@apilift/cli 1.4.33 → 1.4.35

package/dist/apilift-capture-server.js

@@ -19866,6 +19866,55 @@ var extensionPageMessageSchema = external_exports.discriminatedUnion("operation"
   }).strict()
 ]);
 
+// src/capture-server/windows-owner.ts
+import { Worker } from "node:worker_threads";
+var script = `$ErrorActionPreference='Stop'; while ($null -ne ($line=[Console]::ReadLine())) { $parts=$line.Split('|'); try { $p=[System.Diagnostics.Process]::GetProcessById([int]$parts[1]); $stamp=([DateTimeOffset]$p.StartTime.ToUniversalTime()).ToUnixTimeMilliseconds(); $p.Dispose() } catch { $stamp=0 }; [Console]::WriteLine($parts[0]+'|'+$stamp); [Console]::Out.Flush() }`;
+var workerSource = `
+const {workerData}=require('node:worker_threads');
+const {spawn}=require('node:child_process');
+const state=new Int32Array(workerData.memory,0,4), value=new Float64Array(workerData.memory,16,1);
+const child=spawn('powershell.exe',['-NoLogo','-NoProfile','-NonInteractive','-Command',workerData.script],{windowsHide:true,stdio:['pipe','pipe','ignore']});
+const fail=()=>{Atomics.store(state,0,3);Atomics.notify(state,0);};
+child.on('error',fail);child.on('exit',fail);
+let text='';
+child.stdout.on('data',chunk=>{
+  text+=chunk.toString();
+  let end;
+  while((end=text.indexOf('\\n'))>=0){
+    const [id,stamp]=text.slice(0,end).trim().split('|').map(Number);text=text.slice(end+1);
+    if(id!==Atomics.load(state,1)||Atomics.load(state,0)!==1)continue;
+    value[0]=Number.isFinite(stamp)?stamp:0;Atomics.store(state,0,2);Atomics.notify(state,0);
+  }
+  if(text.length>1024){child.kill();fail();}
+});
+const {parentPort}=require('node:worker_threads');
+parentPort.on('message',({id,pid})=>{try{child.stdin.write(id+'|'+pid+'\\n');}catch{fail();}});
+`;
+var worker;
+var memory;
+var sequence = 0;
+function windowsProcessStart(pid) {
+  if (!worker) {
+    memory = new SharedArrayBuffer(24);
+    worker = new Worker(workerSource, { eval: true, workerData: { memory, script } });
+    worker.on("error", () => {
+    });
+    worker.unref();
+  }
+  const state = new Int32Array(memory, 0, 4), value = new Float64Array(memory, 16, 1);
+  const id2 = ++sequence;
+  Atomics.store(state, 1, id2);
+  Atomics.store(state, 0, 1);
+  worker.postMessage({ id: id2, pid });
+  Atomics.wait(state, 0, 1, 4e3);
+  if (Atomics.load(state, 0) === 2 && value[0] > 0) return value[0];
+  if (Atomics.load(state, 0) !== 2) {
+    void worker.terminate();
+    worker = void 0;
+  }
+  return null;
+}
+
 // src/capture-server/store.ts
 import { randomUUID, createHash } from "node:crypto";
 import { mkdirSync, chmodSync, readFileSync as readFileSync2 } from "node:fs";
@@ -19934,6 +19983,10 @@ function inspectOwner(pid, expectedStartedAt, probe) {
       return false;
     }
   }
