@mablhq/mabl-cli 1.10.10 → 1.11.15

package/commands/tests/testsUtil.js

@@ -42,6 +42,7 @@ const logLineMessaging_1 = require("../../core/messaging/logLineMessaging");
 const resourceUtil_1 = require("../../util/resourceUtil");
 const mobileEmulationUtil_1 = require("./mobileEmulationUtil");
 const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
+const stream_1 = require("stream");
 const chalk = require('chalk');
 const chromeFinder = require('chrome-launcher/dist/chrome-finder');
 const launchUtils = require('chrome-launcher/dist/utils');
@@ -128,16 +129,16 @@ async function createBrowserWithAuthedExtension(accessToken, browserWidth, brows
     return maybeBrowser;
 }
 exports.createBrowserWithAuthedExtension = createBrowserWithAuthedExtension;
-async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, defaultViewport, ignoreDefaultArgs) {
+async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headless, credentials, defaultDeviceDescriptor, ignoreDefaultArgs) {
     let browser;
     try {
-        browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultViewport, ignoreDefaultArgs);
+        browser = await maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultDeviceDescriptor, ignoreDefaultArgs);
     }
     catch (error) {
         if (error.message.includes('Running as root without --no-sandbox is not supported')) {
             launchArgs.push('--no-sandbox');
             messaging_1.mablEventEmitter.log('Unable to initialize browser with standard settings, attempting to run with --no-sandbox setting', Date.now(), logLineMessaging_1.LogLineColor.yellow);
-            return maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultViewport, ignoreDefaultArgs).catch(error => {
+            return maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultDeviceDescriptor, ignoreDefaultArgs).catch(error => {
                 messaging_1.mablEventEmitter.log('Browser launch failed', Date.now(), logLineMessaging_1.LogLineColor.red);
                 messaging_1.mablEventEmitter.log(error.message);
             });
@@ -145,9 +146,9 @@ async function launchBrowserInstance(chromePath, launchArgs, userDataDir, headle
     }
     return browser;
 }
-function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultViewport, ignoreDefaultArgs) {
+function maybeLaunchBrowser(chromePath, launchArgs, userDataDir, headless, credentials, defaultDeviceDescriptor, ignoreDefaultArgs) {
     return browserLauncher_1.BrowserLauncherFactory.createRunner().launch({
-        defaultViewport,
+        defaultDeviceDescriptor,
         executablePath: chromePath,
         headless,
         args: launchArgs,
@@ -196,12 +197,12 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
     launchArgs.push(`--disable-features=${disableFeaturesFlags.join(',')}`);
     const fakeMicrophoneMedia = resourceUtil_1.findResource('media/mabl_test_audio.wav');
     const fakeWebcamMedia = resourceUtil_1.findResource('media/mabl_test_pattern.y4m');
-    const defaultViewport = addLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMedia, fakeWebcamMedia, ignoreCertificateErrors, emulationConfig);
+    const defaultDeviceDescriptor = addLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMedia, fakeWebcamMedia, ignoreCertificateErrors, emulationConfig);
     let ignoreDefaultArgs;
     if (enableExtensions) {
         ignoreDefaultArgs = ['--disable-extensions'];
     }
-    const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, defaultViewport, ignoreDefaultArgs);
+    const maybeBrowser = await launchBrowserInstance(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, defaultDeviceDescriptor, ignoreDefaultArgs);
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');
     }
@@ -211,8 +212,8 @@ async function createBrowser(browserWidth, browserHeight, headless, containerTes
 exports.createBrowser = createBrowser;
 function addLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMediaPath, fakeWebcamMediaPath, ignoreCertificateErrors, emulationConfig) {
     var _a, _b;
-    const defaultViewport = mobileEmulationUtil_1.getViewportSettingsForEmulation(emulationConfig);
-    launchArgs.push(`--window-size=${(_a = defaultViewport === null || defaultViewport === void 0 ? void 0 : defaultViewport.width) !== null && _a !== void 0 ? _a : browserWidth},${(_b = defaultViewport === null || defaultViewport === void 0 ? void 0 : defaultViewport.height) !== null && _b !== void 0 ? _b : browserHeight}`);
+    const defaultDeviceDescriptor = mobileEmulationUtil_1.getDeviceDescriptorForEmulation(emulationConfig);
+    launchArgs.push(`--window-size=${(_a = defaultDeviceDescriptor === null || defaultDeviceDescriptor === void 0 ? void 0 : defaultDeviceDescriptor.width) !== null && _a !== void 0 ? _a : browserWidth},${(_b = defaultDeviceDescriptor === null || defaultDeviceDescriptor === void 0 ? void 0 : defaultDeviceDescriptor.height) !== null && _b !== void 0 ? _b : browserHeight}`);
     if (emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent) {
         launchArgs.push(`--user-agent=${emulationConfig === null || emulationConfig === void 0 ? void 0 : emulationConfig.device_config.user_agent}`);
     }
@@ -224,7 +225,7 @@ function addLaunchArgs(launchArgs, browserWidth, browserHeight, fakeMicrophoneMe
     if (ignoreCertificateErrors) {
         launchArgs.push('--ignore-certificate-errors');
     }
-    return defaultViewport;
+    return defaultDeviceDescriptor;
 }
 function addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, emulationConfig) {
     const launchArgs = [...baseExecutionEngineLaunchArgs];
@@ -237,15 +238,15 @@ function addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, em
     else {
         throw new Error('no proxy provided for cloud run');
     }
-    const defaultViewport = addLaunchArgs(launchArgs, browserWidth, browserHeight, ExecutionEngineFakeAudioFilePath, ExecutionEngineFakeVideoFilePath, true, emulationConfig);
+    const defaultDeviceDescriptor = addLaunchArgs(launchArgs, browserWidth, browserHeight, ExecutionEngineFakeAudioFilePath, ExecutionEngineFakeVideoFilePath, true, emulationConfig);
     loggingProvider_1.logger.debug(`launchArgs: ${JSON.stringify(launchArgs)}`);
-    return { defaultViewport, launchArgs };
+    return { defaultDeviceDescriptor, launchArgs };
 }
 exports.addExecutionEngineLaunchArgs = addExecutionEngineLaunchArgs;
 async function createBrowserForExecutionEngine(browserWidth, browserHeight, headless, tempBrowserPreferencesDirectory, proxyInfo, credentials, browserPath, emulationConfig) {
     const chromePath = browserPath !== null && browserPath !== void 0 ? browserPath : findChrome();
-    const { launchArgs, defaultViewport } = addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, emulationConfig);
-    const maybeBrowser = await maybeLaunchBrowser(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, defaultViewport);
+    const { launchArgs, defaultDeviceDescriptor } = addExecutionEngineLaunchArgs(browserWidth, browserHeight, proxyInfo, emulationConfig);
+    const maybeBrowser = await maybeLaunchBrowser(chromePath, launchArgs, tempBrowserPreferencesDirectory, headless, credentials, defaultDeviceDescriptor);
     if (!maybeBrowser) {
         throw new Error('Unable to start Chrome session');
     }
