@skyramp/skyramp 1.3.13 → 1.3.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/skyramp",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "module for leveraging skyramp cli functionality",
   "scripts": {
     "lint": "eslint 'src/**/*.js' 'src/**/*.ts' --fix",

package/scripts/download-binary.js

@@ -4,6 +4,18 @@ const path = require('path');
 const crypto = require('crypto');
 const { S3Client, GetObjectCommand } = require("@aws-sdk/client-s3");
 
+const HEAD_TIMEOUT_MS = 30_000;      // 30s for HEAD/ETag check
+const DOWNLOAD_TIMEOUT_MS = 300_000; // 5min for binary download
+const SCRIPT_TIMEOUT_MS = 600_000;   // 10min global script timeout
+
+// Global script timeout to prevent hanging indefinitely
+const scriptTimer = setTimeout(() => {
+    log('error', `Script timed out after ${SCRIPT_TIMEOUT_MS / 1000}s. This is likely a network connectivity issue.`);
+    log('error', `Please check your network connection and retry by running: npm install @skyramp/skyramp`);
+    process.exit(1);
+}, SCRIPT_TIMEOUT_MS);
+scriptTimer.unref();
+
 function log(level, message) {
     const timestamp = new Date().toISOString();
     console.log(`[${timestamp}] [${level.toUpperCase()}] ${message}`);
@@ -79,13 +91,22 @@ async function calculateMD5(filePath) {
 
 async function getETag(url) {
     return new Promise((resolve, reject) => {
-        https.get(url, { method: 'HEAD' }, res => {
+        const req = https.get(url, { method: 'HEAD', timeout: HEAD_TIMEOUT_MS }, res => {
             if (res.statusCode !== 200) {
+                res.resume(); // Drain response to free the socket
                 reject(new Error(`HTTP ${res.statusCode}: ${url}`));
                 return;
             }
+            res.on('error', (err) => {
+                reject(new Error(`Response stream error during HEAD request: ${err.message}`));
+            });
             resolve(res.headers['etag']?.replace(/"/g, '')); // Remove quotes from ETag
-        }).on('error', (err) => {
+        });
+        req.on('timeout', () => {
+            req.destroy();
+            reject(new Error(`HEAD request timed out after ${HEAD_TIMEOUT_MS / 1000}s: ${url}`));
+        });
+        req.on('error', (err) => {
             log('error', `Error during HEAD request to ${url}: ${err.message}`);
             reject(err);
         });
@@ -119,22 +140,61 @@ async function download(url, dest, options = {}) {
             });
         } else {
             // Public URL download using https
-            https.get(url, res => {
+            let rejected = false;
+            const fail = (err) => {
+                if (rejected) return;
+                rejected = true;
+                // Clean up partial file
+                try { fs.unlinkSync(dest); } catch (_) {}
+                reject(err);
+            };
+
+            const req = https.get(url, { timeout: DOWNLOAD_TIMEOUT_MS }, res => {
                 if (res.statusCode !== 200) {
+                    res.resume(); // Drain response to free the socket
                     const error = new Error(`HTTP ${res.statusCode}: ${url}`);
                     log('error', `Failed to download ${url}: ${error.message}`);
-                    reject(error);
+                    fail(error);
                     return;
                 }
                 const file = fs.createWriteStream(dest);
+                let downloaded = 0;
+                const contentLength = parseInt(res.headers['content-length'], 10);
+                let lastLogTime = Date.now();
+
+                res.on('data', (chunk) => {
+                    downloaded += chunk.length;
+                    const now = Date.now();
+                    if (now - lastLogTime > 10_000) { // Log progress every 10s
+                        const pct = contentLength ? ` (${Math.round(downloaded / contentLength * 100)}%)` : '';
+                        log('info', `Downloading ${path.basename(dest)}: ${(downloaded / 1024 / 1024).toFixed(1)} MB${pct}`);
+                        lastLogTime = now;
+                    }
+                });
+
+                res.on('error', (err) => {
+                    file.destroy();
+                    fail(new Error(`Response stream error: ${err.message}`));
+                });
+
+                file.on('error', (err) => {
+                    res.destroy();
+                    fail(new Error(`File write error: ${err.message}`));
+                });
+
                 res.pipe(file);
                 file.on('finish', () => {
                     log('info', `Successfully downloaded ${url} to ${dest}`);
                     file.close(resolve);
                 });
-            }).on('error', (err) => {
+            });
+            req.on('timeout', () => {
+                req.destroy();
+                fail(new Error(`Download timed out after ${DOWNLOAD_TIMEOUT_MS / 1000}s: ${url}`));
+            });
+            req.on('error', (err) => {
                 log('error', `Error during download from ${url}: ${err.message}`);
-                reject(err);
+                fail(err);
             });
         }
     });
@@ -175,6 +235,23 @@ async function download(url, dest, options = {}) {
             }
 
             await download(url, file.dest, options);
+
+            // Verify downloaded file integrity via ETag/MD5
+            if (!S3_PRIVATE) {
+                try {
+                    const remoteETag = await getETag(url);
+                    const localHash = await calculateMD5(file.dest);
+                    if (remoteETag && remoteETag !== localHash) {
+                        log('error', `Hash mismatch for ${file.name}: expected ${remoteETag}, got ${localHash}`);
+                        try { fs.unlinkSync(file.dest); } catch (_) {}
+                        throw new Error(`Integrity check failed for ${file.name}. Please check your network connection and retry.`);
+                    }
+                } catch (hashErr) {
+                    if (hashErr.message.startsWith('Integrity check failed')) throw hashErr;
+                    log('warn', `Could not verify hash for ${file.name}: ${hashErr.message}`);
+                }
+            }
+
             log('info', `✅ Saved ${file.name} to ${file.dest}`);
         } catch (e) {
             log('error', `❌ Failed to process ${file.name}: ${e.message}`);

package/src/classes/SkyrampClient.js

@@ -108,8 +108,9 @@ const generateRestTestWrapper = lib.func('generateRestTestWrapper', 'string', [
     'bool',         // providerMode
     'bool',         // consumerMode
     'string',       // providerOutput (contract test)
-    'string',        // consumerOutput (contract test)
-    'bool'          // skipProvisionParents
+    'string',       // consumerOutput (contract test)
+    'bool',         // skipProvisionParents
+    'int'           // mockPort
 ]);
 const generateRestMockWrapper = lib.func('generateRestMockWrapper', 'string', [
     'string',       // uri
@@ -124,17 +125,17 @@ const generateRestMockWrapper = lib.func('generateRestMockWrapper', 'string', [
     'string',       // k8sNamespace
     'string',       // k8sConfig
     'string',       // k8sContext
+    'string',       // requestData
     'string',       // responseData
     'string',       // responseStatusCode
     'bool',         // force
     'bool',         // deployDashboard
     'bool',         // requestAware
     'string',       // formParams
-    'string',       // pathParams
-    'string',       // queryParams
     'string',       // apiSchema
     'string',       // traceFilePath
-    'string'        // entryPoint
+    'string',       // entryPoint
+    'int'           // mockPort
 ]);
 const traceCollectWrapper = lib.func('traceCollectWrapper', 'string', ['string', 'string', 'bool', 'string', 'string']);
 const analyzeOpenapiWrapper = lib.func('analyzeOpenapiWrapper', 'string', ['string', 'string']);
@@ -948,11 +949,12 @@ class SkyrampClient {
         parentRequestData || "",
         parentStatusCode || "",
         options.requestAware || false,
-        options.providerMode || true,
+        options.providerMode || false,
         options.consumerMode || false,
         options.providerOutput || "",
         options.consumerOutput || "",
-        options.skipProvisionParents || true,
+        options.skipProvisionParents || false,
+        options.mockPort || 0,
         (err, res) => {
           if (err) {
             reject(err);
@@ -979,17 +981,17 @@ class SkyrampClient {
         options.k8sNamespace || "",
         options.k8sConfig || "",
         options.k8sContext || "",
+        options.requestData || "",
         options.responseData || "",
         options.responseStatusCode || "",
         options.force || false,
         options.deployDashboard || false,
         options.requestAware || false,
         options.formParams || "",
-        options.pathParams || "",
-        options.queryParams || "",
         JSON.stringify(options.apiSchema || []),
         options.traceFilePath || "",
         options.entrypoint || "",
+        options.mockPort || 0,
         (err, res) => {
           if (err) {
             reject(err);

package/src/classes/SmartPlaywright.js

@@ -1175,6 +1175,11 @@ class SkyrampPlaywrightPage {
         return newLocator
     }
 
+    frameLocator(selector) {
+        const originalFrameLocator = this._page.frameLocator(selector);
+        return new SkyrampPlaywrightFrameLocator(this, originalFrameLocator);
+    }
+
     locator(selector, options) {
         const originalLocator = this._page.locator(selector, options);
         return this.newSkyrampPlaywrightLocator(originalLocator, selector, options);
@@ -1434,5 +1439,6 @@ function expect(obj, testInfo) {
 
 module.exports = {
     newSkyrampPlaywrightPage,
+    SkyrampPlaywrightPage,
     expect,
 };

package/src/workspace.d.ts

@@ -26,7 +26,7 @@ export interface Service {
   serviceName: string;
   language?: "python" | "typescript" | "javascript" | "java";
   framework?: "playwright" | "pytest" | "robot" | "junit";
-  outputDir: string;
+  testDirectory?: string;
   api?: ServiceApi;
   runtimeDetails?: ServiceRuntimeDetails;
 }

package/src/workspace.js

@@ -26,7 +26,7 @@ const serviceSchema = z.object({
   framework: z
     .enum(['playwright', 'pytest', 'robot', 'junit'])
     .optional(),
-  outputDir: z.string().optional(),
+  testDirectory: z.string().optional(),
   api: z
     .object({
       schemaPath: z.string().optional(),