@lambdatest/smartui-cli 2.0.3 → 2.0.4

package/dist/index.cjs

@@ -196,9 +196,9 @@ var DEFAULT_CONFIG = {
       "edge"
     ],
     viewports: [
-      [1920, 1080],
-      [1366, 768],
-      [360, 640]
+      [1920],
+      [1366],
+      [360]
     ],
     waitForTimeout: 1e3
   }
@@ -237,13 +237,13 @@ function createWebStaticConfig(filepath) {
 }
 
 // package.json
-var version = "2.0.3";
+var version = "2.0.4";
 var ajv = new Ajv__default.default({ allErrors: true });
 ajv.addFormat("web-url", {
   type: "string",
   validate: (url) => {
     const urlPattern = new RegExp("^(https?:\\/\\/)?((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|((\\d{1,3}\\.){3}\\d{1,3}))(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*(\\?[;&a-z\\d%_.~+=-]*)?(\\#[-a-z\\d_]*)?$", "i");
-    return urlPattern.test(url);
+    return urlPattern.test(url.trim());
   }
 });
 addErrors__default.default(ajv);
@@ -264,17 +264,26 @@ var ConfigSchema = {
           type: "array",
           items: {
             type: "array",
-            items: [
-              { type: "number", minimum: 320, maximum: 7680 },
-              { type: "number", minimum: 320, maximum: 7680 }
+            oneOf: [
+              {
+                items: [{ type: "number", minimum: 320, maximum: 7680 }],
+                minItems: 1,
+                maxItems: 1
+              },
+              {
+                items: [
+                  { type: "number", minimum: 320, maximum: 7680 },
+                  { type: "number", minimum: 320, maximum: 7680 }
+                ],
+                minItems: 2,
+                maxItems: 2
+              }
             ],
-            additionalItems: false,
-            minItems: 2,
-            maxItems: 2
+            errorMessage: "Invalid config; width/height must be >= 320 and <= 7680"
           },
           uniqueItems: true,
           maxItems: 5,
-          errorMessage: "Invalid config; width/height must be >= 320 and <= 7680; max viewports allowed - 5"
+          errorMessage: "Invalid config; max unique viewports allowed - 5"
         },
         waitForPageRender: {
           type: "number",
@@ -326,11 +335,55 @@ var WebStaticConfigSchema = {
 };
 var validateConfig = ajv.compile(ConfigSchema);
 var validateWebStaticConfig = ajv.compile(WebStaticConfigSchema);
+var HTTP_SCHEME = "https:";
+var HTTP_SCHEME_PREFIX = "https://";
+var WWW = "www.";
 function delDir(dir) {
   if (fs__default.default.existsSync(dir)) {
     fs__default.default.rmSync(dir, { recursive: true });
   }
 }
+function ensureHttps(urlString) {
+  try {
+    if (urlString && urlString.startsWith(WWW)) {
+      urlString = HTTP_SCHEME_PREFIX + urlString;
+    }
+    let url = new URL(urlString);
+    if (url.protocol !== HTTP_SCHEME) {
+      url.protocol = HTTP_SCHEME;
+    }
+    return url.toString();
+  } catch (error) {
+    console.error("Invalid URL: " + urlString, error);
+    return null;
+  }
+}
+function scrollToBottomAndBackToTop({
+  frequency = 100,
+  timing = 8,
+  remoteWindow = window
+} = {}) {
+  return new Promise((resolve) => {
+    let scrolls = 1;
+    let scrollLength = remoteWindow.document.body.scrollHeight / frequency;
+    (function scroll() {
+      let scrollBy = scrollLength * scrolls;
+      remoteWindow.setTimeout(() => {
+        remoteWindow.scrollTo(0, scrollBy);
+        if (scrolls < frequency) {
+          scrolls += 1;
+          scroll();
+        }
+        if (scrolls === frequency) {
+          remoteWindow.setTimeout(() => {
+            remoteWindow.scrollTo(0, 0);
+            resolve();
+          }, timing);
+        }
+      }, timing);
+    })();
+  });
+}
 
 // src/lib/httpClient.ts
 var httpClient = class {
@@ -461,7 +514,7 @@ var ctx_default = (options) => {
     process.exit();
   }
   for (let viewport of config.web.viewports)
-    viewports.push({ width: viewport[0], height: viewport[1] });
+    viewports.push({ width: viewport[0], height: viewport[1] || 0 });
   return {
     env,
     log: logger_default,
@@ -685,6 +738,7 @@ var BROWSER_FIREFOX = "firefox";
 var BROWSER_EDGE = "edge";
 var EDGE_CHANNEL = "msedge";
 var PW_WEBKIT = "webkit";
+var MIN_RESOLUTION_HEIGHT = 320;
 function captureScreenshots(ctx, screenshots) {
   return __async(this, null, function* () {
     var _a;
@@ -692,6 +746,7 @@ function captureScreenshots(ctx, screenshots) {
     let totalBrowsers = ctx.webConfig.browsers.length;
     let totalViewports = ctx.webConfig.viewports.length;
     let totalScreenshots = screenshots.length;
+    let capturedScreenshots = 0;
     for (let i = 0; i < totalBrowsers; i++) {
       let browserName = (_a = ctx.webConfig.browsers[i]) == null ? void 0 : _a.toLowerCase();
       let browser;
@@ -718,17 +773,25 @@ function captureScreenshots(ctx, screenshots) {
           let screenshot = screenshots[j];
           let screenshotId = screenshot.name.toLowerCase().replace(/\s/g, "-");
           const page = yield context.newPage();
+          if (screenshot.url) {
+            screenshot.url = screenshot.url.trim();
+            screenshot.url = ensureHttps(screenshot.url);
+          }
           yield page.goto(screenshot.url, pageOptions);
-          yield page.waitForTimeout(screenshot.waitForTimeout || 0);
           for (let k = 0; k < totalViewports; k++) {
             let { width, height } = ctx.webConfig.viewports[k];
             let ssName = `${browserName}-${width}x${height}-${screenshotId}.png`;
             let ssPath = `screenshots/${screenshotId}/${ssName}.png`;
-            yield page.setViewportSize({ width, height });
-            yield page.screenshot({ path: ssPath });
+            yield page.setViewportSize({ width, height: height || MIN_RESOLUTION_HEIGHT });
+            if (height === 0)
+              yield page.evaluate(scrollToBottomAndBackToTop);
+            yield page.waitForTimeout(screenshot.waitForTimeout || 0);
+            yield page.screenshot({ path: ssPath, fullPage: height ? false : true });
             let completed = i == totalBrowsers - 1 && j == totalScreenshots - 1 && k == totalViewports - 1 ? true : false;
             browserName = browserName === BROWSER_SAFARI ? PW_WEBKIT : browserName;
             ctx.client.uploadScreenshot(ctx.build, ssPath, screenshot.name, browserName, `${width}x${height}`, completed);
+            capturedScreenshots++;
+            ctx.task.output = chalk__default.default.gray(`screenshots captured: ${capturedScreenshots}/${totalBrowsers * totalViewports * totalScreenshots}`);
           }
           yield page.close();
         }
@@ -747,8 +810,8 @@ var captureScreenshots_default = (ctx) => {
     title: "Capturing screenshots",
     task: (ctx2, task) => __async(void 0, null, function* () {
       try {
-        let { webStaticConfig: screenshots } = ctx2;
-        let totalScreenshots = yield captureScreenshots(ctx2, screenshots);
+        ctx2.task = task;
+        let totalScreenshots = yield captureScreenshots(ctx2, ctx2.webStaticConfig);
         task.title = "Screenshots captured successfully";
         task.output = chalk__default.default.gray(`total screenshots: ${totalScreenshots}`);
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"