Merge pull request #36 from sushobhit-lt/DOT-2633

fix URL trim and https scheme

Author: pinanks

src/lib/schemaValidation.ts

@@ -12,7 +12,7 @@ ajv.addFormat('web-url', {
             '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
             '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
             '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-        return urlPattern.test(url);
+        return urlPattern.test(url.trim());
     }
 });
 addErrors(ajv);

src/lib/screenshot.ts

@@ -1,6 +1,6 @@
 import { chromium, firefox, webkit, Browser } from "@playwright/test"
 import { Context, WebStaticConfig } from "../types.js"
-import { delDir } from "./utils.js"
+import { delDir, ensureHttps } from "./utils.js"
 
 const BROWSER_CHROME = 'chrome';
 const BROWSER_SAFARI = 'safari';
@@ -47,6 +47,10 @@ export async function captureScreenshots(ctx: Context, screenshots: WebStaticCon
                 let screenshotId = screenshot.name.toLowerCase().replace(/\s/g, '-');
 
                 const page = await context.newPage();
+                if(screenshot.url){
+                    screenshot.url = screenshot.url.trim();
+                    screenshot.url = ensureHttps(screenshot.url)
+                }
                 await page.goto(screenshot.url, pageOptions);
                 await page.waitForTimeout(screenshot.waitForTimeout || 0)
 

src/lib/utils.ts

@@ -1,7 +1,28 @@
 import fs from 'fs';
 
+const HTTP_SCHEME = 'https:';
+const HTTP_SCHEME_PREFIX = 'https://';
+const WWW = 'www.';
+
 export function delDir(dir: string): void {
     if (fs.existsSync(dir)) {
         fs.rmSync(dir, { recursive: true });
     }
+}
+
+// Function to ensure URL uses HTTPS scheme
+export function ensureHttps(urlString: string) {
+    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;
+    }
 }