@dxos/edge-client 0.6.11 → 0.6.12-main.5a87ad5

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

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/index.ts", "../../../src/edge-client.ts", "../../../src/errors.ts", "../../../src/persistent-lifecycle.ts"],
+  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nexport * from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nexport * from './edge-client';\nexport * from './defs';\nexport * from './protocol';\nexport * from './errors';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport WebSocket from 'isomorphic-ws';\n\nimport { Trigger, Event, scheduleTaskInterval, scheduleTask, TriggerState } from '@dxos/async';\nimport { Context, LifecycleState, Resource, type Lifecycle } from '@dxos/context';\nimport { log } from '@dxos/log';\nimport { buf } from '@dxos/protocols/buf';\nimport { type Message, MessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nimport { protocol } from './defs';\nimport { EdgeConnectionClosedError, EdgeIdentityChangedError } from './errors';\nimport { PersistentLifecycle } from './persistent-lifecycle';\nimport { type Protocol, toUint8Array } from './protocol';\n\nconst DEFAULT_TIMEOUT = 10_000;\nconst SIGNAL_KEEPALIVE_INTERVAL = 5_000;\n\nexport type MessageListener = (message: Message) => void | Promise<void>;\n\nexport interface EdgeConnection extends Required<Lifecycle> {\n  connected: Event;\n  reconnect: Event;\n\n  get info(): any;\n  get identityKey(): string;\n  get peerKey(): string;\n  get isOpen(): boolean;\n  setIdentity(params: { peerKey: string; identityKey: string }): void;\n  addListener(listener: MessageListener): () => void;\n  send(message: Message): Promise<void>;\n}\n\nexport type MessengerConfig = {\n  socketEndpoint: string;\n  timeout?: number;\n  protocol?: Protocol;\n};\n\n/**\n * Messenger client.\n */\nexport class EdgeClient extends Resource implements EdgeConnection {\n  public readonly reconnect = new Event();\n  public readonly connected = new Event();\n  private readonly _persistentLifecycle = new PersistentLifecycle({\n    start: async () => this._openWebSocket(),\n    stop: async () => this._closeWebSocket(),\n    onRestart: async () => this.reconnect.emit(),\n  });\n\n  private readonly _listeners = new Set<MessageListener>();\n  private _ready = new Trigger();\n  private _ws?: WebSocket = undefined;\n  private _keepaliveCtx?: Context = undefined;\n  private _heartBeatContext?: Context = undefined;\n\n  constructor(\n    private _identityKey: string,\n    private _peerKey: string,\n    private readonly _config: MessengerConfig,\n  ) {\n    super();\n  }\n\n  // TODO(burdon): Attach logging.\n  public get info() {\n    return {\n      open: this.isOpen,\n      identity: this._identityKey,\n      device: this._peerKey,\n    };\n  }\n\n  get identityKey() {\n    return this._identityKey;\n  }\n\n  get peerKey() {\n    return this._peerKey;\n  }\n\n  setIdentity({ peerKey, identityKey }: { peerKey: string; identityKey: string }) {\n    this._peerKey = peerKey;\n    this._identityKey = identityKey;\n    this._persistentLifecycle.scheduleRestart();\n  }\n\n  public addListener(listener: MessageListener): () => void {\n    this._listeners.add(listener);\n    return () => this._listeners.delete(listener);\n  }\n\n  /**\n   * Open connection to messaging service.\n   */\n  protected override async _open() {\n    log('opening...', { info: this.info });\n    this._persistentLifecycle.open().catch((err) => {\n      log.warn('Error while opening connection', { err });\n    });\n  }\n\n  /**\n   * Close connection and free resources.\n   */\n  protected override async _close() {\n    log('closing...', { peerKey: this._peerKey });\n    await this._persistentLifecycle.close();\n  }\n\n  private async _openWebSocket() {\n    const url = new URL(`/ws/${this._identityKey}/${this._peerKey}`, this._config.socketEndpoint);\n    this._ws = new WebSocket(url);\n\n    this._ws.onopen = () => {\n      log('opened', this.info);\n      this._ready.wake();\n      this.connected.emit();\n    };\n    this._ws.onclose = () => {\n      log('closed', this.info);\n      this._persistentLifecycle.scheduleRestart();\n    };\n    this._ws.onerror = (event) => {\n      log.warn('EdgeClient socket error', { error: event.error, info: event.message });\n      this._persistentLifecycle.scheduleRestart();\n    };\n    /**\n     * https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/data\n     */\n    this._ws.onmessage = async (event) => {\n      if (event.data === '__pong__') {\n        this._onHeartbeat();\n        return;\n      }\n      const data = await toUint8Array(event.data);\n      const message = buf.fromBinary(MessageSchema, data);\n      log('received', { peerKey: this._peerKey, payload: protocol.getPayloadType(message) });\n      if (message) {\n        for (const listener of this._listeners) {\n          try {\n            await listener(message);\n          } catch (err) {\n            log.error('processing', { err, payload: protocol.getPayloadType(message) });\n          }\n        }\n      }\n    };\n\n    await this._ready.wait({ timeout: this._config.timeout ?? DEFAULT_TIMEOUT });\n    this._keepaliveCtx = new Context();\n    scheduleTaskInterval(\n      this._keepaliveCtx,\n      async () => {\n        // TODO(mykola): use RFC6455 ping/pong once implemented in the browser?\n        // Cloudflare's worker responds to this `without interrupting hibernation`. https://developers.cloudflare.com/durable-objects/api/websockets/#setwebsocketautoresponse\n        this._ws?.send('__ping__');\n      },\n      SIGNAL_KEEPALIVE_INTERVAL,\n    );\n    this._ws.send('__ping__');\n    this._onHeartbeat();\n  }\n\n  private async _closeWebSocket() {\n    if (!this._ws) {\n      return;\n    }\n    try {\n      this._ready.throw(this.isOpen ? new EdgeIdentityChangedError() : new EdgeConnectionClosedError());\n      this._ready.reset();\n      void this._keepaliveCtx?.dispose();\n      this._keepaliveCtx = undefined;\n      void this._heartBeatContext?.dispose();\n      this._heartBeatContext = undefined;\n\n      // NOTE: Remove event handlers to avoid scheduling restart.\n      this._ws.onopen = () => {};\n      this._ws.onclose = () => {};\n      this._ws.onerror = () => {};\n      this._ws.close();\n      this._ws = undefined;\n    } catch (err) {\n      if (err instanceof Error && err.message.includes('WebSocket is closed before the connection is established.')) {\n        return;\n      }\n      log.warn('Error closing websocket', { err });\n    }\n  }\n\n  /**\n   * Send message.\n   * NOTE: The message is guaranteed to be delivered but the service must respond with a message to confirm processing.\n   */\n  public async send(message: Message): Promise<void> {\n    if (this._ready.state !== TriggerState.RESOLVED) {\n      log('waiting for websocket to become ready');\n      await this._ready.wait({ timeout: this._config.timeout ?? DEFAULT_TIMEOUT });\n    }\n    if (!this._ws) {\n      throw new EdgeConnectionClosedError();\n    }\n    if (\n      message.source &&\n      (message.source.peerKey !== this._peerKey || message.source.identityKey !== this.identityKey)\n    ) {\n      throw new EdgeIdentityChangedError();\n    }\n\n    log('sending...', { peerKey: this._peerKey, payload: protocol.getPayloadType(message) });\n    this._ws.send(buf.toBinary(MessageSchema, message));\n  }\n\n  private _onHeartbeat() {\n    if (this._lifecycleState !== LifecycleState.OPEN) {\n      return;\n    }\n    void this._heartBeatContext?.dispose();\n    this._heartBeatContext = new Context();\n    scheduleTask(\n      this._heartBeatContext,\n      () => {\n        this._persistentLifecycle.scheduleRestart();\n      },\n      2 * SIGNAL_KEEPALIVE_INTERVAL,\n    );\n  }\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nexport class EdgeConnectionClosedError extends Error {\n  constructor() {\n    super('Edge connection closed.');\n  }\n}\n\nexport class EdgeIdentityChangedError extends Error {\n  constructor() {\n    super('Edge identity changed.');\n  }\n}\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { DeferredTask, sleep, synchronized } from '@dxos/async';\nimport { cancelWithContext, LifecycleState, Resource } from '@dxos/context';\nimport { warnAfterTimeout } from '@dxos/debug';\nimport { log } from '@dxos/log';\n\nconst INIT_RESTART_DELAY = 100;\nconst DEFAULT_MAX_RESTART_DELAY = 5000;\n\nexport type PersistentLifecycleParams = {\n  /**\n   * Create connection.\n   * If promise resolves successfully, connection is considered established.\n   */\n  start: () => Promise<void>;\n\n  /**\n   * Reset connection to initial state.\n   */\n  stop: () => Promise<void>;\n\n  /**\n   * Called after successful start.\n   */\n  onRestart?: () => Promise<void>;\n\n  /**\n   * Maximum delay between restartion attempts.\n   * Default: 5000ms\n   */\n  maxRestartDelay?: number;\n};\n\n/**\n * Handles restarts (e.g. persists connection).\n * Restarts are scheduled with exponential backoff.\n */\nexport class PersistentLifecycle extends Resource {\n  private readonly _start: () => Promise<void>;\n  private readonly _stop: () => Promise<void>;\n  private readonly _onRestart?: () => Promise<void>;\n  private readonly _maxRestartDelay: number;\n\n  private _restartTask?: DeferredTask = undefined;\n  private _restartAfter = 0;\n\n  constructor({ start, stop, onRestart, maxRestartDelay = DEFAULT_MAX_RESTART_DELAY }: PersistentLifecycleParams) {\n    super();\n    this._start = start;\n    this._stop = stop;\n    this._onRestart = onRestart;\n    this._maxRestartDelay = maxRestartDelay;\n  }\n\n  @synchronized\n  protected override async _open() {\n    this._restartTask = new DeferredTask(this._ctx, async () => {\n      try {\n        await this._restart();\n      } catch (err) {\n        log.warn('Restart failed', { err });\n        this._restartTask?.schedule();\n      }\n    });\n    await this._start().catch((err) => {\n      log.warn('Start failed', { err });\n      this._restartTask?.schedule();\n    });\n  }\n\n  protected override async _close() {\n    await this._restartTask?.join();\n    await this._stop();\n    this._restartTask = undefined;\n  }\n\n  private async _restart() {\n    log(`restarting in ${this._restartAfter}ms`, { state: this._lifecycleState });\n    await this._stop();\n    if (this._lifecycleState !== LifecycleState.OPEN) {\n      return;\n    }\n    await cancelWithContext(this._ctx!, sleep(this._restartAfter));\n    this._restartAfter = Math.min(Math.max(this._restartAfter * 2, INIT_RESTART_DELAY), this._maxRestartDelay);\n\n    // May fail if the connection is not established.\n    await warnAfterTimeout(5_000, 'Connection establishment takes too long', () => this._start());\n\n    this._restartAfter = 0;\n    await this._onRestart?.();\n  }\n\n  /**\n   * Scheduling restart should be done from outside.\n   */\n  @synchronized\n  scheduleRestart() {\n    if (this._lifecycleState !== LifecycleState.OPEN) {\n      return;\n    }\n    this._restartTask!.schedule();\n  }\n}\n"],
+  "mappings": "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",
+  "names": ["WebSocket", "Trigger", "Event", "scheduleTaskInterval", "scheduleTask", "TriggerState", "Context", "LifecycleState", "Resource", "log", "buf", "MessageSchema", "EdgeConnectionClosedError", "Error", "constructor", "EdgeIdentityChangedError", "DeferredTask", "sleep", "synchronized", "cancelWithContext", "LifecycleState", "Resource", "warnAfterTimeout", "log", "INIT_RESTART_DELAY", "DEFAULT_MAX_RESTART_DELAY", "PersistentLifecycle", "constructor", "start", "stop", "onRestart", "maxRestartDelay", "_restartTask", "undefined", "_restartAfter", "_start", "_stop", "_onRestart", "_maxRestartDelay", "_open", "_ctx", "_restart", "err", "warn", "schedule", "catch", "_close", "join", "state", "_lifecycleState", "OPEN", "Math", "min", "max", "scheduleRestart", "DEFAULT_TIMEOUT", "SIGNAL_KEEPALIVE_INTERVAL", "EdgeClient", "Resource", "constructor", "_identityKey", "_peerKey", "_config", "reconnect", "Event", "connected", "_persistentLifecycle", "PersistentLifecycle", "start", "_openWebSocket", "stop", "_closeWebSocket", "onRestart", "emit", "_listeners", "Set", "_ready", "Trigger", "_ws", "undefined", "_keepaliveCtx", "_heartBeatContext", "info", "open", "isOpen", "identity", "device", "identityKey", "peerKey", "setIdentity", "scheduleRestart", "addListener", "listener", "add", "delete", "_open", "log", "catch", "err", "warn", "_close", "close", "url", "URL", "socketEndpoint", "WebSocket", "onopen", "wake", "onclose", "onerror", "event", "error", "message", "onmessage", "data", "_onHeartbeat", "toUint8Array", "buf", "fromBinary", "MessageSchema", "payload", "protocol", "getPayloadType", "wait", "timeout", "Context", "scheduleTaskInterval", "send", "throw", "EdgeIdentityChangedError", "EdgeConnectionClosedError", "reset", "dispose", "Error", "includes", "state", "TriggerState", "RESOLVED", "source", "toBinary", "_lifecycleState", "LifecycleState", "OPEN", "scheduleTask"]
+}

package/dist/lib/node-esm/meta.json

@@ -0,0 +1 @@
+{"inputs":{"packages/core/mesh/edge-client/src/protocol.ts":{"bytes":10334,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/edge-client/src/defs.ts":{"bytes":1607,"imports":[{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"packages/core/mesh/edge-client/src/protocol.ts","kind":"import-statement","original":"./protocol"}],"format":"esm"},"packages/core/mesh/edge-client/src/errors.ts":{"bytes":1265,"imports":[],"format":"esm"},"packages/core/mesh/edge-client/src/persistent-lifecycle.ts":{"bytes":10868,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/edge-client/src/edge-client.ts":{"bytes":27085,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"packages/core/mesh/edge-client/src/defs.ts","kind":"import-statement","original":"./defs"},{"path":"packages/core/mesh/edge-client/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"packages/core/mesh/edge-client/src/persistent-lifecycle.ts","kind":"import-statement","original":"./persistent-lifecycle"},{"path":"packages/core/mesh/edge-client/src/protocol.ts","kind":"import-statement","original":"./protocol"}],"format":"esm"},"packages/core/mesh/edge-client/src/index.ts":{"bytes":935,"imports":[{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"packages/core/mesh/edge-client/src/edge-client.ts","kind":"import-statement","original":"./edge-client"},{"path":"packages/core/mesh/edge-client/src/defs.ts","kind":"import-statement","original":"./defs"},{"path":"packages/core/mesh/edge-client/src/protocol.ts","kind":"import-statement","original":"./protocol"},{"path":"packages/core/mesh/edge-client/src/errors.ts","kind":"import-statement","original":"./errors"}],"format":"esm"},"packages/core/mesh/edge-client/src/testing/test-utils.ts":{"bytes":12455,"imports":[{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"packages/core/mesh/edge-client/src/defs.ts","kind":"import-statement","original":"../defs"},{"path":"packages/core/mesh/edge-client/src/protocol.ts","kind":"import-statement","original":"../protocol"}],"format":"esm"},"packages/core/mesh/edge-client/src/testing/index.ts":{"bytes":516,"imports":[{"path":"packages/core/mesh/edge-client/src/testing/test-utils.ts","kind":"import-statement","original":"./test-utils"}],"format":"esm"}},"outputs":{"packages/core/mesh/edge-client/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":18218},"packages/core/mesh/edge-client/dist/lib/node-esm/index.mjs":{"imports":[{"path":"packages/core/mesh/edge-client/dist/lib/node-esm/chunk-HNVT57AU.mjs","kind":"import-statement"},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["EdgeClient","EdgeConnectionClosedError","EdgeIdentityChangedError","Protocol","getTypename","protocol","toUint8Array"],"entryPoint":"packages/core/mesh/edge-client/src/index.ts","inputs":{"packages/core/mesh/edge-client/src/index.ts":{"bytesInOutput":60},"packages/core/mesh/edge-client/src/edge-client.ts":{"bytesInOutput":6943},"packages/core/mesh/edge-client/src/errors.ts":{"bytesInOutput":232},"packages/core/mesh/edge-client/src/persistent-lifecycle.ts":{"bytesInOutput":3015}},"bytes":10876},"packages/core/mesh/edge-client/dist/lib/node-esm/testing/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":6342},"packages/core/mesh/edge-client/dist/lib/node-esm/testing/index.mjs":{"imports":[{"path":"packages/core/mesh/edge-client/dist/lib/node-esm/chunk-HNVT57AU.mjs","kind":"import-statement"},{"path":"isomorphic-ws","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true}],"exports":["DEFAULT_PORT","createTestEdgeWsServer"],"entryPoint":"packages/core/mesh/edge-client/src/testing/index.ts","inputs":{"packages/core/mesh/edge-client/src/testing/test-utils.ts":{"bytesInOutput":3276},"packages/core/mesh/edge-client/src/testing/index.ts":{"bytesInOutput":0}},"bytes":3585},"packages/core/mesh/edge-client/dist/lib/node-esm/chunk-HNVT57AU.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5678},"packages/core/mesh/edge-client/dist/lib/node-esm/chunk-HNVT57AU.mjs":{"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true}],"exports":["Protocol","getTypename","protocol","toUint8Array"],"inputs":{"packages/core/mesh/edge-client/src/protocol.ts":{"bytesInOutput":2600},"packages/core/mesh/edge-client/src/defs.ts":{"bytesInOutput":298}},"bytes":3199}}}

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.11",
+  "version": "0.6.12-main.5a87ad5",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,14 +10,27 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "default": "./dist/lib/node/index.cjs"
+        "require": "./dist/lib/node/index.cjs",
+        "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",
@@ -25,21 +38,20 @@
     "README.md"
   ],
   "dependencies": {
-    "@bufbuild/protobuf": "^2.0.0",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/debug": "0.6.11",
-    "@dxos/context": "0.6.11",
-    "@dxos/log": "0.6.11",
-    "@dxos/invariant": "0.6.11",
-    "@dxos/async": "0.6.11",
-    "@dxos/node-std": "0.6.11",
-    "@dxos/protocols": "0.6.11",
-    "@dxos/util": "0.6.11"
+    "@dxos/async": "0.6.12-main.5a87ad5",
+    "@dxos/context": "0.6.12-main.5a87ad5",
+    "@dxos/invariant": "0.6.12-main.5a87ad5",
+    "@dxos/log": "0.6.12-main.5a87ad5",
+    "@dxos/debug": "0.6.12-main.5a87ad5",
+    "@dxos/node-std": "0.6.12-main.5a87ad5",
+    "@dxos/protocols": "0.6.12-main.5a87ad5",
+    "@dxos/util": "0.6.12-main.5a87ad5"
   },
   "devDependencies": {
-    "jest-websocket-mock": "^2.5.0",
-    "@dxos/keys": "0.6.11"
+    "@dxos/test-utils": "0.6.12-main.5a87ad5",
+    "@dxos/keys": "0.6.12-main.5a87ad5"
   },
   "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,24 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
