changes to handle timeout

Author: Nick-1234531

packages/sdk-utils/src/lib/httpClient.js

@@ -13,21 +13,6 @@ module.exports = new class httpClient {
                 };
             })
             .catch(error => {
-                if (error.code === 'ECONNABORTED') {
-                    // Custom response for timeout on /snapshot/status
-                    if (config.url.includes('/snapshot/status')) {
-                        return {
-                            status: 408, 
-                            statusMessage: 'Request Timeout',
-                            body: `Request timed out after ${config.timeout / 1000} seconds-> Snapshot still processing`
-                        };
-                    }
-                    return {
-                        status: 408, 
-                        statusMessage: 'Request Timeout',
-                        body: `Request timed out after ${config.timeout / 1000} seconds`
-                    };
-                }
                 if (error.response) {
                     throw new Error(error.response.data.error.message);
                 }
@@ -63,14 +48,15 @@ module.exports = new class httpClient {
         })
     }
 
-    getSnapshotStatus(contextId, timeout = 600) {
+    getSnapshotStatus(contextId, snapshotName, pollTimeout) {
         return this.request({
             url: `${utils.getSmartUIServerAddress()}/snapshot/status`,
             method: 'GET',
             params: {
-                contextId: contextId
-            },
-            timeout: timeout * 1000 // Convert timeout from seconds to milliseconds
+                contextId: contextId,
+                snapshotName: snapshotName,
+                pollTimeout: pollTimeout
+            }
         });
     }
 

packages/sdk-utils/src/smartui.js

@@ -36,9 +36,9 @@ async function postSnapshot(snapshot, testType) {
     }
 }
 
-async function getSnapshotStatus(contextId,timeout=600) {
+async function getSnapshotStatus(contextId,snapshotName,pollTimeout=600) {
     try {
-        return await client.getSnapshotStatus(contextId,timeout);
+        return await client.getSnapshotStatus(contextId,snapshotName,pollTimeout);
     } catch (error) {
         log.debug(error);
         throw new Error(`get snapshot status failed; ${error.message}`);

packages/selenium/src/smartui.js

@@ -31,8 +31,7 @@ async function smartuiSnapshot(driver, name, options = {}) {
             let { body } = await utils.postSnapshot({url, name, dom, options}, pkgName);
             if (body && body.data && body.data.warnings?.length !== 0) body.data.warnings.map(e => log.warn(e));
             log.info(`Snapshot captured: ${name}`);
-            let timeout = options?.timeout || 600;
-            let snapshotStatus = await utils.getSnapshotStatus(options.contextId,timeout);
+            let snapshotStatus = await utils.getSnapshotStatus(options.contextId,name,options?.timeout);
             return snapshotStatus.body;
         }
         else{