Fix URL validation

Author: pinanks

src/lib/schemaValidation.ts

@@ -6,13 +6,12 @@ const ajv = new Ajv({ allErrors: true });
 ajv.addFormat('web-url', {
     type: 'string',
     validate: (url: string) => {
-        const urlPattern = new RegExp('^(https?:\\/\\/)?' + // protocol
-            '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
-            '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-            '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-            '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-            '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator
-        return urlPattern.test(url.trim());
+        try {
+            new URL(url.trim());
+            return true;
+        } catch (error) {
+            return false;
+        }
     }
 });
 addErrors(ajv);

src/lib/screenshot.ts

@@ -49,11 +49,7 @@ 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.goto(screenshot.url.trim(), pageOptions);
 
 
                 for (let k = 0; k < totalViewports; k++) {

src/lib/utils.ts

@@ -1,32 +1,11 @@
 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;
-    }
-}
-
 export function scrollToBottomAndBackToTop({
     frequency = 100,
     timing = 8,