+  if (windows && !probe.inspect) {
+    const observed = windowsProcessStart(pid);
+    return observed !== null && Math.abs(observed - expectedStartedAt) <= 5e3;
+  }
   for (let attempt = 0; attempt < (windows ? 2 : 1); attempt++) {
     if (!alive(pid)) return false;
     const remaining = windows ? 8e3 - (now() - started) : 2e3;
@@ -19974,6 +20027,7 @@ var CaptureStore = class {
       if (!hadCandidates) this.db.exec(`INSERT INTO capture_candidates (scope_id,seq,capture_id,entry_json) SELECT e.scope_id,g.first_seq,g.capture_id,e.entry_json FROM capture_entries e JOIN (SELECT scope_id,COALESCE(json_extract(entry_json,'$.captureId'),CAST(seq AS TEXT)) AS capture_id,MIN(seq) AS first_seq,MAX(seq) AS last_seq FROM capture_entries GROUP BY scope_id,capture_id) g ON e.scope_id=g.scope_id AND e.seq=g.last_seq`);
       const columns = this.db.prepare("PRAGMA table_info(scopes)").all();
       if (!columns.some((column) => column.name === "owner_session")) this.db.exec("ALTER TABLE scopes ADD COLUMN owner_session TEXT");
+      if (!this.db.prepare("PRAGMA table_info(bridge_status)").all().some((column) => column.name === "sequence")) this.db.exec("ALTER TABLE bridge_status ADD COLUMN sequence INTEGER NOT NULL DEFAULT 0");
       if (!this.db.prepare("PRAGMA table_info(bridge_status)").all().some((column) => column.name === "capabilities_json")) this.db.exec("ALTER TABLE bridge_status ADD COLUMN capabilities_json TEXT NOT NULL DEFAULT '[]'");
       if (!columns.some((column) => column.name === "start_url")) this.db.exec("ALTER TABLE scopes ADD COLUMN start_url TEXT");
       if (!columns.some((column) => column.name === "binding_mode")) this.db.exec("ALTER TABLE scopes ADD COLUMN binding_mode TEXT");
@@ -20136,8 +20190,11 @@ var CaptureStore = class {
     this.prune();
     return Boolean(this.db.prepare("SELECT 1 FROM scopes WHERE retained_at IS NULL LIMIT 1").get() || this.db.prepare("SELECT 1 FROM jobs j JOIN scopes s ON s.id=j.scope_id WHERE s.retained_at IS NULL LIMIT 1").get() || this.db.prepare("SELECT 1 FROM scopes s WHERE s.retained_at>? AND (EXISTS (SELECT 1 FROM capture_candidates c WHERE c.scope_id=s.id AND json_extract(c.entry_json,'$.pending')=1) OR EXISTS (SELECT 1 FROM capture_body_refs r LEFT JOIN blobs b ON b.scope_id=r.scope_id AND b.digest=r.digest WHERE r.scope_id=s.id AND COALESCE(b.complete,0)=0)) LIMIT 1").get(this.clock() - 2e4));
   }
+  wakeBridge() {
+    this.emit();
+  }
   bridgeReady(version2, capabilities = []) {
-    this.db.prepare("INSERT INTO bridge_status(id,version,updated_at,capabilities_json) VALUES(1,?,?,?) ON CONFLICT(id) DO UPDATE SET version=excluded.version,updated_at=excluded.updated_at,capabilities_json=excluded.capabilities_json").run(version2, this.clock(), json3(capabilities));
+    this.db.prepare("INSERT INTO bridge_status(id,version,updated_at,capabilities_json) VALUES(1,?,?,?) ON CONFLICT(id) DO UPDATE SET version=excluded.version,updated_at=excluded.updated_at,capabilities_json=excluded.capabilities_json,sequence=bridge_status.sequence+1").run(version2, this.clock(), json3(capabilities));
   }
   bridgeCapabilities() {
     const row = this.db.prepare("SELECT capabilities_json FROM bridge_status WHERE id=1 AND updated_at>?").get(this.clock() - 6e4);
@@ -20312,6 +20369,15 @@ async function startCaptureServer(options) {
   const store = new CaptureStore(root, options.clock, options.alive);
   const token = randomBytes(32).toString("base64url");
   let lastActiveAt = Date.now();
+  async function untilChanged(read, ready, waitMs) {
+    const deadline = Date.now() + Math.max(0, Math.min(25e3, Number.isFinite(waitMs) ? waitMs : 0));
+    for (; ; ) {
+      const revision = (await store.changes(-1, 0)).revision;
+      const value = read();
+      if (ready(value) || Date.now() >= deadline) return value;
+      await store.changes(revision, deadline - Date.now());
+    }
+  }
   const server = createServer(async (request2, response) => {
     try {
       if (!equalToken(request2.headers.authorization?.replace(/^Bearer /, "") ?? "", token)) {
@@ -20333,6 +20399,12 @@ async function startCaptureServer(options) {
         send(response, 200, { scopes: store.scopes(), extensionCapabilities: store.bridgeCapabilities() });
         return;
       }
+      if (path === "/bridge/demand" && request2.method === "POST") {
+        await readBody(request2);
+        store.wakeBridge();
+        send(response, 200, { ok: true });
+        return;
+      }
       if (path === "/bridge/ready" && request2.method === "POST") {
         const body2 = object2(await readBody(request2));
         if (typeof body2.version !== "string" || body2.capabilities !== void 0 && (!Array.isArray(body2.capabilities) || body2.capabilities.some((value) => typeof value !== "string"))) throw new CaptureError("invalid-bridge-version", "Native host version and supported capabilities are required");
@@ -20341,7 +20413,8 @@ async function startCaptureServer(options) {
         return;
       }
       if (path === "/scope/candidates" && request2.method === "GET") {
-        send(response, 200, { candidates: store.candidates(String(url3.searchParams.get("id") ?? "")) });
+        const candidates = await untilChanged(() => store.candidates(String(url3.searchParams.get("id") ?? "")), (value) => value.length > 0, Number(url3.searchParams.get("waitMs") ?? 0));
+        send(response, 200, { candidates });
         return;
       }
       if (path === "/scope/entry" && request2.method === "GET") {
@@ -20363,7 +20436,7 @@ async function startCaptureServer(options) {
         return;
       }
       if (path === "/job/result" && request2.method === "GET") {
-        const result = store.jobResult(String(url3.searchParams.get("id") ?? ""));
+        const result = await untilChanged(() => store.jobResult(String(url3.searchParams.get("id") ?? "")), (value) => !value || ["delivered", "uncertain"].includes(value.status), Number(url3.searchParams.get("waitMs") ?? 0));
         send(response, result ? 200 : 404, result ?? { error: { code: "job-missing", message: "Job not found" } });
         return;
       }