@genesislcap/foundation-comms 15.82.0 → 15.84.0

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.
Files changed (46) hide show
  1. package/dist/dts/connect/connect.d.ts +22 -10
  2. package/dist/dts/connect/connect.d.ts.map +1 -1
  3. package/dist/dts/connect/connect.errors.d.ts +120 -0
  4. package/dist/dts/connect/connect.errors.d.ts.map +1 -0
  5. package/dist/dts/connect/connect.types.d.ts +27 -0
  6. package/dist/dts/connect/connect.types.d.ts.map +1 -1
  7. package/dist/dts/connect/errorCodes.d.ts +6 -0
  8. package/dist/dts/connect/errorCodes.d.ts.map +1 -0
  9. package/dist/dts/connect/http.connect.d.ts +14 -5
  10. package/dist/dts/connect/http.connect.d.ts.map +1 -1
  11. package/dist/dts/connect/http.d.ts +1 -0
  12. package/dist/dts/connect/http.d.ts.map +1 -1
  13. package/dist/dts/connect/httpTransport.d.ts +12 -6
  14. package/dist/dts/connect/httpTransport.d.ts.map +1 -1
  15. package/dist/dts/connect/index.d.ts +1 -0
  16. package/dist/dts/connect/index.d.ts.map +1 -1
  17. package/dist/dts/connect/message.d.ts +18 -1
  18. package/dist/dts/connect/message.d.ts.map +1 -1
  19. package/dist/dts/connect/networkFailure.d.ts +7 -0
  20. package/dist/dts/connect/networkFailure.d.ts.map +1 -0
  21. package/dist/dts/connect/reconnectStrategy.d.ts +2 -1
  22. package/dist/dts/connect/reconnectStrategy.d.ts.map +1 -1
  23. package/dist/dts/connect/requestLifecycle.d.ts +23 -0
  24. package/dist/dts/connect/requestLifecycle.d.ts.map +1 -0
  25. package/dist/dts/connect/socket.d.ts +14 -3
  26. package/dist/dts/connect/socket.d.ts.map +1 -1
  27. package/dist/dts/connect/socket.types.d.ts +5 -0
  28. package/dist/dts/connect/socket.types.d.ts.map +1 -1
  29. package/dist/dts/utils/error-code.d.ts +2 -1
  30. package/dist/dts/utils/error-code.d.ts.map +1 -1
  31. package/dist/esm/connect/connect.errors.js +192 -0
  32. package/dist/esm/connect/connect.js +56 -28
  33. package/dist/esm/connect/errorCodes.js +20 -0
  34. package/dist/esm/connect/http.connect.js +166 -74
  35. package/dist/esm/connect/http.js +22 -9
  36. package/dist/esm/connect/httpTransport.js +35 -12
  37. package/dist/esm/connect/index.js +1 -0
  38. package/dist/esm/connect/message.js +6 -1
  39. package/dist/esm/connect/networkFailure.js +12 -0
  40. package/dist/esm/connect/reconnectStrategy.js +4 -3
  41. package/dist/esm/connect/requestLifecycle.js +96 -0
  42. package/dist/esm/connect/socket.js +57 -34
  43. package/dist/esm/utils/error-code.js +6 -2
  44. package/dist/foundation-comms.api.json +1572 -34
  45. package/dist/foundation-comms.d.ts +238 -24
  46. package/package.json +12 -12
@@ -2,7 +2,7 @@ import { User } from '@genesislcap/foundation-user';
2
2
  import { JSONSerializer, UUID } from '@genesislcap/foundation-utils';
3
3
  import { Observable, Subject, Subscription } from 'rxjs';
4
4
  import { Session } from '../session';
5
- import { ConnectConfig } from './connect.types';
5
+ import { ConnectConfig, type ConnectRequestOptions } from './connect.types';
6
6
  import { Http } from './http';
7
7
  import { Message, MessageBuilder } from './message';
8
8
  import { SocketReconnectOptions } from './reconnectStrategy';
@@ -83,7 +83,17 @@ export interface Socket extends Omit<SocketStatus, 'serialize' | 'onClose' | 're
83
83
  * Disconnects the socket and clears all subscriptions
84
84
  */
85
85
  reset(): void;
