@dxos/edge-client 0.6.12-main.ed7cda7 → 0.6.12-staging.0b4bb48

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,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"}
+{"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"}

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

@@ -0,0 +1,11 @@
+import WebSocket from 'isomorphic-ws';
+export declare const DEFAULT_PORT = 8080;
+export declare const createTestWsServer: (port?: number) => Promise<{
+    server: WebSocket.Server;
+    /**
+     * Close the server connection.
+     */
+    error: () => Promise<void>;
+    endpoint: string;
+}>;
+//# sourceMappingURL=test-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../src/test-utils.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,eAAe,CAAC;AAWtC,eAAO,MAAM,YAAY,OAAO,CAAC;AAEjC,eAAO,MAAM,kBAAkB;;IAsB3B;;OAEG;;;EAON,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.6.12-main.ed7cda7",
+  "version": "0.6.12-staging.0b4bb48",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,27 +10,14 @@
     ".": {
       "browser": "./dist/lib/browser/index.mjs",
       "node": {
-        "require": "./dist/lib/node/index.cjs",
-        "default": "./dist/lib/node-esm/index.mjs"
+        "default": "./dist/lib/node/index.cjs"
       },
       "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",
@@ -38,20 +25,21 @@
     "README.md"
   ],
   "dependencies": {
+    "@bufbuild/protobuf": "^2.0.0",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.14.2",
-    "@dxos/async": "0.6.12-main.ed7cda7",
-    "@dxos/context": "0.6.12-main.ed7cda7",
-    "@dxos/debug": "0.6.12-main.ed7cda7",
-    "@dxos/invariant": "0.6.12-main.ed7cda7",
-    "@dxos/log": "0.6.12-main.ed7cda7",
-    "@dxos/node-std": "0.6.12-main.ed7cda7",
-    "@dxos/protocols": "0.6.12-main.ed7cda7",
-    "@dxos/util": "0.6.12-main.ed7cda7"
+    "@dxos/async": "0.6.12-staging.0b4bb48",
+    "@dxos/context": "0.6.12-staging.0b4bb48",
+    "@dxos/invariant": "0.6.12-staging.0b4bb48",
+    "@dxos/debug": "0.6.12-staging.0b4bb48",
+    "@dxos/node-std": "0.6.12-staging.0b4bb48",
+    "@dxos/util": "0.6.12-staging.0b4bb48",
+    "@dxos/protocols": "0.6.12-staging.0b4bb48",
+    "@dxos/log": "0.6.12-staging.0b4bb48"
   },
   "devDependencies": {
-    "@dxos/keys": "0.6.12-main.ed7cda7",
-    "@dxos/test-utils": "0.6.12-main.ed7cda7"
+    "jest-websocket-mock": "^2.5.0",
+    "@dxos/keys": "0.6.12-staging.0b4bb48"
   },
   "publishConfig": {
     "access": "public"

package/src/defs.ts

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

package/src/edge-client.test.ts

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

package/src/edge-client.ts

@@ -6,12 +6,13 @@ 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 { EdgeConnectionClosedError, EdgeIdentityChangedError } from './errors';
+import { WebsocketClosedError } from './errors';
 import { PersistentLifecycle } from './persistent-lifecycle';
 import { type Protocol, toUint8Array } from './protocol';
 
@@ -21,7 +22,6 @@ 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,8 +43,7 @@ export type MessengerConfig = {
  * Messenger client.
  */
 export class EdgeClient extends Resource implements EdgeConnection {
-  public readonly reconnect = new Event();
-  public readonly connected = new Event();
+  public reconnect = new Event();
   private readonly _persistentLifecycle = new PersistentLifecycle({
     start: async () => this._openWebSocket(),
     stop: async () => this._closeWebSocket(),
@@ -52,6 +51,7 @@ 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,6 +63,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
     private readonly _config: MessengerConfig,
   ) {
     super();
+    this._protocol = this._config.protocol ?? protocol;
   }
 
   // TODO(burdon): Attach logging.
@@ -118,7 +119,6 @@ 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(this.isOpen ? new EdgeIdentityChangedError() : new EdgeConnectionClosedError());
+      this._ready.throw(new WebsocketClosedError());
       this._ready.reset();
       void this._keepaliveCtx?.dispose();
       this._keepaliveCtx = undefined;
@@ -197,19 +197,10 @@ 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 });
     }
-    if (!this._ws) {
-      throw new EdgeConnectionClosedError();
-    }
-    if (
-      message.source &&
-      (message.source.peerKey !== this._peerKey || message.source.identityKey !== this.identityKey)
-    ) {
-      throw new EdgeIdentityChangedError();
-    }
-
+    invariant(this._ws);
+    invariant(!message.source || message.source.peerKey === this._peerKey);
     log('sending...', { peerKey: this._peerKey, payload: protocol.getPayloadType(message) });
     this._ws.send(buf.toBinary(MessageSchema, message));
   }