+import { test, expect, describe, onTestFinished } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
-import { test, describe, openAndClose } from '@dxos/test';
+import { openAndClose } from '@dxos/test-utils';
 
 import { protocol } from './defs';
 import { EdgeClient } from './edge-client';
-import { createTestWsServer } from './test-utils';
-
-chai.use(chaiAsPromised);
+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();
+    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);
@@ -27,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'))).to.be.fulfilled;
+    await expect(client.send(textMessage('Hello world 2'))).resolves.not.toThrow();
   });
 
   test('set identity reconnects', async () => {
-    const { endpoint } = await createTestWsServer();
+    const { endpoint, cleanup } = await createTestEdgeWsServer(8002);
+    onTestFinished(cleanup);
 
     const id = PublicKey.random().toHex();
     const client = new EdgeClient(id, id, { socketEndpoint: endpoint });
@@ -45,6 +45,6 @@ describe('EdgeClient', () => {
     const reconnected = client.reconnect.waitForCount(1);
     client.setIdentity({ peerKey: newId, identityKey: newId });
     await reconnected;
-    await expect(client.send(textMessage('Hello world 2'))).to.be.fulfilled;
+    await expect(client.send(textMessage('Hello world 2'))).resolves.not.toThrow();
   });
 });

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/persistent-lifecycle.test.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
+import { describe, expect, test } from 'vitest';
 
 import { sleep, Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
-import { describe, openAndClose, test } from '@dxos/test';
+import { openAndClose } from '@dxos/test-utils';
 
 import { PersistentLifecycle } from './persistent-lifecycle';
 

package/src/protocol.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
+import { describe, expect, test } from 'vitest';
 
 import { buf } from '@dxos/protocols/buf';
 import {
@@ -11,7 +11,6 @@ import {
   SwarmRequestSchema,
   SwarmResponseSchema,
 } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
-import { describe, test } from '@dxos/test';
 
 import { Protocol } from './protocol';