@genesislcap/foundation-comms 15.90.2 → 15.90.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.
|
@@ -170,6 +170,17 @@ export declare class DefaultSocket implements Socket {
|
|
|
170
170
|
private connectOptions;
|
|
171
171
|
private reconnectOptions;
|
|
172
172
|
private socketSubscription;
|
|
173
|
+
/**
|
|
174
|
+
* `suspended` after freeze/bfcache until recovery runs; `recovered` until `pageshow` (or a plain
|
|
175
|
+
* `resume` with no `pageshow`) returns to `idle`, so `resume` + `pageshow` don't recover twice.
|
|
176
|
+
*/
|
|
177
|
+
private pageLifecycle;
|
|
178
|
+
private removePageLifecycleListeners?;
|
|
179
|
+
/**
|
|
180
|
+
* Set when recovering while a reconnect loop is mid-flight so the next `connect()` clears
|
|
181
|
+
* handlers even if `reconnectStreams` would otherwise keep them (stale DATASERVER logons).
|
|
182
|
+
*/
|
|
183
|
+
private forceCleanMessagesOnNextConnect;
|
|
173
184
|
private attempt?;
|
|
174
185
|
private reconnectLoop?;
|
|
175
186
|
private reconnectOutcome?;
|
|
@@ -185,6 +196,18 @@ export declare class DefaultSocket implements Socket {
|
|
|
185
196
|
* Temp putting the user in place to bridge the hasValidSession logic.
|
|
186
197
|
*/
|
|
187
198
|
user: User, config: ConnectConfig);
|
|
199
|
+
/**
|
|
200
|
+
* Chrome terminates WebSockets when a tab is frozen or put in the back-forward cache.
|
|
201
|
+
* On restore, call `connect()` so datasources see the tested false→true path (#2718/#2720)
|
|
202
|
+
* instead of replaying stale DATASERVER logons on a dead transport.
|
|
203
|
+
*
|
|
204
|
+
* Note: `networkMonitor` also listens to `pageshow` / `visibilitychange` and may re-logon
|
|
205
|
+
* unhealthy resources. Socket-level recovery clears handlers and reconnects; both can run on
|
|
206
|
+
* the same `pageshow`. Prefer this path for bfcache/freeze (transport is often dead);
|
|
207
|
+
* networkMonitor covers soft disconnects while the tab stays alive.
|
|
208
|
+
*/
|
|
209
|
+
private ensurePageLifecycleListeners;
|
|
210
|
+
private recoverAfterPageLifecycle;
|
|
188
211
|
/** Makes SCDB columnar payloads transparent (no-op unless an encoding was negotiated). */
|
|
189
212
|
private get scdbDecoder();
|
|
190
213
|
private get heartbeatLoggingIsEnabled();
|
|
@@ -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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"}
|
|
@@ -152,6 +152,16 @@ let DefaultSocket = class DefaultSocket {
|
|
|
152
152
|
this.scdbWasmRequested = false;
|
|
153
153
|
this.heartbeatIsEnabled = true;
|
|
154
154
|
this.heartbeatInterval = this.defaultInterval;
|
|
155
|
+
/**
|
|
156
|
+
* `suspended` after freeze/bfcache until recovery runs; `recovered` until `pageshow` (or a plain
|
|
157
|
+
* `resume` with no `pageshow`) returns to `idle`, so `resume` + `pageshow` don't recover twice.
|
|
158
|
+
*/
|
|
159
|
+
this.pageLifecycle = 'idle';
|
|
160
|
+
/**
|
|
161
|
+
* Set when recovering while a reconnect loop is mid-flight so the next `connect()` clears
|
|
162
|
+
* handlers even if `reconnectStreams` would otherwise keep them (stale DATASERVER logons).
|
|
163
|
+
*/
|
|
164
|
+
this.forceCleanMessagesOnNextConnect = false;
|
|
155
165
|
/** Counts logins and logouts, and their count when the latest attempt began. */
|
|
156
166
|
this.authChanges = 0;
|
|
157
167
|
this.attemptAuthChanges = 0;
|
|
@@ -160,6 +170,74 @@ let DefaultSocket = class DefaultSocket {
|
|
|
160
170
|
this.authChanges += 1;
|
|
161
171
|
});
|
|
162
172
|
}
|
|
173
|
+
/**
|
|
174
|
+
* Chrome terminates WebSockets when a tab is frozen or put in the back-forward cache.
|
|
175
|
+
* On restore, call `connect()` so datasources see the tested false→true path (#2718/#2720)
|
|
176
|
+
* instead of replaying stale DATASERVER logons on a dead transport.
|
|
177
|
+
*
|
|
178
|
+
* Note: `networkMonitor` also listens to `pageshow` / `visibilitychange` and may re-logon
|
|
179
|
+
* unhealthy resources. Socket-level recovery clears handlers and reconnects; both can run on
|
|
180
|
+
* the same `pageshow`. Prefer this path for bfcache/freeze (transport is often dead);
|
|
181
|
+
* networkMonitor covers soft disconnects while the tab stays alive.
|
|
182
|
+
*/
|
|
183
|
+
ensurePageLifecycleListeners() {
|
|
184
|
+
if (this.removePageLifecycleListeners ||
|
|
185
|
+
typeof window === 'undefined' ||
|
|
186
|
+
typeof document === 'undefined') {
|
|
187
|
+
return;
|
|
188
|
+
}
|
|
189
|
+
const markSuspended = () => {
|
|
190
|
+
this.pageLifecycle = 'suspended';
|
|
191
|
+
};
|
|
192
|
+
const onResume = () => {
|
|
193
|
+
this.recoverAfterPageLifecycle();
|
|
194
|
+
};
|
|
195
|
+
const onPageHide = (event) => {
|
|
196
|
+
if (event.persisted) {
|
|
197
|
+
markSuspended();
|
|
198
|
+
}
|
|
199
|
+
};
|
|
200
|
+
const onPageShow = (event) => {
|
|
201
|
+
// bfcache restore may omit pagehide(persisted); arm only if resume hasn't already recovered.
|
|
202
|
+
if (event.persisted && this.pageLifecycle === 'idle') {
|
|
203
|
+
this.pageLifecycle = 'suspended';
|
|
204
|
+
}
|
|
205
|
+
this.recoverAfterPageLifecycle();
|
|
206
|
+
this.pageLifecycle = 'idle';
|
|
207
|
+
};
|
|
208
|
+
document.addEventListener('freeze', markSuspended);
|
|
209
|
+
document.addEventListener('resume', onResume);
|
|
210
|
+
window.addEventListener('pagehide', onPageHide);
|
|
211
|
+
window.addEventListener('pageshow', onPageShow);
|
|
212
|
+
this.removePageLifecycleListeners = () => {
|
|
213
|
+
document.removeEventListener('freeze', markSuspended);
|
|
214
|
+
document.removeEventListener('resume', onResume);
|
|
215
|
+
window.removeEventListener('pagehide', onPageHide);
|
|
216
|
+
window.removeEventListener('pageshow', onPageShow);
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
recoverAfterPageLifecycle() {
|
|
220
|
+
if (this.pageLifecycle !== 'suspended') {
|
|
221
|
+
return;
|
|
222
|
+
}
|
|
223
|
+
this.pageLifecycle = 'recovered';
|
|
224
|
+
if (!this.url) {
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
// A mid-flight reconnect loop would skip cleanMessages when reconnectStreams is on and
|
|
228
|
+
// replay old DATASERVER logons. Start connect first so the loop's finalize can settle
|
|
229
|
+
// waiters with the new attempt instead of false.
|
|
230
|
+
if (this.isReconnecting) {
|
|
231
|
+
this.forceCleanMessagesOnNextConnect = true;
|
|
232
|
+
const loop = this.reconnectLoop;
|
|
233
|
+
this.reconnectLoop = undefined;
|
|
234
|
+
void this.connect(this.url, this.connectOptions, this.reconnectOptions);
|
|
235
|
+
loop === null || loop === void 0 ? void 0 : loop.unsubscribe();
|
|
236
|
+
this.status.isReconnecting = false;
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
239
|
+
void this.connect(this.url, this.connectOptions, this.reconnectOptions);
|
|
240
|
+
}
|
|
163
241
|
/** Makes SCDB columnar payloads transparent (no-op unless an encoding was negotiated). */
|
|
164
242
|
get scdbDecoder() {
|
|
165
243
|
var _a;
|
|
@@ -188,6 +266,8 @@ let DefaultSocket = class DefaultSocket {
|
|
|
188
266
|
logger.warn(`Make sure the host url starts with wss:// or ws://`);
|
|
189
267
|
return;
|
|
190
268
|
}
|
|
269
|
+
// After the host check so a rejected invalid URL does not arm freeze/resume recovery.
|
|
270
|
+
this.ensurePageLifecycleListeners();
|
|
191
271
|
this.attemptAuthChanges = this.authChanges;
|
|
192
272
|
const replacingLiveSocket = !!this.websocket && this.isConnected;
|
|
193
273
|
const connection = new Promise((resolve) => {
|
|
@@ -195,7 +275,10 @@ let DefaultSocket = class DefaultSocket {
|
|
|
195
275
|
logger.info(`${this.isReconnecting ? 'Reconnecting' : 'Connecting'} to ${this.url}`);
|
|
196
276
|
this.status.isConnecting = !this.isReconnecting;
|
|
197
277
|
this.rejectPendingRequests();
|
|
198
|
-
const cleanMessages =
|
|
278
|
+
const cleanMessages = this.forceCleanMessagesOnNextConnect ||
|
|
279
|
+
!this.isReconnecting ||
|
|
280
|
+
!((_a = this.reconnectOptions) === null || _a === void 0 ? void 0 : _a.reconnectStreams);
|
|
281
|
+
this.forceCleanMessagesOnNextConnect = false;
|
|
199
282
|
if (cleanMessages) {
|
|
200
283
|
this.cleanMessages();
|
|
201
284
|
}
|
|
@@ -486,7 +569,15 @@ let DefaultSocket = class DefaultSocket {
|
|
|
486
569
|
if (this.reconnectOutcome === outcome) {
|
|
487
570
|
this.reconnectOutcome = undefined;
|
|
488
571
|
}
|
|
489
|
-
|
|
572
|
+
// Prefer an in-flight connect (e.g. freeze/resume cancelled this loop) over isConnected,
|
|
573
|
+
// which is still false at unsubscribe time.
|
|
574
|
+
const pending = this.attempt;
|
|
575
|
+
if (pending) {
|
|
576
|
+
void pending.then(settle, () => settle(false));
|
|
577
|
+
}
|
|
578
|
+
else {
|
|
579
|
+
settle(this.isConnected);
|
|
580
|
+
}
|
|
490
581
|
if (limitReached) {
|
|
491
582
|
this.notifyReconnectionLimitReached();
|
|
492
583
|
}
|
|
@@ -553,14 +644,19 @@ let DefaultSocket = class DefaultSocket {
|
|
|
553
644
|
window.location.reload();
|
|
554
645
|
}
|
|
555
646
|
reset() {
|
|
556
|
-
var _a, _b;
|
|
647
|
+
var _a, _b, _c;
|
|
648
|
+
// Drop global listeners first so a failing complete() cannot leak freeze/resume handlers.
|
|
649
|
+
(_a = this.removePageLifecycleListeners) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
650
|
+
this.removePageLifecycleListeners = undefined;
|
|
651
|
+
this.pageLifecycle = 'idle';
|
|
652
|
+
this.forceCleanMessagesOnNextConnect = false;
|
|
557
653
|
this.status.isConnected = false;
|
|
558
654
|
this.status.isConfigured = false;
|
|
559
655
|
this.status.isReconnecting = false;
|
|
560
656
|
// A running loop's next attempt would replace whichever socket follows this reset.
|
|
561
|
-
(
|
|
657
|
+
(_b = this.reconnectLoop) === null || _b === void 0 ? void 0 : _b.unsubscribe();
|
|
562
658
|
// Closes a socket still connecting too, which completing the subject alone does not.
|
|
563
|
-
(
|
|
659
|
+
(_c = this.socketSubscription) === null || _c === void 0 ? void 0 : _c.unsubscribe();
|
|
564
660
|
this.websocket && this.websocket.complete();
|
|
565
661
|
this.websocket = null;
|
|
566
662
|
this.attempt = undefined;
|
|
@@ -2954,6 +2954,17 @@ export declare class DefaultSocket implements Socket {
|
|
|
2954
2954
|
private connectOptions;
|
|
2955
2955
|
private reconnectOptions;
|
|
2956
2956
|
private socketSubscription;
|
|
2957
|
+
/**
|
|
2958
|
+
* `suspended` after freeze/bfcache until recovery runs; `recovered` until `pageshow` (or a plain
|
|
2959
|
+
* `resume` with no `pageshow`) returns to `idle`, so `resume` + `pageshow` don't recover twice.
|
|
2960
|
+
*/
|
|
2961
|
+
private pageLifecycle;
|
|
2962
|
+
private removePageLifecycleListeners?;
|
|
2963
|
+
/**
|
|
2964
|
+
* Set when recovering while a reconnect loop is mid-flight so the next `connect()` clears
|
|
2965
|
+
* handlers even if `reconnectStreams` would otherwise keep them (stale DATASERVER logons).
|
|
2966
|
+
*/
|
|
2967
|
+
private forceCleanMessagesOnNextConnect;
|
|
2957
2968
|
private attempt?;
|
|
2958
2969
|
private reconnectLoop?;
|
|
2959
2970
|
private reconnectOutcome?;
|
|
@@ -2969,6 +2980,18 @@ export declare class DefaultSocket implements Socket {
|
|
|
2969
2980
|
* Temp putting the user in place to bridge the hasValidSession logic.
|
|
2970
2981
|
*/
|
|
2971
2982
|
user: User_2, config: ConnectConfig);
|
|
2983
|
+
/**
|
|
2984
|
+
* Chrome terminates WebSockets when a tab is frozen or put in the back-forward cache.
|
|
2985
|
+
* On restore, call `connect()` so datasources see the tested false→true path (#2718/#2720)
|
|
2986
|
+
* instead of replaying stale DATASERVER logons on a dead transport.
|
|
2987
|
+
*
|
|
2988
|
+
* Note: `networkMonitor` also listens to `pageshow` / `visibilitychange` and may re-logon
|
|
2989
|
+
* unhealthy resources. Socket-level recovery clears handlers and reconnects; both can run on
|
|
2990
|
+
* the same `pageshow`. Prefer this path for bfcache/freeze (transport is often dead);
|
|
2991
|
+
* networkMonitor covers soft disconnects while the tab stays alive.
|
|
2992
|
+
*/
|
|
2993
|
+
private ensurePageLifecycleListeners;
|
|
2994
|
+
private recoverAfterPageLifecycle;
|
|
2972
2995
|
/** Makes SCDB columnar payloads transparent (no-op unless an encoding was negotiated). */
|
|
2973
2996
|
private get scdbDecoder();
|
|
2974
2997
|
private get heartbeatLoggingIsEnabled();
|
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.90.
|
|
4
|
+
"version": "15.90.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.90.
|
|
79
|
-
"@genesislcap/genx": "15.90.
|
|
80
|
-
"@genesislcap/ts-builder": "15.90.
|
|
81
|
-
"@genesislcap/uvu-playwright-builder": "15.90.
|
|
82
|
-
"@genesislcap/vite-builder": "15.90.
|
|
83
|
-
"@genesislcap/webpack-builder": "15.90.
|
|
78
|
+
"@genesislcap/foundation-testing": "15.90.3",
|
|
79
|
+
"@genesislcap/genx": "15.90.3",
|
|
80
|
+
"@genesislcap/ts-builder": "15.90.3",
|
|
81
|
+
"@genesislcap/uvu-playwright-builder": "15.90.3",
|
|
82
|
+
"@genesislcap/vite-builder": "15.90.3",
|
|
83
|
+
"@genesislcap/webpack-builder": "15.90.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.90.
|
|
92
|
-
"@genesislcap/foundation-logger": "15.90.
|
|
93
|
-
"@genesislcap/foundation-user": "15.90.
|
|
94
|
-
"@genesislcap/foundation-utils": "15.90.
|
|
95
|
-
"@genesislcap/web-core": "15.90.
|
|
91
|
+
"@genesislcap/foundation-broadcast-channel": "15.90.3",
|
|
92
|
+
"@genesislcap/foundation-logger": "15.90.3",
|
|
93
|
+
"@genesislcap/foundation-user": "15.90.3",
|
|
94
|
+
"@genesislcap/foundation-utils": "15.90.3",
|
|
95
|
+
"@genesislcap/web-core": "15.90.3",
|
|
96
96
|
"@microsoft/fast-element": "1.14.0",
|
|
97
97
|
"@microsoft/fast-foundation": "2.50.0",
|
|
98
98
|
"bowser": "^2.11.0",
|