package/src/errors.ts

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

package/src/index.ts

@@ -7,4 +7,3 @@ 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 { describe, expect, test } from 'vitest';
+import { expect } from 'chai';
 
 import { sleep, Trigger } from '@dxos/async';
 import { log } from '@dxos/log';
-import { openAndClose } from '@dxos/test-utils';
+import { describe, openAndClose, test } from '@dxos/test';
 
 import { PersistentLifecycle } from './persistent-lifecycle';
 

package/src/protocol.test.ts

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

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

package/src/test-utils.ts

@@ -0,0 +1,49 @@
+//
+// 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 } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
+import { afterTest } from '@dxos/test';
+
+import { protocol } from './defs';
+import { toUint8Array } from './protocol';
+
+export const DEFAULT_PORT = 8080;
+
+export const createTestWsServer = async (port = DEFAULT_PORT) => {
+  const server = new WebSocket.Server({ port });
+  let connection: WebSocket;
+  const closeTrigger = new Trigger();
+  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;
+      }
+      log('message', {
+        payload: protocol.getPayload(buf.fromBinary(MessageSchema, await toUint8Array(data)), TextMessageSchema),
+      });
+    });
+    ws.on('close', () => closeTrigger.wake());
+  });
+
+  afterTest(() => server.close());
+  return {
+    server,
+    /**
+     * Close the server connection.
+     */
+    error: async () => {
+      connection.close(1011);
+      await closeTrigger.wait();
+    },
+    endpoint: `ws://localhost:${port}`,
+  };
+};

package/src/websocket.test.ts

@@ -2,18 +2,17 @@
 // Copyright 2024 DXOS.org
 //
 
+import { expect } from 'chai';
 import WebSocket from 'isomorphic-ws';
-import { describe, expect, test, onTestFinished } from 'vitest';
 
 import { Trigger, TriggerState } from '@dxos/async';
+import { describe, test } from '@dxos/test';
 
