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

package/dist/lib/node/chunk-ANV2HBEH.cjs

@@ -0,0 +1,136 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var chunk_ANV2HBEH_exports = {};
+__export(chunk_ANV2HBEH_exports, {
+  Protocol: () => Protocol,
+  getTypename: () => getTypename,
+  protocol: () => protocol,
+  toUint8Array: () => toUint8Array
+});
+module.exports = __toCommonJS(chunk_ANV2HBEH_exports);
+var import_invariant = require("@dxos/invariant");
+var import_buf = require("@dxos/protocols/buf");
+var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
+var import_util = require("@dxos/util");
+var import_buf2 = require("@dxos/protocols/buf");
+var import_messenger_pb2 = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/protocol.ts";
+var getTypename = (typeName) => `type.googleapis.com/${typeName}`;
+var Protocol = class {
+  constructor(types) {
+    this._typeRegistry = import_buf.buf.createRegistry(...types);
+  }
+  get typeRegistry() {
+    return this._typeRegistry;
+  }
+  toJson(message) {
+    try {
+      return import_buf.buf.toJson(import_messenger_pb.MessageSchema, message, {
+        registry: this.typeRegistry
+      });
+    } catch (err) {
+      return {
+        type: this.getPayloadType(message)
+      };
+    }
+  }
+  /**
+  * Return the payload with the given type.
+  */
+  getPayload(message, type) {
+    (0, import_invariant.invariant)(message.payload, void 0, {
+      F: __dxlog_file,
+      L: 40,
+      S: this,
+      A: [
+        "message.payload",
+        ""
+      ]
+    });
+    const payloadTypename = this.getPayloadType(message);
+    if (type && type.typeName !== payloadTypename) {
+      throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);
+    }
+    (0, import_invariant.invariant)(import_buf.bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`, {
+      F: __dxlog_file,
+      L: 46,
+      S: this,
+      A: [
+        "bufWkt.anyIs(message.payload, type)",
+        "`Unexpected payload type: ${payloadTypename}}`"
+      ]
+    });
+    const payload = import_buf.bufWkt.anyUnpack(message.payload, this.typeRegistry);
+    (0, import_invariant.invariant)(payload, `Empty payload: ${payloadTypename}}`, {
+      F: __dxlog_file,
+      L: 48,
+      S: this,
+      A: [
+        "payload",
+        "`Empty payload: ${payloadTypename}}`"
+      ]
+    });
+    return payload;
+  }
+  /**
+  * Get the payload type.
+  */
+  getPayloadType(message) {
+    if (!message.payload) {
+      return void 0;
+    }
+    const [, type] = message.payload.typeUrl.split("/");
+    return type;
+  }
+  /**
+  * Create a packed message.
+  */
+  createMessage(type, { source, target, payload, serviceId }) {
+    return import_buf.buf.create(import_messenger_pb.MessageSchema, {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      source,
+      target,
+      serviceId,
+      payload: payload ? import_buf.bufWkt.anyPack(type, import_buf.buf.create(type, payload)) : void 0
+    });
+  }
+};
+var toUint8Array = async (data) => {
+  if (data instanceof Buffer) {
+    return (0, import_util.bufferToArray)(data);
+  }
+  if (data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
+  }
+  throw new Error(`Unexpected datatype: ${data}`);
+};
+var protocol = new Protocol([
+  import_messenger_pb2.SwarmRequestSchema,
+  import_messenger_pb2.SwarmResponseSchema,
+  import_messenger_pb2.TextMessageSchema,
+  import_buf2.bufWkt.AnySchema
+]);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Protocol,
+  getTypename,
+  protocol,
+  toUint8Array
+});
+//# sourceMappingURL=chunk-ANV2HBEH.cjs.map

package/dist/lib/node/chunk-ANV2HBEH.cjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/protocol.ts", "../../../src/defs.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { invariant } from '@dxos/invariant';\nimport { buf, bufWkt } from '@dxos/protocols/buf';\nimport { type Message, MessageSchema, type PeerSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\nimport { bufferToArray } from '@dxos/util';\n\nexport type PeerData = buf.MessageInitShape<typeof PeerSchema>;\n\nexport const getTypename = (typeName: string) => `type.googleapis.com/${typeName}`;\n\n/**\n * NOTE: The type registry should be extended with all message types.\n */\nexport class Protocol {\n  private readonly _typeRegistry: buf.Registry;\n\n  constructor(types: buf.DescMessage[]) {\n    this._typeRegistry = buf.createRegistry(...types);\n  }\n\n  get typeRegistry(): buf.Registry {\n    return this._typeRegistry;\n  }\n\n  toJson(message: Message): any {\n    try {\n      return buf.toJson(MessageSchema, message, { registry: this.typeRegistry });\n    } catch (err) {\n      return { type: this.getPayloadType(message) };\n    }\n  }\n\n  /**\n   * Return the payload with the given type.\n   */\n  getPayload<Desc extends buf.DescMessage>(message: Message, type: Desc): buf.MessageShape<Desc> {\n    invariant(message.payload);\n    const payloadTypename = this.getPayloadType(message);\n    if (type && type.typeName !== payloadTypename) {\n      throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);\n    }\n\n    invariant(bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`);\n    const payload = bufWkt.anyUnpack(message.payload, this.typeRegistry) as buf.MessageShape<Desc>;\n    invariant(payload, `Empty payload: ${payloadTypename}}`);\n    return payload;\n  }\n\n  /**\n   * Get the payload type.\n   */\n  getPayloadType(message: Message): string | undefined {\n    if (!message.payload) {\n      return undefined;\n    }\n\n    const [, type] = message.payload.typeUrl.split('/');\n    return type;\n  }\n\n  /**\n   * Create a packed message.\n   */\n  createMessage<Desc extends buf.DescMessage>(\n    type: Desc,\n    {\n      source,\n      target,\n      payload,\n      serviceId,\n    }: {\n      source?: PeerData;\n      target?: PeerData[];\n      payload?: buf.MessageInitShape<Desc>;\n      serviceId?: string;\n    },\n  ) {\n    return buf.create(MessageSchema, {\n      timestamp: new Date().toISOString(),\n      source,\n      target,\n      serviceId,\n      payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : undefined,\n    });\n  }\n}\n\n/**\n * Convert websocket data to Uint8Array.\n */\nexport const toUint8Array = async (data: any): Promise<Uint8Array> => {\n  // Node.\n  if (data instanceof Buffer) {\n    return bufferToArray(data);\n  }\n\n  // Browser.\n  if (data instanceof Blob) {\n    return new Uint8Array(await (data as Blob).arrayBuffer());\n  }\n\n  throw new Error(`Unexpected datatype: ${data}`);\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { bufWkt } from '@dxos/protocols/buf';\nimport { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nimport { Protocol } from './protocol';\n\nexport const protocol = new Protocol([SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema, bufWkt.AnySchema]);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,uBAA0B;AAC1B,iBAA4B;AAC5B,0BAA6D;AAC7D,kBAA8B;ACH9B,IAAAA,cAAuB;AACvB,IAAAC,uBAA2E;;ADMpE,IAAMC,cAAc,CAACC,aAAqB,uBAAuBA,QAAAA;AAKjE,IAAMC,WAAN,MAAMA;EAGXC,YAAYC,OAA0B;AACpC,SAAKC,gBAAgBC,eAAIC,eAAc,GAAIH,KAAAA;EAC7C;EAEA,IAAII,eAA6B;AAC/B,WAAO,KAAKH;EACd;EAEAI,OAAOC,SAAuB;AAC5B,QAAI;AACF,aAAOJ,eAAIG,OAAOE,mCAAeD,SAAS;QAAEE,UAAU,KAAKJ;MAAa,CAAA;IAC1E,SAASK,KAAK;AACZ,aAAO;QAAEC,MAAM,KAAKC,eAAeL,OAAAA;MAAS;IAC9C;EACF;;;;EAKAM,WAAyCN,SAAkBI,MAAoC;AAC7FG,oCAAUP,QAAQQ,SAAO,QAAA;;;;;;;;;AACzB,UAAMC,kBAAkB,KAAKJ,eAAeL,OAAAA;AAC5C,QAAII,QAAQA,KAAKb,aAAakB,iBAAiB;AAC7C,YAAM,IAAIC,MAAM,4BAA4BD,eAAAA,cAA6BL,KAAKb,QAAQ,EAAE;IAC1F;AAEAgB,oCAAUI,kBAAOC,MAAMZ,QAAQQ,SAASJ,IAAAA,GAAO,4BAA4BK,eAAAA,KAAkB;;;;;;;;;AAC7F,UAAMD,UAAUG,kBAAOE,UAAUb,QAAQQ,SAAS,KAAKV,YAAY;AACnES,oCAAUC,SAAS,kBAAkBC,eAAAA,KAAkB;;;;;;;;;AACvD,WAAOD;EACT;;;;EAKAH,eAAeL,SAAsC;AACnD,QAAI,CAACA,QAAQQ,SAAS;AACpB,aAAOM;IACT;AAEA,UAAM,CAAA,EAAGV,IAAAA,IAAQJ,QAAQQ,QAAQO,QAAQC,MAAM,GAAA;AAC/C,WAAOZ;EACT;;;;EAKAa,cACEb,MACA,EACEc,QACAC,QACAX,SACAY,UAAS,GAOX;AACA,WAAOxB,eAAIyB,OAAOpB,mCAAe;MAC/BqB,YAAW,oBAAIC,KAAAA,GAAOC,YAAW;MACjCN;MACAC;MACAC;MACAZ,SAASA,UAAUG,kBAAOc,QAAQrB,MAAMR,eAAIyB,OAAOjB,MAAMI,OAAAA,CAAAA,IAAYM;IACvE,CAAA;EACF;AACF;AAKO,IAAMY,eAAe,OAAOC,SAAAA;AAEjC,MAAIA,gBAAgBC,QAAQ;AAC1B,eAAOC,2BAAcF,IAAAA;EACvB;AAGA,MAAIA,gBAAgBG,MAAM;AACxB,WAAO,IAAIC,WAAW,MAAOJ,KAAcK,YAAW,CAAA;EACxD;AAEA,QAAM,IAAItB,MAAM,wBAAwBiB,IAAAA,EAAM;AAChD;AChGO,IAAMM,WAAW,IAAIzC,SAAS;EAAC0C;EAAoBC;EAAqBC;EAAmBzB,YAAAA,OAAO0B;CAAU;",
+  "names": ["import_buf", "import_messenger_pb", "getTypename", "typeName", "Protocol", "constructor", "types", "_typeRegistry", "buf", "createRegistry", "typeRegistry", "toJson", "message", "MessageSchema", "registry", "err", "type", "getPayloadType", "getPayload", "invariant", "payload", "payloadTypename", "Error", "bufWkt", "anyIs", "anyUnpack", "undefined", "typeUrl", "split", "createMessage", "source", "target", "serviceId", "create", "timestamp", "Date", "toISOString", "anyPack", "toUint8Array", "data", "Buffer", "bufferToArray", "Blob", "Uint8Array", "arrayBuffer", "protocol", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "AnySchema"]
+}

