@dxos/messaging 0.10.0 → 0.11.1
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.
- package/dist/lib/chunk-memory-signal-manager.mjs +652 -0
- package/dist/lib/chunk-memory-signal-manager.mjs.map +1 -0
- package/dist/lib/index.mjs +377 -0
- package/dist/lib/index.mjs.map +1 -0
- package/dist/lib/testing.mjs +288 -0
- package/dist/lib/testing.mjs.map +1 -0
- package/dist/types/src/index.d.ts +0 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/messenger.blueprint-test.d.ts.map +1 -1
- package/dist/types/src/messenger.d.ts +1 -1
- package/dist/types/src/messenger.d.ts.map +1 -1
- package/dist/types/src/signal-manager/edge-signal-manager.d.ts +21 -4
- package/dist/types/src/signal-manager/edge-signal-manager.d.ts.map +1 -1
- package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts +2 -0
- package/dist/types/src/signal-manager/edge-signal-manager.test.d.ts.map +1 -0
- package/dist/types/src/signal-manager/index.d.ts +1 -2
- package/dist/types/src/signal-manager/index.d.ts.map +1 -1
- package/dist/types/src/signal-manager/memory-signal-manager.d.ts +12 -10
- package/dist/types/src/signal-manager/memory-signal-manager.d.ts.map +1 -1
- package/dist/types/src/signal-manager/memory-signal-manager.test.d.ts +2 -0
- package/dist/types/src/signal-manager/memory-signal-manager.test.d.ts.map +1 -0
- package/dist/types/src/signal-manager/signal-manager.d.ts +5 -0
- package/dist/types/src/signal-manager/signal-manager.d.ts.map +1 -1
- package/dist/types/src/signal-manager/utils.d.ts +6 -4
- package/dist/types/src/signal-manager/utils.d.ts.map +1 -1
- package/dist/types/src/signal-methods.d.ts +33 -22
- package/dist/types/src/signal-methods.d.ts.map +1 -1
- package/dist/types/src/testing/index.d.ts +1 -0
- package/dist/types/src/testing/index.d.ts.map +1 -1
- package/dist/types/src/testing/test-edge-mesh.d.ts +61 -0
- package/dist/types/src/testing/test-edge-mesh.d.ts.map +1 -0
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +19 -19
- package/src/index.ts +0 -1
- package/src/messenger.blueprint-test.ts +0 -25
- package/src/messenger.node.test.ts +1 -1
- package/src/messenger.ts +42 -18
- package/src/signal-manager/edge-signal-manager.test.ts +193 -0
- package/src/signal-manager/edge-signal-manager.ts +145 -12
- package/src/signal-manager/index.ts +1 -2
- package/src/signal-manager/memory-signal-manager.test.ts +199 -0
- package/src/signal-manager/memory-signal-manager.ts +87 -47
- package/src/signal-manager/signal-manager.ts +7 -0
- package/src/signal-manager/utils.ts +30 -21
- package/src/signal-methods.ts +37 -26
- package/src/testing/index.ts +1 -0
- package/src/testing/test-edge-mesh.ts +196 -0
- package/src/testing/utils.ts +2 -2
- package/dist/lib/neutral/chunk-EC4H56J5.mjs +0 -497
- package/dist/lib/neutral/chunk-EC4H56J5.mjs.map +0 -7
- package/dist/lib/neutral/index.mjs +0 -1249
- package/dist/lib/neutral/index.mjs.map +0 -7
- package/dist/lib/neutral/meta.json +0 -1
- package/dist/lib/neutral/testing/index.mjs +0 -155
- package/dist/lib/neutral/testing/index.mjs.map +0 -7
- package/dist/types/src/signal-client/index.d.ts +0 -2
- package/dist/types/src/signal-client/index.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-client-monitor.d.ts +0 -30
- package/dist/types/src/signal-client/signal-client-monitor.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-client.d.ts +0 -59
- package/dist/types/src/signal-client/signal-client.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-client.node.test.d.ts +0 -2
- package/dist/types/src/signal-client/signal-client.node.test.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-local-state.d.ts +0 -38
- package/dist/types/src/signal-client/signal-local-state.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-rpc-client-monitor.d.ts +0 -6
- package/dist/types/src/signal-client/signal-rpc-client-monitor.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-rpc-client.d.ts +0 -47
- package/dist/types/src/signal-client/signal-rpc-client.d.ts.map +0 -1
- package/dist/types/src/signal-client/signal-rpc-client.node.test.d.ts +0 -2
- package/dist/types/src/signal-client/signal-rpc-client.node.test.d.ts.map +0 -1
- package/dist/types/src/signal-manager/websocket-signal-manager-monitor.d.ts +0 -8
- package/dist/types/src/signal-manager/websocket-signal-manager-monitor.d.ts.map +0 -1
- package/dist/types/src/signal-manager/websocket-signal-manager.d.ts +0 -41
- package/dist/types/src/signal-manager/websocket-signal-manager.d.ts.map +0 -1
- package/dist/types/src/signal-manager/websocket-signal-manager.node.test.d.ts +0 -2
- package/dist/types/src/signal-manager/websocket-signal-manager.node.test.d.ts.map +0 -1
- package/src/signal-client/index.ts +0 -5
- package/src/signal-client/signal-client-monitor.ts +0 -111
- package/src/signal-client/signal-client.node.test.ts +0 -185
- package/src/signal-client/signal-client.ts +0 -339
- package/src/signal-client/signal-local-state.ts +0 -174
- package/src/signal-client/signal-rpc-client-monitor.ts +0 -15
- package/src/signal-client/signal-rpc-client.node.test.ts +0 -102
- package/src/signal-client/signal-rpc-client.ts +0 -227
- package/src/signal-manager/websocket-signal-manager-monitor.ts +0 -20
- package/src/signal-manager/websocket-signal-manager.node.test.ts +0 -112
- package/src/signal-manager/websocket-signal-manager.ts +0 -188
|
@@ -0,0 +1,196 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2026 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import { Event } from '@dxos/async';
|
|
6
|
+
import { type Context } from '@dxos/context';
|
|
7
|
+
import { type EdgeConnection, protocol } from '@dxos/edge-client';
|
|
8
|
+
import { EdgeService } from '@dxos/protocols';
|
|
9
|
+
import {
|
|
10
|
+
type Message,
|
|
11
|
+
SwarmRequest_Action as SwarmRequestAction,
|
|
12
|
+
SwarmRequestSchema,
|
|
13
|
+
} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* In-memory stand-in for the EDGE router + swarm, feature-complete for the messaging paths
|
|
17
|
+
* {@link EdgeSignalManager} exercises: swarm membership (JOIN/LEAVE), tag subscriptions (SUBSCRIBE),
|
|
18
|
+
* point-to-point relay, and tag broadcast fan-out (DX-1125). Multiple {@link TestEdgeConnection}s
|
|
19
|
+
* attach to one mesh, so a broadcast from one client is delivered to the matching subscribers of
|
|
20
|
+
* another — mirroring the real edge without a WebSocket or Durable Object.
|
|
21
|
+
*/
|
|
22
|
+
export class TestEdgeMesh {
|
|
23
|
+
/** peerKey -> connection. */
|
|
24
|
+
private readonly _connections = new Map<string, TestEdgeConnection>();
|
|
25
|
+
/** swarmKey -> (peerKey -> subscription tags). */
|
|
26
|
+
private readonly _subscriptions = new Map<string, Map<string, string[]>>();
|
|
27
|
+
/** swarmKey -> set of member peerKeys. */
|
|
28
|
+
private readonly _members = new Map<string, Set<string>>();
|
|
29
|
+
|
|
30
|
+
createConnection({ peerKey, identityDid }: { peerKey: string; identityDid: string }): TestEdgeConnection {
|
|
31
|
+
const connection = new TestEdgeConnection({ peerKey, identityDid, mesh: this });
|
|
32
|
+
this._connections.set(peerKey, connection);
|
|
33
|
+
return connection;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
removeConnection(peerKey: string): void {
|
|
37
|
+
this._connections.delete(peerKey);
|
|
38
|
+
for (const members of this._members.values()) {
|
|
39
|
+
members.delete(peerKey);
|
|
40
|
+
}
|
|
41
|
+
for (const subs of this._subscriptions.values()) {
|
|
42
|
+
subs.delete(peerKey);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** Handle a message sent by a client connection. */
|
|
47
|
+
receive(fromPeerKey: string, message: Message): void {
|
|
48
|
+
switch (message.serviceId) {
|
|
49
|
+
case EdgeService.SWARM:
|
|
50
|
+
this._handleSwarmRequest(fromPeerKey, message);
|
|
51
|
+
break;
|
|
52
|
+
case EdgeService.SIGNAL:
|
|
53
|
+
this._handleSignal(fromPeerKey, message);
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
private _handleSwarmRequest(fromPeerKey: string, message: Message): void {
|
|
59
|
+
const request = protocol.getPayload(message, SwarmRequestSchema);
|
|
60
|
+
const swarmKeys = request.swarmKeys ?? [];
|
|
61
|
+
switch (request.action) {
|
|
62
|
+
case SwarmRequestAction.JOIN:
|
|
63
|
+
for (const swarmKey of swarmKeys) {
|
|
64
|
+
this._memberSet(swarmKey).add(fromPeerKey);
|
|
65
|
+
}
|
|
66
|
+
break;
|
|
67
|
+
case SwarmRequestAction.LEAVE:
|
|
68
|
+
for (const swarmKey of swarmKeys) {
|
|
69
|
+
this._memberSet(swarmKey).delete(fromPeerKey);
|
|
70
|
+
this._subscriptionMap(swarmKey).delete(fromPeerKey);
|
|
71
|
+
}
|
|
72
|
+
break;
|
|
73
|
+
case SwarmRequestAction.SUBSCRIBE:
|
|
74
|
+
// Set/replace this peer's broadcast subscription on each named swarm (DX-1125).
|
|
75
|
+
for (const swarmKey of swarmKeys) {
|
|
76
|
+
this._subscriptionMap(swarmKey).set(fromPeerKey, request.subscribeTags ?? []);
|
|
77
|
+
}
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
private _handleSignal(fromPeerKey: string, message: Message): void {
|
|
83
|
+
const tags = message.tags ?? [];
|
|
84
|
+
const targets = message.target ?? [];
|
|
85
|
+
|
|
86
|
+
// Broadcast (DX-1125): tags present, no target -> fan out to matching subscribers on the swarm.
|
|
87
|
+
if (tags.length > 0 && targets.length === 0) {
|
|
88
|
+
const swarmKey = message.source?.swarmKey;
|
|
89
|
+
if (!swarmKey) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
for (const [peerKey, subscriptionTags] of this._subscriptionMap(swarmKey)) {
|
|
93
|
+
if (peerKey === fromPeerKey) {
|
|
94
|
+
continue; // No self-delivery.
|
|
95
|
+
}
|
|
96
|
+
if (subscriptionTags.some((tag) => tags.includes(tag))) {
|
|
97
|
+
this._connections.get(peerKey)?.deliver(message);
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
// Point-to-point relay.
|
|
104
|
+
for (const target of targets) {
|
|
105
|
+
if (target.peerKey) {
|
|
106
|
+
this._connections.get(target.peerKey)?.deliver(message);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private _memberSet(swarmKey: string): Set<string> {
|
|
112
|
+
let set = this._members.get(swarmKey);
|
|
113
|
+
if (!set) {
|
|
114
|
+
set = new Set();
|
|
115
|
+
this._members.set(swarmKey, set);
|
|
116
|
+
}
|
|
117
|
+
return set;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
private _subscriptionMap(swarmKey: string): Map<string, string[]> {
|
|
121
|
+
let map = this._subscriptions.get(swarmKey);
|
|
122
|
+
if (!map) {
|
|
123
|
+
map = new Map();
|
|
124
|
+
this._subscriptions.set(swarmKey, map);
|
|
125
|
+
}
|
|
126
|
+
return map;
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/**
|
|
131
|
+
* In-memory {@link EdgeConnection} bound to a {@link TestEdgeMesh}. Only the members
|
|
132
|
+
* {@link EdgeSignalManager} uses are functional; the rest are inert stubs.
|
|
133
|
+
*/
|
|
134
|
+
export class TestEdgeConnection implements EdgeConnection {
|
|
135
|
+
public readonly statusChanged: EdgeConnection['statusChanged'] = new Event<any>();
|
|
136
|
+
private readonly _messageListeners = new Set<(message: Message) => void>();
|
|
137
|
+
private readonly _peerKey: string;
|
|
138
|
+
private readonly _identityDid: string;
|
|
139
|
+
private readonly _mesh: TestEdgeMesh;
|
|
140
|
+
|
|
141
|
+
constructor({ peerKey, identityDid, mesh }: { peerKey: string; identityDid: string; mesh: TestEdgeMesh }) {
|
|
142
|
+
this._peerKey = peerKey;
|
|
143
|
+
this._identityDid = identityDid;
|
|
144
|
+
this._mesh = mesh;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
get info(): any {
|
|
148
|
+
return { peerKey: this._peerKey, identityDid: this._identityDid };
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
get identityDid(): string {
|
|
152
|
+
return this._identityDid;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
get peerKey(): string {
|
|
156
|
+
return this._peerKey;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
get isOpen(): boolean {
|
|
160
|
+
return true;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
get status(): EdgeConnection['status'] {
|
|
164
|
+
return {} as EdgeConnection['status'];
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
setIdentity(): void {}
|
|
168
|
+
|
|
169
|
+
async send(_ctx: Context, message: Message): Promise<void> {
|
|
170
|
+
this._mesh.receive(this._peerKey, message);
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
onMessage(listener: (message: Message) => void): () => void {
|
|
174
|
+
this._messageListeners.add(listener);
|
|
175
|
+
return () => this._messageListeners.delete(listener);
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
onReconnected(listener: () => void, opts?: { emitCurrentState?: boolean }): () => void {
|
|
179
|
+
if (opts?.emitCurrentState !== false) {
|
|
180
|
+
listener();
|
|
181
|
+
}
|
|
182
|
+
return () => {};
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
/** Deliver a message from the mesh to this connection's listeners. */
|
|
186
|
+
deliver(message: Message): void {
|
|
187
|
+
for (const listener of this._messageListeners) {
|
|
188
|
+
listener(message);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
async open(): Promise<void> {}
|
|
193
|
+
async close(): Promise<void> {
|
|
194
|
+
this._mesh.removeConnection(this._peerKey);
|
|
195
|
+
}
|
|
196
|
+
}
|
package/src/testing/utils.ts
CHANGED
|
@@ -31,7 +31,7 @@ export const expectReceivedMessage = (event: Event<Message>, expectedMessage: Me
|
|
|
31
31
|
event.waitFor(
|
|
32
32
|
(msg) =>
|
|
33
33
|
msg.author.peerKey === expectedMessage.author.peerKey &&
|
|
34
|
-
msg.recipient
|
|
34
|
+
msg.recipient?.peerKey === expectedMessage.recipient?.peerKey &&
|
|
35
35
|
PublicKey.from(msg.payload.value).equals(expectedMessage.payload.value),
|
|
36
36
|
),
|
|
37
37
|
5000,
|
|
@@ -46,5 +46,5 @@ export const createMessage = (author: PeerInfo, recipient: PeerInfo, payload: An
|
|
|
46
46
|
|
|
47
47
|
export const messageEqual = (msg1: Message, msg2: Message) =>
|
|
48
48
|
msg1.author.peerKey === msg2.author.peerKey &&
|
|
49
|
-
msg1.recipient
|
|
49
|
+
msg1.recipient?.peerKey === msg2.recipient?.peerKey &&
|
|
50
50
|
PublicKey.from(msg1.payload.value).equals(msg2.payload.value);
|
|
@@ -1,497 +0,0 @@
|
|
|
1
|
-
import "@dxos/node-std/globals";
|
|
2
|
-
|
|
3
|
-
// src/messenger.ts
|
|
4
|
-
import { TimeoutError, scheduleExponentialBackoffTaskInterval, scheduleTask, scheduleTaskInterval } from "@dxos/async";
|
|
5
|
-
import { Context } from "@dxos/context";
|
|
6
|
-
import { invariant } from "@dxos/invariant";
|
|
7
|
-
import { PublicKey } from "@dxos/keys";
|
|
8
|
-
import { log } from "@dxos/log";
|
|
9
|
-
import { TimeoutError as ProtocolTimeoutError } from "@dxos/protocols";
|
|
10
|
-
import { schema } from "@dxos/protocols/proto";
|
|
11
|
-
import { ComplexMap, ComplexSet } from "@dxos/util";
|
|
12
|
-
|
|
13
|
-
// src/messenger-monitor.ts
|
|
14
|
-
import { trace } from "@dxos/tracing";
|
|
15
|
-
var MessengerMonitor = class {
|
|
16
|
-
recordMessageAckFailed() {
|
|
17
|
-
trace.metrics.increment("dxos.mesh.signal.messenger.failed-ack", 1);
|
|
18
|
-
}
|
|
19
|
-
recordReliableMessage(params) {
|
|
20
|
-
trace.metrics.increment("dxos.mesh.signal.messenger.reliable-send", 1, {
|
|
21
|
-
tags: {
|
|
22
|
-
success: params.sent,
|
|
23
|
-
attempts: params.sendAttempts
|
|
24
|
-
}
|
|
25
|
-
});
|
|
26
|
-
}
|
|
27
|
-
};
|
|
28
|
-
|
|
29
|
-
// src/timeouts.ts
|
|
30
|
-
var MESSAGE_TIMEOUT = 1e4;
|
|
31
|
-
|
|
32
|
-
// src/messenger.ts
|
|
33
|
-
var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
|
|
34
|
-
var ReliablePayload = schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
|
|
35
|
-
var Acknowledgement = schema.getCodecForType("dxos.mesh.messaging.Acknowledgement");
|
|
36
|
-
var RECEIVED_MESSAGES_GC_INTERVAL = 12e4;
|
|
37
|
-
var Messenger = class {
|
|
38
|
-
_monitor = new MessengerMonitor();
|
|
39
|
-
_signalManager;
|
|
40
|
-
// { peerId, payloadType } => listeners set
|
|
41
|
-
_listeners = new ComplexMap(({ peerId, payloadType }) => peerId + payloadType);
|
|
42
|
-
// peerId => listeners set
|
|
43
|
-
_defaultListeners = /* @__PURE__ */ new Map();
|
|
44
|
-
_onAckCallbacks = new ComplexMap(PublicKey.hash);
|
|
45
|
-
_receivedMessages = new ComplexSet(PublicKey.hash);
|
|
46
|
-
/**
|
|
47
|
-
* Keys scheduled to be cleared from _receivedMessages on the next iteration.
|
|
48
|
-
*/
|
|
49
|
-
_toClear = new ComplexSet(PublicKey.hash);
|
|
50
|
-
_ctx;
|
|
51
|
-
_closed = true;
|
|
52
|
-
_retryDelay;
|
|
53
|
-
constructor({ signalManager, retryDelay = 1e3 }) {
|
|
54
|
-
this._signalManager = signalManager;
|
|
55
|
-
this._retryDelay = retryDelay;
|
|
56
|
-
this.open();
|
|
57
|
-
}
|
|
58
|
-
open() {
|
|
59
|
-
if (!this._closed) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
log("opening messenger", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 43, S: this });
|
|
63
|
-
this._ctx = new Context({
|
|
64
|
-
onError: (err) => log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 45, S: this })
|
|
65
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 44 });
|
|
66
|
-
this._ctx.onDispose(this._signalManager.onMessage.on(async (message) => {
|
|
67
|
-
log("received message", {
|
|
68
|
-
from: message.author
|
|
69
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 48, S: this });
|
|
70
|
-
await this._handleMessage(message);
|
|
71
|
-
}));
|
|
72
|
-
scheduleTaskInterval(this._ctx, async () => {
|
|
73
|
-
this._performGc();
|
|
74
|
-
}, RECEIVED_MESSAGES_GC_INTERVAL);
|
|
75
|
-
this._closed = false;
|
|
76
|
-
log("opened messenger", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 58, S: this });
|
|
77
|
-
}
|
|
78
|
-
async close() {
|
|
79
|
-
if (this._closed) {
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
this._closed = true;
|
|
83
|
-
await this._ctx.dispose();
|
|
84
|
-
}
|
|
85
|
-
async sendMessage(ctx, { author, recipient, payload }) {
|
|
86
|
-
invariant(!this._closed, "Closed", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 68, S: this, A: ["!this._closed", "'Closed'"] });
|
|
87
|
-
const messageContext = this._ctx.derive();
|
|
88
|
-
const reliablePayload = {
|
|
89
|
-
messageId: PublicKey.random(),
|
|
90
|
-
payload
|
|
91
|
-
};
|
|
92
|
-
invariant(!this._onAckCallbacks.has(reliablePayload.messageId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 74, S: this, A: ["!this._onAckCallbacks.has(reliablePayload.messageId)", ""] });
|
|
93
|
-
log("send message", {
|
|
94
|
-
messageId: reliablePayload.messageId,
|
|
95
|
-
author,
|
|
96
|
-
recipient
|
|
97
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 75, S: this });
|
|
98
|
-
let messageReceived;
|
|
99
|
-
let timeoutHit;
|
|
100
|
-
let sendAttempts = 0;
|
|
101
|
-
const promise = new Promise((resolve, reject) => {
|
|
102
|
-
messageReceived = resolve;
|
|
103
|
-
timeoutHit = reject;
|
|
104
|
-
});
|
|
105
|
-
scheduleExponentialBackoffTaskInterval(messageContext, async () => {
|
|
106
|
-
log("retrying message", {
|
|
107
|
-
messageId: reliablePayload.messageId
|
|
108
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 89, S: this });
|
|
109
|
-
sendAttempts++;
|
|
110
|
-
await this._encodeAndSend(ctx, {
|
|
111
|
-
author,
|
|
112
|
-
recipient,
|
|
113
|
-
reliablePayload
|
|
114
|
-
}).catch((err) => log("failed to send message", {
|
|
115
|
-
err
|
|
116
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 97, S: this }));
|
|
117
|
-
}, this._retryDelay);
|
|
118
|
-
scheduleTask(messageContext, () => {
|
|
119
|
-
log("message not delivered", {
|
|
120
|
-
messageId: reliablePayload.messageId
|
|
121
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 102, S: this });
|
|
122
|
-
this._onAckCallbacks.delete(reliablePayload.messageId);
|
|
123
|
-
timeoutHit(new ProtocolTimeoutError({
|
|
124
|
-
message: "signaling message not delivered",
|
|
125
|
-
cause: new TimeoutError(MESSAGE_TIMEOUT, "Message not delivered")
|
|
126
|
-
}));
|
|
127
|
-
void messageContext.dispose();
|
|
128
|
-
this._monitor.recordReliableMessage({
|
|
129
|
-
sendAttempts,
|
|
130
|
-
sent: false
|
|
131
|
-
});
|
|
132
|
-
}, MESSAGE_TIMEOUT);
|
|
133
|
-
this._onAckCallbacks.set(reliablePayload.messageId, () => {
|
|
134
|
-
messageReceived();
|
|
135
|
-
this._onAckCallbacks.delete(reliablePayload.messageId);
|
|
136
|
-
void messageContext.dispose();
|
|
137
|
-
this._monitor.recordReliableMessage({
|
|
138
|
-
sendAttempts,
|
|
139
|
-
sent: true
|
|
140
|
-
});
|
|
141
|
-
});
|
|
142
|
-
await this._encodeAndSend(ctx, {
|
|
143
|
-
author,
|
|
144
|
-
recipient,
|
|
145
|
-
reliablePayload
|
|
146
|
-
});
|
|
147
|
-
return promise;
|
|
148
|
-
}
|
|
149
|
-
/**
|
|
150
|
-
* Subscribes onMessage function to messages that contains payload with payloadType.
|
|
151
|
-
* @param payloadType if not specified, onMessage will be subscribed to all types of messages.
|
|
152
|
-
*/
|
|
153
|
-
async listen({ peer, payloadType, onMessage }) {
|
|
154
|
-
invariant(!this._closed, "Closed", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 136, S: this, A: ["!this._closed", "'Closed'"] });
|
|
155
|
-
await this._signalManager.subscribeMessages(peer);
|
|
156
|
-
let listeners;
|
|
157
|
-
invariant(peer.peerKey, "Peer key is required", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 139, S: this, A: ["peer.peerKey", "'Peer key is required'"] });
|
|
158
|
-
if (!payloadType) {
|
|
159
|
-
listeners = this._defaultListeners.get(peer.peerKey);
|
|
160
|
-
if (!listeners) {
|
|
161
|
-
listeners = /* @__PURE__ */ new Set();
|
|
162
|
-
this._defaultListeners.set(peer.peerKey, listeners);
|
|
163
|
-
}
|
|
164
|
-
} else {
|
|
165
|
-
listeners = this._listeners.get({
|
|
166
|
-
peerId: peer.peerKey,
|
|
167
|
-
payloadType
|
|
168
|
-
});
|
|
169
|
-
if (!listeners) {
|
|
170
|
-
listeners = /* @__PURE__ */ new Set();
|
|
171
|
-
this._listeners.set({
|
|
172
|
-
peerId: peer.peerKey,
|
|
173
|
-
payloadType
|
|
174
|
-
}, listeners);
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
listeners.add(onMessage);
|
|
178
|
-
return {
|
|
179
|
-
unsubscribe: async () => {
|
|
180
|
-
listeners.delete(onMessage);
|
|
181
|
-
}
|
|
182
|
-
};
|
|
183
|
-
}
|
|
184
|
-
async _encodeAndSend(ctx, { author, recipient, reliablePayload }) {
|
|
185
|
-
await this._signalManager.sendMessage(ctx, {
|
|
186
|
-
author,
|
|
187
|
-
recipient,
|
|
188
|
-
payload: {
|
|
189
|
-
type_url: "dxos.mesh.messaging.ReliablePayload",
|
|
190
|
-
value: ReliablePayload.encode(reliablePayload, {
|
|
191
|
-
preserveAny: true
|
|
192
|
-
})
|
|
193
|
-
}
|
|
194
|
-
});
|
|
195
|
-
}
|
|
196
|
-
async _handleMessage(message) {
|
|
197
|
-
switch (message.payload.type_url) {
|
|
198
|
-
case "dxos.mesh.messaging.ReliablePayload": {
|
|
199
|
-
await this._handleReliablePayload(message);
|
|
200
|
-
break;
|
|
201
|
-
}
|
|
202
|
-
case "dxos.mesh.messaging.Acknowledgement": {
|
|
203
|
-
await this._handleAcknowledgement({
|
|
204
|
-
payload: message.payload
|
|
205
|
-
});
|
|
206
|
-
break;
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
async _handleReliablePayload({ author, recipient, payload }) {
|
|
211
|
-
invariant(payload.type_url === "dxos.mesh.messaging.ReliablePayload", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 195, S: this, A: ["payload.type_url === 'dxos.mesh.messaging.ReliablePayload'", ""] });
|
|
212
|
-
const reliablePayload = ReliablePayload.decode(payload.value, {
|
|
213
|
-
preserveAny: true
|
|
214
|
-
});
|
|
215
|
-
log("handling message", {
|
|
216
|
-
messageId: reliablePayload.messageId
|
|
217
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 199, S: this });
|
|
218
|
-
try {
|
|
219
|
-
await this._sendAcknowledgement(this._ctx, {
|
|
220
|
-
author,
|
|
221
|
-
recipient,
|
|
222
|
-
messageId: reliablePayload.messageId
|
|
223
|
-
});
|
|
224
|
-
} catch (err) {
|
|
225
|
-
this._monitor.recordMessageAckFailed();
|
|
226
|
-
throw err;
|
|
227
|
-
}
|
|
228
|
-
if (this._receivedMessages.has(reliablePayload.messageId)) {
|
|
229
|
-
return;
|
|
230
|
-
}
|
|
231
|
-
this._receivedMessages.add(reliablePayload.messageId);
|
|
232
|
-
await this._callListeners({
|
|
233
|
-
author,
|
|
234
|
-
recipient,
|
|
235
|
-
payload: reliablePayload.payload
|
|
236
|
-
});
|
|
237
|
-
}
|
|
238
|
-
async _handleAcknowledgement({ payload }) {
|
|
239
|
-
invariant(payload.type_url === "dxos.mesh.messaging.Acknowledgement", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 224, S: this, A: ["payload.type_url === 'dxos.mesh.messaging.Acknowledgement'", ""] });
|
|
240
|
-
this._onAckCallbacks.get(Acknowledgement.decode(payload.value).messageId)?.();
|
|
241
|
-
}
|
|
242
|
-
async _sendAcknowledgement(ctx, { author, recipient, messageId }) {
|
|
243
|
-
log("sending ACK", {
|
|
244
|
-
messageId,
|
|
245
|
-
from: recipient,
|
|
246
|
-
to: author
|
|
247
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 228, S: this });
|
|
248
|
-
await this._signalManager.sendMessage(ctx, {
|
|
249
|
-
author: recipient,
|
|
250
|
-
recipient: author,
|
|
251
|
-
payload: {
|
|
252
|
-
type_url: "dxos.mesh.messaging.Acknowledgement",
|
|
253
|
-
value: Acknowledgement.encode({
|
|
254
|
-
messageId
|
|
255
|
-
})
|
|
256
|
-
}
|
|
257
|
-
});
|
|
258
|
-
}
|
|
259
|
-
async _callListeners(message) {
|
|
260
|
-
{
|
|
261
|
-
invariant(message.recipient.peerKey, "Peer key is required", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 246, S: this, A: ["message.recipient.peerKey", "'Peer key is required'"] });
|
|
262
|
-
const defaultListenerMap = this._defaultListeners.get(message.recipient.peerKey);
|
|
263
|
-
if (defaultListenerMap) {
|
|
264
|
-
for (const listener of defaultListenerMap) {
|
|
265
|
-
await listener(message);
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
{
|
|
270
|
-
const listenerMap = this._listeners.get({
|
|
271
|
-
peerId: message.recipient.peerKey,
|
|
272
|
-
payloadType: message.payload.type_url
|
|
273
|
-
});
|
|
274
|
-
if (listenerMap) {
|
|
275
|
-
for (const listener of listenerMap) {
|
|
276
|
-
await listener(message);
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
}
|
|
280
|
-
}
|
|
281
|
-
_performGc() {
|
|
282
|
-
const start = performance.now();
|
|
283
|
-
for (const key of this._toClear.keys()) {
|
|
284
|
-
this._receivedMessages.delete(key);
|
|
285
|
-
}
|
|
286
|
-
this._toClear.clear();
|
|
287
|
-
for (const key of this._receivedMessages.keys()) {
|
|
288
|
-
this._toClear.add(key);
|
|
289
|
-
}
|
|
290
|
-
const elapsed = performance.now() - start;
|
|
291
|
-
if (elapsed > 100) {
|
|
292
|
-
log.warn("GC took too long", {
|
|
293
|
-
elapsed
|
|
294
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 277, S: this });
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
};
|
|
298
|
-
|
|
299
|
-
// src/signal-methods.ts
|
|
300
|
-
var PeerInfoHash = ({ peerKey }) => peerKey;
|
|
301
|
-
|
|
302
|
-
// src/signal-manager/memory-signal-manager.ts
|
|
303
|
-
import { Event, Trigger } from "@dxos/async";
|
|
304
|
-
import { Context as Context2 } from "@dxos/context";
|
|
305
|
-
import { invariant as invariant2 } from "@dxos/invariant";
|
|
306
|
-
import { PublicKey as PublicKey2 } from "@dxos/keys";
|
|
307
|
-
import { log as log2 } from "@dxos/log";
|
|
308
|
-
import { schema as schema2 } from "@dxos/protocols/proto";
|
|
309
|
-
import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet2 } from "@dxos/util";
|
|
310
|
-
var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/memory-signal-manager.ts";
|
|
311
|
-
var MemorySignalManagerContext = class {
|
|
312
|
-
// Swarm messages.
|
|
313
|
-
swarmEvent = new Event();
|
|
314
|
-
// Mapping from topic to set of peers.
|
|
315
|
-
swarms = new ComplexMap2(PublicKey2.hash);
|
|
316
|
-
// Map of connections for each peer for signaling.
|
|
317
|
-
connections = new ComplexMap2(PeerInfoHash);
|
|
318
|
-
};
|
|
319
|
-
var MemorySignalManager = class {
|
|
320
|
-
_context;
|
|
321
|
-
statusChanged = new Event();
|
|
322
|
-
swarmEvent = new Event();
|
|
323
|
-
onMessage = new Event();
|
|
324
|
-
/** Will be used to emit SwarmEvents on .open() and .close() */
|
|
325
|
-
_joinedSwarms = new ComplexSet2(({ topic, peer }) => topic.toHex() + peer.peerKey);
|
|
326
|
-
_ctx;
|
|
327
|
-
// TODO(dmaretskyi): Replace with callback.
|
|
328
|
-
_freezeTrigger = new Trigger().wake();
|
|
329
|
-
constructor(_context) {
|
|
330
|
-
this._context = _context;
|
|
331
|
-
this._ctx = new Context2(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 35 });
|
|
332
|
-
this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
|
|
333
|
-
}
|
|
334
|
-
async open() {
|
|
335
|
-
if (!this._ctx.disposed) {
|
|
336
|
-
return;
|
|
337
|
-
}
|
|
338
|
-
this._ctx = new Context2(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 42 });
|
|
339
|
-
this._ctx.onDispose(this._context.swarmEvent.on((data) => this.swarmEvent.emit(data)));
|
|
340
|
-
await Promise.all([
|
|
341
|
-
...this._joinedSwarms.values()
|
|
342
|
-
].map((value) => this.join(this._ctx, value)));
|
|
343
|
-
}
|
|
344
|
-
async close() {
|
|
345
|
-
if (this._ctx.disposed) {
|
|
346
|
-
return;
|
|
347
|
-
}
|
|
348
|
-
const joinedSwarmsCopy = new ComplexSet2(({ topic, peer }) => topic.toHex() + peer.peerKey, [
|
|
349
|
-
...this._joinedSwarms.values()
|
|
350
|
-
]);
|
|
351
|
-
await Promise.all([
|
|
352
|
-
...this._joinedSwarms.values()
|
|
353
|
-
].map((value) => this.leave(this._ctx, value)));
|
|
354
|
-
this._joinedSwarms = joinedSwarmsCopy;
|
|
355
|
-
await this._ctx.dispose();
|
|
356
|
-
}
|
|
357
|
-
getStatus() {
|
|
358
|
-
return [];
|
|
359
|
-
}
|
|
360
|
-
async join(_ctx, { topic, peer }) {
|
|
361
|
-
invariant2(!this._ctx.disposed, "Closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 67, S: this, A: ["!this._ctx.disposed", "'Closed'"] });
|
|
362
|
-
this._joinedSwarms.add({
|
|
363
|
-
topic,
|
|
364
|
-
peer
|
|
365
|
-
});
|
|
366
|
-
if (!this._context.swarms.has(topic)) {
|
|
367
|
-
this._context.swarms.set(topic, new ComplexSet2(PeerInfoHash));
|
|
368
|
-
}
|
|
369
|
-
this._context.swarms.get(topic).add(peer);
|
|
370
|
-
this._context.swarmEvent.emit({
|
|
371
|
-
topic,
|
|
372
|
-
peerAvailable: {
|
|
373
|
-
peer,
|
|
374
|
-
since: /* @__PURE__ */ new Date()
|
|
375
|
-
}
|
|
376
|
-
});
|
|
377
|
-
for (const [topic2, peers] of this._context.swarms) {
|
|
378
|
-
Array.from(peers).forEach((peer2) => {
|
|
379
|
-
this.swarmEvent.emit({
|
|
380
|
-
topic: topic2,
|
|
381
|
-
peerAvailable: {
|
|
382
|
-
peer: peer2,
|
|
383
|
-
since: /* @__PURE__ */ new Date()
|
|
384
|
-
}
|
|
385
|
-
});
|
|
386
|
-
});
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
async leave(_ctx, { topic, peer }) {
|
|
390
|
-
invariant2(!this._ctx.disposed, "Closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 97, S: this, A: ["!this._ctx.disposed", "'Closed'"] });
|
|
391
|
-
this._joinedSwarms.delete({
|
|
392
|
-
topic,
|
|
393
|
-
peer
|
|
394
|
-
});
|
|
395
|
-
if (!this._context.swarms.has(topic)) {
|
|
396
|
-
this._context.swarms.set(topic, new ComplexSet2(PeerInfoHash));
|
|
397
|
-
}
|
|
398
|
-
this._context.swarms.get(topic).delete(peer);
|
|
399
|
-
const swarmEvent = {
|
|
400
|
-
topic,
|
|
401
|
-
peerLeft: {
|
|
402
|
-
peer
|
|
403
|
-
}
|
|
404
|
-
};
|
|
405
|
-
this._context.swarmEvent.emit(swarmEvent);
|
|
406
|
-
}
|
|
407
|
-
async query(_ctx, request) {
|
|
408
|
-
throw new Error("Not implemented");
|
|
409
|
-
}
|
|
410
|
-
async sendMessage(_ctx, { author, recipient, payload }) {
|
|
411
|
-
log2("send message", {
|
|
412
|
-
author,
|
|
413
|
-
recipient,
|
|
414
|
-
...dec(payload)
|
|
415
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 118, S: this });
|
|
416
|
-
invariant2(recipient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 123, S: this, A: ["recipient", ""] });
|
|
417
|
-
invariant2(!this._ctx.disposed, "Closed", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 124, S: this, A: ["!this._ctx.disposed", "'Closed'"] });
|
|
418
|
-
await this._freezeTrigger.wait();
|
|
419
|
-
const remote = this._context.connections.get(recipient);
|
|
420
|
-
if (!remote) {
|
|
421
|
-
log2.warn("recipient is not subscribed for messages", {
|
|
422
|
-
author,
|
|
423
|
-
recipient
|
|
424
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 128, S: this });
|
|
425
|
-
return;
|
|
426
|
-
}
|
|
427
|
-
if (remote._ctx.disposed) {
|
|
428
|
-
log2.warn("recipient is disposed", {
|
|
429
|
-
author,
|
|
430
|
-
recipient
|
|
431
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 135, S: this });
|
|
432
|
-
return;
|
|
433
|
-
}
|
|
434
|
-
remote._freezeTrigger.wait().then(() => {
|
|
435
|
-
if (remote._ctx.disposed) {
|
|
436
|
-
log2.warn("recipient is disposed", {
|
|
437
|
-
author,
|
|
438
|
-
recipient
|
|
439
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 143, S: this });
|
|
440
|
-
return;
|
|
441
|
-
}
|
|
442
|
-
log2("receive message", {
|
|
443
|
-
author,
|
|
444
|
-
recipient,
|
|
445
|
-
...dec(payload)
|
|
446
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 149, S: this });
|
|
447
|
-
remote.onMessage.emit({
|
|
448
|
-
author,
|
|
449
|
-
recipient,
|
|
450
|
-
payload
|
|
451
|
-
});
|
|
452
|
-
}).catch((err) => {
|
|
453
|
-
log2.error("error while waiting for freeze", {
|
|
454
|
-
err
|
|
455
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 160, S: this });
|
|
456
|
-
});
|
|
457
|
-
}
|
|
458
|
-
async subscribeMessages(peerInfo) {
|
|
459
|
-
log2("subscribing", {
|
|
460
|
-
peerInfo
|
|
461
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 166, S: this });
|
|
462
|
-
this._context.connections.set(peerInfo, this);
|
|
463
|
-
}
|
|
464
|
-
async unsubscribeMessages(peerInfo) {
|
|
465
|
-
log2("unsubscribing", {
|
|
466
|
-
peerInfo
|
|
467
|
-
}, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 172, S: this });
|
|
468
|
-
this._context.connections.delete(peerInfo);
|
|
469
|
-
}
|
|
470
|
-
freeze() {
|
|
471
|
-
this._freezeTrigger.reset();
|
|
472
|
-
}
|
|
473
|
-
unfreeze() {
|
|
474
|
-
this._freezeTrigger.wake();
|
|
475
|
-
}
|
|
476
|
-
};
|
|
477
|
-
var dec = (payload) => {
|
|
478
|
-
if (!payload.type_url.endsWith("ReliablePayload")) {
|
|
479
|
-
return {};
|
|
480
|
-
}
|
|
481
|
-
const relPayload = schema2.getCodecForType("dxos.mesh.messaging.ReliablePayload").decode(payload.value);
|
|
482
|
-
if (typeof relPayload?.payload?.data === "object") {
|
|
483
|
-
return {
|
|
484
|
-
payload: Object.keys(relPayload?.payload?.data)[0],
|
|
485
|
-
sessionId: relPayload?.payload?.sessionId
|
|
486
|
-
};
|
|
487
|
-
}
|
|
488
|
-
return {};
|
|
489
|
-
};
|
|
490
|
-
|
|
491
|
-
export {
|
|
492
|
-
Messenger,
|
|
493
|
-
PeerInfoHash,
|
|
494
|
-
MemorySignalManagerContext,
|
|
495
|
-
MemorySignalManager
|
|
496
|
-
};
|
|
497
|
-
//# sourceMappingURL=chunk-EC4H56J5.mjs.map
|