@nestia/fetcher 1.5.0-dev.20230802-3 → 1.5.0-dev.20230802-4
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/Fetcher.js +12 -13
- package/lib/Fetcher.js.map +1 -1
- package/package.json +1 -1
- package/src/Fetcher.ts +2 -3
package/lib/Fetcher.js
CHANGED
|
@@ -100,22 +100,21 @@ var Fetcher = /** @class */ (function () {
|
|
|
100
100
|
function Fetcher() {
|
|
101
101
|
}
|
|
102
102
|
Fetcher.fetch = function (connection, encrypted, method, path, input, stringify) {
|
|
103
|
-
var _a, _b, _c, _d
|
|
103
|
+
var _a, _b, _c, _d;
|
|
104
104
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
105
|
var headers, init, url, response, text, content, ret;
|
|
106
|
-
return __generator(this, function (
|
|
107
|
-
switch (
|
|
106
|
+
return __generator(this, function (_e) {
|
|
107
|
+
switch (_e.label) {
|
|
108
108
|
case 0:
|
|
109
109
|
if (encrypted.request === true || encrypted.response === true)
|
|
110
110
|
if (connection.encryption === undefined)
|
|
111
111
|
throw new Error("Error on nestia.Fetcher.encrypt(): the encryption password has not been configured.");
|
|
112
112
|
headers = __assign({}, ((_a = connection.headers) !== null && _a !== void 0 ? _a : {}));
|
|
113
113
|
if (method !== "GET" && method !== "DELETE")
|
|
114
|
-
headers["Content-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
init = __assign(__assign({}, ((_d = connection.options) !== null && _d !== void 0 ? _d : {})), { method: method, headers: (function () {
|
|
114
|
+
(_b = headers["Content-Type"]) !== null && _b !== void 0 ? _b : (headers["Content-Type"] = encrypted.request === true || typeof input === "string"
|
|
115
|
+
? "text/plain"
|
|
116
|
+
: "application/json");
|
|
117
|
+
init = __assign(__assign({}, ((_c = connection.options) !== null && _c !== void 0 ? _c : {})), { method: method, headers: (function () {
|
|
119
118
|
var e_1, _a, e_2, _b;
|
|
120
119
|
var output = [];
|
|
121
120
|
try {
|
|
@@ -175,12 +174,12 @@ var Fetcher = /** @class */ (function () {
|
|
|
175
174
|
path = "/" + path;
|
|
176
175
|
url = new URL("".concat(connection.host).concat(path));
|
|
177
176
|
return [4 /*yield*/, polyfill.get()];
|
|
178
|
-
case 1: return [4 /*yield*/, (
|
|
177
|
+
case 1: return [4 /*yield*/, (_e.sent())(url.href, init)];
|
|
179
178
|
case 2:
|
|
180
|
-
response =
|
|
179
|
+
response = _e.sent();
|
|
181
180
|
return [4 /*yield*/, response.text()];
|
|
182
181
|
case 3:
|
|
183
|
-
text =
|
|
182
|
+
text = _e.sent();
|
|
184
183
|
if (!text)
|
|
185
184
|
return [2 /*return*/, undefined];
|
|
186
185
|
// CHECK THE STATUS CODE
|
|
@@ -205,7 +204,7 @@ var Fetcher = /** @class */ (function () {
|
|
|
205
204
|
try {
|
|
206
205
|
// PARSE RESPONSE BODY
|
|
207
206
|
if (encrypted.response ||
|
|
208
|
-
((
|
|
207
|
+
((_d = response.headers.get("Content-Type")) !== null && _d !== void 0 ? _d : "").indexOf("application/json") !== -1)
|
|
209
208
|
ret = JSON.parse(ret);
|
|
210
209
|
// FIND __SET_HEADERS__ FIELD
|
|
211
210
|
if (ret.__set_headers__ !== undefined &&
|
|
@@ -215,7 +214,7 @@ var Fetcher = /** @class */ (function () {
|
|
|
215
214
|
Object.assign(connection.headers, ret.__set_headers__);
|
|
216
215
|
}
|
|
217
216
|
}
|
|
218
|
-
catch (
|
|
217
|
+
catch (_f) { }
|
|
219
218
|
// RETURNS
|
|
220
219
|
return [2 /*return*/, ret];
|
|
221
220
|
}
|
package/lib/Fetcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../src/Fetcher.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA8B;AAM9B,uCAAsC;AACtC,yCAAwC;AACxC,kDAAiD;AAEjD;;;;;;;;;;;;;GAaG;AACH;IAAA;
|
|
1
|
+
{"version":3,"file":"Fetcher.js","sourceRoot":"","sources":["../src/Fetcher.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Fetcher.ts
CHANGED
|
@@ -81,9 +81,8 @@ export class Fetcher {
|
|
|
81
81
|
...(connection.headers ?? {}),
|
|
82
82
|
};
|
|
83
83
|
if (method !== "GET" && method !== "DELETE")
|
|
84
|
-
headers["Content-
|
|
85
|
-
|
|
86
|
-
(encrypted.request === true || typeof input === "string")
|
|
84
|
+
headers["Content-Type"] ??=
|
|
85
|
+
encrypted.request === true || typeof input === "string"
|
|
87
86
|
? "text/plain"
|
|
88
87
|
: "application/json";
|
|
89
88
|
|