@genesislcap/foundation-comms 15.84.2-GENC-1737.1 → 15.84.3
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/dts/connect/connect.d.ts +9 -0
- package/dist/dts/connect/connect.d.ts.map +1 -1
- package/dist/dts/connect/http.connect.d.ts +2 -0
- package/dist/dts/connect/http.connect.d.ts.map +1 -1
- package/dist/dts/connect/socket.d.ts +21 -0
- package/dist/dts/connect/socket.d.ts.map +1 -1
- package/dist/dts/datasource/datasource.d.ts.map +1 -1
- package/dist/esm/connect/connect.js +9 -0
- package/dist/esm/connect/http.connect.js +20 -2
- package/dist/esm/connect/socket.js +42 -5
- package/dist/esm/datasource/datasource.js +2 -1
- package/dist/foundation-comms.api.json +66 -1
- package/dist/foundation-comms.d.ts +32 -0
- package/package.json +12 -12
|
@@ -52,6 +52,15 @@ export interface Connect {
|
|
|
52
52
|
httpMode(): boolean;
|
|
53
53
|
/**
|
|
54
54
|
* Connects to a server at the specified host.
|
|
55
|
+
* @remarks
|
|
56
|
+
* While already connected, connecting or reconnecting to `host`, resolves with that connection
|
|
57
|
+
* instead of replacing it, unless the user has logged in or out since it was opened. Connecting
|
|
58
|
+
* to a different host replaces the connection and ends its subscriptions. To force a new
|
|
59
|
+
* connection to the same host, call `disconnect` first.
|
|
60
|
+
*
|
|
61
|
+
* Joining a reconnect waits for the whole reconnect, not one attempt, with no timeout of its own.
|
|
62
|
+
* With `alwaysOn` that lasts until a socket opens, so during an outage this resolves once the
|
|
63
|
+
* server is back rather than with `false`.
|
|
55
64
|
* @public
|
|
56
65
|
* @param host - The host to connect to. Defaults to GENESIS_SOCKET_URL.
|
|
57
66
|
* @returns A promise that resolves with a boolean indicating whether the connection was successful.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/connect/connect.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAQ,MAAM,MAAM,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE3F,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAEL,YAAY,EACZ,gBAAgB,EAEhB,OAAO,EACP,cAAc,EACd,aAAa,EACb,gBAAgB,EACjB,MAAM,WAAW,CAAC;AAGnB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB;;;OAGG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAE5C;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC;IAEvD;;;;;;;;OAQG;IACH,IAAI,CAAC,CAAC,EACJ,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,GAAG,CAAC,EACzB,aAAa,CAAC,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,OAAO,GAAG,GAAG,CAAC,CAAC;IAE1B;;;;OAIG;IACH,QAAQ,IAAI,OAAO,CAAC;IAEpB
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../src/connect/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,6 +84,8 @@ export declare class DefaultHttpConnect implements Connect {
|
|
|
84
84
|
* @deprecated - Please reference `User` from `@genesislcap/foundation-user` instead.
|
|
85
85
|
*/
|
|
86
86
|
setValidSession(valid: boolean): void;
|
|
87
|
+
/** The host check in flight, shared by concurrent `connect` calls to the same host. */
|
|
88
|
+
private pendingConnect?;
|
|
87
89
|
connect(host: string): Promise<boolean>;
|
|
88
90
|
disconnect(): void;
|
|
89
91
|
snapshot(resourceName: string, params?: any): Promise<Message>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.connect.d.ts","sourceRoot":"","sources":["../../../src/connect/http.connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAI/D,OAAO,EACL,eAAe,EASf,UAAU,EAOX,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACjF,OAAO,EAAE,IAAI,EAAa,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAEL,YAAY,EAEZ,OAAO,EACP,cAAc,EAGd,aAAa,EACb,gBAAgB,EACjB,MAAM,WAAW,CAAC;AASnB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAiB5C;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,OAAO;IAsEjC,IAAI,EAAE,IAAI;IACP,OAAO,CAAC,cAAc;IAC7B,OAAO,CAAC,OAAO;IACb,OAAO,CAAC,SAAS;IACZ,OAAO,CAAC,UAAU;IACf,OAAO,CAAC,MAAM;IAClB,OAAO,CAAC,SAAS;IA1E3B,IAAI,EAAE,MAAM,CAAC;IAGb,SAAS,UAAS;IAGzB,OAAO,CAAC,YAAY,CAAkB;IAItC,kBAAkB,2BAA0C;IAE5D,YAAY,EAAE,UAAU,CAAC,OAAO,CAAC,CAA2C;IAE5E,IACW,WAAW,IAAI,OAAO,CAEhC;IAED,IAAI,WAAW,CAAC,KAAK,EAJK,OAIL,EAGpB;IAGD,OAAO,CAAC,YAAY,CAAC,CAAkC;IAEvD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAEtD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAEtD;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAa;IAEhD;;;;OAIG;IACH,OAAO,CAAC,OAAO,CAAsC;IAErD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IAEpE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoC;IAErE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;IAEhD,oGAAoG;IACpG,OAAO,CAAC,gCAAgC,CAAS;IAEjD;;;OAGG;IACH,OAAO,CAAC,cAAc,CAAiC;IAGvD,OAAO,CAAC,iBAAiB,CAAK;gBAGf,IAAI,EAAE,IAAI,EACC,cAAc,EAAE,cAAc,EACrC,OAAO,EAAE,OAAO,EACd,SAAS,EAAE,SAAS,EACf,UAAU,EAAE,cAAc,EACvB,MAAM,EAAE,iBAAiB,EAC7B,SAAS,EAAE,aAAa;IAMjD;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IA+C5B;;;;OAIG;YACW,SAAS;IAcjB,IAAI,CAAC,CAAC,EACV,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EACrB,aAAa,CAAC,EAAE,OAAO,EACvB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,GAAG,CAAC;IAWf,OAAO,CAAC,cAAc;YAYR,qBAAqB;YASrB,wBAAwB;IAWtC,QAAQ,IAAI,OAAO;IAInB;;OAEG;IACH,eAAe,CAAC,KAAK,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"http.connect.d.ts","sourceRoot":"","sources":["../../../src/connect/http.connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,6 +110,19 @@ export interface Socket extends Omit<SocketStatus, 'serialize' | 'onClose' | 're
|
|
|
110
110
|
* or stale metadata (e.g. `getMetadata(r, false)`).
|
|
111
111
|
*/
|
|
112
112
|
setScdbMetadataRefresher?(refresher: (resourceName: string) => void | Promise<unknown>): void;
|
|
113
|
+
/**
|
|
114
|
+
* Settles with whether the socket is connected once the connection attempt or reconnect loop in
|
|
115
|
+
* progress ends; undefined while neither is in progress.
|
|
116
|
+
* @internal
|
|
117
|
+
*/
|
|
118
|
+
readonly pendingConnection?: Promise<boolean>;
|
|
119
|
+
/**
|
|
120
|
+
* Whether the latest connection attempt began after the user's latest login or logout. With
|
|
121
|
+
* cookie auth the router binds a WebSocket to the session at the handshake, so a socket opened
|
|
122
|
+
* before one of them stays on the session it started with.
|
|
123
|
+
* @internal
|
|
124
|
+
*/
|
|
125
|
+
readonly onCurrentSession?: boolean;
|
|
113
126
|
host: string;
|
|
114
127
|
}
|
|
115
128
|
/**
|
|
@@ -157,6 +170,14 @@ export declare class DefaultSocket implements Socket {
|
|
|
157
170
|
private connectOptions;
|
|
158
171
|
private reconnectOptions;
|
|
159
172
|
private socketSubscription;
|
|
173
|
+
private attempt?;
|
|
174
|
+
private reconnectLoop?;
|
|
175
|
+
private reconnectOutcome?;
|
|
176
|
+
get pendingConnection(): Promise<boolean> | undefined;
|
|
177
|
+
/** Counts logins and logouts, and their count when the latest attempt began. */
|
|
178
|
+
private authChanges;
|
|
179
|
+
private attemptAuthChanges;
|
|
180
|
+
get onCurrentSession(): boolean;
|
|
160
181
|
/** The latest connect()'s outcome, which a connect() it replaced settles with. */
|
|
161
182
|
private connection;
|
|
162
183
|
constructor(messageBuilder: MessageBuilder, session: Session, serializer: JSONSerializer, uuid: UUID, status: SocketStatus,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../src/connect/socket.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../src/connect/socket.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/datasource.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../../src/datasource/datasource.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,6 +106,15 @@ let DefaultConnect = class DefaultConnect {
|
|
|
106
106
|
}
|
|
107
107
|
connect() {
|
|
108
108
|
return __awaiter(this, arguments, void 0, function* (host = GENESIS_SOCKET_URL) {
|
|
109
|
+
// Resetting ends every subscription in the app, so callers using `connect` to ensure a
|
|
110
|
+
// connection share the current one, or the socket's attempt or reconnect loop in progress.
|
|
111
|
+
if (this.socket.host === host && this.socket.onCurrentSession !== false) {
|
|
112
|
+
if (this.isConnected)
|
|
113
|
+
return true;
|
|
114
|
+
const pending = this.socket.pendingConnection;
|
|
115
|
+
if (pending)
|
|
116
|
+
return pending;
|
|
117
|
+
}
|
|
109
118
|
this.socket.reset();
|
|
110
119
|
return this.socket.connect(host, this.config.connect, this.config.reconnect);
|
|
111
120
|
});
|
|
@@ -189,15 +189,33 @@ let DefaultHttpConnect = DefaultHttpConnect_1 = class DefaultHttpConnect {
|
|
|
189
189
|
return __awaiter(this, void 0, void 0, function* () {
|
|
190
190
|
// converts the host to an http one if someone is using the feature flag to
|
|
191
191
|
// force http mode but set the api host as a ws url, and ensures a trailing slash
|
|
192
|
-
|
|
193
|
-
|
|
192
|
+
const httpHost = this.transport.toHttpHost(host);
|
|
193
|
+
if (httpHost === this.host) {
|
|
194
|
+
if (this.isConnected)
|
|
195
|
+
return true;
|
|
196
|
+
if (this.pendingConnect)
|
|
197
|
+
return this.pendingConnect;
|
|
198
|
+
}
|
|
199
|
+
this.host = httpHost;
|
|
200
|
+
const attempt = this.checkHost().then((connected) => {
|
|
194
201
|
this.isConnected = connected;
|
|
195
202
|
this.session.setSessionStorageItem('hostUrl', this.host);
|
|
196
203
|
return connected;
|
|
197
204
|
});
|
|
205
|
+
this.pendingConnect = attempt;
|
|
206
|
+
try {
|
|
207
|
+
return yield attempt;
|
|
208
|
+
}
|
|
209
|
+
finally {
|
|
210
|
+
// A later check (another host, or after `disconnect`) may have replaced this one.
|
|
211
|
+
if (this.pendingConnect === attempt) {
|
|
212
|
+
this.pendingConnect = undefined;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
198
215
|
});
|
|
199
216
|
}
|
|
200
217
|
disconnect() {
|
|
218
|
+
this.pendingConnect = undefined;
|
|
201
219
|
this.isConnected = false;
|
|
202
220
|
this.streams.clear();
|
|
203
221
|
this.ongoingTurbo = {};
|
|
@@ -4,7 +4,7 @@ import { GENESIS_SOCKET_URL, JSONSerializer, UUID } from '@genesislcap/foundatio
|
|
|
4
4
|
import { DOM, observable } from '@microsoft/fast-element';
|
|
5
5
|
import { DI } from '@microsoft/fast-foundation';
|
|
6
6
|
import { from, Observable, of, Subject, Subscription, throwError } from 'rxjs';
|
|
7
|
-
import { exhaustMap, filter, map, switchMap, takeWhile } from 'rxjs/operators';
|
|
7
|
+
import { exhaustMap, filter, finalize, map, switchMap, takeWhile } from 'rxjs/operators';
|
|
8
8
|
import { WebSocketSubject } from 'rxjs/webSocket';
|
|
9
9
|
import { getDefaultScdbWasm } from '../datasource/scdb';
|
|
10
10
|
import { MetaCache } from '../metadata';
|
|
@@ -130,7 +130,15 @@ let DefaultSocket = class DefaultSocket {
|
|
|
130
130
|
var _a;
|
|
131
131
|
return (_a = this.url) !== null && _a !== void 0 ? _a : GENESIS_SOCKET_URL;
|
|
132
132
|
}
|
|
133
|
+
get pendingConnection() {
|
|
134
|
+
var _a;
|
|
135
|
+
return (_a = this.reconnectOutcome) !== null && _a !== void 0 ? _a : this.attempt;
|
|
136
|
+
}
|
|
137
|
+
get onCurrentSession() {
|
|
138
|
+
return this.attemptAuthChanges === this.authChanges;
|
|
139
|
+
}
|
|
133
140
|
constructor(messageBuilder, session, serializer, uuid, status, user, config) {
|
|
141
|
+
var _a, _b;
|
|
134
142
|
this.messageBuilder = messageBuilder;
|
|
135
143
|
this.session = session;
|
|
136
144
|
this.serializer = serializer;
|
|
@@ -144,7 +152,13 @@ let DefaultSocket = class DefaultSocket {
|
|
|
144
152
|
this.scdbWasmRequested = false;
|
|
145
153
|
this.heartbeatIsEnabled = true;
|
|
146
154
|
this.heartbeatInterval = this.defaultInterval;
|
|
155
|
+
/** Counts logins and logouts, and their count when the latest attempt began. */
|
|
156
|
+
this.authChanges = 0;
|
|
157
|
+
this.attemptAuthChanges = 0;
|
|
147
158
|
this.socketMessages = () => this.wsMessages;
|
|
159
|
+
(_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.addAuthenticationChangeListener) === null || _b === void 0 ? void 0 : _b.call(_a, () => {
|
|
160
|
+
this.authChanges += 1;
|
|
161
|
+
});
|
|
148
162
|
}
|
|
149
163
|
/** Makes SCDB columnar payloads transparent (no-op unless an encoding was negotiated). */
|
|
150
164
|
get scdbDecoder() {
|
|
@@ -174,6 +188,7 @@ let DefaultSocket = class DefaultSocket {
|
|
|
174
188
|
logger.warn(`Make sure the host url starts with wss:// or ws://`);
|
|
175
189
|
return;
|
|
176
190
|
}
|
|
191
|
+
this.attemptAuthChanges = this.authChanges;
|
|
177
192
|
const replacingLiveSocket = !!this.websocket && this.isConnected;
|
|
178
193
|
const connection = new Promise((resolve) => {
|
|
179
194
|
var _a, _b, _c, _d;
|
|
@@ -313,6 +328,12 @@ let DefaultSocket = class DefaultSocket {
|
|
|
313
328
|
this.status.isConfigured = true;
|
|
314
329
|
});
|
|
315
330
|
this.connection = connection;
|
|
331
|
+
this.attempt = connection;
|
|
332
|
+
connection.then(() => {
|
|
333
|
+
if (this.attempt === connection) {
|
|
334
|
+
this.attempt = undefined;
|
|
335
|
+
}
|
|
336
|
+
});
|
|
316
337
|
if (replacingLiveSocket) {
|
|
317
338
|
// Report the gap only now that the replacement is installed, so a subscriber that reacts by
|
|
318
339
|
// connecting or disconnecting sees a consistent socket. Consumers re-subscribe on this one
|
|
@@ -438,6 +459,11 @@ let DefaultSocket = class DefaultSocket {
|
|
|
438
459
|
const scheduler = ((_c = this.reconnectOptions) === null || _c === void 0 ? void 0 : _c.reconnectStrategy) === SocketReconnectStrategy.Exponential
|
|
439
460
|
? exponentialScheduler
|
|
440
461
|
: linearScheduler;
|
|
462
|
+
let settle;
|
|
463
|
+
const outcome = new Promise((resolve) => {
|
|
464
|
+
settle = resolve;
|
|
465
|
+
});
|
|
466
|
+
this.reconnectOutcome = outcome;
|
|
441
467
|
const reconnectObservable = this.isConnectedSubject.asObservable().pipe(switchMap((isConnected) => !isConnected
|
|
442
468
|
? retryInterval(this.reconnectOptions, scheduler).pipe(exhaustMap((tick, attempt) => {
|
|
443
469
|
var _a, _b, _c;
|
|
@@ -452,8 +478,15 @@ let DefaultSocket = class DefaultSocket {
|
|
|
452
478
|
? from(this.refreshSessionBeforeReconnect()).pipe(map(() => attempt))
|
|
453
479
|
: of(attempt);
|
|
454
480
|
}))
|
|
455
|
-
: of(-1)), takeWhile(() => this.websocket && !this.isConnected)
|
|
456
|
-
|
|
481
|
+
: of(-1)), takeWhile(() => this.websocket && !this.isConnected),
|
|
482
|
+
// Runs after the observer's complete or error, and when `reset` stops the loop.
|
|
483
|
+
finalize(() => {
|
|
484
|
+
if (this.reconnectOutcome === outcome) {
|
|
485
|
+
this.reconnectOutcome = undefined;
|
|
486
|
+
}
|
|
487
|
+
settle(this.isConnected);
|
|
488
|
+
}));
|
|
489
|
+
this.reconnectLoop = reconnectObservable.subscribe((_e = (_d = this.reconnectOptions) === null || _d === void 0 ? void 0 : _d.reconnectObserver) !== null && _e !== void 0 ? _e : {
|
|
457
490
|
next: (value) => {
|
|
458
491
|
logger.debug(`Attempt no. ${value + 1} to reconnect`);
|
|
459
492
|
this.websocket.complete();
|
|
@@ -502,13 +535,17 @@ let DefaultSocket = class DefaultSocket {
|
|
|
502
535
|
window.location.reload();
|
|
503
536
|
}
|
|
504
537
|
reset() {
|
|
505
|
-
var _a;
|
|
538
|
+
var _a, _b;
|
|
506
539
|
this.status.isConnected = false;
|
|
507
540
|
this.status.isConfigured = false;
|
|
541
|
+
this.status.isReconnecting = false;
|
|
542
|
+
// A running loop's next attempt would replace whichever socket follows this reset.
|
|
543
|
+
(_a = this.reconnectLoop) === null || _a === void 0 ? void 0 : _a.unsubscribe();
|
|
508
544
|
// Closes a socket still connecting too, which completing the subject alone does not.
|
|
509
|
-
(
|
|
545
|
+
(_b = this.socketSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
|
|
510
546
|
this.websocket && this.websocket.complete();
|
|
511
547
|
this.websocket = null;
|
|
548
|
+
this.attempt = undefined;
|
|
512
549
|
this.connection = undefined;
|
|
513
550
|
this.cleanMessages();
|
|
514
551
|
}
|
|
@@ -99,7 +99,8 @@ let DefaultDatasource = class DefaultDatasource {
|
|
|
99
99
|
// and a DATA_LOGON with no resource name, or with another init()'s options.
|
|
100
100
|
const { resourceName } = this.options;
|
|
101
101
|
const superseded = () => generation !== this.generation;
|
|
102
|
-
|
|
102
|
+
// Ensure the connection the app opened; the default host may differ from it.
|
|
103
|
+
const connected = this.connect.isConnected || (yield this.connect.connect(this.connect.host));
|
|
103
104
|
if (superseded())
|
|
104
105
|
return this.interruptedInit(resourceName);
|
|
105
106
|
if (!connected) {
|
|
@@ -1816,7 +1816,7 @@
|
|
|
1816
1816
|
{
|
|
1817
1817
|
"kind": "MethodSignature",
|
|
1818
1818
|
"canonicalReference": "@genesislcap/foundation-comms!Connect#connect:member(1)",
|
|
1819
|
-
"docComment": "/**\n * Connects to a server at the specified host.\n *\n * @param host - The host to connect to. Defaults to GENESIS_SOCKET_URL.\n *\n * @returns A promise that resolves with a boolean indicating whether the connection was successful.\n *\n * @public\n */\n",
|
|
1819
|
+
"docComment": "/**\n * Connects to a server at the specified host.\n *\n * @remarks\n *\n * While already connected, connecting or reconnecting to `host`, resolves with that connection instead of replacing it, unless the user has logged in or out since it was opened. Connecting to a different host replaces the connection and ends its subscriptions. To force a new connection to the same host, call `disconnect` first.\n *\n * Joining a reconnect waits for the whole reconnect, not one attempt, with no timeout of its own. With `alwaysOn` that lasts until a socket opens, so during an outage this resolves once the server is back rather than with `false`.\n *\n * @param host - The host to connect to. Defaults to GENESIS_SOCKET_URL.\n *\n * @returns A promise that resolves with a boolean indicating whether the connection was successful.\n *\n * @public\n */\n",
|
|
1820
1820
|
"excerptTokens": [
|
|
1821
1821
|
{
|
|
1822
1822
|
"kind": "Content",
|
|
@@ -25783,6 +25783,71 @@
|
|
|
25783
25783
|
"isProtected": false,
|
|
25784
25784
|
"isAbstract": false
|
|
25785
25785
|
},
|
|
25786
|
+
{
|
|
25787
|
+
"kind": "Property",
|
|
25788
|
+
"canonicalReference": "@genesislcap/foundation-comms!DefaultSocket#onCurrentSession:member",
|
|
25789
|
+
"docComment": "",
|
|
25790
|
+
"excerptTokens": [
|
|
25791
|
+
{
|
|
25792
|
+
"kind": "Content",
|
|
25793
|
+
"text": "get onCurrentSession(): "
|
|
25794
|
+
},
|
|
25795
|
+
{
|
|
25796
|
+
"kind": "Content",
|
|
25797
|
+
"text": "boolean"
|
|
25798
|
+
},
|
|
25799
|
+
{
|
|
25800
|
+
"kind": "Content",
|
|
25801
|
+
"text": ";"
|
|
25802
|
+
}
|
|
25803
|
+
],
|
|
25804
|
+
"isReadonly": true,
|
|
25805
|
+
"isOptional": false,
|
|
25806
|
+
"releaseTag": "Public",
|
|
25807
|
+
"name": "onCurrentSession",
|
|
25808
|
+
"propertyTypeTokenRange": {
|
|
25809
|
+
"startIndex": 1,
|
|
25810
|
+
"endIndex": 2
|
|
25811
|
+
},
|
|
25812
|
+
"isStatic": false,
|
|
25813
|
+
"isProtected": false,
|
|
25814
|
+
"isAbstract": false
|
|
25815
|
+
},
|
|
25816
|
+
{
|
|
25817
|
+
"kind": "Property",
|
|
25818
|
+
"canonicalReference": "@genesislcap/foundation-comms!DefaultSocket#pendingConnection:member",
|
|
25819
|
+
"docComment": "",
|
|
25820
|
+
"excerptTokens": [
|
|
25821
|
+
{
|
|
25822
|
+
"kind": "Content",
|
|
25823
|
+
"text": "get pendingConnection(): "
|
|
25824
|
+
},
|
|
25825
|
+
{
|
|
25826
|
+
"kind": "Reference",
|
|
25827
|
+
"text": "Promise",
|
|
25828
|
+
"canonicalReference": "!Promise:interface"
|
|
25829
|
+
},
|
|
25830
|
+
{
|
|
25831
|
+
"kind": "Content",
|
|
25832
|
+
"text": "<boolean> | undefined"
|
|
25833
|
+
},
|
|
25834
|
+
{
|
|
25835
|
+
"kind": "Content",
|
|
25836
|
+
"text": ";"
|
|
25837
|
+
}
|
|
25838
|
+
],
|
|
25839
|
+
"isReadonly": true,
|
|
25840
|
+
"isOptional": false,
|
|
25841
|
+
"releaseTag": "Public",
|
|
25842
|
+
"name": "pendingConnection",
|
|
25843
|
+
"propertyTypeTokenRange": {
|
|
25844
|
+
"startIndex": 1,
|
|
25845
|
+
"endIndex": 3
|
|
25846
|
+
},
|
|
25847
|
+
"isStatic": false,
|
|
25848
|
+
"isProtected": false,
|
|
25849
|
+
"isAbstract": false
|
|
25850
|
+
},
|
|
25786
25851
|
{
|
|
25787
25852
|
"kind": "Method",
|
|
25788
25853
|
"canonicalReference": "@genesislcap/foundation-comms!DefaultSocket#reset:member(1)",
|
|
@@ -330,6 +330,15 @@ export declare interface Connect {
|
|
|
330
330
|
httpMode(): boolean;
|
|
331
331
|
/**
|
|
332
332
|
* Connects to a server at the specified host.
|
|
333
|
+
* @remarks
|
|
334
|
+
* While already connected, connecting or reconnecting to `host`, resolves with that connection
|
|
335
|
+
* instead of replacing it, unless the user has logged in or out since it was opened. Connecting
|
|
336
|
+
* to a different host replaces the connection and ends its subscriptions. To force a new
|
|
337
|
+
* connection to the same host, call `disconnect` first.
|
|
338
|
+
*
|
|
339
|
+
* Joining a reconnect waits for the whole reconnect, not one attempt, with no timeout of its own.
|
|
340
|
+
* With `alwaysOn` that lasts until a socket opens, so during an outage this resolves once the
|
|
341
|
+
* server is back rather than with `false`.
|
|
333
342
|
* @public
|
|
334
343
|
* @param host - The host to connect to. Defaults to GENESIS_SOCKET_URL.
|
|
335
344
|
* @returns A promise that resolves with a boolean indicating whether the connection was successful.
|
|
@@ -2528,6 +2537,8 @@ export declare class DefaultHttpConnect implements Connect {
|
|
|
2528
2537
|
* @deprecated - Please reference `User` from `@genesislcap/foundation-user` instead.
|
|
2529
2538
|
*/
|
|
2530
2539
|
setValidSession(valid: boolean): void;
|
|
2540
|
+
/** The host check in flight, shared by concurrent `connect` calls to the same host. */
|
|
2541
|
+
private pendingConnect?;
|
|
2531
2542
|
connect(host: string): Promise<boolean>;
|
|
2532
2543
|
disconnect(): void;
|
|
2533
2544
|
snapshot(resourceName: string, params?: any): Promise<Message>;
|
|
@@ -2943,6 +2954,14 @@ export declare class DefaultSocket implements Socket {
|
|
|
2943
2954
|
private connectOptions;
|
|
2944
2955
|
private reconnectOptions;
|
|
2945
2956
|
private socketSubscription;
|
|
2957
|
+
private attempt?;
|
|
2958
|
+
private reconnectLoop?;
|
|
2959
|
+
private reconnectOutcome?;
|
|
2960
|
+
get pendingConnection(): Promise<boolean> | undefined;
|
|
2961
|
+
/** Counts logins and logouts, and their count when the latest attempt began. */
|
|
2962
|
+
private authChanges;
|
|
2963
|
+
private attemptAuthChanges;
|
|
2964
|
+
get onCurrentSession(): boolean;
|
|
2946
2965
|
/** The latest connect()'s outcome, which a connect() it replaced settles with. */
|
|
2947
2966
|
private connection;
|
|
2948
2967
|
constructor(messageBuilder: MessageBuilder, session: Session, serializer: JSONSerializer, uuid: UUID, status: SocketStatus,
|
|
@@ -5366,6 +5385,19 @@ export declare interface Socket extends Omit<SocketStatus, 'serialize' | 'onClos
|
|
|
5366
5385
|
* or stale metadata (e.g. `getMetadata(r, false)`).
|
|
5367
5386
|
*/
|
|
5368
5387
|
setScdbMetadataRefresher?(refresher: (resourceName: string) => void | Promise<unknown>): void;
|
|
5388
|
+
/**
|
|
5389
|
+
* Settles with whether the socket is connected once the connection attempt or reconnect loop in
|
|
5390
|
+
* progress ends; undefined while neither is in progress.
|
|
5391
|
+
* @internal
|
|
5392
|
+
*/
|
|
5393
|
+
readonly pendingConnection?: Promise<boolean>;
|
|
5394
|
+
/**
|
|
5395
|
+
* Whether the latest connection attempt began after the user's latest login or logout. With
|
|
5396
|
+
* cookie auth the router binds a WebSocket to the session at the handshake, so a socket opened
|
|
5397
|
+
* before one of them stays on the session it started with.
|
|
5398
|
+
* @internal
|
|
5399
|
+
*/
|
|
5400
|
+
readonly onCurrentSession?: boolean;
|
|
5369
5401
|
host: string;
|
|
5370
5402
|
}
|
|
5371
5403
|
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@genesislcap/foundation-comms",
|
|
3
3
|
"description": "Genesis Foundation UI Comms",
|
|
4
|
-
"version": "15.84.
|
|
4
|
+
"version": "15.84.3",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"license": "SEE LICENSE IN license.txt",
|
|
7
7
|
"main": "dist/esm/index.js",
|
|
@@ -75,12 +75,12 @@
|
|
|
75
75
|
}
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@genesislcap/foundation-testing": "15.84.
|
|
79
|
-
"@genesislcap/genx": "15.84.
|
|
80
|
-
"@genesislcap/ts-builder": "15.84.
|
|
81
|
-
"@genesislcap/uvu-playwright-builder": "15.84.
|
|
82
|
-
"@genesislcap/vite-builder": "15.84.
|
|
83
|
-
"@genesislcap/webpack-builder": "15.84.
|
|
78
|
+
"@genesislcap/foundation-testing": "15.84.3",
|
|
79
|
+
"@genesislcap/genx": "15.84.3",
|
|
80
|
+
"@genesislcap/ts-builder": "15.84.3",
|
|
81
|
+
"@genesislcap/uvu-playwright-builder": "15.84.3",
|
|
82
|
+
"@genesislcap/vite-builder": "15.84.3",
|
|
83
|
+
"@genesislcap/webpack-builder": "15.84.3",
|
|
84
84
|
"@types/js-cookie": "^3.0.2",
|
|
85
85
|
"@types/json-schema": "^7.0.11",
|
|
86
86
|
"@types/webappsec-credential-management": "^0.6.2",
|
|
@@ -88,11 +88,11 @@
|
|
|
88
88
|
"sinon": "^17.0.1"
|
|
89
89
|
},
|
|
90
90
|
"dependencies": {
|
|
91
|
-
"@genesislcap/foundation-broadcast-channel": "15.84.
|
|
92
|
-
"@genesislcap/foundation-logger": "15.84.
|
|
93
|
-
"@genesislcap/foundation-user": "15.84.
|
|
94
|
-
"@genesislcap/foundation-utils": "15.84.
|
|
95
|
-
"@genesislcap/web-core": "15.84.
|
|
91
|
+
"@genesislcap/foundation-broadcast-channel": "15.84.3",
|
|
92
|
+
"@genesislcap/foundation-logger": "15.84.3",
|
|
93
|
+
"@genesislcap/foundation-user": "15.84.3",
|
|
94
|
+
"@genesislcap/foundation-utils": "15.84.3",
|
|
95
|
+
"@genesislcap/web-core": "15.84.3",
|
|
96
96
|
"@microsoft/fast-element": "1.14.0",
|
|
97
97
|
"@microsoft/fast-foundation": "2.50.0",
|
|
98
98
|
"bowser": "^2.11.0",
|