askui 0.17.1 → 0.18.1

package/dist/esm/utils/http/http-client-got.js

@@ -12,6 +12,22 @@ import { CookieJar } from 'tough-cookie';
 import { logger } from '../../lib';
 import { Credentials } from './credentials';
 import { httpClientErrorHandler } from './custom-errors';
+function buildRetryLog(requestUrl, errorCode, statusCode, errorMessage, delayInMs, delayReason, attemptCount) {
+    const failureReasons = [];
+    if (statusCode !== undefined && statusCode >= 400) {
+        failureReasons.push(`status code ${statusCode}`);
+    }
+    if (errorCode !== undefined) {
+        failureReasons.push(`error code ${errorCode}`);
+    }
+    if (failureReasons.length === 0) {
+        failureReasons.push('unknown error');
+    }
+    const requestText = requestUrl ? `Request to ${requestUrl}` : 'Request';
+    return (`${requestText} failed with ${failureReasons.join(', ')}.`
+        + ` Retrying in ${delayInMs} ms... (based on ${delayReason}; attempt ${attemptCount})`
+        + `\nFull message:\n${errorMessage}`);
+}
 export class HttpClientGot {
     constructor(token, customHeaders, cookies = {}, proxyAgents) {
         this.token = token;
@@ -27,33 +43,43 @@ export class HttpClientGot {
     buildGotExtendOptions(proxyAgents) {
         const gotExtendOptions = {
             retry: {
-                calculateDelay: ({ attemptCount, retryOptions, error, computedValue, }) => {
+                calculateDelay: ({ attemptCount, retryOptions, error, retryAfter, }) => {
                     var _a, _b, _c;
-                    if (attemptCount > retryOptions.limit
-                        || !this.shouldRetryOnError(error)) {
+                    if (!this.shouldRetryOnError(error)) {
+                        return 0;
+                    }
+                    if (attemptCount > retryOptions.limit) {
+                        return 0;
+                    }
+                    const hasMethod = retryOptions.methods.includes(error.options.method);
+                    const hasErrorCode = retryOptions.errorCodes.includes(error.code);
+                    const hasStatusCode = error.response
+                        && retryOptions.statusCodes.includes(error.response.statusCode);
+                    if (!hasMethod || (!hasErrorCode && !hasStatusCode)) {
                         return 0;
                     }
-                    if (error.response !== undefined
-                        && error.response.headers['retry-after'] === undefined) {
-                        logger.debug(`Request to ${(_a = error.request) === null || _a === void 0 ? void 0 : _a.requestUrl} failed with status code ${(_b = error.response) === null || _b === void 0 ? void 0 : _b.statusCode}.\n${error.message}\nRetrying... (attempt ${attemptCount})`);
-                        return Math.min(1000 * Math.pow(2, (attemptCount - 1)) + Math.random() * 100, Number.MAX_SAFE_INTEGER);
+                    if (error.response) {
+                        if (retryAfter) {
+                            if (retryOptions.maxRetryAfter === undefined
+                                || retryAfter > retryOptions.maxRetryAfter) {
+                                return 0;
+                            }
+                            logger.debug(buildRetryLog((_a = error.request) === null || _a === void 0 ? void 0 : _a.requestUrl, error.code, error.response.statusCode, error.message, retryAfter, 'retry-after header', attemptCount));
+                            return retryAfter;
+                        }
+                        if (error.response.statusCode === 413) {
+                            return 0;
+                        }
                     }
-                    logger.debug(`Request to ${(_c = error.request) === null || _c === void 0 ? void 0 : _c.requestUrl} failed.\n${error.message}\nRetrying... (attempt ${attemptCount})`);
-                    return computedValue;
+                    const baseDelayInMs = 1000;
+                    const noiseToPreventCollisions = Math.random() * 100;
+                    const delayInMs = Math.min(Math.pow(2, (attemptCount - 1)) * baseDelayInMs + noiseToPreventCollisions, Number.MAX_SAFE_INTEGER);
+                    logger.debug(buildRetryLog((_b = error.request) === null || _b === void 0 ? void 0 : _b.requestUrl, error.code, (_c = error.response) === null || _c === void 0 ? void 0 : _c.statusCode, error.message, delayInMs, 'retry-after header', attemptCount));
+                    return delayInMs;
                 },
-                errorCodes: [
-                    'ETIMEDOUT',
-                    'ECONNRESET',
-                    'EADDRINUSE',
-                    'ECONNREFUSED',
-                    'EPIPE',
-                    'ENOTFOUND',
-                    'ENETUNREACH',
-                    'EAI_AGAIN',
-                ],
                 limit: 5,
+                maxRetryAfter: 10 * 60,
                 methods: ['POST', 'GET', 'PUT', 'HEAD', 'DELETE', 'OPTIONS', 'TRACE'],
-                statusCodes: [408, 413, 429, 500, 502, 503, 504, 521, 522, 524],
             },
         };
         if (proxyAgents) {

package/dist/example_projects_templates/typescript/.eslintrc.json-template

@@ -12,9 +12,10 @@
   },
   "plugins": [
     "import",
-    "askui"
+    "@askui/askui"
   ],
   "rules": {
-      "askui/no-missing-askui-exec": "error"
+      "@askui/askui/no-missing-exec": "error",
+      "@askui/askui/expect": "error"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "askui",
-    "version": "0.17.1",
+    "version": "0.18.1",
     "license": "MIT",
     "author": "askui GmbH <info@askui.com> (http://www.askui.com/)",
     "description": "Reliable, automated end-to-end-testing that depends on what is shown on your screen instead of the technology you are running on",