docs: Updates contributors list

security: Replace exec with execFile

.github/README.md

@@ -1014,6 +1014,13 @@ Credit to the following users for contributing to Web-Check
                     <sub><b>Ulises Gascón</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/CrazyWolf13">
+                    <img src="https://avatars.githubusercontent.com/u/96661824?v=4" width="80;" alt="CrazyWolf13"/>
+                    <br />
+                    <sub><b>Tobias</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/PhiRequiem">
                     <img src="https://avatars.githubusercontent.com/u/1323576?v=4" width="80;" alt="PhiRequiem"/>
@@ -1022,12 +1029,14 @@ Credit to the following users for contributing to Web-Check
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/34bits">
+                <a href="https://github.com/ntaiko">
-                    <img src="https://avatars.githubusercontent.com/u/108784453?v=4" width="80;" alt="34bits"/>
+                    <img src="https://avatars.githubusercontent.com/u/108784453?v=4" width="80;" alt="ntaiko"/>
                     <br />
                     <sub><b>Nikolaos G. Ntaiko</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Myzel394">
                     <img src="https://avatars.githubusercontent.com/u/50424412?v=4" width="80;" alt="Myzel394"/>
@@ -1035,8 +1044,6 @@ Credit to the following users for contributing to Web-Check
                     <sub><b>Myzel394</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/murrple-1">
                     <img src="https://avatars.githubusercontent.com/u/5559656?v=4" width="80;" alt="murrple-1"/>
@@ -1058,13 +1065,6 @@ Credit to the following users for contributing to Web-Check
                     <sub><b>John Hupperts</b></sub>
                 </a>
             </td>
-            <td align="center">
-                <a href="https://github.com/eltociear">
-                    <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="80;" alt="eltociear"/>
-                    <br />
-                    <sub><b>Ikko Eltociear Ashimine</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/Gertje823">
                     <img src="https://avatars.githubusercontent.com/u/36937387?v=4" width="80;" alt="Gertje823"/>
@@ -1110,11 +1110,18 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
 		<tr>
             <td align="center">
                 <a href="https://github.com/vincentkoc">
-                    <img src="https://avatars.githubusercontent.com/u/25068?v=4" width="80;" alt="vincentkoc"/>
+                    <img src="https://avatars.githubusercontent.com/u/25068?u=fbd5b2d51142daa4bdbc21e21953a3b8b8188a4a&v=4" width="80;" alt="vincentkoc"/>
                     <br />
                     <sub><b>Vincent Koc</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/BrianCurliss">
+                    <img src="https://avatars.githubusercontent.com/u/1222949?v=4" width="80;" alt="BrianCurliss"/>
+                    <br />
+                    <sub><b>Brian Curliss</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/AnandChowdhary">
                     <img src="https://avatars.githubusercontent.com/u/2841780?u=747e554b3a7f12eb20b7910e1c87d817844f714f&v=4" width="80;" alt="AnandChowdhary"/>
@@ -1122,13 +1129,6 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
                     <sub><b>Anand Chowdhary</b></sub>
                 </a>
             </td>
-            <td align="center">
-                <a href="https://github.com/shrippen">
-                    <img src="https://avatars.githubusercontent.com/u/2873570?v=4" width="80;" alt="shrippen"/>
-                    <br />
-                    <sub><b>Shrippen</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/bile0026">
                     <img src="https://avatars.githubusercontent.com/u/5022496?u=aec96ad173c0ea9baaba93807efa8a848af6595c&v=4" width="80;" alt="bile0026"/>
@@ -1187,29 +1187,6 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
                     <sub><b>HeliXZz</b></sub>
                 </a>
             </td>
