pi-chrome 0.4.3 → 0.4.4

package/extensions/chrome-profile-bridge/browser-extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Pi Existing Chrome Profile Bridge",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Lets Pi control tabs in this existing Chrome profile via a local bridge at 127.0.0.1.",
   "permissions": ["tabs", "scripting", "storage", "activeTab", "alarms"],
   "host_permissions": ["<all_urls>", "http://127.0.0.1:17318/*"],

package/extensions/chrome-profile-bridge/index.ts

@@ -46,7 +46,7 @@ type BridgeResult = {
 	error?: string;
 };
 
-const PI_CHROME_VERSION = "0.4.3";
+const PI_CHROME_VERSION = "0.4.4";
 const DEFAULT_HOST = process.env.PI_CHROME_BRIDGE_HOST ?? "127.0.0.1";
 const DEFAULT_PORT = Number(process.env.PI_CHROME_BRIDGE_PORT ?? "17318");
 const DEFAULT_TIMEOUT_MS = 30_000;
@@ -274,7 +274,24 @@ class ChromeProfileBridge {
 		if (request.method === "GET" && url.pathname === "/next") {
 			this.lastSeenAt = Date.now();
 			this.clientName = url.searchParams.get("name") ?? undefined;
-			const command = this.queue.shift() ?? (await this.waitForCommand(25_000));
+			let aborted = false;
+			let activeWaiter: ((command: BridgeCommand | undefined) => void) | undefined;
+			request.once("close", () => {
+				aborted = true;
+				if (activeWaiter) this.waiters = this.waiters.filter((entry) => entry !== activeWaiter);
+			});
+			let command = this.queue.shift();
+			if (!command) {
+				command = await this.waitForCommand(25_000, (waiter) => {
+					activeWaiter = waiter;
+				});
+			}
+			if (aborted) {
+				// Long-poll connection died before we could deliver. Requeue any command we pulled
+				// so the next live /next picks it up instead of dropping it on the floor.
+				if (command) this.queue.unshift(command);
+				return;
+			}
 			sendJson(response, 200, command ? { type: "command", command } : { type: "none" });
 			return;
 		}
@@ -296,16 +313,22 @@ class ChromeProfileBridge {
 		sendJson(response, 404, { error: "not found" });
 	}
 
-	private waitForCommand(timeoutMs: number): Promise<BridgeCommand | undefined> {
+	private waitForCommand(
+		timeoutMs: number,
+		registerWaiter?: (waiter: (command: BridgeCommand | undefined) => void) => void,
+	): Promise<BridgeCommand | undefined> {
 		return new Promise((resolveWait) => {
-			const timer = setTimeout(() => {
-				this.waiters = this.waiters.filter((waiter) => waiter !== resolveWait);
-				resolveWait(undefined);
-			}, timeoutMs);
-			this.waiters.push((command) => {
+			let settled = false;
+			const waiter = (command: BridgeCommand | undefined) => {
+				if (settled) return;
+				settled = true;
 				clearTimeout(timer);
+				this.waiters = this.waiters.filter((entry) => entry !== waiter);
 				resolveWait(command);
-			});
+			};
+			const timer = setTimeout(() => waiter(undefined), timeoutMs);
+			this.waiters.push(waiter);
+			registerWaiter?.(waiter);
 		});
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-chrome",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Drive your existing logged-in Chrome from Pi \u2014 no re-login, no throwaway profile, background by default.",
   "keywords": [
     "pi-package",