@mablhq/mabl-cli 1.13.14 → 1.13.21

package/api/basicApiClient.js

@@ -28,9 +28,13 @@ const httpUtil_1 = require("../util/httpUtil");
 const axios_1 = __importDefault(require("axios"));
 const os = __importStar(require("os"));
 const async_retry_1 = __importDefault(require("async-retry"));
+const logUtils_1 = require("../util/logUtils");
 const asyncUtil_1 = require("../util/asyncUtil");
 const MABL_ENTITY_VERSION_HEADER = 'x-mabl-entity-version';
-const DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS = 300000;
+const DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS = 60000;
+const DEFAULT_NONRETRYABLE_REQUEST_TIMEOUT_MILLISECONDS = 600000;
+const DEFAULT_RETRIES = 5;
+const DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS = DEFAULT_RETRYABLE_REQUEST_TIMEOUT_MILLISECONDS * DEFAULT_RETRIES;
 const DEFAULT_MIN_RETRY_TIMEOUT_MILLISECONDS = 100;
 const DEFAULT_MAX_RETRY_TIMEOUT_MILLISECONDS = 1000;
 var AuthType;
@@ -40,10 +44,12 @@ var AuthType;
 })(AuthType = exports.AuthType || (exports.AuthType = {}));
 class BasicApiClient {
     constructor(options) {
+        var _a, _b;
         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;
         switch (options.authType) {
             case AuthType.ApiKey:
                 config.auth = {
@@ -68,23 +74,33 @@ class BasicApiClient {
         if (options.userAgentOverride) {
             config.headers[httpUtil_1.USER_AGENT_HEADER] = options.userAgentOverride;
         }
+        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;
     }
-    async makeGetRequest(path) {
-        return this.retryWrappedRequest(async () => this.getRequest(path));
+    getNonRetryableRequestConfig(override) {
+        const overrideWithTimeout = { ...(override !== null && override !== void 0 ? override : {}) };
+        if (!overrideWithTimeout.timeout) {
+            overrideWithTimeout.timeout =
+                DEFAULT_NONRETRYABLE_REQUEST_TIMEOUT_MILLISECONDS;
+        }
+        return { ...this.httpRequestConfig, ...overrideWithTimeout };
+    }
+    makeGetRequest(path) {
+        return this.retryWrappedRequest(`makeGetRequest('${path}')`, () => this.getRequest(path));
     }
     async getRequest(path) {
-        const response = await this.httpClient.get(path);
+        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
-    async makeGetRequestWithETag(path) {
-        return this.retryWrappedRequest(async () => this.getRequestWithETag(path));
+    makeGetRequestWithETag(path) {
+        return this.retryWrappedRequest(`makeGetRequestWithETag('${path}')`, () => this.getRequestWithETag(path));
     }
     async getRequestWithETag(path) {
         var _a;
-        const response = await this.httpClient.get(path);
+        const response = await this.debugRequest('GET', path, () => this.httpClient.get(path));
         BasicApiClient.checkResponseStatusCode(response);
         const headers = response.headers;
         const result = response.data;
@@ -95,42 +111,63 @@ class BasicApiClient {
         return { ...result, entity_version: versionHeader };
     }
     async makePostRequest(path, requestBody, requestConfig) {
-        const response = await this.httpClient.post(path, requestBody, requestConfig);
+        const response = await this.debugRequest('POST', path, () => this.httpClient.post(path, requestBody, this.getNonRetryableRequestConfig(requestConfig)));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
     async makePutRequest(path, requestBody) {
-        const response = await this.httpClient.put(path, requestBody);
+        const response = await this.debugRequest('PUT', path, () => this.httpClient.put(path, requestBody, this.getNonRetryableRequestConfig()));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
-    async makeDeleteRequest(path) {
-        return this.retryWrappedRequest(async () => this.deleteRequest(path));
+    makeDeleteRequest(path) {
+        return this.retryWrappedRequest(`makeDeleteRequest('${path}')`, () => this.deleteRequest(path));
     }
     async deleteRequest(path) {
-        const response = await this.httpClient.delete(path);
+        const response = await this.debugRequest('DELETE', path, () => this.deleteRequest(path));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
     async makePatchRequest(path, requestBody, ifMatch) {
         const extraConfig = ifMatch ? { headers: { 'If-Match': ifMatch } } : {};
-        const response = await this.httpClient.patch(path, requestBody, extraConfig);
+        const response = await this.debugRequest('PATCH', path, () => this.httpClient.patch(path, requestBody, extraConfig));
         BasicApiClient.checkResponseStatusCode(response);
         return response.data;
     }
+    async debugRequest(method, path, request) {
+        const startTimeMillis = Date.now();
+        let responseCode;
+        let error;
+        try {
+            this.debugLogger(`API Client: Sending ${method} ${path}`);
+            const response = await request();
+            responseCode = response.status;
+            return response;
+        }
+        catch (e) {
+            error = e;
+            throw e;
+        }
+        finally {
+            this.debugLogger(`API Client: ${method} ${path} ${error ? 'failed' : 'completed'} in ${Date.now() - startTimeMillis}ms with ${responseCode !== null && responseCode !== void 0 ? responseCode : error}`);
+        }
+    }
     static checkResponseStatusCode(response) {
         const statusCode = response.status;
         if (!statusCode || statusCode >= 400) {
             throw new ApiError_1.ApiError(`[${statusCode} - ${response.statusText}]`, statusCode);
         }
     }
-    retryWrappedRequest(requestFunc) {
+    retryWrappedRequest(description, requestFunc) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const retryOptions = {
-            retries: (_b = (_a = this.retryConfig) === null || _a === void 0 ? void 0 : _a.retryCount) !== null && _b !== void 0 ? _b : 0,
+            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.minTimeoutMillis) !== null && _d !== void 0 ? _d : DEFAULT_MIN_RETRY_TIMEOUT_MILLISECONDS,
             maxTimeout: (_f = (_e = this.retryConfig) === null || _e === void 0 ? void 0 : _e.maxTimeoutMillis) !== null && _f !== void 0 ? _f : DEFAULT_MAX_RETRY_TIMEOUT_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,
+            onRetry: (error) => {
+                this.debugLogger(`Retrying failed API request "${description}"`, error);
+            },
             forever: false,
         };
         return asyncUtil_1.promiseWithTimeout(async_retry_1.default(async (bail) => {
@@ -152,7 +189,7 @@ class BasicApiClient {
                     return {};
                 }
             }
-        }, retryOptions), DEFAULT_MAX_TOTAL_RETRY_TIME_MILLISECONDS + 1000, 'Retryable API request');
+        }, retryOptions), retryOptions.maxRetryTime + retryOptions.maxTimeout, 'Retryable API request');
     }
 }
 exports.BasicApiClient = BasicApiClient;

package/api/mablApiClient.js

@@ -127,7 +127,7 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
     }
     async createDeployment(deployment) {
         try {
-            return await this.makePostRequest(`${env_1.BASE_API_URL}/deployments`, deployment);
+            return await this.makePostRequest(`${env_1.BASE_API_URL}/deployments`, deployment, { timeout: 0 });
         }
         catch (error) {
             throw toApiError(`Failed to create deployment`, error);

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -22,6 +22,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightFrame = void 0;
 const browserLauncher_1 = require("../browserLauncher");
 const playwright = __importStar(require("@playwright/test"));
+const types_1 = require("../types");
 const utils_1 = require("../utils");
 const playwrightHttpResponse_1 = require("./playwrightHttpResponse");
 const playwrightDom_1 = require("./playwrightDom");
@@ -117,7 +118,16 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
     }
     async goto(url, options) {
         try {
+            const waitForNetworkIdle = (options === null || options === void 0 ? void 0 : options.waitUntil) === types_1.LifecycleEvent.NetworkIdle;
+            if (options && waitForNetworkIdle) {
+                options.waitUntil = types_1.LifecycleEvent.Load;
+            }
             const response = await this.frame.goto(url, options);
+            if (waitForNetworkIdle) {
+                await this.frame.waitForLoadState('networkidle', {
+                    timeout: types_1.DefaultTimeouts.quickActionTimeoutMs,
+                });
+            }
             return utils_1.mapIfNotNull(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));
         }
         catch (e) {