@dxos/edge-client 0.6.12-main.5cc132e → 0.6.12-main.78ddbdf

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

@@ -0,0 +1,123 @@
+import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  protocol,
+  toUint8Array
+} from "../chunk-HNVT57AU.mjs";
+
+// packages/core/mesh/edge-client/src/testing/test-utils.ts
+import WebSocket from "isomorphic-ws";
+import { Trigger } from "@dxos/async";
+import { log } from "@dxos/log";
+import { buf } from "@dxos/protocols/buf";
+import { MessageSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/testing/test-utils.ts";
+var DEFAULT_PORT = 8080;
+var createTestEdgeWsServer = async (port = DEFAULT_PORT, params) => {
+  const server = new WebSocket.Server({
+    port,
+    verifyClient: createConnectionDelayHandler(params)
+  });
+  let connection;
+  const messageSink = [];
+  const closeTrigger = new Trigger();
+  const sendResponseMessage = createResponseSender(() => connection);
+  server.on("connection", (ws) => {
+    connection = ws;
+    ws.on("error", (err) => log.catch(err, void 0, {
+      F: __dxlog_file,
+      L: 34,
+      S: void 0,
+      C: (f, a) => f(...a)
+    }));
+    ws.on("message", async (data) => {
+      if (String(data) === "__ping__") {
+        ws.send("__pong__");
+        return;
+      }
+      const { request, requestPayload } = await decodeRequest(params, data);
+      if (params?.messageHandler) {
+        const responsePayload = await params.messageHandler(requestPayload);
+        if (responsePayload && connection) {
+          sendResponseMessage(request, responsePayload);
+        }
+      }
+      log("message", {
+        payload: requestPayload
+      }, {
+        F: __dxlog_file,
+        L: 47,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      messageSink.push(requestPayload);
+    });
+    ws.on("close", () => {
+      connection = void 0;
+      closeTrigger.wake();
+    });
+  });
+  return {
+    server,
+    messageSink,
+    endpoint: `ws://localhost:${port}`,
+    cleanup: () => server.close(),
+    currentConnection: () => connection,
+    sendResponseMessage,
+    closeConnection: () => {
+      closeTrigger.reset();
+      connection.close(1011);
+      return closeTrigger.wait();
+    }
+  };
+};
+var createConnectionDelayHandler = (params) => {
+  return (_, callback) => {
+    if (params?.admitConnection) {
+      log("delaying edge connection admission", void 0, {
+        F: __dxlog_file,
+        L: 75,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      void params.admitConnection.wait().then(() => {
+        callback(true);
+        log("edge connection admitted", void 0, {
+          F: __dxlog_file,
+          L: 78,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+      });
+    } else {
+      callback(true);
+    }
+  };
+};
+var createResponseSender = (connection) => {
+  return (request, responsePayload) => {
+    const recipient = request.source;
+    connection().send(buf.toBinary(MessageSchema, buf.create(MessageSchema, {
+      source: {
+        identityKey: recipient.identityKey,
+        peerKey: recipient.peerKey
+      },
+      serviceId: request.serviceId,
+      payload: {
+        value: responsePayload
+      }
+    })));
+  };
+};
+var decodeRequest = async (params, data) => {
+  const request = buf.fromBinary(MessageSchema, await toUint8Array(data));
+  const requestPayload = params?.payloadDecoder ? params.payloadDecoder(request.payload.value) : protocol.getPayload(request, TextMessageSchema);
+  return {
+    request,
+    requestPayload
+  };
+};
+export {
+  DEFAULT_PORT,
+  createTestEdgeWsServer
+};
+//# sourceMappingURL=index.mjs.map

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/testing/test-utils.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport WebSocket from 'isomorphic-ws';\n\nimport { Trigger } from '@dxos/async';\nimport { log } from '@dxos/log';\nimport { buf } from '@dxos/protocols/buf';\nimport { MessageSchema, TextMessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nimport { protocol } from '../defs';\nimport { toUint8Array } from '../protocol';\n\nexport const DEFAULT_PORT = 8080;\n\ntype TestEdgeWsServerParams = {\n  admitConnection?: Trigger;\n  payloadDecoder?: (payload: Uint8Array) => any;\n  messageHandler?: (payload: any) => Promise<Uint8Array | undefined>;\n};\n\nexport const createTestEdgeWsServer = async (port = DEFAULT_PORT, params?: TestEdgeWsServerParams) => {\n  const server = new WebSocket.Server({ port, verifyClient: createConnectionDelayHandler(params) });\n\n  let connection: WebSocket | undefined;\n\n  const messageSink: any[] = [];\n  const closeTrigger = new Trigger();\n  const sendResponseMessage = createResponseSender(() => connection!);\n\n  server.on('connection', (ws) => {\n    connection = ws;\n    ws.on('error', (err) => log.catch(err));\n    ws.on('message', async (data) => {\n      if (String(data) === '__ping__') {\n        ws.send('__pong__');\n        return;\n      }\n      const { request, requestPayload } = await decodeRequest(params, data);\n      if (params?.messageHandler) {\n        const responsePayload = await params.messageHandler(requestPayload);\n        if (responsePayload && connection) {\n          sendResponseMessage(request, responsePayload);\n        }\n      }\n      log('message', { payload: requestPayload });\n      messageSink.push(requestPayload);\n    });\n\n    ws.on('close', () => {\n      connection = undefined;\n      closeTrigger.wake();\n    });\n  });\n\n  return {\n    server,\n    messageSink,\n    endpoint: `ws://localhost:${port}`,\n    cleanup: () => server.close(),\n    currentConnection: () => connection,\n    sendResponseMessage,\n    closeConnection: () => {\n      closeTrigger.reset();\n      connection!.close(1011);\n      return closeTrigger.wait();\n    },\n  };\n};\n\nconst createConnectionDelayHandler = (params: TestEdgeWsServerParams | undefined) => {\n  return (_: any, callback: (admit: boolean) => void) => {\n    if (params?.admitConnection) {\n      log('delaying edge connection admission');\n      void params.admitConnection.wait().then(() => {\n        callback(true);\n        log('edge connection admitted');\n      });\n    } else {\n      callback(true);\n    }\n  };\n};\n\nconst createResponseSender = (connection: () => WebSocket) => {\n  return (request: Message, responsePayload: Uint8Array) => {\n    const recipient = request.source!;\n    connection().send(\n      buf.toBinary(\n        MessageSchema,\n        buf.create(MessageSchema, {\n          source: {\n            identityKey: recipient.identityKey,\n            peerKey: recipient.peerKey,\n          },\n          serviceId: request.serviceId!,\n          payload: { value: responsePayload },\n        }),\n      ),\n    );\n  };\n};\n\nconst decodeRequest = async (params: TestEdgeWsServerParams | undefined, data: any) => {\n  const request = buf.fromBinary(MessageSchema, await toUint8Array(data));\n  const requestPayload = params?.payloadDecoder\n    ? params.payloadDecoder(request.payload!.value!)\n    : protocol.getPayload(request, TextMessageSchema);\n  return { request, requestPayload };\n};\n"],
+  "mappings": ";;;;;;;AAIA,OAAOA,eAAe;AAEtB,SAASC,eAAe;AACxB,SAASC,WAAW;AACpB,SAASC,WAAW;AACpB,SAASC,eAAeC,yBAAuC;;AAKxD,IAAMC,eAAe;AAQrB,IAAMC,yBAAyB,OAAOC,OAAOF,cAAcG,WAAAA;AAChE,QAAMC,SAAS,IAAIC,UAAUC,OAAO;IAAEJ;IAAMK,cAAcC,6BAA6BL,MAAAA;EAAQ,CAAA;AAE/F,MAAIM;AAEJ,QAAMC,cAAqB,CAAA;AAC3B,QAAMC,eAAe,IAAIC,QAAAA;AACzB,QAAMC,sBAAsBC,qBAAqB,MAAML,UAAAA;AAEvDL,SAAOW,GAAG,cAAc,CAACC,OAAAA;AACvBP,iBAAaO;AACbA,OAAGD,GAAG,SAAS,CAACE,QAAQC,IAAIC,MAAMF,KAAAA,QAAAA;;;;;;AAClCD,OAAGD,GAAG,WAAW,OAAOK,SAAAA;AACtB,UAAIC,OAAOD,IAAAA,MAAU,YAAY;AAC/BJ,WAAGM,KAAK,UAAA;AACR;MACF;AACA,YAAM,EAAEC,SAASC,eAAc,IAAK,MAAMC,cAActB,QAAQiB,IAAAA;AAChE,UAAIjB,QAAQuB,gBAAgB;AAC1B,cAAMC,kBAAkB,MAAMxB,OAAOuB,eAAeF,cAAAA;AACpD,YAAIG,mBAAmBlB,YAAY;AACjCI,8BAAoBU,SAASI,eAAAA;QAC/B;MACF;AACAT,UAAI,WAAW;QAAEU,SAASJ;MAAe,GAAA;;;;;;AACzCd,kBAAYmB,KAAKL,cAAAA;IACnB,CAAA;AAEAR,OAAGD,GAAG,SAAS,MAAA;AACbN,mBAAaqB;AACbnB,mBAAaoB,KAAI;IACnB,CAAA;EACF,CAAA;AAEA,SAAO;IACL3B;IACAM;IACAsB,UAAU,kBAAkB9B,IAAAA;IAC5B+B,SAAS,MAAM7B,OAAO8B,MAAK;IAC3BC,mBAAmB,MAAM1B;IACzBI;IACAuB,iBAAiB,MAAA;AACfzB,mBAAa0B,MAAK;AAClB5B,iBAAYyB,MAAM,IAAA;AAClB,aAAOvB,aAAa2B,KAAI;IAC1B;EACF;AACF;AAEA,IAAM9B,+BAA+B,CAACL,WAAAA;AACpC,SAAO,CAACoC,GAAQC,aAAAA;AACd,QAAIrC,QAAQsC,iBAAiB;AAC3BvB,UAAI,sCAAA,QAAA;;;;;;AACJ,WAAKf,OAAOsC,gBAAgBH,KAAI,EAAGI,KAAK,MAAA;AACtCF,iBAAS,IAAA;AACTtB,YAAI,4BAAA,QAAA;;;;;;MACN,CAAA;IACF,OAAO;AACLsB,eAAS,IAAA;IACX;EACF;AACF;AAEA,IAAM1B,uBAAuB,CAACL,eAAAA;AAC5B,SAAO,CAACc,SAAkBI,oBAAAA;AACxB,UAAMgB,YAAYpB,QAAQqB;AAC1BnC,eAAAA,EAAaa,KACXuB,IAAIC,SACFC,eACAF,IAAIG,OAAOD,eAAe;MACxBH,QAAQ;QACNK,aAAaN,UAAUM;QACvBC,SAASP,UAAUO;MACrB;MACAC,WAAW5B,QAAQ4B;MACnBvB,SAAS;QAAEwB,OAAOzB;MAAgB;IACpC,CAAA,CAAA,CAAA;EAGN;AACF;AAEA,IAAMF,gBAAgB,OAAOtB,QAA4CiB,SAAAA;AACvE,QAAMG,UAAUsB,IAAIQ,WAAWN,eAAe,MAAMO,aAAalC,IAAAA,CAAAA;AACjE,QAAMI,iBAAiBrB,QAAQoD,iBAC3BpD,OAAOoD,eAAehC,QAAQK,QAASwB,KAAK,IAC5CI,SAASC,WAAWlC,SAASmC,iBAAAA;AACjC,SAAO;IAAEnC;IAASC;EAAe;AACnC;",
+  "names": ["WebSocket", "Trigger", "log", "buf", "MessageSchema", "TextMessageSchema", "DEFAULT_PORT", "createTestEdgeWsServer", "port", "params", "server", "WebSocket", "Server", "verifyClient", "createConnectionDelayHandler", "connection", "messageSink", "closeTrigger", "Trigger", "sendResponseMessage", "createResponseSender", "on", "ws", "err", "log", "catch", "data", "String", "send", "request", "requestPayload", "decodeRequest", "messageHandler", "responsePayload", "payload", "push", "undefined", "wake", "endpoint", "cleanup", "close", "currentConnection", "closeConnection", "reset", "wait", "_", "callback", "admitConnection", "then", "recipient", "source", "buf", "toBinary", "MessageSchema", "create", "identityKey", "peerKey", "serviceId", "value", "fromBinary", "toUint8Array", "payloadDecoder", "protocol", "getPayload", "TextMessageSchema"]
+}

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

@@ -1 +1 @@
-{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../../src/defs.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,eAAO,MAAM,QAAQ,UAAwF,CAAC"}
+{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../../src/defs.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,eAAO,MAAM,QAAQ,UAA+F,CAAC"}

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

@@ -4,6 +4,7 @@ import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import { type Protocol } from './protocol';
 export type MessageListener = (message: Message) => void | Promise<void>;
 export interface EdgeConnection extends Required<Lifecycle> {
+    connected: Event;
     reconnect: Event;
     get info(): any;
     get identityKey(): string;
@@ -28,10 +29,10 @@ export declare class EdgeClient extends Resource implements EdgeConnection {
     private _identityKey;
     private _peerKey;
     private readonly _config;
-    reconnect: Event<void>;
+    readonly reconnect: Event<void>;
+    readonly connected: Event<void>;
     private readonly _persistentLifecycle;
     private readonly _listeners;
-    private readonly _protocol;
     private _ready;
     private _ws?;
     private _keepaliveCtx?;

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":"AAMA,OAAO,EAAW,KAAK,EAAoD,MAAM,aAAa,CAAC;AAC/F,OAAO,EAA2B,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAIlF,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,4CAA4C,CAAC;AAKzF,OAAO,EAAE,KAAK,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAKzD,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzE,MAAM,WAAW,cAAe,SAAQ,QAAQ,CAAC,SAAS,CAAC;IACzD,SAAS,EAAE,KAAK,CAAC;IAEjB,IAAI,IAAI,IAAI,GAAG,CAAC;IAChB,IAAI,WAAW,IAAI,MAAM,CAAC;IAC1B,IAAI,OAAO,IAAI,MAAM,CAAC;IACtB,IAAI,MAAM,IAAI,OAAO,CAAC;IACtB,WAAW,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IACnD,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;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,cAAc;IAgB9D,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAjBnB,SAAS,cAAe;IAC/B,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAIlC;IAEH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,GAAG,CAAC,CAAwB;IACpC,OAAO,CAAC,aAAa,CAAC,CAAsB;IAC5C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;gBAGtC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EACP,OAAO,EAAE,eAAe;IAO3C,IAAW,IAAI;;;;MAMd;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;IAMvE,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAKzD;;OAEG;cACsB,KAAK;IAO9B;;OAEG;cACsB,MAAM;YAKjB,cAAc;YAqDd,eAAe;IA0B7B;;;OAGG;IACU,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUlD,OAAO,CAAC,YAAY;CAcrB"}
+{"version":3,"file":"edge-client.d.ts","sourceRoot":"","sources":["../../../src/edge-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAW,KAAK,EAAoD,MAAM,aAAa,CAAC;AAC/F,OAAO,EAA2B,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,eAAe,CAAC;AAGlF,OAAO,EAAE,KAAK,OAAO,EAAiB,MAAM,4CAA4C,CAAC;AAKzF,OAAO,EAAE,KAAK,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAKzD,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzE,MAAM,WAAW,cAAe,SAAQ,QAAQ,CAAC,SAAS,CAAC;IACzD,SAAS,EAAE,KAAK,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC;IAEjB,IAAI,IAAI,IAAI,GAAG,CAAC;IAChB,IAAI,WAAW,IAAI,MAAM,CAAC;IAC1B,IAAI,OAAO,IAAI,MAAM,CAAC;IACtB,IAAI,MAAM,IAAI,OAAO,CAAC;IACtB,WAAW,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IACnD,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;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,cAAc;IAgB9D,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAjB1B,SAAgB,SAAS,cAAe;IACxC,SAAgB,SAAS,cAAe;IACxC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAIlC;IAEH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IACzD,OAAO,CAAC,MAAM,CAAiB;IAC/B,OAAO,CAAC,GAAG,CAAC,CAAwB;IACpC,OAAO,CAAC,aAAa,CAAC,CAAsB;IAC5C,OAAO,CAAC,iBAAiB,CAAC,CAAsB;gBAGtC,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EACP,OAAO,EAAE,eAAe;IAM3C,IAAW,IAAI;;;;MAMd;IAED,IAAI,WAAW,WAEd;IAED,IAAI,OAAO,WAEV;IAED,WAAW,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;IAMvE,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,MAAM,IAAI;IAKzD;;OAEG;cACsB,KAAK;IAO9B;;OAEG;cACsB,MAAM;YAKjB,cAAc;YAsDd,eAAe;IA0B7B;;;OAGG;IACU,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBlD,OAAO,CAAC,YAAY;CAcrB"}

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

@@ -1,4 +1,7 @@
-export declare class WebsocketClosedError extends Error {
+export declare class EdgeConnectionClosedError extends Error {
+    constructor();
+}
+export declare class EdgeIdentityChangedError extends Error {
     constructor();
 }
 //# sourceMappingURL=errors.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/errors.ts"],"names":[],"mappings":"AAIA,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../src/errors.ts"],"names":[],"mappings":"AAIA,qBAAa,yBAA0B,SAAQ,KAAK;;CAInD;AAED,qBAAa,wBAAyB,SAAQ,KAAK;;CAIlD"}

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

@@ -2,4 +2,5 @@ export * from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 export * from './edge-client';
 export * from './defs';
 export * from './protocol';
+export * from './errors';
 //# 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"}
+{"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"}

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

@@ -1,6 +1,6 @@
 import { buf } from '@dxos/protocols/buf';
-import { type Message, type Peer as PeerProto } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
-export type PeerData = Partial<PeerProto>;
+import { type Message, type PeerSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+export type PeerData = buf.MessageInitShape<typeof PeerSchema>;
 export declare const getTypename: (typeName: string) => string;
 /**
  * NOTE: The type registry should be extended with all message types.

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

@@ -1 +1 @@
-{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/protocol.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,OAAO,EAAiB,KAAK,IAAI,IAAI,SAAS,EAAE,MAAM,4CAA4C,CAAC;AAGjH,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAE1C,eAAO,MAAM,WAAW,aAAc,MAAM,WAAsC,CAAC;AAEnF;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,KAAK,EAAE,GAAG,CAAC,WAAW,EAAE;IAIpC,IAAI,YAAY,IAAI,GAAG,CAAC,QAAQ,CAE/B;IAED,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG;IAQ7B;;OAEG;IACH,UAAU,CAAC,IAAI,SAAS,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;IAa9F;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IASpD;;OAEG;IACH,aAAa,CAAC,IAAI,SAAS,GAAG,CAAC,WAAW,EACxC,IAAI,EAAE,IAAI,EACV,EACE,MAAM,EACN,MAAM,EACN,OAAO,EACP,SAAS,GACV,EAAE;QACD,MAAM,CAAC,EAAE,QAAQ,CAAC;QAClB,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACrC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;CAUJ;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,SAAgB,GAAG,KAAG,OAAO,CAAC,UAAU,CAYhE,CAAC"}
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../../src/protocol.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAG1G,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,gBAAgB,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,eAAO,MAAM,WAAW,aAAc,MAAM,WAAsC,CAAC;AAEnF;;GAEG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;gBAEjC,KAAK,EAAE,GAAG,CAAC,WAAW,EAAE;IAIpC,IAAI,YAAY,IAAI,GAAG,CAAC,QAAQ,CAE/B;IAED,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG;IAQ7B;;OAEG;IACH,UAAU,CAAC,IAAI,SAAS,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC;IAa9F;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS;IASpD;;OAEG;IACH,aAAa,CAAC,IAAI,SAAS,GAAG,CAAC,WAAW,EACxC,IAAI,EAAE,IAAI,EACV,EACE,MAAM,EACN,MAAM,EACN,OAAO,EACP,SAAS,GACV,EAAE;QACD,MAAM,CAAC,EAAE,QAAQ,CAAC;QAClB,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;QACpB,OAAO,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACrC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;CAUJ;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,SAAgB,GAAG,KAAG,OAAO,CAAC,UAAU,CAYhE,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './test-utils';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC"}

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

@@ -0,0 +1,20 @@
+import WebSocket from 'isomorphic-ws';
+import { Trigger } from '@dxos/async';
+import { type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+export declare const DEFAULT_PORT = 8080;
+type TestEdgeWsServerParams = {
+    admitConnection?: Trigger;
+    payloadDecoder?: (payload: Uint8Array) => any;
+    messageHandler?: (payload: any) => Promise<Uint8Array | undefined>;
+};
+export declare const createTestEdgeWsServer: (port?: number, params?: TestEdgeWsServerParams) => Promise<{
+    server: WebSocket.Server;
+    messageSink: any[];
+    endpoint: string;
+    cleanup: () => void;
+    currentConnection: () => WebSocket | undefined;
+    sendResponseMessage: (request: Message, responsePayload: Uint8Array) => void;
+    closeConnection: () => Promise<void>;
+}>;
+export {};
+//# sourceMappingURL=test-utils.d.ts.map

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

@@ -0,0 +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;;;;;;mCAgE9E,OAAO,mBAAmB,UAAU;;EAjBtD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.6.12-main.5cc132e",
+  "version": "0.6.12-main.78ddbdf",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,11 +14,23 @@
         "default": "./dist/lib/node-esm/index.mjs"
       },
       "types": "./dist/types/src/index.d.ts"
+    },
+    "./testing": {
+      "browser": "./dist/lib/browser/testing/index.mjs",
+      "node": {
+        "require": "./dist/lib/node/testing/index.cjs",
+        "default": "./dist/lib/node-esm/testing/index.mjs"
+      },
+      "types": "./dist/types/src/testing/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
-    "*": {}
+    "*": {
+      "testing": [
+        "dist/types/src/testing/index.d.ts"
+      ]
+    }
   },
   "files": [
     "dist",
@@ -26,21 +38,20 @@
     "README.md"
   ],
   "dependencies": {
-    "@bufbuild/protobuf": "^2.0.0",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.6.12-main.5cc132e",
-    "@dxos/context": "0.6.12-main.5cc132e",
-    "@dxos/debug": "0.6.12-main.5cc132e",
-    "@dxos/invariant": "0.6.12-main.5cc132e",
-    "@dxos/log": "0.6.12-main.5cc132e",
-    "@dxos/node-std": "0.6.12-main.5cc132e",
-    "@dxos/util": "0.6.12-main.5cc132e",
-    "@dxos/protocols": "0.6.12-main.5cc132e"
+    "@dxos/async": "0.6.12-main.78ddbdf",
+    "@dxos/context": "0.6.12-main.78ddbdf",
+    "@dxos/debug": "0.6.12-main.78ddbdf",
+    "@dxos/invariant": "0.6.12-main.78ddbdf",
+    "@dxos/log": "0.6.12-main.78ddbdf",
+    "@dxos/protocols": "0.6.12-main.78ddbdf",
+    "@dxos/node-std": "0.6.12-main.78ddbdf",
+    "@dxos/util": "0.6.12-main.78ddbdf"
   },
   "devDependencies": {
-    "@dxos/keys": "0.6.12-main.5cc132e",
-    "@dxos/test-utils": "0.6.12-main.5cc132e"
+    "@dxos/test-utils": "0.6.12-main.78ddbdf",
+    "@dxos/keys": "0.6.12-main.78ddbdf"
   },
   "publishConfig": {
     "access": "public"

package/src/defs.ts

@@ -2,10 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { AnySchema } from '@bufbuild/protobuf/wkt';
-
+import { bufWkt } from '@dxos/protocols/buf';
 import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 
 import { Protocol } from './protocol';
 
-export const protocol = new Protocol([SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema, AnySchema]);
+export const protocol = new Protocol([SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema, bufWkt.AnySchema]);

package/src/edge-client.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { test, expect, describe } from 'vitest';
+import { test, expect, describe, onTestFinished } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
@@ -10,13 +10,15 @@ import { openAndClose } from '@dxos/test-utils';
 
 import { protocol } from './defs';
 import { EdgeClient } from './edge-client';
-import { createTestWsServer } from './test-utils';
+import { createTestEdgeWsServer } from './testing';
 
 describe('EdgeClient', () => {
   const textMessage = (message: string) => protocol.createMessage(TextMessageSchema, { payload: { message } });
 
   test('reconnects on error', async () => {
-    const { error: serverError, endpoint } = await createTestWsServer(8001);
+    const { closeConnection, endpoint, cleanup } = await createTestEdgeWsServer(8001);
+    onTestFinished(cleanup);
+
     const id = PublicKey.random().toHex();
     const client = new EdgeClient(id, id, { socketEndpoint: endpoint });
     await openAndClose(client);
@@ -24,13 +26,14 @@ describe('EdgeClient', () => {
     expect(client.isOpen).is.true;
 
     const reconnected = client.reconnect.waitForCount(1);
-    await serverError();
+    await closeConnection();
     await reconnected;
     await expect(client.send(textMessage('Hello world 2'))).resolves.not.toThrow();
   });
 
   test('set identity reconnects', async () => {
-    const { endpoint } = await createTestWsServer(8002);
+    const { endpoint, cleanup } = await createTestEdgeWsServer(8002);
+    onTestFinished(cleanup);
 
     const id = PublicKey.random().toHex();
     const client = new EdgeClient(id, id, { socketEndpoint: endpoint });

package/src/edge-client.ts

@@ -6,13 +6,12 @@ import WebSocket from 'isomorphic-ws';
 
 import { Trigger, Event, scheduleTaskInterval, scheduleTask, TriggerState } from '@dxos/async';
 import { Context, LifecycleState, Resource, type Lifecycle } from '@dxos/context';
-import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { buf } from '@dxos/protocols/buf';
 import { type Message, MessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 
 import { protocol } from './defs';
-import { WebsocketClosedError } from './errors';
+import { EdgeConnectionClosedError, EdgeIdentityChangedError } from './errors';
 import { PersistentLifecycle } from './persistent-lifecycle';
 import { type Protocol, toUint8Array } from './protocol';
 
@@ -22,6 +21,7 @@ const SIGNAL_KEEPALIVE_INTERVAL = 5_000;
 export type MessageListener = (message: Message) => void | Promise<void>;
 
 export interface EdgeConnection extends Required<Lifecycle> {
+  connected: Event;
   reconnect: Event;
 
   get info(): any;
@@ -43,7 +43,8 @@ export type MessengerConfig = {
  * Messenger client.
  */
 export class EdgeClient extends Resource implements EdgeConnection {
-  public reconnect = new Event();
+  public readonly reconnect = new Event();
+  public readonly connected = new Event();
   private readonly _persistentLifecycle = new PersistentLifecycle({
     start: async () => this._openWebSocket(),
     stop: async () => this._closeWebSocket(),
@@ -51,7 +52,6 @@ export class EdgeClient extends Resource implements EdgeConnection {
   });
 
   private readonly _listeners = new Set<MessageListener>();
-  private readonly _protocol: Protocol;
   private _ready = new Trigger();
   private _ws?: WebSocket = undefined;
   private _keepaliveCtx?: Context = undefined;
@@ -63,7 +63,6 @@ export class EdgeClient extends Resource implements EdgeConnection {
     private readonly _config: MessengerConfig,
   ) {
     super();
-    this._protocol = this._config.protocol ?? protocol;
   }
 
   // TODO(burdon): Attach logging.
@@ -119,6 +118,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
     this._ws.onopen = () => {
       log('opened', this.info);
       this._ready.wake();
+      this.connected.emit();
     };
     this._ws.onclose = () => {
       log('closed', this.info);
@@ -170,7 +170,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
       return;
     }
     try {
-      this._ready.throw(new WebsocketClosedError());
+      this._ready.throw(this.isOpen ? new EdgeIdentityChangedError() : new EdgeConnectionClosedError());
       this._ready.reset();
       void this._keepaliveCtx?.dispose();
       this._keepaliveCtx = undefined;
@@ -197,10 +197,19 @@ export class EdgeClient extends Resource implements EdgeConnection {
    */
   public async send(message: Message): Promise<void> {
     if (this._ready.state !== TriggerState.RESOLVED) {
+      log('waiting for websocket to become ready');
       await this._ready.wait({ timeout: this._config.timeout ?? DEFAULT_TIMEOUT });
     }
-    invariant(this._ws);
-    invariant(!message.source || message.source.peerKey === this._peerKey);
+    if (!this._ws) {
+      throw new EdgeConnectionClosedError();
+    }
+    if (
+      message.source &&
+      (message.source.peerKey !== this._peerKey || message.source.identityKey !== this.identityKey)
+    ) {
+      throw new EdgeIdentityChangedError();
+    }
+
     log('sending...', { peerKey: this._peerKey, payload: protocol.getPayloadType(message) });
     this._ws.send(buf.toBinary(MessageSchema, message));
   }

package/src/errors.ts

@@ -2,8 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-export class WebsocketClosedError extends Error {
+export class EdgeConnectionClosedError extends Error {
   constructor() {
-    super('WebSocket connection closed');
+    super('Edge connection closed.');
+  }
+}
+
+export class EdgeIdentityChangedError extends Error {
+  constructor() {
+    super('Edge identity changed.');
   }
 }

package/src/index.ts

@@ -7,3 +7,4 @@ export * from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 export * from './edge-client';
 export * from './defs';
 export * from './protocol';
+export * from './errors';

package/src/protocol.ts

@@ -4,10 +4,10 @@
 
 import { invariant } from '@dxos/invariant';
 import { buf, bufWkt } from '@dxos/protocols/buf';
-import { type Message, MessageSchema, type Peer as PeerProto } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { type Message, MessageSchema, type PeerSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
 import { bufferToArray } from '@dxos/util';
 
-export type PeerData = Partial<PeerProto>;
+export type PeerData = buf.MessageInitShape<typeof PeerSchema>;
 
 export const getTypename = (typeName: string) => `type.googleapis.com/${typeName}`;
 

package/src/testing/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export * from './test-utils';

package/src/testing/test-utils.ts

@@ -0,0 +1,111 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import WebSocket from 'isomorphic-ws';
+
+import { Trigger } from '@dxos/async';
+import { log } from '@dxos/log';
+import { buf } from '@dxos/protocols/buf';
+import { MessageSchema, TextMessageSchema, type Message } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+
+import { protocol } from '../defs';
+import { toUint8Array } from '../protocol';
+
+export const DEFAULT_PORT = 8080;
+
+type TestEdgeWsServerParams = {
+  admitConnection?: Trigger;
+  payloadDecoder?: (payload: Uint8Array) => any;
+  messageHandler?: (payload: any) => Promise<Uint8Array | undefined>;
+};
+
+export const createTestEdgeWsServer = async (port = DEFAULT_PORT, params?: TestEdgeWsServerParams) => {
+  const server = new WebSocket.Server({ port, verifyClient: createConnectionDelayHandler(params) });
+
+  let connection: WebSocket | undefined;
+
+  const messageSink: any[] = [];
+  const closeTrigger = new Trigger();
+  const sendResponseMessage = createResponseSender(() => connection!);
+
+  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 { request, requestPayload } = await decodeRequest(params, data);
+      if (params?.messageHandler) {
+        const responsePayload = await params.messageHandler(requestPayload);
+        if (responsePayload && connection) {
+          sendResponseMessage(request, responsePayload);
+        }
+      }
+      log('message', { payload: requestPayload });
+      messageSink.push(requestPayload);
+    });
+
+    ws.on('close', () => {
+      connection = undefined;
+      closeTrigger.wake();
+    });
+  });
+
+  return {
+    server,
+    messageSink,
+    endpoint: `ws://localhost:${port}`,
+    cleanup: () => server.close(),
+    currentConnection: () => connection,
+    sendResponseMessage,
+    closeConnection: () => {
+      closeTrigger.reset();
+      connection!.close(1011);
+      return closeTrigger.wait();
+    },
+  };
+};
+
+const createConnectionDelayHandler = (params: TestEdgeWsServerParams | undefined) => {
+  return (_: any, callback: (admit: boolean) => void) => {
+    if (params?.admitConnection) {
+      log('delaying edge connection admission');
+      void params.admitConnection.wait().then(() => {
+        callback(true);
+        log('edge connection admitted');
+      });
+    } else {
+      callback(true);
+    }
+  };
+};
+
+const createResponseSender = (connection: () => WebSocket) => {
+  return (request: Message, responsePayload: Uint8Array) => {
+    const recipient = request.source!;
+    connection().send(
+      buf.toBinary(
+        MessageSchema,
+        buf.create(MessageSchema, {
+          source: {
+            identityKey: recipient.identityKey,
+            peerKey: recipient.peerKey,
+          },
+          serviceId: request.serviceId!,
+          payload: { value: responsePayload },
+        }),
+      ),
+    );
+  };
+};
+
+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);
+  return { request, requestPayload };
+};

package/src/websocket.test.ts

@@ -3,16 +3,17 @@
 //
 
 import WebSocket from 'isomorphic-ws';
-import { describe, expect, test } from 'vitest';
+import { describe, expect, test, onTestFinished } from 'vitest';
 
 import { Trigger, TriggerState } from '@dxos/async';
 
-import { createTestWsServer } from './test-utils';
+import { createTestEdgeWsServer } from './testing';
 
-// TODO(wittjosiah): Doesn't work in vitest.
-describe.skip('WebSocket', () => {
+describe('WebSocket', () => {
   test('swap `onclose` handler ', async () => {
-    const { endpoint } = await createTestWsServer(8003);
+    const { endpoint, cleanup } = await createTestEdgeWsServer(8003);
+    onTestFinished(cleanup);
+
     const ws = new WebSocket(endpoint);
     const opened = new Trigger();
     ws.onopen = () => {