@dxos/edge-client 0.6.11 → 0.6.12-main.5cc132e
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/node-esm/index.mjs +477 -0
- package/dist/lib/node-esm/index.mjs.map +7 -0
- package/dist/lib/node-esm/meta.json +1 -0
- package/package.json +13 -12
- package/src/edge-client.test.ts +6 -9
- package/src/persistent-lifecycle.test.ts +2 -2
- package/src/protocol.test.ts +1 -2
- package/src/test-utils.ts +2 -2
- package/src/websocket.test.ts +4 -4
|
@@ -0,0 +1,477 @@
|
|
|
1
|
+
// packages/core/mesh/edge-client/src/index.ts
|
|
2
|
+
export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
|
|
3
|
+
|
|
4
|
+
// packages/core/mesh/edge-client/src/edge-client.ts
|
|
5
|
+
import WebSocket from "isomorphic-ws";
|
|
6
|
+
import { Trigger, Event, scheduleTaskInterval, scheduleTask, TriggerState } from "@dxos/async";
|
|
7
|
+
import { Context, LifecycleState as LifecycleState2, Resource as Resource2 } from "@dxos/context";
|
|
8
|
+
import { invariant as invariant2 } from "@dxos/invariant";
|
|
9
|
+
import { log as log2 } from "@dxos/log";
|
|
10
|
+
import { buf as buf2 } from "@dxos/protocols/buf";
|
|
11
|
+
import { MessageSchema as MessageSchema2 } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
|
|
12
|
+
|
|
13
|
+
// packages/core/mesh/edge-client/src/defs.ts
|
|
14
|
+
import { AnySchema } from "@bufbuild/protobuf/wkt";
|
|
15
|
+
import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
|
|
16
|
+
|
|
17
|
+
// packages/core/mesh/edge-client/src/protocol.ts
|
|
18
|
+
import { invariant } from "@dxos/invariant";
|
|
19
|
+
import { buf, bufWkt } from "@dxos/protocols/buf";
|
|
20
|
+
import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
|
|
21
|
+
import { bufferToArray } from "@dxos/util";
|
|
22
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/protocol.ts";
|
|
23
|
+
var getTypename = (typeName) => `type.googleapis.com/${typeName}`;
|
|
24
|
+
var Protocol = class {
|
|
25
|
+
constructor(types) {
|
|
26
|
+
this._typeRegistry = buf.createRegistry(...types);
|
|
27
|
+
}
|
|
28
|
+
get typeRegistry() {
|
|
29
|
+
return this._typeRegistry;
|
|
30
|
+
}
|
|
31
|
+
toJson(message) {
|
|
32
|
+
try {
|
|
33
|
+
return buf.toJson(MessageSchema, message, {
|
|
34
|
+
registry: this.typeRegistry
|
|
35
|
+
});
|
|
36
|
+
} catch (err) {
|
|
37
|
+
return {
|
|
38
|
+
type: this.getPayloadType(message)
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Return the payload with the given type.
|
|
44
|
+
*/
|
|
45
|
+
getPayload(message, type) {
|
|
46
|
+
invariant(message.payload, void 0, {
|
|
47
|
+
F: __dxlog_file,
|
|
48
|
+
L: 40,
|
|
49
|
+
S: this,
|
|
50
|
+
A: [
|
|
51
|
+
"message.payload",
|
|
52
|
+
""
|
|
53
|
+
]
|
|
54
|
+
});
|
|
55
|
+
const payloadTypename = this.getPayloadType(message);
|
|
56
|
+
if (type && type.typeName !== payloadTypename) {
|
|
57
|
+
throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);
|
|
58
|
+
}
|
|
59
|
+
invariant(bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`, {
|
|
60
|
+
F: __dxlog_file,
|
|
61
|
+
L: 46,
|
|
62
|
+
S: this,
|
|
63
|
+
A: [
|
|
64
|
+
"bufWkt.anyIs(message.payload, type)",
|
|
65
|
+
"`Unexpected payload type: ${payloadTypename}}`"
|
|
66
|
+
]
|
|
67
|
+
});
|
|
68
|
+
const payload = bufWkt.anyUnpack(message.payload, this.typeRegistry);
|
|
69
|
+
invariant(payload, `Empty payload: ${payloadTypename}}`, {
|
|
70
|
+
F: __dxlog_file,
|
|
71
|
+
L: 48,
|
|
72
|
+
S: this,
|
|
73
|
+
A: [
|
|
74
|
+
"payload",
|
|
75
|
+
"`Empty payload: ${payloadTypename}}`"
|
|
76
|
+
]
|
|
77
|
+
});
|
|
78
|
+
return payload;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Get the payload type.
|
|
82
|
+
*/
|
|
83
|
+
getPayloadType(message) {
|
|
84
|
+
if (!message.payload) {
|
|
85
|
+
return void 0;
|
|
86
|
+
}
|
|
87
|
+
const [, type] = message.payload.typeUrl.split("/");
|
|
88
|
+
return type;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Create a packed message.
|
|
92
|
+
*/
|
|
93
|
+
createMessage(type, { source, target, payload, serviceId }) {
|
|
94
|
+
return buf.create(MessageSchema, {
|
|
95
|
+
timestamp: (/* @__PURE__ */ new Date()).toISOString(),
|
|
96
|
+
source,
|
|
97
|
+
target,
|
|
98
|
+
serviceId,
|
|
99
|
+
payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : void 0
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
};
|
|
103
|
+
var toUint8Array = async (data) => {
|
|
104
|
+
if (data instanceof Buffer) {
|
|
105
|
+
return bufferToArray(data);
|
|
106
|
+
}
|
|
107
|
+
if (data instanceof Blob) {
|
|
108
|
+
return new Uint8Array(await data.arrayBuffer());
|
|
109
|
+
}
|
|
110
|
+
throw new Error(`Unexpected datatype: ${data}`);
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
// packages/core/mesh/edge-client/src/defs.ts
|
|
114
|
+
var protocol = new Protocol([
|
|
115
|
+
SwarmRequestSchema,
|
|
116
|
+
SwarmResponseSchema,
|
|
117
|
+
TextMessageSchema,
|
|
118
|
+
AnySchema
|
|
119
|
+
]);
|
|
120
|
+
|
|
121
|
+
// packages/core/mesh/edge-client/src/errors.ts
|
|
122
|
+
var WebsocketClosedError = class extends Error {
|
|
123
|
+
constructor() {
|
|
124
|
+
super("WebSocket connection closed");
|
|
125
|
+
}
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
// packages/core/mesh/edge-client/src/persistent-lifecycle.ts
|
|
129
|
+
import { DeferredTask, sleep, synchronized } from "@dxos/async";
|
|
130
|
+
import { cancelWithContext, LifecycleState, Resource } from "@dxos/context";
|
|
131
|
+
import { warnAfterTimeout } from "@dxos/debug";
|
|
132
|
+
import { log } from "@dxos/log";
|
|
133
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
134
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
135
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
136
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
137
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
138
|
+
}
|
|
139
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/persistent-lifecycle.ts";
|
|
140
|
+
var INIT_RESTART_DELAY = 100;
|
|
141
|
+
var DEFAULT_MAX_RESTART_DELAY = 5e3;
|
|
142
|
+
var PersistentLifecycle = class extends Resource {
|
|
143
|
+
constructor({ start, stop, onRestart, maxRestartDelay = DEFAULT_MAX_RESTART_DELAY }) {
|
|
144
|
+
super();
|
|
145
|
+
this._restartTask = void 0;
|
|
146
|
+
this._restartAfter = 0;
|
|
147
|
+
this._start = start;
|
|
148
|
+
this._stop = stop;
|
|
149
|
+
this._onRestart = onRestart;
|
|
150
|
+
this._maxRestartDelay = maxRestartDelay;
|
|
151
|
+
}
|
|
152
|
+
async _open() {
|
|
153
|
+
this._restartTask = new DeferredTask(this._ctx, async () => {
|
|
154
|
+
try {
|
|
155
|
+
await this._restart();
|
|
156
|
+
} catch (err) {
|
|
157
|
+
log.warn("Restart failed", {
|
|
158
|
+
err
|
|
159
|
+
}, {
|
|
160
|
+
F: __dxlog_file2,
|
|
161
|
+
L: 64,
|
|
162
|
+
S: this,
|
|
163
|
+
C: (f, a) => f(...a)
|
|
164
|
+
});
|
|
165
|
+
this._restartTask?.schedule();
|
|
166
|
+
}
|
|
167
|
+
});
|
|
168
|
+
await this._start().catch((err) => {
|
|
169
|
+
log.warn("Start failed", {
|
|
170
|
+
err
|
|
171
|
+
}, {
|
|
172
|
+
F: __dxlog_file2,
|
|
173
|
+
L: 69,
|
|
174
|
+
S: this,
|
|
175
|
+
C: (f, a) => f(...a)
|
|
176
|
+
});
|
|
177
|
+
this._restartTask?.schedule();
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
async _close() {
|
|
181
|
+
await this._restartTask?.join();
|
|
182
|
+
await this._stop();
|
|
183
|
+
this._restartTask = void 0;
|
|
184
|
+
}
|
|
185
|
+
async _restart() {
|
|
186
|
+
log(`restarting in ${this._restartAfter}ms`, {
|
|
187
|
+
state: this._lifecycleState
|
|
188
|
+
}, {
|
|
189
|
+
F: __dxlog_file2,
|
|
190
|
+
L: 81,
|
|
191
|
+
S: this,
|
|
192
|
+
C: (f, a) => f(...a)
|
|
193
|
+
});
|
|
194
|
+
await this._stop();
|
|
195
|
+
if (this._lifecycleState !== LifecycleState.OPEN) {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
await cancelWithContext(this._ctx, sleep(this._restartAfter));
|
|
199
|
+
this._restartAfter = Math.min(Math.max(this._restartAfter * 2, INIT_RESTART_DELAY), this._maxRestartDelay);
|
|
200
|
+
await warnAfterTimeout(5e3, "Connection establishment takes too long", () => this._start());
|
|
201
|
+
this._restartAfter = 0;
|
|
202
|
+
await this._onRestart?.();
|
|
203
|
+
}
|
|
204
|
+
/**
|
|
205
|
+
* Scheduling restart should be done from outside.
|
|
206
|
+
*/
|
|
207
|
+
scheduleRestart() {
|
|
208
|
+
if (this._lifecycleState !== LifecycleState.OPEN) {
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
this._restartTask.schedule();
|
|
212
|
+
}
|
|
213
|
+
};
|
|
214
|
+
_ts_decorate([
|
|
215
|
+
synchronized
|
|
216
|
+
], PersistentLifecycle.prototype, "_open", null);
|
|
217
|
+
_ts_decorate([
|
|
218
|
+
synchronized
|
|
219
|
+
], PersistentLifecycle.prototype, "scheduleRestart", null);
|
|
220
|
+
|
|
221
|
+
// packages/core/mesh/edge-client/src/edge-client.ts
|
|
222
|
+
var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
|
|
223
|
+
var DEFAULT_TIMEOUT = 1e4;
|
|
224
|
+
var SIGNAL_KEEPALIVE_INTERVAL = 5e3;
|
|
225
|
+
var EdgeClient = class extends Resource2 {
|
|
226
|
+
constructor(_identityKey, _peerKey, _config) {
|
|
227
|
+
super();
|
|
228
|
+
this._identityKey = _identityKey;
|
|
229
|
+
this._peerKey = _peerKey;
|
|
230
|
+
this._config = _config;
|
|
231
|
+
this.reconnect = new Event();
|
|
232
|
+
this._persistentLifecycle = new PersistentLifecycle({
|
|
233
|
+
start: async () => this._openWebSocket(),
|
|
234
|
+
stop: async () => this._closeWebSocket(),
|
|
235
|
+
onRestart: async () => this.reconnect.emit()
|
|
236
|
+
});
|
|
237
|
+
this._listeners = /* @__PURE__ */ new Set();
|
|
238
|
+
this._ready = new Trigger();
|
|
239
|
+
this._ws = void 0;
|
|
240
|
+
this._keepaliveCtx = void 0;
|
|
241
|
+
this._heartBeatContext = void 0;
|
|
242
|
+
this._protocol = this._config.protocol ?? protocol;
|
|
243
|
+
}
|
|
244
|
+
// TODO(burdon): Attach logging.
|
|
245
|
+
get info() {
|
|
246
|
+
return {
|
|
247
|
+
open: this.isOpen,
|
|
248
|
+
identity: this._identityKey,
|
|
249
|
+
device: this._peerKey
|
|
250
|
+
};
|
|
251
|
+
}
|
|
252
|
+
get identityKey() {
|
|
253
|
+
return this._identityKey;
|
|
254
|
+
}
|
|
255
|
+
get peerKey() {
|
|
256
|
+
return this._peerKey;
|
|
257
|
+
}
|
|
258
|
+
setIdentity({ peerKey, identityKey }) {
|
|
259
|
+
this._peerKey = peerKey;
|
|
260
|
+
this._identityKey = identityKey;
|
|
261
|
+
this._persistentLifecycle.scheduleRestart();
|
|
262
|
+
}
|
|
263
|
+
addListener(listener) {
|
|
264
|
+
this._listeners.add(listener);
|
|
265
|
+
return () => this._listeners.delete(listener);
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Open connection to messaging service.
|
|
269
|
+
*/
|
|
270
|
+
async _open() {
|
|
271
|
+
log2("opening...", {
|
|
272
|
+
info: this.info
|
|
273
|
+
}, {
|
|
274
|
+
F: __dxlog_file3,
|
|
275
|
+
L: 101,
|
|
276
|
+
S: this,
|
|
277
|
+
C: (f, a) => f(...a)
|
|
278
|
+
});
|
|
279
|
+
this._persistentLifecycle.open().catch((err) => {
|
|
280
|
+
log2.warn("Error while opening connection", {
|
|
281
|
+
err
|
|
282
|
+
}, {
|
|
283
|
+
F: __dxlog_file3,
|
|
284
|
+
L: 103,
|
|
285
|
+
S: this,
|
|
286
|
+
C: (f, a) => f(...a)
|
|
287
|
+
});
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
/**
|
|
291
|
+
* Close connection and free resources.
|
|
292
|
+
*/
|
|
293
|
+
async _close() {
|
|
294
|
+
log2("closing...", {
|
|
295
|
+
peerKey: this._peerKey
|
|
296
|
+
}, {
|
|
297
|
+
F: __dxlog_file3,
|
|
298
|
+
L: 111,
|
|
299
|
+
S: this,
|
|
300
|
+
C: (f, a) => f(...a)
|
|
301
|
+
});
|
|
302
|
+
await this._persistentLifecycle.close();
|
|
303
|
+
}
|
|
304
|
+
async _openWebSocket() {
|
|
305
|
+
const url = new URL(`/ws/${this._identityKey}/${this._peerKey}`, this._config.socketEndpoint);
|
|
306
|
+
this._ws = new WebSocket(url);
|
|
307
|
+
this._ws.onopen = () => {
|
|
308
|
+
log2("opened", this.info, {
|
|
309
|
+
F: __dxlog_file3,
|
|
310
|
+
L: 120,
|
|
311
|
+
S: this,
|
|
312
|
+
C: (f, a) => f(...a)
|
|
313
|
+
});
|
|
314
|
+
this._ready.wake();
|
|
315
|
+
};
|
|
316
|
+
this._ws.onclose = () => {
|
|
317
|
+
log2("closed", this.info, {
|
|
318
|
+
F: __dxlog_file3,
|
|
319
|
+
L: 124,
|
|
320
|
+
S: this,
|
|
321
|
+
C: (f, a) => f(...a)
|
|
322
|
+
});
|
|
323
|
+
this._persistentLifecycle.scheduleRestart();
|
|
324
|
+
};
|
|
325
|
+
this._ws.onerror = (event) => {
|
|
326
|
+
log2.warn("EdgeClient socket error", {
|
|
327
|
+
error: event.error,
|
|
328
|
+
info: event.message
|
|
329
|
+
}, {
|
|
330
|
+
F: __dxlog_file3,
|
|
331
|
+
L: 128,
|
|
332
|
+
S: this,
|
|
333
|
+
C: (f, a) => f(...a)
|
|
334
|
+
});
|
|
335
|
+
this._persistentLifecycle.scheduleRestart();
|
|
336
|
+
};
|
|
337
|
+
this._ws.onmessage = async (event) => {
|
|
338
|
+
if (event.data === "__pong__") {
|
|
339
|
+
this._onHeartbeat();
|
|
340
|
+
return;
|
|
341
|
+
}
|
|
342
|
+
const data = await toUint8Array(event.data);
|
|
343
|
+
const message = buf2.fromBinary(MessageSchema2, data);
|
|
344
|
+
log2("received", {
|
|
345
|
+
peerKey: this._peerKey,
|
|
346
|
+
payload: protocol.getPayloadType(message)
|
|
347
|
+
}, {
|
|
348
|
+
F: __dxlog_file3,
|
|
349
|
+
L: 141,
|
|
350
|
+
S: this,
|
|
351
|
+
C: (f, a) => f(...a)
|
|
352
|
+
});
|
|
353
|
+
if (message) {
|
|
354
|
+
for (const listener of this._listeners) {
|
|
355
|
+
try {
|
|
356
|
+
await listener(message);
|
|
357
|
+
} catch (err) {
|
|
358
|
+
log2.error("processing", {
|
|
359
|
+
err,
|
|
360
|
+
payload: protocol.getPayloadType(message)
|
|
361
|
+
}, {
|
|
362
|
+
F: __dxlog_file3,
|
|
363
|
+
L: 147,
|
|
364
|
+
S: this,
|
|
365
|
+
C: (f, a) => f(...a)
|
|
366
|
+
});
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
};
|
|
371
|
+
await this._ready.wait({
|
|
372
|
+
timeout: this._config.timeout ?? DEFAULT_TIMEOUT
|
|
373
|
+
});
|
|
374
|
+
this._keepaliveCtx = new Context(void 0, {
|
|
375
|
+
F: __dxlog_file3,
|
|
376
|
+
L: 154
|
|
377
|
+
});
|
|
378
|
+
scheduleTaskInterval(this._keepaliveCtx, async () => {
|
|
379
|
+
this._ws?.send("__ping__");
|
|
380
|
+
}, SIGNAL_KEEPALIVE_INTERVAL);
|
|
381
|
+
this._ws.send("__ping__");
|
|
382
|
+
this._onHeartbeat();
|
|
383
|
+
}
|
|
384
|
+
async _closeWebSocket() {
|
|
385
|
+
if (!this._ws) {
|
|
386
|
+
return;
|
|
387
|
+
}
|
|
388
|
+
try {
|
|
389
|
+
this._ready.throw(new WebsocketClosedError());
|
|
390
|
+
this._ready.reset();
|
|
391
|
+
void this._keepaliveCtx?.dispose();
|
|
392
|
+
this._keepaliveCtx = void 0;
|
|
393
|
+
void this._heartBeatContext?.dispose();
|
|
394
|
+
this._heartBeatContext = void 0;
|
|
395
|
+
this._ws.onopen = () => {
|
|
396
|
+
};
|
|
397
|
+
this._ws.onclose = () => {
|
|
398
|
+
};
|
|
399
|
+
this._ws.onerror = () => {
|
|
400
|
+
};
|
|
401
|
+
this._ws.close();
|
|
402
|
+
this._ws = void 0;
|
|
403
|
+
} catch (err) {
|
|
404
|
+
if (err instanceof Error && err.message.includes("WebSocket is closed before the connection is established.")) {
|
|
405
|
+
return;
|
|
406
|
+
}
|
|
407
|
+
log2.warn("Error closing websocket", {
|
|
408
|
+
err
|
|
409
|
+
}, {
|
|
410
|
+
F: __dxlog_file3,
|
|
411
|
+
L: 190,
|
|
412
|
+
S: this,
|
|
413
|
+
C: (f, a) => f(...a)
|
|
414
|
+
});
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
/**
|
|
418
|
+
* Send message.
|
|
419
|
+
* NOTE: The message is guaranteed to be delivered but the service must respond with a message to confirm processing.
|
|
420
|
+
*/
|
|
421
|
+
async send(message) {
|
|
422
|
+
if (this._ready.state !== TriggerState.RESOLVED) {
|
|
423
|
+
await this._ready.wait({
|
|
424
|
+
timeout: this._config.timeout ?? DEFAULT_TIMEOUT
|
|
425
|
+
});
|
|
426
|
+
}
|
|
427
|
+
invariant2(this._ws, void 0, {
|
|
428
|
+
F: __dxlog_file3,
|
|
429
|
+
L: 202,
|
|
430
|
+
S: this,
|
|
431
|
+
A: [
|
|
432
|
+
"this._ws",
|
|
433
|
+
""
|
|
434
|
+
]
|
|
435
|
+
});
|
|
436
|
+
invariant2(!message.source || message.source.peerKey === this._peerKey, void 0, {
|
|
437
|
+
F: __dxlog_file3,
|
|
438
|
+
L: 203,
|
|
439
|
+
S: this,
|
|
440
|
+
A: [
|
|
441
|
+
"!message.source || message.source.peerKey === this._peerKey",
|
|
442
|
+
""
|
|
443
|
+
]
|
|
444
|
+
});
|
|
445
|
+
log2("sending...", {
|
|
446
|
+
peerKey: this._peerKey,
|
|
447
|
+
payload: protocol.getPayloadType(message)
|
|
448
|
+
}, {
|
|
449
|
+
F: __dxlog_file3,
|
|
450
|
+
L: 204,
|
|
451
|
+
S: this,
|
|
452
|
+
C: (f, a) => f(...a)
|
|
453
|
+
});
|
|
454
|
+
this._ws.send(buf2.toBinary(MessageSchema2, message));
|
|
455
|
+
}
|
|
456
|
+
_onHeartbeat() {
|
|
457
|
+
if (this._lifecycleState !== LifecycleState2.OPEN) {
|
|
458
|
+
return;
|
|
459
|
+
}
|
|
460
|
+
void this._heartBeatContext?.dispose();
|
|
461
|
+
this._heartBeatContext = new Context(void 0, {
|
|
462
|
+
F: __dxlog_file3,
|
|
463
|
+
L: 213
|
|
464
|
+
});
|
|
465
|
+
scheduleTask(this._heartBeatContext, () => {
|
|
466
|
+
this._persistentLifecycle.scheduleRestart();
|
|
467
|
+
}, 2 * SIGNAL_KEEPALIVE_INTERVAL);
|
|
468
|
+
}
|
|
469
|
+
};
|
|
470
|
+
export {
|
|
471
|
+
EdgeClient,
|
|
472
|
+
Protocol,
|
|
473
|
+
getTypename,
|
|
474
|
+
protocol,
|
|
475
|
+
toUint8Array
|
|
476
|
+
};
|
|
477
|
+
//# sourceMappingURL=index.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/index.ts", "../../../src/edge-client.ts", "../../../src/defs.ts", "../../../src/protocol.ts", "../../../src/errors.ts", "../../../src/persistent-lifecycle.ts"],
|
|
4
|
+
"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';\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 { invariant } from '@dxos/invariant';\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 { WebsocketClosedError } 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 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 reconnect = 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 readonly _protocol: Protocol;\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 this._protocol = this._config.protocol ?? protocol;\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 };\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(new WebsocketClosedError());\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 await this._ready.wait({ timeout: this._config.timeout ?? DEFAULT_TIMEOUT });\n }\n invariant(this._ws);\n invariant(!message.source || message.source.peerKey === this._peerKey);\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\nimport { AnySchema } from '@bufbuild/protobuf/wkt';\n\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, AnySchema]);\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { invariant } from '@dxos/invariant';\nimport { buf, bufWkt } from '@dxos/protocols/buf';\nimport { type Message, MessageSchema, type Peer as PeerProto } from '@dxos/protocols/buf/dxos/edge/messenger_pb';\nimport { bufferToArray } from '@dxos/util';\n\nexport type PeerData = Partial<PeerProto>;\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\nexport class WebsocketClosedError extends Error {\n constructor() {\n super('WebSocket connection closed');\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"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["WebSocket", "Trigger", "Event", "scheduleTaskInterval", "scheduleTask", "TriggerState", "Context", "LifecycleState", "Resource", "invariant", "log", "buf", "MessageSchema", "AnySchema", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "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", "protocol", "Protocol", "SwarmRequestSchema", "SwarmResponseSchema", "TextMessageSchema", "AnySchema", "WebsocketClosedError", "Error", "constructor", "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", "_persistentLifecycle", "PersistentLifecycle", "start", "_openWebSocket", "stop", "_closeWebSocket", "onRestart", "emit", "_listeners", "Set", "_ready", "Trigger", "_ws", "undefined", "_keepaliveCtx", "_heartBeatContext", "_protocol", "protocol", "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", "getPayloadType", "wait", "timeout", "Context", "scheduleTaskInterval", "send", "throw", "WebsocketClosedError", "reset", "dispose", "Error", "includes", "state", "TriggerState", "RESOLVED", "invariant", "source", "toBinary", "_lifecycleState", "LifecycleState", "OPEN", "scheduleTask"]
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"inputs":{"packages/core/mesh/edge-client/src/protocol.ts":{"bytes":10314,"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":1578,"imports":[{"path":"@bufbuild/protobuf/wkt","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":846,"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":26527,"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/invariant","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":849,"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"}],"format":"esm"}},"outputs":{"packages/core/mesh/edge-client/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":23169},"packages/core/mesh/edge-client/dist/lib/node-esm/index.mjs":{"imports":[{"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/invariant","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":"@bufbuild/protobuf/wkt","kind":"import-statement","external":true},{"path":"@dxos/protocols/buf/dxos/edge/messenger_pb","kind":"import-statement","external":true},{"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/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","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":6962},"packages/core/mesh/edge-client/src/defs.ts":{"bytesInOutput":285},"packages/core/mesh/edge-client/src/protocol.ts":{"bytesInOutput":2600},"packages/core/mesh/edge-client/src/errors.ts":{"bytesInOutput":116},"packages/core/mesh/edge-client/src/persistent-lifecycle.ts":{"bytesInOutput":3019}},"bytes":13569}}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/edge-client",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.12-main.5cc132e",
|
|
4
4
|
"description": "EDGE Client",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
".": {
|
|
11
11
|
"browser": "./dist/lib/browser/index.mjs",
|
|
12
12
|
"node": {
|
|
13
|
-
"
|
|
13
|
+
"require": "./dist/lib/node/index.cjs",
|
|
14
|
+
"default": "./dist/lib/node-esm/index.mjs"
|
|
14
15
|
},
|
|
15
16
|
"types": "./dist/types/src/index.d.ts"
|
|
16
17
|
}
|
|
@@ -28,18 +29,18 @@
|
|
|
28
29
|
"@bufbuild/protobuf": "^2.0.0",
|
|
29
30
|
"isomorphic-ws": "^5.0.0",
|
|
30
31
|
"ws": "^8.14.2",
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/context": "0.6.
|
|
33
|
-
"@dxos/
|
|
34
|
-
"@dxos/invariant": "0.6.
|
|
35
|
-
"@dxos/
|
|
36
|
-
"@dxos/node-std": "0.6.
|
|
37
|
-
"@dxos/
|
|
38
|
-
"@dxos/
|
|
32
|
+
"@dxos/async": "0.6.12-main.5cc132e",
|
|
33
|
+
"@dxos/context": "0.6.12-main.5cc132e",
|
|
34
|
+
"@dxos/debug": "0.6.12-main.5cc132e",
|
|
35
|
+
"@dxos/invariant": "0.6.12-main.5cc132e",
|
|
36
|
+
"@dxos/log": "0.6.12-main.5cc132e",
|
|
37
|
+
"@dxos/node-std": "0.6.12-main.5cc132e",
|
|
38
|
+
"@dxos/util": "0.6.12-main.5cc132e",
|
|
39
|
+
"@dxos/protocols": "0.6.12-main.5cc132e"
|
|
39
40
|
},
|
|
40
41
|
"devDependencies": {
|
|
41
|
-
"
|
|
42
|
-
"@dxos/
|
|
42
|
+
"@dxos/keys": "0.6.12-main.5cc132e",
|
|
43
|
+
"@dxos/test-utils": "0.6.12-main.5cc132e"
|
|
43
44
|
},
|
|
44
45
|
"publishConfig": {
|
|
45
46
|
"access": "public"
|
package/src/edge-client.test.ts
CHANGED
|
@@ -2,24 +2,21 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
6
|
-
import chaiAsPromised from 'chai-as-promised';
|
|
5
|
+
import { test, expect, describe } from 'vitest';
|
|
7
6
|
|
|
8
7
|
import { PublicKey } from '@dxos/keys';
|
|
9
8
|
import { TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
|
|
10
|
-
import {
|
|
9
|
+
import { openAndClose } from '@dxos/test-utils';
|
|
11
10
|
|
|
12
11
|
import { protocol } from './defs';
|
|
13
12
|
import { EdgeClient } from './edge-client';
|
|
14
13
|
import { createTestWsServer } from './test-utils';
|
|
15
14
|
|
|
16
|
-
chai.use(chaiAsPromised);
|
|
17
|
-
|
|
18
15
|
describe('EdgeClient', () => {
|
|
19
16
|
const textMessage = (message: string) => protocol.createMessage(TextMessageSchema, { payload: { message } });
|
|
20
17
|
|
|
21
18
|
test('reconnects on error', async () => {
|
|
22
|
-
const { error: serverError, endpoint } = await createTestWsServer();
|
|
19
|
+
const { error: serverError, endpoint } = await createTestWsServer(8001);
|
|
23
20
|
const id = PublicKey.random().toHex();
|
|
24
21
|
const client = new EdgeClient(id, id, { socketEndpoint: endpoint });
|
|
25
22
|
await openAndClose(client);
|
|
@@ -29,11 +26,11 @@ describe('EdgeClient', () => {
|
|
|
29
26
|
const reconnected = client.reconnect.waitForCount(1);
|
|
30
27
|
await serverError();
|
|
31
28
|
await reconnected;
|
|
32
|
-
await expect(client.send(textMessage('Hello world 2'))).
|
|
29
|
+
await expect(client.send(textMessage('Hello world 2'))).resolves.not.toThrow();
|
|
33
30
|
});
|
|
34
31
|
|
|
35
32
|
test('set identity reconnects', async () => {
|
|
36
|
-
const { endpoint } = await createTestWsServer();
|
|
33
|
+
const { endpoint } = await createTestWsServer(8002);
|
|
37
34
|
|
|
38
35
|
const id = PublicKey.random().toHex();
|
|
39
36
|
const client = new EdgeClient(id, id, { socketEndpoint: endpoint });
|
|
@@ -45,6 +42,6 @@ describe('EdgeClient', () => {
|
|
|
45
42
|
const reconnected = client.reconnect.waitForCount(1);
|
|
46
43
|
client.setIdentity({ peerKey: newId, identityKey: newId });
|
|
47
44
|
await reconnected;
|
|
48
|
-
await expect(client.send(textMessage('Hello world 2'))).
|
|
45
|
+
await expect(client.send(textMessage('Hello world 2'))).resolves.not.toThrow();
|
|
49
46
|
});
|
|
50
47
|
});
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { expect } from '
|
|
5
|
+
import { describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
7
|
import { sleep, Trigger } from '@dxos/async';
|
|
8
8
|
import { log } from '@dxos/log';
|
|
9
|
-
import {
|
|
9
|
+
import { openAndClose } from '@dxos/test-utils';
|
|
10
10
|
|
|
11
11
|
import { PersistentLifecycle } from './persistent-lifecycle';
|
|
12
12
|
|
package/src/protocol.test.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { expect } from '
|
|
5
|
+
import { describe, expect, test } from 'vitest';
|
|
6
6
|
|
|
7
7
|
import { buf } from '@dxos/protocols/buf';
|
|
8
8
|
import {
|
|
@@ -11,7 +11,6 @@ import {
|
|
|
11
11
|
SwarmRequestSchema,
|
|
12
12
|
SwarmResponseSchema,
|
|
13
13
|
} from '@dxos/protocols/buf/dxos/edge/messenger_pb';
|
|
14
|
-
import { describe, test } from '@dxos/test';
|
|
15
14
|
|
|
16
15
|
import { Protocol } from './protocol';
|
|
17
16
|
|
package/src/test-utils.ts
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import WebSocket from 'isomorphic-ws';
|
|
6
|
+
import { onTestFinished } from 'vitest';
|
|
6
7
|
|
|
7
8
|
import { Trigger } from '@dxos/async';
|
|
8
9
|
import { log } from '@dxos/log';
|
|
9
10
|
import { buf } from '@dxos/protocols/buf';
|
|
10
11
|
import { MessageSchema, TextMessageSchema } from '@dxos/protocols/buf/dxos/edge/messenger_pb';
|
|
11
|
-
import { afterTest } from '@dxos/test';
|
|
12
12
|
|
|
13
13
|
import { protocol } from './defs';
|
|
14
14
|
import { toUint8Array } from './protocol';
|
|
@@ -34,7 +34,7 @@ export const createTestWsServer = async (port = DEFAULT_PORT) => {
|
|
|
34
34
|
ws.on('close', () => closeTrigger.wake());
|
|
35
35
|
});
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
onTestFinished(() => server.close());
|
|
38
38
|
return {
|
|
39
39
|
server,
|
|
40
40
|
/**
|
package/src/websocket.test.ts
CHANGED
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { expect } from 'chai';
|
|
6
5
|
import WebSocket from 'isomorphic-ws';
|
|
6
|
+
import { describe, expect, test } from 'vitest';
|
|
7
7
|
|
|
8
8
|
import { Trigger, TriggerState } from '@dxos/async';
|
|
9
|
-
import { describe, test } from '@dxos/test';
|
|
10
9
|
|
|
11
10
|
import { createTestWsServer } from './test-utils';
|
|
12
11
|
|
|
13
|
-
|
|
12
|
+
// TODO(wittjosiah): Doesn't work in vitest.
|
|
13
|
+
describe.skip('WebSocket', () => {
|
|
14
14
|
test('swap `onclose` handler ', async () => {
|
|
15
|
-
const { endpoint } = await createTestWsServer();
|
|
15
|
+
const { endpoint } = await createTestWsServer(8003);
|
|
16
16
|
const ws = new WebSocket(endpoint);
|
|
17
17
|
const opened = new Trigger();
|
|
18
18
|
ws.onopen = () => {
|