Defer injected scriptis to nextTick, so you can listen for sync errors

httptoolkit · May 31, 2024 · 94499cc · 94499cc
1 parent dcd9a90
commit 94499cc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -195,7 +195,10 @@ export class FridaSession {
         const agentSession = await this.getAgentSession(sessionId);
 
         const script = await agentSession.createScript(fridaScript, {});
-        await script.loadScript();
+
+        setTimeout(async () => {
+            await script.loadScript();
+        }, 0);
 
         return {
             session: agentSession,
@@ -233,9 +236,12 @@ export class FridaSession {
         const agentSession = await this.getAgentSession(sessionId);
 
         const script = await agentSession.createScript(fridaScript, {});
-        await script.loadScript();
 
-        await hostSession.Resume(pid);
+        setTimeout(async () => {
+            await script.loadScript();
+            await hostSession.Resume(pid);
+        }, 0);
+
         return {
             pid,
             session: agentSession,

diff --git a/test/test.spec.ts b/test/test.spec.ts
@@ -120,7 +120,7 @@ describe("Frida-JS", () => {
             path.join(FIXTURES_BASE, `serve-${process.platform}-${process.arch}`),
             [],
             // Run an example script that always crashes:
-            "setTimeout(() => { throw new Error('Intentional script failure error'); }, 100);"
+            "throw new Error('Intentional script failure error');"
         );
         const messages: any[] = [];
         session.onMessage((msg) => messages.push(msg));
@@ -134,9 +134,7 @@ describe("Frida-JS", () => {
             type: 'error',
             description: 'Error: Intentional script failure error',
             stack: 'Error: Intentional script failure error\n' +
-            '    at <anonymous> (/script1.js:1)\n' +
-            '    at apply (native)\n' +
-            '    at <anonymous> (frida/runtime/core.js:51)',
+            '    at <eval> (/script1.js:1)',
             fileName: '/script1.js',
             lineNumber: 1,
             columnNumber: 1