@genesislcap/foundation-comms 15.84.0 → 15.84.2

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.
@@ -157,6 +157,8 @@ export declare class DefaultSocket implements Socket {
157
157
  private connectOptions;
158
158
  private reconnectOptions;
159
159
  private socketSubscription;
160
+ /** The latest connect()'s outcome, which a connect() it replaced settles with. */
161
+ private connection;
160
162
  constructor(messageBuilder: MessageBuilder, session: Session, serializer: JSONSerializer, uuid: UUID, status: SocketStatus,
161
163
  /**
162
164
  * Temp putting the user in place to bridge the hasValidSession logic.
@@ -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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"}
@@ -66,6 +66,8 @@ export interface Datasource extends DatasourceMetadata {
66
66
  * @param fetchMeta - Optional flag to fetch metadata for the datasource. Defaults to true.
67
67
  * @param startStream - Optional flag to start the data stream. Defaults to true.
68
68
  * @returns A promise that resolves with a boolean indicating whether the initialization was successful.
69
+ * When another `init()` or `destroy()` is called before it finishes, it sends nothing more and resolves with the
70
+ * result of the latest `init()`, or false when `destroy()` was called last, even if one of its requests then fails.
69
71
  */
70
72
  init(options: DatasourceOptions, fetchMeta?: boolean, startStream?: boolean): Promise<boolean>;
71
73
  /**
@@ -221,6 +223,8 @@ export declare class DefaultDatasource implements Datasource {
221
223
  resourceType: ResourceType;
222
224
  stream: SocketObservable<FilteredDataServerResult | RequestServerResult>;
223
225
  private _allParams;
226
+ private generation;
227
+ private latestInit?;
224
228
  constructor(connect: Connect, auth: Auth, resources: GenesisResources, config: DatasourceConfig, connectEvents: ConnectEvents);
225
229
  private pollTrigger$;
226
230
  private commitResponseUnsubscribe?;
@@ -230,6 +234,7 @@ export declare class DefaultDatasource implements Datasource {
230
234
  */
231
235
  validResourceName(resourceName: string): boolean;
232
236
  init(options: DatasourceOptions, fetchMeta?: boolean, startStream?: boolean): Promise<boolean>;
237
+ private initialise;
233
238
  startStream(): Promise<void>;
234
239
  /** {@inheritDoc Datasource.destroy} */
235
240
  destroy(): void;
@@ -270,6 +275,7 @@ export declare class DefaultDatasource implements Datasource {
270
275
  */
271
276
  protected normaliseStatus(status: Partial<DatasourceStatus>): DatasourceStatus;
272
277
  private invalidateCache;
278
+ private interruptedInit;
273
279
  }
274
280
  /**
275
281
  * The DI token for the Datasource interface.
@@ -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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"}
@@ -174,7 +174,8 @@ let DefaultSocket = class DefaultSocket {
174
174
  logger.warn(`Make sure the host url starts with wss:// or ws://`);
175
175
  return;
176
176
  }
177
- return new Promise((resolve) => {
177
+ const replacingLiveSocket = !!this.websocket && this.isConnected;
178
+ const connection = new Promise((resolve) => {
178
179
  var _a, _b, _c, _d;
179
180
  logger.info(`${this.isReconnecting ? 'Reconnecting' : 'Connecting'} to ${this.url}`);
180
181
  this.status.isConnecting = !this.isReconnecting;
@@ -184,7 +185,7 @@ let DefaultSocket = class DefaultSocket {
184
185
  this.cleanMessages();
185
186
  }
186
187
  (_b = this.socketSubscription) === null || _b === void 0 ? void 0 : _b.unsubscribe();
187
- const websocket = new WebSocketSubject({
188
+ const subject = new WebSocketSubject({
188
189
  url: this.url,
189
190
  openObserver: {
190
191
  next: () => {
@@ -197,16 +198,21 @@ let DefaultSocket = class DefaultSocket {
197
198
  },
198
199
  closeObserver: {
199
200
  next: (closeEvent) => {
200
- // A replaced socket closes late; its close must not touch its successor's state.
201
- if (this.websocket === websocket) {
202
- this.status.onClose(closeEvent);
203
- this.rejectPendingRequests(new ConnectTransportError('WebSocket connection closed before a reply arrived', {
204
- closeCode: closeEvent === null || closeEvent === void 0 ? void 0 : closeEvent.code,
205
- closeReason: closeEvent === null || closeEvent === void 0 ? void 0 : closeEvent.reason,
206
- }));
207
- if (this.isDisconnectedByServer) {
208
- logger.info(`WebSocket connection was closed due an error - Code: ${closeEvent.code} ${closeEvent.reason ? ' | Reason: ' + closeEvent.reason : ''}`);
209
- }
201
+ var _a;
202
+ // Replaced or reset: the status describes another socket, or none, so leave it alone,
203
+ // and settle with the outcome of the connect() that replaced this one, if any.
204
+ if (this.websocket !== subject) {
205
+ resolve((_a = this.connection) !== null && _a !== void 0 ? _a : false);
206
+ return;
207
+ }
208
+ this.status.onClose(closeEvent);
209
+ this.status.isConnecting = false;
210
+ this.rejectPendingRequests(new ConnectTransportError('WebSocket connection closed before a reply arrived', {
211
+ closeCode: closeEvent === null || closeEvent === void 0 ? void 0 : closeEvent.code,
212
+ closeReason: closeEvent === null || closeEvent === void 0 ? void 0 : closeEvent.reason,
213
+ }));
214
+ if (this.isDisconnectedByServer) {
215
+ logger.info(`WebSocket connection was closed due an error - Code: ${closeEvent.code} ${closeEvent.reason ? ' | Reason: ' + closeEvent.reason : ''}`);
210
216
  }
211
217
  resolve(this.isConnected);
212
218
  },
@@ -214,7 +220,7 @@ let DefaultSocket = class DefaultSocket {
214
220
  serializer: (object) => this.serializer.serialize(object),
215
221
  deserializer: (event) => this.serializer.deserialize(event),
216
222
  });
217
- this.websocket = websocket;
223
+ this.websocket = subject;
218
224
  const onNextMessage = (receivedMessage) => __awaiter(this, void 0, void 0, function* () {
219
225
  var _a;
220
226
  normaliseErrorCodes(receivedMessage);
@@ -306,6 +312,14 @@ let DefaultSocket = class DefaultSocket {
306
312
  });
307
313
  this.status.isConfigured = true;
308
314
  });
315
+ this.connection = connection;
316
+ if (replacingLiveSocket) {
317
+ // Report the gap only now that the replacement is installed, so a subscriber that reacts by
318
+ // connecting or disconnecting sees a consistent socket. Consumers re-subscribe on this one
319
+ // false → true transition, whichever order the old close and the new open arrive in.
320
+ this.status.isConnected = false;
321
+ }
322
+ return connection;
309
323
  }
310
324
  /**
311
325
  *
@@ -337,12 +351,12 @@ let DefaultSocket = class DefaultSocket {
337
351
  const result = yield tryRefreshSession();
338
352
  if (result === SessionRefreshResult.HANDLED_BY_OTHER_TAB) {
339
353
  // Session is already being reauthenticated on another tab, wait for it to finish
340
- onOtherTabReauthComplete(() => this.connect());
354
+ onOtherTabReauthComplete(() => this.connect(this.url, this.connectOptions, this.reconnectOptions));
341
355
  return;
342
356
  }
343
357
  if (result !== SessionRefreshResult.FAILED) {
344
358
  // Connect again to use new session token from obtained cookie
345
- yield this.connect();
359
+ yield this.connect(this.url, this.connectOptions, this.reconnectOptions);
346
360
  }
347
361
  });
348
362
  }
@@ -488,10 +502,14 @@ let DefaultSocket = class DefaultSocket {
488
502
  window.location.reload();
489
503
  }
490
504
  reset() {
505
+ var _a;
491
506
  this.status.isConnected = false;
492
507
  this.status.isConfigured = false;
508
+ // Closes a socket still connecting too, which completing the subject alone does not.
509
+ (_a = this.socketSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
493
510
  this.websocket && this.websocket.complete();
494
511
  this.websocket = null;
512
+ this.connection = undefined;
495
513
  this.cleanMessages();
496
514
  }
497
515
  cleanMessages() {
@@ -546,8 +564,18 @@ let DefaultSocket = class DefaultSocket {
546
564
  * We need to queue these outgoing messages to allow the consumers to subscribe in time. We should review the entire
547
565
  * setup with late subscribers in mind, as we can't say when they will actually subscribe. The impact is grids and
548
566
  * other components remaining stuck on Loading screens, as they miss the first `onMessage` reply.
567
+ *
568
+ * A stream torn down before its turn (subscribed and unsubscribed in one task) sends neither message: its
569
+ * DATA_LOGOFF would reach the server ahead of the DATA_LOGON, which would then open a subscription nothing handles.
549
570
  */
550
- DOM.queueUpdate(() => this.websocket.next(message));
571
+ let logonSent = false;
572
+ let tornDown = false;
573
+ DOM.queueUpdate(() => {
574
+ if (tornDown)
575
+ return;
576
+ logonSent = true;
577
+ this.websocket.next(message);
578
+ });
551
579
  /**
552
580
  * @privateRemarks
553
581
  * Running the data logoff from here makes more sense given the network monitor actor is optionally added.
@@ -567,8 +595,11 @@ let DefaultSocket = class DefaultSocket {
567
595
  },
568
596
  });
569
597
  return () => {
598
+ tornDown = true;
570
599
  messagesSubscription.unsubscribe();
571
- this.sendDataLogoff(message.SOURCE_REF);
600
+ if (logonSent) {
601
+ this.sendDataLogoff(message.SOURCE_REF);
602
+ }
572
603
  this.removeMessageHandler(message.SOURCE_REF);
573
604
  onComplete && onComplete();
574
605
  };
@@ -591,7 +622,8 @@ let DefaultSocket = class DefaultSocket {
591
622
  this.wsMessageHandlers.set(message.SOURCE_REF, new SocketMessageHandler(message, onMessage, onError, isSubscription));
592
623
  }
593
624
  sendDataLogoff(sourceRef) {
594
- this.send(this.messageBuilder.createDataLogoffMessage(sourceRef), false);
625
+ // Nothing awaits a logoff, and a closed socket has no server subscription left to end.
626
+ this.send(this.messageBuilder.createDataLogoffMessage(sourceRef), false).catch((error) => logger.debug(`DATA_LOGOFF not sent for SourceRef: ${sourceRef}`, error));
595
627
  }
596
628
  removeMessageHandler(sourceRef) {
597
629
  this.wsMessageHandlers.delete(sourceRef);
@@ -51,6 +51,9 @@ let DefaultDatasource = class DefaultDatasource {
51
51
  this.loadMoreCount = 0;
52
52
  this.readOnly = true;
53
53
  this._allParams = null;
54
+ // Counts init() and destroy() calls, so an init() or metadata fetch still waiting on the server
55
+ // when a later one runs can tell, and stop.
56
+ this.generation = 0;
54
57
  this.pollTrigger$ = new Subject();
55
58
  }
56
59
  triggerPoll() {
@@ -70,31 +73,61 @@ let DefaultDatasource = class DefaultDatasource {
70
73
  }
71
74
  init(options_1) {
72
75
  return __awaiter(this, arguments, void 0, function* (options, fetchMeta = this.fetchMetadataRequired, startStream = this.startStreamRequired) {
76
+ // The latest init() wins: one still waiting on the server stops, and takes this one's result.
77
+ const generation = (this.generation += 1);
78
+ const result = this.initialise(generation, options, fetchMeta, startStream).catch((error) => {
79
+ if (generation === this.generation)
80
+ throw error;
81
+ // A request that failed once this was superseded is not its failure any more: a socket that
82
+ // closes rejects every request still waiting for a reply.
83
+ logger.debug(`${options === null || options === void 0 ? void 0 : options.resourceName} datasource initialisation failed after it was superseded:`, error);
84
+ return this.interruptedInit(options === null || options === void 0 ? void 0 : options.resourceName);
85
+ });
86
+ this.latestInit = { generation, result };
87
+ return result;
88
+ });
89
+ }
90
+ initialise(generation, options, fetchMeta, startStream) {
91
+ return __awaiter(this, void 0, void 0, function* () {
73
92
  this.fetchMetadataRequired = fetchMeta;
74
93
  this.options = Object.assign(Object.assign({}, this.config.options), options);
75
94
  // Invalidate parameter cache when options change
76
95
  this.invalidateCache();
77
- const resourceName = this.options.resourceName;
96
+ // A destroy() or another init() may run while this waits on the server (an element leaving the
97
+ // document, a grid restarting or reloading): destroy() clears the options, init() replaces
98
+ // them. Read the name once, and stop once either has run, rather than go on to send requests
99
+ // and a DATA_LOGON with no resource name, or with another init()'s options.
100
+ const { resourceName } = this.options;
101
+ const superseded = () => generation !== this.generation;
78
102
  const connected = this.connect.isConnected || (yield this.connect.connect());
103
+ if (superseded())
104
+ return this.interruptedInit(resourceName);
79
105
  if (!connected) {
80
106
  logger.error(`Unable to connect to ${this.connect.host} to get ${resourceName} datasource`);
81
107
  this.reportStatus();
82
108
  return false;
83
109
  }
84
110
  const isValidResource = yield this.resources.isValidResource(resourceName);
111
+ if (superseded())
112
+ return this.interruptedInit(resourceName);
85
113
  if (!isValidResource) {
86
114
  logger.error(`${resourceName} datasource does not exist on ${this.connect.host}`);
87
115
  this.reportStatus();
88
116
  return false;
89
117
  }
90
- this.resourceType = yield this.resources.getResourceTypeFor(resourceName);
118
+ const resourceType = yield this.resources.getResourceTypeFor(resourceName);
119
+ if (superseded())
120
+ return this.interruptedInit(resourceName);
121
+ this.resourceType = resourceType;
91
122
  if (!this.resourceType) {
92
123
  logger.error(`Unable to get the resource type for ${resourceName} datasource from ${this.connect.host}`);
93
124
  this.reportStatus();
94
125
  return false;
95
126
  }
96
127
  if (this.fetchMetadataRequired) {
97
- yield this.fetchAndApplyMetadata(this.options.resourceName);
128
+ yield this.fetchAndApplyMetadata(resourceName);
129
+ if (superseded())
130
+ return this.interruptedInit(resourceName);
98
131
  // Invalidate cache again after metadata fetch as availableIndexes may have changed
99
132
  this._allParams = null;
100
133
  }
@@ -103,7 +136,9 @@ let DefaultDatasource = class DefaultDatasource {
103
136
  // Recreate pollTrigger$ so pollTriggerEvents work after destroy/reinit.
104
137
  // A completed Subject ignores next(), so we need a fresh one each init.
105
138
  this.pollTrigger$ = new Subject();
106
- this.stream = yield this.createStream();
139
+ // Synchronously: opening the stream queues its DATA_LOGON, and nothing may come between that
140
+ // and this datasource holding the stream.
141
+ this.stream = this.createStream();
107
142
  }
108
143
  logger.debug(`${resourceName} datasource initialization ${this.initialized ? `was successful.` : 'has failed.'}`);
109
144
  this.reportStatus();
@@ -113,7 +148,7 @@ let DefaultDatasource = class DefaultDatasource {
113
148
  startStream() {
114
149
  return __awaiter(this, void 0, void 0, function* () {
115
150
  if (!this.options.isSnapshot && this.stream === undefined) {
116
- this.stream = yield this.createStream();
151
+ this.stream = this.createStream();
117
152
  }
118
153
  });
119
154
  }
@@ -121,6 +156,7 @@ let DefaultDatasource = class DefaultDatasource {
121
156
  destroy() {
122
157
  var _a, _b;
123
158
  logger.debug('Datasource.destroy', (_a = this.options) === null || _a === void 0 ? void 0 : _a.resourceName);
159
+ this.generation += 1;
124
160
  if (this.commitResponseUnsubscribe) {
125
161
  this.commitResponseUnsubscribe();
126
162
  this.commitResponseUnsubscribe = undefined;
@@ -266,23 +302,21 @@ let DefaultDatasource = class DefaultDatasource {
266
302
  });
267
303
  }
268
304
  createStream() {
269
- return __awaiter(this, void 0, void 0, function* () {
270
- if (![ResourceType.DATASERVER, ResourceType.REQUEST_SERVER].includes(this.resourceType)) {
271
- throw new Error(`Streaming not supported for selected resource type: ${this.resourceType}`);
272
- }
273
- if (this.resourceType === ResourceType.DATASERVER) {
274
- return this.createDataserverStream();
275
- }
276
- logger.debug(`Creating fake stream by polling ${this.options.resourceName} REQUEST_SERVER`);
277
- return this.createReqRepStream();
278
- });
305
+ if (![ResourceType.DATASERVER, ResourceType.REQUEST_SERVER].includes(this.resourceType)) {
306
+ throw new Error(`Streaming not supported for selected resource type: ${this.resourceType}`);
307
+ }
308
+ if (this.resourceType === ResourceType.DATASERVER) {
309
+ return this.createDataserverStream();
310
+ }
311
+ logger.debug(`Creating fake stream by polling ${this.options.resourceName} REQUEST_SERVER`);
312
+ return this.createReqRepStream();
279
313
  }
280
314
  createDataserverStream() {
281
- return __awaiter(this, void 0, void 0, function* () {
282
- const onMessage = (message) => { };
283
- const onError = (error) => logger.error(withErrorCode(`${this.options.resourceName} stream failed`, error), error);
284
- return this.connect.stream(this.options.resourceName, onMessage, onError, this.dataserverOnlyParams);
285
- });
315
+ // Named now: the stream can outlive the options, which destroy() clears.
316
+ const { resourceName } = this.options;
317
+ const onMessage = (message) => { };
318
+ const onError = (error) => logger.error(withErrorCode(`${resourceName} stream failed`, error), error);
319
+ return this.connect.stream(resourceName, onMessage, onError, this.dataserverOnlyParams);
286
320
  }
287
321
  createReqRepStream() {
288
322
  this.commitResponseUnsubscribe = this.connectEvents.addCommitResponseListener((event) => {
@@ -319,9 +353,13 @@ let DefaultDatasource = class DefaultDatasource {
319
353
  fetchAndApplyMetadata(resourceName) {
320
354
  return __awaiter(this, void 0, void 0, function* () {
321
355
  var _a, _b, _c, _d;
356
+ const generation = this.generation;
322
357
  try {
323
- logger.debug(`Requesting metadata for ${this.options.resourceName} Datasource`);
324
- const meta = yield this.connect.getMetadata(this.options.resourceName);
358
+ logger.debug(`Requesting metadata for ${resourceName} Datasource`);
359
+ const meta = yield this.connect.getMetadata(resourceName);
360
+ // Superseded while the request was out: the metadata is no longer this datasource's.
361
+ if (generation !== this.generation)
362
+ return;
325
363
  if (meta) {
326
364
  this.availableIndexes = (_a = meta.INDEXES) !== null && _a !== void 0 ? _a : [];
327
365
  this.availableSortableFields = (_b = meta.SORTABLE_FIELDS) !== null && _b !== void 0 ? _b : [];
@@ -340,6 +378,12 @@ let DefaultDatasource = class DefaultDatasource {
340
378
  });
341
379
  }
342
380
  catch (e) {
381
+ // Nor is a failure: the request may have failed only because of the teardown (its socket
382
+ // closing on a reconnect, say).
383
+ if (generation !== this.generation) {
384
+ logger.debug(`Metadata Fetch for ${resourceName} failed after it was superseded:`, e);
385
+ return;
386
+ }
343
387
  logger.error(withErrorCode(`Metadata Fetch failed for ${resourceName}:`, e), e);
344
388
  this.status = this.normaliseStatus({
345
389
  isInitialized: false,
@@ -382,6 +426,15 @@ let DefaultDatasource = class DefaultDatasource {
382
426
  invalidateCache() {
383
427
  this._allParams = null;
384
428
  }
429
+ // What an init() that a later init() or destroy() interrupted resolves with: the result of the
430
+ // init() that has the datasource now, or false when destroy() came last, even after a later
431
+ // init() finished. A grid restarting destroys and initialises again straight away, and its
432
+ // first init() still waits on the server.
433
+ interruptedInit(resourceName) {
434
+ logger.debug(`${resourceName} datasource initialisation was superseded`);
435
+ const latest = this.latestInit;
436
+ return latest && latest.generation === this.generation ? latest.result : false;
437
+ }
385
438
  };
386
439
  __decorate([
387
440
  observable
@@ -7053,7 +7053,7 @@
7053
7053
  {
7054
7054
  "kind": "MethodSignature",
7055
7055
  "canonicalReference": "@genesislcap/foundation-comms!Datasource#init:member(1)",
7056
- "docComment": "/**\n * Initializes the datasource with the given options and fetches metadata if specified.\n *\n * @param options - The options to initialize the datasource with.\n *\n * @param fetchMeta - Optional flag to fetch metadata for the datasource. Defaults to true.\n *\n * @param startStream - Optional flag to start the data stream. Defaults to true.\n *\n * @returns A promise that resolves with a boolean indicating whether the initialization was successful.\n *\n * @public\n */\n",
7056
+ "docComment": "/**\n * Initializes the datasource with the given options and fetches metadata if specified.\n *\n * @param options - The options to initialize the datasource with.\n *\n * @param fetchMeta - Optional flag to fetch metadata for the datasource. Defaults to true.\n *\n * @param startStream - Optional flag to start the data stream. Defaults to true.\n *\n * @returns A promise that resolves with a boolean indicating whether the initialization was successful. When another `init()` or `destroy()` is called before it finishes, it sends nothing more and resolves with the result of the latest `init()`, or false when `destroy()` was called last, even if one of its requests then fails.\n *\n * @public\n */\n",
7057
7057
  "excerptTokens": [
7058
7058
  {
7059
7059
  "kind": "Content",
@@ -1217,6 +1217,8 @@ export declare interface Datasource extends DatasourceMetadata {
1217
1217
  * @param fetchMeta - Optional flag to fetch metadata for the datasource. Defaults to true.
1218
1218
  * @param startStream - Optional flag to start the data stream. Defaults to true.
1219
1219
  * @returns A promise that resolves with a boolean indicating whether the initialization was successful.
1220
+ * When another `init()` or `destroy()` is called before it finishes, it sends nothing more and resolves with the
1221
+ * result of the latest `init()`, or false when `destroy()` was called last, even if one of its requests then fails.
1220
1222
  */
1221
1223
  init(options: DatasourceOptions, fetchMeta?: boolean, startStream?: boolean): Promise<boolean>;
1222
1224
  /**
@@ -2299,6 +2301,8 @@ export declare class DefaultDatasource implements Datasource {
2299
2301
  resourceType: ResourceType;
2300
2302
  stream: SocketObservable<FilteredDataServerResult | RequestServerResult>;
2301
2303
  private _allParams;
2304
+ private generation;
2305
+ private latestInit?;
2302
2306
  constructor(connect: Connect, auth: Auth, resources: GenesisResources, config: DatasourceConfig, connectEvents: ConnectEvents);
2303
2307
  private pollTrigger$;
2304
2308
  private commitResponseUnsubscribe?;
@@ -2308,6 +2312,7 @@ export declare class DefaultDatasource implements Datasource {
2308
2312
  */
2309
2313
  validResourceName(resourceName: string): boolean;
2310
2314
  init(options: DatasourceOptions, fetchMeta?: boolean, startStream?: boolean): Promise<boolean>;
2315
+ private initialise;
2311
2316
  startStream(): Promise<void>;
2312
2317
  /** {@inheritDoc Datasource.destroy} */
2313
2318
  destroy(): void;
@@ -2348,6 +2353,7 @@ export declare class DefaultDatasource implements Datasource {
2348
2353
  */
2349
2354
  protected normaliseStatus(status: Partial<DatasourceStatus>): DatasourceStatus;
2350
2355
  private invalidateCache;
2356
+ private interruptedInit;
2351
2357
  }
2352
2358
 
2353
2359
  /**
@@ -2937,6 +2943,8 @@ export declare class DefaultSocket implements Socket {
2937
2943
  private connectOptions;
2938
2944
  private reconnectOptions;
2939
2945
  private socketSubscription;
2946
+ /** The latest connect()'s outcome, which a connect() it replaced settles with. */
2947
+ private connection;
2940
2948
  constructor(messageBuilder: MessageBuilder, session: Session, serializer: JSONSerializer, uuid: UUID, status: SocketStatus,
2941
2949
  /**
2942
2950
  * Temp putting the user in place to bridge the hasValidSession logic.
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.0",
4
+ "version": "15.84.2",
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.0",
79
- "@genesislcap/genx": "15.84.0",
80
- "@genesislcap/ts-builder": "15.84.0",
81
- "@genesislcap/uvu-playwright-builder": "15.84.0",
82
- "@genesislcap/vite-builder": "15.84.0",
83
- "@genesislcap/webpack-builder": "15.84.0",
78
+ "@genesislcap/foundation-testing": "15.84.2",
79
+ "@genesislcap/genx": "15.84.2",
80
+ "@genesislcap/ts-builder": "15.84.2",
81
+ "@genesislcap/uvu-playwright-builder": "15.84.2",
82
+ "@genesislcap/vite-builder": "15.84.2",
83
+ "@genesislcap/webpack-builder": "15.84.2",
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.0",
92
- "@genesislcap/foundation-logger": "15.84.0",
93
- "@genesislcap/foundation-user": "15.84.0",
94
- "@genesislcap/foundation-utils": "15.84.0",
95
- "@genesislcap/web-core": "15.84.0",
91
+ "@genesislcap/foundation-broadcast-channel": "15.84.2",
92
+ "@genesislcap/foundation-logger": "15.84.2",
93
+ "@genesislcap/foundation-user": "15.84.2",
94
+ "@genesislcap/foundation-utils": "15.84.2",
95
+ "@genesislcap/web-core": "15.84.2",
96
96
  "@microsoft/fast-element": "1.14.0",
97
97
  "@microsoft/fast-foundation": "2.50.0",
98
98
  "bowser": "^2.11.0",