86
- send<T>(message: Message<T | any>, needsHandling?: boolean): Promise<Message | any>;
86
+ /**
87
+ * Sends a message and resolves with its reply.
88
+ * @remarks
89
+ * Rejects with a `ConnectNackError` on a `MSG_NACK`, `LOGON_NACK` or `INVALID_INDEX_NACK`, a
90
+ * `ConnectTransportError` when the socket is closed or closes before the reply arrives, and a
91
+ * `ConnectTimeoutError` or `ConnectAbortError` per `options`.
92
+ * @param message - The message to send.
93
+ * @param needsHandling - Whether to wait for a reply. Without one the promise never settles. Default: true.
94
+ * @param options - Timeout and abort signal for the reply.
95
+ */
96
+ send<T>(message: Message<T | any>, needsHandling?: boolean, options?: ConnectRequestOptions): Promise<Message | any>;
87
97
  sendForStream<T>(message: Message<T | any>, onMessage: Function, onError: Function, onComplete?: Function): Observable<Message>;
88
98
  /**
89
99
  * Sends a message and returns an observable that emits messages received from the server.
@@ -179,7 +189,8 @@ export declare class DefaultSocket implements Socket {
179
189
  private reloadPage;
180
190
  reset(): void;
181
191
  private cleanMessages;
182
- send<T>(message: Message<T | any>, needsHandling?: boolean): Promise<Message | any>;
192
+ private rejectPendingRequests;
193
+ send<T>(message: Message<T | any>, needsHandling?: boolean, options?: ConnectRequestOptions): Promise<Message | any>;
183
194
  sendForStream<T>(message: Message<T | any>, onMessage: Function, onError: Function, onComplete?: Function): Observable<Message>;
184
195
  sendForStreamWithoutTeardown<T>(message: Message<T | any>, onMessage: Function, onError: Function): Observable<Message>;
185
196
  socketMessages: () => SocketSubject<Message>;
@@ -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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"}
@@ -55,6 +55,11 @@ export type SocketConnectOptions = {
55
55
  * The path to a proxy server to use for the connection.
56
56
  */
57
57
  proxyPath?: string;
58
+ /**
59
+ * Milliseconds to wait for a request/reply message's reply before rejecting with a
60
+ * `ConnectTimeoutError`. Unset (default) waits until the reply arrives or the socket closes.
61
+ */
62
+ requestTimeout?: number;
58
63
  /**
59
64
  * Opt in to a columnar dataserver payload encoding for all DATA_LOGON subscriptions, negotiated
60
65
  * transparently — every consumer (grids, React wrappers, FAST components, custom datasources)
@@ -1 +1 @@
1
- {"version":3,"file":"socket.types.d.ts","sourceRoot":"","sources":["../../../src/connect/socket.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACvD;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACvD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC;CACnC,CAAC"}
1
+ {"version":3,"file":"socket.types.d.ts","sourceRoot":"","sources":["../../../src/connect/socket.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEpC;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACvD;;;OAGG;IACH,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IACvD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;;;;;;;;OAWG;IACH,kBAAkB,CAAC,EAAE,YAAY,CAAC;CACnC,CAAC"}
@@ -4,7 +4,8 @@
4
4
  * different failures apart without sending the NACK.
5
5
  *
6
6
  * @param message - The log message.
7
- * @param source - A NACK message, or one of its `ERROR` entries.
7
+ * @param source - A NACK message, one of its `ERROR` entries, or an error carrying the NACK as
8
+ * `receivedMessage` or `body`.
8
9
  * @internal
9
10
  */
10
11
  export declare const withErrorCode: (message: string, source: unknown) => string;
