Merge branch 'master' into avoiding-anomalies

packages/gui/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@docmirror/dev-sidecar": "workspace:*",
     "@docmirror/mitmproxy": "workspace:*",
-    "@natmri/platform-napi": "^0.0.7",
+    "@starknt/shutdown-handler-napi": "^0.0.2",
     "@starknt/sysproxy": "^0.0.1",
     "@vscode/sudo-prompt": "^9.3.1",
     "adm-zip": "^0.5.16",

packages/gui/src/background/powerMonitor.js

@@ -1,4 +1,4 @@
-import { acquireShutdownBlock, insertWndProcHook, releaseShutdownBlock, removeWndProcHook, setMainWindowHandle } from '@natmri/platform-napi'
+import { acquireShutdownBlock, insertWndProcHook, releaseShutdownBlock, removeWndProcHook, setMainWindowHandle } from '@starknt/shutdown-handler-napi'
 import { powerMonitor as _powerMonitor } from 'electron'
 
 class PowerMonitor {
@@ -9,11 +9,11 @@ class PowerMonitor {
   }
 
   /**
-   * @param {BrowserWindow} window
+   * @param {import('electron').BrowserWindow} window
    */
   setupMainWindow (window) {
     if (!this.setup) {
-      setMainWindowHandle(window.getNativeWindowHandle().readBigInt64LE())
+      setMainWindowHandle(window.getNativeWindowHandle())
       this.setup = true
     }
   }

packages/gui/vue.config.js

@@ -45,17 +45,14 @@ module.exports = defineConfig({
         '@starknt/sysproxy-linux-arm64-gnu',
         '@starknt/sysproxy-darwin-x64',
         '@starknt/sysproxy-darwin-arm64',
-        '@natmri/platform-napi',
-        '@natmri/platform-napi-win32-ia32-msvc',
-        '@natmri/platform-napi-win32-x64-msvc',
-        '@natmri/platform-napi-win32-arm64-msvc',
-        '@natmri/platform-napi-linux-x64-gnu',
-        '@natmri/platform-napi-linux-x64-musl',
-        '@natmri/platform-napi-linux-arm64-gnu',
-        '@natmri/platform-napi-linux-arm64-musl',
-        '@natmri/platform-napi-linux-arm-gnueabihf',
-        '@natmri/platform-napi-darwin-x64',
-        '@natmri/platform-napi-darwin-arm64',
+        '@starknt/shutdown-handler-napi',
+        '@starknt/shutdown-handler-napi-win32-ia32-msvc',
+        '@starknt/shutdown-handler-napi-win32-x64-msvc',
+        '@starknt/shutdown-handler-napi-win32-arm64-msvc',
+        '@starknt/shutdown-handler-napi-linux-x64-gnu',
+        '@starknt/shutdown-handler-napi-linux-arm64-gnu',
+        '@starknt/shutdown-handler-napi-darwin-x64',
+        '@starknt/shutdown-handler-napi-darwin-arm64',
       ],
       nodeIntegration: true,
       // Provide an array of files that, when changed, will recompile the main process and restart Electron

packages/mitmproxy/src/lib/interceptor/impl/req/OPTIONS.js

@@ -14,7 +14,7 @@ function readConfig (config, defaultConfig) {
 
 module.exports = {
   name: 'options',
-  priority: 1,
+  priority: 101,
   requestIntercept (context, interceptOpt, req, res, ssl, next) {
     const { rOptions, log } = context
 

packages/mitmproxy/src/lib/interceptor/impl/req/cacheReq.js → packages/mitmproxy/src/lib/interceptor/impl/req/cacheRequest.js

@@ -55,7 +55,7 @@ function getLastModifiedTimeFromIfModifiedSince (rOptions, log) {
 }
 
 module.exports = {
-  name: 'cacheReq',
+  name: 'cacheRequest',
   priority: 104,
   requestIntercept (context, interceptOpt, req, res, ssl, next) {
     const { rOptions, log } = context

packages/mitmproxy/src/lib/interceptor/impl/req/redirect.js

@@ -2,7 +2,7 @@ const proxyApi = require('./proxy')
 
 module.exports = {
   name: 'redirect',
-  priority: 102,
+  priority: 105,
   requestIntercept (context, interceptOpt, req, res, ssl, next, matched) {
     const { rOptions, log } = context
 

packages/mitmproxy/src/lib/interceptor/impl/req/sni.js

@@ -1,6 +1,6 @@
 module.exports = {
   name: 'sni',
-  priority: 122,
+  priority: 123,
   requestIntercept (context, interceptOpt, req, res, ssl, next) {
     const { rOptions, log } = context
 

packages/mitmproxy/src/lib/interceptor/impl/req/success.js

@@ -1,6 +1,6 @@
 module.exports = {
   name: 'success',
-  priority: 101,
+  priority: 102,
   requestIntercept (context, interceptOpt, req, res, ssl, next) {
     const { rOptions, log } = context
 

packages/mitmproxy/src/lib/interceptor/impl/req/unVerifySsl.js

@@ -1,6 +1,6 @@
 module.exports = {
   name: 'unVerifySsl',
-  priority: 123,
+  priority: 124,
   requestIntercept (context, interceptOpt, req, res, ssl, next) {
     const { rOptions, log } = context
 

packages/mitmproxy/src/lib/interceptor/impl/res/cacheRes.js → packages/mitmproxy/src/lib/interceptor/impl/res/cacheResponse.js

@@ -1,7 +1,7 @@
-const cacheReq = require('../req/cacheReq')
+const cacheReq = require('../req/cacheRequest')
 
 module.exports = {
-  name: 'cacheRes',
+  name: 'cacheResponse',
   priority: 202,
   responseIntercept (context, interceptOpt, req, res, proxyReq, proxyRes, ssl, next) {
     const { rOptions, log } = context

packages/mitmproxy/src/lib/interceptor/impl/res/responseReplace.js

@@ -1,5 +1,5 @@
 const lodash = require('lodash')
-const cacheReq = require('../req/cacheReq')
+const cacheReq = require('../req/cacheRequest')
 
 const REMOVE = '[remove]'
 

packages/mitmproxy/src/lib/interceptor/index.js

@@ -1,10 +1,9 @@
 // request interceptor impls
 const OPTIONS = require('./impl/req/OPTIONS.js')
-
 const success = require('./impl/req/success')
-const redirect = require('./impl/req/redirect')
 const abort = require('./impl/req/abort')
-const cacheReq = require('./impl/req/cacheReq')
+const cacheRequest = require('./impl/req/cacheRequest')
+const redirect = require('./impl/req/redirect')
 
 const requestReplace = require('./impl/req/requestReplace')
 
@@ -16,20 +15,19 @@ const baiduOcr = require('./impl/req/baiduOcr')
 
 // response interceptor impls
 const AfterOPTIONSHeaders = require('./impl/res/AfterOPTIONSHeaders')
-const cacheRes = require('./impl/res/cacheRes')
+const cacheResponse = require('./impl/res/cacheResponse')
 const responseReplace = require('./impl/res/responseReplace')
 
 const script = require('./impl/res/script')
 
 module.exports = [
   // request interceptor impls
-  OPTIONS,
-  success, redirect, abort, cacheReq,
+  OPTIONS, success, abort, cacheRequest, redirect,
   requestReplace,
   proxy, sni, unVerifySsl,
   baiduOcr,
 
   // response interceptor impls
-  AfterOPTIONSHeaders, cacheRes, responseReplace,
+  AfterOPTIONSHeaders, cacheResponse, responseReplace,
   script,
 ]