frida-test 0.3.0 → 0.3.2

package/dist/bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../src/bundler.ts"],"names":[],"mappings":"AAwEA,wBAAsB,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CA2DlG"}
+{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../src/bundler.ts"],"names":[],"mappings":"AAwFA,wBAAsB,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CA4DlG"}

package/dist/bundler.js

@@ -63,6 +63,20 @@ async function deleteWorkDir(workDir) {
         logger.warn(`Failed to remove temporary work dir "${workDir}": ${err.message}`);
     }
 }
+async function prepareTypeCheckConfig(projectRoot, workDir) {
+    const realTsconfigPath = path.join(projectRoot, "tsconfig.json");
+    if (!existsSync(realTsconfigPath))
+        return;
+    const scratchConfig = {
+        extends: realTsconfigPath.replace(/\\/g, "/"),
+        compilerOptions: {
+            rootDir: projectRoot.replace(/\\/g, "/"),
+        },
+        include: [],
+        exclude: [],
+    };
+    await writeFile(path.join(workDir, "tsconfig.json"), JSON.stringify(scratchConfig, null, 2), "utf8");
+}
 export async function bundleAgent(testSuitePaths, keep = false) {
     if (testSuitePaths.length === 0) {
         throw new Error("bundleAgent requires at least one test suite path.");
@@ -87,19 +101,19 @@ export async function bundleAgent(testSuitePaths, keep = false) {
             .join("\n");
         await rm(entrypointPath, { force: true });
         await writeFile(entrypointPath, agentSource.replace(IMPORT_MARKER, importStatements), "utf8");
+        await prepareTypeCheckConfig(projectRoot, workDir);
         const outfilePath = path.join(workDir, AGENT_BUNDLE_FILENAME);
         const fridaCompile = getFridaCompileBin(projectRoot);
         const args = fridaCompile.useLocal ? [entrypointPath, "-o", outfilePath] : ["frida-compile", entrypointPath, "-o", outfilePath];
         try {
             execFileSync(fridaCompile.path, args, {
-                cwd: projectRoot,
+                cwd: workDir,
                 shell: process.platform === "win32",
-                encoding: "utf8",
+                stdio: "inherit",
             });
         }
         catch (err) {
-            const stderr = err.stderr?.toString().trim();
-            throw new Error(`frida-compile failed for entrypoint "${entrypointPath}" with suites [${testSuitePaths.join(", ")}]: ${stderr || err.message}`, { cause: err });
+            throw new Error(`frida-compile failed for entrypoint "${entrypointPath}" with suites [${testSuitePaths.join(", ")}] (see compiler output above for details)`, { cause: err });
         }
         logger.info(`Agent bundle sucessfully created and saved at ${outfilePath}.`);
         return await readFile(outfilePath, "utf8");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frida-test",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "homepage": "https://github.com/bernhste/frida-test/blob/main/README.md",
@@ -63,6 +63,6 @@
     "typescript": "^7.0.2"
   },
   "allowScripts": {
-    "frida@17.17.0": true
+    "frida@17.18.0": true
   }
 }

package/src/agent-runtime/registry.ts

@@ -252,35 +252,29 @@ export async function runTests(nodes: TestSuiteNode[], emit: (message: AgentMess
 
   const parentHooks: EachHooks = { beforeEach: rootHooks.beforeEach, afterEach: rootHooks.afterEach };
 
-  const settled = await Promise.allSettled(
-    nodes.map(async (node) => {
-      emit({ type: "test-suite-started", name: node.name });
-      const { result: testResult, counts } = await runTestSuiteNode(node, verbose, parentHooks);
-      const suiteResult: TestSuiteResult = { name: node.name, testResult, status: testResult.status };
-      emit({ type: "test-suite-finished", name: node.name, result: suiteResult });
-      return { suiteResult, counts };
-    }),
-  );
-
   const testSuitesResults: TestSuiteResult[] = [];
   let counts = ZERO_COUNTS;
 
-  settled.forEach((outcome, i) => {
-    if (outcome.status === "fulfilled") {
-      testSuitesResults.push(outcome.value.suiteResult);
-      counts = addCounts(counts, outcome.value.counts);
-      return;
+  for (const node of nodes) {
+    emit({ type: "test-suite-started", name: node.name });
+    try {
+      const { result: testResult, counts: nodeCounts } = await runTestSuiteNode(node, verbose, parentHooks);
+      const suiteResult: TestSuiteResult = { name: node.name, testResult, status: testResult.status };
+      emit({ type: "test-suite-finished", name: node.name, result: suiteResult });
+      testSuitesResults.push(suiteResult);
+      counts = addCounts(counts, nodeCounts);
+    } catch (err) {
+      const error = serializeError(err, verbose);
+      const suiteResult: TestSuiteResult = {
+        name: node.name,
+        testResult: { name: node.name, status: "failed", durationMs: 0, error },
+        status: "failed",
+      };
+      emit({ type: "test-suite-finished", name: node.name, result: suiteResult });
+      testSuitesResults.push(suiteResult);
+      counts = addCounts(counts, { total: 1, passed: 0, failed: 1 });
     }
-
-    const error = serializeError(outcome.reason, verbose);
-    const testSuiteResult: TestSuiteResult = {
-      name: nodes[i].name,
-      testResult: { name: nodes[i].name, status: "failed", durationMs: 0, error },
-      status: "failed",
-    };
-    testSuitesResults.push(testSuiteResult);
-    counts = addCounts(counts, { total: 1, passed: 0, failed: 1 });
-  });
+  }
 
   const afterAllError = await runTeardownHooks(rootHooks.afterAll, verbose);
   if (afterAllError) {