fix(ci): use cli hdiff path for e2e artifacts

Author: sunnylqm

Example/e2etest/e2e/globalSetup.ts

@@ -97,21 +97,17 @@ function startServer() {
   const serverScript = path.join(projectRoot, 'scripts/local-e2e-server.ts');
   fs.mkdirSync(artifactsRoot, { recursive: true });
 
-  const logFile = path.join(artifactsRoot, '.server.log');
-  const logFd = fs.openSync(logFile, 'w');
-
   const child = spawn('bun', [serverScript], {
     cwd: projectRoot,
     detached: true,
-    stdio: ['ignore', logFd, logFd],
+    stdio: 'ignore',
     env: {
       ...process.env,
       E2E_ASSET_PORT: String(LOCAL_UPDATE_PORT),
     },
   });
   child.unref();
   fs.writeFileSync(pidFile, String(child.pid));
-  // Keep logFd open for the server lifetime — it will be cleaned up on process exit.
 }
 
 function waitForServer(timeoutMs = 30000) {
@@ -239,27 +235,6 @@ async function globalSetup() {
   }
   startServer();
   await waitForServer();
-
-  // Diagnostic: list artifacts via debug endpoint and local filesystem
-  const origin = `http://127.0.0.1:${LOCAL_UPDATE_PORT}`;
-  try {
-    const debugRes = await fetch(`${origin}/debug/artifacts`);
-    if (debugRes.ok) {
-      console.log('[globalSetup] Server artifacts:', await debugRes.text());
-    } else {
-      console.log('[globalSetup] Debug endpoint returned:', debugRes.status);
-    }
-  } catch (e) {
-    console.log('[globalSetup] Debug endpoint error:', e);
-  }
-  const localArtifactsDir = path.join(artifactsRoot, platform);
-  if (fs.existsSync(localArtifactsDir)) {
-    const files = fs.readdirSync(localArtifactsDir);
-    console.log(`[globalSetup] Local artifacts dir (${localArtifactsDir}):`, files);
-  } else {
-    console.log(`[globalSetup] Local artifacts dir MISSING: ${localArtifactsDir}`);
-  }
-
   await warmServer(platform as 'ios' | 'android');
   await detoxGlobalSetup();
 }

Example/e2etest/scripts/local-e2e-server.ts

@@ -140,9 +140,6 @@ const server = Bun.serve({
         !fs.existsSync(filePath) ||
         fs.statSync(filePath).isDirectory()
       ) {
-        console.error(
-          `[404] ${url.pathname} -> ${filePath} (exists: ${filePath ? fs.existsSync(filePath) : 'null'})`,
-        );
         return new Response('not found', { status: 404 });
       }
 
@@ -159,22 +156,6 @@ const server = Bun.serve({
       });
     }
 
-    if (url.pathname === '/debug/artifacts') {
-      const entries = fs.readdirSync(artifactsRoot, { recursive: true });
-      const listing = entries.map(e => {
-        const fullPath = path.join(artifactsRoot, String(e));
-        try {
-          const stat = fs.statSync(fullPath);
-          return `${e} (${stat.size} bytes, ${stat.isDirectory() ? 'dir' : 'file'})`;
-        } catch {
-          return `${e} (stat failed)`;
-        }
-      });
-      return new Response(JSON.stringify({ artifactsRoot, entries: listing }, null, 2), {
-        headers: { 'Content-Type': 'application/json' },
-      });
-    }
-
     return new Response('not found', { status: 404 });
   },
 });

Example/e2etest/scripts/prepare-local-update-artifacts.ts

