@dxos/edge-client 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/dist/lib/browser/chunk-TKYUZ5ZK.mjs

@@ -0,0 +1,302 @@
+// packages/core/mesh/edge-client/src/edge-ws-muxer.ts
+import { Trigger } from "@dxos/async";
+import { log } from "@dxos/log";
+import { buf as buf2 } from "@dxos/protocols/buf";
+import { MessageSchema as MessageSchema2 } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+
+// 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";
+
+// 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
+var protocol = new Protocol([
+  SwarmRequestSchema,
+  SwarmResponseSchema,
+  TextMessageSchema,
+  bufWkt2.AnySchema
+]);
+
+// packages/core/mesh/edge-client/src/edge-ws-muxer.ts
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-muxer.ts";
+var FLAG_SEGMENT_SEQ = 1;
+var FLAG_SEGMENT_SEQ_TERMINATED = 1 << 1;
+var CLOUDFLARE_MESSAGE_MAX_BYTES = 1e3 * 1e3;
+var CLOUDFLARE_RPC_MAX_BYTES = 32 * 1e3 * 1e3;
+var MAX_CHUNK_LENGTH = 16384;
+var MAX_BUFFERED_AMOUNT = CLOUDFLARE_MESSAGE_MAX_BYTES;
+var BUFFER_FULL_BACKOFF_TIMEOUT = 100;
+var WebSocketMuxer = class {
+  constructor(_ws, config) {
+    this._ws = _ws;
+    this._inMessageAccumulator = /* @__PURE__ */ new Map();
+    this._outMessageChunks = /* @__PURE__ */ new Map();
+    this._outMessageChannelByService = /* @__PURE__ */ new Map();
+    this._maxChunkLength = config?.maxChunkLength ?? MAX_CHUNK_LENGTH;
+  }
+  /**
+  * Resolves when all the message chunks get enqueued for sending.
+  */
+  async send(message) {
+    const binary = buf2.toBinary(MessageSchema2, message);
+    const channelId = this._resolveChannel(message);
+    if (channelId == null && binary.byteLength > CLOUDFLARE_MESSAGE_MAX_BYTES || binary.byteLength > CLOUDFLARE_RPC_MAX_BYTES) {
+      log.error("Large message dropped", {
+        byteLength: binary.byteLength,
+        serviceId: message.serviceId,
+        payload: protocol.getPayloadType(message),
+        channelId
+      }, {
+        F: __dxlog_file2,
+        L: 62,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    if (channelId == null || binary.length < this._maxChunkLength) {
+      const flags = Buffer.from([
+        0
+      ]);
+      this._ws.send(Buffer.concat([
+        flags,
+        binary
+      ]));
+      return;
+    }
+    const terminatorSentTrigger = new Trigger();
+    const messageChunks = [];
+    for (let i = 0; i < binary.length; i += this._maxChunkLength) {
+      const chunk = binary.slice(i, i + this._maxChunkLength);
+      const isLastChunk = i + this._maxChunkLength >= binary.length;
+      if (isLastChunk) {
+        const flags = Buffer.from([
+          FLAG_SEGMENT_SEQ | FLAG_SEGMENT_SEQ_TERMINATED,
+          channelId
+        ]);
+        messageChunks.push({
+          payload: Buffer.concat([
+            flags,
+            chunk
+          ]),
+          trigger: terminatorSentTrigger
+        });
+      } else {
+        const flags = Buffer.from([
+          FLAG_SEGMENT_SEQ,
+          channelId
+        ]);
+        messageChunks.push({
+          payload: Buffer.concat([
+            flags,
+            chunk
+          ])
+        });
+      }
+    }
+    const queuedMessages = this._outMessageChunks.get(channelId);
+    if (queuedMessages) {
+      queuedMessages.push(...messageChunks);
+    } else {
+      this._outMessageChunks.set(channelId, messageChunks);
+    }
+    this._sendChunkedMessages();
+    return terminatorSentTrigger.wait();
+  }
+  receiveData(data) {
+    if ((data[0] & FLAG_SEGMENT_SEQ) === 0) {
+      return buf2.fromBinary(MessageSchema2, data.slice(1));
+    }
+    const [flags, channelId, ...payload] = data;
+    let chunkAccumulator = this._inMessageAccumulator.get(channelId);
+    if (chunkAccumulator) {
+      chunkAccumulator.push(Buffer.from(payload));
+    } else {
+      chunkAccumulator = [
+        Buffer.from(payload)
+      ];
+      this._inMessageAccumulator.set(channelId, chunkAccumulator);
+    }
+    if ((flags & FLAG_SEGMENT_SEQ_TERMINATED) === 0) {
+      return void 0;
+    }
+    const message = buf2.fromBinary(MessageSchema2, Buffer.concat(chunkAccumulator));
+    this._inMessageAccumulator.delete(channelId);
+    return message;
+  }
+  destroy() {
+    if (this._sendTimeout) {
+      clearTimeout(this._sendTimeout);
+      this._sendTimeout = void 0;
+    }
+    for (const channelChunks of this._outMessageChunks.values()) {
+      channelChunks.forEach((chunk) => chunk.trigger?.wake());
+    }
+    this._outMessageChunks.clear();
+    this._inMessageAccumulator.clear();
+    this._outMessageChannelByService.clear();
+  }
+  _sendChunkedMessages() {
+    if (this._sendTimeout) {
+      return;
+    }
+    const send = () => {
+      if (this._ws.readyState === 2 || this._ws.readyState === 3) {
+        log.warn("send called for closed websocket", void 0, {
+          F: __dxlog_file2,
+          L: 146,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this._sendTimeout = void 0;
+        return;
+      }
+      let timeout = 0;
+      const emptyChannels = [];
+      for (const [channelId, messages] of this._outMessageChunks.entries()) {
+        if (this._ws.bufferedAmount != null) {
+          if (this._ws.bufferedAmount + MAX_CHUNK_LENGTH > MAX_BUFFERED_AMOUNT) {
+            timeout = BUFFER_FULL_BACKOFF_TIMEOUT;
+            break;
+          }
+        }
+        const nextMessage = messages.shift();
+        if (nextMessage) {
+          this._ws.send(nextMessage.payload);
+          nextMessage.trigger?.wake();
+        } else {
+          emptyChannels.push(channelId);
+        }
+      }
+      emptyChannels.forEach((channelId) => this._outMessageChunks.delete(channelId));
+      if (this._outMessageChunks.size > 0) {
+        this._sendTimeout = setTimeout(send, timeout);
+      } else {
+        this._sendTimeout = void 0;
+      }
+    };
+    this._sendTimeout = setTimeout(send);
+  }
+  _resolveChannel(message) {
+    if (!message.serviceId) {
+      return void 0;
+    }
+    let id = this._outMessageChannelByService.get(message.serviceId);
+    if (!id) {
+      id = this._outMessageChannelByService.size + 1;
+      this._outMessageChannelByService.set(message.serviceId, id);
+    }
+    return id;
+  }
+};
+var WebSocket;
+(function(WebSocket2) {
+  WebSocket2[WebSocket2["CLOSING"] = 2] = "CLOSING";
+  WebSocket2[WebSocket2["CLOSED"] = 3] = "CLOSED";
+})(WebSocket || (WebSocket = {}));
+
+export {
+  getTypename,
+  Protocol,
+  toUint8Array,
+  protocol,
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
+  WebSocketMuxer
+};
+//# sourceMappingURL=chunk-TKYUZ5ZK.mjs.map

package/dist/lib/browser/chunk-TKYUZ5ZK.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/edge-ws-muxer.ts", "../../../src/defs.ts", "../../../src/protocol.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Trigger } from '@dxos/async';\nimport { log } from '@dxos/log';\nimport { buf } from '@dxos/protocols/buf';\nimport { MessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nimport { protocol } from './defs';\n\n/**\n * 0000 0001 - message contains a part of segmented message chunk sequence.\n * The next byte defines a channel id and the rest of the message contains a part of Message proto binary.\n * Messages from different channels might interleave.\n * When the flag is NOT set the rest of the message should be interpreted as the valid Message proto binary.\n */\nconst FLAG_SEGMENT_SEQ = 1;\n/**\n * 0000 0010 - message terminates a segmented message chunk sequence.\n * All the chunks accumulated for the channel specified by the second byte can be concatenated\n * and interpreted as a valid Message proto binary.\n */\nconst FLAG_SEGMENT_SEQ_TERMINATED = 1 << 1;\n\n/**\n * https://developers.cloudflare.com/durable-objects/platform/limits/\n */\nexport const CLOUDFLARE_MESSAGE_MAX_BYTES = 1000 * 1000; // 1MB\nexport const CLOUDFLARE_RPC_MAX_BYTES = 32 * 1000 * 1000; // 32MB\n\nconst MAX_CHUNK_LENGTH = 16384;\nconst MAX_BUFFERED_AMOUNT = CLOUDFLARE_MESSAGE_MAX_BYTES;\nconst BUFFER_FULL_BACKOFF_TIMEOUT = 100;\n\nexport class WebSocketMuxer {\n  private readonly _inMessageAccumulator = new Map<number, Buffer[]>();\n  private readonly _outMessageChunks = new Map<number, MessageChunk[]>();\n  private readonly _outMessageChannelByService = new Map<string, number>();\n\n  private _sendTimeout: any | undefined;\n\n  private readonly _maxChunkLength: number;\n\n  constructor(\n    private readonly _ws: WebSocketCompat,\n    config?: { maxChunkLength: number },\n  ) {\n    this._maxChunkLength = config?.maxChunkLength ?? MAX_CHUNK_LENGTH;\n  }\n\n  /**\n   * Resolves when all the message chunks get enqueued for sending.\n   */\n  public async send(message: Message): Promise<void> {\n    const binary = buf.toBinary(MessageSchema, message);\n    const channelId = this._resolveChannel(message);\n    if (\n      (channelId == null && binary.byteLength > CLOUDFLARE_MESSAGE_MAX_BYTES) ||\n      binary.byteLength > CLOUDFLARE_RPC_MAX_BYTES\n    ) {\n      log.error('Large message dropped', {\n        byteLength: binary.byteLength,\n        serviceId: message.serviceId,\n        payload: protocol.getPayloadType(message),\n        channelId,\n      });\n      return;\n    }\n\n    if (channelId == null || binary.length < this._maxChunkLength) {\n      const flags = Buffer.from([0]);\n      this._ws.send(Buffer.concat([flags, binary]));\n      return;\n    }\n\n    const terminatorSentTrigger = new Trigger();\n    const messageChunks: MessageChunk[] = [];\n    for (let i = 0; i < binary.length; i += this._maxChunkLength) {\n      const chunk = binary.slice(i, i + this._maxChunkLength);\n      const isLastChunk = i + this._maxChunkLength >= binary.length;\n      if (isLastChunk) {\n        const flags = Buffer.from([FLAG_SEGMENT_SEQ | FLAG_SEGMENT_SEQ_TERMINATED, channelId]);\n        messageChunks.push({ payload: Buffer.concat([flags, chunk]), trigger: terminatorSentTrigger });\n      } else {\n        const flags = Buffer.from([FLAG_SEGMENT_SEQ, channelId]);\n        messageChunks.push({ payload: Buffer.concat([flags, chunk]) });\n      }\n    }\n\n    const queuedMessages = this._outMessageChunks.get(channelId);\n    if (queuedMessages) {\n      queuedMessages.push(...messageChunks);\n    } else {\n      this._outMessageChunks.set(channelId, messageChunks);\n    }\n\n    this._sendChunkedMessages();\n\n    return terminatorSentTrigger.wait();\n  }\n\n  public receiveData(data: Uint8Array): Message | undefined {\n    if ((data[0] & FLAG_SEGMENT_SEQ) === 0) {\n      return buf.fromBinary(MessageSchema, data.slice(1));\n    }\n\n    const [flags, channelId, ...payload] = data;\n    let chunkAccumulator = this._inMessageAccumulator.get(channelId);\n    if (chunkAccumulator) {\n      chunkAccumulator.push(Buffer.from(payload));\n    } else {\n      chunkAccumulator = [Buffer.from(payload)];\n      this._inMessageAccumulator.set(channelId, chunkAccumulator);\n    }\n\n    if ((flags & FLAG_SEGMENT_SEQ_TERMINATED) === 0) {\n      return undefined;\n    }\n\n    const message = buf.fromBinary(MessageSchema, Buffer.concat(chunkAccumulator));\n    this._inMessageAccumulator.delete(channelId);\n    return message;\n  }\n\n  public destroy() {\n    if (this._sendTimeout) {\n      clearTimeout(this._sendTimeout);\n      this._sendTimeout = undefined;\n    }\n    for (const channelChunks of this._outMessageChunks.values()) {\n      channelChunks.forEach((chunk) => chunk.trigger?.wake());\n    }\n    this._outMessageChunks.clear();\n    this._inMessageAccumulator.clear();\n    this._outMessageChannelByService.clear();\n  }\n\n  private _sendChunkedMessages() {\n    if (this._sendTimeout) {\n      return;\n    }\n\n    const send = () => {\n      if (this._ws.readyState === WebSocket.CLOSING || this._ws.readyState === WebSocket.CLOSED) {\n        log.warn('send called for closed websocket');\n        this._sendTimeout = undefined;\n        return;\n      }\n\n      let timeout = 0;\n      const emptyChannels: number[] = [];\n      for (const [channelId, messages] of this._outMessageChunks.entries()) {\n        if (this._ws.bufferedAmount != null) {\n          if (this._ws.bufferedAmount + MAX_CHUNK_LENGTH > MAX_BUFFERED_AMOUNT) {\n            timeout = BUFFER_FULL_BACKOFF_TIMEOUT;\n            break;\n          }\n        }\n\n        const nextMessage = messages.shift();\n        if (nextMessage) {\n          this._ws.send(nextMessage.payload);\n          nextMessage.trigger?.wake();\n        } else {\n          emptyChannels.push(channelId);\n        }\n      }\n\n      emptyChannels.forEach((channelId) => this._outMessageChunks.delete(channelId));\n\n      if (this._outMessageChunks.size > 0) {\n        this._sendTimeout = setTimeout(send, timeout);\n      } else {\n        this._sendTimeout = undefined;\n      }\n    };\n    this._sendTimeout = setTimeout(send);\n  }\n\n  private _resolveChannel(message: Message): number | undefined {\n    if (!message.serviceId) {\n      return undefined;\n    }\n    let id = this._outMessageChannelByService.get(message.serviceId);\n    if (!id) {\n      id = this._outMessageChannelByService.size + 1;\n      this._outMessageChannelByService.set(message.serviceId, id);\n    }\n    return id;\n  }\n}\n\ntype WebSocketCompat = {\n  readonly readyState: number;\n  /**\n   * Not available in workerd.\n   */\n  bufferedAmount?: number;\n  send(message: (ArrayBuffer | ArrayBufferView) | string): void;\n};\n\ntype MessageChunk = {\n  payload: Buffer;\n  /**\n   * Wakes when the payload is enqueued by WebSocket.\n   */\n  trigger?: Trigger;\n};\n\n/**\n * To avoid using isomorphic-ws on edge.\n */\nenum WebSocket {\n  CLOSING = 2,\n  CLOSED = 3,\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", "//\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"],
+  "mappings": "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",
+  "names": ["Trigger", "log", "buf", "MessageSchema", "bufWkt", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "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", "protocol", "Protocol", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "bufWkt", "AnySchema", "FLAG_SEGMENT_SEQ", "FLAG_SEGMENT_SEQ_TERMINATED", "CLOUDFLARE_MESSAGE_MAX_BYTES", "CLOUDFLARE_RPC_MAX_BYTES", "MAX_CHUNK_LENGTH", "MAX_BUFFERED_AMOUNT", "BUFFER_FULL_BACKOFF_TIMEOUT", "WebSocketMuxer", "constructor", "_ws", "config", "_inMessageAccumulator", "Map", "_outMessageChunks", "_outMessageChannelByService", "_maxChunkLength", "maxChunkLength", "send", "message", "binary", "buf", "toBinary", "MessageSchema", "channelId", "_resolveChannel", "byteLength", "log", "error", "serviceId", "payload", "protocol", "getPayloadType", "length", "flags", "Buffer", "from", "concat", "terminatorSentTrigger", "Trigger", "messageChunks", "i", "chunk", "slice", "isLastChunk", "push", "trigger", "queuedMessages", "get", "set", "_sendChunkedMessages", "wait", "receiveData", "data", "fromBinary", "chunkAccumulator", "undefined", "delete", "destroy", "_sendTimeout", "clearTimeout", "channelChunks", "values", "forEach", "wake", "clear", "readyState", "warn", "timeout", "emptyChannels", "messages", "entries", "bufferedAmount", "nextMessage", "shift", "size", "setTimeout", "id", "WebSocket"]
+}

package/dist/lib/browser/edge-ws-muxer.mjs

@@ -0,0 +1,11 @@
+import {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
+  WebSocketMuxer
+} from "./chunk-TKYUZ5ZK.mjs";
+export {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
+  WebSocketMuxer
+};
+//# sourceMappingURL=edge-ws-muxer.mjs.map

package/dist/lib/browser/edge-ws-muxer.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/dist/lib/browser/index.mjs

@@ -1,9 +1,12 @@
 import {
+  CLOUDFLARE_MESSAGE_MAX_BYTES,
+  CLOUDFLARE_RPC_MAX_BYTES,
   Protocol,
+  WebSocketMuxer,
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-ZWJXA37R.mjs";
+} from "./chunk-TKYUZ5ZK.mjs";
 
 // packages/core/mesh/edge-client/src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
@@ -60,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) {
@@ -71,7 +75,6 @@ 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();
@@ -89,47 +92,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)
         });
@@ -140,7 +169,7 @@ var EdgeWsConnection = class extends Resource {
           currentIdentity: this._identity
         }, {
           F: __dxlog_file2,
-          L: 80,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -153,11 +182,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) => {
@@ -167,7 +197,7 @@ var EdgeWsConnection = class extends Resource {
           info: event.message
         }, {
           F: __dxlog_file2,
-          L: 91,
+          L: 100,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -177,7 +207,7 @@ var EdgeWsConnection = class extends Resource {
           error: event.error
         }, {
           F: __dxlog_file2,
-          L: 94,
+          L: 103,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -189,7 +219,7 @@ var EdgeWsConnection = class extends Resource {
           event: event.type
         }, {
           F: __dxlog_file2,
-          L: 102,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -199,15 +229,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)
         });
@@ -221,6 +254,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;
@@ -229,7 +264,7 @@ var EdgeWsConnection = class extends Resource {
         err
       }, {
         F: __dxlog_file2,
-        L: 128,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -238,7 +273,7 @@ var EdgeWsConnection = class extends Resource {
   _scheduleHeartbeats() {
     invariant2(this._ws, void 0, {
       F: __dxlog_file2,
-      L: 133,
+      L: 151,
       S: this,
       A: [
         "this._ws",
@@ -258,13 +293,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)
         });
@@ -354,7 +389,7 @@ var EdgeClient = class extends Resource2 {
       });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
-      this._persistentLifecycle.scheduleRestart();
+      void this._persistentLifecycle.scheduleRestart();
     }
   }
   onMessage(listener) {
@@ -466,7 +501,7 @@ 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,
@@ -792,7 +827,6 @@ var EdgeHttpClient = class {
   async uploadFunction(pathParts, body, args) {
     const path = [
       "functions",
-      pathParts.spaceId,
       ...pathParts.functionId ? [
         pathParts.functionId
       ] : []
@@ -991,11 +1025,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,