@outfoxx/sunday 1.1.0-beta.20 → 1.1.0-beta.22
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/build/esm/fetch-event-source.d.ts +4 -1
- package/build/esm/fetch-event-source.js +30 -18
- package/build/esm/fetch-event-source.js.map +1 -1
- package/build/esm/logger.d.ts +9 -0
- package/build/esm/logger.js +22 -1
- package/build/esm/logger.js.map +1 -1
- package/build/esm/media-type-codecs/cbor-encoder.js +1 -1
- package/build/esm/media-type-codecs/cbor-encoder.js.map +1 -1
- package/build/esnext/fetch-event-source.d.ts +4 -1
- package/build/esnext/fetch-event-source.js +30 -18
- package/build/esnext/fetch-event-source.js.map +1 -1
- package/build/esnext/logger.d.ts +9 -0
- package/build/esnext/logger.js +22 -1
- package/build/esnext/logger.js.map +1 -1
- package/build/esnext/media-type-codecs/cbor-encoder.js +1 -1
- package/build/esnext/media-type-codecs/cbor-encoder.js.map +1 -1
- package/build/main/fetch-event-source.d.ts +4 -1
- package/build/main/fetch-event-source.js +30 -18
- package/build/main/fetch-event-source.js.map +1 -1
- package/build/main/logger.d.ts +9 -0
- package/build/main/logger.js +24 -0
- package/build/main/logger.js.map +1 -1
- package/build/main/media-type-codecs/cbor-encoder.js +1 -1
- package/build/main/media-type-codecs/cbor-encoder.js.map +1 -1
- package/package.json +1 -1
- package/src/fetch-event-source.ts +52 -25
- package/src/logger.ts +26 -0
- package/src/media-type-codecs/cbor-encoder.ts +1 -1
|
@@ -7,7 +7,8 @@ export interface FetchEventSource {
|
|
|
7
7
|
}
|
|
8
8
|
export declare class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
9
9
|
private static LAST_EVENT_ID_HEADER;
|
|
10
|
-
private static
|
|
10
|
+
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
|
+
private static RETRY_EXPONENT;
|
|
11
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
12
13
|
private static EVENT_TIMEOUT_CHECK_INTERVAL;
|
|
13
14
|
CONNECTING: number;
|
|
@@ -42,6 +43,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
42
43
|
private internalConnect;
|
|
43
44
|
close(): void;
|
|
44
45
|
private internalClose;
|
|
46
|
+
private updateLastEventReceived;
|
|
45
47
|
private startEventTimeoutCheck;
|
|
46
48
|
private stopEventTimeoutCheck;
|
|
47
49
|
private checkEventTimeout;
|
|
@@ -50,6 +52,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
50
52
|
private receivedError;
|
|
51
53
|
private receivedComplete;
|
|
52
54
|
private scheduleReconnect;
|
|
55
|
+
private static calculateRetryTime;
|
|
53
56
|
private clearReconnect;
|
|
54
57
|
private dispatchParsedEvent;
|
|
55
58
|
fireErrorEvent(error: unknown): void;
|
|
@@ -15,6 +15,7 @@ import { EMPTY, map, of, Subscription, switchMap } from 'rxjs';
|
|
|
15
15
|
import { fromReadableStreamLike } from 'rxjs/internal/observable/innerFrom';
|
|
16
16
|
import { EventParser } from './event-parser';
|
|
17
17
|
import { validate } from './fetch';
|
|
18
|
+
import { levelLogger, LogLevel } from './logger';
|
|
18
19
|
import { MediaType } from './media-type';
|
|
19
20
|
import { unknownGet, unknownSet } from './util/any';
|
|
20
21
|
export class FetchEventSource extends EventTarget {
|
|
@@ -30,14 +31,13 @@ export class FetchEventSource extends EventTarget {
|
|
|
30
31
|
this.onopen = null;
|
|
31
32
|
this.internalRetryTime = 100;
|
|
32
33
|
this.retryAttempt = 0;
|
|
33
|
-
this.connectionAttemptTime = 0;
|
|
34
34
|
this.lastEventReceivedTime = 0;
|
|
35
35
|
this.eventParser = new EventParser();
|
|
36
36
|
//
|
|
37
37
|
// Event Dispatch
|
|
38
38
|
//
|
|
39
39
|
this.dispatchParsedEvent = (eventInfo) => {
|
|
40
|
-
this.
|
|
40
|
+
this.updateLastEventReceived();
|
|
41
41
|
if (eventInfo.retry) {
|
|
42
42
|
const retryTime = Number.parseInt(eventInfo.retry, 10);
|
|
43
43
|
if (Number.isSafeInteger(retryTime)) {
|
|
@@ -45,7 +45,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
45
45
|
this.internalRetryTime = retryTime;
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
-
this.logger?.
|
|
48
|
+
this.logger?.warn?.('ignoring invalid retry timeout event', {
|
|
49
49
|
eventInfo,
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -55,6 +55,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
55
55
|
eventInfo.event == null &&
|
|
56
56
|
eventInfo.data == null) {
|
|
57
57
|
// skip empty event
|
|
58
|
+
this.logger?.trace?.('skipping empty event');
|
|
58
59
|
return;
|
|
59
60
|
}
|
|
60
61
|
// Save last-event-id if the new id is valid
|
|
@@ -64,7 +65,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
64
65
|
this.lastEventId = eventInfo.id;
|
|
65
66
|
}
|
|
66
67
|
else {
|
|
67
|
-
this.logger?.
|
|
68
|
+
this.logger?.warn?.('event id contains NULL byte, unable to use for last-event-id');
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
// Dispatch event
|
|
@@ -83,7 +84,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
83
84
|
this.eventTimeout =
|
|
84
85
|
eventSourceInit?.eventTimeout ??
|
|
85
86
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
|
|
86
|
-
this.logger = eventSourceInit?.logger;
|
|
87
|
+
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
87
88
|
}
|
|
88
89
|
get retryTime() {
|
|
89
90
|
return this.internalRetryTime;
|
|
@@ -159,7 +160,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
159
160
|
if (this.readyState === this.CLOSED) {
|
|
160
161
|
return;
|
|
161
162
|
}
|
|
162
|
-
this.logger?.debug?.('
|
|
163
|
+
this.logger?.debug?.('closing');
|
|
163
164
|
this.readyState = this.CLOSED;
|
|
164
165
|
this.internalClose();
|
|
165
166
|
}
|
|
@@ -172,12 +173,15 @@ export class FetchEventSource extends EventTarget {
|
|
|
172
173
|
//
|
|
173
174
|
// Event Timeout
|
|
174
175
|
//
|
|
176
|
+
updateLastEventReceived(time = Date.now()) {
|
|
177
|
+
this.lastEventReceivedTime = time;
|
|
178
|
+
}
|
|
175
179
|
startEventTimeoutCheck(lastEventReceivedTime) {
|
|
176
180
|
this.stopEventTimeoutCheck();
|
|
177
181
|
if (!this.eventTimeout) {
|
|
178
182
|
return;
|
|
179
183
|
}
|
|
180
|
-
this.lastEventReceivedTime
|
|
184
|
+
this.updateLastEventReceived(lastEventReceivedTime);
|
|
181
185
|
this.logger?.trace?.('starting event timeout checks');
|
|
182
186
|
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL * 1000);
|
|
183
187
|
}
|
|
@@ -216,7 +220,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
216
220
|
this.scheduleReconnect();
|
|
217
221
|
return;
|
|
218
222
|
}
|
|
219
|
-
this.logger?.
|
|
223
|
+
this.logger?.info?.('opened');
|
|
220
224
|
this.connectionOrigin = response.url;
|
|
221
225
|
this.retryAttempt = 0;
|
|
222
226
|
this.readyState = this.OPEN;
|
|
@@ -261,21 +265,28 @@ export class FetchEventSource extends EventTarget {
|
|
|
261
265
|
//
|
|
262
266
|
scheduleReconnect() {
|
|
263
267
|
this.internalClose();
|
|
268
|
+
const lastConnectionTime = this.connectionAttemptTime
|
|
269
|
+
? Date.now() - this.connectionAttemptTime
|
|
270
|
+
: 0;
|
|
271
|
+
const retryDelay = FetchEventSource.calculateRetryTime(this.retryAttempt, this.retryTime, lastConnectionTime);
|
|
272
|
+
this.retryAttempt++;
|
|
273
|
+
this.readyState = this.CONNECTING;
|
|
274
|
+
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
275
|
+
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
276
|
+
}
|
|
277
|
+
static calculateRetryTime(retryAttempt, retryTime, lastConnectTime) {
|
|
278
|
+
const retryMultiplier = Math.min(retryAttempt, this.MAX_RETRY_TIME_MULTIPLIER);
|
|
264
279
|
// calculate total delay
|
|
265
|
-
|
|
266
|
-
let retryDelay = Math.min(this.retryTime + backOffDelay, this.retryTime * FetchEventSource.MAX_RETRY_TIME_MULTIPLE);
|
|
280
|
+
let retryDelay = Math.pow(retryMultiplier, this.RETRY_EXPONENT) * retryTime;
|
|
267
281
|
// Adjust delay by amount of time last connect
|
|
268
282
|
// cycle took, except on the first attempt
|
|
269
|
-
if (
|
|
270
|
-
|
|
283
|
+
if (retryAttempt > 0) {
|
|
284
|
+
retryDelay -= lastConnectTime;
|
|
271
285
|
// Ensure delay is at least as large as
|
|
272
286
|
// minimum retry time interval
|
|
273
|
-
retryDelay = Math.max(retryDelay
|
|
287
|
+
retryDelay = Math.max(retryDelay, retryTime);
|
|
274
288
|
}
|
|
275
|
-
|
|
276
|
-
this.readyState = this.CONNECTING;
|
|
277
|
-
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
278
|
-
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
289
|
+
return retryDelay;
|
|
279
290
|
}
|
|
280
291
|
clearReconnect() {
|
|
281
292
|
if (this.reconnectTimeoutHandle) {
|
|
@@ -290,7 +301,8 @@ export class FetchEventSource extends EventTarget {
|
|
|
290
301
|
}
|
|
291
302
|
}
|
|
292
303
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
293
|
-
FetchEventSource.
|
|
304
|
+
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
305
|
+
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
294
306
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 75;
|
|
295
307
|
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL = 2;
|
|
296
308
|
//# sourceMappingURL=fetch-event-source.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAc,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAa,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
package/build/esm/logger.d.ts
CHANGED
|
@@ -6,3 +6,12 @@ export interface Logger {
|
|
|
6
6
|
warn?(...data: unknown[]): void;
|
|
7
7
|
error?(...data: unknown[]): void;
|
|
8
8
|
}
|
|
9
|
+
export declare enum LogLevel {
|
|
10
|
+
Trace = 4,
|
|
11
|
+
Debug = 3,
|
|
12
|
+
Info = 2,
|
|
13
|
+
Warn = 1,
|
|
14
|
+
Error = 0,
|
|
15
|
+
None = -1
|
|
16
|
+
}
|
|
17
|
+
export declare function levelLogger(level: LogLevel, logger?: Logger): Logger | undefined;
|
package/build/esm/logger.js
CHANGED
|
@@ -11,5 +11,26 @@
|
|
|
11
11
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
12
|
// See the License for the specific language governing permissions and
|
|
13
13
|
// limitations under the License.
|
|
14
|
-
export
|
|
14
|
+
export var LogLevel;
|
|
15
|
+
(function (LogLevel) {
|
|
16
|
+
LogLevel[LogLevel["Trace"] = 4] = "Trace";
|
|
17
|
+
LogLevel[LogLevel["Debug"] = 3] = "Debug";
|
|
18
|
+
LogLevel[LogLevel["Info"] = 2] = "Info";
|
|
19
|
+
LogLevel[LogLevel["Warn"] = 1] = "Warn";
|
|
20
|
+
LogLevel[LogLevel["Error"] = 0] = "Error";
|
|
21
|
+
LogLevel[LogLevel["None"] = -1] = "None";
|
|
22
|
+
})(LogLevel || (LogLevel = {}));
|
|
23
|
+
export function levelLogger(level, logger) {
|
|
24
|
+
if (!logger) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
log: logger?.log?.bind(logger),
|
|
29
|
+
trace: level >= LogLevel.Trace ? logger?.trace?.bind(logger) : undefined,
|
|
30
|
+
debug: level >= LogLevel.Debug ? logger?.debug?.bind(logger) : undefined,
|
|
31
|
+
info: level >= LogLevel.Info ? logger?.info?.bind(logger) : undefined,
|
|
32
|
+
warn: level >= LogLevel.Warn ? logger?.warn?.bind(logger) : undefined,
|
|
33
|
+
error: level >= LogLevel.Error ? logger?.error?.bind(logger) : undefined,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
15
36
|
//# sourceMappingURL=logger.js.map
|
package/build/esm/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAWjC,MAAM,CAAN,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;IACT,wCAAS,CAAA;AACX,CAAC,EAPW,QAAQ,KAAR,QAAQ,QAOnB;AAED,MAAM,UAAU,WAAW,CACzB,KAAe,EACf,MAAe;IAEf,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,OAAO;QACL,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;QAC9B,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;KACzE,CAAC;AACJ,CAAC"}
|
|
@@ -22,7 +22,7 @@ export class CBOREncoder {
|
|
|
22
22
|
this.dateEncoding = dateEncoding;
|
|
23
23
|
this.stringifier = new JsonStringifier();
|
|
24
24
|
this.arrayBufferSerializer = (_, value) => {
|
|
25
|
-
return value
|
|
25
|
+
return value;
|
|
26
26
|
};
|
|
27
27
|
this.instantSerializer = (_, value) => {
|
|
28
28
|
if (value == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,wBAAwB,EACxB,OAAO,EACP,SAAS,EACT,aAAa,EACb,SAAS,EACT,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,MAAM,GACP,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGvE,MAAM,OAAO,WAAW;IAUtB,YAAqB,YAAsC;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;QAFnD,gBAAW,GAAG,IAAI,eAAe,EAAE,CAAC;QAqEpC,0BAAqB,GAAe,CAAC,CAAC,EAAE,KAAkB,EAAE,EAAE;YACpE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ export interface FetchEventSource {
|
|
|
7
7
|
}
|
|
8
8
|
export declare class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
9
9
|
private static LAST_EVENT_ID_HEADER;
|
|
10
|
-
private static
|
|
10
|
+
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
|
+
private static RETRY_EXPONENT;
|
|
11
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
12
13
|
private static EVENT_TIMEOUT_CHECK_INTERVAL;
|
|
13
14
|
CONNECTING: number;
|
|
@@ -42,6 +43,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
42
43
|
private internalConnect;
|
|
43
44
|
close(): void;
|
|
44
45
|
private internalClose;
|
|
46
|
+
private updateLastEventReceived;
|
|
45
47
|
private startEventTimeoutCheck;
|
|
46
48
|
private stopEventTimeoutCheck;
|
|
47
49
|
private checkEventTimeout;
|
|
@@ -50,6 +52,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
50
52
|
private receivedError;
|
|
51
53
|
private receivedComplete;
|
|
52
54
|
private scheduleReconnect;
|
|
55
|
+
private static calculateRetryTime;
|
|
53
56
|
private clearReconnect;
|
|
54
57
|
private dispatchParsedEvent;
|
|
55
58
|
fireErrorEvent(error: unknown): void;
|
|
@@ -15,6 +15,7 @@ import { EMPTY, map, of, Subscription, switchMap } from 'rxjs';
|
|
|
15
15
|
import { fromReadableStreamLike } from 'rxjs/internal/observable/innerFrom';
|
|
16
16
|
import { EventParser } from './event-parser';
|
|
17
17
|
import { validate } from './fetch';
|
|
18
|
+
import { levelLogger, LogLevel } from './logger';
|
|
18
19
|
import { MediaType } from './media-type';
|
|
19
20
|
import { unknownGet, unknownSet } from './util/any';
|
|
20
21
|
export class FetchEventSource extends EventTarget {
|
|
@@ -30,14 +31,13 @@ export class FetchEventSource extends EventTarget {
|
|
|
30
31
|
this.onopen = null;
|
|
31
32
|
this.internalRetryTime = 100;
|
|
32
33
|
this.retryAttempt = 0;
|
|
33
|
-
this.connectionAttemptTime = 0;
|
|
34
34
|
this.lastEventReceivedTime = 0;
|
|
35
35
|
this.eventParser = new EventParser();
|
|
36
36
|
//
|
|
37
37
|
// Event Dispatch
|
|
38
38
|
//
|
|
39
39
|
this.dispatchParsedEvent = (eventInfo) => {
|
|
40
|
-
this.
|
|
40
|
+
this.updateLastEventReceived();
|
|
41
41
|
if (eventInfo.retry) {
|
|
42
42
|
const retryTime = Number.parseInt(eventInfo.retry, 10);
|
|
43
43
|
if (Number.isSafeInteger(retryTime)) {
|
|
@@ -45,7 +45,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
45
45
|
this.internalRetryTime = retryTime;
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
-
this.logger?.
|
|
48
|
+
this.logger?.warn?.('ignoring invalid retry timeout event', {
|
|
49
49
|
eventInfo,
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -55,6 +55,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
55
55
|
eventInfo.event == null &&
|
|
56
56
|
eventInfo.data == null) {
|
|
57
57
|
// skip empty event
|
|
58
|
+
this.logger?.trace?.('skipping empty event');
|
|
58
59
|
return;
|
|
59
60
|
}
|
|
60
61
|
// Save last-event-id if the new id is valid
|
|
@@ -64,7 +65,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
64
65
|
this.lastEventId = eventInfo.id;
|
|
65
66
|
}
|
|
66
67
|
else {
|
|
67
|
-
this.logger?.
|
|
68
|
+
this.logger?.warn?.('event id contains NULL byte, unable to use for last-event-id');
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
// Dispatch event
|
|
@@ -83,7 +84,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
83
84
|
this.eventTimeout =
|
|
84
85
|
eventSourceInit?.eventTimeout ??
|
|
85
86
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
|
|
86
|
-
this.logger = eventSourceInit?.logger;
|
|
87
|
+
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
87
88
|
}
|
|
88
89
|
get retryTime() {
|
|
89
90
|
return this.internalRetryTime;
|
|
@@ -159,7 +160,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
159
160
|
if (this.readyState === this.CLOSED) {
|
|
160
161
|
return;
|
|
161
162
|
}
|
|
162
|
-
this.logger?.debug?.('
|
|
163
|
+
this.logger?.debug?.('closing');
|
|
163
164
|
this.readyState = this.CLOSED;
|
|
164
165
|
this.internalClose();
|
|
165
166
|
}
|
|
@@ -172,12 +173,15 @@ export class FetchEventSource extends EventTarget {
|
|
|
172
173
|
//
|
|
173
174
|
// Event Timeout
|
|
174
175
|
//
|
|
176
|
+
updateLastEventReceived(time = Date.now()) {
|
|
177
|
+
this.lastEventReceivedTime = time;
|
|
178
|
+
}
|
|
175
179
|
startEventTimeoutCheck(lastEventReceivedTime) {
|
|
176
180
|
this.stopEventTimeoutCheck();
|
|
177
181
|
if (!this.eventTimeout) {
|
|
178
182
|
return;
|
|
179
183
|
}
|
|
180
|
-
this.lastEventReceivedTime
|
|
184
|
+
this.updateLastEventReceived(lastEventReceivedTime);
|
|
181
185
|
this.logger?.trace?.('starting event timeout checks');
|
|
182
186
|
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL * 1000);
|
|
183
187
|
}
|
|
@@ -216,7 +220,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
216
220
|
this.scheduleReconnect();
|
|
217
221
|
return;
|
|
218
222
|
}
|
|
219
|
-
this.logger?.
|
|
223
|
+
this.logger?.info?.('opened');
|
|
220
224
|
this.connectionOrigin = response.url;
|
|
221
225
|
this.retryAttempt = 0;
|
|
222
226
|
this.readyState = this.OPEN;
|
|
@@ -261,21 +265,28 @@ export class FetchEventSource extends EventTarget {
|
|
|
261
265
|
//
|
|
262
266
|
scheduleReconnect() {
|
|
263
267
|
this.internalClose();
|
|
268
|
+
const lastConnectionTime = this.connectionAttemptTime
|
|
269
|
+
? Date.now() - this.connectionAttemptTime
|
|
270
|
+
: 0;
|
|
271
|
+
const retryDelay = FetchEventSource.calculateRetryTime(this.retryAttempt, this.retryTime, lastConnectionTime);
|
|
272
|
+
this.retryAttempt++;
|
|
273
|
+
this.readyState = this.CONNECTING;
|
|
274
|
+
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
275
|
+
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
276
|
+
}
|
|
277
|
+
static calculateRetryTime(retryAttempt, retryTime, lastConnectTime) {
|
|
278
|
+
const retryMultiplier = Math.min(retryAttempt, this.MAX_RETRY_TIME_MULTIPLIER);
|
|
264
279
|
// calculate total delay
|
|
265
|
-
|
|
266
|
-
let retryDelay = Math.min(this.retryTime + backOffDelay, this.retryTime * FetchEventSource.MAX_RETRY_TIME_MULTIPLE);
|
|
280
|
+
let retryDelay = Math.pow(retryMultiplier, this.RETRY_EXPONENT) * retryTime;
|
|
267
281
|
// Adjust delay by amount of time last connect
|
|
268
282
|
// cycle took, except on the first attempt
|
|
269
|
-
if (
|
|
270
|
-
|
|
283
|
+
if (retryAttempt > 0) {
|
|
284
|
+
retryDelay -= lastConnectTime;
|
|
271
285
|
// Ensure delay is at least as large as
|
|
272
286
|
// minimum retry time interval
|
|
273
|
-
retryDelay = Math.max(retryDelay
|
|
287
|
+
retryDelay = Math.max(retryDelay, retryTime);
|
|
274
288
|
}
|
|
275
|
-
|
|
276
|
-
this.readyState = this.CONNECTING;
|
|
277
|
-
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
278
|
-
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
289
|
+
return retryDelay;
|
|
279
290
|
}
|
|
280
291
|
clearReconnect() {
|
|
281
292
|
if (this.reconnectTimeoutHandle) {
|
|
@@ -290,7 +301,8 @@ export class FetchEventSource extends EventTarget {
|
|
|
290
301
|
}
|
|
291
302
|
}
|
|
292
303
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
293
|
-
FetchEventSource.
|
|
304
|
+
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
305
|
+
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
294
306
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 75;
|
|
295
307
|
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL = 2;
|
|
296
308
|
//# sourceMappingURL=fetch-event-source.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAc,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAAa,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
package/build/esnext/logger.d.ts
CHANGED
|
@@ -6,3 +6,12 @@ export interface Logger {
|
|
|
6
6
|
warn?(...data: unknown[]): void;
|
|
7
7
|
error?(...data: unknown[]): void;
|
|
8
8
|
}
|
|
9
|
+
export declare enum LogLevel {
|
|
10
|
+
Trace = 4,
|
|
11
|
+
Debug = 3,
|
|
12
|
+
Info = 2,
|
|
13
|
+
Warn = 1,
|
|
14
|
+
Error = 0,
|
|
15
|
+
None = -1
|
|
16
|
+
}
|
|
17
|
+
export declare function levelLogger(level: LogLevel, logger?: Logger): Logger | undefined;
|
package/build/esnext/logger.js
CHANGED
|
@@ -11,5 +11,26 @@
|
|
|
11
11
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
12
|
// See the License for the specific language governing permissions and
|
|
13
13
|
// limitations under the License.
|
|
14
|
-
export
|
|
14
|
+
export var LogLevel;
|
|
15
|
+
(function (LogLevel) {
|
|
16
|
+
LogLevel[LogLevel["Trace"] = 4] = "Trace";
|
|
17
|
+
LogLevel[LogLevel["Debug"] = 3] = "Debug";
|
|
18
|
+
LogLevel[LogLevel["Info"] = 2] = "Info";
|
|
19
|
+
LogLevel[LogLevel["Warn"] = 1] = "Warn";
|
|
20
|
+
LogLevel[LogLevel["Error"] = 0] = "Error";
|
|
21
|
+
LogLevel[LogLevel["None"] = -1] = "None";
|
|
22
|
+
})(LogLevel || (LogLevel = {}));
|
|
23
|
+
export function levelLogger(level, logger) {
|
|
24
|
+
if (!logger) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
log: logger?.log?.bind(logger),
|
|
29
|
+
trace: level >= LogLevel.Trace ? logger?.trace?.bind(logger) : undefined,
|
|
30
|
+
debug: level >= LogLevel.Debug ? logger?.debug?.bind(logger) : undefined,
|
|
31
|
+
info: level >= LogLevel.Info ? logger?.info?.bind(logger) : undefined,
|
|
32
|
+
warn: level >= LogLevel.Warn ? logger?.warn?.bind(logger) : undefined,
|
|
33
|
+
error: level >= LogLevel.Error ? logger?.error?.bind(logger) : undefined,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
15
36
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAWjC,MAAM,CAAN,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;IACT,wCAAS,CAAA;AACX,CAAC,EAPW,QAAQ,KAAR,QAAQ,QAOnB;AAED,MAAM,UAAU,WAAW,CACzB,KAAe,EACf,MAAe;IAEf,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,OAAO;QACL,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;QAC9B,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;KACzE,CAAC;AACJ,CAAC"}
|
|
@@ -22,7 +22,7 @@ export class CBOREncoder {
|
|
|
22
22
|
this.dateEncoding = dateEncoding;
|
|
23
23
|
this.stringifier = new JsonStringifier();
|
|
24
24
|
this.arrayBufferSerializer = (_, value) => {
|
|
25
|
-
return value
|
|
25
|
+
return value;
|
|
26
26
|
};
|
|
27
27
|
this.instantSerializer = (_, value) => {
|
|
28
28
|
if (value == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,wBAAwB,EACxB,OAAO,EACP,SAAS,EACT,aAAa,EACb,SAAS,EACT,cAAc,EACd,UAAU,EACV,aAAa,EACb,aAAa,EACb,MAAM,GACP,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGvE,MAAM,OAAO,WAAW;IAUtB,YAAqB,YAAsC;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;QAFnD,gBAAW,GAAG,IAAI,eAAe,EAAE,CAAC;QAqEpC,0BAAqB,GAAe,CAAC,CAAC,EAAE,KAAkB,EAAE,EAAE;YACpE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,8 @@ export interface FetchEventSource {
|
|
|
7
7
|
}
|
|
8
8
|
export declare class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
9
9
|
private static LAST_EVENT_ID_HEADER;
|
|
10
|
-
private static
|
|
10
|
+
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
|
+
private static RETRY_EXPONENT;
|
|
11
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
12
13
|
private static EVENT_TIMEOUT_CHECK_INTERVAL;
|
|
13
14
|
CONNECTING: number;
|
|
@@ -42,6 +43,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
42
43
|
private internalConnect;
|
|
43
44
|
close(): void;
|
|
44
45
|
private internalClose;
|
|
46
|
+
private updateLastEventReceived;
|
|
45
47
|
private startEventTimeoutCheck;
|
|
46
48
|
private stopEventTimeoutCheck;
|
|
47
49
|
private checkEventTimeout;
|
|
@@ -50,6 +52,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
50
52
|
private receivedError;
|
|
51
53
|
private receivedComplete;
|
|
52
54
|
private scheduleReconnect;
|
|
55
|
+
private static calculateRetryTime;
|
|
53
56
|
private clearReconnect;
|
|
54
57
|
private dispatchParsedEvent;
|
|
55
58
|
fireErrorEvent(error: unknown): void;
|
|
@@ -18,6 +18,7 @@ const rxjs_1 = require("rxjs");
|
|
|
18
18
|
const innerFrom_1 = require("rxjs/internal/observable/innerFrom");
|
|
19
19
|
const event_parser_1 = require("./event-parser");
|
|
20
20
|
const fetch_1 = require("./fetch");
|
|
21
|
+
const logger_1 = require("./logger");
|
|
21
22
|
const media_type_1 = require("./media-type");
|
|
22
23
|
const any_1 = require("./util/any");
|
|
23
24
|
class FetchEventSource extends EventTarget {
|
|
@@ -33,14 +34,13 @@ class FetchEventSource extends EventTarget {
|
|
|
33
34
|
this.onopen = null;
|
|
34
35
|
this.internalRetryTime = 100;
|
|
35
36
|
this.retryAttempt = 0;
|
|
36
|
-
this.connectionAttemptTime = 0;
|
|
37
37
|
this.lastEventReceivedTime = 0;
|
|
38
38
|
this.eventParser = new event_parser_1.EventParser();
|
|
39
39
|
//
|
|
40
40
|
// Event Dispatch
|
|
41
41
|
//
|
|
42
42
|
this.dispatchParsedEvent = (eventInfo) => {
|
|
43
|
-
this.
|
|
43
|
+
this.updateLastEventReceived();
|
|
44
44
|
if (eventInfo.retry) {
|
|
45
45
|
const retryTime = Number.parseInt(eventInfo.retry, 10);
|
|
46
46
|
if (Number.isSafeInteger(retryTime)) {
|
|
@@ -48,7 +48,7 @@ class FetchEventSource extends EventTarget {
|
|
|
48
48
|
this.internalRetryTime = retryTime;
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
|
-
this.logger?.
|
|
51
|
+
this.logger?.warn?.('ignoring invalid retry timeout event', {
|
|
52
52
|
eventInfo,
|
|
53
53
|
});
|
|
54
54
|
}
|
|
@@ -58,6 +58,7 @@ class FetchEventSource extends EventTarget {
|
|
|
58
58
|
eventInfo.event == null &&
|
|
59
59
|
eventInfo.data == null) {
|
|
60
60
|
// skip empty event
|
|
61
|
+
this.logger?.trace?.('skipping empty event');
|
|
61
62
|
return;
|
|
62
63
|
}
|
|
63
64
|
// Save last-event-id if the new id is valid
|
|
@@ -67,7 +68,7 @@ class FetchEventSource extends EventTarget {
|
|
|
67
68
|
this.lastEventId = eventInfo.id;
|
|
68
69
|
}
|
|
69
70
|
else {
|
|
70
|
-
this.logger?.
|
|
71
|
+
this.logger?.warn?.('event id contains NULL byte, unable to use for last-event-id');
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
// Dispatch event
|
|
@@ -86,7 +87,7 @@ class FetchEventSource extends EventTarget {
|
|
|
86
87
|
this.eventTimeout =
|
|
87
88
|
eventSourceInit?.eventTimeout ??
|
|
88
89
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
|
|
89
|
-
this.logger = eventSourceInit?.logger;
|
|
90
|
+
this.logger = (0, logger_1.levelLogger)(logger_1.LogLevel.Info, eventSourceInit?.logger);
|
|
90
91
|
}
|
|
91
92
|
get retryTime() {
|
|
92
93
|
return this.internalRetryTime;
|
|
@@ -162,7 +163,7 @@ class FetchEventSource extends EventTarget {
|
|
|
162
163
|
if (this.readyState === this.CLOSED) {
|
|
163
164
|
return;
|
|
164
165
|
}
|
|
165
|
-
this.logger?.debug?.('
|
|
166
|
+
this.logger?.debug?.('closing');
|
|
166
167
|
this.readyState = this.CLOSED;
|
|
167
168
|
this.internalClose();
|
|
168
169
|
}
|
|
@@ -175,12 +176,15 @@ class FetchEventSource extends EventTarget {
|
|
|
175
176
|
//
|
|
176
177
|
// Event Timeout
|
|
177
178
|
//
|
|
179
|
+
updateLastEventReceived(time = Date.now()) {
|
|
180
|
+
this.lastEventReceivedTime = time;
|
|
181
|
+
}
|
|
178
182
|
startEventTimeoutCheck(lastEventReceivedTime) {
|
|
179
183
|
this.stopEventTimeoutCheck();
|
|
180
184
|
if (!this.eventTimeout) {
|
|
181
185
|
return;
|
|
182
186
|
}
|
|
183
|
-
this.lastEventReceivedTime
|
|
187
|
+
this.updateLastEventReceived(lastEventReceivedTime);
|
|
184
188
|
this.logger?.trace?.('starting event timeout checks');
|
|
185
189
|
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL * 1000);
|
|
186
190
|
}
|
|
@@ -219,7 +223,7 @@ class FetchEventSource extends EventTarget {
|
|
|
219
223
|
this.scheduleReconnect();
|
|
220
224
|
return;
|
|
221
225
|
}
|
|
222
|
-
this.logger?.
|
|
226
|
+
this.logger?.info?.('opened');
|
|
223
227
|
this.connectionOrigin = response.url;
|
|
224
228
|
this.retryAttempt = 0;
|
|
225
229
|
this.readyState = this.OPEN;
|
|
@@ -264,21 +268,28 @@ class FetchEventSource extends EventTarget {
|
|
|
264
268
|
//
|
|
265
269
|
scheduleReconnect() {
|
|
266
270
|
this.internalClose();
|
|
271
|
+
const lastConnectionTime = this.connectionAttemptTime
|
|
272
|
+
? Date.now() - this.connectionAttemptTime
|
|
273
|
+
: 0;
|
|
274
|
+
const retryDelay = FetchEventSource.calculateRetryTime(this.retryAttempt, this.retryTime, lastConnectionTime);
|
|
275
|
+
this.retryAttempt++;
|
|
276
|
+
this.readyState = this.CONNECTING;
|
|
277
|
+
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
278
|
+
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
279
|
+
}
|
|
280
|
+
static calculateRetryTime(retryAttempt, retryTime, lastConnectTime) {
|
|
281
|
+
const retryMultiplier = Math.min(retryAttempt, this.MAX_RETRY_TIME_MULTIPLIER);
|
|
267
282
|
// calculate total delay
|
|
268
|
-
|
|
269
|
-
let retryDelay = Math.min(this.retryTime + backOffDelay, this.retryTime * FetchEventSource.MAX_RETRY_TIME_MULTIPLE);
|
|
283
|
+
let retryDelay = Math.pow(retryMultiplier, this.RETRY_EXPONENT) * retryTime;
|
|
270
284
|
// Adjust delay by amount of time last connect
|
|
271
285
|
// cycle took, except on the first attempt
|
|
272
|
-
if (
|
|
273
|
-
|
|
286
|
+
if (retryAttempt > 0) {
|
|
287
|
+
retryDelay -= lastConnectTime;
|
|
274
288
|
// Ensure delay is at least as large as
|
|
275
289
|
// minimum retry time interval
|
|
276
|
-
retryDelay = Math.max(retryDelay
|
|
290
|
+
retryDelay = Math.max(retryDelay, retryTime);
|
|
277
291
|
}
|
|
278
|
-
|
|
279
|
-
this.readyState = this.CONNECTING;
|
|
280
|
-
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
281
|
-
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
292
|
+
return retryDelay;
|
|
282
293
|
}
|
|
283
294
|
clearReconnect() {
|
|
284
295
|
if (this.reconnectTimeoutHandle) {
|
|
@@ -294,7 +305,8 @@ class FetchEventSource extends EventTarget {
|
|
|
294
305
|
}
|
|
295
306
|
exports.FetchEventSource = FetchEventSource;
|
|
296
307
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
297
|
-
FetchEventSource.
|
|
308
|
+
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
309
|
+
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
298
310
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 75;
|
|
299
311
|
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL = 2;
|
|
300
312
|
//# sourceMappingURL=fetch-event-source.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,+BAA2E;AAC3E,kEAA4E;AAC5E,iDAAwD;AACxD,mCAAmC;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
package/build/main/logger.d.ts
CHANGED
|
@@ -6,3 +6,12 @@ export interface Logger {
|
|
|
6
6
|
warn?(...data: unknown[]): void;
|
|
7
7
|
error?(...data: unknown[]): void;
|
|
8
8
|
}
|
|
9
|
+
export declare enum LogLevel {
|
|
10
|
+
Trace = 4,
|
|
11
|
+
Debug = 3,
|
|
12
|
+
Info = 2,
|
|
13
|
+
Warn = 1,
|
|
14
|
+
Error = 0,
|
|
15
|
+
None = -1
|
|
16
|
+
}
|
|
17
|
+
export declare function levelLogger(level: LogLevel, logger?: Logger): Logger | undefined;
|
package/build/main/logger.js
CHANGED
|
@@ -13,4 +13,28 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.levelLogger = exports.LogLevel = void 0;
|
|
17
|
+
var LogLevel;
|
|
18
|
+
(function (LogLevel) {
|
|
19
|
+
LogLevel[LogLevel["Trace"] = 4] = "Trace";
|
|
20
|
+
LogLevel[LogLevel["Debug"] = 3] = "Debug";
|
|
21
|
+
LogLevel[LogLevel["Info"] = 2] = "Info";
|
|
22
|
+
LogLevel[LogLevel["Warn"] = 1] = "Warn";
|
|
23
|
+
LogLevel[LogLevel["Error"] = 0] = "Error";
|
|
24
|
+
LogLevel[LogLevel["None"] = -1] = "None";
|
|
25
|
+
})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
|
|
26
|
+
function levelLogger(level, logger) {
|
|
27
|
+
if (!logger) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
log: logger?.log?.bind(logger),
|
|
32
|
+
trace: level >= LogLevel.Trace ? logger?.trace?.bind(logger) : undefined,
|
|
33
|
+
debug: level >= LogLevel.Debug ? logger?.debug?.bind(logger) : undefined,
|
|
34
|
+
info: level >= LogLevel.Info ? logger?.info?.bind(logger) : undefined,
|
|
35
|
+
warn: level >= LogLevel.Warn ? logger?.warn?.bind(logger) : undefined,
|
|
36
|
+
error: level >= LogLevel.Error ? logger?.error?.bind(logger) : undefined,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
exports.levelLogger = levelLogger;
|
|
16
40
|
//# sourceMappingURL=logger.js.map
|
package/build/main/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC"}
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAWjC,IAAY,QAOX;AAPD,WAAY,QAAQ;IAClB,yCAAS,CAAA;IACT,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,uCAAQ,CAAA;IACR,yCAAS,CAAA;IACT,wCAAS,CAAA;AACX,CAAC,EAPW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAOnB;AAED,SAAgB,WAAW,CACzB,KAAe,EACf,MAAe;IAEf,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAC;KAClB;IACD,OAAO;QACL,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;QAC9B,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACxE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,IAAI,EAAE,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;QACrE,KAAK,EAAE,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;KACzE,CAAC;AACJ,CAAC;AAfD,kCAeC"}
|
|
@@ -25,7 +25,7 @@ class CBOREncoder {
|
|
|
25
25
|
this.dateEncoding = dateEncoding;
|
|
26
26
|
this.stringifier = new jackson_js_1.JsonStringifier();
|
|
27
27
|
this.arrayBufferSerializer = (_, value) => {
|
|
28
|
-
return value
|
|
28
|
+
return value;
|
|
29
29
|
};
|
|
30
30
|
this.instantSerializer = (_, value) => {
|
|
31
31
|
if (value == null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":";AAAA,8BAA8B;AAC9B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,gDAAgD;AAChD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,wCAauB;AACvB,2CAA+C;AAC/C,oDAAsD;AAEtD,4BAA0B;AAE1B,+CAAkE;AAClE,2CAAuE;AAGvE,MAAa,WAAW;IAUtB,YAAqB,YAAsC;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;QAFnD,gBAAW,GAAG,IAAI,4BAAe,EAAE,CAAC;QAqEpC,0BAAqB,GAAe,CAAC,CAAC,EAAE,KAAkB,EAAE,EAAE;YACpE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"cbor-encoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-encoder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -16,7 +16,7 @@ import { EMPTY, map, Observable, of, Subscription, switchMap } from 'rxjs';
|
|
|
16
16
|
import { fromReadableStreamLike } from 'rxjs/internal/observable/innerFrom';
|
|
17
17
|
import { EventInfo, EventParser } from './event-parser';
|
|
18
18
|
import { validate } from './fetch';
|
|
19
|
-
import { Logger } from './logger';
|
|
19
|
+
import { levelLogger, Logger, LogLevel } from './logger';
|
|
20
20
|
import { MediaType } from './media-type';
|
|
21
21
|
import { ExtEventSource } from './request-factory';
|
|
22
22
|
import { unknownGet, unknownSet } from './util/any';
|
|
@@ -28,6 +28,7 @@ export interface FetchEventSource {
|
|
|
28
28
|
listener: (this: EventSource, ev: EventSourceEventMap[K]) => any,
|
|
29
29
|
options?: boolean | AddEventListenerOptions,
|
|
30
30
|
): void;
|
|
31
|
+
|
|
31
32
|
removeEventListener<K extends keyof EventSourceEventMap>(
|
|
32
33
|
type: K,
|
|
33
34
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -38,7 +39,8 @@ export interface FetchEventSource {
|
|
|
38
39
|
|
|
39
40
|
export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
40
41
|
private static LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
41
|
-
private static
|
|
42
|
+
private static MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
43
|
+
private static RETRY_EXPONENT = 2.6;
|
|
42
44
|
private static EVENT_TIMEOUT_DEFAULT = 75;
|
|
43
45
|
private static EVENT_TIMEOUT_CHECK_INTERVAL = 2;
|
|
44
46
|
|
|
@@ -64,7 +66,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
64
66
|
private connectionSubscription?: Subscription;
|
|
65
67
|
private internalRetryTime = 100;
|
|
66
68
|
private retryAttempt = 0;
|
|
67
|
-
private connectionAttemptTime
|
|
69
|
+
private connectionAttemptTime: number | undefined;
|
|
68
70
|
private connectionOrigin?: string;
|
|
69
71
|
private reconnectTimeoutHandle?: number;
|
|
70
72
|
private lastEventId?: string;
|
|
@@ -90,7 +92,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
90
92
|
this.eventTimeout =
|
|
91
93
|
eventSourceInit?.eventTimeout ??
|
|
92
94
|
FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
|
|
93
|
-
this.logger = eventSourceInit?.logger;
|
|
95
|
+
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
94
96
|
}
|
|
95
97
|
|
|
96
98
|
//
|
|
@@ -191,7 +193,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
191
193
|
return;
|
|
192
194
|
}
|
|
193
195
|
|
|
194
|
-
this.logger?.debug?.('
|
|
196
|
+
this.logger?.debug?.('closing');
|
|
195
197
|
|
|
196
198
|
this.readyState = this.CLOSED;
|
|
197
199
|
|
|
@@ -211,6 +213,10 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
211
213
|
// Event Timeout
|
|
212
214
|
//
|
|
213
215
|
|
|
216
|
+
private updateLastEventReceived(time: number = Date.now()) {
|
|
217
|
+
this.lastEventReceivedTime = time;
|
|
218
|
+
}
|
|
219
|
+
|
|
214
220
|
private startEventTimeoutCheck(lastEventReceivedTime: number) {
|
|
215
221
|
this.stopEventTimeoutCheck();
|
|
216
222
|
|
|
@@ -218,7 +224,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
218
224
|
return;
|
|
219
225
|
}
|
|
220
226
|
|
|
221
|
-
this.lastEventReceivedTime
|
|
227
|
+
this.updateLastEventReceived(lastEventReceivedTime);
|
|
222
228
|
|
|
223
229
|
this.logger?.trace?.('starting event timeout checks');
|
|
224
230
|
|
|
@@ -274,7 +280,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
274
280
|
return;
|
|
275
281
|
}
|
|
276
282
|
|
|
277
|
-
this.logger?.
|
|
283
|
+
this.logger?.info?.('opened');
|
|
278
284
|
|
|
279
285
|
this.connectionOrigin = response.url;
|
|
280
286
|
this.retryAttempt = 0;
|
|
@@ -336,21 +342,15 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
336
342
|
private scheduleReconnect() {
|
|
337
343
|
this.internalClose();
|
|
338
344
|
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
this.retryTime + backOffDelay,
|
|
343
|
-
this.retryTime * FetchEventSource.MAX_RETRY_TIME_MULTIPLE,
|
|
344
|
-
);
|
|
345
|
+
const lastConnectionTime = this.connectionAttemptTime
|
|
346
|
+
? Date.now() - this.connectionAttemptTime
|
|
347
|
+
: 0;
|
|
345
348
|
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
// minimum retry time interval
|
|
352
|
-
retryDelay = Math.max(retryDelay - connectionTime, this.retryTime);
|
|
353
|
-
}
|
|
349
|
+
const retryDelay = FetchEventSource.calculateRetryTime(
|
|
350
|
+
this.retryAttempt,
|
|
351
|
+
this.retryTime,
|
|
352
|
+
lastConnectionTime,
|
|
353
|
+
);
|
|
354
354
|
|
|
355
355
|
this.retryAttempt++;
|
|
356
356
|
this.readyState = this.CONNECTING;
|
|
@@ -363,6 +363,32 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
363
363
|
);
|
|
364
364
|
}
|
|
365
365
|
|
|
366
|
+
private static calculateRetryTime(
|
|
367
|
+
retryAttempt: number,
|
|
368
|
+
retryTime: number,
|
|
369
|
+
lastConnectTime: number,
|
|
370
|
+
): number {
|
|
371
|
+
const retryMultiplier = Math.min(
|
|
372
|
+
retryAttempt,
|
|
373
|
+
this.MAX_RETRY_TIME_MULTIPLIER,
|
|
374
|
+
);
|
|
375
|
+
|
|
376
|
+
// calculate total delay
|
|
377
|
+
let retryDelay = Math.pow(retryMultiplier, this.RETRY_EXPONENT) * retryTime;
|
|
378
|
+
|
|
379
|
+
// Adjust delay by amount of time last connect
|
|
380
|
+
// cycle took, except on the first attempt
|
|
381
|
+
if (retryAttempt > 0) {
|
|
382
|
+
retryDelay -= lastConnectTime;
|
|
383
|
+
|
|
384
|
+
// Ensure delay is at least as large as
|
|
385
|
+
// minimum retry time interval
|
|
386
|
+
retryDelay = Math.max(retryDelay, retryTime);
|
|
387
|
+
}
|
|
388
|
+
|
|
389
|
+
return retryDelay;
|
|
390
|
+
}
|
|
391
|
+
|
|
366
392
|
private clearReconnect() {
|
|
367
393
|
if (this.reconnectTimeoutHandle) {
|
|
368
394
|
clearTimeout(this.reconnectTimeoutHandle);
|
|
@@ -375,7 +401,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
375
401
|
//
|
|
376
402
|
|
|
377
403
|
private dispatchParsedEvent = (eventInfo: EventInfo) => {
|
|
378
|
-
this.
|
|
404
|
+
this.updateLastEventReceived();
|
|
379
405
|
|
|
380
406
|
if (eventInfo.retry) {
|
|
381
407
|
const retryTime = Number.parseInt(eventInfo.retry, 10);
|
|
@@ -385,7 +411,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
385
411
|
|
|
386
412
|
this.internalRetryTime = retryTime;
|
|
387
413
|
} else {
|
|
388
|
-
this.logger?.
|
|
414
|
+
this.logger?.warn?.('ignoring invalid retry timeout event', {
|
|
389
415
|
eventInfo,
|
|
390
416
|
});
|
|
391
417
|
}
|
|
@@ -398,6 +424,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
398
424
|
eventInfo.data == null
|
|
399
425
|
) {
|
|
400
426
|
// skip empty event
|
|
427
|
+
this.logger?.trace?.('skipping empty event');
|
|
401
428
|
return;
|
|
402
429
|
}
|
|
403
430
|
|
|
@@ -407,8 +434,8 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
407
434
|
if (eventInfo.id.indexOf('\0') == -1) {
|
|
408
435
|
this.lastEventId = eventInfo.id;
|
|
409
436
|
} else {
|
|
410
|
-
this.logger?.
|
|
411
|
-
'event id contains
|
|
437
|
+
this.logger?.warn?.(
|
|
438
|
+
'event id contains NULL byte, unable to use for last-event-id',
|
|
412
439
|
);
|
|
413
440
|
}
|
|
414
441
|
}
|
package/src/logger.ts
CHANGED
|
@@ -20,3 +20,29 @@ export interface Logger {
|
|
|
20
20
|
warn?(...data: unknown[]): void;
|
|
21
21
|
error?(...data: unknown[]): void;
|
|
22
22
|
}
|
|
23
|
+
|
|
24
|
+
export enum LogLevel {
|
|
25
|
+
Trace = 4,
|
|
26
|
+
Debug = 3,
|
|
27
|
+
Info = 2,
|
|
28
|
+
Warn = 1,
|
|
29
|
+
Error = 0,
|
|
30
|
+
None = -1,
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
export function levelLogger(
|
|
34
|
+
level: LogLevel,
|
|
35
|
+
logger?: Logger,
|
|
36
|
+
): Logger | undefined {
|
|
37
|
+
if (!logger) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
return {
|
|
41
|
+
log: logger?.log?.bind(logger),
|
|
42
|
+
trace: level >= LogLevel.Trace ? logger?.trace?.bind(logger) : undefined,
|
|
43
|
+
debug: level >= LogLevel.Debug ? logger?.debug?.bind(logger) : undefined,
|
|
44
|
+
info: level >= LogLevel.Info ? logger?.info?.bind(logger) : undefined,
|
|
45
|
+
warn: level >= LogLevel.Warn ? logger?.warn?.bind(logger) : undefined,
|
|
46
|
+
error: level >= LogLevel.Error ? logger?.error?.bind(logger) : undefined,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
@@ -113,7 +113,7 @@ export class CBOREncoder implements MediaTypeEncoder {
|
|
|
113
113
|
}
|
|
114
114
|
|
|
115
115
|
private arrayBufferSerializer: Serializer = (_, value: ArrayBuffer) => {
|
|
116
|
-
return value
|
|
116
|
+
return value;
|
|
117
117
|
};
|
|
118
118
|
|
|
119
119
|
private instantSerializer: Serializer = (_, value: Instant) => {
|