@outfoxx/sunday 1.1.0-beta.13 → 1.1.0-beta.15
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/event-parser.js +3 -4
- package/build/esm/event-parser.js.map +1 -1
- package/build/esm/fetch-event-source.js +29 -42
- package/build/esm/fetch-event-source.js.map +1 -1
- package/build/esm/fetch-request-factory.js +9 -12
- package/build/esm/fetch-request-factory.js.map +1 -1
- package/build/esm/fetch.js +5 -7
- package/build/esm/fetch.js.map +1 -1
- package/build/esm/media-type-codecs/cbor-decoder.js +8 -4
- package/build/esm/media-type-codecs/cbor-decoder.js.map +1 -1
- package/build/esm/media-type-codecs/cbor-encoder.d.ts +1 -0
- package/build/esm/media-type-codecs/cbor-encoder.js +10 -4
- package/build/esm/media-type-codecs/cbor-encoder.js.map +1 -1
- package/build/esm/media-type-codecs/json-encoder.js +4 -6
- package/build/esm/media-type-codecs/json-encoder.js.map +1 -1
- package/build/esm/media-type-codecs/media-type-decoder.js +1 -2
- package/build/esm/media-type-codecs/media-type-decoder.js.map +1 -1
- package/build/esm/media-type-codecs/media-type-encoder.js +2 -4
- package/build/esm/media-type-codecs/media-type-encoder.js.map +1 -1
- package/build/esm/media-type-codecs/www-form-url-encoder.js +1 -1
- package/build/esm/media-type-codecs/www-form-url-encoder.js.map +1 -1
- package/build/esm/media-type.js +14 -17
- package/build/esm/media-type.js.map +1 -1
- package/build/esm/problem.js +4 -7
- package/build/esm/problem.js.map +1 -1
- package/build/esm/util/any.js +1 -2
- package/build/esm/util/any.js.map +1 -1
- package/build/esm/util/error.js +1 -1
- package/build/esm/util/error.js.map +1 -1
- package/build/esm/util/stream-rxjs.js +1 -1
- package/build/esm/util/stream-rxjs.js.map +1 -1
- package/build/esnext/event-parser.js +3 -4
- package/build/esnext/event-parser.js.map +1 -1
- package/build/esnext/fetch-event-source.js +29 -42
- package/build/esnext/fetch-event-source.js.map +1 -1
- package/build/esnext/fetch-request-factory.js +9 -12
- package/build/esnext/fetch-request-factory.js.map +1 -1
- package/build/esnext/fetch.js +5 -7
- package/build/esnext/fetch.js.map +1 -1
- package/build/esnext/media-type-codecs/cbor-decoder.js +8 -4
- package/build/esnext/media-type-codecs/cbor-decoder.js.map +1 -1
- package/build/esnext/media-type-codecs/cbor-encoder.d.ts +1 -0
- package/build/esnext/media-type-codecs/cbor-encoder.js +10 -4
- package/build/esnext/media-type-codecs/cbor-encoder.js.map +1 -1
- package/build/esnext/media-type-codecs/json-encoder.js +4 -6
- package/build/esnext/media-type-codecs/json-encoder.js.map +1 -1
- package/build/esnext/media-type-codecs/media-type-decoder.js +1 -2
- package/build/esnext/media-type-codecs/media-type-decoder.js.map +1 -1
- package/build/esnext/media-type-codecs/media-type-encoder.js +2 -4
- package/build/esnext/media-type-codecs/media-type-encoder.js.map +1 -1
- package/build/esnext/media-type-codecs/www-form-url-encoder.js +1 -1
- package/build/esnext/media-type-codecs/www-form-url-encoder.js.map +1 -1
- package/build/esnext/media-type.js +14 -17
- package/build/esnext/media-type.js.map +1 -1
- package/build/esnext/problem.js +4 -7
- package/build/esnext/problem.js.map +1 -1
- package/build/esnext/util/any.js +1 -2
- package/build/esnext/util/any.js.map +1 -1
- package/build/esnext/util/error.js +1 -1
- package/build/esnext/util/error.js.map +1 -1
- package/build/esnext/util/stream-rxjs.js +1 -1
- package/build/esnext/util/stream-rxjs.js.map +1 -1
- package/build/main/event-parser.js +3 -4
- package/build/main/event-parser.js.map +1 -1
- package/build/main/fetch-event-source.js +29 -42
- package/build/main/fetch-event-source.js.map +1 -1
- package/build/main/fetch-request-factory.js +9 -12
- package/build/main/fetch-request-factory.js.map +1 -1
- package/build/main/fetch.js +5 -7
- package/build/main/fetch.js.map +1 -1
- package/build/main/media-type-codecs/cbor-decoder.js +8 -4
- package/build/main/media-type-codecs/cbor-decoder.js.map +1 -1
- package/build/main/media-type-codecs/cbor-encoder.d.ts +1 -0
- package/build/main/media-type-codecs/cbor-encoder.js +10 -4
- package/build/main/media-type-codecs/cbor-encoder.js.map +1 -1
- package/build/main/media-type-codecs/json-encoder.js +4 -6
- package/build/main/media-type-codecs/json-encoder.js.map +1 -1
- package/build/main/media-type-codecs/media-type-decoder.js +1 -2
- package/build/main/media-type-codecs/media-type-decoder.js.map +1 -1
- package/build/main/media-type-codecs/media-type-encoder.js +2 -4
- package/build/main/media-type-codecs/media-type-encoder.js.map +1 -1
- package/build/main/media-type-codecs/www-form-url-encoder.js +1 -1
- package/build/main/media-type-codecs/www-form-url-encoder.js.map +1 -1
- package/build/main/media-type.js +14 -17
- package/build/main/media-type.js.map +1 -1
- package/build/main/problem.js +4 -7
- package/build/main/problem.js.map +1 -1
- package/build/main/util/any.js +1 -2
- package/build/main/util/any.js.map +1 -1
- package/build/main/util/error.js +1 -1
- package/build/main/util/error.js.map +1 -1
- package/build/main/util/stream-rxjs.js +1 -1
- package/build/main/util/stream-rxjs.js.map +1 -1
- package/package.json +2 -2
|
@@ -22,7 +22,6 @@ const any_1 = require("./util/any");
|
|
|
22
22
|
const stream_rxjs_1 = require("./util/stream-rxjs");
|
|
23
23
|
class FetchEventSource extends EventTarget {
|
|
24
24
|
constructor(url, eventSourceInit) {
|
|
25
|
-
var _a, _b;
|
|
26
25
|
super();
|
|
27
26
|
this.CONNECTING = 0;
|
|
28
27
|
this.OPEN = 1;
|
|
@@ -41,16 +40,15 @@ class FetchEventSource extends EventTarget {
|
|
|
41
40
|
// Event Dispatch
|
|
42
41
|
//
|
|
43
42
|
this.dispatchParsedEvent = (eventInfo) => {
|
|
44
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
45
43
|
this.lastEventReceivedTime = Date.now();
|
|
46
44
|
if (eventInfo.retry) {
|
|
47
45
|
const retryTime = Number.parseInt(eventInfo.retry, 10);
|
|
48
46
|
if (Number.isSafeInteger(retryTime)) {
|
|
49
|
-
|
|
47
|
+
this.logger?.debug?.('updating retry timeout', { retryTime });
|
|
50
48
|
this.internalRetryTime = retryTime;
|
|
51
49
|
}
|
|
52
50
|
else {
|
|
53
|
-
|
|
51
|
+
this.logger?.debug?.('ignoring invalid retry timeout event', {
|
|
54
52
|
eventInfo,
|
|
55
53
|
});
|
|
56
54
|
}
|
|
@@ -69,25 +67,27 @@ class FetchEventSource extends EventTarget {
|
|
|
69
67
|
this.lastEventId = eventInfo.id;
|
|
70
68
|
}
|
|
71
69
|
else {
|
|
72
|
-
|
|
70
|
+
this.logger?.debug?.('event id contains null, unable to use for last-event-id');
|
|
73
71
|
}
|
|
74
72
|
}
|
|
75
73
|
// Dispatch event
|
|
76
|
-
const event = new MessageEvent(
|
|
74
|
+
const event = new MessageEvent(eventInfo.event ?? 'message', {
|
|
77
75
|
data: eventInfo.data,
|
|
78
76
|
lastEventId: this.lastEventId,
|
|
79
77
|
origin: this.connectionOrigin,
|
|
80
78
|
});
|
|
81
|
-
|
|
79
|
+
this.onmessage?.(event);
|
|
82
80
|
this.dispatchEvent(event);
|
|
83
81
|
};
|
|
84
82
|
this.url = url;
|
|
85
83
|
this.adapter =
|
|
86
|
-
|
|
84
|
+
eventSourceInit?.adapter ??
|
|
85
|
+
((_url, requestInit) => (0, rxjs_1.of)(new Request(_url, requestInit)));
|
|
87
86
|
this.eventTimeout =
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
this.
|
|
87
|
+
eventSourceInit?.eventTimeout ??
|
|
88
|
+
FetchEventSource.EVENT_TIMEOUT_DEFAULT * 1000;
|
|
89
|
+
this.logger = eventSourceInit?.logger;
|
|
90
|
+
this.externalAbortController = eventSourceInit?.abortController;
|
|
91
91
|
}
|
|
92
92
|
get retryTime() {
|
|
93
93
|
return this.internalRetryTime;
|
|
@@ -96,16 +96,14 @@ class FetchEventSource extends EventTarget {
|
|
|
96
96
|
// Connect
|
|
97
97
|
//
|
|
98
98
|
connect() {
|
|
99
|
-
var _a, _b;
|
|
100
99
|
if (this.readyState === this.CONNECTING || this.readyState === this.OPEN) {
|
|
101
|
-
|
|
100
|
+
this.logger?.trace?.('skipping connect', { state: this.readyState });
|
|
102
101
|
return;
|
|
103
102
|
}
|
|
104
103
|
this.internalConnect();
|
|
105
104
|
}
|
|
106
105
|
internalConnect() {
|
|
107
|
-
|
|
108
|
-
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.call(_a, 'connecting');
|
|
106
|
+
this.logger?.debug?.('connecting');
|
|
109
107
|
this.readyState = this.CONNECTING;
|
|
110
108
|
const headers = new Headers({
|
|
111
109
|
accept: media_type_1.MediaType.EventStream.toString(),
|
|
@@ -113,7 +111,7 @@ class FetchEventSource extends EventTarget {
|
|
|
113
111
|
if (this.lastEventId) {
|
|
114
112
|
headers.append(FetchEventSource.LAST_EVENT_ID_HEADER, this.lastEventId);
|
|
115
113
|
}
|
|
116
|
-
const abortController =
|
|
114
|
+
const abortController = this.externalAbortController ?? new AbortController();
|
|
117
115
|
const requestInit = {
|
|
118
116
|
headers,
|
|
119
117
|
cache: 'no-store',
|
|
@@ -145,14 +143,12 @@ class FetchEventSource extends EventTarget {
|
|
|
145
143
|
// Close
|
|
146
144
|
//
|
|
147
145
|
close() {
|
|
148
|
-
|
|
149
|
-
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug) === null || _b === void 0 ? void 0 : _b.call(_a, 'close requested');
|
|
146
|
+
this.logger?.debug?.('close requested');
|
|
150
147
|
this.readyState = this.CLOSED;
|
|
151
148
|
this.internalClose();
|
|
152
149
|
}
|
|
153
150
|
internalClose() {
|
|
154
|
-
|
|
155
|
-
(_a = this.connectionSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
|
|
151
|
+
this.connectionSubscription?.unsubscribe();
|
|
156
152
|
this.connectionSubscription = undefined;
|
|
157
153
|
this.clearReconnect();
|
|
158
154
|
this.stopEventTimeoutCheck();
|
|
@@ -161,34 +157,31 @@ class FetchEventSource extends EventTarget {
|
|
|
161
157
|
// Event Timeout
|
|
162
158
|
//
|
|
163
159
|
startEventTimeoutCheck(lastEventReceivedTime) {
|
|
164
|
-
var _a, _b;
|
|
165
160
|
this.stopEventTimeoutCheck();
|
|
166
161
|
if (!this.eventTimeout) {
|
|
167
162
|
return;
|
|
168
163
|
}
|
|
169
164
|
this.lastEventReceivedTime = lastEventReceivedTime;
|
|
170
|
-
|
|
165
|
+
this.logger?.trace?.('starting event timeout checks');
|
|
171
166
|
this.eventTimeoutCheckHandle = window.setInterval(() => this.checkEventTimeout(), FetchEventSource.EVENT_TIMEOUT_CHECK_INTERVAL * 1000);
|
|
172
167
|
}
|
|
173
168
|
stopEventTimeoutCheck() {
|
|
174
|
-
|
|
175
|
-
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.trace) === null || _b === void 0 ? void 0 : _b.call(_a, 'stopping event timeout checks');
|
|
169
|
+
this.logger?.trace?.('stopping event timeout checks');
|
|
176
170
|
if (this.eventTimeoutCheckHandle) {
|
|
177
171
|
clearInterval(this.eventTimeoutCheckHandle);
|
|
178
172
|
}
|
|
179
173
|
this.eventTimeoutCheckHandle = undefined;
|
|
180
174
|
}
|
|
181
175
|
checkEventTimeout() {
|
|
182
|
-
var _a, _b, _c, _d;
|
|
183
176
|
if (!this.eventTimeout) {
|
|
184
177
|
this.stopEventTimeoutCheck();
|
|
185
178
|
return;
|
|
186
179
|
}
|
|
187
|
-
|
|
180
|
+
this.logger?.trace?.('checking event timeout');
|
|
188
181
|
// Check elapsed time since last received event
|
|
189
182
|
const elapsed = Date.now() - this.lastEventReceivedTime;
|
|
190
183
|
if (elapsed > this.eventTimeout) {
|
|
191
|
-
|
|
184
|
+
this.logger?.debug?.('event timeout reached', {
|
|
192
185
|
elapsed,
|
|
193
186
|
});
|
|
194
187
|
this.fireErrorEvent(Error('EventTimeout'));
|
|
@@ -199,16 +192,15 @@ class FetchEventSource extends EventTarget {
|
|
|
199
192
|
// Connection Handlers
|
|
200
193
|
//
|
|
201
194
|
receivedHeaders(response) {
|
|
202
|
-
var _a, _b, _c, _d, _e;
|
|
203
195
|
if (this.readyState !== this.CONNECTING) {
|
|
204
|
-
|
|
196
|
+
this.logger?.error?.('invalid readyState for receivedHeaders', {
|
|
205
197
|
readyState: this.readyState,
|
|
206
198
|
});
|
|
207
199
|
this.fireErrorEvent(Error('InvalidState'));
|
|
208
200
|
this.scheduleReconnect();
|
|
209
201
|
return;
|
|
210
202
|
}
|
|
211
|
-
|
|
203
|
+
this.logger?.debug?.('opened');
|
|
212
204
|
this.connectionOrigin = response.url;
|
|
213
205
|
this.retryAttempt = 0;
|
|
214
206
|
this.readyState = this.OPEN;
|
|
@@ -216,46 +208,42 @@ class FetchEventSource extends EventTarget {
|
|
|
216
208
|
// connect as last time we received an event
|
|
217
209
|
this.startEventTimeoutCheck(Date.now());
|
|
218
210
|
const event = new Event('open');
|
|
219
|
-
|
|
211
|
+
this.onopen?.(event);
|
|
220
212
|
this.dispatchEvent(event);
|
|
221
213
|
}
|
|
222
214
|
receivedData(buffer) {
|
|
223
|
-
var _a, _b, _c, _d;
|
|
224
215
|
if (this.readyState !== this.OPEN) {
|
|
225
|
-
|
|
216
|
+
this.logger?.error?.('invalid readyState for receiveData', {
|
|
226
217
|
readyState: this.readyState,
|
|
227
218
|
});
|
|
228
219
|
this.fireErrorEvent(Error('InvalidState'));
|
|
229
220
|
this.scheduleReconnect();
|
|
230
221
|
return;
|
|
231
222
|
}
|
|
232
|
-
|
|
223
|
+
this.logger?.debug?.('received data', { length: buffer.byteLength });
|
|
233
224
|
this.eventParser.process(buffer, this.dispatchParsedEvent);
|
|
234
225
|
}
|
|
235
226
|
receivedError(error) {
|
|
236
|
-
var _a, _b;
|
|
237
227
|
if (this.readyState === this.CLOSED) {
|
|
238
228
|
return;
|
|
239
229
|
}
|
|
240
|
-
|
|
230
|
+
this.logger?.debug?.('received error', { error });
|
|
241
231
|
this.fireErrorEvent(error);
|
|
242
232
|
if (this.readyState !== this.CLOSED) {
|
|
243
233
|
this.scheduleReconnect();
|
|
244
234
|
}
|
|
245
235
|
}
|
|
246
236
|
receivedComplete() {
|
|
247
|
-
var _a, _b;
|
|
248
237
|
if (this.readyState == this.CLOSED) {
|
|
249
238
|
return;
|
|
250
239
|
}
|
|
251
|
-
|
|
240
|
+
this.logger?.debug?.('received complete');
|
|
252
241
|
this.scheduleReconnect();
|
|
253
242
|
}
|
|
254
243
|
//
|
|
255
244
|
// Reconnection
|
|
256
245
|
//
|
|
257
246
|
scheduleReconnect() {
|
|
258
|
-
var _a, _b;
|
|
259
247
|
this.internalClose();
|
|
260
248
|
// calculate total delay
|
|
261
249
|
const backOffDelay = Math.pow(this.retryAttempt, 2) * this.retryTime;
|
|
@@ -270,7 +258,7 @@ class FetchEventSource extends EventTarget {
|
|
|
270
258
|
}
|
|
271
259
|
this.retryAttempt++;
|
|
272
260
|
this.readyState = this.CONNECTING;
|
|
273
|
-
|
|
261
|
+
this.logger?.debug?.('scheduling reconnect', { retryDelay });
|
|
274
262
|
this.reconnectTimeoutHandle = window.setTimeout(() => this.internalConnect(), retryDelay);
|
|
275
263
|
}
|
|
276
264
|
clearReconnect() {
|
|
@@ -280,10 +268,9 @@ class FetchEventSource extends EventTarget {
|
|
|
280
268
|
this.reconnectTimeoutHandle = undefined;
|
|
281
269
|
}
|
|
282
270
|
fireErrorEvent(error) {
|
|
283
|
-
var _a;
|
|
284
271
|
const event = new Event('error');
|
|
285
272
|
(0, any_1.unknownSet)(event, 'error', error);
|
|
286
|
-
|
|
273
|
+
this.onerror?.(event);
|
|
287
274
|
}
|
|
288
275
|
}
|
|
289
276
|
exports.FetchEventSource = FetchEventSource;
|
|
@@ -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,+BAAgF;AAChF,iDAAwD;AACxD,mCAAmC;AAEnC,6CAAyC;AAEzC,oCAAwC;AACxC,oDAAgD;AAiBhD,MAAa,gBAAiB,SAAQ,WAAW;IAuC/C,YACE,GAAW,EACX,eAKC
|
|
1
|
+
{"version":3,"file":"fetch-event-source.js","sourceRoot":"","sources":["../../src/fetch-event-source.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,16 +27,15 @@ const url_template_1 = require("./url-template");
|
|
|
27
27
|
const error_1 = require("./util/error");
|
|
28
28
|
class FetchRequestFactory {
|
|
29
29
|
constructor(baseUrl, options) {
|
|
30
|
-
var _a, _b, _c;
|
|
31
30
|
this.problemTypes = new Map();
|
|
32
31
|
this.baseUrl =
|
|
33
32
|
typeof baseUrl === 'string' ? new url_template_1.URLTemplate(baseUrl) : baseUrl;
|
|
34
|
-
this.adapter = options
|
|
33
|
+
this.adapter = options?.adapter;
|
|
35
34
|
this.mediaTypeEncoders =
|
|
36
|
-
|
|
35
|
+
options?.mediaTypeEncoders ?? media_type_encoders_1.MediaTypeEncoders.DEFAULT;
|
|
37
36
|
this.mediaTypeDecoders =
|
|
38
|
-
|
|
39
|
-
this.logger =
|
|
37
|
+
options?.mediaTypeDecoders ?? media_type_decoders_1.MediaTypeDecoders.DEFAULT;
|
|
38
|
+
this.logger = options?.logger ?? console;
|
|
40
39
|
}
|
|
41
40
|
registerProblem(type, problemType) {
|
|
42
41
|
const typeStr = type instanceof URL ? type.toString() : type;
|
|
@@ -45,8 +44,7 @@ class FetchRequestFactory {
|
|
|
45
44
|
request(requestSpec, requestInit) {
|
|
46
45
|
//
|
|
47
46
|
return (0, rxjs_1.defer)(() => {
|
|
48
|
-
|
|
49
|
-
const url = this.baseUrl.complete(requestSpec.pathTemplate, (_a = requestSpec.pathParameters) !== null && _a !== void 0 ? _a : {});
|
|
47
|
+
const url = this.baseUrl.complete(requestSpec.pathTemplate, requestSpec.pathParameters ?? {});
|
|
50
48
|
if (requestSpec.queryParameters) {
|
|
51
49
|
const encoder = this.mediaTypeEncoders.find(media_type_1.MediaType.WWWFormUrlEncoded);
|
|
52
50
|
if (!(0, media_type_encoder_1.isURLQueryParamsEncoder)(encoder)) {
|
|
@@ -65,7 +63,7 @@ class FetchRequestFactory {
|
|
|
65
63
|
headers.set('accept', accept);
|
|
66
64
|
}
|
|
67
65
|
// Determine content type
|
|
68
|
-
const contentType =
|
|
66
|
+
const contentType = requestSpec.contentTypes?.find((type) => this.mediaTypeEncoders.supports(type));
|
|
69
67
|
// If matched, add content type (even if body is nil, to match any expected server requirements)
|
|
70
68
|
if (contentType) {
|
|
71
69
|
headers.set('content-type', contentType.toString());
|
|
@@ -86,11 +84,11 @@ class FetchRequestFactory {
|
|
|
86
84
|
method: requestSpec.method,
|
|
87
85
|
});
|
|
88
86
|
return (0, rxjs_1.of)(new Request(url.toString(), init));
|
|
89
|
-
}).pipe((0, rxjs_1.switchMap)(async (request) =>
|
|
87
|
+
}).pipe((0, rxjs_1.switchMap)(async (request) => this.adapter?.adapt(this, request) ?? request));
|
|
90
88
|
}
|
|
91
89
|
response(request, dataExpected) {
|
|
92
90
|
const request$ = request instanceof Request ? (0, rxjs_1.of)(request) : this.request(request);
|
|
93
|
-
return request$.pipe((0, rxjs_1.switchMap)((req) => fetch(req)), (0, rxjs_1.switchMap)((response) => (0, fetch_1.validate)(response, dataExpected
|
|
91
|
+
return request$.pipe((0, rxjs_1.switchMap)((req) => fetch(req)), (0, rxjs_1.switchMap)((response) => (0, fetch_1.validate)(response, dataExpected ?? false, this.problemTypes)));
|
|
94
92
|
}
|
|
95
93
|
resultResponse(request, responseType) {
|
|
96
94
|
const response$ = this.response(request, !!responseType);
|
|
@@ -170,8 +168,7 @@ class FetchRequestFactory {
|
|
|
170
168
|
}
|
|
171
169
|
};
|
|
172
170
|
eventSource.onerror = (event) => {
|
|
173
|
-
|
|
174
|
-
(_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.call(_a, { event }, 'event source error');
|
|
171
|
+
this.logger?.error?.({ event }, 'event source error');
|
|
175
172
|
};
|
|
176
173
|
eventSource.connect();
|
|
177
174
|
return () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-request-factory.js","sourceRoot":"","sources":["../../src/fetch-request-factory.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,+BAA6D;AAG7D,mCAAmC;AACnC,6DAAwD;AACxD,2DAAuD;AAEvD,6CAAyC;AAEzC,iFAA4E;AAC5E,+EAAiF;AACjF,iFAA4E;AAS5E,iDAA6C;AAC7C,iDAA6C;AAC7C,wCAA8C;AAE9C,MAAa,mBAAmB;IAQ9B,YACE,OAA6B,EAC7B,OAKC
|
|
1
|
+
{"version":3,"file":"fetch-request-factory.js","sourceRoot":"","sources":["../../src/fetch-request-factory.ts"],"names":[],"mappings":"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"}
|
package/build/main/fetch.js
CHANGED
|
@@ -20,20 +20,19 @@ const sunday_error_1 = require("./sunday-error");
|
|
|
20
20
|
const base64_1 = require("./util/base64");
|
|
21
21
|
const error_1 = require("./util/error");
|
|
22
22
|
async function validate(response, dataExpected, problemTypes) {
|
|
23
|
-
var _a, _b;
|
|
24
23
|
if (response.status < 200 || response.status >= 300) {
|
|
25
24
|
const mediaType = media_type_1.MediaType.from(response.headers.get('content-type'), media_type_1.MediaType.OctetStream);
|
|
26
|
-
const isProblem =
|
|
25
|
+
const isProblem = mediaType?.compatible(media_type_1.MediaType.Problem) ?? false;
|
|
27
26
|
if (!isProblem) {
|
|
28
27
|
throw await problem_1.Problem.fromResponse(response);
|
|
29
28
|
}
|
|
30
29
|
const problemData = await response.json();
|
|
31
|
-
const problemType =
|
|
30
|
+
const problemType = problemTypes?.get(problemData.type) ?? problem_1.Problem;
|
|
32
31
|
if (problemType.name === 'Problem') {
|
|
33
32
|
throw new problem_1.Problem(problemData);
|
|
34
33
|
}
|
|
35
34
|
else {
|
|
36
|
-
throw new problemType(problemData
|
|
35
|
+
throw new problemType(problemData?.instance);
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
38
|
if (dataExpected && (response.status === 204 || response.status === 205)) {
|
|
@@ -50,15 +49,14 @@ var ResponseExample;
|
|
|
50
49
|
.map(([name, value]) => `${name}: ${value}\n`)
|
|
51
50
|
.join('') +
|
|
52
51
|
'\n' +
|
|
53
|
-
(bodyExample
|
|
52
|
+
(bodyExample ?? '<none>'));
|
|
54
53
|
}
|
|
55
54
|
ResponseExample.build = build;
|
|
56
55
|
async function bodyExcerpt(response, maxLength) {
|
|
57
|
-
var _a;
|
|
58
56
|
let body;
|
|
59
57
|
let bodyExcerpt;
|
|
60
58
|
try {
|
|
61
|
-
if (
|
|
59
|
+
if (response.headers.get('content-type')?.startsWith('text/')) {
|
|
62
60
|
const text = await response.text();
|
|
63
61
|
body = text;
|
|
64
62
|
if (text.length > maxLength) {
|
package/build/main/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.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;;;AAGjC,6CAAyC;AACzC,uCAAoC;AACpC,iDAA6C;AAC7C,0CAAuC;AACvC,wCAA8C;AAEvC,KAAK,UAAU,QAAQ,CAC5B,QAAkB,EAClB,YAAqB,EACrB,YAA2D
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.CBORDecoder = void 0;
|
|
17
17
|
const core_1 = require("@js-joda/core");
|
|
18
|
-
const cbor_redux_1 = require("
|
|
18
|
+
const cbor_redux_1 = require("cbor-redux");
|
|
19
19
|
const jackson_js_1 = require("@outfoxx/jackson-js");
|
|
20
20
|
const base64_1 = require("../util/base64");
|
|
21
21
|
const cbor_tags_1 = require("./cbor-tags");
|
|
@@ -23,8 +23,12 @@ class CBORDecoder {
|
|
|
23
23
|
constructor(numericDateDecoding) {
|
|
24
24
|
this.numericDateDecoding = numericDateDecoding;
|
|
25
25
|
this.parser = new jackson_js_1.JsonParser();
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
this.untag = (key, value) => {
|
|
27
|
+
if (!(value instanceof cbor_redux_1.TaggedValue)) {
|
|
28
|
+
return value;
|
|
29
|
+
}
|
|
30
|
+
const tag = value.tag;
|
|
31
|
+
value = value.value;
|
|
28
32
|
switch (tag) {
|
|
29
33
|
case cbor_tags_1.isoDateTimeTag:
|
|
30
34
|
if (typeof value !== 'string') {
|
|
@@ -403,7 +407,7 @@ class CBORDecoder {
|
|
|
403
407
|
return this.decodeData(await response.arrayBuffer(), type);
|
|
404
408
|
}
|
|
405
409
|
decodeData(buffer, type) {
|
|
406
|
-
return this.parser.transform(cbor_redux_1.CBOR.decode(buffer, this.untag), {
|
|
410
|
+
return this.parser.transform(cbor_redux_1.CBOR.decode(buffer, this.untag, { mode: 'loose' }), {
|
|
407
411
|
deserializers: this.customDeserializers,
|
|
408
412
|
mainCreator: () => type,
|
|
409
413
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cbor-decoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-decoder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cbor-decoder.js","sourceRoot":"","sources":["../../../src/media-type-codecs/cbor-decoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export declare class CBOREncoder implements MediaTypeEncoder {
|
|
|
9
9
|
constructor(dateEncoding: CBOREncoder.DateEncoding);
|
|
10
10
|
encode<T>(value: T, type?: AnyType): ArrayBuffer;
|
|
11
11
|
private encodeJSON;
|
|
12
|
+
private arrayBufferSerializer;
|
|
12
13
|
private instantSerializer;
|
|
13
14
|
private zonedDateTimeSerializer;
|
|
14
15
|
private offsetDateTimeSerializer;
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.CBOREncoder = void 0;
|
|
17
17
|
const core_1 = require("@js-joda/core");
|
|
18
|
-
const cbor_redux_1 = require("
|
|
18
|
+
const cbor_redux_1 = require("cbor-redux");
|
|
19
19
|
const jackson_js_1 = require("@outfoxx/jackson-js");
|
|
20
20
|
require("reflect-metadata");
|
|
21
21
|
const temporal_1 = require("../util/temporal");
|
|
@@ -24,6 +24,9 @@ class CBOREncoder {
|
|
|
24
24
|
constructor(dateEncoding) {
|
|
25
25
|
this.dateEncoding = dateEncoding;
|
|
26
26
|
this.stringifier = new jackson_js_1.JsonStringifier();
|
|
27
|
+
this.arrayBufferSerializer = (_, value) => {
|
|
28
|
+
return value == null ? null : new Uint8Array(value);
|
|
29
|
+
};
|
|
27
30
|
this.instantSerializer = (_, value) => {
|
|
28
31
|
if (value == null) {
|
|
29
32
|
return null;
|
|
@@ -192,6 +195,10 @@ class CBOREncoder {
|
|
|
192
195
|
type: () => URL,
|
|
193
196
|
mapper: this.urlSerializer,
|
|
194
197
|
},
|
|
198
|
+
{
|
|
199
|
+
type: () => ArrayBuffer,
|
|
200
|
+
mapper: this.arrayBufferSerializer,
|
|
201
|
+
},
|
|
195
202
|
];
|
|
196
203
|
}
|
|
197
204
|
static get default() {
|
|
@@ -201,16 +208,15 @@ class CBOREncoder {
|
|
|
201
208
|
return cbor_redux_1.CBOR.encode(this.encodeJSON(value, type));
|
|
202
209
|
}
|
|
203
210
|
encodeJSON(value, type) {
|
|
204
|
-
var _a;
|
|
205
211
|
// Use natural type when subtypes exist
|
|
206
212
|
if (Reflect.hasMetadata('jackson:defaultContextGroup:JsonSubTypes',
|
|
207
213
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
208
|
-
|
|
214
|
+
value.constructor ?? {})) {
|
|
209
215
|
type = [Object];
|
|
210
216
|
}
|
|
211
217
|
return this.stringifier.transform(value, {
|
|
212
218
|
serializers: this.customSerializers,
|
|
213
|
-
mainCreator: () => type
|
|
219
|
+
mainCreator: () => type ?? [Object],
|
|
214
220
|
});
|
|
215
221
|
}
|
|
216
222
|
}
|