@dxos/edge-client 0.8.2-main.f11618f → 0.8.2-staging.7ac8446

package/dist/lib/browser/index.mjs

@@ -1,21 +1,17 @@
 import {
-  CLOUDFLARE_MESSAGE_LENGTH_LIMIT,
-  EdgeWsConnection,
   Protocol,
-  WebSocketMuxer,
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-5DDWS5EC.mjs";
+} from "./chunk-ZWJXA37R.mjs";
 
 // packages/core/mesh/edge-client/src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
 // packages/core/mesh/edge-client/src/edge-client.ts
-import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from "@dxos/async";
-import { Resource } from "@dxos/context";
-import { log, logInfo } from "@dxos/log";
-import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } from "@dxos/async";
+import { Resource as Resource2 } from "@dxos/context";
+import { log as log2, logInfo as logInfo2 } from "@dxos/log";
 
 // packages/core/mesh/edge-client/src/edge-identity.ts
 import { invariant } from "@dxos/invariant";
@@ -57,6 +53,229 @@ var handleAuthChallenge = async (failedResponse, identity) => {
   return schema.getCodecForType("dxos.halo.credentials.Presentation").encode(presentation);
 };
 
+// packages/core/mesh/edge-client/src/edge-ws-connection.ts
+import WebSocket from "isomorphic-ws";
+import { scheduleTask, scheduleTaskInterval } from "@dxos/async";
+import { Context, Resource } from "@dxos/context";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { log, logInfo } from "@dxos/log";
+import { buf } from "@dxos/protocols/buf";
+import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
+var SIGNAL_KEEPALIVE_INTERVAL = 4e3;
+var SIGNAL_KEEPALIVE_TIMEOUT = 12e3;
+var CLOUDFLARE_MESSAGE_LENGTH_LIMIT = 1024 * 1024;
+var EdgeWsConnection = class extends Resource {
+  constructor(_identity, _connectionInfo, _callbacks) {
+    super();
+    this._identity = _identity;
+    this._connectionInfo = _connectionInfo;
+    this._callbacks = _callbacks;
+  }
+  get info() {
+    return {
+      open: this.isOpen,
+      identity: this._identity.identityKey,
+      device: this._identity.peerKey
+    };
+  }
+  send(message) {
+    invariant2(this._ws, void 0, {
+      F: __dxlog_file2,
+      L: 54,
+      S: this,
+      A: [
+        "this._ws",
+        ""
+      ]
+    });
+    log("sending...", {
+      peerKey: this._identity.peerKey,
+      payload: protocol.getPayloadType(message)
+    }, {
+      F: __dxlog_file2,
+      L: 55,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const encoded = buf.toBinary(MessageSchema, message);
+    if (encoded.byteLength >= CLOUDFLARE_MESSAGE_LENGTH_LIMIT) {
+      log.error("edge message dropped due to websocket message limit", {
+        byteLength: encoded.byteLength,
+        serviceId: message.serviceId,
+        payload: protocol.getPayloadType(message)
+      }, {
+        F: __dxlog_file2,
+        L: 58,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    this._ws.send(encoded);
+  }
+  async _open() {
+    this._ws = new WebSocket(this._connectionInfo.url.toString(), this._connectionInfo.protocolHeader ? [
+      this._connectionInfo.protocolHeader
+    ] : []);
+    this._ws.onopen = () => {
+      if (this.isOpen) {
+        log("connected", void 0, {
+          F: __dxlog_file2,
+          L: 76,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onConnected();
+        this._scheduleHeartbeats();
+      } else {
+        log.verbose("connected after becoming inactive", {
+          currentIdentity: this._identity
+        }, {
+          F: __dxlog_file2,
+          L: 80,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    };
+    this._ws.onclose = (event) => {
+      if (this.isOpen) {
+        log.warn("disconnected while being open", {
+          code: event.code,
+          reason: event.reason
+        }, {
+          F: __dxlog_file2,
+          L: 85,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onRestartRequired();
+      }
+    };
+    this._ws.onerror = (event) => {
+      if (this.isOpen) {
+        log.warn("edge connection socket error", {
+          error: event.error,
+          info: event.message
+        }, {
+          F: __dxlog_file2,
+          L: 91,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onRestartRequired();
+      } else {
+        log.verbose("error ignored on closed connection", {
+          error: event.error
+        }, {
+          F: __dxlog_file2,
+          L: 94,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    };
+    this._ws.onmessage = async (event) => {
+      if (!this.isOpen) {
+        log.verbose("message ignored on closed connection", {
+          event: event.type
+        }, {
+          F: __dxlog_file2,
+          L: 102,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      if (event.data === "__pong__") {
+        this._rescheduleHeartbeatTimeout();
+        return;
+      }
+      const data = await toUint8Array(event.data);
+      if (this.isOpen) {
+        const message = buf.fromBinary(MessageSchema, data);
+        log("received", {
+          from: message.source,
+          payload: protocol.getPayloadType(message)
+        }, {
+          F: __dxlog_file2,
+          L: 112,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onMessage(message);
+      }
+    };
+  }
+  async _close() {
+    void this._inactivityTimeoutCtx?.dispose().catch(() => {
+    });
+    try {
+      this._ws?.close();
+      this._ws = void 0;
+    } catch (err) {
+      if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
+        return;
+      }
+      log.warn("Error closing websocket", {
+        err
+      }, {
+        F: __dxlog_file2,
+        L: 128,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _scheduleHeartbeats() {
+    invariant2(this._ws, void 0, {
+      F: __dxlog_file2,
+      L: 133,
+      S: this,
+      A: [
+        "this._ws",
+        ""
+      ]
+    });
+    scheduleTaskInterval(this._ctx, async () => {
+      this._ws?.send("__ping__");
+    }, SIGNAL_KEEPALIVE_INTERVAL);
+    this._ws.send("__ping__");
+    this._rescheduleHeartbeatTimeout();
+  }
+  _rescheduleHeartbeatTimeout() {
+    if (!this.isOpen) {
+      return;
+    }
+    void this._inactivityTimeoutCtx?.dispose();
+    this._inactivityTimeoutCtx = new Context(void 0, {
+      F: __dxlog_file2,
+      L: 152
+    });
+    scheduleTask(this._inactivityTimeoutCtx, () => {
+      if (this.isOpen) {
+        log.warn("restart due to inactivity timeout", void 0, {
+          F: __dxlog_file2,
+          L: 157,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._callbacks.onRestartRequired();
+      }
+    }, SIGNAL_KEEPALIVE_TIMEOUT);
+  }
+};
+_ts_decorate([
+  logInfo
+], EdgeWsConnection.prototype, "info", null);
+
 // packages/core/mesh/edge-client/src/errors.ts
 var EdgeConnectionClosedError = class extends Error {
   constructor() {
@@ -78,20 +297,19 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
 };
 
 // packages/core/mesh/edge-client/src/edge-client.ts
-function _ts_decorate(decorators, target, key, desc) {
+function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
-var EdgeClient = class extends Resource {
+var EdgeClient = class extends Resource2 {
   constructor(_identity, _config) {
     super();
     this._identity = _identity;
     this._config = _config;
-    this.statusChanged = new Event();
     this._persistentLifecycle = new PersistentLifecycle({
       start: async () => this._connect(),
       stop: async (state) => this._disconnect(state)
@@ -107,13 +325,12 @@ var EdgeClient = class extends Resource {
   get info() {
     return {
       open: this.isOpen,
-      status: this.status,
       identity: this._identity.identityKey,
       device: this._identity.peerKey
     };
   }
-  get status() {
-    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED ? EdgeStatus.CONNECTED : EdgeStatus.NOT_CONNECTED;
+  get isConnected() {
+    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED;
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -123,18 +340,18 @@ var EdgeClient = class extends Resource {
   }
   setIdentity(identity) {
     if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
-      log("Edge identity changed", {
+      log2("Edge identity changed", {
         identity,
         oldIdentity: this._identity
       }, {
-        F: __dxlog_file2,
-        L: 99,
+        F: __dxlog_file3,
+        L: 94,
         S: this,
         C: (f, a) => f(...a)
       });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
-      void this._persistentLifecycle.scheduleRestart();
+      this._persistentLifecycle.scheduleRestart();
     }
   }
   onMessage(listener) {
@@ -149,9 +366,9 @@ var EdgeClient = class extends Resource {
           try {
             listener();
           } catch (error) {
-            log.catch(error, void 0, {
-              F: __dxlog_file2,
-              L: 121,
+            log2.catch(error, void 0, {
+              F: __dxlog_file3,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -165,20 +382,20 @@ var EdgeClient = class extends Resource {
   * Open connection to messaging service.
   */
   async _open() {
-    log("opening...", {
+    log2("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file2,
-      L: 133,
+      F: __dxlog_file3,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
     this._persistentLifecycle.open().catch((err) => {
-      log.warn("Error while opening connection", {
+      log2.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file2,
-        L: 135,
+        F: __dxlog_file3,
+        L: 130,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -188,11 +405,11 @@ var EdgeClient = class extends Resource {
   * Close connection and free resources.
   */
   async _close() {
-    log("closing...", {
+    log2("closing...", {
       peerKey: this._identity.peerKey
     }, {
-      F: __dxlog_file2,
-      L: 143,
+      F: __dxlog_file3,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -207,9 +424,9 @@ var EdgeClient = class extends Resource {
     const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
-      log("identity changed during auth header request", void 0, {
-        F: __dxlog_file2,
-        L: 157,
+      log2("identity changed during auth header request", void 0, {
+        F: __dxlog_file3,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -217,12 +434,12 @@ var EdgeClient = class extends Resource {
     }
     const restartRequired = new Trigger();
     const url = new URL(path, this._baseWsUrl);
-    log("Opening websocket", {
+    log2("Opening websocket", {
       url: url.toString(),
       protocolHeader
     }, {
-      F: __dxlog_file2,
-      L: 163,
+      F: __dxlog_file3,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -235,9 +452,9 @@ var EdgeClient = class extends Resource {
           this._ready.wake();
           this._notifyReconnected();
         } else {
-          log.verbose("connected callback ignored, because connection is not active", void 0, {
-            F: __dxlog_file2,
-            L: 173,
+          log2.verbose("connected callback ignored, because connection is not active", void 0, {
+            F: __dxlog_file3,
+            L: 168,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -246,11 +463,11 @@ var EdgeClient = class extends Resource {
       onRestartRequired: () => {
         if (this._isActive(connection)) {
           this._closeCurrentConnection();
-          void this._persistentLifecycle.scheduleRestart();
+          this._persistentLifecycle.scheduleRestart();
         } else {
-          log.verbose("restart requested by inactive connection", void 0, {
-            F: __dxlog_file2,
-            L: 181,
+          log2.verbose("restart requested by inactive connection", void 0, {
+            F: __dxlog_file3,
+            L: 176,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -261,12 +478,12 @@ var EdgeClient = class extends Resource {
         if (this._isActive(connection)) {
           this._notifyMessageReceived(message);
         } else {
-          log.verbose("ignored a message on inactive connection", {
+          log2.verbose("ignored a message on inactive connection", {
             from: message.source,
             type: message.payload?.typeUrl
           }, {
-            F: __dxlog_file2,
-            L: 189,
+            F: __dxlog_file3,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -285,25 +502,22 @@ var EdgeClient = class extends Resource {
   }
   async _disconnect(state) {
     await state.close();
-    this.statusChanged.emit(this.status);
   }
   _closeCurrentConnection(error = new EdgeConnectionClosedError()) {
     this._currentConnection = void 0;
     this._ready.throw(error);
     this._ready.reset();
-    this.statusChanged.emit(this.status);
   }
   _notifyReconnected() {
-    this.statusChanged.emit(this.status);
     for (const listener of this._reconnectListeners) {
       try {
         listener();
       } catch (err) {
-        log.error("ws reconnect listener failed", {
+        log2.error("ws reconnect listener failed", {
           err
         }, {
-          F: __dxlog_file2,
-          L: 225,
+          F: __dxlog_file3,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -315,12 +529,12 @@ var EdgeClient = class extends Resource {
       try {
         listener(message);
       } catch (err) {
-        log.error("ws incoming message processing failed", {
+        log2.error("ws incoming message processing failed", {
           err,
           payload: protocol.getPayloadType(message)
         }, {
-          F: __dxlog_file2,
-          L: 235,
+          F: __dxlog_file3,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -333,9 +547,9 @@ var EdgeClient = class extends Resource {
   */
   async send(message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
-      log("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file2,
-        L: 246,
+      log2("waiting for websocket to become ready", void 0, {
+        F: __dxlog_file3,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -360,12 +574,12 @@ var EdgeClient = class extends Resource {
     if (response.status === 401) {
       return encodePresentationWsAuthHeader(await handleAuthChallenge(response, this._identity));
     } else {
-      log.warn("no auth challenge from edge", {
+      log2.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
       }, {
-        F: __dxlog_file2,
-        L: 271,
+        F: __dxlog_file3,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -373,8 +587,8 @@ var EdgeClient = class extends Resource {
     }
   }
 };
-_ts_decorate([
-  logInfo
+_ts_decorate2([
+  logInfo2
 ], EdgeClient.prototype, "info", null);
 var encodePresentationWsAuthHeader = (encodedPresentation) => {
   const encodedToken = Buffer.from(encodedPresentation).toString("base64").replace(/=*$/, "").replaceAll("/", "|");
@@ -383,10 +597,10 @@ var encodePresentationWsAuthHeader = (encodedPresentation) => {
 
 // packages/core/mesh/edge-client/src/auth.ts
 import { createCredential, signPresentation } from "@dxos/credentials";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey } from "@dxos/keys";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
     identityKey: key.toHex(),
@@ -430,8 +644,8 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     identityKey: identityKey.toHex(),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
-      invariant2(chain, void 0, {
-        F: __dxlog_file3,
+      invariant3(chain, void 0, {
+        F: __dxlog_file4,
         L: 75,
         S: void 0,
         A: [
@@ -494,20 +708,20 @@ var createStubEdgeIdentity = () => {
 
 // packages/core/mesh/edge-client/src/edge-http-client.ts
 import { sleep } from "@dxos/async";
-import { Context } from "@dxos/context";
-import { log as log2 } from "@dxos/log";
+import { Context as Context2 } from "@dxos/context";
+import { log as log3 } from "@dxos/log";
 import { EdgeCallFailedError, EdgeAuthChallengeError } from "@dxos/protocols";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
 var DEFAULT_RETRY_TIMEOUT = 1500;
 var DEFAULT_RETRY_JITTER = 500;
 var DEFAULT_MAX_RETRIES_COUNT = 3;
 var EdgeHttpClient = class {
   constructor(baseUrl) {
     this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    log2("created", {
+    log3("created", {
       url: this._baseUrl
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 53,
       S: this,
       C: (f, a) => f(...a)
@@ -639,8 +853,8 @@ var EdgeHttpClient = class {
     });
   }
   async _call(path, args) {
-    const requestContext = args.context ?? new Context(void 0, {
-      F: __dxlog_file4,
+    const requestContext = args.context ?? new Context2(void 0, {
+      F: __dxlog_file5,
       L: 192
     });
     const shouldRetry = createRetryHandler(args);
@@ -652,12 +866,12 @@ var EdgeHttpClient = class {
       }
       url += `?${queryParams.toString()}`;
     }
-    log2("call", {
+    log3("call", {
       method: args.method,
       path,
       request: args.body
     }, {
-      F: __dxlog_file4,
+      F: __dxlog_file5,
       L: 204,
       S: this,
       C: (f, a) => f(...a)
@@ -676,11 +890,11 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          log2("unsuccessful edge response", {
+          log3("unsuccessful edge response", {
             path,
             body
           }, {
-            F: __dxlog_file4,
+            F: __dxlog_file5,
             L: 223,
             S: this,
             C: (f, a) => f(...a)
@@ -701,11 +915,11 @@ var EdgeHttpClient = class {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log2("retrying edge request", {
+        log3("retrying edge request", {
           path,
           processingError
         }, {
-          F: __dxlog_file4,
+          F: __dxlog_file5,
           L: 242,
           S: this,
           C: (f, a) => f(...a)
@@ -717,8 +931,8 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      log2.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file4,
+      log3.warn("edge unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file5,
         L: 251,
         S: this,
         C: (f, a) => f(...a)
@@ -727,8 +941,8 @@ var EdgeHttpClient = class {
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
-    log2("auth header updated", void 0, {
-      F: __dxlog_file4,
+    log3("auth header updated", void 0, {
+      F: __dxlog_file5,
       L: 256,
       S: this,
       C: (f, a) => f(...a)
@@ -771,13 +985,11 @@ var encodeAuthHeader = (challenge) => {
   return `VerifiablePresentation pb;base64,${encodedChallenge}`;
 };
 export {
-  CLOUDFLARE_MESSAGE_LENGTH_LIMIT,
   EdgeClient,
   EdgeConnectionClosedError,
   EdgeHttpClient,
   EdgeIdentityChangedError,
   Protocol,
-  WebSocketMuxer,
   createChainEdgeIdentity,
   createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity,