@dxos/messaging 0.6.12-staging.e11e696 → 0.6.13-main.548ca8d

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. package/dist/lib/browser/chunk-BN7UMWB4.mjs +2299 -0
  2. package/dist/lib/browser/chunk-BN7UMWB4.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +9 -2286
  4. package/dist/lib/browser/index.mjs.map +4 -4
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/testing/index.mjs +147 -0
  7. package/dist/lib/browser/testing/index.mjs.map +7 -0
  8. package/dist/lib/node/chunk-DBUGAS7J.cjs +2276 -0
  9. package/dist/lib/node/chunk-DBUGAS7J.cjs.map +7 -0
  10. package/dist/lib/node/index.cjs +9 -2242
  11. package/dist/lib/node/index.cjs.map +4 -4
  12. package/dist/lib/node/meta.json +1 -1
  13. package/dist/lib/node/testing/index.cjs +162 -0
  14. package/dist/lib/node/testing/index.cjs.map +7 -0
  15. package/dist/lib/node-esm/chunk-5LCDIQ7T.mjs +2291 -0
  16. package/dist/lib/node-esm/chunk-5LCDIQ7T.mjs.map +7 -0
  17. package/dist/lib/node-esm/index.mjs +10 -2280
  18. package/dist/lib/node-esm/index.mjs.map +4 -4
  19. package/dist/lib/node-esm/meta.json +1 -1
  20. package/dist/lib/node-esm/testing/index.mjs +146 -0
  21. package/dist/lib/node-esm/testing/index.mjs.map +7 -0
  22. package/dist/types/src/messenger.blueprint-test.d.ts +2 -3
  23. package/dist/types/src/messenger.blueprint-test.d.ts.map +1 -1
  24. package/dist/types/src/testing/test-builder.d.ts +3 -4
  25. package/dist/types/src/testing/test-builder.d.ts.map +1 -1
  26. package/dist/types/src/testing/test-peer.d.ts +0 -1
  27. package/dist/types/src/testing/test-peer.d.ts.map +1 -1
  28. package/package.json +29 -16
  29. package/src/messenger.blueprint-test.ts +2 -5
  30. package/src/messenger.node.test.ts +1 -2
  31. package/src/signal-manager/edge-signal-manager.node.test.ts +7 -3
  32. package/src/testing/test-builder.ts +3 -6
  33. package/src/testing/test-peer.ts +4 -6
@@ -1,4 +1,3 @@
1
- import { type PublicKey } from '@dxos/keys';
2
- import { type SignalManager } from './signal-manager';
3
- export declare const messengerTests: (signalManagerFactory: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>) => void;
1
+ import { TestBuilder } from './testing';
2
+ export declare const messengerTests: (signalManagerFactory: TestBuilder["createSignalManager"]) => void;
4
3
  //# sourceMappingURL=messenger.blueprint-test.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"messenger.blueprint-test.d.ts","sourceRoot":"","sources":["../../../src/messenger.blueprint-test.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,KAAK,aAAa,EAA0B,MAAM,kBAAkB,CAAC;AAI9E,eAAO,MAAM,cAAc,yBACH,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,aAAa,CAAC,SAqU/F,CAAC"}
1
+ {"version":3,"file":"messenger.blueprint-test.d.ts","sourceRoot":"","sources":["../../../src/messenger.blueprint-test.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiD,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvF,eAAO,MAAM,cAAc,yBAA0B,WAAW,CAAC,qBAAqB,CAAC,SAoUtF,CAAC"}
@@ -1,9 +1,8 @@
1
- import { type PublicKey } from '@dxos/keys';
2
1
  import { TestPeer } from './test-peer';
3
- import { type SignalManager, MemorySignalManager } from '../signal-manager';
2
+ import { type SignalManager } from '../signal-manager';
4
3
  import { type Message } from '../signal-methods';
5
4
  export type TestBuilderOptions = {
6
- signalManagerFactory?: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>;
5
+ signalManagerFactory?: (peer: TestPeer) => Promise<SignalManager>;
7
6
  messageDisruption?: (msg: Message) => Message[];
8
7
  };
9
8
  export declare class TestBuilder {
@@ -11,7 +10,7 @@ export declare class TestBuilder {
11
10
  private _signalContext;
12
11
  private readonly _peers;
13
12
  constructor(options: TestBuilderOptions);
14
- createSignalManager(identityKey: PublicKey, deviceKey: PublicKey): Promise<SignalManager | MemorySignalManager>;
13
+ createSignalManager(peer: TestPeer): Promise<SignalManager>;
15
14
  createPeer(): Promise<TestPeer>;
16
15
  createPeers(count: number): Promise<TestPeer[]>;
17
16
  close(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,aAAa,EAAE,mBAAmB,EAA8B,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oBAAoB,CAAC,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAChG,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;CACjD,CAAC;AAEF,qBAAa,WAAW;IAIH,OAAO,EAAE,kBAAkB;IAH9C,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;gBAEtB,OAAO,EAAE,kBAAkB;IAExC,mBAAmB,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS;IAkBhE,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC;IAO/B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI/C,KAAK;CAGZ"}
1
+ {"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,KAAK,aAAa,EAAmD,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAClE,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;CACjD,CAAC;AAEF,qBAAa,WAAW;IAIH,OAAO,EAAE,kBAAkB;IAH9C,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;gBAEtB,OAAO,EAAE,kBAAkB;IAExC,mBAAmB,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC;IAiB3D,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC;IAO/B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI/C,KAAK;CAGZ"}
@@ -8,7 +8,6 @@ import { type Message, type PeerInfo } from '../signal-methods';
8
8
  export declare class TestPeer extends Resource {
9
9
  private readonly testBuilder;
10
10
  peerId: PublicKey;
11
- identityKey: PublicKey;
12
11
  signalManager: SignalManager;
13
12
  messenger: Messenger;
14
13
  defaultReceived: Event<Message>;
@@ -1 +1 @@
1
- {"version":3,"file":"test-peer.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-peer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEhE,qBAAa,QAAS,SAAQ,QAAQ;IAOxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IANjC,MAAM,YAAsB;IAC5B,WAAW,YAAsB;IACjC,aAAa,EAAG,aAAa,CAAC;IAC9B,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,iBAAwB;gBAEjB,WAAW,EAAE,WAAW;IAIrD,IAAI,QAAQ,IAAI,QAAQ,CAKvB;IAEK,eAAe,CAAC,OAAO,EAAE,OAAO;IAIhC,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ;IAIrD,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ;cAI7B,KAAK;cAgBL,MAAM;CAIhC"}
1
+ {"version":3,"file":"test-peer.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-peer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEhE,qBAAa,QAAS,SAAQ,QAAQ;IAMxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IALjC,MAAM,YAAsB;IAC5B,aAAa,EAAG,aAAa,CAAC;IAC9B,SAAS,EAAG,SAAS,CAAC;IACtB,eAAe,iBAAwB;gBAEjB,WAAW,EAAE,WAAW;IAIrD,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAEK,eAAe,CAAC,OAAO,EAAE,OAAO;IAIhC,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ;IAIrD,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ;cAI7B,KAAK;cAgBL,MAAM;CAIhC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/messaging",
3
- "version": "0.6.12-staging.e11e696",
3
+ "version": "0.6.13-main.548ca8d",
4
4
  "description": "Messaging",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,11 +14,23 @@
14
14
  "default": "./dist/lib/node-esm/index.mjs"
15
15
  },
16
16
  "types": "./dist/types/src/index.d.ts"
17
+ },
18
+ "./testing": {
19
+ "browser": "./dist/lib/browser/testing/index.mjs",
20
+ "node": {
21
+ "require": "./dist/lib/node/testing/index.cjs",
22
+ "default": "./dist/lib/node-esm/testing/index.mjs"
23
+ },
24
+ "types": "./dist/types/src/testing/index.d.ts"
17
25
  }
18
26
  },
19
27
  "types": "dist/types/src/index.d.ts",
20
28
  "typesVersions": {
21
- "*": {}
29
+ "*": {
30
+ "testing": [
31
+ "dist/types/src/testing/index.d.ts"
32
+ ]
33
+ }
22
34
  },
23
35
  "files": [
24
36
  "dist",
@@ -28,23 +40,24 @@
28
40
  "dependencies": {
29
41
  "isomorphic-ws": "^5.0.0",
30
42
  "ws": "^8.14.2",
31
- "@dxos/codec-protobuf": "0.6.12-staging.e11e696",
32
- "@dxos/context": "0.6.12-staging.e11e696",
33
- "@dxos/invariant": "0.6.12-staging.e11e696",
34
- "@dxos/edge-client": "0.6.12-staging.e11e696",
35
- "@dxos/keys": "0.6.12-staging.e11e696",
36
- "@dxos/async": "0.6.12-staging.e11e696",
37
- "@dxos/log": "0.6.12-staging.e11e696",
38
- "@dxos/node-std": "0.6.12-staging.e11e696",
39
- "@dxos/protocols": "0.6.12-staging.e11e696",
40
- "@dxos/rpc": "0.6.12-staging.e11e696",
41
- "@dxos/tracing": "0.6.12-staging.e11e696",
42
- "@dxos/util": "0.6.12-staging.e11e696"
43
+ "@dxos/async": "0.6.13-main.548ca8d",
44
+ "@dxos/codec-protobuf": "0.6.13-main.548ca8d",
45
+ "@dxos/context": "0.6.13-main.548ca8d",
46
+ "@dxos/edge-client": "0.6.13-main.548ca8d",
47
+ "@dxos/invariant": "0.6.13-main.548ca8d",
48
+ "@dxos/keys": "0.6.13-main.548ca8d",
49
+ "@dxos/log": "0.6.13-main.548ca8d",
50
+ "@dxos/node-std": "0.6.13-main.548ca8d",
51
+ "@dxos/protocols": "0.6.13-main.548ca8d",
52
+ "@dxos/rpc": "0.6.13-main.548ca8d",
53
+ "@dxos/util": "0.6.13-main.548ca8d",
54
+ "@dxos/tracing": "0.6.13-main.548ca8d"
43
55
  },
44
56
  "devDependencies": {
45
57
  "@types/node": "^22.7.4",
46
- "@dxos/signal": "0.6.12-staging.e11e696",
47
- "@dxos/test-utils": "0.6.12-staging.e11e696"
58
+ "@dxos/keyring": "0.6.13-main.548ca8d",
59
+ "@dxos/signal": "0.6.13-main.548ca8d",
60
+ "@dxos/test-utils": "0.6.13-main.548ca8d"
48
61
  },
49
62
  "publishConfig": {
50
63
  "access": "public"
@@ -5,16 +5,13 @@
5
5
  import { describe, expect, test, onTestFinished } from 'vitest';
6
6
 
7
7
  import { asyncTimeout, latch, sleep } from '@dxos/async';
8
- import { type PublicKey } from '@dxos/keys';
9
8
  import { range } from '@dxos/util';
10
9
 
11
- import { type SignalManager, WebsocketSignalManager } from './signal-manager';
10
+ import { WebsocketSignalManager } from './signal-manager';
12
11
  import { type Message } from './signal-methods';
13
12
  import { messageEqual, PAYLOAD_1, PAYLOAD_2, PAYLOAD_3, TestBuilder } from './testing';
14
13
 
15
- export const messengerTests = (
16
- signalManagerFactory: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>,
17
- ) => {
14
+ export const messengerTests = (signalManagerFactory: TestBuilder['createSignalManager']) => {
18
15
  test('Message between peers', async () => {
19
16
  const builder = new TestBuilder({
20
17
  signalManagerFactory,
@@ -6,7 +6,6 @@ import { afterAll, onTestFinished, beforeAll, test, describe } from 'vitest';
6
6
 
7
7
  import { asyncTimeout } from '@dxos/async';
8
8
  import { createEphemeralEdgeIdentity, EdgeClient } from '@dxos/edge-client';
9
- import { type PublicKey } from '@dxos/keys';
10
9
  import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
11
10
  import { openAndClose } from '@dxos/test-utils';
12
11
 
@@ -53,7 +52,7 @@ describe('Messenger with WebsocketSignalManager', () => {
53
52
 
54
53
  // TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
55
54
  describe.skip('Messenger with EdgeSignalManager', () => {
56
- const edgeSignalFactory = async (identityKey: PublicKey, deviceKey: PublicKey) => {
55
+ const edgeSignalFactory = async () => {
57
56
  const client = new EdgeClient(await createEphemeralEdgeIdentity(), { socketEndpoint: 'ws://localhost:8787' });
58
57
  await openAndClose(client);
59
58
 
@@ -4,7 +4,8 @@
4
4
 
5
5
  import { onTestFinished, describe, test } from 'vitest';
6
6
 
7
- import { createEphemeralEdgeIdentity, EdgeClient } from '@dxos/edge-client';
7
+ import { createDeviceEdgeIdentity, EdgeClient } from '@dxos/edge-client';
8
+ import { Keyring } from '@dxos/keyring';
8
9
  import { PublicKey } from '@dxos/keys';
9
10
  import { openAndClose } from '@dxos/test-utils';
10
11
 
@@ -13,8 +14,11 @@ import { createMessage, expectReceivedMessage, TestBuilder, type TestBuilderOpti
13
14
 
14
15
  // TODO(mykola): Expects wrangler dev in edge repo to run. Skip to pass CI.
15
16
  describe.skip('EdgeSignalManager', () => {
16
- const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (identityKey, deviceKey) => {
17
- const client = new EdgeClient(await createEphemeralEdgeIdentity(), { socketEndpoint: 'ws://localhost:8787' });
17
+ const edgeSignalFactory: TestBuilderOptions['signalManagerFactory'] = async (peer) => {
18
+ const keyring = new Keyring();
19
+ const client = new EdgeClient(await createDeviceEdgeIdentity(keyring, peer.peerId), {
20
+ socketEndpoint: 'ws://localhost:8787',
21
+ });
18
22
  await openAndClose(client);
19
23
 
20
24
  return new EdgeSignalManager({ edgeConnection: client });
@@ -2,14 +2,12 @@
2
2
  // Copyright 2022 DXOS.org
3
3
  //
4
4
 
5
- import { type PublicKey } from '@dxos/keys';
6
-
7
5
  import { TestPeer } from './test-peer';
8
6
  import { type SignalManager, MemorySignalManager, MemorySignalManagerContext } from '../signal-manager';
9
7
  import { type Message } from '../signal-methods';
10
8
 
11
9
  export type TestBuilderOptions = {
12
- signalManagerFactory?: (identityKey: PublicKey, deviceKey: PublicKey) => Promise<SignalManager>;
10
+ signalManagerFactory?: (peer: TestPeer) => Promise<SignalManager>;
13
11
  messageDisruption?: (msg: Message) => Message[];
14
12
  };
15
13
 
@@ -19,10 +17,9 @@ export class TestBuilder {
19
17
 
20
18
  constructor(public options: TestBuilderOptions) {}
21
19
 
22
- async createSignalManager(identityKey: PublicKey, deviceKey: PublicKey) {
20
+ async createSignalManager(peer: TestPeer): Promise<SignalManager> {
23
21
  const signalManager =
24
- (await this.options.signalManagerFactory?.(identityKey, deviceKey)) ??
25
- new MemorySignalManager(this._signalContext);
22
+ (await this.options.signalManagerFactory?.(peer)) ?? new MemorySignalManager(this._signalContext);
26
23
 
27
24
  if (this.options.messageDisruption) {
28
25
  // Imitates signal network disruptions (e. g. message doubling, ).
@@ -4,8 +4,10 @@
4
4
 
5
5
  import { Event } from '@dxos/async';
6
6
  import { Resource } from '@dxos/context';
7
+ import { PeerSchema } from '@dxos/edge-client';
7
8
  import { PublicKey } from '@dxos/keys';
8
9
  import { log } from '@dxos/log';
10
+ import { buf } from '@dxos/protocols/buf';
9
11
 
10
12
  import { type TestBuilder } from './test-builder';
11
13
  import { expectPeerAvailable, expectPeerLeft, expectReceivedMessage } from './utils';
@@ -15,7 +17,6 @@ import { type Message, type PeerInfo } from '../signal-methods';
15
17
 
16
18
  export class TestPeer extends Resource {
17
19
  public peerId = PublicKey.random();
18
- public identityKey = PublicKey.random();
19
20
  public signalManager!: SignalManager;
20
21
  public messenger!: Messenger;
21
22
  public defaultReceived = new Event<Message>();
@@ -25,10 +26,7 @@ export class TestPeer extends Resource {
25
26
  }
26
27
 
27
28
  get peerInfo(): PeerInfo {
28
- return {
29
- peerKey: this.peerId.toHex(),
30
- identityKey: this.identityKey.toHex(),
31
- };
29
+ return buf.create(PeerSchema, { peerKey: this.peerId.toHex(), identityKey: this.peerId.toHex() });
32
30
  }
33
31
 
34
32
  async waitTillReceive(message: Message) {
@@ -44,7 +42,7 @@ export class TestPeer extends Resource {
44
42
  }
45
43
 
46
44
  protected override async _open() {
47
- this.signalManager = await this.testBuilder.createSignalManager(this.identityKey, this.peerId);
45
+ this.signalManager = await this.testBuilder.createSignalManager(this);
48
46
  this.messenger = new Messenger({ signalManager: this.signalManager, retryDelay: 300 });
49
47
 
50
48
  await this.signalManager.open();