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

package/dist/lib/node-esm/chunk-HNVT57AU.mjs

@@ -0,0 +1,115 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+
+// packages/core/mesh/edge-client/src/protocol.ts
+import { invariant } from "@dxos/invariant";
+import { buf, bufWkt } from "@dxos/protocols/buf";
+import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { bufferToArray } from "@dxos/util";
+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 = buf.createRegistry(...types);
+  }
+  get typeRegistry() {
+    return this._typeRegistry;
+  }
+  toJson(message) {
+    try {
+      return buf.toJson(MessageSchema, message, {
+        registry: this.typeRegistry
+      });
+    } catch (err) {
+      return {
+        type: this.getPayloadType(message)
+      };
+    }
+  }
+  /**
+  * Return the payload with the given type.
+  */
+  getPayload(message, type) {
+    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}`);
+    }
+    invariant(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 = bufWkt.anyUnpack(message.payload, this.typeRegistry);
+    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 buf.create(MessageSchema, {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      source,
+      target,
+      serviceId,
+      payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : void 0
+    });
+  }
+};
+var toUint8Array = async (data) => {
+  if (data instanceof Buffer) {
+    return bufferToArray(data);
+  }
+  if (data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
+  }
+  throw new Error(`Unexpected datatype: ${data}`);
+};
+
+// packages/core/mesh/edge-client/src/defs.ts
+import { bufWkt as bufWkt2 } from "@dxos/protocols/buf";
+import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+var protocol = new Protocol([
+  SwarmRequestSchema,
+  SwarmResponseSchema,
+  TextMessageSchema,
+  bufWkt2.AnySchema
+]);
+
+export {
+  getTypename,
+  Protocol,
+  toUint8Array,
+  protocol
+};
+//# sourceMappingURL=chunk-HNVT57AU.mjs.map

package/dist/lib/node-esm/chunk-HNVT57AU.mjs.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,SAASA,iBAAiB;AAC1B,SAASC,KAAKC,cAAc;AAC5B,SAAuBC,qBAAsC;AAC7D,SAASC,qBAAqB;;AAIvB,IAAMC,cAAc,CAACC,aAAqB,uBAAuBA,QAAAA;AAKjE,IAAMC,WAAN,MAAMA;EAGXC,YAAYC,OAA0B;AACpC,SAAKC,gBAAgBT,IAAIU,eAAc,GAAIF,KAAAA;EAC7C;EAEA,IAAIG,eAA6B;AAC/B,WAAO,KAAKF;EACd;EAEAG,OAAOC,SAAuB;AAC5B,QAAI;AACF,aAAOb,IAAIY,OAAOV,eAAeW,SAAS;QAAEC,UAAU,KAAKH;MAAa,CAAA;IAC1E,SAASI,KAAK;AACZ,aAAO;QAAEC,MAAM,KAAKC,eAAeJ,OAAAA;MAAS;IAC9C;EACF;;;;EAKAK,WAAyCL,SAAkBG,MAAoC;AAC7FjB,cAAUc,QAAQM,SAAO,QAAA;;;;;;;;;AACzB,UAAMC,kBAAkB,KAAKH,eAAeJ,OAAAA;AAC5C,QAAIG,QAAQA,KAAKX,aAAae,iBAAiB;AAC7C,YAAM,IAAIC,MAAM,4BAA4BD,eAAAA,cAA6BJ,KAAKX,QAAQ,EAAE;IAC1F;AAEAN,cAAUE,OAAOqB,MAAMT,QAAQM,SAASH,IAAAA,GAAO,4BAA4BI,eAAAA,KAAkB;;;;;;;;;AAC7F,UAAMD,UAAUlB,OAAOsB,UAAUV,QAAQM,SAAS,KAAKR,YAAY;AACnEZ,cAAUoB,SAAS,kBAAkBC,eAAAA,KAAkB;;;;;;;;;AACvD,WAAOD;EACT;;;;EAKAF,eAAeJ,SAAsC;AACnD,QAAI,CAACA,QAAQM,SAAS;AACpB,aAAOK;IACT;AAEA,UAAM,CAAA,EAAGR,IAAAA,IAAQH,QAAQM,QAAQM,QAAQC,MAAM,GAAA;AAC/C,WAAOV;EACT;;;;EAKAW,cACEX,MACA,EACEY,QACAC,QACAV,SACAW,UAAS,GAOX;AACA,WAAO9B,IAAI+B,OAAO7B,eAAe;MAC/B8B,YAAW,oBAAIC,KAAAA,GAAOC,YAAW;MACjCN;MACAC;MACAC;MACAX,SAASA,UAAUlB,OAAOkC,QAAQnB,MAAMhB,IAAI+B,OAAOf,MAAMG,OAAAA,CAAAA,IAAYK;IACvE,CAAA;EACF;AACF;AAKO,IAAMY,eAAe,OAAOC,SAAAA;AAEjC,MAAIA,gBAAgBC,QAAQ;AAC1B,WAAOnC,cAAckC,IAAAA;EACvB;AAGA,MAAIA,gBAAgBE,MAAM;AACxB,WAAO,IAAIC,WAAW,MAAOH,KAAcI,YAAW,CAAA;EACxD;AAEA,QAAM,IAAIpB,MAAM,wBAAwBgB,IAAAA,EAAM;AAChD;;;ACrGA,SAASK,UAAAA,eAAc;AACvB,SAASC,oBAAoBC,qBAAqBC,yBAAyB;AAIpE,IAAMC,WAAW,IAAIC,SAAS;EAACC;EAAoBC;EAAqBC;EAAmBC,QAAOC;CAAU;",
+  "names": ["invariant", "buf", "bufWkt", "MessageSchema", "bufferToArray", "getTypename", "typeName", "Protocol", "constructor", "types", "_typeRegistry", "createRegistry", "typeRegistry", "toJson", "message", "registry", "err", "type", "getPayloadType", "getPayload", "payload", "payloadTypename", "Error", "anyIs", "anyUnpack", "undefined", "typeUrl", "split", "createMessage", "source", "target", "serviceId", "create", "timestamp", "Date", "toISOString", "anyPack", "toUint8Array", "data", "Buffer", "Blob", "Uint8Array", "arrayBuffer", "bufWkt", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "protocol", "Protocol", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "bufWkt", "AnySchema"]
+}

package/dist/lib/node-esm/index.mjs

@@ -1,22 +1,18 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
 import {
-  CLOUDFLARE_MESSAGE_MAX_BYTES,
-  CLOUDFLARE_RPC_MAX_BYTES,
   Protocol,
-  WebSocketMuxer,
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-25HGRGNZ.mjs";
+} from "./chunk-HNVT57AU.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 { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } 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";
@@ -64,7 +60,6 @@ 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) {
@@ -76,6 +71,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 Resource {
   constructor(_identity, _connectionInfo, _callbacks) {
     super();
@@ -93,73 +89,47 @@ var EdgeWsConnection = class extends Resource {
   send(message) {
     invariant2(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 52,
+      L: 54,
       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: 54,
+      L: 55,
       S: this,
       C: (f, a) => f(...a)
     });
-    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, {
+    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: 67,
+        L: 58,
         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: 84,
+          L: 76,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -170,7 +140,7 @@ var EdgeWsConnection = class extends Resource {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file2,
-          L: 88,
+          L: 80,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -183,12 +153,11 @@ var EdgeWsConnection = class extends 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) => {
@@ -198,7 +167,7 @@ var EdgeWsConnection = class extends Resource {
           info: event.message
         }, {
           F: __dxlog_file2,
-          L: 100,
+          L: 91,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -208,7 +177,7 @@ var EdgeWsConnection = class extends Resource {
           error: event.error
         }, {
           F: __dxlog_file2,
-          L: 103,
+          L: 94,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -220,7 +189,7 @@ var EdgeWsConnection = class extends Resource {
           event: event.type
         }, {
           F: __dxlog_file2,
-          L: 111,
+          L: 102,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -230,18 +199,15 @@ var EdgeWsConnection = class extends Resource {
         this._rescheduleHeartbeatTimeout();
         return;
       }
-      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) {
+      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: 128,
+          L: 112,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -255,8 +221,6 @@ 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;
@@ -265,7 +229,7 @@ var EdgeWsConnection = class extends Resource {
         err
       }, {
         F: __dxlog_file2,
-        L: 146,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -274,7 +238,7 @@ var EdgeWsConnection = class extends Resource {
   _scheduleHeartbeats() {
     invariant2(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 151,
+      L: 133,
       S: this,
       A: [
         "this._ws",
@@ -294,13 +258,13 @@ var EdgeWsConnection = class extends Resource {
     void this._inactivityTimeoutCtx?.dispose();
     this._inactivityTimeoutCtx = new Context(void 0, {
       F: __dxlog_file2,
-      L: 170
+      L: 152
     });
     scheduleTask(this._inactivityTimeoutCtx, () => {
       if (this.isOpen) {
         log.warn("restart due to inactivity timeout", void 0, {
           F: __dxlog_file2,
-          L: 175,
+          L: 157,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -347,7 +311,6 @@ var EdgeClient = class extends Resource2 {
     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)
@@ -363,13 +326,12 @@ var EdgeClient = class extends Resource2 {
   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;
@@ -384,13 +346,13 @@ var EdgeClient = class extends Resource2 {
         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) {
@@ -407,7 +369,7 @@ var EdgeClient = class extends Resource2 {
           } catch (error) {
             log2.catch(error, void 0, {
               F: __dxlog_file3,
-              L: 121,
+              L: 116,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -425,7 +387,7 @@ var EdgeClient = class extends Resource2 {
       info: this.info
     }, {
       F: __dxlog_file3,
-      L: 133,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -434,7 +396,7 @@ var EdgeClient = class extends Resource2 {
         err
       }, {
         F: __dxlog_file3,
-        L: 135,
+        L: 130,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -448,7 +410,7 @@ var EdgeClient = class extends Resource2 {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file3,
-      L: 143,
+      L: 138,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -465,7 +427,7 @@ var EdgeClient = class extends Resource2 {
     if (this._identity !== identity) {
       log2("identity changed during auth header request", void 0, {
         F: __dxlog_file3,
-        L: 157,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -478,7 +440,7 @@ var EdgeClient = class extends Resource2 {
       protocolHeader
     }, {
       F: __dxlog_file3,
-      L: 163,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -493,7 +455,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.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)
           });
@@ -502,11 +464,11 @@ var EdgeClient = class extends Resource2 {
       onRestartRequired: () => {
         if (this._isActive(connection)) {
           this._closeCurrentConnection();
-          void this._persistentLifecycle.scheduleRestart();
+          this._persistentLifecycle.scheduleRestart();
         } else {
           log2.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file3,
-            L: 181,
+            L: 176,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -522,7 +484,7 @@ var EdgeClient = class extends Resource2 {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file3,
-            L: 189,
+            L: 184,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -541,16 +503,13 @@ 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();
@@ -559,7 +518,7 @@ var EdgeClient = class extends Resource2 {
           err
         }, {
           F: __dxlog_file3,
-          L: 225,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -576,7 +535,7 @@ var EdgeClient = class extends Resource2 {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file3,
-          L: 235,
+          L: 227,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -591,7 +550,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: 246,
+        L: 238,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -621,7 +580,7 @@ var EdgeClient = class extends Resource2 {
         statusText: response.statusText
       }, {
         F: __dxlog_file3,
-        L: 271,
+        L: 263,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -828,6 +787,7 @@ var EdgeHttpClient = class {
   async uploadFunction(pathParts, body, args) {
     const path = [
       "functions",
+      pathParts.spaceId,
       ...pathParts.functionId ? [
         pathParts.functionId
       ] : []
@@ -1026,14 +986,11 @@ 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,