@outfoxx/sunday 1.1.0-beta.22 → 1.1.0-beta.23
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 +3 -1
- package/build/esm/fetch-event-source.js +7 -5
- package/build/esm/fetch-event-source.js.map +1 -1
- package/build/esnext/fetch-event-source.d.ts +3 -1
- package/build/esnext/fetch-event-source.js +7 -5
- package/build/esnext/fetch-event-source.js.map +1 -1
- package/build/main/fetch-event-source.d.ts +3 -1
- package/build/main/fetch-event-source.js +7 -5
- package/build/main/fetch-event-source.js.map +1 -1
- package/package.json +1 -1
- package/src/fetch-event-source.ts +9 -5
|
@@ -10,7 +10,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
10
10
|
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
11
|
private static RETRY_EXPONENT;
|
|
12
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
13
|
-
private static
|
|
13
|
+
private static EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
14
14
|
CONNECTING: number;
|
|
15
15
|
OPEN: number;
|
|
16
16
|
CLOSED: number;
|
|
@@ -31,12 +31,14 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
31
31
|
private lastEventId?;
|
|
32
32
|
private logger?;
|
|
33
33
|
private readonly eventTimeout?;
|
|
34
|
+
private readonly eventTimeoutCheckInterval;
|
|
34
35
|
private eventTimeoutCheckHandle?;
|
|
35
36
|
private lastEventReceivedTime;
|
|
36
37
|
private eventParser;
|
|
37
38
|
constructor(url: string, eventSourceInit?: EventSourceInit & {
|
|
38
39
|
adapter?: (url: string, requestInit: RequestInit) => Observable<Request>;
|
|
39
40
|
eventTimeout?: number;
|
|
41
|
+
eventTimeoutCheckInterval?: number;
|
|
40
42
|
logger?: Logger;
|
|
41
43
|
});
|
|
42
44
|
connect(): void;
|
|
@@ -82,8 +82,10 @@ export class FetchEventSource extends EventTarget {
|
|
|
82
82
|
eventSourceInit?.adapter ??
|
|
83
83
|
((_url, requestInit) => of(new Request(_url, requestInit)));
|
|
84
84
|
this.eventTimeout =
|
|
85
|
-
eventSourceInit?.eventTimeout ??
|
|
86
|
-
|
|
85
|
+
eventSourceInit?.eventTimeout ?? FetchEventSource.EVENT_TIMEOUT_DEFAULT;
|
|
86
|
+
this.eventTimeoutCheckInterval =
|
|
87
|
+
eventSourceInit?.eventTimeoutCheckInterval ??
|
|
88
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
87
89
|
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
88
90
|
}
|
|
89
91
|
get retryTime() {
|
|
@@ -183,7 +185,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
183
185
|
}
|
|
184
186
|
this.updateLastEventReceived(lastEventReceivedTime);
|
|
185
187
|
this.logger?.trace?.('starting event timeout checks');
|
|
186
|
-
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(),
|
|
188
|
+
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), this.eventTimeoutCheckInterval);
|
|
187
189
|
}
|
|
188
190
|
stopEventTimeoutCheck() {
|
|
189
191
|
if (this.eventTimeoutCheckHandle) {
|
|
@@ -303,6 +305,6 @@ export class FetchEventSource extends EventTarget {
|
|
|
303
305
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
304
306
|
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
305
307
|
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
306
|
-
FetchEventSource.EVENT_TIMEOUT_DEFAULT =
|
|
307
|
-
FetchEventSource.
|
|
308
|
+
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 120 * 1000;
|
|
309
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT = 2 * 1000;
|
|
308
310
|
//# 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;AACnC,OAAO,EAAE,WAAW,EAAU,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAkBpD,MAAM,OAAO,gBAAiB,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
10
10
|
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
11
|
private static RETRY_EXPONENT;
|
|
12
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
13
|
-
private static
|
|
13
|
+
private static EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
14
14
|
CONNECTING: number;
|
|
15
15
|
OPEN: number;
|
|
16
16
|
CLOSED: number;
|
|
@@ -31,12 +31,14 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
31
31
|
private lastEventId?;
|
|
32
32
|
private logger?;
|
|
33
33
|
private readonly eventTimeout?;
|
|
34
|
+
private readonly eventTimeoutCheckInterval;
|
|
34
35
|
private eventTimeoutCheckHandle?;
|
|
35
36
|
private lastEventReceivedTime;
|
|
36
37
|
private eventParser;
|
|
37
38
|
constructor(url: string, eventSourceInit?: EventSourceInit & {
|
|
38
39
|
adapter?: (url: string, requestInit: RequestInit) => Observable<Request>;
|
|
39
40
|
eventTimeout?: number;
|
|
41
|
+
eventTimeoutCheckInterval?: number;
|
|
40
42
|
logger?: Logger;
|
|
41
43
|
});
|
|
42
44
|
connect(): void;
|
|
@@ -82,8 +82,10 @@ export class FetchEventSource extends EventTarget {
|
|
|
82
82
|
eventSourceInit?.adapter ??
|
|
83
83
|
((_url, requestInit) => of(new Request(_url, requestInit)));
|
|
84
84
|
this.eventTimeout =
|
|
85
|
-
eventSourceInit?.eventTimeout ??
|
|
86
|
-
|
|
85
|
+
eventSourceInit?.eventTimeout ?? FetchEventSource.EVENT_TIMEOUT_DEFAULT;
|
|
86
|
+
this.eventTimeoutCheckInterval =
|
|
87
|
+
eventSourceInit?.eventTimeoutCheckInterval ??
|
|
88
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
87
89
|
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
88
90
|
}
|
|
89
91
|
get retryTime() {
|
|
@@ -183,7 +185,7 @@ export class FetchEventSource extends EventTarget {
|
|
|
183
185
|
}
|
|
184
186
|
this.updateLastEventReceived(lastEventReceivedTime);
|
|
185
187
|
this.logger?.trace?.('starting event timeout checks');
|
|
186
|
-
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(),
|
|
188
|
+
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), this.eventTimeoutCheckInterval);
|
|
187
189
|
}
|
|
188
190
|
stopEventTimeoutCheck() {
|
|
189
191
|
if (this.eventTimeoutCheckHandle) {
|
|
@@ -303,6 +305,6 @@ export class FetchEventSource extends EventTarget {
|
|
|
303
305
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
304
306
|
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
305
307
|
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
306
|
-
FetchEventSource.EVENT_TIMEOUT_DEFAULT =
|
|
307
|
-
FetchEventSource.
|
|
308
|
+
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 120 * 1000;
|
|
309
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT = 2 * 1000;
|
|
308
310
|
//# 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;AACnC,OAAO,EAAE,WAAW,EAAU,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAkBpD,MAAM,OAAO,gBAAiB,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
10
10
|
private static MAX_RETRY_TIME_MULTIPLIER;
|
|
11
11
|
private static RETRY_EXPONENT;
|
|
12
12
|
private static EVENT_TIMEOUT_DEFAULT;
|
|
13
|
-
private static
|
|
13
|
+
private static EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
14
14
|
CONNECTING: number;
|
|
15
15
|
OPEN: number;
|
|
16
16
|
CLOSED: number;
|
|
@@ -31,12 +31,14 @@ export declare class FetchEventSource extends EventTarget implements ExtEventSou
|
|
|
31
31
|
private lastEventId?;
|
|
32
32
|
private logger?;
|
|
33
33
|
private readonly eventTimeout?;
|
|
34
|
+
private readonly eventTimeoutCheckInterval;
|
|
34
35
|
private eventTimeoutCheckHandle?;
|
|
35
36
|
private lastEventReceivedTime;
|
|
36
37
|
private eventParser;
|
|
37
38
|
constructor(url: string, eventSourceInit?: EventSourceInit & {
|
|
38
39
|
adapter?: (url: string, requestInit: RequestInit) => Observable<Request>;
|
|
39
40
|
eventTimeout?: number;
|
|
41
|
+
eventTimeoutCheckInterval?: number;
|
|
40
42
|
logger?: Logger;
|
|
41
43
|
});
|
|
42
44
|
connect(): void;
|
|
@@ -85,8 +85,10 @@ class FetchEventSource extends EventTarget {
|
|
|
85
85
|
eventSourceInit?.adapter ??
|
|
86
86
|
((_url, requestInit) => (0, rxjs_1.of)(new Request(_url, requestInit)));
|
|
87
87
|
this.eventTimeout =
|
|
88
|
-
eventSourceInit?.eventTimeout ??
|
|
89
|
-
|
|
88
|
+
eventSourceInit?.eventTimeout ?? FetchEventSource.EVENT_TIMEOUT_DEFAULT;
|
|
89
|
+
this.eventTimeoutCheckInterval =
|
|
90
|
+
eventSourceInit?.eventTimeoutCheckInterval ??
|
|
91
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
90
92
|
this.logger = (0, logger_1.levelLogger)(logger_1.LogLevel.Info, eventSourceInit?.logger);
|
|
91
93
|
}
|
|
92
94
|
get retryTime() {
|
|
@@ -186,7 +188,7 @@ class FetchEventSource extends EventTarget {
|
|
|
186
188
|
}
|
|
187
189
|
this.updateLastEventReceived(lastEventReceivedTime);
|
|
188
190
|
this.logger?.trace?.('starting event timeout checks');
|
|
189
|
-
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(),
|
|
191
|
+
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), this.eventTimeoutCheckInterval);
|
|
190
192
|
}
|
|
191
193
|
stopEventTimeoutCheck() {
|
|
192
194
|
if (this.eventTimeoutCheckHandle) {
|
|
@@ -307,6 +309,6 @@ exports.FetchEventSource = FetchEventSource;
|
|
|
307
309
|
FetchEventSource.LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
308
310
|
FetchEventSource.MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
309
311
|
FetchEventSource.RETRY_EXPONENT = 2.6;
|
|
310
|
-
FetchEventSource.EVENT_TIMEOUT_DEFAULT =
|
|
311
|
-
FetchEventSource.
|
|
312
|
+
FetchEventSource.EVENT_TIMEOUT_DEFAULT = 120 * 1000;
|
|
313
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT = 2 * 1000;
|
|
312
314
|
//# 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;AACnC,qCAAyD;AACzD,6CAAyC;AAEzC,oCAAoD;AAkBpD,MAAa,gBAAiB,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -41,8 +41,8 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
41
41
|
private static LAST_EVENT_ID_HEADER = 'Last-Event-ID';
|
|
42
42
|
private static MAX_RETRY_TIME_MULTIPLIER = 12;
|
|
43
43
|
private static RETRY_EXPONENT = 2.6;
|
|
44
|
-
private static EVENT_TIMEOUT_DEFAULT =
|
|
45
|
-
private static
|
|
44
|
+
private static EVENT_TIMEOUT_DEFAULT = 120 * 1000;
|
|
45
|
+
private static EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT = 2 * 1000;
|
|
46
46
|
|
|
47
47
|
CONNECTING = 0;
|
|
48
48
|
OPEN = 1;
|
|
@@ -72,6 +72,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
72
72
|
private lastEventId?: string;
|
|
73
73
|
private logger?: Logger;
|
|
74
74
|
private readonly eventTimeout?: number;
|
|
75
|
+
private readonly eventTimeoutCheckInterval: number;
|
|
75
76
|
private eventTimeoutCheckHandle?: number;
|
|
76
77
|
private lastEventReceivedTime = 0;
|
|
77
78
|
private eventParser = new EventParser();
|
|
@@ -81,6 +82,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
81
82
|
eventSourceInit?: EventSourceInit & {
|
|
82
83
|
adapter?: (url: string, requestInit: RequestInit) => Observable<Request>;
|
|
83
84
|
eventTimeout?: number;
|
|
85
|
+
eventTimeoutCheckInterval?: number;
|
|
84
86
|
logger?: Logger;
|
|
85
87
|
},
|
|
86
88
|
) {
|
|
@@ -90,8 +92,10 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
90
92
|
eventSourceInit?.adapter ??
|
|
91
93
|
((_url, requestInit) => of(new Request(_url, requestInit)));
|
|
92
94
|
this.eventTimeout =
|
|
93
|
-
eventSourceInit?.eventTimeout ??
|
|
94
|
-
|
|
95
|
+
eventSourceInit?.eventTimeout ?? FetchEventSource.EVENT_TIMEOUT_DEFAULT;
|
|
96
|
+
this.eventTimeoutCheckInterval =
|
|
97
|
+
eventSourceInit?.eventTimeoutCheckInterval ??
|
|
98
|
+
FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL_DEFAULT;
|
|
95
99
|
this.logger = levelLogger(LogLevel.Info, eventSourceInit?.logger);
|
|
96
100
|
}
|
|
97
101
|
|
|
@@ -230,7 +234,7 @@ export class FetchEventSource extends EventTarget implements ExtEventSource {
|
|
|
230
234
|
|
|
231
235
|
this.eventTimeoutCheckHandle = window.setInterval(
|
|
232
236
|
() => this.checkEventTimeout(),
|
|
233
|
-
|
|
237
|
+
this.eventTimeoutCheckInterval,
|
|
234
238
|
);
|
|
235
239
|
}
|
|
236
240
|
|