@ai-matrx/desktop-protocol 0.5.0 → 0.7.0

package/dist/client.d.cts

@@ -1,8 +1,8 @@
 import { BackoffOptions } from '@ai-matrx/realtime';
 export { RECONNECT_ALARM_ATTEMPTS } from '@ai-matrx/realtime';
 import { z } from 'zod';
-import { W as Welcome, D as DesktopProtocolError, O as OpName, a as OpParams, b as OpResult, c as OPS, S as StreamMeta, E as EndReason, d as EVENTS, C as ClientType } from './registry-BeY9D7h0.cjs';
-export { i as isDesktopProtocolError } from './registry-BeY9D7h0.cjs';
+import { W as Welcome, D as DesktopProtocolError, C as CloseOutcome, O as OpName, a as OpParams, b as OpResult, c as OPS, S as StreamMeta, E as EndReason, d as EVENTS, e as ClientType } from './registry-Duc_VFN8.cjs';
+export { i as isDesktopProtocolError } from './registry-Duc_VFN8.cjs';
 import { FrameHeader } from './frame.cjs';
 
 /** The subset of the WHATWG WebSocket the client uses — browser, React Native, `ws` and Workers all fit. */
@@ -49,6 +49,8 @@ interface DesktopClientState {
     retryInMs: number | null;
     lastError: DesktopProtocolError | null;
     lastCloseCode: number | null;
+    /** Why dialing stopped, when the far side refused us for good (CLOSE_RULES); null otherwise. */
+    outcome: CloseOutcome | null;
 }
 type DesktopClientDiagnostic = {
     kind: "malformed_message";

package/dist/client.d.ts

@@ -1,8 +1,8 @@
 import { BackoffOptions } from '@ai-matrx/realtime';
 export { RECONNECT_ALARM_ATTEMPTS } from '@ai-matrx/realtime';
 import { z } from 'zod';
-import { W as Welcome, D as DesktopProtocolError, O as OpName, a as OpParams, b as OpResult, c as OPS, S as StreamMeta, E as EndReason, d as EVENTS, C as ClientType } from './registry-BeY9D7h0.js';
-export { i as isDesktopProtocolError } from './registry-BeY9D7h0.js';
+import { W as Welcome, D as DesktopProtocolError, C as CloseOutcome, O as OpName, a as OpParams, b as OpResult, c as OPS, S as StreamMeta, E as EndReason, d as EVENTS, e as ClientType } from './registry-Duc_VFN8.js';
+export { i as isDesktopProtocolError } from './registry-Duc_VFN8.js';
 import { FrameHeader } from './frame.js';
 
 /** The subset of the WHATWG WebSocket the client uses — browser, React Native, `ws` and Workers all fit. */
@@ -49,6 +49,8 @@ interface DesktopClientState {
     retryInMs: number | null;
     lastError: DesktopProtocolError | null;
     lastCloseCode: number | null;
+    /** Why dialing stopped, when the far side refused us for good (CLOSE_RULES); null otherwise. */
+    outcome: CloseOutcome | null;
 }
 type DesktopClientDiagnostic = {
     kind: "malformed_message";

package/dist/client.js

@@ -281,6 +281,29 @@ var CloseCode = {
 };
 var CloseCodeValue = z3.literal([1e3, 1001, 1006, 1012, 1013, 4001, 4003, 4004, 4008, 4009, 4010, 4400, 4426]);
 
+// src/close-policy.ts
+var CLOSE_RULES = {
+  [CloseCode.NORMAL]: { action: "reconnect", error: ["DEVICE_OFFLINE", "Connection closed"] },
+  [CloseCode.GOING_AWAY]: { action: "reconnect_now", error: ["DEVICE_OFFLINE", "Connection lost"] },
+  [CloseCode.ABNORMAL]: { action: "reconnect_now", error: ["DEVICE_OFFLINE", "Connection lost"] },
+  [CloseCode.DEVICE_RECONNECTED]: { action: "reconnect_now", error: ["DEVICE_OFFLINE", "Device reconnected"] },
+  [CloseCode.TRY_AGAIN_LATER]: { action: "reconnect", error: ["DEVICE_OFFLINE", "Relay busy; retrying"] },
+  [CloseCode.AUTH_INVALID]: { action: "reauth", outcome: "signed_out", error: ["AUTH_INVALID", "Sign-in was not accepted"] },
+  [CloseCode.AUTH_FORBIDDEN]: { action: "stop", outcome: "not_owned", error: ["AUTH_FORBIDDEN", "Not this device's owner"] },
+  [CloseCode.DEVICE_NOT_FOUND]: { action: "stop", outcome: "removed", error: ["NOT_FOUND", "Device not found"] },
+  [CloseCode.AUTH_EXPIRED]: { action: "reauth", outcome: "signed_out", error: ["AUTH_EXPIRED", "Sign-in expired"] },
+  [CloseCode.REPLACED]: { action: "stop", outcome: "replaced", error: ["CONFLICT", "Replaced by a newer connection"] },
+  [CloseCode.DEVICE_REVOKED]: { action: "stop", outcome: "revoked", error: ["AUTH_DEVICE_REVOKED", "This device was revoked"] },
+  // A malformed message, or a connection the relay lost track of: a fresh socket starts clean.
+  [CloseCode.PROTOCOL_ERROR]: { action: "reconnect", error: ["PROTOCOL_ERROR", "Connection reset by the relay"] },
+  [CloseCode.UPGRADE_REQUIRED]: { action: "stop", outcome: "upgrade_required", error: ["PROTOCOL_VERSION_UNSUPPORTED", "Protocol upgrade required"] }
+};
+var UNKNOWN = { action: "reconnect", error: ["DEVICE_OFFLINE", "Connection lost"] };
+function closeRule(code) {
+  if (code === null || code === void 0) return CLOSE_RULES[CloseCode.ABNORMAL];
+  return CLOSE_RULES[code] ?? UNKNOWN;
+}
+
 // src/schema/frame.ts
 import { z as z4 } from "zod";
 var FrameHeader = z4.strictObject({
@@ -616,7 +639,11 @@ var SessionControlChangedEvent = z8.strictObject({ controller_client_id: z8.stri
 import { z as z9 } from "zod";
 var RelayDeviceStatusEvent = z9.strictObject({
   online: z9.boolean(),
-  since_ms: epochMs,
+  /**
+   * When the device last went online/offline; null = it has never connected (since 1.1 —
+   * NULL_SINCE: a 1.0 reader is sent 0, its old meaning).
+   */
+  since_ms: epochMs.nullable(),
   app_version: z9.string().max(32).nullable(),
   protocol_version: ProtocolVersion.nullable()
 });
@@ -698,13 +725,6 @@ var EVENTS = {
 
 // src/client/client.ts
 var WS_OPEN = 1;
-var TERMINAL_CLOSE = /* @__PURE__ */ new Map([
-  [CloseCode.DEVICE_REVOKED, ["AUTH_DEVICE_REVOKED", "This device was revoked"]],
-  [CloseCode.AUTH_FORBIDDEN, ["AUTH_FORBIDDEN", "Not this device's owner"]],
-  [CloseCode.DEVICE_NOT_FOUND, ["NOT_FOUND", "Device not found"]],
-  [CloseCode.REPLACED, ["CONFLICT", "Replaced by a newer connection"]],
-  [CloseCode.UPGRADE_REQUIRED, ["PROTOCOL_VERSION_UNSUPPORTED", "Protocol upgrade required"]]
-]);
 var defaultTimers = {
   setTimeout: (fn, ms) => globalThis.setTimeout(fn, ms),
   clearTimeout: (handle) => globalThis.clearTimeout(handle),
@@ -747,8 +767,10 @@ function createDesktopClient(options) {
     attempts: 0,
     retryInMs: null,
     lastError: null,
-    lastCloseCode: null
+    lastCloseCode: null,
+    outcome: null
   };
+  let authRefusals = 0;
   const listeners = /* @__PURE__ */ new Set();
   const readyWaiters = /* @__PURE__ */ new Set();
   const pending = /* @__PURE__ */ new Map();
@@ -783,6 +805,7 @@ function createDesktopClient(options) {
   }
   function connect() {
     if (state.status === "connecting" || state.status === "handshaking" || state.status === "open") return;
+    if (state.status === "closed" || state.status === "idle") authRefusals = 0;
     closedByUser = false;
     if (reconnectTimer !== null) {
       timers.clearTimeout(reconnectTimer);
@@ -864,8 +887,11 @@ function createDesktopClient(options) {
       timers.clearTimeout(probeTimer);
       probeTimer = null;
     }
-    const terminal = code === null ? void 0 : TERMINAL_CLOSE.get(code);
-    const lost = error ?? (terminal ? new DesktopProtocolError(terminal[0], terminal[1]) : new DesktopProtocolError("DEVICE_OFFLINE", "Connection lost", { retryable: true }));
+    const rule = code === null ? null : closeRule(code);
+    if (rule?.action === "reauth") authRefusals++;
+    const stopped = rule !== null && (rule.action === "stop" || rule.action === "reauth" && authRefusals >= 2);
+    const terminal = stopped && rule ? rule : void 0;
+    const lost = error ?? (terminal ? new DesktopProtocolError(terminal.error[0], terminal.error[1]) : rule && rule.action === "reauth" ? new DesktopProtocolError(rule.error[0], rule.error[1], { retryable: true }) : new DesktopProtocolError("DEVICE_OFFLINE", "Connection lost", { retryable: true }));
     for (const [id, p] of pending) {
       pending.delete(id);
       p.cleanup();
@@ -882,7 +908,14 @@ function createDesktopClient(options) {
       endStream(s, null, lost);
     }
     if (closedByUser || terminal) {
-      setState({ status: "closed", welcome: null, lastError: closedByUser ? state.lastError : lost, lastCloseCode: code, retryInMs: null });
+      setState({
+        status: "closed",
+        welcome: null,
+        lastError: closedByUser ? state.lastError : lost,
+        lastCloseCode: code,
+        retryInMs: null,
+        outcome: closedByUser ? null : terminal?.outcome ?? null
+      });
       rejectReadyWaiters(lost);
       return;
     }
@@ -1036,7 +1069,8 @@ function createDesktopClient(options) {
     }
     helloId = null;
     backoff.markConnected();
-    setState({ status: "open", welcome: welcome.data, attempts: 0, retryInMs: null, lastError: null });
+    authRefusals = 0;
+    setState({ status: "open", welcome: welcome.data, attempts: 0, retryInMs: null, lastError: null, outcome: null });
     for (const w of [...readyWaiters]) {
       readyWaiters.delete(w);
       w.resolve(welcome.data);