@@ -253,18 +254,18 @@ async function createBrowserForExecutionEngine(browserWidth, browserHeight, head
 }
 exports.createBrowserForExecutionEngine = createBrowserForExecutionEngine;
 async function connectToExistingBrowser(port, browserHeight, browserWidth, currentDownloadPath) {
-    const defaultViewport = {
+    const defaultDeviceDescriptor = {
         width: browserWidth,
         height: browserHeight,
     };
     const response = await axios_1.default.get(`http://localhost:${port}/json/version`);
     const url = response.data.webSocketDebuggerUrl;
-    return connectToExistingBrowserWebsocket(url, currentDownloadPath, defaultViewport);
+    return connectToExistingBrowserWebsocket(url, currentDownloadPath, defaultDeviceDescriptor);
 }
 exports.connectToExistingBrowser = connectToExistingBrowser;
-function connectToExistingBrowserWebsocket(websocketEndpoint, currentDownloadPath, defaultViewport) {
+function connectToExistingBrowserWebsocket(websocketEndpoint, currentDownloadPath, defaultDeviceDescriptor) {
     return browserLauncher_1.BrowserLauncherFactory.createRunner().connect({
-        defaultViewport,
+        defaultDeviceDescriptor,
         browserWSEndpoint: websocketEndpoint,
     }, currentDownloadPath);
 }
@@ -505,8 +506,14 @@ function handleExtensionMessage(message, trainingBrowser) {
             break;
     }
 }
-async function downloadUploadFile(fileUploadUrl, fileUpload, downloadDirectory) {
-    const client = axios_1.default.create(httpUtil_1.currentProxyConfig());
+async function downloadUploadFile(fileUploadUrl, fileUpload, downloadDirectory, mablApiClient) {
+    let client;
+    if (mablApiClient) {
+        client = mablApiClient.httpClient;
+    }
+    else {
+        client = axios_1.default.create(httpUtil_1.currentProxyConfig());
+    }
     try {
         const finalDirectory = path.normalize(`${downloadDirectory}/${fileUpload.id}`);
         try {
@@ -522,7 +529,12 @@ async function downloadUploadFile(fileUploadUrl, fileUpload, downloadDirectory)
         const response = await client.get(fileUploadUrl, {
             responseType: 'stream',
         });
-        response.data.pipe(writer);
+        if (response.data.pipe) {
+            response.data.pipe(writer);
+        }
+        else if (!(response.status >= 400)) {
+            stream_1.Readable.from(response.data).pipe(writer);
+        }
         return new Promise((resolve, reject) => {
             writer.on('finish', () => resolve(finalPath));
             writer.on('error', reject);

package/commands/tests/tests_cmds/import.js

@@ -161,7 +161,16 @@ async function importTests(port, debug, importMultipleTests) {
         loggingProvider_1.logger.info('Import will end automatically when the Selenium session is closed or CTRL+C is pressed');
         await Promise.race([importCancelPromise, sessionClosedPromise]);
     }
-    Timers.setImmediate(() => seleniumProxy.stop());
+    Timers.setImmediate(async () => {
+        try {
+            await seleniumProxy.stop();
+        }
+        catch (error) {
+            if (debug) {
+                loggingProvider_1.logger.error(`Error stopping selenium proxy: ${error}`);
+            }
+        }
+    });
     return importedTests;
 }
 async function handlePostImportActions(workspaceId, name, apiClient, importedTests, autoSave) {

package/core/execution/ApiTestUtils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deduplicateApiTestExecutionResults = void 0;
+function deduplicateApiTestExecutionResults(postmanResult) {
+    var _a;
+    const executionsById = {};
+    const orderedExecutionIds = [];
+    (_a = postmanResult.run.executions) === null || _a === void 0 ? void 0 : _a.forEach(execution => {
+        const executionId = execution.id;
+        if (!executionsById[executionId]) {
+            orderedExecutionIds.push(executionId);
+        }
+        executionsById[executionId] = execution;
+    });
+    postmanResult.run.executions = orderedExecutionIds.map(executionId => executionsById[executionId]);
+    return postmanResult;
+}
+exports.deduplicateApiTestExecutionResults = deduplicateApiTestExecutionResults;