@dxos/edge-client 0.8.1 → 0.8.2-main.2f9c567

package/dist/types/src/edge-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-client.d.ts","sourceRoot":"","sources":["../../../src/edge-client.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAG1E,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AAGzE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AACzD,MAAM,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC;AAE3C,MAAM,WAAW,cAAe,SAAQ,QAAQ,CAAC,SAAS,CAAC;IACzD,IAAI,IAAI,IAAI,GAAG,CAAC;IAChB,IAAI,WAAW,IAAI,MAAM,CAAC;IAC1B,IAAI,OAAO,IAAI,MAAM,CAAC;IACtB,IAAI,MAAM,IAAI,OAAO,CAAC;IACtB,IAAI,WAAW,IAAI,OAAO,CAAC;IAC3B,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IACjD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,cAAc;IAgB9D,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAGlC;IAEH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAgC;IAEpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IAEtC,OAAO,CAAC,kBAAkB,CAAC,CAA+B;IAC1D,OAAO,CAAC,MAAM,CAAiB;gBAGrB,SAAS,EAAE,YAAY,EACd,OAAO,EAAE,eAAe;IAO3C,IACW,IAAI;;;;MAMd;IAED,IAAI,WAAW,YAEd;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,WAAW,CAAC,QAAQ,EAAE,YAAY;IAS3B,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAKhD,aAAa,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAkBtD;;OAEG;cACsB,KAAK;IAO9B;;OAEG;cACsB,MAAM;YAMjB,QAAQ;YA2DR,WAAW;IAIzB,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IAU9B;;;OAGG;IACU,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAoBpC,iBAAiB;IAY/B,OAAO,CAAC,SAAS,CAA4E;CAC9F"}
+{"version":3,"file":"edge-client.d.ts","sourceRoot":"","sources":["../../../src/edge-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiE,KAAK,EAAE,MAAM,aAAa,CAAC;AACnG,OAAO,EAAE,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAGxE,OAAO,EAAE,KAAK,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AAGzE,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AACzD,MAAM,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC;AAE3C,MAAM,WAAW,cAAe,SAAQ,QAAQ,CAAC,SAAS,CAAC;IACzD,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,IAAI,IAAI,IAAI,GAAG,CAAC;IAChB,IAAI,WAAW,IAAI,MAAM,CAAC;IAC1B,IAAI,OAAO,IAAI,MAAM,CAAC;IACtB,IAAI,MAAM,IAAI,OAAO,CAAC;IACtB,IAAI,MAAM,IAAI,UAAU,CAAC;IACzB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;IAC1C,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IACjD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,cAAc;IAgB9D,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhB1B,SAAgB,aAAa,oBAA2B;IAExD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAGlC;IAEH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAgC;IACpE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,kBAAkB,CAAC,CAA+B;IAC1D,OAAO,CAAC,MAAM,CAAiB;gBAGrB,SAAS,EAAE,YAAY,EACd,OAAO,EAAE,eAAe;IAO3C,IACW,IAAI;;;;;MAOd;IAED,IAAI,MAAM,IAAI,UAAU,CAIvB;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,WAAW,CAAC,QAAQ,EAAE,YAAY;IAS3B,SAAS,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAKhD,aAAa,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAkBtD;;OAEG;cACsB,KAAK;IAO9B;;OAEG;cACsB,MAAM;YAMjB,QAAQ;YA2DR,WAAW;IAKzB,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,sBAAsB;IAU9B;;;OAGG;IACU,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAoBpC,iBAAiB;IAY/B,OAAO,CAAC,SAAS,CAA4E;CAC9F"}

package/dist/types/src/edge-ws-connection.d.ts

@@ -12,6 +12,7 @@ export declare class EdgeWsConnection extends Resource {
     private readonly _callbacks;
     private _inactivityTimeoutCtx;
     private _ws;
+    private _wsMuxer;
     constructor(_identity: EdgeIdentity, _connectionInfo: {
         url: URL;
         protocolHeader?: string;

package/dist/types/src/edge-ws-connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-ws-connection.d.ts","sourceRoot":"","sources":["../../../src/edge-ws-connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIlD,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAGzF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAWpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,QAAQ;IAK1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAN7B,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,GAAG,CAAwB;gBAGhB,SAAS,EAAE,YAAY,EACvB,eAAe,EAAE;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACtD,UAAU,EAAE,yBAAyB;IAKxD,IACW,IAAI;;;;MAMd;IAEM,IAAI,CAAC,OAAO,EAAE,OAAO;cAeH,KAAK;cAkDL,MAAM;IAc/B,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,2BAA2B;CAiBpC"}
+{"version":3,"file":"edge-ws-connection.d.ts","sourceRoot":"","sources":["../../../src/edge-ws-connection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKlD,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAGzF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAOpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACtC,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B,CAAC;AAEF,qBAAa,gBAAiB,SAAQ,QAAQ;IAM1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAP7B,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,QAAQ,CAA6B;gBAG1B,SAAS,EAAE,YAAY,EACvB,eAAe,EAAE;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EACtD,UAAU,EAAE,yBAAyB;IAKxD,IACW,IAAI;;;;MAMd;IAEM,IAAI,CAAC,OAAO,EAAE,OAAO;cAoBH,KAAK;cA+DL,MAAM;IAgB/B,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,2BAA2B;CAiBpC"}

package/dist/types/src/edge-ws-muxer.d.ts

@@ -0,0 +1,35 @@
+import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+/**
+ * https://developers.cloudflare.com/durable-objects/platform/limits/
+ */
+export declare const CLOUDFLARE_MESSAGE_MAX_BYTES: number;
+export declare const CLOUDFLARE_RPC_MAX_BYTES: number;
+export declare class WebSocketMuxer {
+    private readonly _ws;
+    private readonly _inMessageAccumulator;
+    private readonly _outMessageChunks;
+    private readonly _outMessageChannelByService;
+    private _sendTimeout;
+    private readonly _maxChunkLength;
+    constructor(_ws: WebSocketCompat, config?: {
+        maxChunkLength: number;
+    });
+    /**
+     * Resolves when all the message chunks get enqueued for sending.
+     */
+    send(message: Message): Promise<void>;
+    receiveData(data: Uint8Array): Message | undefined;
+    destroy(): void;
+    private _sendChunkedMessages;
+    private _resolveChannel;
+}
+type WebSocketCompat = {
+    readonly readyState: number;
+    /**
+     * Not available in workerd.
+     */
+    bufferedAmount?: number;
+    send(message: (ArrayBuffer | ArrayBufferView) | string): void;
+};
+export {};
+//# sourceMappingURL=edge-ws-muxer.d.ts.map

package/dist/types/src/edge-ws-muxer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-ws-muxer.d.ts","sourceRoot":"","sources":["../../../src/edge-ws-muxer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAkBzF;;GAEG;AACH,eAAO,MAAM,4BAA4B,QAAc,CAAC;AACxD,eAAO,MAAM,wBAAwB,QAAmB,CAAC;AAMzD,qBAAa,cAAc;IAUvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IATtB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAA+B;IACrE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqC;IACvE,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAA6B;IAEzE,OAAO,CAAC,YAAY,CAAkB;IAEtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;gBAGtB,GAAG,EAAE,eAAe,EACrC,MAAM,CAAC,EAAE;QAAE,cAAc,EAAE,MAAM,CAAA;KAAE;IAKrC;;OAEG;IACU,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD3C,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,GAAG,SAAS;IAuBlD,OAAO;IAad,OAAO,CAAC,oBAAoB;IA0C5B,OAAO,CAAC,eAAe;CAWxB;AAED,KAAK,eAAe,GAAG;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,GAAG,eAAe,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;CAC/D,CAAC"}

package/dist/types/src/edge-ws-muxer.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=edge-ws-muxer.test.d.ts.map

package/dist/types/src/edge-ws-muxer.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge-ws-muxer.test.d.ts","sourceRoot":"","sources":["../../../src/edge-ws-muxer.test.ts"],"names":[],"mappings":""}

package/dist/types/src/index.d.ts

@@ -6,4 +6,5 @@ export * from './errors';
 export * from './auth';
 export * from './edge-http-client';
 export * from './edge-identity';
+export * from './edge-ws-muxer';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,4CAA4C,CAAC;AAE3D,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,4CAA4C,CAAC;AAE3D,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC"}

package/dist/types/src/testing/test-utils.d.ts

@@ -1,6 +1,7 @@
 import WebSocket from 'isomorphic-ws';
 import { Trigger } from '@dxos/async';
 import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { WebSocketMuxer } from '../edge-ws-muxer';
 export declare const DEFAULT_PORT = 8080;
 type TestEdgeWsServerParams = {
     admitConnection?: Trigger;
@@ -13,9 +14,12 @@ export declare const createTestEdgeWsServer: (port?: number, params?: TestEdgeWs
     messageSourceLog: any[];
     endpoint: string;
     cleanup: () => void;
-    currentConnection: () => WebSocket | undefined;
+    currentConnection: () => {
+        ws: WebSocket;
+        muxer: WebSocketMuxer;
+    } | undefined;
     sendResponseMessage: (request: Message, responsePayload: Uint8Array) => void;
-    sendMessage: (msg: Message) => void;
+    sendMessage: (msg: Message) => Promise<void>;
     closeConnection: () => Promise<void>;
 }>;
 export {};

package/dist/types/src/testing/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-utils.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAGtC,OAAO,EAAoC,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAK5G,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,KAAK,sBAAsB,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,GAAG,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;CACpE,CAAC;AAEF,eAAO,MAAM,sBAAsB,2BAAwC,sBAAsB;;;;;;;mCAsE9E,OAAO,mBAAmB,UAAU;uBA1BhC,OAAO;;EAS7B,CAAC"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-utils.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,eAAe,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAItC,OAAO,EAAoC,KAAK,OAAO,EAAE,MAAM,4CAA4C,CAAC;AAG5G,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,KAAK,sBAAsB,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,GAAG,CAAC;IAC9C,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;CACpE,CAAC;AAEF,eAAO,MAAM,sBAAsB,2BAAwC,sBAAsB;;;;;;;YAOzE,SAAS;eAAS,cAAc;;mCAwErC,OAAO,mBAAmB,UAAU;uBA1BhC,OAAO;;EAS7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.8.1",
+  "version": "0.8.2-main.2f9c567",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,6 +14,11 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
+    "./muxer": {
+      "types": "./dist/types/src/edge-ws-muxer.d.ts",
+      "browser": "./dist/lib/browser/edge-ws-muxer.mjs",
+      "node": "./dist/lib/node-esm/edge-ws-muxer.mjs"
+    },
     "./testing": {
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
@@ -36,21 +41,21 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/credentials": "0.8.1",
-    "@dxos/crypto": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/log": "0.8.1",
-    "@dxos/node-std": "0.8.1",
-    "@dxos/keyring": "0.8.1",
-    "@dxos/protocols": "0.8.1",
-    "@dxos/util": "0.8.1"
+    "@dxos/async": "0.8.2-main.2f9c567",
+    "@dxos/context": "0.8.2-main.2f9c567",
+    "@dxos/credentials": "0.8.2-main.2f9c567",
+    "@dxos/crypto": "0.8.2-main.2f9c567",
+    "@dxos/invariant": "0.8.2-main.2f9c567",
+    "@dxos/debug": "0.8.2-main.2f9c567",
+    "@dxos/keyring": "0.8.2-main.2f9c567",
+    "@dxos/keys": "0.8.2-main.2f9c567",
+    "@dxos/node-std": "0.8.2-main.2f9c567",
+    "@dxos/protocols": "0.8.2-main.2f9c567",
+    "@dxos/util": "0.8.2-main.2f9c567",
+    "@dxos/log": "0.8.2-main.2f9c567"
   },
   "devDependencies": {
-    "@dxos/test-utils": "0.8.1"
+    "@dxos/test-utils": "0.8.2-main.2f9c567"
   },
   "publishConfig": {
     "access": "public"

package/src/edge-client.test.ts

@@ -7,6 +7,7 @@ import { describe, expect, onTestFinished, test } from 'vitest';
 import { Trigger } from '@dxos/async';
 import { Keyring } from '@dxos/keyring';
 import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { openAndClose } from '@dxos/test-utils';
 
 import { createEphemeralEdgeIdentity, createTestHaloEdgeIdentity } from './auth';
@@ -40,17 +41,17 @@ describe('EdgeClient', () => {
 
     const { client } = await openNewClient(endpoint);
 
-    expect(client.isConnected).toBeFalsy();
+    expect(client.status).toBe(EdgeStatus.NOT_CONNECTED);
     admitConnection.wake();
-    await expect.poll(() => client.isConnected).toBeTruthy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
 
     admitConnection.reset();
     await closeConnection();
     expect(client.isOpen).is.true;
-    await expect.poll(() => client.isConnected).toBeFalsy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.NOT_CONNECTED);
 
     admitConnection.wake();
-    await expect.poll(() => client.isConnected).toBeTruthy();
+    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
   });
 
   test('set identity reconnects', async () => {

package/src/edge-client.ts

@@ -2,10 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } from '@dxos/async';
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from '@dxos/async';
 import { Resource, type Lifecycle } from '@dxos/context';
 import { log, logInfo } from '@dxos/log';
 import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 
 import { protocol } from './defs';
 import { type EdgeIdentity, handleAuthChallenge } from './edge-identity';
@@ -20,11 +21,12 @@ export type MessageListener = (message: Message) => void;
 export type ReconnectListener = () => void;
 
 export interface EdgeConnection extends Required<Lifecycle> {
+  statusChanged: Event<EdgeStatus>;
   get info(): any;
   get identityKey(): string;
   get peerKey(): string;
   get isOpen(): boolean;
-  get isConnected(): boolean;
+  get status(): EdgeStatus;
   setIdentity(identity: EdgeIdentity): void;
   onMessage(listener: MessageListener): () => void;
   onReconnected(listener: ReconnectListener): () => void;
@@ -45,6 +47,8 @@ export type MessengerConfig = {
  *  - Dispatches connection state and message notifications.
  */
 export class EdgeClient extends Resource implements EdgeConnection {
+  public readonly statusChanged = new Event<EdgeStatus>();
+
   private readonly _persistentLifecycle = new PersistentLifecycle<EdgeWsConnection>({
     start: async () => this._connect(),
     stop: async (state: EdgeWsConnection) => this._disconnect(state),
@@ -52,10 +56,8 @@ export class EdgeClient extends Resource implements EdgeConnection {
 
   private readonly _messageListeners = new Set<MessageListener>();
   private readonly _reconnectListeners = new Set<ReconnectListener>();
-
   private readonly _baseWsUrl: string;
   private readonly _baseHttpUrl: string;
-
   private _currentConnection?: EdgeWsConnection = undefined;
   private _ready = new Trigger();
 
@@ -72,13 +74,16 @@ export class EdgeClient extends Resource implements EdgeConnection {
   public get info() {
     return {
       open: this.isOpen,
+      status: this.status,
       identity: this._identity.identityKey,
       device: this._identity.peerKey,
     };
   }
 
-  get isConnected() {
-    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED;
+  get status(): EdgeStatus {
+    return Boolean(this._currentConnection) && this._ready.state === TriggerState.RESOLVED
+      ? EdgeStatus.CONNECTED
+      : EdgeStatus.NOT_CONNECTED;
   }
 
   get identityKey() {
@@ -94,7 +99,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
       log('Edge identity changed', { identity, oldIdentity: this._identity });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
-      this._persistentLifecycle.scheduleRestart();
+      void this._persistentLifecycle.scheduleRestart();
     }
   }
 
@@ -171,7 +176,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
         onRestartRequired: () => {
           if (this._isActive(connection)) {
             this._closeCurrentConnection();
-            this._persistentLifecycle.scheduleRestart();
+            void this._persistentLifecycle.scheduleRestart();
           } else {
             log.verbose('restart requested by inactive connection');
           }
@@ -201,15 +206,18 @@ export class EdgeClient extends Resource implements EdgeConnection {
 
   private async _disconnect(state: EdgeWsConnection) {
     await state.close();
+    this.statusChanged.emit(this.status);
   }
 
   private _closeCurrentConnection(error: Error = new EdgeConnectionClosedError()) {
     this._currentConnection = undefined;
     this._ready.throw(error);
     this._ready.reset();
+    this.statusChanged.emit(this.status);
   }
 
   private _notifyReconnected() {
+    this.statusChanged.emit(this.status);
     for (const listener of this._reconnectListeners) {
       try {
         listener();

package/src/edge-ws-connection.ts

@@ -8,21 +8,18 @@ import { scheduleTask, scheduleTaskInterval } from '@dxos/async';
 import { Context, Resource } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { log, logInfo } from '@dxos/log';
+import { EdgeWebsocketProtocol } from '@dxos/protocols';
 import { buf } from '@dxos/protocols/buf';
 import { MessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 
 import { protocol } from './defs';
 import { type EdgeIdentity } from './edge-identity';
+import { CLOUDFLARE_MESSAGE_MAX_BYTES, WebSocketMuxer } from './edge-ws-muxer';
 import { toUint8Array } from './protocol';
 
 const SIGNAL_KEEPALIVE_INTERVAL = 4_000;
 const SIGNAL_KEEPALIVE_TIMEOUT = 12_000;
 
-/**
- * 1MB websocket message limit: https://developers.cloudflare.com/durable-objects/platform/limits/
- */
-const CLOUDFLARE_MESSAGE_LENGTH_LIMIT = 1024 * 1024;
-
 export type EdgeWsConnectionCallbacks = {
   onConnected: () => void;
   onMessage: (message: Message) => void;
@@ -32,6 +29,7 @@ export type EdgeWsConnectionCallbacks = {
 export class EdgeWsConnection extends Resource {
   private _inactivityTimeoutCtx: Context | undefined;
   private _ws: WebSocket | undefined;
+  private _wsMuxer: WebSocketMuxer | undefined;
 
   constructor(
     private readonly _identity: EdgeIdentity,
@@ -52,24 +50,34 @@ export class EdgeWsConnection extends Resource {
 
   public send(message: Message) {
     invariant(this._ws);
+    invariant(this._wsMuxer);
     log('sending...', { peerKey: this._identity.peerKey, payload: protocol.getPayloadType(message) });
-    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),
-      });
-      return;
+    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),
+        });
+        return;
+      }
+      this._ws.send(binary);
+    } else {
+      this._wsMuxer.send(message).catch((e) => log.catch(e));
     }
-    this._ws.send(encoded);
   }
 
   protected override async _open() {
+    const baseProtocols = [...Object.values(EdgeWebsocketProtocol)];
     this._ws = new WebSocket(
       this._connectionInfo.url.toString(),
-      this._connectionInfo.protocolHeader ? [this._connectionInfo.protocolHeader] : [],
+      this._connectionInfo.protocolHeader
+        ? [...baseProtocols, this._connectionInfo.protocolHeader]
+        : [...baseProtocols],
     );
+    const muxer = new WebSocketMuxer(this._ws);
+    this._wsMuxer = muxer;
 
     this._ws.onopen = () => {
       if (this.isOpen) {
@@ -84,6 +92,7 @@ export class EdgeWsConnection extends Resource {
       if (this.isOpen) {
         log.warn('disconnected while being open', { code: event.code, reason: event.reason });
         this._callbacks.onRestartRequired();
+        muxer.destroy();
       }
     };
     this._ws.onerror = (event) => {
@@ -106,9 +115,16 @@ export class EdgeWsConnection 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) });
         this._callbacks.onMessage(message);
       }
@@ -121,6 +137,8 @@ export class EdgeWsConnection extends Resource {
     try {
       this._ws?.close();
       this._ws = undefined;
+      this._wsMuxer?.destroy();
+      this._wsMuxer = undefined;
     } catch (err) {
       if (err instanceof Error && err.message.includes('WebSocket is closed before the connection is established.')) {
         return;

package/src/edge-ws-muxer.test.ts

@@ -0,0 +1,55 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { describe, expect, test } from 'vitest';
+
+import { bufWkt } from '@dxos/protocols/buf';
+import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+
+import { protocol } from './defs';
+import type { EdgeIdentity } from './edge-identity';
+import { WebSocketMuxer } from './edge-ws-muxer';
+
+const MAX_CHUNK_LENGTH = 16;
+
+describe('WebSocketMuxerTest', () => {
+  test('basic message reassembly', async () => {
+    const { muxer: muxer1, sentMessages } = await createMuxer();
+    const { muxer: muxer2 } = await createMuxer();
+    const content = 'A'.repeat(MAX_CHUNK_LENGTH);
+    await muxer1.send(textMessage(content));
+
+    expect(sentMessages.length).toBeGreaterThan(1);
+    for (const chunk of sentMessages.slice(0, -1)) {
+      expect(muxer2.receiveData(chunk)).toBeUndefined();
+    }
+
+    const reassembledMessage = muxer2.receiveData(sentMessages.at(-1)!)!;
+    expect(reassembledMessage).toBeDefined();
+
+    const decoded = bufWkt.anyUnpack(reassembledMessage.payload!, TextMessageSchema);
+    expect(decoded?.message).toStrictEqual(content);
+  });
+});
+
+const textMessage = (message: string, source?: EdgeIdentity) =>
+  protocol.createMessage(TextMessageSchema, {
+    source: source && { peerKey: source.peerKey, identityKey: source.identityKey },
+    serviceId: 'test-service',
+    payload: { message },
+  });
+
+const createMuxer = async () => {
+  const sentMessages: Uint8Array[] = [];
+  const muxer = new WebSocketMuxer(
+    {
+      readyState: 1,
+      send: (message: string) => {
+        sentMessages.push(Buffer.from(message));
+      },
+    },
+    { maxChunkLength: MAX_CHUNK_LENGTH },
+  );
+  return { muxer, sentMessages };
+};