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

package/dist/lib/node/index.cjs

@@ -29,27 +29,31 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
+  CLOUDFLARE_MESSAGE_MAX_BYTES: () => import_chunk_XNHBUTNB.CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES: () => import_chunk_XNHBUTNB.CLOUDFLARE_RPC_MAX_BYTES,
   EdgeClient: () => EdgeClient,
   EdgeConnectionClosedError: () => EdgeConnectionClosedError,
   EdgeHttpClient: () => EdgeHttpClient,
   EdgeIdentityChangedError: () => EdgeIdentityChangedError,
-  Protocol: () => import_chunk_ANV2HBEH.Protocol,
+  Protocol: () => import_chunk_XNHBUTNB.Protocol,
+  WebSocketMuxer: () => import_chunk_XNHBUTNB.WebSocketMuxer,
   createChainEdgeIdentity: () => createChainEdgeIdentity,
   createDeviceEdgeIdentity: () => createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity: () => createEphemeralEdgeIdentity,
   createStubEdgeIdentity: () => createStubEdgeIdentity,
   createTestHaloEdgeIdentity: () => createTestHaloEdgeIdentity,
-  getTypename: () => import_chunk_ANV2HBEH.getTypename,
+  getTypename: () => import_chunk_XNHBUTNB.getTypename,
   handleAuthChallenge: () => handleAuthChallenge,