package/dist/lib/node/index.cjs

@@ -29,31 +29,27 @@ 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_ZOL3YSDR.CLOUDFLARE_MESSAGE_MAX_BYTES,
-  CLOUDFLARE_RPC_MAX_BYTES: () => import_chunk_ZOL3YSDR.CLOUDFLARE_RPC_MAX_BYTES,
   EdgeClient: () => EdgeClient,
   EdgeConnectionClosedError: () => EdgeConnectionClosedError,
   EdgeHttpClient: () => EdgeHttpClient,
   EdgeIdentityChangedError: () => EdgeIdentityChangedError,
-  Protocol: () => import_chunk_ZOL3YSDR.Protocol,
-  WebSocketMuxer: () => import_chunk_ZOL3YSDR.WebSocketMuxer,
+  Protocol: () => import_chunk_ANV2HBEH.Protocol,
   createChainEdgeIdentity: () => createChainEdgeIdentity,
   createDeviceEdgeIdentity: () => createDeviceEdgeIdentity,
   createEphemeralEdgeIdentity: () => createEphemeralEdgeIdentity,
   createStubEdgeIdentity: () => createStubEdgeIdentity,
   createTestHaloEdgeIdentity: () => createTestHaloEdgeIdentity,
-  getTypename: () => import_chunk_ZOL3YSDR.getTypename,
+  getTypename: () => import_chunk_ANV2HBEH.getTypename,
   handleAuthChallenge: () => handleAuthChallenge,
