@mablhq/mabl-cli 1.16.5 → 1.16.11

package/api/basicApiClient.js

@@ -37,6 +37,14 @@ const DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS = DEFAULT_RETRYABLE_REQUEST_TIME
 const DEFAULT_NONRETRYABLE_REQUEST_TIMEOUT_MILLISECONDS = DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS;
 const DEFAULT_MIN_RETRY_INTERVAL_MILLISECONDS = 1000;
 const DEFAULT_MAX_RETRY_INTERVAL_MILLISECONDS = 10000;
+const RETRYABLE_NODEJS_ERRORS = [
+    'EAI_AGAIN',
+    'ECONNRESET',
+    'ENOTFOUND',
+    'ENETUNREACH',
+    'ETIMEOUT',
+    'ECONNABORTED',
+];
 var AuthType;
 (function (AuthType) {
     AuthType[AuthType["Bearer"] = 0] = "Bearer";
@@ -44,12 +52,12 @@ var AuthType;
 })(AuthType = exports.AuthType || (exports.AuthType = {}));
 class BasicApiClient {
     constructor(options) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         const config = httpUtil_1.axiosProxyConfig({
             sslVerify: options.sslVerify,
             proxyHost: options.proxyUrl,
         });
-        config.timeout = (_a = options.requestTimeoutMillis) !== null && _a !== void 0 ? _a : DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
+        config.timeout = (_c = (_a = options.requestTimeoutMillis) !== null && _a !== void 0 ? _a : (_b = options.retryConfig) === null || _b === void 0 ? void 0 : _b.requestTimeoutMillis) !== null && _c !== void 0 ? _c : DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
         switch (options.authType) {
             case AuthType.ApiKey:
                 config.auth = {
@@ -77,7 +85,7 @@ class BasicApiClient {
         this.httpRequestConfig = config;
         this.httpClient = axios_1.default.create(config);
         this.retryConfig = options.retryConfig;
-        this.debugLogger = (_b = options.debugLogger) !== null && _b !== void 0 ? _b : logUtils_1.logInternal;
+        this.debugLogger = (_d = options.debugLogger) !== null && _d !== void 0 ? _d : logUtils_1.logInternal;
     }
     getNonRetryableRequestConfig(override) {
         const overrideWithTimeout = { ...(override !== null && override !== void 0 ? override : {}) };
@@ -87,20 +95,26 @@ class BasicApiClient {
         }
         return { ...this.httpRequestConfig, ...overrideWithTimeout };
     }
-    makeGetRequest(path) {
-        return this.retryWrappedRequest(`makeGetRequest('${path}')`, () => this.getRequest(path));
+    getRetryableRequestConfig(retryConfig) {
+        var _a;
+        return this.getNonRetryableRequestConfig({
+            timeout: (_a = retryConfig === null || retryConfig === void 0 ? void 0 : retryConfig.requestTimeoutMillis) !== null && _a !== void 0 ? _a : this.httpRequestConfig.timeout,
+        });
+    }
+    makeGetRequest(path, retryConfig) {
+        return this.retryWrappedRequest(`makeGetRequest('${path}')`, () => this.getRequest(path, this.getRetryableRequestConfig(retryConfig)), retryConfig);
     }
-    async getRequest(path) {
-        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path));
+    async getRequest(path, config) {
+        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path, config));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
-    makeGetRequestWithETag(path) {
-        return this.retryWrappedRequest(`makeGetRequestWithETag('${path}')`, () => this.getRequestWithETag(path));
+    makeGetRequestWithETag(path, retryConfig) {
+        return this.retryWrappedRequest(`makeGetRequestWithETag('${path}')`, () => this.getRequestWithETag(path, this.getRetryableRequestConfig(retryConfig)), retryConfig);
     }
-    async getRequestWithETag(path) {
+    async getRequestWithETag(path, config) {
         var _a;
-        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path));
+        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path, config));
         BasicApiClient.checkResponseStatusCode(response);
         const headers = response.headers;
         const result = response.data;
@@ -120,11 +134,11 @@ class BasicApiClient {
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
-    makeDeleteRequest(path) {
-        return this.retryWrappedRequest(`makeDeleteRequest('${path}')`, () => this.deleteRequest(path));
+    makeDeleteRequest(path, retryConfig) {
+        return this.retryWrappedRequest(`makeDeleteRequest('${path}')`, () => this.deleteRequest(path, this.getRetryableRequestConfig(retryConfig)), retryConfig);
     }
-    async deleteRequest(path) {
-        const response = await this.debugRequest('DELETE', path, () => this.deleteRequest(path));
+    async deleteRequest(path, config) {
+        const response = await this.debugRequest('DELETE', path, () => this.deleteRequest(path, config));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
@@ -158,38 +172,48 @@ class BasicApiClient {
             throw new ApiError_1.ApiError(`[${statusCode} - ${response.statusText}]`, statusCode);
         }
     }
-    retryWrappedRequest(description, requestFunc) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    retryWrappedRequest(description, requestFunc, retryConfigOverride) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const retryOptions = {
-            retries: (_b = (_a = this.retryConfig) === null || _a === void 0 ? void 0 : _a.retryCount) !== null && _b !== void 0 ? _b : DEFAULT_RETRIES,
-            minTimeout: (_d = (_c = this.retryConfig) === null || _c === void 0 ? void 0 : _c.minRetryIntervalMillis) !== null && _d !== void 0 ? _d : DEFAULT_MIN_RETRY_INTERVAL_MILLISECONDS,
-            maxTimeout: (_f = (_e = this.retryConfig) === null || _e === void 0 ? void 0 : _e.maxRetryIntervalMillis) !== null && _f !== void 0 ? _f : DEFAULT_MAX_RETRY_INTERVAL_MILLISECONDS,
-            maxRetryTime: (_h = (_g = this.retryConfig) === null || _g === void 0 ? void 0 : _g.maxRetryTimeMillis) !== null && _h !== void 0 ? _h : DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS,
+            retries: (_c = (_a = retryConfigOverride === null || retryConfigOverride === void 0 ? void 0 : retryConfigOverride.retryCount) !== null && _a !== void 0 ? _a : (_b = this.retryConfig) === null || _b === void 0 ? void 0 : _b.retryCount) !== null && _c !== void 0 ? _c : DEFAULT_RETRIES,
+            minTimeout: (_f = (_d = retryConfigOverride === null || retryConfigOverride === void 0 ? void 0 : retryConfigOverride.minRetryIntervalMillis) !== null && _d !== void 0 ? _d : (_e = this.retryConfig) === null || _e === void 0 ? void 0 : _e.minRetryIntervalMillis) !== null && _f !== void 0 ? _f : DEFAULT_MIN_RETRY_INTERVAL_MILLISECONDS,
+            maxTimeout: (_j = (_g = retryConfigOverride === null || retryConfigOverride === void 0 ? void 0 : retryConfigOverride.maxRetryIntervalMillis) !== null && _g !== void 0 ? _g : (_h = this.retryConfig) === null || _h === void 0 ? void 0 : _h.maxRetryIntervalMillis) !== null && _j !== void 0 ? _j : DEFAULT_MAX_RETRY_INTERVAL_MILLISECONDS,
+            maxRetryTime: (_m = (_k = retryConfigOverride === null || retryConfigOverride === void 0 ? void 0 : retryConfigOverride.maxRetryTimeMillis) !== null && _k !== void 0 ? _k : (_l = this.retryConfig) === null || _l === void 0 ? void 0 : _l.maxRetryTimeMillis) !== null && _m !== void 0 ? _m : DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS,
             onRetry: (error) => {
                 this.debugLogger(`Retrying failed API request "${description}"`, error);
             },
             forever: false,
         };
         return asyncUtil_1.promiseWithTimeout(async_retry_1.default(async (bail) => {
-            var _a, _b;
             try {
                 return await requestFunc();
             }
             catch (error) {
-                const axiosError = error;
-                const statusCode = (_a = axiosError.code) !== null && _a !== void 0 ? _a : (_b = axiosError.response) === null || _b === void 0 ? void 0 : _b.status;
-                if (statusCode === 429 ||
-                    statusCode === 502 ||
-                    statusCode === 503 ||
-                    statusCode === 504) {
+                if (axios_1.default.isAxiosError(error) && BasicApiClient.isRetryable(error)) {
                     throw error;
                 }
                 else {
+                    let code;
+                    if (axios_1.default.isAxiosError(error)) {
+                        code = error.code;
+                    }
+                    this.debugLogger(`Non-retryable error on API client: ${code} ${description} ${error}`);
                     bail(error);
                     return {};
                 }
             }
         }, retryOptions), retryOptions.maxRetryTime + retryOptions.maxTimeout, 'Retryable API request');
     }
+    static isRetryable(axiosError) {
+        if (axiosError.response) {
+            const statusCode = axiosError.response.status;
+            return (statusCode === 429 ||
+                statusCode === 502 ||
+                statusCode === 503 ||
+                statusCode === 504);
+        }
+        return (axiosError.code !== undefined &&
+            RETRYABLE_NODEJS_ERRORS.includes(axiosError.code));
+    }
 }
 exports.BasicApiClient = BasicApiClient;

package/api/mablApiClient.js

@@ -227,7 +227,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async getDeploymentResults(deploymentEventId) {
         try {
-            return await this.makeGetRequest(`${env_1.BASE_API_URL}/execution/result/event/${deploymentEventId}`);
+            return await this.makeGetRequest(`${env_1.BASE_API_URL}/execution/result/event/${deploymentEventId}`, { requestTimeoutMillis: 600000, maxRetryTimeMillis: 900000 });
         }
         catch (error) {
             throw toApiError(`Failed to get deployment results`, error);

package/browserLauncher/pageEvent.js

@@ -13,4 +13,5 @@ var PageEvent;
     PageEvent["Response"] = "response";
     PageEvent["TracingBufferUsage"] = "tracingbufferusage";
     PageEvent["TracingComplete"] = "tracingcomplete";
+    PageEvent["TracingDataCollected"] = "TracingDataCollected";
 })(PageEvent = exports.PageEvent || (exports.PageEvent = {}));

package/browserLauncher/playwrightBrowserLauncher/playwrightPage.js

@@ -130,6 +130,12 @@ class PlaywrightPage extends events_1.default {
                     this.emit(browserLauncher_1.PageEvent.TracingBufferUsage, tracing);
                 });
             }
+            if (event === browserLauncher_1.PageEvent.TracingDataCollected &&
+                !this.listenerCount(event)) {
+                this.getCdpSession().on('Tracing.dataCollected', (data) => {
+                    this.emit(browserLauncher_1.PageEvent.TracingDataCollected, data);
+                });
+            }
             if (event === browserLauncher_1.PageEvent.TracingComplete && !this.listenerCount(event)) {
                 this.getCdpSession().on('Tracing.tracingComplete', (tracingComplete) => {
                     this.emit(browserLauncher_1.PageEvent.TracingComplete, tracingComplete);

package/browserLauncher/puppeteerBrowserLauncher/puppeteerPage.js

@@ -245,6 +245,12 @@ class PuppeteerPage extends events_1.default {
                 this.emit(browserLauncher_1.PageEvent.TracingComplete, tracingComplete);
             });
         }
+        if (event === browserLauncher_1.PageEvent.TracingDataCollected &&
+            !this.listenerCount(event)) {
+            this.getCdpClient().on('Tracing.dataCollected', (data) => {
+                this.emit(browserLauncher_1.PageEvent.TracingComplete, data);
+            });
+        }
     }
     evaluateHandleInSecondaryWorld(code, ...args) {
         return this.mainFrame().evaluateHandleInSecondaryWorld(code, ...args);