@nextclaw/remote 0.1.35 → 0.1.37

package/dist/index.d.ts

@@ -199,12 +199,20 @@ declare class RemoteServiceModule {
     private readonly deps;
     private abortController;
     private runTask;
+    private releaseOwnership;
     constructor(deps: {
         loadConfig: () => Config;
         uiEnabled: boolean;
         localOrigin: string;
         statusStore: RemoteStatusWriter;
         createConnector: (logger: RemoteLogger) => RemoteConnector;
+        claimOwnership?: () => {
+            ok: true;
+            release: () => void;
+        } | {
+            ok: false;
+            error: string;
+        };
         logger?: RemoteLogger;
     });
     start(): Promise<void> | null;

package/dist/index.js

@@ -714,6 +714,9 @@ var TERMINAL_REMOTE_ERROR_PATTERNS = [
   /token expired/i,
   /token is invalid/i,
   /run "nextclaw login"/i,
+  /replaced by a newer connector session/i,
+  /already owned by (?:running )?nextclaw service/i,
+  /already owned by local nextclaw process/i,
   /unexpected server response:\s*400/i,
   /unexpected server response:\s*401/i,
   /unexpected server response:\s*403/i,
@@ -725,6 +728,26 @@ function isTerminalRemoteConnectorError(error) {
   const message = error instanceof Error ? error.message : String(error);
   return TERMINAL_REMOTE_ERROR_PATTERNS.some((pattern) => pattern.test(message));
 }
+function describeUnexpectedRemoteConnectorClose(event) {
+  const code = typeof event.code === "number" && Number.isFinite(event.code) ? event.code : null;
+  const reason = typeof event.reason === "string" ? event.reason.trim() : "";
+  const wasClean = typeof event.wasClean === "boolean" ? event.wasClean : null;
+  if ((code === null || code === 1e3) && !reason) {
+    return null;
+  }
+  const detailParts = [];
+  if (code !== null) {
+    detailParts.push(`code ${code}`);
+  }
+  if (wasClean !== null) {
+    detailParts.push(wasClean ? "clean" : "unclean");
+  }
+  const detail = detailParts.length > 0 ? ` (${detailParts.join(", ")})` : "";
+  if (reason) {
+    return `Remote connector websocket closed${detail}: ${reason}`;
+  }
+  return `Remote connector websocket closed${detail}.`;
+}
 
 // src/remote-connector-retry.utils.ts
 var BASE_RECONNECT_DELAY_MS = 3e3;
@@ -852,8 +875,13 @@ var RemoteConnector = class {
           socket
         });
       });
-      socket.addEventListener("close", () => {
+      socket.addEventListener("close", (event) => {
         appAdapter.stop();
+        const closeMessage = describeUnexpectedRemoteConnectorClose(event ?? {});
+        if (!aborted && closeMessage) {
+          finishReject(new Error(closeMessage));
+          return;
+        }
         finishResolve(aborted ? "aborted" : "closed");
       });
       socket.addEventListener("error", (event) => {
@@ -1109,6 +1137,7 @@ var RemoteServiceModule = class {
   }
   abortController = null;
   runTask = null;
+  releaseOwnership = null;
   start() {
     if (this.runTask) {
       return this.runTask;
@@ -1135,6 +1164,22 @@ var RemoteServiceModule = class {
       warn: (message) => console.warn(`[remote] ${message}`),
       error: (message) => console.error(`[remote] ${message}`)
     };
+    const ownership = this.deps.claimOwnership?.();
+    if (ownership && !ownership.ok) {
+      this.deps.statusStore.write({
+        enabled: true,
+        state: "error",
+        deviceName: config.remote.deviceName || void 0,
+        deviceId: void 0,
+        platformBase: config.remote.platformApiBase || void 0,
+        localOrigin: this.deps.localOrigin,
+        lastError: ownership.error,
+        lastConnectedAt: null
+      });
+      logger.error(ownership.error);
+      return null;
+    }
+    this.releaseOwnership = ownership?.release ?? null;
     this.abortController = new AbortController();
     const connector = this.deps.createConnector(logger);
     this.runTask = connector.run({
@@ -1157,6 +1202,9 @@ var RemoteServiceModule = class {
         lastError: message
       });
       logger.error(message);
+    }).finally(() => {
+      this.releaseOwnership?.();
+      this.releaseOwnership = null;
     });
     return this.runTask;
   }
@@ -1172,6 +1220,8 @@ var RemoteServiceModule = class {
     } finally {
       this.abortController = null;
       this.runTask = null;
+      this.releaseOwnership?.();
+      this.releaseOwnership = null;
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/remote",
-  "version": "0.1.35",
+  "version": "0.1.37",
   "private": false,
   "description": "Remote access runtime for NextClaw device registration, relay bridging, and service-managed connectivity.",
   "type": "module",
@@ -30,8 +30,8 @@
   "dependencies": {
     "commander": "^12.1.0",
     "ws": "^8.18.0",
-    "@nextclaw/server": "0.10.41",
-    "@nextclaw/core": "0.9.12"
+    "@nextclaw/core": "0.11.0",
+    "@nextclaw/server": "0.10.43"
   },
   "devDependencies": {
     "@types/node": "^20.17.6",