-  protocol: () => import_chunk_ZOL3YSDR.protocol,
-  toUint8Array: () => import_chunk_ZOL3YSDR.toUint8Array
+  protocol: () => import_chunk_ANV2HBEH.protocol,
+  toUint8Array: () => import_chunk_ANV2HBEH.toUint8Array
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_ZOL3YSDR = require("./chunk-ZOL3YSDR.cjs");
+var import_chunk_ANV2HBEH = require("./chunk-ANV2HBEH.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"));
@@ -61,7 +57,6 @@ 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");
@@ -71,7 +66,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_protocols2 = require("@dxos/protocols");
+var import_protocols = 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, {
@@ -117,6 +112,7 @@ 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();
@@ -134,73 +130,47 @@ var EdgeWsConnection = class extends import_context2.Resource {
   send(message) {
     (0, import_invariant2.invariant)(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 52,
+      L: 54,
       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_ZOL3YSDR.protocol.getPayloadType(message)
+      payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
     }, {
       F: __dxlog_file2,
-      L: 54,
+      L: 55,
       S: this,
       C: (f, a) => f(...a)
     });
-    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_ZOL3YSDR.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_ZOL3YSDR.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, {
+    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)
+      }, {
         F: __dxlog_file2,
-        L: 67,
+        L: 58,
         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_ZOL3YSDR.WebSocketMuxer(this._ws);
-    this._wsMuxer = muxer;
+    ] : []);
     this._ws.onopen = () => {
       if (this.isOpen) {
         (0, import_log2.log)("connected", void 0, {
           F: __dxlog_file2,
-          L: 84,
+          L: 76,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -211,7 +181,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file2,
-          L: 88,
+          L: 80,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -224,12 +194,11 @@ var EdgeWsConnection = class extends import_context2.Resource {
           reason: event.reason
         }, {
           F: __dxlog_file2,
-          L: 93,
+          L: 85,
           S: this,
           C: (f, a) => f(...a)
         });
         this._callbacks.onRestartRequired();
-        muxer.destroy();
       }
     };
     this._ws.onerror = (event) => {
@@ -239,7 +208,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           info: event.message
         }, {
           F: __dxlog_file2,
-          L: 100,
+          L: 91,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -249,7 +218,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           error: event.error
         }, {
           F: __dxlog_file2,
-          L: 103,
+          L: 94,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -261,7 +230,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
           event: event.type
         }, {
           F: __dxlog_file2,
-          L: 111,
+          L: 102,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -271,18 +240,15 @@ var EdgeWsConnection = class extends import_context2.Resource {
         this._rescheduleHeartbeatTimeout();
         return;
       }
-      const bytes = await (0, import_chunk_ZOL3YSDR.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) {
+      const data = await (0, import_chunk_ANV2HBEH.toUint8Array)(event.data);
+      if (this.isOpen) {
+        const message = import_buf.buf.fromBinary(import_messenger_pb.MessageSchema, data);
         (0, import_log2.log)("received", {
           from: message.source,
-          payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
+          payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
         }, {
           F: __dxlog_file2,
-          L: 128,
+          L: 112,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -296,8 +262,6 @@ 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;
@@ -306,7 +270,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
         err
       }, {
         F: __dxlog_file2,
-        L: 146,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -315,7 +279,7 @@ var EdgeWsConnection = class extends import_context2.Resource {
   _scheduleHeartbeats() {
     (0, import_invariant2.invariant)(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 151,
+      L: 133,
       S: this,
       A: [
         "this._ws",
@@ -335,13 +299,13 @@ var EdgeWsConnection = class extends import_context2.Resource {
     void this._inactivityTimeoutCtx?.dispose();
     this._inactivityTimeoutCtx = new import_context2.Context(void 0, {
       F: __dxlog_file2,
-      L: 170
+      L: 152
     });
     (0, import_async2.scheduleTask)(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
         import_log2.log.warn("restart due to inactivity timeout", void 0, {
           F: __dxlog_file2,
-          L: 175,
+          L: 157,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -382,7 +346,6 @@ var EdgeClient = class extends import_context.Resource {
     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)
@@ -398,13 +361,12 @@ var EdgeClient = class extends import_context.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 === import_async.TriggerState.RESOLVED ? import_services.EdgeStatus.CONNECTED : import_services.EdgeStatus.NOT_CONNECTED;
+  get isConnected() {
+    return Boolean(this._currentConnection) && this._ready.state === import_async.TriggerState.RESOLVED;
   }
   get identityKey() {
     return this._identity.identityKey;
@@ -419,13 +381,13 @@ var EdgeClient = class extends import_context.Resource {
         oldIdentity: this._identity
       }, {
         F: __dxlog_file3,
-        L: 99,
+        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) {
@@ -442,7 +404,7 @@ var EdgeClient = class extends import_context.Resource {
           } catch (error) {
             import_log.log.catch(error, void 0, {
               F: __dxlog_file3,
-              L: 121,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -460,7 +422,7 @@ var EdgeClient = class extends import_context.Resource {
       info: this.info
     }, {
       F: __dxlog_file3,
-      L: 133,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -469,7 +431,7 @@ var EdgeClient = class extends import_context.Resource {
         err
       }, {
         F: __dxlog_file3,
-        L: 135,
+        L: 130,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -483,7 +445,7 @@ var EdgeClient = class extends import_context.Resource {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file3,
-      L: 143,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -500,7 +462,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: 157,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -513,7 +475,7 @@ var EdgeClient = class extends import_context.Resource {
       protocolHeader
     }, {
       F: __dxlog_file3,
-      L: 163,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -528,7 +490,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: 173,
+            L: 168,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -537,11 +499,11 @@ var EdgeClient = class extends import_context.Resource {
       onRestartRequired: () => {
         if (this._isActive(connection)) {
           this._closeCurrentConnection();
-          void this._persistentLifecycle.scheduleRestart();
+          this._persistentLifecycle.scheduleRestart();
         } else {
           import_log.log.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file3,
-            L: 181,
+            L: 176,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -557,7 +519,7 @@ var EdgeClient = class extends import_context.Resource {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file3,
-            L: 189,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -576,16 +538,13 @@ 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();
@@ -594,7 +553,7 @@ var EdgeClient = class extends import_context.Resource {
           err
         }, {
           F: __dxlog_file3,
-          L: 225,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -608,10 +567,10 @@ var EdgeClient = class extends import_context.Resource {
       } catch (err) {
         import_log.log.error("ws incoming message processing failed", {
           err,
-          payload: import_chunk_ZOL3YSDR.protocol.getPayloadType(message)
+          payload: import_chunk_ANV2HBEH.protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 235,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -626,7 +585,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: 246,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -656,7 +615,7 @@ var EdgeClient = class extends import_context.Resource {
         statusText: response.statusText
       }, {
         F: __dxlog_file3,
-        L: 271,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -851,6 +810,7 @@ var EdgeHttpClient = class {
   async uploadFunction(pathParts, body, args) {
     const path = [
       "functions",
+      pathParts.spaceId,
       ...pathParts.functionId ? [
         pathParts.functionId
       ] : []
@@ -964,19 +924,19 @@ var EdgeHttpClient = class {
             C: (f, a) => f(...a)
           });
           if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new import_protocols2.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
+            processingError = new import_protocols.EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
           } else {
-            processingError = import_protocols2.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
+            processingError = import_protocols.EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
           }
         } else if (response.status === 401 && !handledAuth) {
           authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
         } else {
-          processingError = import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
+          processingError = import_protocols.EdgeCallFailedError.fromHttpFailure(response);
         }
       } catch (error) {
-        processingError = import_protocols2.EdgeCallFailedError.fromProcessingFailureCause(error);
+        processingError = import_protocols.EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
         (0, import_log3.log)("retrying edge request", {
@@ -1001,7 +961,7 @@ var EdgeHttpClient = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      throw import_protocols2.EdgeCallFailedError.fromHttpFailure(response);
+      throw import_protocols.EdgeCallFailedError.fromHttpFailure(response);
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     this._authHeader = encodeAuthHeader(challenge);
@@ -1050,14 +1010,11 @@ 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,