@hydranium/protocol 1.0.0-next.230 → 1.0.0-next.235
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/lib/client/data-connection.d.ts +9 -0
- package/lib/client/data-connection.d.ts.map +1 -1
- package/lib/client/data-connection.js +31 -10
- package/lib/client/data-connection.js.map +1 -1
- package/lib/client/data-port.d.ts +17 -5
- package/lib/client/data-port.d.ts.map +1 -1
- package/lib/client/message-relay.d.ts +1 -1
- package/lib/client/message-relay.js +1 -1
- package/lib/testing/data-doubles.d.ts +4 -0
- package/lib/testing/data-doubles.d.ts.map +1 -1
- package/lib/testing/data-doubles.js.map +1 -1
- package/lib/testing/wait-for.d.ts +3 -2
- package/lib/testing/wait-for.d.ts.map +1 -1
- package/lib/testing/wait-for.js +40 -10
- package/lib/testing/wait-for.js.map +1 -1
- package/package.json +1 -1
- package/src/client/data-connection.ts +31 -13
- package/src/client/data-port.ts +17 -5
- package/src/client/message-relay.ts +1 -1
- package/src/testing/data-doubles.ts +4 -0
- package/src/testing/wait-for.ts +38 -11
|
@@ -100,6 +100,13 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
100
100
|
* watch's handle is disposed.
|
|
101
101
|
*/
|
|
102
102
|
protected readonly watches: Map<string, string>;
|
|
103
|
+
/**
|
|
104
|
+
* Per id, the URI of a watch whose handle was disposed with no ready
|
|
105
|
+
* generation to unwatch on. {@link generationReady} sends the unwatch to the
|
|
106
|
+
* next ready one: a generation that failed its readiness check after its
|
|
107
|
+
* watches were sent leaves them on a connection the port may hand back.
|
|
108
|
+
*/
|
|
109
|
+
protected readonly pendingUnwatches: Map<string, string>;
|
|
103
110
|
/** The port's logger, or one that logs nothing. */
|
|
104
111
|
protected readonly logger: Logger;
|
|
105
112
|
/** Backs {@link onDidReconnect}. */
|
|
@@ -191,6 +198,8 @@ export declare class DataConnection<TTransfer extends TransferElement, TServer e
|
|
|
191
198
|
* open, and every watch {@link watchDocument} keeps.
|
|
192
199
|
*/
|
|
193
200
|
protected generationReady(generation: RpcConnectionGeneration<TServer>): void;
|
|
201
|
+
/** Take back the watch of `uri` under `clientId` on `generation`; the server ignores one it does not hold. */
|
|
202
|
+
protected unwatch(generation: RpcConnectionGeneration<TServer>, clientId: string, uri: string): void;
|
|
194
203
|
/**
|
|
195
204
|
* Send the watch of `uri` under `clientId` to `generation`, which has just
|
|
196
205
|
* passed its readiness gate. Sent at once rather than after a wait, so no
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data-connection.d.ts","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,13 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
74
74
|
* watch's handle is disposed.
|
|
75
75
|
*/
|
|
76
76
|
watches = new Map();
|
|
77
|
+
/**
|
|
78
|
+
* Per id, the URI of a watch whose handle was disposed with no ready
|
|
79
|
+
* generation to unwatch on. {@link generationReady} sends the unwatch to the
|
|
80
|
+
* next ready one: a generation that failed its readiness check after its
|
|
81
|
+
* watches were sent leaves them on a connection the port may hand back.
|
|
82
|
+
*/
|
|
83
|
+
pendingUnwatches = new Map();
|
|
77
84
|
/** The port's logger, or one that logs nothing. */
|
|
78
85
|
logger;
|
|
79
86
|
/** Backs {@link onDidReconnect}. */
|
|
@@ -183,18 +190,24 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
183
190
|
if (!this.watches.delete(clientId)) {
|
|
184
191
|
return;
|
|
185
192
|
}
|
|
186
|
-
// Without a generation the
|
|
187
|
-
//
|
|
188
|
-
|
|
193
|
+
// Without a ready generation the unwatch waits for the next one,
|
|
194
|
+
// rather than opening a connection only for it.
|
|
195
|
+
const unwatchLater = () => {
|
|
196
|
+
this.pendingUnwatches.set(clientId, uri);
|
|
197
|
+
};
|
|
189
198
|
const generation = this.generation;
|
|
190
|
-
if (generation) {
|
|
191
|
-
(
|
|
192
|
-
|
|
193
|
-
this.logger.debug(`Unwatch ${uri} as ${clientId}`);
|
|
194
|
-
generation.server.unwatchModelDocument({ uri, clientId }).catch(() => undefined);
|
|
195
|
-
}
|
|
196
|
-
}, () => undefined);
|
|
199
|
+
if (!generation) {
|
|
200
|
+
unwatchLater();
|
|
201
|
+
return;
|
|
197
202
|
}
|
|
203
|
+
(generation.ready ??= this.awaitReady(generation)).then(() => {
|
|
204
|
+
if (this.generation === generation) {
|
|
205
|
+
this.unwatch(generation, clientId, uri);
|
|
206
|
+
}
|
|
207
|
+
else {
|
|
208
|
+
unwatchLater();
|
|
209
|
+
}
|
|
210
|
+
}, unwatchLater);
|
|
198
211
|
});
|
|
199
212
|
}
|
|
200
213
|
/**
|
|
@@ -305,11 +318,18 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
305
318
|
super.generationReady(generation);
|
|
306
319
|
this.reconnectSessions();
|
|
307
320
|
this.watches.forEach((uri, clientId) => this.watchAgain(generation, clientId, uri));
|
|
321
|
+
this.pendingUnwatches.forEach((uri, clientId) => this.unwatch(generation, clientId, uri));
|
|
322
|
+
this.pendingUnwatches.clear();
|
|
308
323
|
if (this.readyBefore) {
|
|
309
324
|
this.reconnectEmitter.fire(undefined);
|
|
310
325
|
}
|
|
311
326
|
this.readyBefore = true;
|
|
312
327
|
}
|
|
328
|
+
/** Take back the watch of `uri` under `clientId` on `generation`; the server ignores one it does not hold. */
|
|
329
|
+
unwatch(generation, clientId, uri) {
|
|
330
|
+
this.logger.debug(`Unwatch ${uri} as ${clientId}`);
|
|
331
|
+
generation.server.unwatchModelDocument({ uri, clientId }).catch(() => undefined);
|
|
332
|
+
}
|
|
313
333
|
/**
|
|
314
334
|
* Send the watch of `uri` under `clientId` to `generation`, which has just
|
|
315
335
|
* passed its readiness gate. Sent at once rather than after a wait, so no
|
|
@@ -361,6 +381,7 @@ class DataConnection extends rpc_connection_1.RpcConnection {
|
|
|
361
381
|
// For a factory's session whose `detach` does not fire.
|
|
362
382
|
this.sessions.clear();
|
|
363
383
|
this.watches.clear();
|
|
384
|
+
this.pendingUnwatches.clear();
|
|
364
385
|
this.createSessionEmitter.dispose();
|
|
365
386
|
this.reconnectEmitter.dispose();
|
|
366
387
|
this.dirtyChangedEmitter.dispose();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"data-connection.js","sourceRoot":"","sources":["../../src/client/data-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,10 +52,22 @@ export interface DataPort {
|
|
|
52
52
|
/**
|
|
53
53
|
* Open the transport and hand back a listening `MessageConnection`.
|
|
54
54
|
*
|
|
55
|
-
* Called at most once per connection generation. A rejection
|
|
56
|
-
* transport-construction failure and is reported
|
|
57
|
-
* {@link reportError} by the consumer; it must leave the port
|
|
58
|
-
* that a later generation can retry.
|
|
55
|
+
* Called at most once per connection generation. A rejection before the
|
|
56
|
+
* port is disposed is a transport-construction failure and is reported
|
|
57
|
+
* through {@link reportError} by the consumer; it must leave the port
|
|
58
|
+
* reusable, so that a later generation can retry.
|
|
59
|
+
*
|
|
60
|
+
* The consumer disposes a connection only when it drops the generation on
|
|
61
|
+
* {@link onDispose} or is disposed itself, so the connection of a generation
|
|
62
|
+
* that failed its readiness check stays with the port. A port whose
|
|
63
|
+
* connections reach one far end hands back the same connection until it is
|
|
64
|
+
* disposed: a second live one would take answers meant for the first, or end
|
|
65
|
+
* that far end when disposed. A port that opens an independent transport per
|
|
66
|
+
* call disposes the one it opened before at the next call. Either releases
|
|
67
|
+
* its connection at its own dispose and refuses to connect after it, since
|
|
68
|
+
* the consumer reconnects when told. Either serves one consumer: one
|
|
69
|
+
* consumer's dispose, or its next call to a port of the second kind,
|
|
70
|
+
* disposes the connection another still uses.
|
|
59
71
|
*/
|
|
60
72
|
connect(): Promise<MessageConnection>;
|
|
61
73
|
/**
|
|
@@ -82,7 +94,7 @@ export interface DataPort {
|
|
|
82
94
|
* forces this to exist, since a restarted server binds new ephemeral ports
|
|
83
95
|
* and nothing re-discovers them.
|
|
84
96
|
*
|
|
85
|
-
* `
|
|
97
|
+
* `DataConnection` drops its connection generation on this event and
|
|
86
98
|
* builds a fresh one on the next request.
|
|
87
99
|
*
|
|
88
100
|
* A local `Event`, deliberately: nothing here crosses a structured-clone
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-port.d.ts","sourceRoot":"","sources":["../../src/client/data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,WAAW,QAAQ;IACtB
|
|
1
|
+
{"version":3,"file":"data-port.d.ts","sourceRoot":"","sources":["../../src/client/data-port.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF,OAAO,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,MAAM,WAAW,QAAQ;IACtB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAEtC;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IAE7D,mGAAmG;IACnG,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAEzB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;CACxD"}
|
|
@@ -99,7 +99,7 @@ export interface MessageRelay extends Disposable {
|
|
|
99
99
|
*
|
|
100
100
|
* It is not enough that a disciplined client awaits its own connection before
|
|
101
101
|
* sending: a host builds the far-side connection and hands it back *without*
|
|
102
|
-
* waiting for the relay, so `
|
|
102
|
+
* waiting for the relay, so `DataConnection`'s very first call — the readiness
|
|
103
103
|
* handshake — is already in flight while the socket is still opening. Dropping
|
|
104
104
|
* that first request presents as a client hanging forever on connect against a
|
|
105
105
|
* perfectly healthy server.
|
|
@@ -46,7 +46,7 @@ exports.RELAY_REPLAY_FAILED = (0, primitives_1.defineMessage)('hydranium/protoco
|
|
|
46
46
|
*
|
|
47
47
|
* It is not enough that a disciplined client awaits its own connection before
|
|
48
48
|
* sending: a host builds the far-side connection and hands it back *without*
|
|
49
|
-
* waiting for the relay, so `
|
|
49
|
+
* waiting for the relay, so `DataConnection`'s very first call — the readiness
|
|
50
50
|
* handshake — is already in flight while the socket is still opening. Dropping
|
|
51
51
|
* that first request presents as a client hanging forever on connect against a
|
|
52
52
|
* perfectly healthy server.
|
|
@@ -49,6 +49,10 @@ export interface FakeDataPortOptions {
|
|
|
49
49
|
*
|
|
50
50
|
* Throwing (or rejecting) here is the transport-construction failure path,
|
|
51
51
|
* which the consumer surfaces through {@link FakeDataPort.reported}.
|
|
52
|
+
*
|
|
53
|
+
* The double disposes none of these connections and goes on connecting
|
|
54
|
+
* after its dispose, where a real port releases its connection and refuses:
|
|
55
|
+
* the test owns them.
|
|
52
56
|
*/
|
|
53
57
|
connect(): MessageConnection | Promise<MessageConnection>;
|
|
54
58
|
/** The port's {@link DataPort.logger}. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-doubles.d.ts","sourceRoot":"","sources":["../../src/testing/data-doubles.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAW,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,KAAK,EACT,oBAAoB,EACpB,4BAA4B,EAC5B,iCAAiC,EACjC,0BAA0B,EAC1B,2BAA2B,EAC3B,4BAA4B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,0CAA0C;AAC1C,MAAM,WAAW,mBAAmB;IACjC
|
|
1
|
+
{"version":3,"file":"data-doubles.d.ts","sourceRoot":"","sources":["../../src/testing/data-doubles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-doubles.js","sourceRoot":"","sources":["../../src/testing/data-doubles.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;AAElF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,mDAAiE;AAEjE,yEAA6E;
|
|
1
|
+
{"version":3,"file":"data-doubles.js","sourceRoot":"","sources":["../../src/testing/data-doubles.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,12 +31,13 @@ export interface WaitForOptions {
|
|
|
31
31
|
readonly timeoutMs?: number;
|
|
32
32
|
/** Poll the predicate every this-many milliseconds. Default 5. */
|
|
33
33
|
readonly intervalMs?: number;
|
|
34
|
-
/** Error message on timeout. Default a generic phrasing. */
|
|
34
|
+
/** Error message on timeout, and when the predicate throws. Default a generic phrasing. */
|
|
35
35
|
readonly message?: string;
|
|
36
36
|
}
|
|
37
37
|
/**
|
|
38
38
|
* Resolve once `predicate()` returns true, polling at `intervalMs`; reject with
|
|
39
|
-
* `message` once `timeoutMs` elapses
|
|
39
|
+
* `message` once `timeoutMs` elapses, or at once when the predicate throws, with
|
|
40
|
+
* the throw as the error's `cause`. The **non-racy** alternative to a fixed
|
|
40
41
|
* sleep for awaiting an asynchronous side effect that lands on an observable
|
|
41
42
|
* value.
|
|
42
43
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-for.d.ts","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,mCAAmC;AACnC,MAAM,WAAW,cAAc;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,
|
|
1
|
+
{"version":3,"file":"wait-for.d.ts","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAElF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,mCAAmC;AACnC,MAAM,WAAW,cAAc;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,kEAAkE;IAClE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,2FAA2F;IAC3F,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,MAAM,OAAO,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA8C7F;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,IAAI,CAAC,EAAE,SAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3C"}
|
package/lib/testing/wait-for.js
CHANGED
|
@@ -12,7 +12,8 @@ exports.waitFor = waitFor;
|
|
|
12
12
|
exports.tick = tick;
|
|
13
13
|
/**
|
|
14
14
|
* Resolve once `predicate()` returns true, polling at `intervalMs`; reject with
|
|
15
|
-
* `message` once `timeoutMs` elapses
|
|
15
|
+
* `message` once `timeoutMs` elapses, or at once when the predicate throws, with
|
|
16
|
+
* the throw as the error's `cause`. The **non-racy** alternative to a fixed
|
|
16
17
|
* sleep for awaiting an asynchronous side effect that lands on an observable
|
|
17
18
|
* value.
|
|
18
19
|
*
|
|
@@ -30,19 +31,48 @@ function waitFor(predicate, options = {}) {
|
|
|
30
31
|
const timeoutMs = options.timeoutMs ?? 2000;
|
|
31
32
|
const intervalMs = options.intervalMs ?? 5;
|
|
32
33
|
const message = options.message ?? `Timed out after ${timeoutMs}ms waiting for a condition`;
|
|
33
|
-
if (predicate()) {
|
|
34
|
-
return Promise.resolve();
|
|
35
|
-
}
|
|
36
34
|
return new Promise((resolve, reject) => {
|
|
37
|
-
|
|
35
|
+
// A throw would leave the promise unsettled from a timer, or escape
|
|
36
|
+
// `waitFor` itself on the first check; it rejects as the timeout instead,
|
|
37
|
+
// with the throw as cause. True once the promise is settled.
|
|
38
|
+
const settle = (timedOut) => {
|
|
39
|
+
let met = false;
|
|
40
|
+
let threw = false;
|
|
41
|
+
let cause;
|
|
42
|
+
try {
|
|
43
|
+
met = predicate();
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
threw = true;
|
|
47
|
+
cause = error;
|
|
48
|
+
}
|
|
49
|
+
if (met) {
|
|
50
|
+
resolve();
|
|
51
|
+
}
|
|
52
|
+
else if (timedOut || threw) {
|
|
53
|
+
reject(new Error(message, threw ? { cause } : undefined));
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
return true;
|
|
59
|
+
};
|
|
60
|
+
if (settle(false)) {
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const stop = () => {
|
|
38
64
|
clearInterval(poll);
|
|
39
|
-
|
|
65
|
+
clearTimeout(deadline);
|
|
66
|
+
};
|
|
67
|
+
// A stalled loop can run the deadline after the condition came true but
|
|
68
|
+
// before the next poll saw it, so the deadline checks once more.
|
|
69
|
+
const deadline = setTimeout(() => {
|
|
70
|
+
settle(true);
|
|
71
|
+
stop();
|
|
40
72
|
}, timeoutMs);
|
|
41
73
|
const poll = setInterval(() => {
|
|
42
|
-
if (
|
|
43
|
-
|
|
44
|
-
clearTimeout(deadline);
|
|
45
|
-
resolve();
|
|
74
|
+
if (settle(false)) {
|
|
75
|
+
stop();
|
|
46
76
|
}
|
|
47
77
|
}, intervalMs);
|
|
48
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wait-for.js","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;AAgClF
|
|
1
|
+
{"version":3,"file":"wait-for.js","sourceRoot":"","sources":["../../src/testing/wait-for.ts"],"names":[],"mappings":";AAAA;;;;;;;kFAOkF;;;;AAgClF;;;;;;;;;;;;;;;;GAgBG;AACH,iBAAwB,SAAwB,EAAE,OAAO,GAAmB,EAAE;IAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,mBAAmB,SAAS,4BAA4B,CAAC;IAC5F,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,oEAAoE;QACpE,0EAA0E;QAC1E,6DAA6D;QAC7D,MAAM,MAAM,GAAG,CAAC,QAAiB,EAAW,EAAE;YAC3C,IAAI,GAAG,GAAG,KAAK,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC;gBACF,GAAG,GAAG,SAAS,EAAE,CAAC;YACrB,CAAC;YAAC,OAAO,KAAc,EAAE,CAAC;gBACvB,KAAK,GAAG,IAAI,CAAC;gBACb,KAAK,GAAG,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,GAAG,EAAE,CAAC;gBACP,OAAO,EAAE,CAAC;YACb,CAAC;iBAAM,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;gBAC5B,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACL,OAAO,KAAK,CAAC;YAChB,CAAC;YACD,OAAO,IAAI,CAAC;QACf,CAAC,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACjB,OAAO;QACV,CAAC;QACD,MAAM,IAAI,GAAG,GAAS,EAAE;YACrB,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC,CAAC;QACF,wEAAwE;QACxE,iEAAiE;QACjE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC;YACb,IAAI,EAAE,CAAC;QACV,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE;YAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjB,IAAI,EAAE,CAAC;YACV,CAAC;QACJ,CAAC,EAAE,UAAU,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,cAAqB,EAAE,GAAG,EAAE;IACzB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC"}
|
package/package.json
CHANGED
|
@@ -145,6 +145,13 @@ export class DataConnection<
|
|
|
145
145
|
* watch's handle is disposed.
|
|
146
146
|
*/
|
|
147
147
|
protected readonly watches = new Map<string, string>();
|
|
148
|
+
/**
|
|
149
|
+
* Per id, the URI of a watch whose handle was disposed with no ready
|
|
150
|
+
* generation to unwatch on. {@link generationReady} sends the unwatch to the
|
|
151
|
+
* next ready one: a generation that failed its readiness check after its
|
|
152
|
+
* watches were sent leaves them on a connection the port may hand back.
|
|
153
|
+
*/
|
|
154
|
+
protected readonly pendingUnwatches = new Map<string, string>();
|
|
148
155
|
/** The port's logger, or one that logs nothing. */
|
|
149
156
|
protected readonly logger: Logger;
|
|
150
157
|
/** Backs {@link onDidReconnect}. */
|
|
@@ -263,21 +270,23 @@ export class DataConnection<
|
|
|
263
270
|
if (!this.watches.delete(clientId)) {
|
|
264
271
|
return;
|
|
265
272
|
}
|
|
266
|
-
// Without a generation the
|
|
267
|
-
//
|
|
268
|
-
|
|
273
|
+
// Without a ready generation the unwatch waits for the next one,
|
|
274
|
+
// rather than opening a connection only for it.
|
|
275
|
+
const unwatchLater = (): void => {
|
|
276
|
+
this.pendingUnwatches.set(clientId, uri);
|
|
277
|
+
};
|
|
269
278
|
const generation = this.generation;
|
|
270
|
-
if (generation) {
|
|
271
|
-
(
|
|
272
|
-
|
|
273
|
-
if (this.generation === generation) {
|
|
274
|
-
this.logger.debug(`Unwatch ${uri} as ${clientId}`);
|
|
275
|
-
generation.server.unwatchModelDocument({ uri, clientId }).catch(() => undefined);
|
|
276
|
-
}
|
|
277
|
-
},
|
|
278
|
-
() => undefined
|
|
279
|
-
);
|
|
279
|
+
if (!generation) {
|
|
280
|
+
unwatchLater();
|
|
281
|
+
return;
|
|
280
282
|
}
|
|
283
|
+
(generation.ready ??= this.awaitReady(generation)).then(() => {
|
|
284
|
+
if (this.generation === generation) {
|
|
285
|
+
this.unwatch(generation, clientId, uri);
|
|
286
|
+
} else {
|
|
287
|
+
unwatchLater();
|
|
288
|
+
}
|
|
289
|
+
}, unwatchLater);
|
|
281
290
|
});
|
|
282
291
|
}
|
|
283
292
|
|
|
@@ -393,12 +402,20 @@ export class DataConnection<
|
|
|
393
402
|
super.generationReady(generation);
|
|
394
403
|
this.reconnectSessions();
|
|
395
404
|
this.watches.forEach((uri, clientId) => this.watchAgain(generation, clientId, uri));
|
|
405
|
+
this.pendingUnwatches.forEach((uri, clientId) => this.unwatch(generation, clientId, uri));
|
|
406
|
+
this.pendingUnwatches.clear();
|
|
396
407
|
if (this.readyBefore) {
|
|
397
408
|
this.reconnectEmitter.fire(undefined);
|
|
398
409
|
}
|
|
399
410
|
this.readyBefore = true;
|
|
400
411
|
}
|
|
401
412
|
|
|
413
|
+
/** Take back the watch of `uri` under `clientId` on `generation`; the server ignores one it does not hold. */
|
|
414
|
+
protected unwatch(generation: RpcConnectionGeneration<TServer>, clientId: string, uri: string): void {
|
|
415
|
+
this.logger.debug(`Unwatch ${uri} as ${clientId}`);
|
|
416
|
+
generation.server.unwatchModelDocument({ uri, clientId }).catch(() => undefined);
|
|
417
|
+
}
|
|
418
|
+
|
|
402
419
|
/**
|
|
403
420
|
* Send the watch of `uri` under `clientId` to `generation`, which has just
|
|
404
421
|
* passed its readiness gate. Sent at once rather than after a wait, so no
|
|
@@ -456,6 +473,7 @@ export class DataConnection<
|
|
|
456
473
|
// For a factory's session whose `detach` does not fire.
|
|
457
474
|
this.sessions.clear();
|
|
458
475
|
this.watches.clear();
|
|
476
|
+
this.pendingUnwatches.clear();
|
|
459
477
|
this.createSessionEmitter.dispose();
|
|
460
478
|
this.reconnectEmitter.dispose();
|
|
461
479
|
this.dirtyChangedEmitter.dispose();
|
package/src/client/data-port.ts
CHANGED
|
@@ -54,10 +54,22 @@ export interface DataPort {
|
|
|
54
54
|
/**
|
|
55
55
|
* Open the transport and hand back a listening `MessageConnection`.
|
|
56
56
|
*
|
|
57
|
-
* Called at most once per connection generation. A rejection
|
|
58
|
-
* transport-construction failure and is reported
|
|
59
|
-
* {@link reportError} by the consumer; it must leave the port
|
|
60
|
-
* that a later generation can retry.
|
|
57
|
+
* Called at most once per connection generation. A rejection before the
|
|
58
|
+
* port is disposed is a transport-construction failure and is reported
|
|
59
|
+
* through {@link reportError} by the consumer; it must leave the port
|
|
60
|
+
* reusable, so that a later generation can retry.
|
|
61
|
+
*
|
|
62
|
+
* The consumer disposes a connection only when it drops the generation on
|
|
63
|
+
* {@link onDispose} or is disposed itself, so the connection of a generation
|
|
64
|
+
* that failed its readiness check stays with the port. A port whose
|
|
65
|
+
* connections reach one far end hands back the same connection until it is
|
|
66
|
+
* disposed: a second live one would take answers meant for the first, or end
|
|
67
|
+
* that far end when disposed. A port that opens an independent transport per
|
|
68
|
+
* call disposes the one it opened before at the next call. Either releases
|
|
69
|
+
* its connection at its own dispose and refuses to connect after it, since
|
|
70
|
+
* the consumer reconnects when told. Either serves one consumer: one
|
|
71
|
+
* consumer's dispose, or its next call to a port of the second kind,
|
|
72
|
+
* disposes the connection another still uses.
|
|
61
73
|
*/
|
|
62
74
|
connect(): Promise<MessageConnection>;
|
|
63
75
|
|
|
@@ -87,7 +99,7 @@ export interface DataPort {
|
|
|
87
99
|
* forces this to exist, since a restarted server binds new ephemeral ports
|
|
88
100
|
* and nothing re-discovers them.
|
|
89
101
|
*
|
|
90
|
-
* `
|
|
102
|
+
* `DataConnection` drops its connection generation on this event and
|
|
91
103
|
* builds a fresh one on the next request.
|
|
92
104
|
*
|
|
93
105
|
* A local `Event`, deliberately: nothing here crosses a structured-clone
|
|
@@ -121,7 +121,7 @@ export interface MessageRelay extends Disposable {
|
|
|
121
121
|
*
|
|
122
122
|
* It is not enough that a disciplined client awaits its own connection before
|
|
123
123
|
* sending: a host builds the far-side connection and hands it back *without*
|
|
124
|
-
* waiting for the relay, so `
|
|
124
|
+
* waiting for the relay, so `DataConnection`'s very first call — the readiness
|
|
125
125
|
* handshake — is already in flight while the socket is still opening. Dropping
|
|
126
126
|
* that first request presents as a client hanging forever on connect against a
|
|
127
127
|
* perfectly healthy server.
|
|
@@ -60,6 +60,10 @@ export interface FakeDataPortOptions {
|
|
|
60
60
|
*
|
|
61
61
|
* Throwing (or rejecting) here is the transport-construction failure path,
|
|
62
62
|
* which the consumer surfaces through {@link FakeDataPort.reported}.
|
|
63
|
+
*
|
|
64
|
+
* The double disposes none of these connections and goes on connecting
|
|
65
|
+
* after its dispose, where a real port releases its connection and refuses:
|
|
66
|
+
* the test owns them.
|
|
63
67
|
*/
|
|
64
68
|
connect(): MessageConnection | Promise<MessageConnection>;
|
|
65
69
|
/** The port's {@link DataPort.logger}. */
|
package/src/testing/wait-for.ts
CHANGED
|
@@ -33,13 +33,14 @@ export interface WaitForOptions {
|
|
|
33
33
|
readonly timeoutMs?: number;
|
|
34
34
|
/** Poll the predicate every this-many milliseconds. Default 5. */
|
|
35
35
|
readonly intervalMs?: number;
|
|
36
|
-
/** Error message on timeout. Default a generic phrasing. */
|
|
36
|
+
/** Error message on timeout, and when the predicate throws. Default a generic phrasing. */
|
|
37
37
|
readonly message?: string;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
41
|
* Resolve once `predicate()` returns true, polling at `intervalMs`; reject with
|
|
42
|
-
* `message` once `timeoutMs` elapses
|
|
42
|
+
* `message` once `timeoutMs` elapses, or at once when the predicate throws, with
|
|
43
|
+
* the throw as the error's `cause`. The **non-racy** alternative to a fixed
|
|
43
44
|
* sleep for awaiting an asynchronous side effect that lands on an observable
|
|
44
45
|
* value.
|
|
45
46
|
*
|
|
@@ -57,19 +58,45 @@ export function waitFor(predicate: () => boolean, options: WaitForOptions = {}):
|
|
|
57
58
|
const timeoutMs = options.timeoutMs ?? 2000;
|
|
58
59
|
const intervalMs = options.intervalMs ?? 5;
|
|
59
60
|
const message = options.message ?? `Timed out after ${timeoutMs}ms waiting for a condition`;
|
|
60
|
-
if (predicate()) {
|
|
61
|
-
return Promise.resolve();
|
|
62
|
-
}
|
|
63
61
|
return new Promise<void>((resolve, reject) => {
|
|
64
|
-
|
|
62
|
+
// A throw would leave the promise unsettled from a timer, or escape
|
|
63
|
+
// `waitFor` itself on the first check; it rejects as the timeout instead,
|
|
64
|
+
// with the throw as cause. True once the promise is settled.
|
|
65
|
+
const settle = (timedOut: boolean): boolean => {
|
|
66
|
+
let met = false;
|
|
67
|
+
let threw = false;
|
|
68
|
+
let cause: unknown;
|
|
69
|
+
try {
|
|
70
|
+
met = predicate();
|
|
71
|
+
} catch (error: unknown) {
|
|
72
|
+
threw = true;
|
|
73
|
+
cause = error;
|
|
74
|
+
}
|
|
75
|
+
if (met) {
|
|
76
|
+
resolve();
|
|
77
|
+
} else if (timedOut || threw) {
|
|
78
|
+
reject(new Error(message, threw ? { cause } : undefined));
|
|
79
|
+
} else {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
return true;
|
|
83
|
+
};
|
|
84
|
+
if (settle(false)) {
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
const stop = (): void => {
|
|
65
88
|
clearInterval(poll);
|
|
66
|
-
|
|
89
|
+
clearTimeout(deadline);
|
|
90
|
+
};
|
|
91
|
+
// A stalled loop can run the deadline after the condition came true but
|
|
92
|
+
// before the next poll saw it, so the deadline checks once more.
|
|
93
|
+
const deadline = setTimeout(() => {
|
|
94
|
+
settle(true);
|
|
95
|
+
stop();
|
|
67
96
|
}, timeoutMs);
|
|
68
97
|
const poll = setInterval(() => {
|
|
69
|
-
if (
|
|
70
|
-
|
|
71
|
-
clearTimeout(deadline);
|
|
72
|
-
resolve();
|
|
98
|
+
if (settle(false)) {
|
|
99
|
+
stop();
|
|
73
100
|
}
|
|
74
101
|
}, intervalMs);
|
|
75
102
|
});
|