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

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;AAQpD;;GAEG;AACH,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD,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"}
+{"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"}

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

@@ -6,5 +6,4 @@ 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;AAChC,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"}

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

@@ -1,7 +1,6 @@
 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;
@@ -14,12 +13,9 @@ export declare const createTestEdgeWsServer: (port?: number, params?: TestEdgeWs
     messageSourceLog: any[];
     endpoint: string;
     cleanup: () => void;
-    currentConnection: () => {
-        ws: WebSocket;
-        muxer: WebSocketMuxer;
-    } | undefined;
+    currentConnection: () => WebSocket | undefined;
     sendResponseMessage: (request: Message, responsePayload: Uint8Array) => void;
-    sendMessage: (msg: Message) => Promise<void>;
+    sendMessage: (msg: Message) => 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;AAI5G,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"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-staging.7ac8446",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -36,21 +36,21 @@
   "dependencies": {
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/credentials": "0.8.2-main.f11618f",
-    "@dxos/context": "0.8.2-main.f11618f",
-    "@dxos/crypto": "0.8.2-main.f11618f",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f",
-    "@dxos/keyring": "0.8.2-main.f11618f",
-    "@dxos/debug": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/keys": "0.8.2-main.f11618f",
-    "@dxos/node-std": "0.8.2-main.f11618f",
-    "@dxos/protocols": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f"
+    "@dxos/async": "0.8.2-staging.7ac8446",
+    "@dxos/context": "0.8.2-staging.7ac8446",
+    "@dxos/credentials": "0.8.2-staging.7ac8446",
+    "@dxos/crypto": "0.8.2-staging.7ac8446",
+    "@dxos/keyring": "0.8.2-staging.7ac8446",
+    "@dxos/debug": "0.8.2-staging.7ac8446",
+    "@dxos/keys": "0.8.2-staging.7ac8446",
+    "@dxos/invariant": "0.8.2-staging.7ac8446",
+    "@dxos/log": "0.8.2-staging.7ac8446",
+    "@dxos/protocols": "0.8.2-staging.7ac8446",
+    "@dxos/node-std": "0.8.2-staging.7ac8446",
+    "@dxos/util": "0.8.2-staging.7ac8446"
   },
   "devDependencies": {
-    "@dxos/test-utils": "0.8.2-main.f11618f"
+    "@dxos/test-utils": "0.8.2-staging.7ac8446"
   },
   "publishConfig": {
     "access": "public"

package/src/edge-client.test.ts

@@ -7,7 +7,6 @@ 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';
@@ -41,17 +40,17 @@ describe('EdgeClient', () => {
 
     const { client } = await openNewClient(endpoint);
 
-    expect(client.status).toBe(EdgeStatus.NOT_CONNECTED);
+    expect(client.isConnected).toBeFalsy();
     admitConnection.wake();
-    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
+    await expect.poll(() => client.isConnected).toBeTruthy();
 
     admitConnection.reset();
     await closeConnection();
     expect(client.isOpen).is.true;
-    await expect.poll(() => client.status).toBe(EdgeStatus.NOT_CONNECTED);
+    await expect.poll(() => client.isConnected).toBeFalsy();
 
     admitConnection.wake();
-    await expect.poll(() => client.status).toBe(EdgeStatus.CONNECTED);
+    await expect.poll(() => client.isConnected).toBeTruthy();
   });
 
   test('set identity reconnects', async () => {

package/src/edge-client.ts

@@ -2,11 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from '@dxos/async';
+import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle } 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';
@@ -21,12 +20,11 @@ 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 status(): EdgeStatus;
+  get isConnected(): boolean;
   setIdentity(identity: EdgeIdentity): void;
   onMessage(listener: MessageListener): () => void;
   onReconnected(listener: ReconnectListener): () => void;
@@ -47,8 +45,6 @@ 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),
@@ -56,8 +52,10 @@ 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();
 
@@ -74,16 +72,13 @@ 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 status(): EdgeStatus {
-    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() {
@@ -99,7 +94,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
       log('Edge identity changed', { identity, oldIdentity: this._identity });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
-      void this._persistentLifecycle.scheduleRestart();
+      this._persistentLifecycle.scheduleRestart();
     }
   }
 
@@ -176,7 +171,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
         onRestartRequired: () => {
           if (this._isActive(connection)) {
             this._closeCurrentConnection();
-            void this._persistentLifecycle.scheduleRestart();
+            this._persistentLifecycle.scheduleRestart();
           } else {
             log.verbose('restart requested by inactive connection');
           }
@@ -206,18 +201,15 @@ 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

@@ -13,17 +13,15 @@ import { MessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messe
 
 import { protocol } from './defs';
 import { type EdgeIdentity } from './edge-identity';
-import { CLOUDFLARE_MESSAGE_LENGTH_LIMIT, WebSocketMuxer } from './edge-ws-muxer';
 import { toUint8Array } from './protocol';
 
 const SIGNAL_KEEPALIVE_INTERVAL = 4_000;
 const SIGNAL_KEEPALIVE_TIMEOUT = 12_000;
 
-const EDGE_WEBSOCKET_PROTOCOL_V0 = 'edge-ws-v0';
 /**
- * Supports message segmentation and muxing.
+ * 1MB websocket message limit: https://developers.cloudflare.com/durable-objects/platform/limits/
  */
-export const EDGE_WEBSOCKET_PROTOCOL_V1 = 'edge-ws-v1';
+const CLOUDFLARE_MESSAGE_LENGTH_LIMIT = 1024 * 1024;
 
 export type EdgeWsConnectionCallbacks = {
   onConnected: () => void;
@@ -34,7 +32,6 @@ 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,
@@ -55,34 +52,24 @@ 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) });
-    if (this._ws?.protocol.includes(EDGE_WEBSOCKET_PROTOCOL_V0)) {
-      const binary = buf.toBinary(MessageSchema, message);
-      if (binary.length > CLOUDFLARE_MESSAGE_LENGTH_LIMIT) {
-        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));
+    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;
     }
+    this._ws.send(encoded);
   }
 
   protected override async _open() {
-    const baseProtocols = [EDGE_WEBSOCKET_PROTOCOL_V0, EDGE_WEBSOCKET_PROTOCOL_V1];
     this._ws = new WebSocket(
       this._connectionInfo.url.toString(),
-      this._connectionInfo.protocolHeader
-        ? [...baseProtocols, this._connectionInfo.protocolHeader]
-        : [...baseProtocols],
+      this._connectionInfo.protocolHeader ? [this._connectionInfo.protocolHeader] : [],
     );
-    const muxer = new WebSocketMuxer(this._ws);
-    this._wsMuxer = muxer;
 
     this._ws.onopen = () => {
       if (this.isOpen) {
@@ -97,7 +84,6 @@ 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) => {
@@ -120,16 +106,9 @@ export class EdgeWsConnection extends Resource {
         this._rescheduleHeartbeatTimeout();
         return;
       }
-      const bytes = await toUint8Array(event.data);
-      if (!this.isOpen) {
-        return;
-      }
-
-      const message = this._ws?.protocol?.includes(EDGE_WEBSOCKET_PROTOCOL_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) });
         this._callbacks.onMessage(message);
       }