@@ -1 +1 @@
1
- {"version":3,"file":"error-code.d.ts","sourceRoot":"","sources":["../../../src/utils/error-code.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,QAAQ,OAAO,KAAG,MAGhE,CAAC"}
1
+ {"version":3,"file":"error-code.d.ts","sourceRoot":"","sources":["../../../src/utils/error-code.ts"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,QAAQ,OAAO,KAAG,MAGhE,CAAC"}
@@ -0,0 +1,192 @@
1
+ import { StatusCodes } from 'http-status-codes';
2
+ import { normaliseErrorCodes } from './errorCodes';
3
+ /**
4
+ * Base class of the errors Connect rejects with. Narrow with `instanceof` on a subclass or by `kind`.
5
+ * @public
6
+ */
7
+ export class ConnectError extends Error {
8
+ constructor(message, cause) {
9
+ super(message);
10
+ Object.setPrototypeOf(this, new.target.prototype);
11
+ if (cause !== undefined) {
12
+ this.cause = cause;
13
+ }
14
+ }
15
+ }
16
+ const nackText = (message) => {
17
+ var _a;
18
+ const type = (_a = message === null || message === void 0 ? void 0 : message.MESSAGE_TYPE) !== null && _a !== void 0 ? _a : 'NACK';
19
+ const texts = (Array.isArray(message === null || message === void 0 ? void 0 : message.ERROR) ? message.ERROR : [])
20
+ .map((error) => error === null || error === void 0 ? void 0 : error.TEXT)
21
+ .filter(Boolean);
22
+ return texts.length ? `${type}: ${texts.join('; ')}` : type;
23
+ };
24
+ /**
25
+ * The server rejected the request with a NACK.
26
+ * @remarks
27
+ * Keeps `receivedMessage` and `sentMessage`, the shape Connect rejected NACKs with before.
28
+ * @public
29
+ */
30
+ export class ConnectNackError extends ConnectError {
31
+ get kind() {
32
+ return 'nack';
33
+ }
34
+ constructor(
35
+ /** The NACK the server replied with. */
36
+ receivedMessage,
37
+ /** The message that was NACKed. */
38
+ sentMessage) {
39
+ super(nackText(normaliseErrorCodes(receivedMessage)));
40
+ this.receivedMessage = receivedMessage;
41
+ this.sentMessage = sentMessage;
42
+ this.name = 'ConnectNackError';
43
+ }
44
+ /**
45
+ * The NACK's `MESSAGE_TYPE`: `MSG_NACK`, `LOGON_NACK`, `INVALID_INDEX_NACK`, or `EVENT_NACK` when
46
+ * `rejectEventNack` is set.
47
+ */
48
+ get messageType() {
49
+ var _a;
50
+ return (_a = this.receivedMessage) === null || _a === void 0 ? void 0 : _a.MESSAGE_TYPE;
51
+ }
52
+ /** The NACK's `ERROR` entries. */
53
+ get errors() {
54
+ var _a;
55
+ return Array.isArray((_a = this.receivedMessage) === null || _a === void 0 ? void 0 : _a.ERROR) ? this.receivedMessage.ERROR : [];
56
+ }
57
+ /** The NACK's `WARNING` entries. */
58
+ get warnings() {
59
+ var _a;
60
+ return Array.isArray((_a = this.receivedMessage) === null || _a === void 0 ? void 0 : _a.WARNING) ? this.receivedMessage.WARNING : [];
61
+ }
62
+ /** The `CODE` of the first `ERROR` entry. */
63
+ get code() {
64
+ var _a;
65
+ return (_a = this.errors[0]) === null || _a === void 0 ? void 0 : _a.CODE;
66
+ }
67
+ }
68
+ /**
69
+ * The connection closed or failed before a reply arrived, or a network error stopped an HTTP request.
70
+ * @public
71
+ */
72
+ export class ConnectTransportError extends ConnectError {
73
+ get kind() {
74
+ return 'transport';
75
+ }
76
+ constructor(message, { closeCode, closeReason, cause, } = {}) {
77
+ super(message, cause);
78
+ this.name = 'ConnectTransportError';
79
+ this.closeCode = closeCode;
80
+ this.closeReason = closeReason;
81
+ }
82
+ }
83
+ /**
84
+ * An HTTP request failed with a non-2xx status.
85
+ * @public
86
+ */
87
+ export class ConnectHttpError extends ConnectError {
88
+ get kind() {
89
+ return 'http';
90
+ }
91
+ constructor(
92
+ /** The HTTP status code. */
93
+ status,
94
+ /** The HTTP status text. */
95
+ statusText = '',
96
+ /** The response body, parsed as JSON when it is JSON. It may hold a Genesis NACK. */
97
+ body) {
98
+ super(`HTTP error: ${status} ${statusText}`.trim());
99
+ this.status = status;
100
+ this.statusText = statusText;
101
+ this.body = body;
102
+ this.name = 'ConnectHttpError';
103
+ }
104
+ }
105
+ /**
106
+ * No reply arrived within the request's timeout.
107
+ * @public
108
+ */
109
+ export class ConnectTimeoutError extends ConnectError {
110
+ get kind() {
111
+ return 'timeout';
112
+ }
113
+ constructor(
114
+ /** The timeout that elapsed, in milliseconds. */
115
+ timeout) {
116
+ super(`Request timed out after ${timeout} ms`);
117
+ this.timeout = timeout;
118
+ this.name = 'ConnectTimeoutError';
119
+ }
120
+ }
121
+ /**
122
+ * The request's `AbortSignal` aborted before a reply arrived.
123
+ * @public
124
+ */
125
+ export class ConnectAbortError extends ConnectError {
126
+ get kind() {
127
+ return 'abort';
128
+ }
129
+ constructor(
130
+ /** The signal's abort reason. */
131
+ reason) {
132
+ super('Request aborted');
133
+ this.reason = reason;
134
+ this.name = 'ConnectAbortError';
135
+ }
136
+ }
137
+ const RETRYABLE_STATUSES = new Set([
138
+ StatusCodes.REQUEST_TIMEOUT,
139
+ StatusCodes.TOO_MANY_REQUESTS,
140
+ StatusCodes.INTERNAL_SERVER_ERROR,
141
+ StatusCodes.BAD_GATEWAY,
142
+ StatusCodes.SERVICE_UNAVAILABLE,
143
+ StatusCodes.GATEWAY_TIMEOUT,
144
+ ]);
145
+ // Genesis maps deterministic failures such as DUPLICATE_KEY to 500, so a NACK's 500 is final.
146
+ const RETRYABLE_NACK_STATUSES = new Set([
147
+ StatusCodes.REQUEST_TIMEOUT,
148
+ StatusCodes.TOO_MANY_REQUESTS,
149
+ StatusCodes.SERVICE_UNAVAILABLE,
150
+ StatusCodes.GATEWAY_TIMEOUT,
151
+ ]);
152
+ const TRANSIENT_ERROR_CODES = {
153
+ UNAVAILABLE: StatusCodes.SERVICE_UNAVAILABLE,
154
+ OPERATION_TIMEOUT: StatusCodes.REQUEST_TIMEOUT,
155
+ MAX_LOGON_LIMIT: StatusCodes.TOO_MANY_REQUESTS,
156
+ };
157
+ // Read by shape, not instanceof, so errors from another copy of this package are understood too.
158
+ const nackOf = (error) => {
159
+ var _a;
160
+ const source = error;
161
+ const nack = ((_a = source === null || source === void 0 ? void 0 : source.receivedMessage) !== null && _a !== void 0 ? _a : source === null || source === void 0 ? void 0 : source.body);
162
+ return Array.isArray(nack === null || nack === void 0 ? void 0 : nack.ERROR) ? nack : undefined;
163
+ };
164
+ const statusOf = (entry) => {
165
+ var _a;
166
+ const status = Number.parseInt(String((_a = entry === null || entry === void 0 ? void 0 : entry.STATUS_CODE) !== null && _a !== void 0 ? _a : entry === null || entry === void 0 ? void 0 : entry.CODE), 10);
167
+ return Number.isFinite(status) ? status : TRANSIENT_ERROR_CODES[String(entry === null || entry === void 0 ? void 0 : entry.CODE)];
168
+ };
169
+ /**
170
+ * Whether a request failed for a transient reason, so sending it again may succeed: a closed
171
+ * connection, a network error, a timeout, an HTTP 408, 429, 500, 502, 503 or 504 without a Genesis
172
+ * NACK, or a NACK whose errors are all 408, 429, 503 or 504, such as `UNAVAILABLE`.
173
+ * @remarks
174
+ * Other NACKs, aborts and other HTTP statuses are not retryable. A NACK without a status on every
175
+ * error falls back to the HTTP status. Retry only idempotent requests: a commit that timed out may
176
+ * still have been applied.
177
+ * @param error - The error a request rejected with.
178
+ * @public
179
+ */
180
+ export function isRetryable(error) {
181
+ var _a, _b;
182
+ const kind = error === null || error === void 0 ? void 0 : error.kind;
183
+ if (kind === 'transport' || kind === 'timeout') {
184
+ return true;
185
+ }
186
+ const statuses = ((_b = (_a = nackOf(error)) === null || _a === void 0 ? void 0 : _a.ERROR) !== null && _b !== void 0 ? _b : []).map(statusOf);
187
+ if (statuses.length && statuses.every((status) => status !== undefined)) {
188
+ return statuses.every((status) => RETRYABLE_NACK_STATUSES.has(status));
189
+ }
190
+ const status = error === null || error === void 0 ? void 0 : error.status;
191
+ return typeof status === 'number' && RETRYABLE_STATUSES.has(status);
192
+ }
@@ -6,11 +6,13 @@ import { scan } from 'rxjs';
6
6
  import { MetaCache } from '../metadata';
7
7
  import { logger } from '../utils';
8
8
  import { withErrorCode } from '../utils/error-code';
9
+ import { ConnectNackError } from './connect.errors';
9
10
  import { ConnectEventsEmitter } from './connect.events';
10
11
  import { ConnectConfig } from './connect.types';
11
12
  import { HttpConnect } from './http.connect';
12
13
  import { HttpTransport } from './httpTransport';
13
14
  import { buildRequestCacheKey, EventMessageType, MessageBuilder, } from './message';
15
+ import { InFlightRequests, rejectEventNackIfAsked } from './requestLifecycle';
14
16
  import { resourceNameOf, ScdbStreamDecoder } from './scdbStreamDecoder';
15
17
  import { Socket } from './socket';
16
18
  import { updateState } from './updateState';
@@ -41,7 +43,8 @@ let DefaultConnect = class DefaultConnect {
41
43
  this.config = config;
42
44
  this.transport = transport;
43
45
  this.isWorking = false;
44
- this.inFlightRequests = new Map();
46
+ this.inFlightMetadata = new InFlightRequests();
47
+ this.inFlightRequests = new InFlightRequests();
45
48
  // One app-level flag opts every dataserver subscription into a columnar encoding, negotiated
46
49
  // transparently. Request side here; the decode side is handled in the socket.
47
50
  const encoding = (_a = this.config.connect) === null || _a === void 0 ? void 0 : _a.dataserverEncoding;
@@ -73,11 +76,11 @@ let DefaultConnect = class DefaultConnect {
73
76
  get httpHost() {
74
77
  return this.transport.toHttpHost(this.socket.host);
75
78
  }
76
- requestOverHttp(requestMessage) {
79
+ requestOverHttp(requestMessage, options) {
77
80
  return __awaiter(this, void 0, void 0, function* () {
78
81
  const resourceName = resourceNameOf(requestMessage);
79
82
  this.httpScdbDecoder.prepareRequest(requestMessage);
80
- const response = yield this.transport.requestServer(this.httpHost, requestMessage);
83
+ const response = yield this.transport.requestServer(this.httpHost, requestMessage, options);
81
84
  this.httpScdbDecoder.onMessage(response, resourceName);
82
85
  return response;
83
86
  });
@@ -87,10 +90,10 @@ let DefaultConnect = class DefaultConnect {
87
90
  * `useHttpReqRep` is active and falling back to the WebSocket otherwise.
88
91
  * @internal
89
92
  */
90
- sendReqRep(message) {
93
+ sendReqRep(message, options) {
91
94
  return this.useHttpReqRep
92
- ? this.transport.post(this.httpHost, message)
93
- : this.socket.send(message);
95
+ ? this.transport.post(this.httpHost, message, options)
96
+ : this.socket.send(message, true, options);
94
97
  }
95
98
  /**
96
99
  * @deprecated - Please reference `User` from `@genesislcap/foundation-user` instead.
@@ -98,8 +101,8 @@ let DefaultConnect = class DefaultConnect {
98
101
  setValidSession(valid) {
99
102
  logger.deprecated('setValidSession', 'Please refrain from calling this API as this state is managed internally.', '15.0.0');
100
103
  }
101
- send(message, needsHandling) {
102
- return this.socket.send(message, needsHandling);
104
+ send(message, needsHandling, options) {
105
+ return this.socket.send(message, needsHandling, options);
103
106
  }
104
107
  connect() {
105
108
  return __awaiter(this, arguments, void 0, function* (host = GENESIS_SOCKET_URL) {
@@ -178,21 +181,29 @@ let DefaultConnect = class DefaultConnect {
178
181
  });
179
182
  }
180
183
  getMetadata(resourceName_1) {
181
- return __awaiter(this, arguments, void 0, function* (resourceName, useCache = true) {
182
- var _a;
184
+ return __awaiter(this, arguments, void 0, function* (resourceName, useCache = true, options) {
183
185
  if (useCache) {
184
186
  if (this.metaCache.hasMetadataFor(resourceName)) {
185
187
  logger.debug(`Cached metadata retrieved for ${resourceName}`);
186
188
  return this.metaCache.getMetadataFor(resourceName);
187
189
  }
188
190
  }
191
+ if (this.inFlightMetadata.has(resourceName)) {
192
+ logger.debug(`In-flight metadata request collapsed for ${resourceName}`);
193
+ }
194
+ return this.inFlightMetadata.join(resourceName, (signal) => this.fetchMetadata(resourceName, signal), this.callerOptions(options));
195
+ });
196
+ }
197
+ fetchMetadata(resourceName, signal) {
198
+ return __awaiter(this, void 0, void 0, function* () {
199
+ var _a;
189
200
  const metaRequestMessage = this.messageBuilder.createMetaRequestMessage(resourceName);
190
201
  logger.debug(`${metaRequestMessage.MESSAGE_TYPE} (metadata) message created -> `, metaRequestMessage);
191
202
  let details;
192
203
  let error;
193
204
  try {
194
205
  this.isWorking = true;
195
- const metaResponse = yield this.sendReqRep(metaRequestMessage);
206
+ const metaResponse = yield this.sendReqRep(metaRequestMessage, { timeout: 0, signal });
196
207
  details = (_a = metaResponse === null || metaResponse === void 0 ? void 0 : metaResponse.DETAILS) !== null && _a !== void 0 ? _a : {};
197
208
  if (Object.keys(details).length) {
198
209
  this.metaCache.setMetadataFor(resourceName, details);
@@ -201,7 +212,7 @@ let DefaultConnect = class DefaultConnect {
201
212
  catch (e) {
202
213
  error = e;
203
214
  logger.error(withErrorCode(`Metadata request failed for ${resourceName}`, e), e);
204
- throw e instanceof Error ? e : new Error(String(e));
215
+ throw asError(e);
205
216
  }
206
217
  finally {
207
218
  this.events.onMetadataEvent(resourceName, metaRequestMessage, error);
@@ -238,33 +249,42 @@ let DefaultConnect = class DefaultConnect {
238
249
  return jsonSchema;
239
250
  });
240
251
  }
252
+ /**
253
+ * How long one caller of a shared request waits: its own timeout, else `requestTimeout` on the
254
+ * socket. The shared send itself has no timeout.
255
+ */
256
+ callerOptions(options) {
257
+ var _a, _b;
258
+ const defaultTimeout = this.useHttpReqRep ? undefined : (_a = this.config.connect) === null || _a === void 0 ? void 0 : _a.requestTimeout;
259
+ return { timeout: (_b = options === null || options === void 0 ? void 0 : options.timeout) !== null && _b !== void 0 ? _b : defaultTimeout, signal: options === null || options === void 0 ? void 0 : options.signal };
260
+ }
241
261
  request(resourceName_1, params_1) {
242
- return __awaiter(this, arguments, void 0, function* (resourceName, params, useCache = false) {
262
+ return __awaiter(this, arguments, void 0, function* (resourceName, params, useCache = false, options) {
243
263
  const cacheKey = buildRequestCacheKey(resourceName, params);
244
264
  if (useCache && this.metaCache.hasRequestFor(cacheKey)) {
245
265
  logger.debug(`Cached request response retrieved for ${cacheKey}`);
246
266
  return this.metaCache.getRequestFor(cacheKey);
247
267
  }
248
- const inFlight = this.inFlightRequests.get(cacheKey);
249
- if (inFlight) {
268
+ if (this.inFlightRequests.has(cacheKey)) {
250
269
  logger.debug(`In-flight request collapsed for ${cacheKey}`);
251
- return inFlight;
252
270
  }
253
- const requestMessage = this.messageBuilder.createRequestMessage(resourceName, params);
254
- logger.debug(`${requestMessage.MESSAGE_TYPE} (request server) message created -> `, requestMessage);
255
- // REQUEST_SERVER messages go out as a GET (query-string encoded) over HTTP, mirroring the
256
- // HTTP-only Connect, otherwise they travel over the socket.
257
- const promise = (this.useHttpReqRep ? this.requestOverHttp(requestMessage) : this.socket.send(requestMessage)).finally(() => {
258
- this.inFlightRequests.delete(cacheKey);
259
- });
260
- this.inFlightRequests.set(cacheKey, promise);
261
- const response = yield promise;
271
+ const response = yield this.inFlightRequests.join(cacheKey, (signal) => this.sendRequest(resourceName, params, signal), this.callerOptions(options));
262
272
  if (useCache && response) {
263
273
  this.metaCache.setRequestFor(cacheKey, response);
264
274
  }
265
275
  return response;
266
276
  });
267
277
  }
278
+ sendRequest(resourceName, params, signal) {
279
+ const requestMessage = this.messageBuilder.createRequestMessage(resourceName, params);
280
+ logger.debug(`${requestMessage.MESSAGE_TYPE} (request server) message created -> `, requestMessage);
281
+ const options = { timeout: 0, signal };
282
+ // REQUEST_SERVER messages go out as a GET (query-string encoded) over HTTP, mirroring the
283
+ // HTTP-only Connect, otherwise they travel over the socket.
284
+ return this.useHttpReqRep
285
+ ? this.requestOverHttp(requestMessage, options)
286
+ : this.socket.send(requestMessage, true, options);
287
+ }
268
288
  getAvailableResources(params_1) {
269
289
  return __awaiter(this, arguments, void 0, function* (params, useCache = true) {
270
290
  if (useCache) {
@@ -280,15 +300,15 @@ let DefaultConnect = class DefaultConnect {
280
300
  return resources;
281
301
  });
282
302
  }
283
- commitEvent(eventName, params) {
303
+ commitEvent(eventName, params, options) {
284
304
  return __awaiter(this, void 0, void 0, function* () {
285
305
  const msg = this.messageBuilder.createCommitMessage(eventName, params);
286
306
  logger.debug(`${msg.MESSAGE_TYPE} (commit) message created -> `, msg);
287
- const promise = this.sendReqRep(msg);
307
+ const promise = this.sendReqRep(msg, options);
288
308
  this.events.onCommitEvent(eventName, msg);
289
309
  return promise.then((response) => {
290
310
  this.events.onCommitResponseEvent(eventName, response);
291
- return response;
311
+ return rejectEventNackIfAsked(response, msg, options);
292
312
  });
293
313
  });
294
314
  }
@@ -305,6 +325,14 @@ DefaultConnect = __decorate([
305
325
  __param(5, HttpTransport)
306
326
  ], DefaultConnect);
307
327
  export { DefaultConnect };
328
+ const isNackShaped = (error) => typeof (error === null || error === void 0 ? void 0 : error.receivedMessage) === 'object';
329
+ const asError = (error) => {
330
+ if (error instanceof Error)
331
+ return error;
332
+ if (isNackShaped(error))
333
+ return new ConnectNackError(error.receivedMessage, error.sentMessage);
334
+ return new Error(String(error));
335
+ };
308
336
  const useHttpConnect = FORCE_HTTP === 'true' || isFeatureActivated('forceHttp');
309
337
  /**
310
338
  * The DI token for the Connect interface (WS-only).
@@ -0,0 +1,20 @@
1
+ const stringifyCodes = (entries) => {
2
+ if (!Array.isArray(entries))
3
+ return;
4
+ entries.forEach((entry) => {
5
+ if (typeof (entry === null || entry === void 0 ? void 0 : entry.CODE) === 'number')
6
+ entry.CODE = String(entry.CODE);
7
+ if (typeof (entry === null || entry === void 0 ? void 0 : entry.STATUS_CODE) === 'number')
8
+ entry.STATUS_CODE = String(entry.STATUS_CODE);
9
+ });
10
+ };
11
+ /**
12
+ * Converts the numeric `CODE`s the router puts on its own errors, such as `404`, to strings, as
13
+ * `MessageError` declares them. Changes the message in place and returns it.
14
+ */
15
+ export const normaliseErrorCodes = (message) => {
16
+ const { ERROR, WARNING } = (message !== null && message !== void 0 ? message : {});
17
+ stringifyCodes(ERROR);
18
+ stringifyCodes(WARNING);
19
+ return message;
20
+ };