@piecemaker-legal/piecemaker 2.0.9 → 2.0.11

package/server/piecemaker/anonymizer/hudsucker-fixture.cjs

@@ -1,6 +1,5 @@
 const { execFileSync, spawn } = require('node:child_process');
 const fs = require('node:fs');
-const net = require('node:net');
 const os = require('node:os');
 const path = require('node:path');
 
@@ -25,17 +24,6 @@ function makeCertificateAuthority(directory) {
   return { cert, key };
 }
 
-function freePort() {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer();
-    server.once('error', reject);
-    server.listen(0, '127.0.0.1', () => {
-      const { port } = server.address();
-      server.close((error) => (error ? reject(error) : resolve(port)));
-    });
-  });
-}
-
 function waitForOutput(child, needle, timeoutMs) {
   return new Promise((resolve, reject) => {
     let buffer = '';
@@ -71,21 +59,23 @@ async function startHudsuckerSession({
   const ca = makeCertificateAuthority(directory);
   const dictionary = createSqliteDictionaryLoader({ databasePath });
   const bridge = await startRewriterBridge({ dictionary, harness });
-  const port = await freePort();
   const upstreamMap = hosts.map((host) => `${host}=127.0.0.1:${upstreamPort}`).join(',');
   const child = spawn(binary, [
-    '--listen', `127.0.0.1:${port}`,
+    '--listen', '127.0.0.1:0',
     '--rewriter', `http://127.0.0.1:${bridge.port}`,
     '--ca-cert', ca.cert,
     '--ca-key', ca.key,
     '--hosts', hosts.join(','),
     '--upstream-map', upstreamMap,
   ], {
-    stdio: ['ignore', 'pipe', 'pipe'],
+    stdio: ['pipe', 'pipe', 'pipe'],
     env: { ...process.env, HTTPS_PROXY: '', HTTP_PROXY: '', ALL_PROXY: '', http_proxy: '', https_proxy: '' },
   });
+  let logs = '';
+  child.stderr.on('data', (chunk) => { logs += chunk; });
+  let port;
   try {
-    await waitForOutput(child, `listening 127.0.0.1:${port}`, 15000);
+    port = (await waitForOutput(child, 'listening 127.0.0.1:', 15000)).match(/listening 127\.0\.0\.1:(\d+)/)[1];
   } catch (error) {
     child.kill('SIGKILL');
     await bridge.close();
@@ -96,6 +86,9 @@ async function startHudsuckerSession({
     origin: `http://127.0.0.1:${port}`,
     caFile: ca.cert,
     stats: bridge.stats,
+    child,
+    bridge,
+    logs: () => logs,
     async close() {
       child.kill('SIGTERM');
       await new Promise((resolve) => child.once('exit', resolve));

package/server/piecemaker/anonymizer/hudsucker-proxy/Cargo.toml

@@ -10,5 +10,5 @@ http-body-util = "0.1"
 hudsucker = { version = "0.25", default-features = false, features = ["decoder", "http2", "rcgen-ca", "rustls-client"] }
 reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"] }
 serde_json = "1"
-tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync"] }
+tokio = { version = "1", features = ["macros", "net", "rt-multi-thread", "sync"] }
 tokio-stream = "0.1"