-import { createTestEdgeWsServer } from './testing';
+import { createTestWsServer } from './test-utils';
 
 describe('WebSocket', () => {
   test('swap `onclose` handler ', async () => {
-    const { endpoint, cleanup } = await createTestEdgeWsServer(8003);
-    onTestFinished(cleanup);
-
+    const { endpoint } = await createTestWsServer();
     const ws = new WebSocket(endpoint);
     const opened = new Trigger();
     ws.onopen = () => {

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

@@ -1,113 +0,0 @@
-// packages/core/mesh/edge-client/src/protocol.ts
-import { invariant } from "@dxos/invariant";
-import { buf, bufWkt } from "@dxos/protocols/buf";
-import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-import { bufferToArray } from "@dxos/util";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/protocol.ts";
-var getTypename = (typeName) => `type.googleapis.com/${typeName}`;
-var Protocol = class {
-  constructor(types) {
-    this._typeRegistry = buf.createRegistry(...types);
-  }
-  get typeRegistry() {
-    return this._typeRegistry;
-  }
-  toJson(message) {
-    try {
-      return buf.toJson(MessageSchema, message, {
-        registry: this.typeRegistry
-      });
-    } catch (err) {
-      return {
-        type: this.getPayloadType(message)
-      };
-    }
-  }
-  /**
-  * Return the payload with the given type.
-  */
-  getPayload(message, type) {
-    invariant(message.payload, void 0, {
-      F: __dxlog_file,
-      L: 40,
-      S: this,
-      A: [
-        "message.payload",
-        ""
-      ]
-    });
-    const payloadTypename = this.getPayloadType(message);
-    if (type && type.typeName !== payloadTypename) {
-      throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);
-    }
-    invariant(bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`, {
-      F: __dxlog_file,
-      L: 46,
-      S: this,
-      A: [
-        "bufWkt.anyIs(message.payload, type)",
-        "`Unexpected payload type: ${payloadTypename}}`"
-      ]
-    });
-    const payload = bufWkt.anyUnpack(message.payload, this.typeRegistry);
-    invariant(payload, `Empty payload: ${payloadTypename}}`, {
-      F: __dxlog_file,
-      L: 48,
-      S: this,
-      A: [
-        "payload",
-        "`Empty payload: ${payloadTypename}}`"
-      ]
-    });
-    return payload;
-  }
-  /**
-  * Get the payload type.
-  */
-  getPayloadType(message) {
-    if (!message.payload) {
-      return void 0;
-    }
-    const [, type] = message.payload.typeUrl.split("/");
-    return type;
-  }
-  /**
-  * Create a packed message.
-  */
-  createMessage(type, { source, target, payload, serviceId }) {
-    return buf.create(MessageSchema, {
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      source,
-      target,
-      serviceId,
-      payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : void 0
-    });
-  }
-};
-var toUint8Array = async (data) => {
-  if (data instanceof Buffer) {
-    return bufferToArray(data);
-  }
-  if (data instanceof Blob) {
-    return new Uint8Array(await data.arrayBuffer());
-  }
-  throw new Error(`Unexpected datatype: ${data}`);
-};
-
-// packages/core/mesh/edge-client/src/defs.ts
-import { bufWkt as bufWkt2 } from "@dxos/protocols/buf";
-import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-var protocol = new Protocol([
-  SwarmRequestSchema,
-  SwarmResponseSchema,
-  TextMessageSchema,
-  bufWkt2.AnySchema
-]);
-
-export {
-  getTypename,
-  Protocol,
-  toUint8Array,
-  protocol
-};
-//# sourceMappingURL=chunk-ZWJXA37R.mjs.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/protocol.ts", "../../../src/defs.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { invariant } from '@dxos/invariant';\nimport { buf, bufWkt } from '@dxos/protocols/buf';\nimport { type Message, MessageSchema, type PeerSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\nimport { bufferToArray } from '@dxos/util';\n\nexport type PeerData = buf.MessageInitShape<typeof PeerSchema>;\n\nexport const getTypename = (typeName: string) => `type.googleapis.com/${typeName}`;\n\n/**\n * NOTE: The type registry should be extended with all message types.\n */\nexport class Protocol {\n  private readonly _typeRegistry: buf.Registry;\n\n  constructor(types: buf.DescMessage[]) {\n    this._typeRegistry = buf.createRegistry(...types);\n  }\n\n  get typeRegistry(): buf.Registry {\n    return this._typeRegistry;\n  }\n\n  toJson(message: Message): any {\n    try {\n      return buf.toJson(MessageSchema, message, { registry: this.typeRegistry });\n    } catch (err) {\n      return { type: this.getPayloadType(message) };\n    }\n  }\n\n  /**\n   * Return the payload with the given type.\n   */\n  getPayload<Desc extends buf.DescMessage>(message: Message, type: Desc): buf.MessageShape<Desc> {\n    invariant(message.payload);\n    const payloadTypename = this.getPayloadType(message);\n    if (type && type.typeName !== payloadTypename) {\n      throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);\n    }\n\n    invariant(bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`);\n    const payload = bufWkt.anyUnpack(message.payload, this.typeRegistry) as buf.MessageShape<Desc>;\n    invariant(payload, `Empty payload: ${payloadTypename}}`);\n    return payload;\n  }\n\n  /**\n   * Get the payload type.\n   */\n  getPayloadType(message: Message): string | undefined {\n    if (!message.payload) {\n      return undefined;\n    }\n\n    const [, type] = message.payload.typeUrl.split('/');\n    return type;\n  }\n\n  /**\n   * Create a packed message.\n   */\n  createMessage<Desc extends buf.DescMessage>(\n    type: Desc,\n    {\n      source,\n      target,\n      payload,\n      serviceId,\n    }: {\n      source?: PeerData;\n      target?: PeerData[];\n      payload?: buf.MessageInitShape<Desc>;\n      serviceId?: string;\n    },\n  ) {\n    return buf.create(MessageSchema, {\n      timestamp: new Date().toISOString(),\n      source,\n      target,\n      serviceId,\n      payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : undefined,\n    });\n  }\n}\n\n/**\n * Convert websocket data to Uint8Array.\n */\nexport const toUint8Array = async (data: any): Promise<Uint8Array> => {\n  // Node.\n  if (data instanceof Buffer) {\n    return bufferToArray(data);\n  }\n\n  // Browser.\n  if (data instanceof Blob) {\n    return new Uint8Array(await (data as Blob).arrayBuffer());\n  }\n\n  throw new Error(`Unexpected datatype: ${data}`);\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { bufWkt } from '@dxos/protocols/buf';\nimport { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\n\nimport { Protocol } from './protocol';\n\nexport const protocol = new Protocol([SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema, bufWkt.AnySchema]);\n"],
-  "mappings": ";AAIA,SAASA,iBAAiB;AAC1B,SAASC,KAAKC,cAAc;AAC5B,SAAuBC,qBAAsC;AAC7D,SAASC,qBAAqB;;AAIvB,IAAMC,cAAc,CAACC,aAAqB,uBAAuBA,QAAAA;AAKjE,IAAMC,WAAN,MAAMA;EAGXC,YAAYC,OAA0B;AACpC,SAAKC,gBAAgBT,IAAIU,eAAc,GAAIF,KAAAA;EAC7C;EAEA,IAAIG,eAA6B;AAC/B,WAAO,KAAKF;EACd;EAEAG,OAAOC,SAAuB;AAC5B,QAAI;AACF,aAAOb,IAAIY,OAAOV,eAAeW,SAAS;QAAEC,UAAU,KAAKH;MAAa,CAAA;IAC1E,SAASI,KAAK;AACZ,aAAO;QAAEC,MAAM,KAAKC,eAAeJ,OAAAA;MAAS;IAC9C;EACF;;;;EAKAK,WAAyCL,SAAkBG,MAAoC;AAC7FjB,cAAUc,QAAQM,SAAO,QAAA;;;;;;;;;AACzB,UAAMC,kBAAkB,KAAKH,eAAeJ,OAAAA;AAC5C,QAAIG,QAAQA,KAAKX,aAAae,iBAAiB;AAC7C,YAAM,IAAIC,MAAM,4BAA4BD,eAAAA,cAA6BJ,KAAKX,QAAQ,EAAE;IAC1F;AAEAN,cAAUE,OAAOqB,MAAMT,QAAQM,SAASH,IAAAA,GAAO,4BAA4BI,eAAAA,KAAkB;;;;;;;;;AAC7F,UAAMD,UAAUlB,OAAOsB,UAAUV,QAAQM,SAAS,KAAKR,YAAY;AACnEZ,cAAUoB,SAAS,kBAAkBC,eAAAA,KAAkB;;;;;;;;;AACvD,WAAOD;EACT;;;;EAKAF,eAAeJ,SAAsC;AACnD,QAAI,CAACA,QAAQM,SAAS;AACpB,aAAOK;IACT;AAEA,UAAM,CAAA,EAAGR,IAAAA,IAAQH,QAAQM,QAAQM,QAAQC,MAAM,GAAA;AAC/C,WAAOV;EACT;;;;EAKAW,cACEX,MACA,EACEY,QACAC,QACAV,SACAW,UAAS,GAOX;AACA,WAAO9B,IAAI+B,OAAO7B,eAAe;MAC/B8B,YAAW,oBAAIC,KAAAA,GAAOC,YAAW;MACjCN;MACAC;MACAC;MACAX,SAASA,UAAUlB,OAAOkC,QAAQnB,MAAMhB,IAAI+B,OAAOf,MAAMG,OAAAA,CAAAA,IAAYK;IACvE,CAAA;EACF;AACF;AAKO,IAAMY,eAAe,OAAOC,SAAAA;AAEjC,MAAIA,gBAAgBC,QAAQ;AAC1B,WAAOnC,cAAckC,IAAAA;EACvB;AAGA,MAAIA,gBAAgBE,MAAM;AACxB,WAAO,IAAIC,WAAW,MAAOH,KAAcI,YAAW,CAAA;EACxD;AAEA,QAAM,IAAIpB,MAAM,wBAAwBgB,IAAAA,EAAM;AAChD;;;ACrGA,SAASK,UAAAA,eAAc;AACvB,SAASC,oBAAoBC,qBAAqBC,yBAAyB;AAIpE,IAAMC,WAAW,IAAIC,SAAS;EAACC;EAAoBC;EAAqBC;EAAmBC,QAAOC;CAAU;",
-  "names": ["invariant", "buf", "bufWkt", "MessageSchema", "bufferToArray", "getTypename", "typeName", "Protocol", "constructor", "types", "_typeRegistry", "createRegistry", "typeRegistry", "toJson", "message", "registry", "err", "type", "getPayloadType", "getPayload", "payload", "payloadTypename", "Error", "anyIs", "anyUnpack", "undefined", "typeUrl", "split", "createMessage", "source", "target", "serviceId", "create", "timestamp", "Date", "toISOString", "anyPack", "toUint8Array", "data", "Buffer", "Blob", "Uint8Array", "arrayBuffer", "bufWkt", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "protocol", "Protocol", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "bufWkt", "AnySchema"]
-}

package/dist/lib/browser/testing/index.mjs

@@ -1,122 +0,0 @@
-import {
-  protocol,
-  toUint8Array
-} from "../chunk-ZWJXA37R.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