@datocms/rest-client-utils 5.8.0 → 6.1.1
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/dist/cjs/__tests__/request.test.js +85 -0
- package/dist/cjs/__tests__/request.test.js.map +1 -0
- package/dist/cjs/errors.js +14 -0
- package/dist/cjs/errors.js.map +1 -1
- package/dist/cjs/request.js +35 -7
- package/dist/cjs/request.js.map +1 -1
- package/dist/esm/__tests__/buildNormalizedParams.test.js +2 -11
- package/dist/esm/__tests__/buildNormalizedParams.test.js.map +1 -1
- package/dist/esm/__tests__/request.test.d.ts +1 -0
- package/dist/esm/__tests__/request.test.js +78 -0
- package/dist/esm/__tests__/request.test.js.map +1 -0
- package/dist/esm/deserialize.js +23 -8
- package/dist/esm/deserialize.js.map +1 -1
- package/dist/esm/errors.js +14 -0
- package/dist/esm/errors.js.map +1 -1
- package/dist/esm/pollJobResult.js +15 -26
- package/dist/esm/pollJobResult.js.map +1 -1
- package/dist/esm/rawPageIterator.js +26 -40
- package/dist/esm/rawPageIterator.js.map +1 -1
- package/dist/esm/request.js +140 -117
- package/dist/esm/request.js.map +1 -1
- package/dist/esm/serialize.js +11 -16
- package/dist/esm/serialize.js.map +1 -1
- package/dist/types/__tests__/request.test.d.ts +1 -0
- package/package.json +2 -2
- package/src/__tests__/request.test.ts +105 -0
- package/src/errors.ts +17 -0
- package/src/request.ts +44 -8
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const errors_1 = require("../errors");
|
|
13
|
+
const request_1 = require("../request");
|
|
14
|
+
const API_TOKEN = 'aaaabbbbccccdddd';
|
|
15
|
+
function jsonResponse(status, body) {
|
|
16
|
+
return new Response(JSON.stringify(body), {
|
|
17
|
+
status,
|
|
18
|
+
statusText: 'Unprocessable Entity',
|
|
19
|
+
headers: { 'Content-Type': 'application/json' },
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
function buildOptions(fetchFn) {
|
|
23
|
+
return {
|
|
24
|
+
baseUrl: 'https://site-api.datocms.com',
|
|
25
|
+
fetchJobResult: () => __awaiter(this, void 0, void 0, function* () {
|
|
26
|
+
throw new Error('not needed');
|
|
27
|
+
}),
|
|
28
|
+
fetchFn,
|
|
29
|
+
apiToken: API_TOKEN,
|
|
30
|
+
method: 'GET',
|
|
31
|
+
url: '/items/bad-id',
|
|
32
|
+
autoRetry: false,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
describe('request()', () => {
|
|
36
|
+
it('sends the real API token, but keeps it out of the error', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
let sentAuthorization;
|
|
38
|
+
const fetchFn = jest.fn((_url, init) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
|
+
var _a;
|
|
40
|
+
sentAuthorization = (_a = init === null || init === void 0 ? void 0 : init.headers) === null || _a === void 0 ? void 0 : _a.authorization;
|
|
41
|
+
return jsonResponse(422, { data: [] });
|
|
42
|
+
}));
|
|
43
|
+
const error = yield (0, request_1.request)(buildOptions(fetchFn)).then(() => {
|
|
44
|
+
throw new Error('expected the request to fail');
|
|
45
|
+
}, (error) => error);
|
|
46
|
+
expect(error).toBeInstanceOf(errors_1.ApiError);
|
|
47
|
+
expect(sentAuthorization).toBe(`Bearer ${API_TOKEN}`);
|
|
48
|
+
expect(error.request.headers.authorization).toBe('[REDACTED, ending in dddd]');
|
|
49
|
+
expect(JSON.stringify(error)).not.toContain(API_TOKEN);
|
|
50
|
+
}));
|
|
51
|
+
it('keeps the token out of a timeout error too', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const fetchFn = (() => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
|
+
const error = new Error('timeout');
|
|
54
|
+
error.code = 'ETIMEDOUT';
|
|
55
|
+
throw error;
|
|
56
|
+
}));
|
|
57
|
+
const error = yield (0, request_1.request)(Object.assign(Object.assign({}, buildOptions(fetchFn)), { autoRetry: false })).then(() => {
|
|
58
|
+
throw new Error('expected the request to fail');
|
|
59
|
+
}, (error) => error);
|
|
60
|
+
expect(error).toBeInstanceOf(errors_1.TimeoutError);
|
|
61
|
+
expect(error.request.headers.authorization).toBe('[REDACTED, ending in dddd]');
|
|
62
|
+
}));
|
|
63
|
+
it('does not spill the failed call through incidental serialization', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
|
+
const fetchFn = (() => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
|
+
return jsonResponse(422, {
|
|
66
|
+
data: [],
|
|
67
|
+
});
|
|
68
|
+
}));
|
|
69
|
+
const error = yield (0, request_1.request)(Object.assign(Object.assign({}, buildOptions(fetchFn)), { body: {
|
|
70
|
+
data: { attributes: { url: 'https://example.com/?token=s3cr3t' } },
|
|
71
|
+
} })).then(() => {
|
|
72
|
+
throw new Error('expected the request to fail');
|
|
73
|
+
}, (error) => error);
|
|
74
|
+
// `request` and `response` stay readable...
|
|
75
|
+
expect(error.request.url).toContain('/items/bad-id');
|
|
76
|
+
expect(error.response.status).toBe(422);
|
|
77
|
+
// ...but no longer travel by accident: this is what `console.error()`,
|
|
78
|
+
// `serialize-error` and most error trackers walk.
|
|
79
|
+
expect(Object.keys(error)).not.toContain('request');
|
|
80
|
+
expect(Object.keys(error)).not.toContain('response');
|
|
81
|
+
expect(JSON.stringify(error)).not.toContain('s3cr3t');
|
|
82
|
+
expect(JSON.stringify(Object.assign({}, error))).not.toContain('s3cr3t');
|
|
83
|
+
}));
|
|
84
|
+
});
|
|
85
|
+
//# sourceMappingURL=request.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.test.js","sourceRoot":"","sources":["../../../src/__tests__/request.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/errors.js
CHANGED
|
@@ -36,6 +36,18 @@ function isErrorBody(body) {
|
|
|
36
36
|
*/
|
|
37
37
|
const TIMEOUT_ERROR = Symbol.for('@datocms/rest-client-utils:TimeoutError');
|
|
38
38
|
const API_ERROR = Symbol.for('@datocms/rest-client-utils:ApiError');
|
|
39
|
+
/**
|
|
40
|
+
* Hides properties from anything that walks own enumerable keys —
|
|
41
|
+
* `console.error()`, `JSON.stringify()`, object spread, `serialize-error`,
|
|
42
|
+
* error trackers. Reading `error.request` explicitly keeps working exactly as
|
|
43
|
+
* before; the data just stops travelling by accident, since the request and
|
|
44
|
+
* response of a failed call can carry credentials and other secrets.
|
|
45
|
+
*/
|
|
46
|
+
function hideProperties(target, keys) {
|
|
47
|
+
for (const key of keys) {
|
|
48
|
+
Object.defineProperty(target, key, { enumerable: false });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
39
51
|
class TimeoutError extends Error {
|
|
40
52
|
static [Symbol.hasInstance](value) {
|
|
41
53
|
if (typeof value !== 'object' ||
|
|
@@ -70,6 +82,7 @@ class TimeoutError extends Error {
|
|
|
70
82
|
}
|
|
71
83
|
this.request = initObject.request;
|
|
72
84
|
this.preCallStack = initObject.preCallStack;
|
|
85
|
+
hideProperties(this, ['request', 'preCallStack']);
|
|
73
86
|
this.message = `${initObject.request.method} ${initObject.request.url}: Timeout error`;
|
|
74
87
|
if (this.preCallStack) {
|
|
75
88
|
this.stack += `\nCaused By:\n${this.preCallStack}`;
|
|
@@ -110,6 +123,7 @@ class ApiError extends Error {
|
|
|
110
123
|
this.request = initObject.request;
|
|
111
124
|
this.response = initObject.response;
|
|
112
125
|
this.preCallStack = initObject.preCallStack;
|
|
126
|
+
hideProperties(this, ['request', 'response', 'preCallStack']);
|
|
113
127
|
let message = `${initObject.request.method} ${initObject.request.url}: ${this.response.status} ${this.response.statusText}`;
|
|
114
128
|
if (this.errors.length > 0) {
|
|
115
129
|
message += `\n\n${JSON.stringify(this.errors, null, 2)}`;
|
package/dist/cjs/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":";;;AAcA,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE;QAClE,OAAO,KAAK,CAAC;KACd;IAED,MAAM,YAAY,GAAG,IAAyB,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,YAAmC,CAAC;IAE7D,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzC,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,KAAK,IAAI;QAChB,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC;QAClB,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC;QACpB,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC;QACzB,OAAuB,CAAC,IAAI,KAAK,WAAW,EAC7C;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAgBD;;;;;;;;;GASG;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":";;;AAcA,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE;QAClE,OAAO,KAAK,CAAC;KACd;IAED,MAAM,YAAY,GAAG,IAAyB,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,YAAmC,CAAC;IAE7D,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzC,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,KAAK,IAAI;QAChB,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC;QAClB,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC;QACpB,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC;QACzB,OAAuB,CAAC,IAAI,KAAK,WAAW,EAC7C;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAgBD;;;;;;;;;GASG;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;AAEpE;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,MAAc,EAAE,IAAc;IACpD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;KAC3D;AACH,CAAC;AAOD,MAAa,YAAa,SAAQ,KAAK;IAMrC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAc;QACxC,IACE,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,KAAK,IAAI;YACd,CAAC,CAAC,aAAa,IAAI,KAAK,CAAC,EACzB;YACA,OAAO,KAAK,CAAC;SACd;QAED,sEAAsE;QACtE,4EAA4E;QAC5E,iIAAiI;QACjI,MAAM,SAAS,GAAG,IAAwC,CAAC;QAE3D,IAAI,SAAS,KAAK,YAAY,EAAE;YAC9B,OAAO,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACxE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,UAAkC;QAC5C,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAElD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE;YACzC,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAE3B,IAAI,mBAAmB,IAAI,KAAK,EAAE;YAChC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;SAC7C;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAK,KAAa,EAAE,CAAC,KAAK,CAAC;SACzC;QAED,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAE5C,cAAc,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,OAAO,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,iBAAiB,CAAC;QAEvF,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,KAAK,IAAI,iBAAiB,IAAI,CAAC,YAAY,EAAE,CAAC;SACpD;IACH,CAAC;CACF;AAzDD,oCAyDC;AAQD,MAAa,QAAS,SAAQ,KAAK;IAOjC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAc;QACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,SAAS,IAAI,KAAK,CAAC,EAAE;YACxE,OAAO,KAAK,CAAC;SACd;QAED,sEAAsE;QACtE,4EAA4E;QAC5E,iIAAiI;QACjI,MAAM,SAAS,GAAG,IAAwC,CAAC;QAE3D,IAAI,SAAS,KAAK,QAAQ,EAAE;YAC1B,OAAO,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;SACxE;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,UAA8B;QACxC,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAElD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE;YACrC,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,KAAK;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QAEvB,IAAI,mBAAmB,IAAI,KAAK,EAAE;YAChC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SACzC;aAAM;YACL,IAAI,CAAC,KAAK,GAAG,IAAK,KAAa,EAAE,CAAC,KAAK,CAAC;SACzC;QAED,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAE5C,cAAc,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;QAE9D,IAAI,OAAO,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAE5H,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,OAAO,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;SAC1D;QAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,KAAK,IAAI,iBAAiB,IAAI,CAAC,YAAY,EAAE,CAAC;SACpD;IACH,CAAC;IAED,IAAI,MAAM;QACR,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACpC,OAAO,EAAE,CAAC;SACX;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;IACjC,CAAC;IAED,SAAS,CACP,WAA8B,EAC9B,aAAiD;QAEjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CACrB,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;YACrC,CAAC,CAAC,aAAa;gBACb,CAAC,OAAO,aAAa,KAAK,UAAU;oBAClC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;oBACzC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CACjC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAC1D,CAAC,CAAC,CACZ,CAAC;IACJ,CAAC;CACF;AAtFD,4BAsFC"}
|
package/dist/cjs/request.js
CHANGED
|
@@ -35,6 +35,28 @@ function headersToObject(headers) {
|
|
|
35
35
|
});
|
|
36
36
|
return result;
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* Headers whose value must never end up inside an error object.
|
|
40
|
+
*
|
|
41
|
+
* Right now this client only ever sets one of them, but the list is the point:
|
|
42
|
+
* a header added here is redacted everywhere an error can reach.
|
|
43
|
+
*/
|
|
44
|
+
const SENSITIVE_HEADERS = ['authorization'];
|
|
45
|
+
/**
|
|
46
|
+
* Returns a copy of the request headers with every sensitive value blanked out.
|
|
47
|
+
*
|
|
48
|
+
* Errors travel: they get logged, serialized, sent to error trackers, and — as
|
|
49
|
+
* we learned the hard way — occasionally echoed back to an HTTP client. The
|
|
50
|
+
* real headers are only ever handed to `fetch()`; what we keep on the error is
|
|
51
|
+
* this redacted copy.
|
|
52
|
+
*/
|
|
53
|
+
function redactHeaders(headers) {
|
|
54
|
+
return Object.fromEntries(Object.entries(headers).map(([key, value]) => SENSITIVE_HEADERS.includes(key.toLowerCase())
|
|
55
|
+
? // The last 4 characters are enough to tell two tokens apart while
|
|
56
|
+
// debugging, and useless to whoever gets hold of the log.
|
|
57
|
+
[key, `[REDACTED, ending in ${value.slice(-4)}]`]
|
|
58
|
+
: [key, value]));
|
|
59
|
+
}
|
|
38
60
|
function buildApiErrorInitObject(method, url, requestHeaders, requestBody, response, responseBody, preCallStack) {
|
|
39
61
|
return {
|
|
40
62
|
request: {
|
|
@@ -114,6 +136,7 @@ function request(options) {
|
|
|
114
136
|
// user agent cannot be set on browser
|
|
115
137
|
delete headers['user-agent'];
|
|
116
138
|
}
|
|
139
|
+
const redactedHeaders = redactHeaders(headers);
|
|
117
140
|
const baseUrl = options.baseUrl.replace(/\/$/, '');
|
|
118
141
|
const body = options.body ? JSON.stringify(options.body, null, 2) : undefined;
|
|
119
142
|
const queryString = options.queryParams && Object.keys(options.queryParams).length > 0
|
|
@@ -123,7 +146,7 @@ function request(options) {
|
|
|
123
146
|
if (logLevel >= LogLevel.BASIC) {
|
|
124
147
|
log(`[${requestId}] ${options.method} ${url}`);
|
|
125
148
|
if (logLevel >= LogLevel.BODY_AND_HEADERS) {
|
|
126
|
-
for (const [key, value] of Object.entries(
|
|
149
|
+
for (const [key, value] of Object.entries(redactedHeaders)) {
|
|
127
150
|
log(`[${requestId}] ${key}: ${value}`);
|
|
128
151
|
}
|
|
129
152
|
}
|
|
@@ -131,22 +154,24 @@ function request(options) {
|
|
|
131
154
|
log(`[${requestId}] ${body}`);
|
|
132
155
|
}
|
|
133
156
|
}
|
|
157
|
+
// Declared out here so that the `finally` below can always clear it: a timer
|
|
158
|
+
// left pending keeps Node's event loop alive for as long as it runs.
|
|
159
|
+
let timeoutId;
|
|
134
160
|
try {
|
|
135
161
|
const requestPromise = (0, makeCancelablePromise_js_1.makeCancelablePromise)(fetchFn(url, {
|
|
136
162
|
method: options.method,
|
|
137
163
|
headers,
|
|
138
164
|
body,
|
|
139
165
|
}));
|
|
140
|
-
|
|
166
|
+
timeoutId = setTimeout(() => {
|
|
141
167
|
requestPromise.cancel();
|
|
142
168
|
}, options.requestTimeout || 30000);
|
|
143
169
|
const response = yield requestPromise;
|
|
144
|
-
clearTimeout(timeoutId);
|
|
145
170
|
const responseContentType = response.headers.get('Content-Type');
|
|
146
171
|
const invalidContentType = responseContentType && !responseContentType.includes('application/json');
|
|
147
172
|
if (response.status === 429 || invalidContentType) {
|
|
148
173
|
if (!autoRetry || (invalidContentType && options.method !== 'GET')) {
|
|
149
|
-
throw new errors_js_1.ApiError(buildApiErrorInitObject(options.method, url,
|
|
174
|
+
throw new errors_js_1.ApiError(buildApiErrorInitObject(options.method, url, redactedHeaders, options.body, response, undefined, preCallStack));
|
|
150
175
|
}
|
|
151
176
|
const waitTimeInSecs = response.headers.has('X-RateLimit-Reset')
|
|
152
177
|
? Number.parseInt(response.headers.get('X-RateLimit-Reset'), 10)
|
|
@@ -187,14 +212,14 @@ function request(options) {
|
|
|
187
212
|
if (response.status === 202) {
|
|
188
213
|
const jobResult = yield options.fetchJobResult(responseBody.data.id);
|
|
189
214
|
if (jobResult.status < 200 || jobResult.status >= 300) {
|
|
190
|
-
throw new errors_js_1.ApiError(buildApiErrorInitObjectFromJobResult(options.method, url,
|
|
215
|
+
throw new errors_js_1.ApiError(buildApiErrorInitObjectFromJobResult(options.method, url, redactedHeaders, options.body, jobResult.status, jobResult.payload, preCallStack));
|
|
191
216
|
}
|
|
192
217
|
responseBody = jobResult.payload;
|
|
193
218
|
}
|
|
194
219
|
if (response.status >= 200 && response.status < 300) {
|
|
195
220
|
return responseBody;
|
|
196
221
|
}
|
|
197
|
-
const error = new errors_js_1.ApiError(buildApiErrorInitObject(options.method, url,
|
|
222
|
+
const error = new errors_js_1.ApiError(buildApiErrorInitObject(options.method, url, redactedHeaders, options.body, response, responseBody, preCallStack));
|
|
198
223
|
const transientErrorCode = (_a = error.errors.find((e) => e.attributes.transient)) === null || _a === void 0 ? void 0 : _a.attributes.code;
|
|
199
224
|
if (autoRetry && transientErrorCode) {
|
|
200
225
|
if (logLevel >= LogLevel.BASIC) {
|
|
@@ -215,10 +240,13 @@ function request(options) {
|
|
|
215
240
|
yield (0, wait_js_1.wait)(retryCount * 1000);
|
|
216
241
|
return request(Object.assign(Object.assign({}, options), { retryCount: retryCount + 1 }));
|
|
217
242
|
}
|
|
218
|
-
throw new errors_js_1.TimeoutError(buildTimeoutErrorInitObject(options.method, url,
|
|
243
|
+
throw new errors_js_1.TimeoutError(buildTimeoutErrorInitObject(options.method, url, redactedHeaders, options.body, preCallStack));
|
|
219
244
|
}
|
|
220
245
|
throw error;
|
|
221
246
|
}
|
|
247
|
+
finally {
|
|
248
|
+
clearTimeout(timeoutId);
|
|
249
|
+
}
|
|
222
250
|
});
|
|
223
251
|
}
|
|
224
252
|
exports.request = request;
|
package/dist/cjs/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,6 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { buildNormalizedParams } from '../buildNormalizedParams.js';
|
|
11
2
|
describe('buildNormalizedParams', () => {
|
|
12
|
-
it('encodes complex params', () =>
|
|
3
|
+
it('encodes complex params', async () => {
|
|
13
4
|
expect(buildNormalizedParams({ foo: 0 })).toMatchInlineSnapshot(`
|
|
14
5
|
[
|
|
15
6
|
[
|
|
@@ -97,6 +88,6 @@ describe('buildNormalizedParams', () => {
|
|
|
97
88
|
],
|
|
98
89
|
]
|
|
99
90
|
`);
|
|
100
|
-
})
|
|
91
|
+
});
|
|
101
92
|
});
|
|
102
93
|
//# sourceMappingURL=buildNormalizedParams.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildNormalizedParams.test.js","sourceRoot":"","sources":["../../../src/__tests__/buildNormalizedParams.test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildNormalizedParams.test.js","sourceRoot":"","sources":["../../../src/__tests__/buildNormalizedParams.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAO/D,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAOlE,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAOnE,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAOhE,CAAC,CAAC;QACH,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,qBAAqB,CACrE,IAAI,CACL,CAAC;QAEF,MAAM,CAAC,qBAAqB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;KAOnE,CAAC,CAAC;QAEH,MAAM,CACJ,qBAAqB,CAAC;YACpB,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC;gBACT,KAAK,EAAE,EAAE;aACV;SACF,CAAC,CACH,CAAC,qBAAqB,CAAC;;;;;;;;;;;KAWvB,CAAC,CAAC;QAEH,MAAM,CACJ,qBAAqB,CAAC;YACpB,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;SAC3C,CAAC,CACH,CAAC,qBAAqB,CAAC;;;;;;;KAOvB,CAAC,CAAC;QAEH,MAAM,CACJ,qBAAqB,CAAC;YACpB,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE;SAC7B,CAAC,CACH,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;KAevB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { ApiError, TimeoutError } from '../errors';
|
|
2
|
+
import { request } from '../request';
|
|
3
|
+
const API_TOKEN = 'aaaabbbbccccdddd';
|
|
4
|
+
function jsonResponse(status, body) {
|
|
5
|
+
return new Response(JSON.stringify(body), {
|
|
6
|
+
status,
|
|
7
|
+
statusText: 'Unprocessable Entity',
|
|
8
|
+
headers: { 'Content-Type': 'application/json' },
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
function buildOptions(fetchFn) {
|
|
12
|
+
return {
|
|
13
|
+
baseUrl: 'https://site-api.datocms.com',
|
|
14
|
+
fetchJobResult: async () => {
|
|
15
|
+
throw new Error('not needed');
|
|
16
|
+
},
|
|
17
|
+
fetchFn,
|
|
18
|
+
apiToken: API_TOKEN,
|
|
19
|
+
method: 'GET',
|
|
20
|
+
url: '/items/bad-id',
|
|
21
|
+
autoRetry: false,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
describe('request()', () => {
|
|
25
|
+
it('sends the real API token, but keeps it out of the error', async () => {
|
|
26
|
+
let sentAuthorization;
|
|
27
|
+
const fetchFn = jest.fn(async (_url, init) => {
|
|
28
|
+
var _a;
|
|
29
|
+
sentAuthorization = (_a = init === null || init === void 0 ? void 0 : init.headers) === null || _a === void 0 ? void 0 : _a.authorization;
|
|
30
|
+
return jsonResponse(422, { data: [] });
|
|
31
|
+
});
|
|
32
|
+
const error = await request(buildOptions(fetchFn)).then(() => {
|
|
33
|
+
throw new Error('expected the request to fail');
|
|
34
|
+
}, (error) => error);
|
|
35
|
+
expect(error).toBeInstanceOf(ApiError);
|
|
36
|
+
expect(sentAuthorization).toBe(`Bearer ${API_TOKEN}`);
|
|
37
|
+
expect(error.request.headers.authorization).toBe('[REDACTED, ending in dddd]');
|
|
38
|
+
expect(JSON.stringify(error)).not.toContain(API_TOKEN);
|
|
39
|
+
});
|
|
40
|
+
it('keeps the token out of a timeout error too', async () => {
|
|
41
|
+
const fetchFn = (async () => {
|
|
42
|
+
const error = new Error('timeout');
|
|
43
|
+
error.code = 'ETIMEDOUT';
|
|
44
|
+
throw error;
|
|
45
|
+
});
|
|
46
|
+
const error = await request({
|
|
47
|
+
...buildOptions(fetchFn),
|
|
48
|
+
autoRetry: false,
|
|
49
|
+
}).then(() => {
|
|
50
|
+
throw new Error('expected the request to fail');
|
|
51
|
+
}, (error) => error);
|
|
52
|
+
expect(error).toBeInstanceOf(TimeoutError);
|
|
53
|
+
expect(error.request.headers.authorization).toBe('[REDACTED, ending in dddd]');
|
|
54
|
+
});
|
|
55
|
+
it('does not spill the failed call through incidental serialization', async () => {
|
|
56
|
+
const fetchFn = (async () => jsonResponse(422, {
|
|
57
|
+
data: [],
|
|
58
|
+
}));
|
|
59
|
+
const error = await request({
|
|
60
|
+
...buildOptions(fetchFn),
|
|
61
|
+
body: {
|
|
62
|
+
data: { attributes: { url: 'https://example.com/?token=s3cr3t' } },
|
|
63
|
+
},
|
|
64
|
+
}).then(() => {
|
|
65
|
+
throw new Error('expected the request to fail');
|
|
66
|
+
}, (error) => error);
|
|
67
|
+
// `request` and `response` stay readable...
|
|
68
|
+
expect(error.request.url).toContain('/items/bad-id');
|
|
69
|
+
expect(error.response.status).toBe(422);
|
|
70
|
+
// ...but no longer travel by accident: this is what `console.error()`,
|
|
71
|
+
// `serialize-error` and most error trackers walk.
|
|
72
|
+
expect(Object.keys(error)).not.toContain('request');
|
|
73
|
+
expect(Object.keys(error)).not.toContain('response');
|
|
74
|
+
expect(JSON.stringify(error)).not.toContain('s3cr3t');
|
|
75
|
+
expect(JSON.stringify({ ...error })).not.toContain('s3cr3t');
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=request.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.test.js","sourceRoot":"","sources":["../../../src/__tests__/request.test.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/deserialize.js
CHANGED
|
@@ -5,12 +5,19 @@ function hasIncluded(thing) {
|
|
|
5
5
|
return typeof thing === 'object' && !!thing && 'included' in thing;
|
|
6
6
|
}
|
|
7
7
|
export function deserializeJsonEntity({ __itemTypeId, id, type, attributes, relationships, meta, }) {
|
|
8
|
-
return
|
|
9
|
-
?
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
8
|
+
return {
|
|
9
|
+
...(__itemTypeId ? { __itemTypeId } : {}),
|
|
10
|
+
...(id ? { id } : {}),
|
|
11
|
+
...(type ? { type } : {}),
|
|
12
|
+
...(attributes || {}),
|
|
13
|
+
...(relationships
|
|
14
|
+
? Object.fromEntries(Object.entries(relationships).map(([rel, value]) => [
|
|
15
|
+
rel,
|
|
16
|
+
value === null || value === void 0 ? void 0 : value.data,
|
|
17
|
+
]))
|
|
18
|
+
: {}),
|
|
19
|
+
...(meta ? { meta } : {}),
|
|
20
|
+
};
|
|
14
21
|
}
|
|
15
22
|
export function deserializeResponseBody(body) {
|
|
16
23
|
if (!hasData(body)) {
|
|
@@ -50,7 +57,11 @@ export function deserializeRawItem(entity) {
|
|
|
50
57
|
const processedAttributes = entity.attributes
|
|
51
58
|
? processValue(entity.attributes)
|
|
52
59
|
: entity.attributes;
|
|
53
|
-
return
|
|
60
|
+
return {
|
|
61
|
+
...entity,
|
|
62
|
+
attributes: processedAttributes,
|
|
63
|
+
__itemTypeId: entity.relationships.item_type.data.id,
|
|
64
|
+
};
|
|
54
65
|
}
|
|
55
66
|
export function deserializeRawResponseBodyWithItems(body) {
|
|
56
67
|
if (!hasData(body)) {
|
|
@@ -67,6 +78,10 @@ export function deserializeRawResponseBodyWithItems(body) {
|
|
|
67
78
|
if (hasIncluded(body)) {
|
|
68
79
|
included = body.included.map(deserializeRawItem);
|
|
69
80
|
}
|
|
70
|
-
return
|
|
81
|
+
return {
|
|
82
|
+
...body,
|
|
83
|
+
data,
|
|
84
|
+
...(included ? { included } : {}),
|
|
85
|
+
};
|
|
71
86
|
}
|
|
72
87
|
//# sourceMappingURL=deserialize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":"AAiBA,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,SAAS,WAAW,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,UAAU,IAAI,KAAK,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAI,EACvC,YAAY,EACZ,EAAE,EACF,IAAI,EACJ,UAAU,EACV,aAAa,EACb,IAAI,GACU;IACd,OAAO,
|
|
1
|
+
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/errors.js
CHANGED
|
@@ -33,6 +33,18 @@ function isErrorBody(body) {
|
|
|
33
33
|
*/
|
|
34
34
|
const TIMEOUT_ERROR = Symbol.for('@datocms/rest-client-utils:TimeoutError');
|
|
35
35
|
const API_ERROR = Symbol.for('@datocms/rest-client-utils:ApiError');
|
|
36
|
+
/**
|
|
37
|
+
* Hides properties from anything that walks own enumerable keys —
|
|
38
|
+
* `console.error()`, `JSON.stringify()`, object spread, `serialize-error`,
|
|
39
|
+
* error trackers. Reading `error.request` explicitly keeps working exactly as
|
|
40
|
+
* before; the data just stops travelling by accident, since the request and
|
|
41
|
+
* response of a failed call can carry credentials and other secrets.
|
|
42
|
+
*/
|
|
43
|
+
function hideProperties(target, keys) {
|
|
44
|
+
for (const key of keys) {
|
|
45
|
+
Object.defineProperty(target, key, { enumerable: false });
|
|
46
|
+
}
|
|
47
|
+
}
|
|
36
48
|
export class TimeoutError extends Error {
|
|
37
49
|
static [Symbol.hasInstance](value) {
|
|
38
50
|
if (typeof value !== 'object' ||
|
|
@@ -67,6 +79,7 @@ export class TimeoutError extends Error {
|
|
|
67
79
|
}
|
|
68
80
|
this.request = initObject.request;
|
|
69
81
|
this.preCallStack = initObject.preCallStack;
|
|
82
|
+
hideProperties(this, ['request', 'preCallStack']);
|
|
70
83
|
this.message = `${initObject.request.method} ${initObject.request.url}: Timeout error`;
|
|
71
84
|
if (this.preCallStack) {
|
|
72
85
|
this.stack += `\nCaused By:\n${this.preCallStack}`;
|
|
@@ -106,6 +119,7 @@ export class ApiError extends Error {
|
|
|
106
119
|
this.request = initObject.request;
|
|
107
120
|
this.response = initObject.response;
|
|
108
121
|
this.preCallStack = initObject.preCallStack;
|
|
122
|
+
hideProperties(this, ['request', 'response', 'preCallStack']);
|
|
109
123
|
let message = `${initObject.request.method} ${initObject.request.url}: ${this.response.status} ${this.response.statusText}`;
|
|
110
124
|
if (this.errors.length > 0) {
|
|
111
125
|
message += `\n\n${JSON.stringify(this.errors, null, 2)}`;
|
package/dist/esm/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAcA,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE;QAClE,OAAO,KAAK,CAAC;KACd;IAED,MAAM,YAAY,GAAG,IAAyB,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,gBAAgB,GAAG,YAAmC,CAAC;IAE7D,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAEzC,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,KAAK,IAAI;QAChB,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC;QAClB,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC;QACpB,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC;QACzB,OAAuB,CAAC,IAAI,KAAK,WAAW,EAC7C;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAgBD;;;;;;;;;GASG;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AAC5E,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,20 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { ApiError } from './errors.js';
|
|
11
2
|
import { wait } from './wait.js';
|
|
12
|
-
export function pollJobResult(fetcher) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
3
|
+
export async function pollJobResult(fetcher) {
|
|
4
|
+
let jobResult;
|
|
5
|
+
let retryCount = 0;
|
|
6
|
+
do {
|
|
7
|
+
try {
|
|
8
|
+
retryCount += 1;
|
|
9
|
+
await wait(retryCount * 1000);
|
|
10
|
+
jobResult = await fetcher();
|
|
11
|
+
}
|
|
12
|
+
catch (e) {
|
|
13
|
+
if (!(e instanceof ApiError) || e.response.status !== 404) {
|
|
14
|
+
throw e;
|
|
21
15
|
}
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
} while (!jobResult);
|
|
28
|
-
return jobResult;
|
|
29
|
-
});
|
|
16
|
+
}
|
|
17
|
+
} while (!jobResult);
|
|
18
|
+
return jobResult;
|
|
30
19
|
}
|
|
31
20
|
//# sourceMappingURL=pollJobResult.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAiC;IAEjC,IAAI,SAAgC,CAAC;IACrC,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,GAAG;QACD,IAAI;YACF,UAAU,IAAI,CAAC,CAAC;YAChB,MAAM,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;YAC9B,SAAS,GAAG,MAAM,OAAO,EAAE,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,CAAC,YAAY,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;gBACzD,MAAM,CAAC,CAAC;aACT;SACF;KACF,QAAQ,CAAC,SAAS,EAAE;IAErB,OAAO,SAAS,CAAC;AACnB,CAAC"}
|