-  protocol: () => import_chunk_ANV2HBEH.protocol,
-  toUint8Array: () => import_chunk_ANV2HBEH.toUint8Array
+  protocol: () => import_chunk_XNHBUTNB.protocol,
+  toUint8Array: () => import_chunk_XNHBUTNB.toUint8Array
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_ANV2HBEH = require("./chunk-ANV2HBEH.cjs");
+var import_chunk_XNHBUTNB = require("./chunk-XNHBUTNB.cjs");
 __reExport(node_exports, require("@dxos/protocols/buf/dxos/edge/messenger_pb"), module.exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_log = require("@dxos/log");
+var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_invariant = require("@dxos/invariant");
 var import_proto = require("@dxos/protocols/proto");
 var import_isomorphic_ws = __toESM(require("isomorphic-ws"));
@@ -57,6 +61,7 @@ var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_invariant2 = require("@dxos/invariant");
 var import_log2 = require("@dxos/log");
+var import_protocols = require("@dxos/protocols");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
 var import_credentials = require("@dxos/credentials");
@@ -66,7 +71,7 @@ var import_keys = require("@dxos/keys");
 var import_async3 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
 var import_log3 = require("@dxos/log");
-var import_protocols = require("@dxos/protocols");
+var import_protocols2 = require("@dxos/protocols");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
 var handleAuthChallenge = async (failedResponse, identity) => {
   (0, import_invariant.invariant)(failedResponse.status === 401, void 0, {
@@ -112,13 +117,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 import_context2.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 {
@@ -130,47 +131,73 @@ var EdgeWsConnection = class extends import_context2.Resource {
   send(message) {
     (0, import_invariant2.invariant)(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 54,
+      L: 52,
       S: this,
       A: [
         "this._ws",
         ""
       ]
     });
+    (0, import_invariant2.invariant)(this._wsMuxer, void 0, {
+      F: __dxlog_file2,
+      L: 53,
+      S: this,
+      A: [
+        "this._wsMuxer",
+        ""
+      ]
+    });
     (0, import_log2.log)("sending...", {
       peerKey: this._identity.peerKey,
-      payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
+      payload: import_chunk_XNHBUTNB.protocol.getPayloadType(message)
     }, {
       F: __dxlog_file2,
-      L: 55,
+      L: 54,
       S: this,
       C: (f, a) => f(...a)
     });
-    const encoded = import_buf.buf.toBinary(import_messenger_pb.MessageSchema, message);
-    if (encoded.byteLength >= CLOUDFLARE_MESSAGE_LENGTH_LIMIT) {
-      import_log2.log.error("edge message dropped due to websocket message limit", {
-        byteLength: encoded.byteLength,
-        serviceId: message.serviceId,
-        payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
-      }, {
+    if (this._ws?.protocol.includes(import_protocols.EdgeWebsocketProtocol.V0)) {
+      const binary = import_buf.buf.toBinary(import_messenger_pb.MessageSchema, message);
+      if (binary.length > import_chunk_XNHBUTNB.CLOUDFLARE_MESSAGE_MAX_BYTES) {
+        import_log2.log.error("Message dropped because it was too large (>1MB).", {
+          byteLength: binary.byteLength,
+          serviceId: message.serviceId,
+          payload: import_chunk_XNHBUTNB.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) => import_log2.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(import_protocols.EdgeWebsocketProtocol)
+    ];
     this._ws = new import_isomorphic_ws.default(this._connectionInfo.url.toString(), this._connectionInfo.protocolHeader ? [
+      ...baseProtocols,
       this._connectionInfo.protocolHeader
-    ] : []);
+    ] : [
+      ...baseProtocols
+    ]);
+    const muxer = new import_chunk_XNHBUTNB.WebSocketMuxer(this._ws);
+    this._wsMuxer = muxer;
     this._ws.onopen = () => {
       if (this.isOpen) {
         (0, import_log2.log)("connected", void 0, {
           F: __dxlog_file2,
-          L: 76,
+          L: 84,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -181,7 +208,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file2,
-          L: 80,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -194,11 +221,12 @@ var EdgeWsConnection = class extends import_context2.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) => {
@@ -208,7 +236,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           info: event.message
         }, {
           F: __dxlog_file2,
-          L: 91,
+          L: 100,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -218,7 +246,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           error: event.error
         }, {
           F: __dxlog_file2,
-          L: 94,
+          L: 103,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -230,7 +258,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           event: event.type
         }, {
           F: __dxlog_file2,
-          L: 102,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -240,15 +268,18 @@ var EdgeWsConnection = class extends import_context2.Resource {
         this._rescheduleHeartbeatTimeout();
         return;
       }
-      const data = await (0, import_chunk_ANV2HBEH.toUint8Array)(event.data);
-      if (this.isOpen) {
-        const message = import_buf.buf.fromBinary(import_messenger_pb.MessageSchema, data);
+      const bytes = await (0, import_chunk_XNHBUTNB.toUint8Array)(event.data);
+      if (!this.isOpen) {
+        return;
+      }
+      const message = this._ws?.protocol?.includes(import_protocols.EdgeWebsocketProtocol.V0) ? import_buf.buf.fromBinary(import_messenger_pb.MessageSchema, bytes) : muxer.receiveData(bytes);
+      if (message) {
         (0, import_log2.log)("received", {
           from: message.source,
-          payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
+          payload: import_chunk_XNHBUTNB.protocol.getPayloadType(message)
         }, {
           F: __dxlog_file2,
-          L: 112,
+          L: 128,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -262,6 +293,8 @@ var EdgeWsConnection = class extends import_context2.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;
@@ -270,7 +303,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
         err
       }, {
         F: __dxlog_file2,
-        L: 128,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -279,7 +312,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
   _scheduleHeartbeats() {
     (0, import_invariant2.invariant)(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 133,
+      L: 151,
       S: this,
       A: [
         "this._ws",
@@ -299,13 +332,13 @@ var EdgeWsConnection = class extends import_context2.Resource {
     void this._inactivityTimeoutCtx?.dispose();
     this._inactivityTimeoutCtx = new import_context2.Context(void 0, {
       F: __dxlog_file2,
-      L: 152
+      L: 170
     });
     (0, import_async2.scheduleTask)(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
         import_log2.log.warn("restart due to inactivity timeout", void 0, {
           F: __dxlog_file2,
-          L: 157,
+          L: 175,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -343,30 +376,23 @@ var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/
 var DEFAULT_TIMEOUT = 1e4;
 var EdgeClient = class extends import_context.Resource {
   constructor(_identity, _config) {
-    super();
-    this._identity = _identity;
-    this._config = _config;
-    this._persistentLifecycle = new import_async.PersistentLifecycle({
+    super(), this._identity = _identity, this._config = _config, this.statusChanged = new import_async.Event(), this._persistentLifecycle = new import_async.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 import_async.Trigger();
-    this._isActive = (connection) => connection === this._currentConnection;
+    }), this._messageListeners = /* @__PURE__ */ new Set(), this._reconnectListeners = /* @__PURE__ */ new Set(), this._currentConnection = void 0, this._ready = new import_async.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 === import_async.TriggerState.RESOLVED;
+  get status() {
+    return Boolean(this._currentConnection) && this._ready.state === import_async.TriggerState.RESOLVED ? import_services.EdgeStatus.CONNECTED : import_services.EdgeStatus.NOT_CONNECTED;
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -381,13 +407,13 @@ var EdgeClient = class extends import_context.Resource {
         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) {
@@ -404,7 +430,7 @@ var EdgeClient = class extends import_context.Resource {
           } catch (error) {
             import_log.log.catch(error, void 0, {
               F: __dxlog_file3,
-              L: 116,
+              L: 121,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -422,7 +448,7 @@ var EdgeClient = class extends import_context.Resource {
       info: this.info
     }, {
       F: __dxlog_file3,
-      L: 128,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -431,7 +457,7 @@ var EdgeClient = class extends import_context.Resource {
         err
       }, {
         F: __dxlog_file3,
-        L: 130,
+        L: 135,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -445,7 +471,7 @@ var EdgeClient = class extends import_context.Resource {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file3,
-      L: 138,
+      L: 143,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -462,7 +488,7 @@ var EdgeClient = class extends import_context.Resource {
     if (this._identity !== identity) {
       (0, import_log.log)("identity changed during auth header request", void 0, {
         F: __dxlog_file3,
-        L: 152,
+        L: 157,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -475,7 +501,7 @@ var EdgeClient = class extends import_context.Resource {
       protocolHeader
     }, {
       F: __dxlog_file3,
-      L: 158,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -490,7 +516,7 @@ var EdgeClient = class extends import_context.Resource {
         } else {
           import_log.log.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)
           });
@@ -499,11 +525,11 @@ var EdgeClient = class extends import_context.Resource {
       onRestartRequired: () => {
         if (this._isActive(connection)) {
           this._closeCurrentConnection();
-          this._persistentLifecycle.scheduleRestart();
+          void this._persistentLifecycle.scheduleRestart();
         } else {
           import_log.log.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file3,
-            L: 176,
+            L: 181,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -519,7 +545,7 @@ var EdgeClient = class extends import_context.Resource {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file3,
-            L: 184,
+            L: 189,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -538,13 +564,16 @@ var EdgeClient = class extends import_context.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();
@@ -553,7 +582,7 @@ var EdgeClient = class extends import_context.Resource {
           err
         }, {
           F: __dxlog_file3,
-          L: 217,
+          L: 225,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -567,10 +596,10 @@ var EdgeClient = class extends import_context.Resource {
       } catch (err) {
         import_log.log.error("ws incoming message processing failed", {
           err,
-          payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
+          payload: import_chunk_XNHBUTNB.protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 227,
+          L: 235,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -585,7 +614,7 @@ var EdgeClient = class extends import_context.Resource {
     if (this._ready.state !== import_async.TriggerState.RESOLVED) {
       (0, import_log.log)("waiting for websocket to become ready", void 0, {
         F: __dxlog_file3,
-        L: 238,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -615,7 +644,7 @@ var EdgeClient = class extends import_context.Resource {
         statusText: response.statusText
       }, {
         F: __dxlog_file3,
-        L: 263,
+        L: 271,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -810,7 +839,6 @@ var EdgeHttpClient = class {
   async uploadFunction(pathParts, body, args) {
     const path = [
       "functions",
-      pathParts.spaceId,
       ...pathParts.functionId ? [
         pathParts.functionId
       ] : []
@@ -924,19 +952,19 @@ var EdgeHttpClient = class {
             C: (f, a) => f(...a)
           });
           if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new import_protocols.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
+            processingError = new import_protocols2.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
           } else {
-            processingError = import_protocols.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
+            processingError = import_protocols2.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
           }
         } else if (response.status === 401 && !handledAuth) {
           authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
         } else {
-          processingError = import_protocols.EdgeCallFailedError.fromHttpFailure(response);
+          processingError = import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
         }
       } catch (error) {
-        processingError = import_protocols.EdgeCallFailedError.fromProcessingFailureCause(error);
+        processingError = import_protocols2.EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
         (0, import_log3.log)("retrying edge request", {
@@ -961,7 +989,7 @@ var EdgeHttpClient = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      throw import_protocols.EdgeCallFailedError.fromHttpFailure(response);
+      throw import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
@@ -1010,11 +1038,14 @@ var encodeAuthHeader = (challenge) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
   EdgeClient,
   EdgeConnectionClosedError,
   EdgeHttpClient,
   EdgeIdentityChangedError,
   Protocol,
+  WebSocketMuxer,
   createChainEdgeIdentity,
   createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity,