@tstdl/base 0.78.0-beta53 → 0.78.0-beta54
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.
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import type { HttpBodyType } from "../../types";
|
|
2
|
+
import type { UndefinableJson } from "../../../types";
|
|
2
3
|
import type { HttpClientResponse } from '../http-client-response';
|
|
3
4
|
export declare function getResponseStream(response: HttpClientResponse): AsyncIterable<Uint8Array>;
|
|
4
5
|
export declare function getResponseBuffer(response: HttpClientResponse): Promise<Uint8Array>;
|
|
5
6
|
export declare function getResponseText(response: HttpClientResponse): Promise<string>;
|
|
7
|
+
export declare function getResponseJson(response: HttpClientResponse): Promise<UndefinableJson>;
|
|
6
8
|
/**
|
|
7
9
|
* set body of response to correct type (modifies instance)
|
|
8
10
|
* @param response response with either stream of buffer as body
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setBody = exports.getResponseText = exports.getResponseBuffer = exports.getResponseStream = void 0;
|
|
3
|
+
exports.setBody = exports.getResponseJson = exports.getResponseText = exports.getResponseBuffer = exports.getResponseStream = void 0;
|
|
4
4
|
const is_async_iterable_1 = require("../../../utils/async-iterable-helpers/is-async-iterable");
|
|
5
5
|
const compression_1 = require("../../../utils/compression");
|
|
6
6
|
const encoding_1 = require("../../../utils/encoding");
|
|
@@ -40,6 +40,11 @@ async function getResponseText(response) {
|
|
|
40
40
|
return (0, encoding_1.decodeText)(buffer, response.headers.charset);
|
|
41
41
|
}
|
|
42
42
|
exports.getResponseText = getResponseText;
|
|
43
|
+
async function getResponseJson(response) {
|
|
44
|
+
const text = await getResponseText(response);
|
|
45
|
+
return JSON.parse(text);
|
|
46
|
+
}
|
|
47
|
+
exports.getResponseJson = getResponseJson;
|
|
43
48
|
/**
|
|
44
49
|
* set body of response to correct type (modifies instance)
|
|
45
50
|
* @param response response with either stream of buffer as body
|
|
@@ -65,8 +70,7 @@ async function setBody(response, type) {
|
|
|
65
70
|
break;
|
|
66
71
|
}
|
|
67
72
|
case 'json': {
|
|
68
|
-
|
|
69
|
-
response.body = JSON.parse(text);
|
|
73
|
+
response.body = await getResponseJson(response);
|
|
70
74
|
break;
|
|
71
75
|
}
|
|
72
76
|
case 'buffer': {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../source/http/client/adapters/utils.ts"],"names":[],"mappings":";;;AAEA,+FAAmF;AACnF,4DAAiD;AACjD,sDAA8C;AAC9C,uEAAgE;AAChE,4DAA0E;AAG1E,SAAgB,iBAAiB,CAAC,QAA4B;IAC5D,IAAI,CAAC,IAAA,mCAAe,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB,CAAC;AAND,8CAMC;AAEM,KAAK,UAAU,iBAAiB,CAAC,QAA4B;IAClE,IAAI,UAAsB,CAAC;IAE3B,IAAI,IAAA,0BAAY,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC/B,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC;KAC5B;SACI,IAAI,IAAA,2BAAa,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACrC,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAC5C;SACI,IAAI,IAAA,oBAAM,EAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAC9B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QACjD,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;KACrC;SACI;QACH,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC3C,UAAU,GAAG,MAAM,IAAA,gCAAgB,EAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KAC7E;IAED,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,SAAS,CAAC,EAAE;QACrJ,UAAU,GAAG,MAAM,IAAA,wBAAU,EAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;KACxF;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAvBD,8CAuBC;AAEM,KAAK,UAAU,eAAe,CAAC,QAA4B;IAChE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO,IAAA,qBAAU,EAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACtD,CAAC;AAHD,0CAGC;AAED;;;;GAIG;AACH,0CAA0C;AACnC,KAAK,UAAU,OAAO,CAAC,QAA4B,EAAE,IAAkB;IAC5E,QAAQ,IAAI,EAAE;QACZ,KAAK,MAAM,CAAC,CAAC;YACX,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;gBAC1D,MAAM,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACjC;iBACI,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE;gBACjE,MAAM,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACjC;iBACI;gBACH,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;aACnC;YAED,MAAM;SACP;QAED,KAAK,MAAM,CAAC,CAAC;YACV,QAA6C,CAAC,IAAI,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC,CAAC;YACtF,MAAM;SACP;QAED,KAAK,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../source/http/client/adapters/utils.ts"],"names":[],"mappings":"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"}
|
package/http/http.error.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { TypedOmit, UndefinableJson } from "../types";
|
|
2
|
-
import type { ErrorExtraInfo } from "../utils";
|
|
2
|
+
import type { ErrorExtraInfo } from "../utils/format-error";
|
|
3
3
|
import { CustomError } from '../error';
|
|
4
4
|
import type { HttpClientRequest, HttpClientRequestObject, HttpClientResponse, HttpClientResponseObject } from './client';
|
|
5
5
|
export declare enum HttpErrorReason {
|
package/http/http.error.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HttpError = exports.HttpErrorReason = void 0;
|
|
4
|
+
const async_iterable_helpers_1 = require("../utils/async-iterable-helpers");
|
|
5
|
+
const property_name_1 = require("../utils/object/property-name");
|
|
4
6
|
const type_guards_1 = require("../utils/type-guards");
|
|
5
7
|
const error_1 = require("../error");
|
|
6
8
|
var HttpErrorReason;
|
|
@@ -19,22 +21,39 @@ class HttpError extends error_1.CustomError {
|
|
|
19
21
|
this.request = request.asObject();
|
|
20
22
|
this.response = response?.asObject();
|
|
21
23
|
if ((0, type_guards_1.isDefined)(this.response)) {
|
|
22
|
-
|
|
24
|
+
Reflect.deleteProperty(this.response, 'request');
|
|
23
25
|
}
|
|
24
|
-
Object.defineProperty(this,
|
|
26
|
+
Object.defineProperty(this, (0, property_name_1.propertyNameOf)((instance) => instance.requestInstance), {
|
|
25
27
|
value: request,
|
|
26
28
|
enumerable: false
|
|
27
29
|
});
|
|
28
|
-
Object.defineProperty(this,
|
|
30
|
+
Object.defineProperty(this, (0, property_name_1.propertyNameOf)((instance) => instance.responseInstance), {
|
|
29
31
|
value: response,
|
|
30
32
|
enumerable: false
|
|
31
33
|
});
|
|
32
34
|
}
|
|
33
35
|
getExtraInfo() {
|
|
34
|
-
|
|
36
|
+
const extraInfo = {
|
|
35
37
|
url: this.request.url,
|
|
36
38
|
method: this.request.method
|
|
37
39
|
};
|
|
40
|
+
if ((0, type_guards_1.isDefined)(this.response)) {
|
|
41
|
+
const responseExtraInfo = {};
|
|
42
|
+
responseExtraInfo['statusCode'] = this.response.statusCode;
|
|
43
|
+
responseExtraInfo['statusMessage'] = this.response.statusMessage;
|
|
44
|
+
responseExtraInfo['headers'] = this.response.body;
|
|
45
|
+
if (this.response.body instanceof Uint8Array) {
|
|
46
|
+
responseExtraInfo['body'] = '[Uint8Array]';
|
|
47
|
+
}
|
|
48
|
+
if ((0, async_iterable_helpers_1.isAsyncIterable)(this.response.body)) {
|
|
49
|
+
responseExtraInfo['body'] = '[AsyncIterable]';
|
|
50
|
+
}
|
|
51
|
+
if (!(0, type_guards_1.isUndefined)(this.response.body)) {
|
|
52
|
+
responseExtraInfo['body'] = this.response.body;
|
|
53
|
+
}
|
|
54
|
+
extraInfo['response'] = responseExtraInfo;
|
|
55
|
+
}
|
|
56
|
+
return extraInfo;
|
|
38
57
|
}
|
|
39
58
|
}
|
|
40
59
|
exports.HttpError = HttpError;
|
package/http/http.error.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.error.js","sourceRoot":"","sources":["../../source/http/http.error.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"http.error.js","sourceRoot":"","sources":["../../source/http/http.error.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tstdl/base",
|
|
3
|
-
"version": "0.78.0-
|
|
3
|
+
"version": "0.78.0-beta54",
|
|
4
4
|
"author": "Patrick Hein",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"@elastic/elasticsearch": "^8.4",
|
|
41
41
|
"@koa/router": "^12.0",
|
|
42
|
-
"@tstdl/angular": "^0.11.0-
|
|
42
|
+
"@tstdl/angular": "^0.11.0-beta54",
|
|
43
43
|
"chroma-js": "^2.4",
|
|
44
44
|
"got": "^12.4",
|
|
45
45
|
"handlebars": "^4.7",
|