Wire up some more

frida · Oct 1, 2024 · 53eb285 · 53eb285
1 parent 58958b3
commit 53eb285
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 251 deletions.
diff --git a/apps/tracer/package-lock.json b/apps/tracer/package-lock.json
diff --git a/apps/tracer/package.json b/apps/tracer/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@blueprintjs/core": "^5.12.0",
+    "@frida/react-use-r2": "^1.0.1",
     "@monaco-editor/react": "^4.6.0",
     "monaco-editor": "^0.51.0",
     "react": "^18.3.1",

diff --git a/apps/tracer/src/DisassemblyView.tsx b/apps/tracer/src/DisassemblyView.tsx
@@ -1,6 +1,6 @@
 import "./DisassemblyView.css";
 import { Handler, HandlerId } from "./model.js";
-import { useR2 } from "./use-r2.js";
+import { useR2 } from "@frida/react-use-r2";
 import { hideContextMenu, Menu, MenuItem, showContextMenu, Spinner } from "@blueprintjs/core";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 

diff --git a/apps/tracer/src/model.ts b/apps/tracer/src/model.ts
@@ -1,8 +1,11 @@
-import { useR2 } from "./use-r2.js";
+import { useR2, type Platform, type Architecture } from "@frida/react-use-r2";
+import r2WasmUrl from "@frida/react-use-r2/dist/r2.wasm?url";
 import { OverlayToaster } from "@blueprintjs/core";
 import { useCallback, useEffect, useRef, useState } from "react";
 import useWebSocket, { ReadyState } from "react-use-websocket";
 
+console.log("r2WasmUrl:", r2WasmUrl);
+
 const SOCKET_URL = (import.meta.env.MODE === "development")
     ? "ws://localhost:1337"
     : `ws://${window.location.host}`;
@@ -344,10 +347,6 @@ export interface ProcessDetails {
     main_module: NativeModule;
 }
 
-export type Platform = "windows" | "darwin" | "linux" | "freebsd" | "qnx";
-
-export type Architecture = "ia32" | "x64" | "arm" | "arm64" | "mips";
-
 export interface NativeModule {
     base: string;
     name: string;

diff --git a/apps/tracer/src/r2.d.ts b/apps/tracer/src/r2.d.ts
diff --git a/apps/tracer/src/r2.js b/apps/tracer/src/r2.js
diff --git a/apps/tracer/src/use-r2.ts b/apps/tracer/src/use-r2.ts
diff --git a/apps/tracer/vite.config.ts b/apps/tracer/vite.config.ts
@@ -13,12 +13,4 @@ export default defineConfig({
             }
         }
     },
-    server: {
-        proxy: {
-            "^/src/r2\\.wasm": {
-                target: "http://localhost:8000",
-                rewrite: (path) => path.replace(/^\/src/, ""),
-            },
-        }
-    },
 });