-            <td align="center">
-                <a href="https://github.com/patvdv">
-                    <img src="https://avatars.githubusercontent.com/u/12430107?u=e8911c2fb91af4d30432f76da8c40927b2830bd7&v=4" width="80;" alt="patvdv"/>
-                    <br />
-                    <sub><b>Patrick Van Der Veken</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/john-bampton">
-                    <img src="https://avatars.githubusercontent.com/u/23456618?v=4" width="80;" alt="john-bampton"/>
-                    <br />
-                    <sub><b>Master Yoda</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/MioOgbeni">
-                    <img src="https://avatars.githubusercontent.com/u/24291977?v=4" width="80;" alt="MioOgbeni"/>
-                    <br />
-                    <sub><b>Tomáš Novák</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/mryesiller">
                     <img src="https://avatars.githubusercontent.com/u/24632172?u=0d20f2d615158f87cd60a3398d3efb026c32f291&v=4" width="80;" alt="mryesiller"/>
@@ -1217,6 +1194,8 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
                     <sub><b>Göksel Yeşiller</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/sushibait">
                     <img src="https://avatars.githubusercontent.com/u/26634535?v=4" width="80;" alt="sushibait"/>
@@ -1224,29 +1203,6 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
                     <sub><b>Shiverme Timbers</b></sub>
                 </a>
             </td>
-            <td align="center">
-                <a href="https://github.com/forwardemail">
-                    <img src="https://avatars.githubusercontent.com/u/32481436?v=4" width="80;" alt="forwardemail"/>
-                    <br />
-                    <sub><b>Forward Email - Open-source & Privacy-focused Email Service (2023)</b></sub>
-                </a>
-            </td>
-            <td align="center">
-                <a href="https://github.com/semiceau">
-                    <img src="https://avatars.githubusercontent.com/u/50425951?u=f8c386b966312769f559422adf0dbc7e2f116258&v=4" width="80;" alt="semiceau"/>
-                    <br />
-                    <sub><b>GT</b></sub>
-                </a>
-            </td>
-		</tr>
-		<tr>
-            <td align="center">
-                <a href="https://github.com/Bastii717">
-                    <img src="https://avatars.githubusercontent.com/u/53431819?u=604977bed6ad6875ada890d0d3765a4cacc2fa14&v=4" width="80;" alt="Bastii717"/>
-                    <br />
-                    <sub><b>Bastii717</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/getumbrel">
                     <img src="https://avatars.githubusercontent.com/u/59408891?v=4" width="80;" alt="getumbrel"/>
@@ -1284,13 +1240,6 @@ Huge thanks to these wonderful people, who sponsor me on GitHub, their support h
             </td>
 		</tr>
 		<tr>
-            <td align="center">
-                <a href="https://github.com/nrvo">
-                    <img src="https://avatars.githubusercontent.com/u/151435968?u=e1dcb307fd0efdc45cddbe9490a7b956e4da6835&v=4" width="80;" alt="nrvo"/>
-                    <br />
-                    <sub><b>Nrvo</b></sub>
-                </a>
-            </td>
             <td align="center">
                 <a href="https://github.com/hudsonrock-partnerships">
                     <img src="https://avatars.githubusercontent.com/u/163282900?u=5f2667f7fe5d284ac7a2da6b0800ea8970b0fcbf&v=4" width="80;" alt="hudsonrock-partnerships"/>

api/_common/middleware.js

@@ -8,6 +8,9 @@ const TIMEOUT = process.env.API_TIMEOUT_LIMIT ? parseInt(process.env.API_TIMEOUT
 // If present, set CORS allowed origins for responses
 const ALLOWED_ORIGINS = process.env.API_CORS_ORIGIN || '*';
 
+// Disable everything :( Setting this env var will turn off the instance, and show message
+const DISABLE_EVERYTHING = !!process.env.VITE_DISABLE_EVERYTHING;
+
 // Set the platform currently being used
 let PLATFORM = 'NETLIFY';
 if (process.env.PLATFORM) { PLATFORM = process.env.PLATFORM.toUpperCase(); }
@@ -21,7 +24,6 @@ const headers = {
   'Content-Type': 'application/json;charset=UTF-8',
 };
 
-
 const timeoutErrorMsg = 'You can re-trigger this request, by clicking "Retry"\n'
 + 'If you\'re running your own instance of Web Check, then you can '
 + 'resolve this issue, by increasing the timeout limit in the '
@@ -31,6 +33,14 @@ const timeoutErrorMsg = 'You can re-trigger this request, by clicking "Retry"\n'
 + 'in order to keep running costs affordable, so that Web Check can '
 + 'remain freely available for everyone.';
 
+const disabledErrorMsg = 'Error - WebCheck Temporarily Disabled.\n\n'
++ 'We\'re sorry, but due to the increased cost of running Web Check '
++ 'we\'ve had to temporatily disable the public instand. '
++ 'We\'re activley looking for affordable ways to keep Web Check running, '
++ 'while free to use for everybody.\n'
++ 'In the meantime, since we\'ve made our code free and open source, '
++ 'you can get Web Check running on your own system, by following the instructions in our GitHub repo';
+
 // A middleware function used by all API routes on all platforms
 const commonMiddleware = (handler) => {
 
@@ -45,6 +55,11 @@ const commonMiddleware = (handler) => {
 
   // Vercel
   const vercelHandler = async (request, response) => {
+
+    if (DISABLE_EVERYTHING) {
+      response.status(503).json({ error: disabledErrorMsg });
+    }
+
     const queryParams = request.query || {};
     const rawUrl = queryParams.url;
 
@@ -83,6 +98,15 @@ const commonMiddleware = (handler) => {
     const queryParams = event.queryStringParameters || event.query || {};
     const rawUrl = queryParams.url;
 
+    if (DISABLE_EVERYTHING) {
+      callback(null, {
+        statusCode: 503,
+        body: JSON.stringify({ error: 'Web-Check is temporarily disabled. Please try again later.' }),
+        headers,
+      });
+      return;
+    }
+
     if (!rawUrl) {
       callback(null, {
         statusCode: 500,

api/screenshot.js

@@ -1,10 +1,67 @@
 import puppeteer from 'puppeteer-core';
 import chromium from 'chrome-aws-lambda';
 import middleware from './_common/middleware.js';
+import { execFile } from 'child_process';
+import { promises as fs } from 'fs';
+import path from 'path';
+import pkg from 'uuid';
+const { v4: uuidv4 } = pkg;
+
+// Helper function for direct chromium screenshot as fallback
+const directChromiumScreenshot = async (url) => {
+  console.log(`[DIRECT-SCREENSHOT] Starting direct screenshot process for URL: ${url}`);
+  
+  // Create a tmp filename
+  const tmpDir = '/tmp';
+  const uuid = uuidv4();
+  const screenshotPath = path.join(tmpDir, `screenshot-${uuid}.png`);
+  
+  console.log(`[DIRECT-SCREENSHOT] Will save screenshot to: ${screenshotPath}`);
+  
+  return new Promise((resolve, reject) => {
+    const chromePath = process.env.CHROME_PATH || '/usr/bin/chromium';
+    const args = [
+      '--headless',
+      '--disable-gpu',
+      '--no-sandbox',
+      `--screenshot=${screenshotPath}`,
+      url
+    ];
+
+    console.log(`[DIRECT-SCREENSHOT] Executing: ${chromePath} ${args.join(' ')}`);
+    
+    execFile(chromePath, args, async (error, stdout, stderr) => {
+      if (error) {
+        console.error(`[DIRECT-SCREENSHOT] Chromium error: ${error.message}`);
+        return reject(error);
+      }
+  
+      try {
+        // Read the screenshot file
+        const screenshotData = await fs.readFile(screenshotPath);
+        console.log(`[DIRECT-SCREENSHOT] Screenshot read successfully`);
+        
+        // Convert to base64
+        const base64Data = screenshotData.toString('base64');
+  
+        await fs.unlink(screenshotPath).catch(err =>
+          console.warn(`[DIRECT-SCREENSHOT] Failed to delete temp file: ${err.message}`)
+        );
+  
+        resolve(base64Data);
+      } catch (readError) {
+        console.error(`[DIRECT-SCREENSHOT] Failed reading screenshot: ${readError.message}`);
+        reject(readError);
+      }
+    });
+  });
+};
 
 const screenshotHandler = async (targetUrl) => {
+  console.log(`[SCREENSHOT] Request received for URL: ${targetUrl}`);
   
   if (!targetUrl) {
+    console.error('[SCREENSHOT] URL is missing from queryStringParameters');
     throw new Error('URL is missing from queryStringParameters');
   }
   
@@ -15,26 +72,45 @@ const screenshotHandler = async (targetUrl) => {
   try {
     new URL(targetUrl);
   } catch (error) {
+    console.error(`[SCREENSHOT] URL provided is invalid: ${targetUrl}`);
     throw new Error('URL provided is invalid');
   }
 
+  // First try direct Chromium
+  try {
+    console.log(`[SCREENSHOT] Using direct Chromium method for URL: ${targetUrl}`);
+    const base64Screenshot = await directChromiumScreenshot(targetUrl);
+    console.log(`[SCREENSHOT] Direct screenshot successful`);
+    return { image: base64Screenshot };
+  } catch (directError) {
+    console.error(`[SCREENSHOT] Direct screenshot method failed: ${directError.message}`);
+    console.log(`[SCREENSHOT] Falling back to puppeteer method...`);
+  }
+  
+  // fall back puppeteer 
   let browser = null;
   try {
+    console.log(`[SCREENSHOT] Launching puppeteer browser`);
     browser = await puppeteer.launch({
       args: [...chromium.args, '--no-sandbox'], // Add --no-sandbox flag
       defaultViewport: { width: 800, height: 600 },
-      executablePath: process.env.CHROME_PATH || await chromium.executablePath,
+      executablePath: process.env.CHROME_PATH || '/usr/bin/chromium',
-      headless: chromium.headless,
+      headless: true,
       ignoreHTTPSErrors: true,
       ignoreDefaultArgs: ['--disable-extensions'],
     });
     
+    console.log(`[SCREENSHOT] Creating new page`);
     let page = await browser.newPage();
     
+    console.log(`[SCREENSHOT] Setting page preferences`);
     await page.emulateMediaFeatures([{ name: 'prefers-color-scheme', value: 'dark' }]);
     page.setDefaultNavigationTimeout(8000);
+    
+    console.log(`[SCREENSHOT] Navigating to URL: ${targetUrl}`);
     await page.goto(targetUrl, { waitUntil: 'domcontentloaded' });
     
+    console.log(`[SCREENSHOT] Checking if body element exists`);
     await page.evaluate(() => {
       const selector = 'body';
       return new Promise((resolve, reject) => {
@@ -46,13 +122,20 @@ const screenshotHandler = async (targetUrl) => {
       });
     });
     
+    console.log(`[SCREENSHOT] Taking screenshot`);
     const screenshotBuffer = await page.screenshot();
+    
+    console.log(`[SCREENSHOT] Converting screenshot to base64`);
     const base64Screenshot = screenshotBuffer.toString('base64');
     
+    console.log(`[SCREENSHOT] Screenshot complete, returning image`);
     return { image: base64Screenshot };
-
+  } catch (error) {
+    console.error(`[SCREENSHOT] Puppeteer screenshot failed: ${error.message}`);
+    throw error;
   } finally {
     if (browser !== null) {
+      console.log(`[SCREENSHOT] Closing browser`);
       await browser.close();
     }
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "web-check",
   "type": "module",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "homepage": "https://web-check.xyz",
   "scripts": {
     "start": "node server",

src/components/homepage/TempDisabled.astro

@@ -0,0 +1,27 @@
+<div class="banner">
+  <p>
+    ⚠️ Web Check is temporarily disabled due to excess demand and associated costs. 
+    We apologize for any inconvenience and are working on a solution.
+  </p>
+</div>
+
+<style>
+  .banner {
+    position: relative;
+    top: 0;
+    left: 0;
+    width: 100%;
+    background-color: var(--primary);
+    color: var(--background);
+    padding: 0.75rem 1rem;
+    text-align: center;
+    z-index: 1000;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  }
+
+  .banner p {
+    margin: 0;
+    font-size: 0.95rem;
+    line-height: 1.4;
+  }
+</style>

src/layouts/MetaTags.astro

@@ -22,7 +22,7 @@ const siteInfo = {
   site: import.meta.env.SITE_URL || 'https://web-check.xyz',
   analytics: {
     enable: import.meta.env.ENABLE_ANALYTICS,
-    domain: 'web-check.xyz',
+    domain: 'web-check.as93.net',
     script: 'https://no-track.as93.net/js/script.js',
   },
 };
@@ -92,8 +92,7 @@ const makeBreadcrumbs = () => {
 
 <!-- Non-tracking hit counter -->
 {analytics.enable && (
-  <script defer is:inline type="text/partytown"
+  <script defer data-domain={analytics.domain} src={analytics.script}></script>
-    data-domain={analytics.domain} src={analytics.script}></script>
 )}
 
 <!-- Schema.org markup for Google -->

src/pages/index.astro

@@ -1,12 +1,15 @@
 ---
 import BaseLayout from '@layouts/Base.astro';
 import HeroForm from '@components/homepage/HeroForm.astro';
+import TempDisabled from '@/components/homepage/TempDisabled.astro';
 import HomeBackground from '@/components/homepage/HomeBackground';
 import AboutSection from '@/components/homepage/AboutSection.astro';
 import Footer from '@components/scafold/Footer.astro';
 
 const isBossServer = import.meta.env.BOSS_SERVER === true;
 
+const disableEverything = import.meta.env.VITE_DISABLE_EVERYTHING === true;
+
 // Redirect strait to /check or /check/:url if running as self-hosted instance
 if (!isBossServer) {
   const searchUrl = new URLSearchParams(new URL(Astro.request.url).search).get('url');
@@ -20,6 +23,7 @@ if (!isBossServer) {
   <Fragment slot="head">
     {!isBossServer && (<meta http-equiv="refresh" content="0; url=/check" />)}
   </Fragment>
+  { disableEverything && <TempDisabled />}
   <main>
     <HeroForm />
     <AboutSection />

src/web-check-live/hooks/motherOfAllHooks.ts

@@ -4,6 +4,7 @@ import 'react-toastify/dist/ReactToastify.css';
 
 import type { LoadingState } from 'web-check-live/components/misc/ProgressBar';
 import type { AddressType } from 'web-check-live/utils/address-type-checker';
+import keys from 'web-check-live/utils/get-keys';
 
 interface UseIpAddressProps<ResultType = any> {
   // Unique identifier for this job type
@@ -37,6 +38,10 @@ const useMotherOfAllHooks = <ResultType = any>(params: UseIpAddressProps<ResultT
   // Fire off the HTTP fetch request, then set results and update loading / error state
 
   const doTheFetch = () => {
+    if (keys.disableEverything) {
+      updateLoadingJobs(jobId, 'skipped', 'Web-Check is temporarily disabled. Please try again later.', reset);
+      return Promise.resolve();
+    }
     return fetchRequest()
     .then((res: any) => {
       if (!res) { // No response :(

src/web-check-live/utils/get-keys.ts

@@ -2,6 +2,7 @@
 const keys = {
   shodan: import.meta.env.REACT_APP_SHODAN_API_KEY || "default_value_if_not_set",
   whoApi: import.meta.env.REACT_APP_WHO_API_KEY || "default_value_if_not_set",
+  disableEverything: import.meta.env.VITE_DISABLE_EVERYTHING === 'true',
 };
 // const keys = process && process.env ? {
 //   shodan: process.env.REACT_APP_SHODAN_API_KEY,