point to correct location for mitmproxy addon

Author: lawrence-forooghian

bin/interception-proxy

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 // This is the script which will be run when you run this package via `npx`.
-require("../dist/server.js");
+require("../dist/js/server.js");

package.json

@@ -8,7 +8,7 @@
   ],
   "scripts": {
     "prepare": "npm run build",
-    "build": "tsc",
+    "build": "tsc && cp -r src/python dist",
     "start": "npm run build && bin/interception-proxy",
     "format:check": "prettier . --check",
     "format:fix": "prettier . --write",

src/ControlRPC.ts renamed to src/js/ControlRPC.ts

@@ -1,5 +1,6 @@
 import { spawn } from "child_process";
 import { InterceptionModeDTO } from "./ControlRPC";
+import path from "path";
 
 export class MitmproxyLauncher {
   private _onMitmproxyReady: (() => void) | null = null;
@@ -47,7 +48,7 @@ export class MitmproxyLauncher {
       "stream_large_bodies=1",
       ...(mitmdumpMode === null ? [] : ["--mode", mitmdumpMode]),
       "-s",
-      "test/mitmproxy_addon_2.py",
+      path.join(__dirname, "..", "python", "mitmproxy_addon.py"),
       "--set",
       // "full request URL with response status code and HTTP headers" (the default truncates the URL)
       "flow_detail=2",

src/ControlServer.ts renamed to src/js/ControlServer.ts

@@ -12,7 +12,7 @@ async def send_ready_notification() -> None:
         data = json.dumps(notification_dto)
         await websocket.send(data)
 
-class MitmproxyAddon2:
+class MitmproxyAddon:
     def running(self) -> None:
         # tell the control API that we’re ready to receive traffic
         asyncio.get_running_loop().create_task(send_ready_notification())
@@ -25,14 +25,14 @@ def request(self, flow: http.HTTPFlow) -> None:
             return
 
         # (b'Connection', b'Upgrade'), (b'Upgrade', b'websocket')
-        intercept = MitmproxyAddon2.is_websocket_upgrade_request(flow.request)
-        logging.info(f'MitmproxyAddon2 {"intercepting" if intercept else "not intercepting"} `request` {flow.request.url}, headers {flow.request.headers}')
+        intercept = MitmproxyAddon.is_websocket_upgrade_request(flow.request)
+        logging.info(f'MitmproxyAddon {"intercepting" if intercept else "not intercepting"} `request` {flow.request.url}, headers {flow.request.headers}')
         # pretty_host takes the "Host" header of the request into account,
         # which is useful in transparent mode where we usually only have the IP
         # otherwise.
         # if flow.request.pretty_host == "example.org":
         # I tried doing it in websocket_start instead but that didn’t work
-        if MitmproxyAddon2.is_websocket_upgrade_request(flow.request):
+        if MitmproxyAddon.is_websocket_upgrade_request(flow.request):
             original_host = flow.request.pretty_host
             original_scheme = flow.request.scheme
 
@@ -52,4 +52,4 @@ def is_websocket_upgrade_request(request: http.Request) -> bool:
         # TODO this request handling is a bit fragile, the special case for `split` is just to handle the fact that Firefox sends 'Connection: keep-alive, Upgrade'
         return True if 'Connection' in request.headers and ('Upgrade' in request.headers['Connection'].split(", ")) and 'Upgrade' in request.headers and request.headers['Upgrade'] == 'websocket' else False
 
-addons = [MitmproxyAddon2()]
+addons = [MitmproxyAddon()]

src/InterceptedConnection.ts renamed to src/js/InterceptedConnection.ts

@@ -1,7 +1,7 @@
 {
   "extends": "@tsconfig/node-lts/tsconfig.json",
-  "include": ["src"],
+  "include": ["src/js"],
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist/js"
   }
 }