@datocms/rest-client-utils 1.1.1 → 1.1.3
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/deserialize.js.map +1 -1
- package/dist/cjs/{ApiError.js → errors.js} +25 -2
- package/dist/cjs/errors.js.map +1 -0
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/{CancelablePromise.js → makeCancelablePromise.js} +4 -2
- package/dist/cjs/makeCancelablePromise.js.map +1 -0
- package/dist/cjs/pollJobResult.js +2 -2
- package/dist/cjs/pollJobResult.js.map +1 -1
- package/dist/cjs/request.js +35 -15
- package/dist/cjs/request.js.map +1 -1
- package/dist/esm/deserialize.js.map +1 -1
- package/dist/esm/{ApiError.d.ts → errors.d.ts} +9 -0
- package/dist/esm/{ApiError.js → errors.js} +24 -1
- package/dist/esm/errors.js.map +1 -0
- package/dist/esm/index.d.ts +2 -2
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/{CancelablePromise.d.ts → makeCancelablePromise.d.ts} +1 -1
- package/dist/esm/{CancelablePromise.js → makeCancelablePromise.js} +4 -2
- package/dist/esm/makeCancelablePromise.js.map +1 -0
- package/dist/esm/pollJobResult.js +1 -1
- package/dist/esm/pollJobResult.js.map +1 -1
- package/dist/esm/request.d.ts +1 -0
- package/dist/esm/request.js +32 -12
- package/dist/esm/request.js.map +1 -1
- package/dist/types/{ApiError.d.ts → errors.d.ts} +9 -0
- package/dist/types/index.d.ts +2 -2
- package/dist/types/{CancelablePromise.d.ts → makeCancelablePromise.d.ts} +1 -1
- package/dist/types/request.d.ts +1 -0
- package/package.json +2 -2
- package/src/deserialize.ts +0 -2
- package/src/{ApiError.ts → errors.ts} +30 -0
- package/src/index.ts +2 -2
- package/src/{CancelablePromise.ts → makeCancelablePromise.ts} +4 -2
- package/src/pollJobResult.ts +1 -1
- package/src/request.ts +66 -14
- package/dist/cjs/ApiError.js.map +0 -1
- package/dist/cjs/CancelablePromise.js.map +0 -1
- package/dist/esm/ApiError.js.map +0 -1
- package/dist/esm/CancelablePromise.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAYA,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,SAAgB,qBAAqB,CAAI,EAMzB;QALd,EAAE,QAAA,EACF,IAAI,UAAA,EACJ,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,IAAI,UAAA;IAEJ,OAAO,iDACF,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAClB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACtB,CAAC,UAAU,IAAI,EAAE,CAAC,GAClB,CAAC,aAAa;QACf,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA;gBAClD,GAAG;gBACH,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI;aACZ;QAHmD,CAGnD,CAAC,CACH;QACH,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrB,CAAC;AACT,CAAC;AArBD,sDAqBC;AAED,SAAgB,uBAAuB,CAAI,IAAa;IACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAiB,CAAC;KAC7D;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC;AAC1D,CAAC;AAVD,0DAUC"}
|
|
@@ -15,7 +15,7 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
15
15
|
};
|
|
16
16
|
})();
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.ApiError = void 0;
|
|
18
|
+
exports.ApiError = exports.TimeoutError = void 0;
|
|
19
19
|
function isErrorBody(body) {
|
|
20
20
|
if (typeof body !== 'object' || body === null || !('data' in body)) {
|
|
21
21
|
return false;
|
|
@@ -74,6 +74,29 @@ var humanMessageForPlanUpgradeLimit = {
|
|
|
74
74
|
users: "You've reached the maximum number of collaborators your plan allows to invite to the project",
|
|
75
75
|
access_tokens: "You've reached the maximum number of API tokens your plan allows to create",
|
|
76
76
|
};
|
|
77
|
+
var TimeoutError = /** @class */ (function (_super) {
|
|
78
|
+
__extends(TimeoutError, _super);
|
|
79
|
+
function TimeoutError(initObject) {
|
|
80
|
+
var _newTarget = this.constructor;
|
|
81
|
+
var _this = _super.call(this, 'API Error!') || this;
|
|
82
|
+
Object.setPrototypeOf(_this, _newTarget.prototype);
|
|
83
|
+
if ('captureStackTrace' in Error) {
|
|
84
|
+
Error.captureStackTrace(_this, ApiError);
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
_this.stack = new Error().stack;
|
|
88
|
+
}
|
|
89
|
+
_this.request = initObject.request;
|
|
90
|
+
_this.preCallStack = initObject.preCallStack;
|
|
91
|
+
_this.message = "".concat(initObject.request.method, " ").concat(initObject.request.url, ": Timeout error");
|
|
92
|
+
if (_this.preCallStack) {
|
|
93
|
+
_this.stack += "\nCaused By:\n".concat(_this.preCallStack);
|
|
94
|
+
}
|
|
95
|
+
return _this;
|
|
96
|
+
}
|
|
97
|
+
return TimeoutError;
|
|
98
|
+
}(Error));
|
|
99
|
+
exports.TimeoutError = TimeoutError;
|
|
77
100
|
var ApiError = /** @class */ (function (_super) {
|
|
78
101
|
__extends(ApiError, _super);
|
|
79
102
|
function ApiError(initObject) {
|
|
@@ -144,4 +167,4 @@ var ApiError = /** @class */ (function (_super) {
|
|
|
144
167
|
return ApiError;
|
|
145
168
|
}(Error));
|
|
146
169
|
exports.ApiError = ApiError;
|
|
147
|
-
//# sourceMappingURL=
|
|
170
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/index.js
CHANGED
|
@@ -14,13 +14,13 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./
|
|
17
|
+
__exportStar(require("./errors"), exports);
|
|
18
18
|
__exportStar(require("./deserialize"), exports);
|
|
19
19
|
__exportStar(require("./pollJobResult"), exports);
|
|
20
20
|
__exportStar(require("./rawPageIterator"), exports);
|
|
21
21
|
__exportStar(require("./request"), exports);
|
|
22
22
|
__exportStar(require("./serialize"), exports);
|
|
23
|
-
__exportStar(require("./
|
|
23
|
+
__exportStar(require("./makeCancelablePromise"), exports);
|
|
24
24
|
__exportStar(require("./toId"), exports);
|
|
25
25
|
__exportStar(require("./wait"), exports);
|
|
26
26
|
//# sourceMappingURL=index.js.map
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;AAEb,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;;;;;;AAEb,2CAAyB;AACzB,gDAA8B;AAC9B,kDAAgC;AAChC,oDAAkC;AAClC,4CAA0B;AAC1B,8CAA4B;AAC5B,0DAAwC;AACxC,yCAAuB;AACvB,yCAAuB"}
|
|
@@ -32,7 +32,9 @@ function makeCancelablePromise(promiseOrAsyncFn, onCancel) {
|
|
|
32
32
|
var cancelable = new Promise(function (resolve, reject) {
|
|
33
33
|
cancel = function () {
|
|
34
34
|
try {
|
|
35
|
-
onCancel
|
|
35
|
+
if (onCancel) {
|
|
36
|
+
onCancel();
|
|
37
|
+
}
|
|
36
38
|
reject(new CanceledPromiseError());
|
|
37
39
|
}
|
|
38
40
|
catch (e) {
|
|
@@ -50,4 +52,4 @@ function makeCancelablePromise(promiseOrAsyncFn, onCancel) {
|
|
|
50
52
|
return cancelable;
|
|
51
53
|
}
|
|
52
54
|
exports.makeCancelablePromise = makeCancelablePromise;
|
|
53
|
-
//# sourceMappingURL=
|
|
55
|
+
//# sourceMappingURL=makeCancelablePromise.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeCancelablePromise.js","sourceRoot":"","sources":["../../src/makeCancelablePromise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;IAA0C,wCAAK;IAC7C;;QAAA,YACE,kBAAM,mBAAmB,CAAC,SAE3B;QADC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;;IACpD,CAAC;IACH,2BAAC;AAAD,CAAC,AALD,CAA0C,KAAK,GAK9C;AALY,oDAAoB;AAWjC,SAAgB,qBAAqB,CACnC,gBAAiD,EACjD,QAAqB;IAErB,IAAI,MAAM,GAAwB,IAAI,CAAC;IAEvC,IAAM,UAAU,GAAyB,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACnE,MAAM,GAAG;YACP,IAAI;gBACF,IAAI,QAAQ,EAAE;oBACZ,QAAQ,EAAE,CAAC;iBACZ;gBACD,MAAM,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;QAEF,IAAM,OAAO,GACX,OAAO,gBAAgB,KAAK,UAAU;YACpC,CAAC,CAAC,gBAAgB,EAAE;YACpB,CAAC,CAAC,gBAAgB,CAAC;QAEvB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;KAC5B;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AA/BD,sDA+BC"}
|
|
@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.pollJobResult = void 0;
|
|
40
|
-
var
|
|
40
|
+
var errors_1 = require("./errors");
|
|
41
41
|
var wait_1 = require("./wait");
|
|
42
42
|
function pollJobResult(fetcher) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -59,7 +59,7 @@ function pollJobResult(fetcher) {
|
|
|
59
59
|
return [3 /*break*/, 5];
|
|
60
60
|
case 4:
|
|
61
61
|
e_1 = _a.sent();
|
|
62
|
-
if (!(e_1 instanceof
|
|
62
|
+
if (!(e_1 instanceof errors_1.ApiError) || e_1.response.status !== 404) {
|
|
63
63
|
throw e_1;
|
|
64
64
|
}
|
|
65
65
|
return [3 /*break*/, 5];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAoC;AAEpC,+BAA8B;AAE9B,SAAsB,aAAa,CACjC,OAAiC;;;;;;oBAG7B,UAAU,GAAG,CAAC,CAAC;;;;oBAIf,UAAU,IAAI,CAAC,CAAC;oBAChB,qBAAM,IAAA,WAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;oBAA7B,SAA6B,CAAC;oBAClB,qBAAM,OAAO,EAAE,EAAA;;oBAA3B,SAAS,GAAG,SAAe,CAAC;;;;oBAE5B,IAAI,CAAC,CAAC,GAAC,YAAY,iBAAQ,CAAC,IAAI,GAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;wBACzD,MAAM,GAAC,CAAC;qBACT;;;wBAEI,CAAC,SAAS;;wBAEnB,sBAAO,SAAS,EAAC;;;;CAClB;AAnBD,sCAmBC"}
|
package/dist/cjs/request.js
CHANGED
|
@@ -53,8 +53,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
53
53
|
exports.request = exports.LogLevel = void 0;
|
|
54
54
|
var qs_1 = __importDefault(require("qs"));
|
|
55
55
|
var cross_fetch_1 = __importDefault(require("cross-fetch"));
|
|
56
|
-
var
|
|
56
|
+
var errors_1 = require("./errors");
|
|
57
57
|
var wait_1 = require("./wait");
|
|
58
|
+
var makeCancelablePromise_1 = require("./makeCancelablePromise");
|
|
58
59
|
var LogLevel;
|
|
59
60
|
(function (LogLevel) {
|
|
60
61
|
/** No logging */
|
|
@@ -90,6 +91,17 @@ function buildApiErrorInitObject(method, url, requestHeaders, requestBody, respo
|
|
|
90
91
|
preCallStack: preCallStack,
|
|
91
92
|
};
|
|
92
93
|
}
|
|
94
|
+
function buildTimeoutErrorInitObject(method, url, requestHeaders, requestBody, preCallStack) {
|
|
95
|
+
return {
|
|
96
|
+
request: {
|
|
97
|
+
url: url,
|
|
98
|
+
method: method,
|
|
99
|
+
headers: requestHeaders,
|
|
100
|
+
body: requestBody,
|
|
101
|
+
},
|
|
102
|
+
preCallStack: preCallStack,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
93
105
|
function buildApiErrorInitObjectFromJobResult(method, url, requestHeaders, requestBody, responseStatus, responseBody, preCallStack) {
|
|
94
106
|
return {
|
|
95
107
|
request: {
|
|
@@ -113,7 +125,7 @@ function isErrorWithCode(error) {
|
|
|
113
125
|
var requestCount = 1;
|
|
114
126
|
function request(options) {
|
|
115
127
|
return __awaiter(this, void 0, void 0, function () {
|
|
116
|
-
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
128
|
+
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, requestPromise_1, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
117
129
|
return __generator(this, function (_d) {
|
|
118
130
|
switch (_d.label) {
|
|
119
131
|
case 0:
|
|
@@ -146,19 +158,23 @@ function request(options) {
|
|
|
146
158
|
}
|
|
147
159
|
_d.label = 1;
|
|
148
160
|
case 1:
|
|
149
|
-
_d.trys.push([1, 12, ,
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
161
|
+
_d.trys.push([1, 12, , 16]);
|
|
162
|
+
requestPromise_1 = (0, makeCancelablePromise_1.makeCancelablePromise)((0, cross_fetch_1.default)(url, {
|
|
163
|
+
method: options.method,
|
|
164
|
+
headers: headers,
|
|
165
|
+
body: body,
|
|
166
|
+
}));
|
|
167
|
+
setTimeout(function () {
|
|
168
|
+
requestPromise_1.cancel();
|
|
169
|
+
}, options.requestTimeout || 30000);
|
|
170
|
+
return [4 /*yield*/, requestPromise_1];
|
|
155
171
|
case 2:
|
|
156
172
|
response_1 = _d.sent();
|
|
157
173
|
responseContentType = response_1.headers.get('Content-Type');
|
|
158
174
|
invalidContentType = responseContentType && !responseContentType.includes('application/json');
|
|
159
175
|
if (!(response_1.status === 429 || invalidContentType)) return [3 /*break*/, 4];
|
|
160
176
|
if (!autoRetry || (invalidContentType && options.method !== 'GET')) {
|
|
161
|
-
throw new
|
|
177
|
+
throw new errors_1.ApiError(buildApiErrorInitObject(options.method, url, headers, options.body, response_1, undefined, preCallStack));
|
|
162
178
|
}
|
|
163
179
|
waitTimeInSecs = response_1.headers.has('X-RateLimit-Reset')
|
|
164
180
|
? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
@@ -186,6 +202,7 @@ function request(options) {
|
|
|
186
202
|
'x-queue-time',
|
|
187
203
|
'x-ratelimit-remaining',
|
|
188
204
|
'x-request-id',
|
|
205
|
+
'cf-ray',
|
|
189
206
|
].forEach(function (key) {
|
|
190
207
|
var value = response_1.headers.get(key);
|
|
191
208
|
if (value) {
|
|
@@ -211,7 +228,7 @@ function request(options) {
|
|
|
211
228
|
case 8:
|
|
212
229
|
jobResult = _d.sent();
|
|
213
230
|
if (jobResult.status < 200 || jobResult.status >= 300) {
|
|
214
|
-
throw new
|
|
231
|
+
throw new errors_1.ApiError(buildApiErrorInitObjectFromJobResult(options.method, url, headers, options.body, jobResult.status, jobResult.payload, preCallStack));
|
|
215
232
|
}
|
|
216
233
|
responseBody = jobResult.payload;
|
|
217
234
|
_d.label = 9;
|
|
@@ -219,7 +236,7 @@ function request(options) {
|
|
|
219
236
|
if (response_1.status >= 200 && response_1.status < 300) {
|
|
220
237
|
return [2 /*return*/, responseBody];
|
|
221
238
|
}
|
|
222
|
-
error = new
|
|
239
|
+
error = new errors_1.ApiError(buildApiErrorInitObject(options.method, url, headers, options.body, response_1, responseBody, preCallStack));
|
|
223
240
|
if (!(autoRetry && error.findError('BATCH_DATA_VALIDATION_IN_PROGRESS'))) return [3 /*break*/, 11];
|
|
224
241
|
if (logLevel >= LogLevel.BASIC) {
|
|
225
242
|
log("[".concat(requestId, "] Data validation in progress, wait ").concat(retryCount, " seconds then retry..."));
|
|
@@ -231,16 +248,19 @@ function request(options) {
|
|
|
231
248
|
case 11: throw error;
|
|
232
249
|
case 12:
|
|
233
250
|
error_1 = _d.sent();
|
|
234
|
-
if (!(
|
|
251
|
+
if (!(error_1 instanceof makeCancelablePromise_1.CanceledPromiseError ||
|
|
252
|
+
(isErrorWithCode(error_1) && error_1.code.includes('ETIMEDOUT')))) return [3 /*break*/, 15];
|
|
253
|
+
if (!autoRetry) return [3 /*break*/, 14];
|
|
235
254
|
if (logLevel >= LogLevel.BASIC) {
|
|
236
|
-
log("[".concat(requestId, "]
|
|
255
|
+
log("[".concat(requestId, "] Timeout error, wait ").concat(retryCount, " seconds then retry..."));
|
|
237
256
|
}
|
|
238
257
|
return [4 /*yield*/, (0, wait_1.wait)(retryCount * 1000)];
|
|
239
258
|
case 13:
|
|
240
259
|
_d.sent();
|
|
241
260
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
242
|
-
case 14: throw
|
|
243
|
-
case 15:
|
|
261
|
+
case 14: throw new errors_1.TimeoutError(buildTimeoutErrorInitObject(options.method, url, headers, options.body, preCallStack));
|
|
262
|
+
case 15: throw error_1;
|
|
263
|
+
case 16: return [2 /*return*/];
|
|
244
264
|
}
|
|
245
265
|
});
|
|
246
266
|
});
|
package/dist/cjs/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoB;AACpB,4DAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"deserialize.js","sourceRoot":"","sources":["../../src/deserialize.ts"],"names":[],"mappings":";;;;;;;;;;;AAYA,SAAS,OAAO,CAAC,KAAc;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAI,EAMzB;QALd,EAAE,QAAA,EACF,IAAI,UAAA,EACJ,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,IAAI,UAAA;IAEJ,OAAO,iDACF,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAClB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACtB,CAAC,UAAU,IAAI,EAAE,CAAC,GAClB,CAAC,aAAa;QACf,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YAAM,OAAA;gBAClD,GAAG;gBACH,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI;aACZ;QAHmD,CAGnD,CAAC,CACH;QACH,CAAC,CAAC,EAAE,CAAC,GACJ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACrB,CAAC;AACT,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAI,IAAa;IACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAiB,CAAC;KAC7D;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC;AAC1D,CAAC"}
|
|
@@ -19,6 +19,15 @@ export declare type ApiErrorResponse = {
|
|
|
19
19
|
headers: Record<string, string>;
|
|
20
20
|
body?: unknown;
|
|
21
21
|
};
|
|
22
|
+
export declare type TimeoutErrorInitObject = {
|
|
23
|
+
request: ApiErrorRequest;
|
|
24
|
+
preCallStack?: string;
|
|
25
|
+
};
|
|
26
|
+
export declare class TimeoutError extends Error {
|
|
27
|
+
request: ApiErrorRequest;
|
|
28
|
+
preCallStack?: string;
|
|
29
|
+
constructor(initObject: TimeoutErrorInitObject);
|
|
30
|
+
}
|
|
22
31
|
export declare type ApiErrorInitObject = {
|
|
23
32
|
request: ApiErrorRequest;
|
|
24
33
|
response: ApiErrorResponse;
|
|
@@ -71,6 +71,29 @@ var humanMessageForPlanUpgradeLimit = {
|
|
|
71
71
|
users: "You've reached the maximum number of collaborators your plan allows to invite to the project",
|
|
72
72
|
access_tokens: "You've reached the maximum number of API tokens your plan allows to create",
|
|
73
73
|
};
|
|
74
|
+
var TimeoutError = /** @class */ (function (_super) {
|
|
75
|
+
__extends(TimeoutError, _super);
|
|
76
|
+
function TimeoutError(initObject) {
|
|
77
|
+
var _newTarget = this.constructor;
|
|
78
|
+
var _this = _super.call(this, 'API Error!') || this;
|
|
79
|
+
Object.setPrototypeOf(_this, _newTarget.prototype);
|
|
80
|
+
if ('captureStackTrace' in Error) {
|
|
81
|
+
Error.captureStackTrace(_this, ApiError);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
_this.stack = new Error().stack;
|
|
85
|
+
}
|
|
86
|
+
_this.request = initObject.request;
|
|
87
|
+
_this.preCallStack = initObject.preCallStack;
|
|
88
|
+
_this.message = "".concat(initObject.request.method, " ").concat(initObject.request.url, ": Timeout error");
|
|
89
|
+
if (_this.preCallStack) {
|
|
90
|
+
_this.stack += "\nCaused By:\n".concat(_this.preCallStack);
|
|
91
|
+
}
|
|
92
|
+
return _this;
|
|
93
|
+
}
|
|
94
|
+
return TimeoutError;
|
|
95
|
+
}(Error));
|
|
96
|
+
export { TimeoutError };
|
|
74
97
|
var ApiError = /** @class */ (function (_super) {
|
|
75
98
|
__extends(ApiError, _super);
|
|
76
99
|
function ApiError(initObject) {
|
|
@@ -141,4 +164,4 @@ var ApiError = /** @class */ (function (_super) {
|
|
|
141
164
|
return ApiError;
|
|
142
165
|
}(Error));
|
|
143
166
|
export { ApiError };
|
|
144
|
-
//# sourceMappingURL=
|
|
167
|
+
//# sourceMappingURL=errors.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './errors';
|
|
2
2
|
export * from './deserialize';
|
|
3
3
|
export * from './pollJobResult';
|
|
4
4
|
export * from './rawPageIterator';
|
|
5
5
|
export * from './request';
|
|
6
6
|
export * from './serialize';
|
|
7
|
-
export * from './
|
|
7
|
+
export * from './makeCancelablePromise';
|
|
8
8
|
export * from './toId';
|
|
9
9
|
export * from './wait';
|
package/dist/esm/index.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
-
export * from './
|
|
2
|
+
export * from './errors';
|
|
3
3
|
export * from './deserialize';
|
|
4
4
|
export * from './pollJobResult';
|
|
5
5
|
export * from './rawPageIterator';
|
|
6
6
|
export * from './request';
|
|
7
7
|
export * from './serialize';
|
|
8
|
-
export * from './
|
|
8
|
+
export * from './makeCancelablePromise';
|
|
9
9
|
export * from './toId';
|
|
10
10
|
export * from './wait';
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,cAAc,UAAU,CAAC;AACzB,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC"}
|
|
@@ -4,4 +4,4 @@ export declare class CanceledPromiseError extends Error {
|
|
|
4
4
|
export interface CancelablePromise<T> extends Promise<T> {
|
|
5
5
|
cancel(): void;
|
|
6
6
|
}
|
|
7
|
-
export declare function makeCancelablePromise<T>(promiseOrAsyncFn: Promise<T> | (() => Promise<T>), onCancel
|
|
7
|
+
export declare function makeCancelablePromise<T>(promiseOrAsyncFn: Promise<T> | (() => Promise<T>), onCancel?: () => void): CancelablePromise<T>;
|
|
@@ -29,7 +29,9 @@ export function makeCancelablePromise(promiseOrAsyncFn, onCancel) {
|
|
|
29
29
|
var cancelable = new Promise(function (resolve, reject) {
|
|
30
30
|
cancel = function () {
|
|
31
31
|
try {
|
|
32
|
-
onCancel
|
|
32
|
+
if (onCancel) {
|
|
33
|
+
onCancel();
|
|
34
|
+
}
|
|
33
35
|
reject(new CanceledPromiseError());
|
|
34
36
|
}
|
|
35
37
|
catch (e) {
|
|
@@ -46,4 +48,4 @@ export function makeCancelablePromise(promiseOrAsyncFn, onCancel) {
|
|
|
46
48
|
}
|
|
47
49
|
return cancelable;
|
|
48
50
|
}
|
|
49
|
-
//# sourceMappingURL=
|
|
51
|
+
//# sourceMappingURL=makeCancelablePromise.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"makeCancelablePromise.js","sourceRoot":"","sources":["../../src/makeCancelablePromise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;IAA0C,wCAAK;IAC7C;;QAAA,YACE,kBAAM,mBAAmB,CAAC,SAE3B;QADC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;;IACpD,CAAC;IACH,2BAAC;AAAD,CAAC,AALD,CAA0C,KAAK,GAK9C;;AAMD,MAAM,UAAU,qBAAqB,CACnC,gBAAiD,EACjD,QAAqB;IAErB,IAAI,MAAM,GAAwB,IAAI,CAAC;IAEvC,IAAM,UAAU,GAAyB,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACnE,MAAM,GAAG;YACP,IAAI;gBACF,IAAI,QAAQ,EAAE;oBACZ,QAAQ,EAAE,CAAC;iBACZ;gBACD,MAAM,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;QAEF,IAAM,OAAO,GACX,OAAO,gBAAgB,KAAK,UAAU;YACpC,CAAC,CAAC,gBAAgB,EAAE;YACpB,CAAC,CAAC,gBAAgB,CAAC;QAEvB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;KAC5B;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -34,7 +34,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
34
34
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
|
-
import { ApiError } from './
|
|
37
|
+
import { ApiError } from './errors';
|
|
38
38
|
import { wait } from './wait';
|
|
39
39
|
export function pollJobResult(fetcher) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pollJobResult.js","sourceRoot":"","sources":["../../src/pollJobResult.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,UAAgB,aAAa,CACjC,OAAiC;;;;;;oBAG7B,UAAU,GAAG,CAAC,CAAC;;;;oBAIf,UAAU,IAAI,CAAC,CAAC;oBAChB,qBAAM,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;oBAA7B,SAA6B,CAAC;oBAClB,qBAAM,OAAO,EAAE,EAAA;;oBAA3B,SAAS,GAAG,SAAe,CAAC;;;;oBAE5B,IAAI,CAAC,CAAC,GAAC,YAAY,QAAQ,CAAC,IAAI,GAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;wBACzD,MAAM,GAAC,CAAC;qBACT;;;wBAEI,CAAC,SAAS;;wBAEnB,sBAAO,SAAS,EAAC;;;;CAClB"}
|
package/dist/esm/request.d.ts
CHANGED
package/dist/esm/request.js
CHANGED
|
@@ -47,8 +47,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
47
47
|
};
|
|
48
48
|
import qs from 'qs';
|
|
49
49
|
import fetch from 'cross-fetch';
|
|
50
|
-
import { ApiError } from './
|
|
50
|
+
import { ApiError, TimeoutError, } from './errors';
|
|
51
51
|
import { wait } from './wait';
|
|
52
|
+
import { makeCancelablePromise, CanceledPromiseError, } from './makeCancelablePromise';
|
|
52
53
|
export var LogLevel;
|
|
53
54
|
(function (LogLevel) {
|
|
54
55
|
/** No logging */
|
|
@@ -84,6 +85,17 @@ function buildApiErrorInitObject(method, url, requestHeaders, requestBody, respo
|
|
|
84
85
|
preCallStack: preCallStack,
|
|
85
86
|
};
|
|
86
87
|
}
|
|
88
|
+
function buildTimeoutErrorInitObject(method, url, requestHeaders, requestBody, preCallStack) {
|
|
89
|
+
return {
|
|
90
|
+
request: {
|
|
91
|
+
url: url,
|
|
92
|
+
method: method,
|
|
93
|
+
headers: requestHeaders,
|
|
94
|
+
body: requestBody,
|
|
95
|
+
},
|
|
96
|
+
preCallStack: preCallStack,
|
|
97
|
+
};
|
|
98
|
+
}
|
|
87
99
|
function buildApiErrorInitObjectFromJobResult(method, url, requestHeaders, requestBody, responseStatus, responseBody, preCallStack) {
|
|
88
100
|
return {
|
|
89
101
|
request: {
|
|
@@ -107,7 +119,7 @@ function isErrorWithCode(error) {
|
|
|
107
119
|
var requestCount = 1;
|
|
108
120
|
export function request(options) {
|
|
109
121
|
return __awaiter(this, void 0, void 0, function () {
|
|
110
|
-
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
122
|
+
var requestId, preCallStack, userAgent, retryCount, logLevel, autoRetry, log, headers, baseUrl, body, queryString, url, _i, _a, _b, key, value, requestPromise_1, response_1, responseContentType, invalidContentType, waitTimeInSecs, responseBody, _c, jobResult, error, error_1;
|
|
111
123
|
return __generator(this, function (_d) {
|
|
112
124
|
switch (_d.label) {
|
|
113
125
|
case 0:
|
|
@@ -140,12 +152,16 @@ export function request(options) {
|
|
|
140
152
|
}
|
|
141
153
|
_d.label = 1;
|
|
142
154
|
case 1:
|
|
143
|
-
_d.trys.push([1, 12, ,
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
155
|
+
_d.trys.push([1, 12, , 16]);
|
|
156
|
+
requestPromise_1 = makeCancelablePromise(fetch(url, {
|
|
157
|
+
method: options.method,
|
|
158
|
+
headers: headers,
|
|
159
|
+
body: body,
|
|
160
|
+
}));
|
|
161
|
+
setTimeout(function () {
|
|
162
|
+
requestPromise_1.cancel();
|
|
163
|
+
}, options.requestTimeout || 30000);
|
|
164
|
+
return [4 /*yield*/, requestPromise_1];
|
|
149
165
|
case 2:
|
|
150
166
|
response_1 = _d.sent();
|
|
151
167
|
responseContentType = response_1.headers.get('Content-Type');
|
|
@@ -180,6 +196,7 @@ export function request(options) {
|
|
|
180
196
|
'x-queue-time',
|
|
181
197
|
'x-ratelimit-remaining',
|
|
182
198
|
'x-request-id',
|
|
199
|
+
'cf-ray',
|
|
183
200
|
].forEach(function (key) {
|
|
184
201
|
var value = response_1.headers.get(key);
|
|
185
202
|
if (value) {
|
|
@@ -225,16 +242,19 @@ export function request(options) {
|
|
|
225
242
|
case 11: throw error;
|
|
226
243
|
case 12:
|
|
227
244
|
error_1 = _d.sent();
|
|
228
|
-
if (!(
|
|
245
|
+
if (!(error_1 instanceof CanceledPromiseError ||
|
|
246
|
+
(isErrorWithCode(error_1) && error_1.code.includes('ETIMEDOUT')))) return [3 /*break*/, 15];
|
|
247
|
+
if (!autoRetry) return [3 /*break*/, 14];
|
|
229
248
|
if (logLevel >= LogLevel.BASIC) {
|
|
230
|
-
log("[".concat(requestId, "]
|
|
249
|
+
log("[".concat(requestId, "] Timeout error, wait ").concat(retryCount, " seconds then retry..."));
|
|
231
250
|
}
|
|
232
251
|
return [4 /*yield*/, wait(retryCount * 1000)];
|
|
233
252
|
case 13:
|
|
234
253
|
_d.sent();
|
|
235
254
|
return [2 /*return*/, request(__assign(__assign({}, options), { retryCount: retryCount + 1 }))];
|
|
236
|
-
case 14: throw
|
|
237
|
-
case 15:
|
|
255
|
+
case 14: throw new TimeoutError(buildTimeoutErrorInitObject(options.method, url, headers, options.body, preCallStack));
|
|
256
|
+
case 15: throw error_1;
|
|
257
|
+
case 16: return [2 /*return*/];
|
|
238
258
|
}
|
|
239
259
|
});
|
|
240
260
|
});
|
package/dist/esm/request.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,15 @@ export declare type ApiErrorResponse = {
|
|
|
19
19
|
headers: Record<string, string>;
|
|
20
20
|
body?: unknown;
|
|
21
21
|
};
|
|
22
|
+
export declare type TimeoutErrorInitObject = {
|
|
23
|
+
request: ApiErrorRequest;
|
|
24
|
+
preCallStack?: string;
|
|
25
|
+
};
|
|
26
|
+
export declare class TimeoutError extends Error {
|
|
27
|
+
request: ApiErrorRequest;
|
|
28
|
+
preCallStack?: string;
|
|
29
|
+
constructor(initObject: TimeoutErrorInitObject);
|
|
30
|
+
}
|
|
22
31
|
export declare type ApiErrorInitObject = {
|
|
23
32
|
request: ApiErrorRequest;
|
|
24
33
|
response: ApiErrorResponse;
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './errors';
|
|
2
2
|
export * from './deserialize';
|
|
3
3
|
export * from './pollJobResult';
|
|
4
4
|
export * from './rawPageIterator';
|
|
5
5
|
export * from './request';
|
|
6
6
|
export * from './serialize';
|
|
7
|
-
export * from './
|
|
7
|
+
export * from './makeCancelablePromise';
|
|
8
8
|
export * from './toId';
|
|
9
9
|
export * from './wait';
|
|
@@ -4,4 +4,4 @@ export declare class CanceledPromiseError extends Error {
|
|
|
4
4
|
export interface CancelablePromise<T> extends Promise<T> {
|
|
5
5
|
cancel(): void;
|
|
6
6
|
}
|
|
7
|
-
export declare function makeCancelablePromise<T>(promiseOrAsyncFn: Promise<T> | (() => Promise<T>), onCancel
|
|
7
|
+
export declare function makeCancelablePromise<T>(promiseOrAsyncFn: Promise<T> | (() => Promise<T>), onCancel?: () => void): CancelablePromise<T>;
|
package/dist/types/request.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@datocms/rest-client-utils",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.3",
|
|
4
4
|
"description": "Utilities for DatoCMS REST API clients",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"datocms",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"cross-fetch": "^3.1.5",
|
|
41
41
|
"qs": "^6.10.3"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "e370345a81ed2ae180fa51990d25333d3d34f430",
|
|
44
44
|
"devDependencies": {
|
|
45
45
|
"@types/qs": "^6.9.7"
|
|
46
46
|
}
|
package/src/deserialize.ts
CHANGED
|
@@ -94,6 +94,36 @@ export type ApiErrorResponse = {
|
|
|
94
94
|
body?: unknown;
|
|
95
95
|
};
|
|
96
96
|
|
|
97
|
+
export type TimeoutErrorInitObject = {
|
|
98
|
+
request: ApiErrorRequest;
|
|
99
|
+
preCallStack?: string;
|
|
100
|
+
};
|
|
101
|
+
|
|
102
|
+
export class TimeoutError extends Error {
|
|
103
|
+
request: ApiErrorRequest;
|
|
104
|
+
preCallStack?: string;
|
|
105
|
+
|
|
106
|
+
constructor(initObject: TimeoutErrorInitObject) {
|
|
107
|
+
super('API Error!');
|
|
108
|
+
Object.setPrototypeOf(this, new.target.prototype);
|
|
109
|
+
|
|
110
|
+
if ('captureStackTrace' in Error) {
|
|
111
|
+
Error.captureStackTrace(this, ApiError);
|
|
112
|
+
} else {
|
|
113
|
+
this.stack = new Error().stack;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
this.request = initObject.request;
|
|
117
|
+
this.preCallStack = initObject.preCallStack;
|
|
118
|
+
|
|
119
|
+
this.message = `${initObject.request.method} ${initObject.request.url}: Timeout error`;
|
|
120
|
+
|
|
121
|
+
if (this.preCallStack) {
|
|
122
|
+
this.stack += `\nCaused By:\n${this.preCallStack}`;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
97
127
|
export type ApiErrorInitObject = {
|
|
98
128
|
request: ApiErrorRequest;
|
|
99
129
|
response: ApiErrorResponse;
|
package/src/index.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
export * from './
|
|
3
|
+
export * from './errors';
|
|
4
4
|
export * from './deserialize';
|
|
5
5
|
export * from './pollJobResult';
|
|
6
6
|
export * from './rawPageIterator';
|
|
7
7
|
export * from './request';
|
|
8
8
|
export * from './serialize';
|
|
9
|
-
export * from './
|
|
9
|
+
export * from './makeCancelablePromise';
|
|
10
10
|
export * from './toId';
|
|
11
11
|
export * from './wait';
|
|
@@ -11,14 +11,16 @@ export interface CancelablePromise<T> extends Promise<T> {
|
|
|
11
11
|
|
|
12
12
|
export function makeCancelablePromise<T>(
|
|
13
13
|
promiseOrAsyncFn: Promise<T> | (() => Promise<T>),
|
|
14
|
-
onCancel
|
|
14
|
+
onCancel?: () => void,
|
|
15
15
|
): CancelablePromise<T> {
|
|
16
16
|
let cancel: (() => void) | null = null;
|
|
17
17
|
|
|
18
18
|
const cancelable = <CancelablePromise<T>>new Promise((resolve, reject) => {
|
|
19
19
|
cancel = () => {
|
|
20
20
|
try {
|
|
21
|
-
onCancel
|
|
21
|
+
if (onCancel) {
|
|
22
|
+
onCancel();
|
|
23
|
+
}
|
|
22
24
|
reject(new CanceledPromiseError());
|
|
23
25
|
} catch (e) {
|
|
24
26
|
reject(e);
|
package/src/pollJobResult.ts
CHANGED
package/src/request.ts
CHANGED
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
import qs from 'qs';
|
|
2
2
|
import fetch from 'cross-fetch';
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
ApiError,
|
|
5
|
+
ApiErrorInitObject,
|
|
6
|
+
TimeoutError,
|
|
7
|
+
TimeoutErrorInitObject,
|
|
8
|
+
} from './errors';
|
|
4
9
|
import { JobResult } from './internalTypes';
|
|
5
10
|
import { wait } from './wait';
|
|
11
|
+
import {
|
|
12
|
+
makeCancelablePromise,
|
|
13
|
+
CanceledPromiseError,
|
|
14
|
+
} from './makeCancelablePromise';
|
|
6
15
|
|
|
7
16
|
export enum LogLevel {
|
|
8
17
|
/** No logging */
|
|
@@ -23,6 +32,7 @@ type RequestOptions = {
|
|
|
23
32
|
logLevel?: LogLevel;
|
|
24
33
|
autoRetry?: boolean;
|
|
25
34
|
retryCount?: number;
|
|
35
|
+
requestTimeout?: number;
|
|
26
36
|
method: 'GET' | 'PUT' | 'POST' | 'DELETE';
|
|
27
37
|
url: string;
|
|
28
38
|
queryParams?: Record<string, unknown>;
|
|
@@ -68,6 +78,24 @@ function buildApiErrorInitObject(
|
|
|
68
78
|
};
|
|
69
79
|
}
|
|
70
80
|
|
|
81
|
+
function buildTimeoutErrorInitObject(
|
|
82
|
+
method: string,
|
|
83
|
+
url: string,
|
|
84
|
+
requestHeaders: Record<string, string>,
|
|
85
|
+
requestBody: unknown,
|
|
86
|
+
preCallStack?: string,
|
|
87
|
+
): TimeoutErrorInitObject {
|
|
88
|
+
return {
|
|
89
|
+
request: {
|
|
90
|
+
url,
|
|
91
|
+
method,
|
|
92
|
+
headers: requestHeaders,
|
|
93
|
+
body: requestBody,
|
|
94
|
+
},
|
|
95
|
+
preCallStack,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
|
|
71
99
|
function buildApiErrorInitObjectFromJobResult(
|
|
72
100
|
method: string,
|
|
73
101
|
url: string,
|
|
@@ -142,11 +170,19 @@ export async function request<T>(options: RequestOptions): Promise<T> {
|
|
|
142
170
|
}
|
|
143
171
|
|
|
144
172
|
try {
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
173
|
+
const requestPromise = makeCancelablePromise(
|
|
174
|
+
fetch(url, {
|
|
175
|
+
method: options.method,
|
|
176
|
+
headers,
|
|
177
|
+
body,
|
|
178
|
+
}),
|
|
179
|
+
);
|
|
180
|
+
|
|
181
|
+
setTimeout(() => {
|
|
182
|
+
requestPromise.cancel();
|
|
183
|
+
}, options.requestTimeout || 30000);
|
|
184
|
+
|
|
185
|
+
const response = await requestPromise;
|
|
150
186
|
|
|
151
187
|
const responseContentType = response.headers.get('Content-Type');
|
|
152
188
|
const invalidContentType =
|
|
@@ -198,6 +234,7 @@ export async function request<T>(options: RequestOptions): Promise<T> {
|
|
|
198
234
|
'x-queue-time',
|
|
199
235
|
'x-ratelimit-remaining',
|
|
200
236
|
'x-request-id',
|
|
237
|
+
'cf-ray',
|
|
201
238
|
].forEach((key) => {
|
|
202
239
|
const value = response.headers.get(key);
|
|
203
240
|
if (value) {
|
|
@@ -264,16 +301,31 @@ export async function request<T>(options: RequestOptions): Promise<T> {
|
|
|
264
301
|
|
|
265
302
|
throw error;
|
|
266
303
|
} catch (error) {
|
|
267
|
-
if (
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
304
|
+
if (
|
|
305
|
+
error instanceof CanceledPromiseError ||
|
|
306
|
+
(isErrorWithCode(error) && error.code.includes('ETIMEDOUT'))
|
|
307
|
+
) {
|
|
308
|
+
if (autoRetry) {
|
|
309
|
+
if (logLevel >= LogLevel.BASIC) {
|
|
310
|
+
log(
|
|
311
|
+
`[${requestId}] Timeout error, wait ${retryCount} seconds then retry...`,
|
|
312
|
+
);
|
|
313
|
+
}
|
|
273
314
|
|
|
274
|
-
|
|
315
|
+
await wait(retryCount * 1000);
|
|
275
316
|
|
|
276
|
-
|
|
317
|
+
return request({ ...options, retryCount: retryCount + 1 });
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
throw new TimeoutError(
|
|
321
|
+
buildTimeoutErrorInitObject(
|
|
322
|
+
options.method,
|
|
323
|
+
url,
|
|
324
|
+
headers,
|
|
325
|
+
options.body,
|
|
326
|
+
preCallStack,
|
|
327
|
+
),
|
|
328
|
+
);
|
|
277
329
|
}
|
|
278
330
|
|
|
279
331
|
throw error;
|
package/dist/cjs/ApiError.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"CancelablePromise.js","sourceRoot":"","sources":["../../src/CancelablePromise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA;IAA0C,wCAAK;IAC7C;;QAAA,YACE,kBAAM,mBAAmB,CAAC,SAE3B;QADC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;;IACpD,CAAC;IACH,2BAAC;AAAD,CAAC,AALD,CAA0C,KAAK,GAK9C;AALY,oDAAoB;AAWjC,SAAgB,qBAAqB,CACnC,gBAAiD,EACjD,QAAoB;IAEpB,IAAI,MAAM,GAAwB,IAAI,CAAC;IAEvC,IAAM,UAAU,GAAyB,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACnE,MAAM,GAAG;YACP,IAAI;gBACF,QAAQ,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;QAEF,IAAM,OAAO,GACX,OAAO,gBAAgB,KAAK,UAAU;YACpC,CAAC,CAAC,gBAAgB,EAAE;YACpB,CAAC,CAAC,gBAAgB,CAAC;QAEvB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;KAC5B;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AA7BD,sDA6BC"}
|
package/dist/esm/ApiError.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ApiError.js","sourceRoot":"","sources":["../../src/ApiError.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAYA,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,IAAM,YAAY,GAAG,IAAyB,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IAED,IAAM,gBAAgB,GAAG,YAAmC,CAAC;IAE7D,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,IAAM,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;AAED,IAAM,mBAAmB,GAAuC;IAC9D,iCAAiC,EAAE,oJAAoJ;IACvL,wBAAwB,EAAE,uCAAuC;IACjE,gBAAgB,EAAE,+CAA+C;IACjE,kBAAkB,EAAE,0FAA0F;IAC9G,mBAAmB,EAAE,4BAA4B;IACjD,aAAa,EAAE,6BAA6B;IAC5C,cAAc,EAAE,iHAAiH;IACjI,WAAW,EAAE,wFAAwF;IACrG,2BAA2B,EAAE,4EAA4E;IACzG,qBAAqB,EAAE,sCAAsC;IAC7D,kBAAkB,EAAE,2EAA2E;IAC/F,kBAAkB,EAAE,qKAAqK;IACzL,uBAAuB,EAAE,8DAA8D;IACvF,kBAAkB,EAAE,yFAAyF;IAC7G,qBAAqB,EAAE,6CAA6C;IACpE,gBAAgB,EAAE,oEAAoE;IACtF,kBAAkB,EAAE,qEAAqE;IACzF,0BAA0B,EAAE,qEAAqE;IACjG,oCAAoC,EAAE,oFAAoF;CAC3H,CAAC;AAEF,IAAM,+BAA+B,GAAuC;IAC1E,cAAc,EAAE,sEAAsE;IACtF,oBAAoB,EAAE,oEAAoE;IAC1F,UAAU,EAAE,wEAAwE;IACpF,KAAK,EAAE,yEAAyE;IAChF,OAAO,EAAE,+DAA+D;IACxE,oBAAoB,EAAE,+DAA+D;IACrF,GAAG,EAAE,yDAAyD;IAC9D,OAAO,EAAE,+DAA+D;IACxE,KAAK,EAAE,uEAAuE;IAC9E,gBAAgB,EAAE,qDAAqD;IACvE,KAAK,EAAE,8FAA8F;IACrG,aAAa,EAAE,4EAA4E;CAC5F,CAAC;AAsBF;IAA8B,4BAAK;IAKjC,kBAAY,UAA8B;;QAA1C,YACE,kBAAM,YAAY,CAAC,SAwBpB;QAvBC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;QAElD,IAAI,mBAAmB,IAAI,KAAK,EAAE;YAChC,KAAK,CAAC,iBAAiB,CAAC,KAAI,EAAE,QAAQ,CAAC,CAAC;SACzC;aAAM;YACL,KAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,KAAK,CAAC;SAChC;QAED,KAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QAClC,KAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACpC,KAAI,CAAC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QAE5C,IAAI,OAAO,GAAG,UAAG,UAAU,CAAC,OAAO,CAAC,MAAM,cAAI,UAAU,CAAC,OAAO,CAAC,GAAG,eAAK,KAAI,CAAC,QAAQ,CAAC,MAAM,cAAI,KAAI,CAAC,QAAQ,CAAC,UAAU,CAAE,CAAC;QAE5H,IAAI,KAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,OAAO,IAAI,cAAO,IAAI,CAAC,SAAS,CAAC,KAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAE,CAAC;SAC1D;QAED,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,KAAI,CAAC,YAAY,EAAE;YACrB,KAAI,CAAC,KAAK,IAAI,wBAAiB,KAAI,CAAC,YAAY,CAAE,CAAC;SACpD;;IACH,CAAC;IAED,sBAAI,4BAAM;aAAV;YACE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpC,OAAO,EAAE,CAAC;aACX;YAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QACjC,CAAC;;;OAAA;IAED,4BAAS,GAAT,UACE,WAA8B,EAC9B,aAAiD;QAEjD,IAAM,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,UAAC,KAAK;YACJ,OAAA,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBACrC,CAAC,CAAC,aAAa;oBACb,CAAC,OAAO,aAAa,KAAK,UAAU;wBAClC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;wBACzC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,CACjC,UAAC,EAAY;gCAAX,GAAG,QAAA,EAAE,KAAK,QAAA;4BAAM,OAAA,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK;wBAAvC,CAAuC,CAC1D,CAAC,CAAC;QANT,CAMS,CACZ,CAAC;IACJ,CAAC;IAED,sBAAI,kCAAY;aAAhB;YAAA,iBAoBC;YAnBC,IAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAEjE,IAAI,gBAAgB,EAAE;gBACZ,IAAA,KAAK,GAAK,gBAAgB,CAAC,UAAU,CAAC,OAG7C,MAHY,CAGX;gBACF,OAAO,UAAG,+BAA+B,CAAC,KAAK,CAAC,0OAAuO,CAAC;aACzR;YAED,IAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;iBAC5C,MAAM,CAAC,UAAC,IAAI,IAAK,OAAA,KAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAApB,CAAoB,CAAC;iBACtC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,mBAAmB,CAAC,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;YAE5C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,IAAI,CAAC;aACb;YAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;;;OAAA;IACH,eAAC;AAAD,CAAC,AA9ED,CAA8B,KAAK,GA8ElC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"CancelablePromise.js","sourceRoot":"","sources":["../../src/CancelablePromise.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;IAA0C,wCAAK;IAC7C;;QAAA,YACE,kBAAM,mBAAmB,CAAC,SAE3B;QADC,MAAM,CAAC,cAAc,CAAC,KAAI,EAAE,WAAW,SAAS,CAAC,CAAC;;IACpD,CAAC;IACH,2BAAC;AAAD,CAAC,AALD,CAA0C,KAAK,GAK9C;;AAMD,MAAM,UAAU,qBAAqB,CACnC,gBAAiD,EACjD,QAAoB;IAEpB,IAAI,MAAM,GAAwB,IAAI,CAAC;IAEvC,IAAM,UAAU,GAAyB,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACnE,MAAM,GAAG;YACP,IAAI;gBACF,QAAQ,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,oBAAoB,EAAE,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAC;QAEF,IAAM,OAAO,GACX,OAAO,gBAAgB,KAAK,UAAU;YACpC,CAAC,CAAC,gBAAgB,EAAE;YACpB,CAAC,CAAC,gBAAgB,CAAC;QAEvB,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,EAAE;QACV,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC;KAC5B;IAED,OAAO,UAAU,CAAC;AACpB,CAAC"}
|