@sjhmars/happy-bridge 0.2.1 → 0.2.2

package/lib/client.js

@@ -17,21 +17,21 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var HappyBridgeCard_module_css_default = {
-			"error": "l9rBEq_error",
 			"row": "l9rBEq_row",
-			"chevron": "l9rBEq_chevron",
-			"body": "l9rBEq_body",
-			"button": "l9rBEq_button",
 			"qr": "l9rBEq_qr",
+			"headText": "l9rBEq_headText",
 			"status": "l9rBEq_status",
-			"checkbox": "l9rBEq_checkbox",
+			"description": "l9rBEq_description",
 			"name": "l9rBEq_name",
+			"label": "l9rBEq_label",
+			"button": "l9rBEq_button",
 			"header": "l9rBEq_header",
+			"card": "l9rBEq_card",
+			"checkbox": "l9rBEq_checkbox",
+			"chevron": "l9rBEq_chevron",
+			"body": "l9rBEq_body",
 			"select": "l9rBEq_select",
-			"description": "l9rBEq_description",
-			"label": "l9rBEq_label",
-			"headText": "l9rBEq_headText",
-			"card": "l9rBEq_card"
+			"error": "l9rBEq_error"
 		};
 		//#endregion
 		//#region src/client/HappyBridgeCard.tsx

package/lib/index.js

@@ -3947,6 +3947,8 @@ var HappyBridge = class {
 		if (link.alwaysAllow.has(req.toolName)) return "allowed-once";
 		if (!grantAtLeast(this.config.remoteGrant, "approve")) return next();
 		const id = req.callId;
+		const controller = new AbortController();
+		req.signal = req.signal === void 0 ? controller.signal : AbortSignal.any([req.signal, controller.signal]);
 		this.startTool(link, id, req.toolName, req.reason === void 0 ? {} : { reason: req.reason });
 		const phone = new Promise((resolve) => {
 			link.pendingHuman = {
@@ -3957,13 +3959,18 @@ var HappyBridge = class {
 			};
 		});
 		this.pushRequests(link);
-		const winner = await Promise.race([phone.then((outcome) => ({
-			src: "phone",
+		const web = next().then((outcome) => ({
+			src: "web",
 			outcome
-		})), next().then((outcome) => ({
+		}), () => ({
 			src: "web",
+			outcome: "cancelled"
+		}));
+		const winner = await Promise.race([phone.then((outcome) => ({
+			src: "phone",
 			outcome
-		}))]);
+		})), web]);
+		if (winner.src === "phone") controller.abort();
 		if (winner.src === "web" && link.pendingHuman?.kind === "approval" && link.pendingHuman.id === id) {
 			delete link.pendingHuman;
 			this.clearRequest(link, id, winner.outcome === "allowed-once" ? "approved" : "canceled");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sjhmars/happy-bridge",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Pair an already-running dsh web/desktop client with Happy App so the phone remote-controls the same harness sessions",
   "type": "module",
   "main": "lib/index.js",