@lambdatest/smartui-cli 4.1.24 → 4.1.26

package/dist/index.cjs

@@ -775,6 +775,10 @@ var ConfigSchema = {
     allowDuplicateSnapshotNames: {
       type: "boolean",
       errorMessage: "Invalid config; allowDuplicateSnapshotNames must be true/false"
+    },
+    useLambdaInternal: {
+      type: "boolean",
+      errorMessage: "Invalid config; useLambdaInternal must be true/false"
     }
   },
   anyOf: [
@@ -1008,6 +1012,18 @@ var SnapshotSchema = {
         sessionId: {
           type: "string",
           errorMessage: "Invalid snapshot options; sessionId must be a string"
+        },
+        contextId: {
+          type: "string",
+          errorMessage: "Invalid snapshot options; contextId must be a string"
+        },
+        sync: {
+          type: "boolean",
+          errorMessage: "Invalid snapshot options; sync must be a boolean"
+        },
+        timeout: {
+          type: "number",
+          errorMessage: "Invalid snapshot options; timeout must be a number"
         }
       },
       additionalProperties: false
@@ -1670,8 +1686,39 @@ function stopTunnelHelper(ctx) {
     ctx.log.debug("Tunnel is Stopped ? " + status);
   });
 }
+function calculateVariantCount(config) {
+  let variantCount = 0;
+  if (config.web) {
+    const browsers = config.web.browsers || [];
+    const viewports = config.web.viewports || [];
+    variantCount += browsers.length * viewports.length;
+  }
+  if (config.mobile) {
+    const devices = config.mobile.devices || [];
+    variantCount += devices.length;
+  }
+  return variantCount;
+}
+function calculateVariantCountFromSnapshot(snapshot, globalConfig) {
+  var _a, _b;
+  let variantCount = 0;
+  if ((_a = snapshot.options) == null ? void 0 : _a.web) {
+    const browsers = snapshot.options.web.browsers || [];
+    const viewports = snapshot.options.web.viewports || [];
+    variantCount += browsers.length * viewports.length;
+  }
+  if ((_b = snapshot.options) == null ? void 0 : _b.mobile) {
+    const devices = snapshot.options.mobile.devices || [];
+    variantCount += devices.length;
+  }
+  if (variantCount === 0 && globalConfig) {
+    variantCount = calculateVariantCount(globalConfig);
+  }
+  return variantCount;
+}
 
 // src/lib/server.ts
