better packages

Author: planetarian

package.json

@@ -83,6 +83,8 @@
     }
   },
   "dependencies": {
+    "@bjowes/http-mitm-proxy": "^0.9.6",
+    "@expo/sudo-prompt": "^9.3.2",
     "@jimp/custom": "^0.16.1",
     "@jimp/plugin-crop": "^0.16.1",
     "@jimp/plugin-mask": "^0.16.1",
@@ -92,13 +94,11 @@
     "auto-launch": "^5.0.5",
     "electron-squirrel-startup": "^1.0.0",
     "fs-extra": "^10.0.0",
-    "http-mitm-proxy": "^1.1.0",
     "http-proxy": "^1.18.1",
     "isomorphic-git": "^1.34.0",
     "node-fetch": "^2.6.1",
     "node-socksv5-dns-looukp": "^1.0.9",
-    "node-stream-zip": "^1.15.0",
-    "windows-elevate": "^1.0.1"
+    "node-stream-zip": "^1.15.0"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.0.0-beta.61",

src/proxy/ipc.js

@@ -4,7 +4,7 @@ const fetch = require("node-fetch")
 
 module.exports = { log, error, trace, registerElectron, send, sendRecent, setMainWindow, checkVersion, addStatAndSend, saveStats, getStatsPath: () => statsPath, setStatsPath: (path) => statsPath = path }
 
-const elevate = require("windows-elevate")
+const sudo = require("@expo/sudo-prompt")
 const { execFile } = require("child_process")
 const { getMitmCertDir } = require("./proxy")
 
@@ -163,7 +163,7 @@ async function checkTrustMitmCert() {
         } else {
             log(logSource, `Issuer cert CN=${issuer} not found`);
 
-            elevate.exec("certutil", ["-addstore", "Root", `${path.join(getMitmCertDir(), "certs", "ca.pem")}`],
+            sudo.exec(`certutil -addstore Root "${path.resolve(path.join(getMitmCertDir(), "certs", "ca.pem"))}"`, {},
                 (error, stdout, stderror) => {
                 if (error) {
                     error(logSource, 'Failed to install cert.', error, stderror);

src/proxy/proxy.js

@@ -77,9 +77,9 @@ class Proxy {
         this.proxy.on("error", (error) => Logger.error(kccpLogSource, `Proxy error: ${error.code}: ${error.hostname}`))
 
         // MITM HTTPS proxy
-        this.mitm.use(MitmProxy.Proxy.wildcard)
-        this.mitm.use(MitmProxy.Proxy.gunzip)
         this.mitm.onRequest(async (ctx, callback) => {
+            ctx.use(MitmProxy.wildcard)
+            ctx.use(MitmProxy.gunzip)
             let url = ctx.clientToProxyRequest.url
             if (url.startsWith("/"))
                 url = `https://${ctx.clientToProxyRequest.headers.host}${url}`
@@ -263,7 +263,7 @@ class Proxy {
             else {
                 this.mitm.httpServer?.close()
                 Object.keys(this.mitm.sslServers).forEach(key => {
-                    this.mitm.sslservers[key].server.close()
+                    this.mitm.sslServers[key].server.close()
                 })
             }
         }
@@ -303,7 +303,7 @@ class Proxy {
         if (this.mitm) {
             this.mitm.httpServer?.close()
             Object.keys(this.mitm.sslServers).forEach(key => {
-                this.mitm.sslServers[key]?.server.close()
+                this.mitm.sslServers[key].server.close()
             })
         }
     }