@@ -142,8 +121,6 @@ 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/index.ts

@@ -11,4 +11,3 @@ export * from './errors';
 export * from './auth';
 export * from './edge-http-client';
 export * from './edge-identity';
-export * from './edge-ws-muxer';

package/src/testing/test-utils.ts

@@ -10,8 +10,6 @@ import { buf } from '@dxos/protocols/buf';
 import { MessageSchema, TextMessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 
 import { protocol } from '../defs';
-import { EDGE_WEBSOCKET_PROTOCOL_V1 } from '../edge-ws-connection';
-import { WebSocketMuxer } from '../edge-ws-muxer';
 import { toUint8Array } from '../protocol';
 
 export const DEFAULT_PORT = 8080;
@@ -23,33 +21,24 @@ type TestEdgeWsServerParams = {
 };
 
 export const createTestEdgeWsServer = async (port = DEFAULT_PORT, params?: TestEdgeWsServerParams) => {
-  const wsServer = new WebSocket.Server({
-    port,
-    verifyClient: createConnectionDelayHandler(params),
-    handleProtocols: () => [EDGE_WEBSOCKET_PROTOCOL_V1],
-  });
+  const server = new WebSocket.Server({ port, verifyClient: createConnectionDelayHandler(params) });
 
-  let connection: { ws: WebSocket; muxer: WebSocketMuxer } | undefined;
+  let connection: WebSocket | undefined;
 
   const messageSink: any[] = [];
   const messageSourceLog: any[] = [];
   const closeTrigger = new Trigger();
-  const sendResponseMessage = createResponseSender(() => connection!.muxer);
+  const sendResponseMessage = createResponseSender(() => connection!);
 
-  wsServer.on('connection', (ws) => {
-    const muxer = new WebSocketMuxer(ws);
-    connection = { ws, muxer };
+  server.on('connection', (ws) => {
+    connection = ws;
     ws.on('error', (err) => log.catch(err));
     ws.on('message', async (data) => {
       if (String(data) === '__ping__') {
         ws.send('__pong__');
         return;
       }
-      const message = muxer.receiveData(await toUint8Array(data));
-      if (!message) {
-        return;
-      }
-      const { request, requestPayload } = await decodePayload(message, params);
+      const { request, requestPayload } = await decodeRequest(params, data);
       messageSourceLog.push(request.source);
       if (params?.messageHandler) {
         const responsePayload = await params.messageHandler(requestPayload);
@@ -68,19 +57,19 @@ export const createTestEdgeWsServer = async (port = DEFAULT_PORT, params?: TestE
   });
 
   return {
-    server: wsServer,
+    server,
     messageSink,
     messageSourceLog,
-    endpoint: `ws://127.0.0.1:${port}`,
-    cleanup: () => wsServer.close(),
+    endpoint: `ws://localhost:${port}`,
+    cleanup: () => server.close(),
     currentConnection: () => connection,
     sendResponseMessage,
     sendMessage: (msg: Message) => {
-      return connection!.muxer.send(msg);
+      connection!.send(buf.toBinary(MessageSchema, msg));
     },
     closeConnection: () => {
       closeTrigger.reset();
-      connection!.ws.close(1011);
+      connection!.close(1011);
       return closeTrigger.wait();
     },
   };
@@ -100,23 +89,27 @@ const createConnectionDelayHandler = (params: TestEdgeWsServerParams | undefined
   };
 };
 
-const createResponseSender = (connection: () => WebSocketMuxer) => {
+const createResponseSender = (connection: () => WebSocket) => {
   return (request: Message, responsePayload: Uint8Array) => {
     const recipient = request.source!;
-    void connection().send(
-      buf.create(MessageSchema, {
-        source: {
-          identityKey: recipient.identityKey,
-          peerKey: recipient.peerKey,
-        },
-        serviceId: request.serviceId!,
-        payload: { value: responsePayload },
-      }),
+    connection().send(
+      buf.toBinary(
+        MessageSchema,
+        buf.create(MessageSchema, {
+          source: {
+            identityKey: recipient.identityKey,
+            peerKey: recipient.peerKey,
+          },
+          serviceId: request.serviceId!,
+          payload: { value: responsePayload },
+        }),
+      ),
     );
   };
 };
 
-const decodePayload = async (request: Message, params: TestEdgeWsServerParams | undefined) => {
+const decodeRequest = async (params: TestEdgeWsServerParams | undefined, data: any) => {
+  const request = buf.fromBinary(MessageSchema, await toUint8Array(data));
   const requestPayload = params?.payloadDecoder
     ? params.payloadDecoder(request.payload!.value!)
     : protocol.getPayload(request, TextMessageSchema);