+var uploadDomToS3ViaEnv = process.env.USE_LAMBDA_INTERNAL || false;
 var server_default = (ctx) => __async(void 0, null, function* () {
   const server = fastify__default.default({
     logger: {
@@ -1691,7 +1738,7 @@ var server_default = (ctx) => __async(void 0, null, function* () {
     reply.code(200).send({ data: { dom: SMARTUI_DOM } });
   });
   server.post("/snapshot", opts, (request, reply) => __async(void 0, null, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     let replyCode;
     let replyBody;
     try {
@@ -1700,8 +1747,9 @@ var server_default = (ctx) => __async(void 0, null, function* () {
         throw new Error(validateSnapshot.errors[0].message);
       const sessionId = (_a = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _a.sessionId;
       let capsBuildId = "";
+      const contextId = (_b = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _b.contextId;
       if (sessionId) {
-        if ((_b = ctx.sessionCapabilitiesMap) == null ? void 0 : _b.has(sessionId)) {
+        if ((_c = ctx.sessionCapabilitiesMap) == null ? void 0 : _c.has(sessionId)) {
           const cachedCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
           capsBuildId = (cachedCapabilities == null ? void 0 : cachedCapabilities.buildId) || "";
         } else {
@@ -1724,7 +1772,19 @@ var server_default = (ctx) => __async(void 0, null, function* () {
         }
       }
       ctx.testType = testType;
-      (_c = ctx.snapshotQueue) == null ? void 0 : _c.enqueue(snapshot);
+      if (contextId && !ctx.contextToSnapshotMap) {
+        ctx.contextToSnapshotMap = /* @__PURE__ */ new Map();
+        ctx.log.debug(`Initialized empty context mapping map for contextId: ${contextId}`);
+      }
+      if (contextId && ctx.contextToSnapshotMap) {
+        ctx.contextToSnapshotMap.set(contextId, 0);
+        ctx.log.debug(`Marking contextId as captured and added to queue: ${contextId}`);
+      }
+      if (contextId) {
+        (_d = ctx.snapshotQueue) == null ? void 0 : _d.enqueueFront(snapshot);
+      } else {
+        (_e = ctx.snapshotQueue) == null ? void 0 : _e.enqueue(snapshot);
+      }
       ctx.isSnapshotCaptured = true;
       replyCode = 200;
       replyBody = { data: { message: "success", warnings: [] } };
@@ -1736,7 +1796,7 @@ var server_default = (ctx) => __async(void 0, null, function* () {
     return reply.code(replyCode).send(replyBody);
   }));
   server.post("/stop", opts, (_, reply) => __async(void 0, null, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     let replyCode;
     let replyBody;
     try {
@@ -1758,8 +1818,15 @@ var server_default = (ctx) => __async(void 0, null, function* () {
       if (ctx.server) {
         ctx.server.close();
       }
-      let resp = yield ctx.client.getS3PreSignedURL(ctx);
-      yield ctx.client.uploadLogs(ctx, resp.data.url);
+      let uploadCLILogsToS3 = ((_c = ctx == null ? void 0 : ctx.config) == null ? void 0 : _c.useLambdaInternal) || uploadDomToS3ViaEnv;
+      if (!uploadCLILogsToS3) {
+        ctx.log.debug(`Log file to be uploaded`);
+        let resp = yield ctx.client.getS3PreSignedURL(ctx);
+        yield ctx.client.uploadLogs(ctx, resp.data.url);
+      } else {
+        ctx.log.debug(`Log file to be uploaded via LSRS`);
+        let resp = ctx.client.sendCliLogsToLSRS(ctx);
+      }
       if (pingIntervalId !== null) {
         clearInterval(pingIntervalId);
         ctx.log.debug("Ping polling stopped immediately.");
@@ -1777,6 +1844,93 @@ var server_default = (ctx) => __async(void 0, null, function* () {
   server.get("/ping", opts, (_, reply) => {
     reply.code(200).send({ status: "Server is running", version: ctx.cliVersion });
   });
+  server.get("/snapshot/status", opts, (request, reply) => __async(void 0, null, function* () {
+    var _a;
+    let replyCode;
+    let replyBody;
+    try {
+      ctx.log.debug(`request.query : ${JSON.stringify(request.query)}`);
+      const { contextId, pollTimeout, snapshotName } = request.query;
+      if (!contextId || !snapshotName) {
+        throw new Error("contextId and snapshotName are required parameters");
+      }
+      const timeoutDuration = pollTimeout * 1e3 || 3e4;
+      if ((_a = ctx.contextToSnapshotMap) == null ? void 0 : _a.has(contextId)) {
+        let contextStatus = ctx.contextToSnapshotMap.get(contextId);
+        while (contextStatus == 0) {
+          yield new Promise((resolve) => setTimeout(resolve, 5e3));
+          contextStatus = ctx.contextToSnapshotMap.get(contextId);
+        }
+        if (contextStatus == 2) {
+          throw new Error("Snapshot Failed");
+        }
+        ctx.log.debug("Snapshot uploaded successfully");
+        let lastExternalResponse = null;
+        const startTime = Date.now();
+        while (true) {
+          try {
+            const externalResponse = yield ctx.client.getSnapshotStatus(
+              snapshotName,
+              contextId,
+              ctx
+            );
+            lastExternalResponse = externalResponse;
+            if (externalResponse.statusCode === 200) {
+              replyCode = 200;
+              replyBody = externalResponse.data;
+              return reply.code(replyCode).send(replyBody);
+            } else if (externalResponse.statusCode === 202) {
+              replyBody = externalResponse.data;
+              ctx.log.debug(`External API attempt: Still processing, Pending Screenshots ${externalResponse.snapshotCount}`);
+              yield new Promise((resolve) => setTimeout(resolve, 5e3));
+            } else if (externalResponse.statusCode === 404) {
+              ctx.log.debug(`Snapshot still processing, not uploaded`);
+              yield new Promise((resolve) => setTimeout(resolve, 5e3));
+            } else {
+              ctx.log.debug(`Unexpected response from external API: ${JSON.stringify(externalResponse)}`);
+              replyCode = 500;
+              replyBody = {
+                error: {
+                  message: `Unexpected response from external API: ${externalResponse.statusCode}`,
+                  externalApiStatus: externalResponse.statusCode
+                }
+              };
+              return reply.code(replyCode).send(replyBody);
+            }
+            ctx.log.debug(`timeoutDuration: ${timeoutDuration}`);
+            ctx.log.debug(`Time passed: ${Date.now() - startTime}`);
+            if (Date.now() - startTime > timeoutDuration) {
+              replyCode = 202;
+              replyBody = {
+                data: {
+                  message: "Request timed out-> Snapshot still processing"
+                }
+              };
+              return reply.code(replyCode).send(replyBody);
+            }
+          } catch (externalApiError) {
+            ctx.log.debug(`External API call failed: ${externalApiError.message}`);
+            replyCode = 500;
+            replyBody = {
+              error: {
+                message: `External API call failed: ${externalApiError.message}`
+              }
+            };
+            return reply.code(replyCode).send(replyBody);
+          }
+        }
+      } else {
+        replyCode = 404;
+        replyBody = { error: { message: `No snapshot found for contextId: ${contextId}` } };
+        return reply.code(replyCode).send(replyBody);
+      }
+    } catch (error) {
+      ctx.log.debug(`snapshot status failed; ${error}`);
+      replyCode = 500;
+      replyBody = { error: { message: error.message } };
+      return reply.code(replyCode).send(replyBody);
+    }
+  }));
   yield server.listen({ port: ctx.options.port });
   let { port } = server.addresses()[0];
   process.env.SMARTUI_SERVER_ADDRESS = `http://localhost:${port}`;
@@ -1923,7 +2077,7 @@ var authExec_default = (ctx) => {
 };
 
 // package.json
-var version = "4.1.24";
+var version = "4.1.26";
 var package_default = {
   name: "@lambdatest/smartui-cli",
   version,
@@ -2043,10 +2197,10 @@ var httpClient = class {
   request(config, log2) {
     return __async(this, null, function* () {
       log2.debug(`http request: ${config.method} ${config.url}`);
-      if (config && config.data && !config.data.name && !config.data.snapshot) {
+      if (config && config.data && !config.data.skipLogging && !config.data.name && !config.data.snapshot) {
         log2.debug(config.data);
       }
-      if (config && config.data && config.data.snapshotUuid) {
+      if (config && config.data && !config.data.skipLogging && config.data.snapshotUuid) {
         log2.debug(config.data);
       }
       return this.axiosInstance.request(config).then((resp) => {
@@ -2264,7 +2418,7 @@ var httpClient = class {
       }
     }, ctx.log);
   }
-  processSnapshot(ctx, snapshot, snapshotUuid, discoveryErrors) {
+  processSnapshot(ctx, snapshot, snapshotUuid, discoveryErrors, variantCount, sync = false) {
     return this.request({
       url: `/build/${ctx.build.id}/snapshot`,
       method: "POST",
@@ -2273,12 +2427,14 @@ var httpClient = class {
         name: snapshot.name,
         url: snapshot.url,
         snapshotUuid,
+        variantCount,
         test: {
           type: ctx.testType,
           source: "cli"
         },
         doRemoteDiscovery: snapshot.options.doRemoteDiscovery,
-        discoveryErrors
+        discoveryErrors,
+        sync
       }
     }, ctx.log);
   }
@@ -2419,6 +2575,36 @@ var httpClient = class {
       }
     }, ctx.log);
   }
+  sendDomToLSRS(ctx, snapshot, snapshotUuid) {
+    return this.request({
+      url: `/upload/dom`,
+      method: "POST",
+      data: {
+        buildId: ctx.build.id,
+        snapshotName: snapshot.name,
+        snapshotUuid,
+        domContent: snapshot,
+        skipLogging: true
+      }
+    }, ctx.log);
+  }
+  sendDomToLSRSForCaps(ctx, snapshot, snapshotUuid, capsBuildId, capsProjectToken) {
+    return this.request({
+      url: `/upload/dom`,
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        projectToken: capsProjectToken !== "" ? capsProjectToken : this.projectToken
+      },
+      data: {
+        buildId: capsBuildId,
+        snapshotName: snapshot.name,
+        snapshotUuid,
+        domContent: snapshot,
+        skipLogging: true
+      }
+    }, ctx.log);
+  }
   uploadLogs(ctx, uploadURL) {
     const fileStream = fs5__default.default.createReadStream(constants_default.LOG_FILE_PATH);
     const { size } = fs5__default.default.statSync(constants_default.LOG_FILE_PATH);
@@ -2436,6 +2622,18 @@ var httpClient = class {
       // prevent axios from limiting the content size
     }, ctx.log);
   }
+  sendCliLogsToLSRS(ctx) {
+    const logContent = fs5__default.default.readFileSync(constants_default.LOG_FILE_PATH, "utf-8");
+    return this.request({
+      url: `/upload/logs`,
+      method: "POST",
+      data: {
+        buildId: ctx.build.id,
+        logContent,
+        skipLogging: true
+      }
+    }, ctx.log);
+  }
   uploadSnapshotToS3(ctx, uploadURL, snapshot) {
     return this.request({
       url: uploadURL,
@@ -2500,6 +2698,15 @@ var httpClient = class {
       data: requestData
     }, ctx.log);
   }
+  getSnapshotStatus(snapshotName, snapshotUuid, ctx) {
+    return this.request({
+      url: `/snapshot/status?buildId=${ctx.build.id}&snapshotName=${snapshotName}&snapshotUUID=${snapshotUuid}`,
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }, ctx.log);
+  }
 };
 var ctx_default = (options) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
@@ -2519,6 +2726,7 @@ var ctx_default = (options) => {
   let fetchResultsFileObj;
   let buildNameObj;
   let allowDuplicateSnapshotNames = false;
+  let useLambdaInternal = false;
   try {
     if (options.config) {
       config = JSON.parse(fs5__default.default.readFileSync(options.config, "utf-8"));
@@ -2583,6 +2791,12 @@ var ctx_default = (options) => {
   if (config.allowDuplicateSnapshotNames) {
     allowDuplicateSnapshotNames = true;
   }
+  if (config.useLambdaInternal) {
+    useLambdaInternal = true;
+  }
+  if (config.waitForPageRender && config.waitForPageRender < 3e4) {
+    config.waitForPageRender = 3e4;
+  }
   return {
     env,
     log: logger_default,
@@ -2607,7 +2821,8 @@ var ctx_default = (options) => {
       tunnel: tunnelObj,
       userAgent: config.userAgent || "",
       requestHeaders: config.requestHeaders || {},
-      allowDuplicateSnapshotNames
+      allowDuplicateSnapshotNames,
+      useLambdaInternal
     },
     uploadFilePath: "",
     webStaticConfig: [],
@@ -2927,6 +3142,7 @@ ${snapshot.warnings.length ? chalk__default.default.gray(`[warning] ${snapshot.w
     rendererOptions: { persistentOutput: true }
   };
 };
+var uploadDomToS3ViaEnv2 = process.env.USE_LAMBDA_INTERNAL || false;
 var finalizeBuild_default = (ctx) => {
   return {
     title: `Finalizing build`,
@@ -2991,9 +3207,15 @@ var finalizeBuild_default = (ctx) => {
         yield (_b = ctx2.server) == null ? void 0 : _b.close();
         ctx2.log.debug(`Closed server`);
         if (ctx2.isSnapshotCaptured) {
-          ctx2.log.debug(`Log file to be uploaded`);
-          let resp = yield ctx2.client.getS3PreSignedURL(ctx2);
-          yield ctx2.client.uploadLogs(ctx2, resp.data.url);
+          let uploadCLILogsToS3 = ctx2.config.useLambdaInternal || uploadDomToS3ViaEnv2;
+          if (!uploadCLILogsToS3) {
+            ctx2.log.debug(`Log file to be uploaded`);
+            let resp = yield ctx2.client.getS3PreSignedURL(ctx2);
+            yield ctx2.client.uploadLogs(ctx2, resp.data.url);
+          } else {
+            ctx2.log.debug(`Log file to be uploaded via LSRS`);
+            let resp = ctx2.client.sendCliLogsToLSRS(ctx2);
+          }
         }
       } catch (error) {
         ctx2.log.debug(error);
@@ -3657,6 +3879,7 @@ function processSnapshot(snapshot, ctx) {
     };
   });
 }
+var uploadDomToS3ViaEnv3 = process.env.USE_LAMBDA_INTERNAL || false;
 var Queue = class {
   constructor(ctx) {
     this.snapshots = [];
@@ -3676,6 +3899,15 @@ var Queue = class {
       }
     }
   }
+  enqueueFront(item) {
+    this.snapshots.unshift(item);
+    if (!this.ctx.config.delayedUpload) {
+      if (!this.processing) {
+        this.processing = true;
+        this.processNext();
+      }
+    }
+  }
   startProcessingfunc() {
     if (!this.processing) {
       this.processing = true;
@@ -3869,7 +4101,7 @@ var Queue = class {
   }
   processNext() {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
       if (!this.isEmpty()) {
         let snapshot;
         if (this.ctx.config.delayedUpload) {
@@ -3925,11 +4157,19 @@ var Queue = class {
               discoveryErrors = result.discoveryErrors;
             }
             if (useCapsBuildId) {
+              this.ctx.log.info(`Using cached buildId: ${capsBuildId}`);
               if (useKafkaFlowCaps) {
                 const snapshotUuid = uuid.v4();
-                const presignedResponse = yield this.ctx.client.getS3PresignedURLForSnapshotUploadCaps(this.ctx, processedSnapshot.name, snapshotUuid, capsBuildId, capsProjectToken);
-                const uploadUrl = presignedResponse.data.url;
-                yield this.ctx.client.uploadSnapshotToS3Caps(this.ctx, uploadUrl, processedSnapshot, capsProjectToken);
+                let uploadDomToS3 = this.ctx.config.useLambdaInternal || uploadDomToS3ViaEnv3;
+                if (!uploadDomToS3) {
+                  this.ctx.log.debug(`Uploading dom to S3 for snapshot using presigned URL for CAPS`);
+                  const presignedResponse = yield this.ctx.client.getS3PresignedURLForSnapshotUploadCaps(this.ctx, processedSnapshot.name, snapshotUuid, capsBuildId, capsProjectToken);
+                  const uploadUrl = presignedResponse.data.url;
+                  yield this.ctx.client.uploadSnapshotToS3Caps(this.ctx, uploadUrl, processedSnapshot, capsProjectToken);
+                } else {
+                  this.ctx.log.debug(`Uploading dom to S3 for snapshot using LSRS`);
+                  yield this.ctx.client.sendDomToLSRSForCaps(this.ctx, processedSnapshot, snapshotUuid, capsBuildId, capsProjectToken);
+                }
                 yield this.ctx.client.processSnapshotCaps(this.ctx, processedSnapshot, snapshotUuid, capsBuildId, capsProjectToken, discoveryErrors);
               } else {
                 yield this.ctx.client.uploadSnapshotForCaps(this.ctx, processedSnapshot, capsBuildId, capsProjectToken, discoveryErrors);
@@ -3962,10 +4202,21 @@ var Queue = class {
                 }
               }
               if (this.ctx.build && this.ctx.build.useKafkaFlow) {
-                const snapshotUuid = uuid.v4();
-                const presignedResponse = yield this.ctx.client.getS3PresignedURLForSnapshotUpload(this.ctx, processedSnapshot.name, snapshotUuid);
-                const uploadUrl = presignedResponse.data.url;
-                let snapshotUploadResponse = yield this.ctx.client.uploadSnapshotToS3(this.ctx, uploadUrl, processedSnapshot);
+                let snapshotUuid = uuid.v4();
+                let snapshotUploadResponse;
+                if (((_e = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _e.contextId) && ((_f = this.ctx.contextToSnapshotMap) == null ? void 0 : _f.has(snapshot.options.contextId))) {
+                  snapshotUuid = snapshot.options.contextId;
+                }
+                let uploadDomToS3 = this.ctx.config.useLambdaInternal || uploadDomToS3ViaEnv3;
+                if (!uploadDomToS3) {
+                  this.ctx.log.debug(`Uploading dom to S3 for snapshot using presigned URL`);
+                  const presignedResponse = yield this.ctx.client.getS3PresignedURLForSnapshotUpload(this.ctx, processedSnapshot.name, snapshotUuid);
+                  const uploadUrl = presignedResponse.data.url;
+                  snapshotUploadResponse = yield this.ctx.client.uploadSnapshotToS3(this.ctx, uploadUrl, processedSnapshot);
+                } else {
+                  this.ctx.log.debug(`Uploading dom to S3 for snapshot using LSRS`);
+                  snapshotUploadResponse = yield this.ctx.client.sendDomToLSRS(this.ctx, processedSnapshot, snapshotUuid);
+                }
                 if (!snapshotUploadResponse || Object.keys(snapshotUploadResponse).length === 0) {
                   this.ctx.log.debug(`snapshot failed; Unable to upload dom to S3`);
                   this.processedSnapshots.push({ name: snapshot == null ? void 0 : snapshot.name, error: `snapshot failed; Unable to upload dom to S3` });
@@ -3979,11 +4230,19 @@ var Queue = class {
                       this.ctx.log.debug(`Closed browser context for snapshot ${snapshot.name}`);
                     }
                   }
+                  if ((_g = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _g.contextId) {
+                    (_i = this.ctx.contextToSnapshotMap) == null ? void 0 : _i.set((_h = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _h.contextId, 2);
+                  }
                   this.processNext();
                 } else {
-                  yield this.ctx.client.processSnapshot(this.ctx, processedSnapshot, snapshotUuid, discoveryErrors);
+                  yield this.ctx.client.processSnapshot(this.ctx, processedSnapshot, snapshotUuid, discoveryErrors, calculateVariantCountFromSnapshot(processedSnapshot, this.ctx.config), (_j = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _j.sync);
+                  if (((_k = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _k.contextId) && ((_l = this.ctx.contextToSnapshotMap) == null ? void 0 : _l.has(snapshot.options.contextId))) {
+                    this.ctx.contextToSnapshotMap.set(snapshot.options.contextId, 1);
+                  }
+                  this.ctx.log.debug(`ContextId: ${(_m = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _m.contextId} status set to uploaded`);
                 }
               } else {
+                this.ctx.log.info(`Uploading snapshot to S3`);
                 yield this.ctx.client.uploadSnapshot(this.ctx, processedSnapshot, discoveryErrors);
               }
               this.ctx.totalSnapshots++;
@@ -3993,6 +4252,9 @@ var Queue = class {
         } catch (error) {
           this.ctx.log.debug(`snapshot failed; ${error}`);
           this.processedSnapshots.push({ name: snapshot == null ? void 0 : snapshot.name, error: error.message });
+          if (((_n = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _n.contextId) && this.ctx.contextToSnapshotMap) {
+            this.ctx.contextToSnapshotMap.set(snapshot.options.contextId, 2);
+          }
         }
         if (this.ctx.browser) {
           for (let context of this.ctx.browser.contexts()) {

package/package.json

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