@@ -66,7 +66,7 @@ function runPushy(args: string[], cwd: string) {
   }
   const result = spawnSync('node', [cliEntry, ...args], {
     cwd,
-    stdio: 'pipe',
+    stdio: 'inherit',
     env: {
       ...process.env,
       NODE_PATH: nodePath.join(path.delimiter),
@@ -77,12 +77,9 @@ function runPushy(args: string[], cwd: string) {
     timeout: 120_000,
   });
 
-  const stdout = result.stdout?.toString() ?? '';
-  const stderr = result.stderr?.toString() ?? '';
-  if (stdout) console.log(`[pushy ${args[0]}] stdout:`, stdout.trim());
-  if (stderr) console.log(`[pushy ${args[0]}] stderr:`, stderr.trim());
-  console.log(`[pushy ${args[0]}] exit code: ${result.status}, signal: ${result.signal}`);
-
+  if (result.error) {
+    throw result.error;
+  }
   if (result.status !== 0) {
     throw new Error(
       `pushy ${args.join(' ')} failed with exit code ${result.status}`,
@@ -126,32 +123,6 @@ function prepareDir() {
   fs.mkdirSync(artifactsDir, { recursive: true });
 }
 
-function runHdiffWrapper(mode: 'ppk' | 'apk', oldFile: string, newFile: string, outputFile: string) {
-  // Use projectRoot (source dir) not __dirname (which may be .ts-build/)
-  const wrapperScript = path.join(projectRoot, 'scripts', 'run-hdiff-wrapper.js');
-  console.log(`[runHdiffWrapper] script=${wrapperScript} cliRoot=${cliRoot} mode=${mode}`);
-  console.log(`[runHdiffWrapper] args: [${cliRoot}, ${mode}, ${oldFile}, ${newFile}, ${outputFile}]`);
-  const result = spawnSync(
-    process.execPath,
-    [wrapperScript, cliRoot, mode, oldFile, newFile, outputFile],
-    {
-      cwd: projectRoot,
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        NODE_PATH: [
-          path.join(projectRoot, 'node_modules'),
-          path.join(cliRoot, 'node_modules'),
-        ].join(path.delimiter),
-      },
-    },
-  );
-
-  if (result.status !== 0) {
-    throw new Error(`${mode} wrapper failed with exit code ${result.status}`);
-  }
-}
-
 function bundleTo(entryFile: string, outputFile: string) {
   runPushy(
     [
@@ -171,6 +142,35 @@ function bundleTo(entryFile: string, outputFile: string) {
   );
 }
 
+function verifyGeneratedFile(label: string, filePath: string) {
+  if (!fs.existsSync(filePath)) {
+    throw new Error(`${label} file not found after generation: ${filePath}`);
+  }
+  console.log(
+    `Verified ${label}: ${filePath} (${fs.statSync(filePath).size} bytes)`,
+  );
+}
+
+function generatePpkDiff(origin: string, next: string, output: string) {
+  runPushy(
+    ['hdiff', origin, next, '--output', output, '--no-interactive'],
+    projectRoot,
+  );
+  verifyGeneratedFile('ppk diff', output);
+}
+
+function generateAndroidPackageDiff(
+  apkPath: string,
+  next: string,
+  output: string,
+) {
+  runPushy(
+    ['hdiffFromApk', apkPath, next, '--output', output, '--no-interactive'],
+    projectRoot,
+  );
+  verifyGeneratedFile('package diff', output);
+}
+
 async function main() {
   prepareDir();
 
@@ -186,11 +186,7 @@ async function main() {
   ensureHdiffModule();
 
   console.log('Generating ppk diff...');
-  runHdiffWrapper('ppk', v1, v2, ppkDiff);
-  if (!fs.existsSync(ppkDiff)) {
-    throw new Error(`ppk diff file not found after generation: ${ppkDiff}`);
-  }
-  console.log(`Verified ppk diff: ${ppkDiff} (${fs.statSync(ppkDiff).size} bytes)`);
+  generatePpkDiff(v1, v2, ppkDiff);
 
   if (platform === 'android') {
     const apkPath = path.join(
@@ -206,17 +202,15 @@ async function main() {
 
     fs.copyFileSync(apkPath, path.join(artifactsDir, LOCAL_UPDATE_FILES.apk));
     console.log('Generating package diff...');
-    runHdiffWrapper(
-      'apk',
+    const packageDiffPath = path.join(
+      artifactsDir,
+      LOCAL_UPDATE_FILES.packageDiff,
+    );
+    generateAndroidPackageDiff(
       apkPath,
       v3,
-      path.join(artifactsDir, LOCAL_UPDATE_FILES.packageDiff),
+      packageDiffPath,
     );
-    const packageDiffPath = path.join(artifactsDir, LOCAL_UPDATE_FILES.packageDiff);
-    if (!fs.existsSync(packageDiffPath)) {
-      throw new Error(`Package diff file not found after generation: ${packageDiffPath}`);
-    }
-    console.log(`Verified package diff: ${packageDiffPath} (${fs.statSync(packageDiffPath).size} bytes)`);
   }
 
   const manifestPath = path.join(artifactsDir, 'manifest.json');

Example/e2etest/scripts/run-hdiff-wrapper.js

@@ -1,4 +1,4 @@
-import { describe, expect, mock, test } from 'bun:test';
+import { afterEach, describe, expect, mock, test } from 'bun:test';
 
 const importFreshClient = (cacheKey: string) => import(`../client?${cacheKey}`);
 
@@ -366,6 +366,12 @@ describe('Pushy server config', () => {
 });
 
 describe('downloadUpdate fallback chain', () => {
+  const realSetTimeout = globalThis.setTimeout;
+
+  afterEach(() => {
+    globalThis.setTimeout = realSetTimeout;
+  });
+
   const setupDownloadMocks = ({
     downloadPatchFromPpk = mock(() => Promise.resolve()),
     downloadPatchFromPackage = mock(() => Promise.resolve()),
@@ -382,7 +388,6 @@ describe('downloadUpdate fallback chain', () => {
     });
 
     // Override setTimeout to skip real backoff delays in retry tests
-    const realSetTimeout = globalThis.setTimeout.bind(globalThis);
     globalThis.setTimeout = ((fn: (...args: any[]) => void, _ms?: number) =>
       realSetTimeout(fn, 0)) as unknown as typeof setTimeout;