@nestia/fetcher 3.2.6 → 3.3.0-dev.20240624
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/lib/EncryptedFetcher.js +1 -1
- package/lib/EncryptedFetcher.js.map +1 -1
- package/lib/IConnection.d.ts +6 -1
- package/lib/PlainFetcher.js +1 -1
- package/lib/PlainFetcher.js.map +1 -1
- package/lib/internal/FetcherBase.d.ts +1 -12
- package/lib/internal/FetcherBase.js +61 -105
- package/lib/internal/FetcherBase.js.map +1 -1
- package/package.json +1 -5
- package/src/EncryptedFetcher.ts +1 -1
- package/src/IConnection.ts +6 -1
- package/src/PlainFetcher.ts +1 -1
- package/src/internal/FetcherBase.ts +8 -29
- package/lib/internal/Singleton.d.ts +0 -1
- package/lib/internal/Singleton.js +0 -24
- package/lib/internal/Singleton.js.map +0 -1
- package/src/internal/Singleton.ts +0 -20
package/lib/EncryptedFetcher.js
CHANGED
|
@@ -74,7 +74,7 @@ var EncryptedFetcher;
|
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
: function () { return function () { return connection.encryption; }; };
|
|
77
|
-
return [2 /*return*/, FetcherBase_1.FetcherBase.
|
|
77
|
+
return [2 /*return*/, FetcherBase_1.FetcherBase.request({
|
|
78
78
|
className: "EncryptedFetcher",
|
|
79
79
|
encode: ((_c = route.request) === null || _c === void 0 ? void 0 : _c.encrypted) === true
|
|
80
80
|
? function (input, headers) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EncryptedFetcher.js","sourceRoot":"","sources":["../src/EncryptedFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AAKtC,sDAAqD;AAErD;;;;;;;;;;;;;GAaG;AACH,IAAiB,gBAAgB,CAwJhC;AAxJD,WAAiB,gBAAgB;IAuC/B,SAAsB,KAAK,CACzB,UAAuB,EACvB,KAAwE,EACxE,KAAa,EACb,SAAoC;;;;;gBAEpC,IACE,CAAC,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,MAAK,IAAI,KAAI,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,CAAA,CAAC;oBAChE,UAAU,CAAC,UAAU,KAAK,SAAS;oBAEnC,MAAM,IAAI,KAAK,CACb,qFAAqF,CACtF,CAAC;gBACE,OAAO,GACX,OAAO,UAAU,CAAC,UAAU,KAAK,UAAU;oBACzC,CAAC,CAAC,UAAC,SAA8B;wBAC7B,OAAA,UACE,OAA4D,EAC5D,IAAY;4BAEZ,OAAC,UAAU,CAAC,UAA0C,CAAC;gCACrD,OAAO,SAAA;gCACP,IAAI,MAAA;gCACJ,SAAS,WAAA;6BACV,CAAC;wBAJF,CAIE;oBARJ,CAQI;oBACR,CAAC,CAAC,cAAM,OAAA,cAAM,OAAA,UAAU,CAAC,UAAiC,EAA5C,CAA4C,EAAlD,CAAkD,CAAC;gBAE/D,sBAAO,yBAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"EncryptedFetcher.js","sourceRoot":"","sources":["../src/EncryptedFetcher.ts"],"names":[],"mappings":"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"}
|
package/lib/IConnection.d.ts
CHANGED
|
@@ -65,8 +65,13 @@ export interface IConnection<Headers extends object | undefined = object | undef
|
|
|
65
65
|
/**
|
|
66
66
|
* Custom fetch function.
|
|
67
67
|
*
|
|
68
|
-
* If you want to use custom `fetch` function instead of built-in
|
|
68
|
+
* If you want to use custom `fetch` function instead of built-in,
|
|
69
69
|
* assign your custom `fetch` function into this property.
|
|
70
|
+
*
|
|
71
|
+
* For reference, the `fetch` function has started to be supported
|
|
72
|
+
* since version 20 of NodeJS. Therefore, if you are using NodeJS
|
|
73
|
+
* version 19 or lower, you have to assign the `node-fetch` module
|
|
74
|
+
* into this property.
|
|
70
75
|
*/
|
|
71
76
|
fetch?: typeof fetch;
|
|
72
77
|
}
|
package/lib/PlainFetcher.js
CHANGED
|
@@ -61,7 +61,7 @@ var PlainFetcher;
|
|
|
61
61
|
return __generator(this, function (_c) {
|
|
62
62
|
if (((_a = route.request) === null || _a === void 0 ? void 0 : _a.encrypted) === true || ((_b = route.response) === null || _b === void 0 ? void 0 : _b.encrypted) === true)
|
|
63
63
|
throw new Error("Error on PlainFetcher.fetch(): PlainFetcher doesn't have encryption ability. Use EncryptedFetcher instead.");
|
|
64
|
-
return [2 /*return*/, FetcherBase_1.FetcherBase.
|
|
64
|
+
return [2 /*return*/, FetcherBase_1.FetcherBase.request({
|
|
65
65
|
className: "PlainFetcher",
|
|
66
66
|
encode: function (input) { return input; },
|
|
67
67
|
decode: function (input) { return input; },
|
package/lib/PlainFetcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PlainFetcher.js","sourceRoot":"","sources":["../src/PlainFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,sDAAqD;AAErD;;;;;;;;;;;;;;GAcG;AACH,IAAiB,YAAY,CAoF5B;AApFD,WAAiB,YAAY;IAuC3B,SAAsB,KAAK,CACzB,UAAuB,EACvB,KAAwE,EACxE,KAAa,EACb,SAAoC;;;;gBAEpC,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,MAAK,IAAI,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,MAAK,IAAI;oBACzE,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAC;gBACJ,sBAAO,yBAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"PlainFetcher.js","sourceRoot":"","sources":["../src/PlainFetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,sDAAqD;AAErD;;;;;;;;;;;;;;GAcG;AACH,IAAiB,YAAY,CAoF5B;AApFD,WAAiB,YAAY;IAuC3B,SAAsB,KAAK,CACzB,UAAuB,EACvB,KAAwE,EACxE,KAAa,EACb,SAAoC;;;;gBAEpC,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,MAAK,IAAI,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,MAAK,IAAI;oBACzE,MAAM,IAAI,KAAK,CACb,4GAA4G,CAC7G,CAAC;gBACJ,sBAAO,yBAAW,CAAC,OAAO,CAAC;wBACzB,SAAS,EAAE,cAAc;wBACzB,MAAM,EAAE,UAAC,KAAK,IAAK,OAAA,KAAK,EAAL,CAAK;wBACxB,MAAM,EAAE,UAAC,KAAK,IAAK,OAAA,KAAK,EAAL,CAAK;qBACzB,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,EAAC;;;KACzC;IAfqB,kBAAK,QAe1B,CAAA;IAcD,SAAsB,SAAS,CAC7B,UAAuB,EACvB,KAAwE,EACxE,KAAa,EACb,SAAoC;;;;gBAEpC,IAAI,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,SAAS,MAAK,IAAI,IAAI,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,SAAS,MAAK,IAAI;oBACzE,MAAM,IAAI,KAAK,CACb,gHAAgH,CACjH,CAAC;gBACJ,sBAAO,yBAAW,CAAC,SAAS,CAAC;wBAC3B,SAAS,EAAE,cAAc;wBACzB,MAAM,EAAE,UAAC,KAAK,IAAK,OAAA,KAAK,EAAL,CAAK;wBACxB,MAAM,EAAE,UAAC,KAAK,IAAK,OAAA,KAAK,EAAL,CAAK;qBACzB,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAoB,EAAC;;;KAC5D;IAfqB,sBAAS,YAe9B,CAAA;AACH,CAAC,EApFgB,YAAY,4BAAZ,YAAY,QAoF5B"}
|
|
@@ -1,12 +1 @@
|
|
|
1
|
-
|
|
2
|
-
import { IFetchRoute } from "../IFetchRoute";
|
|
3
|
-
import { IPropagation } from "../IPropagation";
|
|
4
|
-
export declare namespace FetcherBase {
|
|
5
|
-
interface IProps {
|
|
6
|
-
className: string;
|
|
7
|
-
encode: (input: any, headers: Record<string, IConnection.HeaderValue | undefined>) => string;
|
|
8
|
-
decode: (input: string, headers: Record<string, IConnection.HeaderValue | undefined>) => any;
|
|
9
|
-
}
|
|
10
|
-
const fetch: (props: IProps) => <Input, Output>(connection: IConnection, route: IFetchRoute<"DELETE" | "GET" | "HEAD" | "PATCH" | "POST" | "PUT">, input?: Input, stringify?: (input: Input) => string) => Promise<Output>;
|
|
11
|
-
const propagate: (props: IProps) => <Input>(connection: IConnection, route: IFetchRoute<"DELETE" | "GET" | "HEAD" | "PATCH" | "POST" | "PUT">, input?: Input, stringify?: (input: Input) => string) => Promise<IPropagation<any, any>>;
|
|
12
|
-
}
|
|
1
|
+
export {};
|
|
@@ -82,18 +82,16 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
82
82
|
}
|
|
83
83
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
84
84
|
};
|
|
85
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
86
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
87
|
-
};
|
|
88
85
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
89
86
|
exports.FetcherBase = void 0;
|
|
90
|
-
var import2_1 = __importDefault(require("import2"));
|
|
91
87
|
var HttpError_1 = require("../HttpError");
|
|
92
|
-
|
|
88
|
+
/**
|
|
89
|
+
* @internal
|
|
90
|
+
*/
|
|
93
91
|
var FetcherBase;
|
|
94
92
|
(function (FetcherBase) {
|
|
95
93
|
var _this = this;
|
|
96
|
-
FetcherBase.
|
|
94
|
+
FetcherBase.request = function (props) {
|
|
97
95
|
return function (connection, route, input, stringify) { return __awaiter(_this, void 0, void 0, function () {
|
|
98
96
|
var result;
|
|
99
97
|
return __generator(this, function (_a) {
|
|
@@ -119,18 +117,18 @@ var FetcherBase;
|
|
|
119
117
|
var _Propagate = function (method) {
|
|
120
118
|
return function (props) {
|
|
121
119
|
return function (connection, route, input, stringify) { return __awaiter(_this, void 0, void 0, function () {
|
|
122
|
-
var headers, init, path, url, event, response,
|
|
123
|
-
var _h, _j, _k, _l, _m, _o, _p, _q
|
|
124
|
-
return __generator(this, function (
|
|
125
|
-
switch (
|
|
120
|
+
var headers, init, path, url, event, response, result, _a, type, text, query, _b, _c, _d, _e, exp_1, _f;
|
|
121
|
+
var _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
122
|
+
return __generator(this, function (_r) {
|
|
123
|
+
switch (_r.label) {
|
|
126
124
|
case 0:
|
|
127
|
-
headers = __assign({}, ((
|
|
125
|
+
headers = __assign({}, ((_g = connection.headers) !== null && _g !== void 0 ? _g : {}));
|
|
128
126
|
if (input !== undefined)
|
|
129
|
-
if (((
|
|
127
|
+
if (((_h = route.request) === null || _h === void 0 ? void 0 : _h.type) === undefined)
|
|
130
128
|
throw new Error("Error on ".concat(props.className, ".fetch(): no content-type being configured."));
|
|
131
129
|
else if (route.request.type !== "multipart/form-data")
|
|
132
130
|
headers["Content-Type"] = route.request.type;
|
|
133
|
-
init = __assign(__assign({}, ((
|
|
131
|
+
init = __assign(__assign({}, ((_j = connection.options) !== null && _j !== void 0 ? _j : {})), { method: route.method, headers: (function () {
|
|
134
132
|
var e_1, _a, e_2, _b;
|
|
135
133
|
var output = [];
|
|
136
134
|
try {
|
|
@@ -169,11 +167,11 @@ var FetcherBase;
|
|
|
169
167
|
if (input !== undefined)
|
|
170
168
|
init.body = props.encode(
|
|
171
169
|
// BODY TRANSFORM
|
|
172
|
-
((
|
|
170
|
+
((_k = route.request) === null || _k === void 0 ? void 0 : _k.type) === "application/x-www-form-urlencoded"
|
|
173
171
|
? request_query_body(input)
|
|
174
|
-
: ((
|
|
172
|
+
: ((_l = route.request) === null || _l === void 0 ? void 0 : _l.type) === "multipart/form-data"
|
|
175
173
|
? request_form_data_body(input)
|
|
176
|
-
: ((
|
|
174
|
+
: ((_m = route.request) === null || _m === void 0 ? void 0 : _m.type) !== "text/plain"
|
|
177
175
|
? (stringify !== null && stringify !== void 0 ? stringify : JSON.stringify)(input)
|
|
178
176
|
: input, headers);
|
|
179
177
|
path = connection.host[connection.host.length - 1] !== "/" &&
|
|
@@ -191,19 +189,12 @@ var FetcherBase;
|
|
|
191
189
|
respond_at: null,
|
|
192
190
|
completed_at: null,
|
|
193
191
|
};
|
|
194
|
-
|
|
192
|
+
_r.label = 1;
|
|
195
193
|
case 1:
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
case 2: return [4 /*yield*/, polyfill.get()];
|
|
201
|
-
case 3:
|
|
202
|
-
_a = (_s.sent());
|
|
203
|
-
_s.label = 4;
|
|
204
|
-
case 4: return [4 /*yield*/, (_a)(url.href, init)];
|
|
205
|
-
case 5:
|
|
206
|
-
response = _s.sent();
|
|
194
|
+
_r.trys.push([1, 12, 13, 18]);
|
|
195
|
+
return [4 /*yield*/, ((_o = connection.fetch) !== null && _o !== void 0 ? _o : fetch)(url.href, init)];
|
|
196
|
+
case 2:
|
|
197
|
+
response = _r.sent();
|
|
207
198
|
event.respond_at = new Date();
|
|
208
199
|
event.status = response.status;
|
|
209
200
|
result = {
|
|
@@ -214,13 +205,13 @@ var FetcherBase;
|
|
|
214
205
|
headers: response_headers_to_object(response.headers),
|
|
215
206
|
data: undefined,
|
|
216
207
|
};
|
|
217
|
-
if (!(result.success === false)) return [3 /*break*/,
|
|
208
|
+
if (!(result.success === false)) return [3 /*break*/, 4];
|
|
218
209
|
// WHEN FAILED
|
|
219
|
-
|
|
210
|
+
_a = result;
|
|
220
211
|
return [4 /*yield*/, response.text()];
|
|
221
|
-
case
|
|
212
|
+
case 3:
|
|
222
213
|
// WHEN FAILED
|
|
223
|
-
|
|
214
|
+
_a.data = _r.sent();
|
|
224
215
|
type = response.headers.get("content-type");
|
|
225
216
|
if (method !== "fetch" &&
|
|
226
217
|
type &&
|
|
@@ -228,96 +219,61 @@ var FetcherBase;
|
|
|
228
219
|
try {
|
|
229
220
|
result.data = JSON.parse(result.data);
|
|
230
221
|
}
|
|
231
|
-
catch (
|
|
232
|
-
return [3 /*break*/,
|
|
233
|
-
case
|
|
234
|
-
if (!(route.method === "HEAD")) return [3 /*break*/,
|
|
222
|
+
catch (_s) { }
|
|
223
|
+
return [3 /*break*/, 11];
|
|
224
|
+
case 4:
|
|
225
|
+
if (!(route.method === "HEAD")) return [3 /*break*/, 5];
|
|
235
226
|
result.data = undefined;
|
|
236
|
-
return [3 /*break*/,
|
|
237
|
-
case
|
|
238
|
-
if (!(((
|
|
227
|
+
return [3 /*break*/, 11];
|
|
228
|
+
case 5:
|
|
229
|
+
if (!(((_p = route.response) === null || _p === void 0 ? void 0 : _p.type) === "application/json")) return [3 /*break*/, 7];
|
|
239
230
|
return [4 /*yield*/, response.text()];
|
|
240
|
-
case
|
|
241
|
-
text =
|
|
231
|
+
case 6:
|
|
232
|
+
text = _r.sent();
|
|
242
233
|
result.data = text.length ? JSON.parse(text) : undefined;
|
|
243
|
-
return [3 /*break*/,
|
|
244
|
-
case
|
|
245
|
-
if (!(((
|
|
246
|
-
|
|
234
|
+
return [3 /*break*/, 11];
|
|
235
|
+
case 7:
|
|
236
|
+
if (!(((_q = route.response) === null || _q === void 0 ? void 0 : _q.type) === "application/x-www-form-urlencoded")) return [3 /*break*/, 9];
|
|
237
|
+
_b = URLSearchParams.bind;
|
|
247
238
|
return [4 /*yield*/, response.text()];
|
|
248
|
-
case
|
|
249
|
-
query = new (
|
|
239
|
+
case 8:
|
|
240
|
+
query = new (_b.apply(URLSearchParams, [void 0, _r.sent()]))();
|
|
250
241
|
result.data = route.parseQuery ? route.parseQuery(query) : query;
|
|
251
|
-
return [3 /*break*/,
|
|
252
|
-
case
|
|
253
|
-
|
|
254
|
-
|
|
242
|
+
return [3 /*break*/, 11];
|
|
243
|
+
case 9:
|
|
244
|
+
_c = result;
|
|
245
|
+
_e = (_d = props).decode;
|
|
255
246
|
return [4 /*yield*/, response.text()];
|
|
256
|
-
case
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
case
|
|
247
|
+
case 10:
|
|
248
|
+
_c.data = _e.apply(_d, [_r.sent(), result.headers]);
|
|
249
|
+
_r.label = 11;
|
|
250
|
+
case 11:
|
|
260
251
|
event.output = result.data;
|
|
261
252
|
return [2 /*return*/, result];
|
|
262
|
-
case
|
|
263
|
-
exp_1 =
|
|
253
|
+
case 12:
|
|
254
|
+
exp_1 = _r.sent();
|
|
264
255
|
throw exp_1;
|
|
265
|
-
case
|
|
256
|
+
case 13:
|
|
266
257
|
event.completed_at = new Date();
|
|
267
|
-
if (!connection.logger) return [3 /*break*/,
|
|
268
|
-
|
|
269
|
-
case
|
|
270
|
-
|
|
258
|
+
if (!connection.logger) return [3 /*break*/, 17];
|
|
259
|
+
_r.label = 14;
|
|
260
|
+
case 14:
|
|
261
|
+
_r.trys.push([14, 16, , 17]);
|
|
271
262
|
return [4 /*yield*/, connection.logger(event)];
|
|
272
|
-
case
|
|
273
|
-
|
|
274
|
-
return [3 /*break*/,
|
|
275
|
-
case
|
|
276
|
-
|
|
277
|
-
return [3 /*break*/,
|
|
278
|
-
case
|
|
279
|
-
case
|
|
263
|
+
case 15:
|
|
264
|
+
_r.sent();
|
|
265
|
+
return [3 /*break*/, 17];
|
|
266
|
+
case 16:
|
|
267
|
+
_f = _r.sent();
|
|
268
|
+
return [3 /*break*/, 17];
|
|
269
|
+
case 17: return [7 /*endfinally*/];
|
|
270
|
+
case 18: return [2 /*return*/];
|
|
280
271
|
}
|
|
281
272
|
});
|
|
282
273
|
}); };
|
|
283
274
|
};
|
|
284
275
|
};
|
|
285
276
|
})(FetcherBase || (exports.FetcherBase = FetcherBase = {}));
|
|
286
|
-
/**
|
|
287
|
-
* @internal
|
|
288
|
-
*/
|
|
289
|
-
var polyfill = new Singleton_1.Singleton(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
290
|
-
function is_node_process(m) {
|
|
291
|
-
return (m !== null &&
|
|
292
|
-
typeof m.process === "object" &&
|
|
293
|
-
m.process !== null &&
|
|
294
|
-
typeof m.process.versions === "object" &&
|
|
295
|
-
m.process.versions !== null &&
|
|
296
|
-
typeof m.process.versions.node !== "undefined");
|
|
297
|
-
}
|
|
298
|
-
var m, _a, _b;
|
|
299
|
-
var _c;
|
|
300
|
-
return __generator(this, function (_d) {
|
|
301
|
-
switch (_d.label) {
|
|
302
|
-
case 0:
|
|
303
|
-
if (!(typeof global === "object" && is_node_process(global))) return [3 /*break*/, 4];
|
|
304
|
-
m = global;
|
|
305
|
-
if (!((_c = m.fetch) !== null && _c !== void 0)) return [3 /*break*/, 1];
|
|
306
|
-
_a = _c;
|
|
307
|
-
return [3 /*break*/, 3];
|
|
308
|
-
case 1:
|
|
309
|
-
_b = m;
|
|
310
|
-
return [4 /*yield*/, (0, import2_1.default)("node-fetch")];
|
|
311
|
-
case 2:
|
|
312
|
-
_a = (_b.fetch = (_d.sent()).default);
|
|
313
|
-
_d.label = 3;
|
|
314
|
-
case 3:
|
|
315
|
-
_a;
|
|
316
|
-
return [2 /*return*/, m.fetch];
|
|
317
|
-
case 4: return [2 /*return*/, self.fetch];
|
|
318
|
-
}
|
|
319
|
-
});
|
|
320
|
-
}); });
|
|
321
277
|
/**
|
|
322
278
|
* @internal
|
|
323
279
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FetcherBase.js","sourceRoot":"","sources":["../../src/internal/FetcherBase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FetcherBase.js","sourceRoot":"","sources":["../../src/internal/FetcherBase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestia/fetcher",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.3.0-dev.20240624",
|
|
4
4
|
"description": "Fetcher library of Nestia SDK",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -35,10 +35,6 @@
|
|
|
35
35
|
"peerDependencies": {
|
|
36
36
|
"typescript": ">= 4.8.0"
|
|
37
37
|
},
|
|
38
|
-
"dependencies": {
|
|
39
|
-
"import2": "^1.0.3",
|
|
40
|
-
"node-fetch": "^2.6.7"
|
|
41
|
-
},
|
|
42
38
|
"files": [
|
|
43
39
|
"README.md",
|
|
44
40
|
"LICENSE",
|
package/src/EncryptedFetcher.ts
CHANGED
package/src/IConnection.ts
CHANGED
|
@@ -75,8 +75,13 @@ export interface IConnection<
|
|
|
75
75
|
/**
|
|
76
76
|
* Custom fetch function.
|
|
77
77
|
*
|
|
78
|
-
* If you want to use custom `fetch` function instead of built-in
|
|
78
|
+
* If you want to use custom `fetch` function instead of built-in,
|
|
79
79
|
* assign your custom `fetch` function into this property.
|
|
80
|
+
*
|
|
81
|
+
* For reference, the `fetch` function has started to be supported
|
|
82
|
+
* since version 20 of NodeJS. Therefore, if you are using NodeJS
|
|
83
|
+
* version 19 or lower, you have to assign the `node-fetch` module
|
|
84
|
+
* into this property.
|
|
80
85
|
*/
|
|
81
86
|
fetch?: typeof fetch;
|
|
82
87
|
}
|
package/src/PlainFetcher.ts
CHANGED
|
@@ -67,7 +67,7 @@ export namespace PlainFetcher {
|
|
|
67
67
|
throw new Error(
|
|
68
68
|
"Error on PlainFetcher.fetch(): PlainFetcher doesn't have encryption ability. Use EncryptedFetcher instead.",
|
|
69
69
|
);
|
|
70
|
-
return FetcherBase.
|
|
70
|
+
return FetcherBase.request({
|
|
71
71
|
className: "PlainFetcher",
|
|
72
72
|
encode: (input) => input,
|
|
73
73
|
decode: (input) => input,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import import2 from "import2";
|
|
2
|
-
|
|
3
1
|
import { HttpError } from "../HttpError";
|
|
4
2
|
import { IConnection } from "../IConnection";
|
|
5
3
|
import { IFetchEvent } from "../IFetchEvent";
|
|
6
4
|
import { IFetchRoute } from "../IFetchRoute";
|
|
7
5
|
import { IPropagation } from "../IPropagation";
|
|
8
|
-
import { Singleton } from "./Singleton";
|
|
9
6
|
|
|
7
|
+
/**
|
|
8
|
+
* @internal
|
|
9
|
+
*/
|
|
10
10
|
export namespace FetcherBase {
|
|
11
11
|
export interface IProps {
|
|
12
12
|
className: string;
|
|
@@ -20,7 +20,7 @@ export namespace FetcherBase {
|
|
|
20
20
|
) => any;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
export const
|
|
23
|
+
export const request =
|
|
24
24
|
(props: IProps) =>
|
|
25
25
|
async <Input, Output>(
|
|
26
26
|
connection: IConnection,
|
|
@@ -135,9 +135,10 @@ export namespace FetcherBase {
|
|
|
135
135
|
};
|
|
136
136
|
try {
|
|
137
137
|
// TRY FETCH
|
|
138
|
-
const response: Response = await (
|
|
139
|
-
|
|
140
|
-
|
|
138
|
+
const response: Response = await (connection.fetch ?? fetch)(
|
|
139
|
+
url.href,
|
|
140
|
+
init,
|
|
141
|
+
);
|
|
141
142
|
event.respond_at = new Date();
|
|
142
143
|
event.status = response.status;
|
|
143
144
|
|
|
@@ -193,28 +194,6 @@ export namespace FetcherBase {
|
|
|
193
194
|
};
|
|
194
195
|
}
|
|
195
196
|
|
|
196
|
-
/**
|
|
197
|
-
* @internal
|
|
198
|
-
*/
|
|
199
|
-
const polyfill = new Singleton(async (): Promise<typeof fetch> => {
|
|
200
|
-
function is_node_process(m: typeof global | null): boolean {
|
|
201
|
-
return (
|
|
202
|
-
m !== null &&
|
|
203
|
-
typeof m.process === "object" &&
|
|
204
|
-
m.process !== null &&
|
|
205
|
-
typeof m.process.versions === "object" &&
|
|
206
|
-
m.process.versions !== null &&
|
|
207
|
-
typeof m.process.versions.node !== "undefined"
|
|
208
|
-
);
|
|
209
|
-
}
|
|
210
|
-
if (typeof global === "object" && is_node_process(global)) {
|
|
211
|
-
const m: any = global as any;
|
|
212
|
-
m.fetch ??= ((await import2("node-fetch")) as any).default;
|
|
213
|
-
return (m as any).fetch;
|
|
214
|
-
}
|
|
215
|
-
return self.fetch;
|
|
216
|
-
});
|
|
217
|
-
|
|
218
197
|
/**
|
|
219
198
|
* @internal
|
|
220
199
|
*/
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Singleton = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* @internal
|
|
6
|
-
*/
|
|
7
|
-
var Singleton = /** @class */ (function () {
|
|
8
|
-
function Singleton(closure_) {
|
|
9
|
-
this.closure_ = closure_;
|
|
10
|
-
this.value_ = NOT_MOUNTED_YET;
|
|
11
|
-
}
|
|
12
|
-
Singleton.prototype.get = function () {
|
|
13
|
-
if (this.value_ === NOT_MOUNTED_YET)
|
|
14
|
-
this.value_ = this.closure_();
|
|
15
|
-
return this.value_;
|
|
16
|
-
};
|
|
17
|
-
return Singleton;
|
|
18
|
-
}());
|
|
19
|
-
exports.Singleton = Singleton;
|
|
20
|
-
/**
|
|
21
|
-
* @internal
|
|
22
|
-
*/
|
|
23
|
-
var NOT_MOUNTED_YET = {};
|
|
24
|
-
//# sourceMappingURL=Singleton.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Singleton.js","sourceRoot":"","sources":["../../src/internal/Singleton.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH;IAGE,mBAAoC,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;QACnD,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC;IAChC,CAAC;IAEM,uBAAG,GAAV;QACE,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe;YAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC,MAAW,CAAC;IAC1B,CAAC;IACH,gBAAC;AAAD,CAAC,AAXD,IAWC;AAXY,8BAAS;AAatB;;GAEG;AACH,IAAM,eAAe,GAAG,EAAE,CAAC"}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @internal
|
|
3
|
-
*/
|
|
4
|
-
export class Singleton<T> {
|
|
5
|
-
private value_: T | object;
|
|
6
|
-
|
|
7
|
-
public constructor(private readonly closure_: () => T) {
|
|
8
|
-
this.value_ = NOT_MOUNTED_YET;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
public get(): T {
|
|
12
|
-
if (this.value_ === NOT_MOUNTED_YET) this.value_ = this.closure_();
|
|
13
|
-
return this.value_ as T;
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
/**
|
|
18
|
-
* @internal
|
|
19
|
-
*/
|
|
20
|
-
const NOT_MOUNTED_YET = {};
|