@makerbi/remodex 1.3.9 → 1.3.10

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@makerbi/remodex",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "description": "Local bridge between Codex and the Remodex mobile app. Run `remodex up` to start.",
   "main": "src/index.js",
   "bin": {
-    "remodex": "./bin/remodex.js"
+    "remodex": "bin/remodex.js"
   },
   "files": [
     "bin/",

package/src/bridge.js

@@ -55,6 +55,9 @@ const RELAY_WATCHDOG_PING_INTERVAL_MS = 10_000;
 const RELAY_WATCHDOG_STALE_AFTER_MS = 70_000;
 const BRIDGE_STATUS_HEARTBEAT_INTERVAL_MS = 5_000;
 const STALE_RELAY_STATUS_MESSAGE = "Relay heartbeat stalled; reconnect pending.";
+const CLOSE_CODE_INVALID_RELAY_REQUEST = 4000;
+const CLOSE_CODE_REPLACED_BY_NEW_MAC = 4001;
+const CLOSE_CODE_MAC_UNAUTHORIZED = 4005;
 const RELAY_HISTORY_IMAGE_REFERENCE_URL = "remodex://history-image-elided";
 const RELAY_THREAD_PAYLOAD_SOFT_LIMIT_BYTES = 4 * 1024 * 1024;
 const RELAY_HISTORY_TEXT_TAIL_LIMIT_CHARS = 24_000;
@@ -146,6 +149,7 @@ function startBridge({
   let lastRelayActivityAt = 0;
   let lastPublishedBridgeStatus = null;
   let lastConnectionStatus = null;
+  let lastConnectionError = "";
   let codexLaunchState = config.codexEndpoint ? "connected" : "starting";
   let codexHandshakeState = config.codexEndpoint ? "warm" : "cold";
   const forwardedInitializeRequestIds = new Set();
@@ -322,35 +326,42 @@ function startBridge({
   }
 
   // Keeps npm start output compact by emitting only high-signal connection states.
-  function logConnectionStatus(status) {
-    if (lastConnectionStatus === status) {
+  function logConnectionStatus(status, lastError = "") {
+    if (lastConnectionStatus === status && lastConnectionError === lastError) {
       return;
     }
 
     lastConnectionStatus = status;
+    lastConnectionError = lastError;
     publishBridgeStatus({
       state: "running",
       connectionStatus: status,
       pid: process.pid,
-      lastError: "",
+      lastError,
     });
     console.log(`[remodex] ${status}`);
+    if (lastError) {
+      console.error(`[remodex] ${lastError}`);
+    }
   }
 
   // Retries the relay socket while preserving the active Codex process and session id.
-  function scheduleRelayReconnect(closeCode) {
+  function scheduleRelayReconnect(closeCode, closeReason = "") {
     if (isShuttingDown) {
       return;
     }
 
-    if (closeCode === 4000 || closeCode === 4001) {
-      logConnectionStatus("disconnected");
+    if (isTerminalRelayCloseCode(closeCode)) {
+      const lastError = buildRelayCloseStatusError(closeCode, closeReason);
+      logConnectionStatus("disconnected", lastError);
       shutdown(codex, () => socket, () => {
         isShuttingDown = true;
         bridgeWakeAssertion.stop();
         clearReconnectTimer();
         clearRelayWatchdog();
         clearBridgeStatusHeartbeat();
+      }, {
+        exitCode: closeCode === CLOSE_CODE_MAC_UNAUTHORIZED ? 1 : 0,
       });
       return;
     }
@@ -421,18 +432,19 @@ function startBridge({
       markRelayActivity();
     });
 
-    nextSocket.on("close", (code) => {
+    nextSocket.on("close", (code, reason) => {
+      const closeReason = normalizeWebSocketCloseReason(reason);
       if (socket === nextSocket) {
         clearRelayWatchdog();
       }
-      logConnectionStatus("disconnected");
+      logConnectionStatus("disconnected", buildRelayCloseStatusError(code, closeReason));
       if (socket === nextSocket) {
         socket = null;
       }
       stopContextUsageWatcher();
       rolloutLiveMirror?.stopAll();
       desktopRefresher.handleTransportReset();
-      scheduleRelayReconnect(code);
+      scheduleRelayReconnect(code, closeReason);
     });
 
     nextSocket.on("error", () => {
@@ -473,12 +485,13 @@ function startBridge({
   codex.onClose(() => {
     clearRelayWatchdog();
     clearBridgeStatusHeartbeat();
-    logConnectionStatus("disconnected");
+    const lastError = lastConnectionError || "";
+    logConnectionStatus("disconnected", lastError);
     publishBridgeStatus({
       state: "stopped",
       connectionStatus: "disconnected",
       pid: process.pid,
-      lastError: "",
+      lastError,
     });
     isShuttingDown = true;
     bridgeWakeAssertion.stop();
@@ -1281,7 +1294,7 @@ function buildMacRegistration(deviceState, pairingSession) {
   };
 }
 
-function shutdown(codex, getSocket, beforeExit = () => {}) {
+function shutdown(codex, getSocket, beforeExit = () => {}, { exitCode = 0 } = {}) {
   beforeExit();
 
   const socket = getSocket();
@@ -1291,7 +1304,41 @@ function shutdown(codex, getSocket, beforeExit = () => {}) {
 
   codex.shutdown();
 
-  setTimeout(() => process.exit(0), 100);
+  setTimeout(() => process.exit(exitCode), 100);
+}
+
+function isTerminalRelayCloseCode(closeCode) {
+  return closeCode === CLOSE_CODE_INVALID_RELAY_REQUEST
+    || closeCode === CLOSE_CODE_REPLACED_BY_NEW_MAC
+    || closeCode === CLOSE_CODE_MAC_UNAUTHORIZED;
+}
+
+function normalizeWebSocketCloseReason(reason) {
+  if (typeof reason === "string") {
+    return reason.trim();
+  }
+
+  if (Buffer.isBuffer(reason)) {
+    return reason.toString("utf8").trim();
+  }
+
+  return "";
+}
+
+function buildRelayCloseStatusError(closeCode, closeReason = "") {
+  if (!Number.isInteger(closeCode) || closeCode === 1000 || closeCode === 1005) {
+    return "";
+  }
+
+  const normalizedReason = normalizeNonEmptyString(closeReason);
+  if (closeCode === CLOSE_CODE_MAC_UNAUTHORIZED) {
+    return normalizedReason
+      || "Relay authorization failed. Set REMODEX_RELAY_ACCESS_TOKEN or use a relay that does not require a Mac access token.";
+  }
+
+  return normalizedReason
+    ? `Relay closed the connection (${closeCode}): ${normalizedReason}`
+    : `Relay closed the connection (${closeCode}).`;
 }
 
 function extractBridgeMessageContext(rawMessage) {
@@ -2103,10 +2150,12 @@ function persistBridgePreferences(
 
 module.exports = {
   buildHeartbeatBridgeStatus,
+  buildRelayCloseStatusError,
   buildRelayAccessTokenHeaders,
   buildRelayUserAgentHeader,
   createMacOSBridgeWakeAssertion,
   hasRelayConnectionGoneStale,
+  isTerminalRelayCloseCode,
   persistBridgePreferences,
   sanitizeLiveGeneratedImageMessageForRelay,
   sanitizeThreadHistoryImagesForRelay,

package/src/package-version-status.js

@@ -10,7 +10,7 @@ const { version: installedVersion = "" } = require("../package.json");
 const DEFAULT_CACHE_TTL_MS = 30 * 60 * 1000;
 const DEFAULT_EMPTY_CACHE_RETRY_MS = 60 * 1000;
 const DEFAULT_INITIAL_FETCH_WAIT_MS = 250;
-const REMODEX_REGISTRY_URL = "https://registry.npmjs.org/remodex/latest";
+const REMODEX_REGISTRY_URL = "https://registry.npmjs.org/@makerbi%2fremodex/latest";
 
 function createBridgePackageVersionStatusReader({
   cacheTtlMs = DEFAULT_CACHE_TTL_MS,