@dxos/edge-client 0.8.1 → 0.8.2-main.10c050d

package/dist/lib/browser/index.mjs

@@ -1,17 +1,21 @@
 import {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
   Protocol,
+  WebSocketMuxer,
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-ZWJXA37R.mjs";
+} from "./chunk-VHS3XEIX.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 } from "@dxos/async";
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
 import { log as log2, logInfo as logInfo2 } from "@dxos/log";
+import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 
 // packages/core/mesh/edge-client/src/edge-identity.ts
 import { invariant } from "@dxos/invariant";
@@ -59,6 +63,7 @@ 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 { EdgeWebsocketProtocol } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 function _ts_decorate(decorators, target, key, desc) {
@@ -70,13 +75,9 @@ function _ts_decorate(decorators, target, key, desc) {
 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;
+    super(), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks;
   }
   get info() {
     return {
@@ -88,47 +89,73 @@ var EdgeWsConnection = class extends Resource {
   send(message) {
     invariant2(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 54,
+      L: 52,
       S: this,
       A: [
         "this._ws",
         ""
       ]
     });
+    invariant2(this._wsMuxer, void 0, {
+      F: __dxlog_file2,
+      L: 53,
+      S: this,
+      A: [
+        "this._wsMuxer",
+        ""
+      ]
+    });
     log("sending...", {
       peerKey: this._identity.peerKey,
       payload: protocol.getPayloadType(message)
     }, {
       F: __dxlog_file2,
-      L: 55,
+      L: 54,
       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)
-      }, {
+    if (this._ws?.protocol.includes(EdgeWebsocketProtocol.V0)) {
+      const binary = buf.toBinary(MessageSchema, message);
+      if (binary.length > CLOUDFLARE_MESSAGE_MAX_BYTES) {
+        log.error("Message dropped because it was too large (>1MB).", {
+          byteLength: binary.byteLength,
+          serviceId: message.serviceId,
+          payload: protocol.getPayloadType(message)
+        }, {
+          F: __dxlog_file2,
+          L: 58,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      this._ws.send(binary);
+    } else {
+      this._wsMuxer.send(message).catch((e) => log.catch(e, void 0, {
         F: __dxlog_file2,
-        L: 58,
+        L: 67,
         S: this,
         C: (f, a) => f(...a)
-      });
-      return;
+      }));
     }
-    this._ws.send(encoded);
   }
   async _open() {
+    const baseProtocols = [
+      ...Object.values(EdgeWebsocketProtocol)
+    ];
     this._ws = new WebSocket(this._connectionInfo.url.toString(), this._connectionInfo.protocolHeader ? [
+      ...baseProtocols,
       this._connectionInfo.protocolHeader
-    ] : []);
+    ] : [
+      ...baseProtocols
+    ]);
+    const muxer = new WebSocketMuxer(this._ws);
+    this._wsMuxer = muxer;
     this._ws.onopen = () => {
       if (this.isOpen) {
         log("connected", void 0, {
           F: __dxlog_file2,
-          L: 76,
+          L: 84,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -139,7 +166,7 @@ var EdgeWsConnection = class extends Resource {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file2,
-          L: 80,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -152,11 +179,12 @@ var EdgeWsConnection = class extends Resource {
           reason: event.reason
         }, {
           F: __dxlog_file2,
-          L: 85,
+          L: 93,
           S: this,
           C: (f, a) => f(...a)
         });
         this._callbacks.onRestartRequired();
+        muxer.destroy();
       }
     };
     this._ws.onerror = (event) => {
@@ -166,7 +194,7 @@ var EdgeWsConnection = class extends Resource {
           info: event.message
         }, {
           F: __dxlog_file2,
-          L: 91,
+          L: 100,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -176,7 +204,7 @@ var EdgeWsConnection = class extends Resource {
           error: event.error
         }, {
           F: __dxlog_file2,
-          L: 94,
+          L: 103,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -188,7 +216,7 @@ var EdgeWsConnection = class extends Resource {
           event: event.type
         }, {
           F: __dxlog_file2,
-          L: 102,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -198,15 +226,18 @@ var EdgeWsConnection = class extends Resource {
         this._rescheduleHeartbeatTimeout();
         return;
       }
-      const data = await toUint8Array(event.data);
-      if (this.isOpen) {
-        const message = buf.fromBinary(MessageSchema, data);
+      const bytes = await toUint8Array(event.data);
+      if (!this.isOpen) {
+        return;
+      }
+      const message = this._ws?.protocol?.includes(EdgeWebsocketProtocol.V0) ? buf.fromBinary(MessageSchema, bytes) : muxer.receiveData(bytes);
+      if (message) {
         log("received", {
           from: message.source,
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file2,
-          L: 112,
+          L: 128,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -220,6 +251,8 @@ var EdgeWsConnection = class extends Resource {
     try {
       this._ws?.close();
       this._ws = void 0;
+      this._wsMuxer?.destroy();
+      this._wsMuxer = void 0;
     } catch (err) {
       if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
         return;
@@ -228,7 +261,7 @@ var EdgeWsConnection = class extends Resource {
         err
       }, {
         F: __dxlog_file2,
-        L: 128,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -237,7 +270,7 @@ var EdgeWsConnection = class extends Resource {
   _scheduleHeartbeats() {
     invariant2(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 133,
+      L: 151,
       S: this,
       A: [
         "this._ws",
@@ -257,13 +290,13 @@ var EdgeWsConnection = class extends Resource {
     void this._inactivityTimeoutCtx?.dispose();
     this._inactivityTimeoutCtx = new Context(void 0, {
       F: __dxlog_file2,
-      L: 152
+      L: 170
     });
     scheduleTask(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
         log.warn("restart due to inactivity timeout", void 0, {
           F: __dxlog_file2,
-          L: 157,
+          L: 175,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -307,30 +340,23 @@ var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/
 var DEFAULT_TIMEOUT = 1e4;
 var EdgeClient = class extends Resource2 {
   constructor(_identity, _config) {
-    super();
-    this._identity = _identity;
-    this._config = _config;
-    this._persistentLifecycle = new PersistentLifecycle({
+    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)
-    });
-    this._messageListeners = /* @__PURE__ */ new Set();
-    this._reconnectListeners = /* @__PURE__ */ new Set();
-    this._currentConnection = void 0;
-    this._ready = new Trigger();
-    this._isActive = (connection) => connection === this._currentConnection;
+    }), this._messageListeners = /* @__PURE__ */ new Set(), this._reconnectListeners = /* @__PURE__ */ new Set(), this._currentConnection = void 0, this._ready = new Trigger(), this._isActive = (connection) => connection === this._currentConnection;
     this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
     this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
   }
   get info() {
     return {
       open: this.isOpen,
+      status: this.status,
       identity: this._identity.identityKey,
       device: this._identity.peerKey
     };
   }
-  get isConnected() {
-    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED;
+  get status() {
+    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED ? EdgeStatus.CONNECTED : EdgeStatus.NOT_CONNECTED;
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -345,13 +371,13 @@ var EdgeClient = class extends Resource2 {
         oldIdentity: this._identity
       }, {
         F: __dxlog_file3,
-        L: 94,
+        L: 99,
         S: this,
         C: (f, a) => f(...a)
       });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
-      this._persistentLifecycle.scheduleRestart();
+      void this._persistentLifecycle.scheduleRestart();
     }
   }
   onMessage(listener) {
@@ -368,7 +394,7 @@ var EdgeClient = class extends Resource2 {
           } catch (error) {
             log2.catch(error, void 0, {
               F: __dxlog_file3,
-              L: 116,
+              L: 121,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -386,7 +412,7 @@ var EdgeClient = class extends Resource2 {
       info: this.info
     }, {
       F: __dxlog_file3,
-      L: 128,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -395,7 +421,7 @@ var EdgeClient = class extends Resource2 {
         err
       }, {
         F: __dxlog_file3,
-        L: 130,
+        L: 135,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -409,7 +435,7 @@ var EdgeClient = class extends Resource2 {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file3,
-      L: 138,
+      L: 143,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -426,7 +452,7 @@ var EdgeClient = class extends Resource2 {
     if (this._identity !== identity) {
       log2("identity changed during auth header request", void 0, {
         F: __dxlog_file3,
-        L: 152,
+        L: 157,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -439,7 +465,7 @@ var EdgeClient = class extends Resource2 {
       protocolHeader
     }, {
       F: __dxlog_file3,
-      L: 158,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -454,7 +480,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.verbose("connected callback ignored, because connection is not active", void 0, {
             F: __dxlog_file3,
-            L: 168,
+            L: 173,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -463,11 +489,11 @@ var EdgeClient = class extends Resource2 {
       onRestartRequired: () => {
         if (this._isActive(connection)) {
           this._closeCurrentConnection();
-          this._persistentLifecycle.scheduleRestart();
+          void this._persistentLifecycle.scheduleRestart();
         } else {
           log2.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file3,
-            L: 176,
+            L: 181,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -483,7 +509,7 @@ var EdgeClient = class extends Resource2 {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file3,
-            L: 184,
+            L: 189,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -502,13 +528,16 @@ var EdgeClient = class extends Resource2 {
   }
   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();
@@ -517,7 +546,7 @@ var EdgeClient = class extends Resource2 {
           err
         }, {
           F: __dxlog_file3,
-          L: 217,
+          L: 225,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -534,7 +563,7 @@ var EdgeClient = class extends Resource2 {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 227,
+          L: 235,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -549,7 +578,7 @@ var EdgeClient = class extends Resource2 {
     if (this._ready.state !== TriggerState.RESOLVED) {
       log2("waiting for websocket to become ready", void 0, {
         F: __dxlog_file3,
-        L: 238,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -579,7 +608,7 @@ var EdgeClient = class extends Resource2 {
         statusText: response.statusText
       }, {
         F: __dxlog_file3,
-        L: 263,
+        L: 271,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -786,7 +815,6 @@ var EdgeHttpClient = class {
   async uploadFunction(pathParts, body, args) {
     const path = [
       "functions",
-      pathParts.spaceId,
       ...pathParts.functionId ? [
         pathParts.functionId
       ] : []
@@ -985,11 +1013,14 @@ var encodeAuthHeader = (challenge) => {
   return `VerifiablePresentation pb;base64,${encodedChallenge}`;
 };
 export {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
   EdgeClient,
   EdgeConnectionClosedError,
   EdgeHttpClient,
   EdgeIdentityChangedError,
   Protocol,
+  WebSocketMuxer,
   createChainEdgeIdentity,
   createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity,