Merge branch 'main' of github.com:kiomarzsss/cloudflare-scanner

.eslintrc.cjs

@@ -29,6 +29,7 @@ const config = {
       },
     ],
     "@typescript-eslint/no-misused-promises": "off",
+    "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-unused-vars": "off",
     "@next/next/no-img-element": "off",
   },

package.json

@@ -14,6 +14,7 @@
     "@serwist/next": "^8.4.4",
     "@serwist/precaching": "^8.4.4",
     "@serwist/sw": "^8.4.4",
+    "axios": "^1.6.7",
     "next": "^14.1.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",

public/css/style.css

@@ -170,6 +170,21 @@ label {
     border-radius: 30px;
 }
 
+.groupInput {
+    float: left;
+    width: 100%;
+}
+.groupInput label {
+    float: left;
+}
+.groupInput label:first-child {
+    width: calc( 100% - 110px);
+}
+.groupInput label:last-child {
+    width: 100px;
+    float: right;
+}
+
 footer {
     margin: 50px 0 20px 0;
     padding: 10px 0;

src/hooks/axiosWithSNI.ts

@@ -0,0 +1,22 @@
+import axios from 'axios';
+import https from 'https';
+
+const axiosWithSNI = (url: string, sni: string, signal: AbortSignal | undefined, timeout: number) => {
+    let agent = null;
+    if (sni !== '') {
+        agent = new https.Agent({
+            servername: sni,
+            host: sni
+        });
+    }
+
+    return axios.create({
+        baseURL: url,
+        method: "GET",
+        signal: signal,
+        httpsAgent: agent,
+        timeout: timeout
+    });
+};
+
+export default axiosWithSNI;

src/hooks/useIPScanner.ts

@@ -1,6 +1,7 @@
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
 import { randomizeElements } from "~/helpers/randomizeElements";
+import axiosWithSNI from "./axiosWithSNI";
 
 type ValidIP = {
     ip: string;
@@ -15,6 +16,8 @@ export type Settings = {
     maxIPCount: number;
     maxLatency: number;
     ipRegex: string;
+    sniValue: string;
+    portValue: number;
 };
 
 type SettingKeys = keyof Settings;
@@ -55,6 +58,8 @@ export const settingsInitialValues: Pick<ScannerStore, SettingKeys> = {
     maxIPCount: 5,
     maxLatency: 1000,
     ipRegex: "",
+    sniValue: "",
+    portValue: 80,
 };
 
 const initialState: Omit<ScannerStore, FunctionalKeys> = {
@@ -158,10 +163,25 @@ export const useIPScanner = ({ allIps }: IPScannerProps) => {
         }
     }
 
+    const ports = {
+        http : [80,  8080, 2052, 2082, 2086, 2095],
+        https: [443, 8443, 2053, 2083, 2087, 2096],
+    };
+
     async function testIPs(ipList: string[]) {
+        let isSSL = false;
+        if (ports.https.includes(state.portValue)) {
+            isSSL = true;
+        }
         for (const ip of ipList) {
             increaseTestNo();
-            const url = `http://${ip}/cdn-cgi/trace`;
+
+            let url = `http://${ip}:${state.portValue}`;
+            let path = `/cdn-cgi/trace`;
+            if (state.sniValue !== '' && isSSL ) {
+                url = `https://${ip}:${state.portValue}`;
+                path = `/__down`;
+            }
 
             let testCount = 0;
 
@@ -191,8 +211,18 @@ export const useIPScanner = ({ allIps }: IPScannerProps) => {
                 }
 
                 dispatch(newState);
-
                 try {
+
+                    const axiosInstance = axiosWithSNI(url, state.sniValue, controller.signal, timeout);
+                    const response = await axiosInstance.get(path);
+                    testCount++;
+                } catch (error) {
+                    if (error instanceof Error && !["AbortError", "TypeError"].includes(error.name)) {
+                        testCount++;
+                    }
+                }
+
+                /*try {
                     await fetch(url, {
                         signal: controller.signal,
                         //mode: 'no-cors'
@@ -203,7 +233,7 @@ export const useIPScanner = ({ allIps }: IPScannerProps) => {
                     if (error instanceof Error && !["AbortError", "TypeError"].includes(error.name)) {
                         testCount++;
                     }
-                }
+                }*/
                 clearTimeout(timeoutId);
             }
 

src/pages/index.tsx

@@ -16,7 +16,7 @@ import { allIps } from "~/consts";
 import { useUserIPInfo } from "~/hooks/useUserIPInfo";
 import { toast } from "react-hot-toast";
 import { useEffect, useState } from "react";
-import { useRouter } from 'next/router';
+//import { useRouter } from 'next/router';
 const UserIP = dynamic(() => import("~/components/UserIP"), { ssr: false });
 
 const Home: NextPage = () => {
@@ -28,6 +28,8 @@ const Home: NextPage = () => {
     currentIP,
     currentLatency,
     ipRegex,
+    sniValue,
+    portValue,
     maxIPCount,
     maxLatency,
     scanState,
@@ -148,6 +150,35 @@ const Home: NextPage = () => {
               className="form-control dirLeft"
             />
           </label>
+            <div className="groupInput">
+                <label>
+                    SNI:
+                    <input
+                        type="text"
+                        id="sni"
+                        value={sniValue}
+                        onChange={(e) =>
+                            setSettings({ sniValue: (e.target.value).replace(/^(https?:\/\/)?/, '') })
+                        }
+                        disabled={isRunning}
+                        className="form-control dirLeft"
+                    />
+                </label>
+                <label>
+                    Port:
+                    <input
+                        type="number"
+                        id="max-latency"
+                        value={(sniValue !== "" ? portValue : 80)}
+                        disabled={isRunning}
+                        onChange={(e) =>
+                            setSettings({ portValue: e.target.valueAsNumber })
+                        }
+                        min={80}
+                        className="form-control dirLeft"
+                    />
+                </label>
+            </div>
           <div className="clearfix"></div>
           {/*<div className="alert alert-info">
                         <UserIP

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2017",
+    "target": "es6",
     "types": ["@serwist/next/typings"],
     "lib": ["dom", "dom.iterable", "esnext", "webworker"],
     "allowJs": true,