@tocha688/browser 0.0.1 → 1.0.0

package/src/network/cache.ts

@@ -1,130 +1,130 @@
-/**
- * 用于浏览器缓存
- */
-
-import { type Page } from "patchright-core";
-import fs from "fs";
-import path from "path";
-import { createHash } from "crypto";
-import { BrowserCachePath } from "../core/config";
-
-function getCachePath(url: string, cachePath: string) {
-    const hash = createHash("md5").update(url).digest("hex");
-    const cacheFile = path.join(cachePath, hash);
-    const metaFile = cacheFile + ".meta.json";
-    return { cacheFile, metaFile }
-}
-
-/** 缓存浏览器到目录 ./tmp/browser_cache */
-export async function routeAssetsCache(page: Page, cachePath: string) {
-    // 确保缓存目录存在
-    if (!fs.existsSync(cachePath)) {
-        fs.mkdirSync(cachePath, { recursive: true });
-    }
-
-    console.log("启用浏览器缓存")
-
-    await page.route("**/*", async (route) => {
-        const req = route.request();
-        //如果不是get直接放行
-        if (req.method() !== "GET") {
-            return route.continue();
-        }
-        const type = req.resourceType()
-        if (["xhr", "fetch", "websocket", "document"].includes(type)) {
-            return route.continue();
-        }
-
-        // 尝试从缓存读取 (使用 URL hash 作为文件名)
-        const url = req.url();
-        const { cacheFile, metaFile } = getCachePath(url, cachePath);
-
-        try {
-            if (fs.existsSync(cacheFile) && fs.existsSync(metaFile)) {
-                const meta = JSON.parse(fs.readFileSync(metaFile, "utf-8"));
-                const body = fs.readFileSync(cacheFile);
-                // 检查缓存是否过期
-                if (Date.now() - meta.timestamp > meta.timeout) {
-                    fs.unlinkSync(cacheFile);
-                    fs.unlinkSync(metaFile);
-                    return route.continue();
-                }
-                // console.log(`命中缓存 ${url}`, metaFile);
-                return route.fulfill({
-                    status: 200,
-                    headers: meta.headers,
-                    body: body,
-                    contentType: meta.contentType
-                });
-            }
-        } catch (e) {
-            // 缓存读取失败，继续请求
-            // console.log(`缓存 ${url} 读取失败`, e);
-        }
-        return route.continue();
-    });
-
-    // 监听响应事件，检查是否缓存到本地
-    await page.on("response", async (response) => {
-        const req = response.request();
-        if (req.method() !== "GET") {
-            return;
-        }
-        const status = response.status()
-        if (![200, 201].includes(status)) {
-            return;
-        }
-        const url = response.url();
-        const { cacheFile, metaFile } = getCachePath(url, cachePath);
-        if (fs.existsSync(cacheFile) && fs.existsSync(metaFile)) {
-            return;
-        }
-        // 检查响应头是否允许缓存
-        const headers = response.headers();
-        const resType = headers["content-type"] || "";
-        if (resType.includes("text/plain") || url.includes(";")) {
-            return;
-        }
-        const cacheControl = headers["cache-control"] || "";
-        const pragma = headers["pragma"] || "";
-        // 如果明确禁止缓存，则不缓存
-        if (cacheControl.includes("no-store") || pragma.includes("no-cache")) {
-            return;
-        }
-        const type = req.resourceType()
-        if (!(pragma || cacheControl)) {
-            // 如果没有cache-control和pragma头，只缓存document类型的资源
-            if (["xhr", "fetch", "websocket", "document"].includes(type)) {
-                return;
-            }
-            // 如果有参数也不缓存
-            const params = new URL(url).searchParams
-            if (params.toString().length > 0) {
-                return;
-            }
-            // if (["document", "script"].includes(type) && params.size > 0) {
-            //     return;
-            // }
-            // if (["script"].includes(type) && params.size > 38) {
-            //     return;
-            // }
-        }
-
-        try {
-            // 保存到缓存
-            const buffer = await response.body();
-            fs.writeFileSync(cacheFile, buffer);
-            fs.writeFileSync(metaFile, JSON.stringify({
-                url: url,
-                headers: headers,
-                contentType: headers["content-type"],
-                timestamp: Date.now(),
-                // 从header中获取缓存时间，默认1分钟
-                timeout: parseInt(headers["cache-control"]?.match(/max-age=(\d+)/)?.[1] || "99999999") * 1000,
-            }));
-            // console.log(`缓存 ${url}`, resType);
-        } catch (e) {
-            // console.log(`缓存 ${url} 写入失败`, e);
-        }
-    });
+/**
+ * 用于浏览器缓存
+ */
+
+import { type Page } from "patchright-core";
+import fs from "fs";
+import path from "path";
+import { createHash } from "crypto";
+import { BrowserCachePath } from "../core/config";
+
+function getCachePath(url: string, cachePath: string) {
+    const hash = createHash("md5").update(url).digest("hex");
+    const cacheFile = path.join(cachePath, hash);
+    const metaFile = cacheFile + ".meta.json";
+    return { cacheFile, metaFile }
+}
+
+/** 缓存浏览器到目录 ./tmp/browser_cache */
+export async function routeAssetsCache(page: Page, cachePath: string) {
+    // 确保缓存目录存在
+    if (!fs.existsSync(cachePath)) {
+        fs.mkdirSync(cachePath, { recursive: true });
+    }
+
+    console.log("启用浏览器缓存")
+
+    await page.route("**/*", async (route) => {
+        const req = route.request();
+        //如果不是get直接放行
+        if (req.method() !== "GET") {
+            return route.continue();
+        }
+        const type = req.resourceType()
+        if (["xhr", "fetch", "websocket", "document"].includes(type)) {
+            return route.continue();
+        }
+
+        // 尝试从缓存读取 (使用 URL hash 作为文件名)
+        const url = req.url();
+        const { cacheFile, metaFile } = getCachePath(url, cachePath);
+
+        try {
+            if (fs.existsSync(cacheFile) && fs.existsSync(metaFile)) {
+                const meta = JSON.parse(fs.readFileSync(metaFile, "utf-8"));
+                const body = fs.readFileSync(cacheFile);
+                // 检查缓存是否过期
+                if (Date.now() - meta.timestamp > meta.timeout) {
+                    fs.unlinkSync(cacheFile);
+                    fs.unlinkSync(metaFile);
+                    return route.continue();
+                }
+                // console.log(`命中缓存 ${url}`, metaFile);
+                return route.fulfill({
+                    status: 200,
+                    headers: meta.headers,
+                    body: body,
+                    contentType: meta.contentType
+                });
+            }
+        } catch (e) {
+            // 缓存读取失败，继续请求
+            // console.log(`缓存 ${url} 读取失败`, e);
+        }
+        return route.continue();
+    });
+
+    // 监听响应事件，检查是否缓存到本地
+    await page.on("response", async (response) => {
+        const req = response.request();
+        if (req.method() !== "GET") {
+            return;
+        }
+        const status = response.status()
+        if (![200, 201].includes(status)) {
+            return;
+        }
+        const url = response.url();
+        const { cacheFile, metaFile } = getCachePath(url, cachePath);
+        if (fs.existsSync(cacheFile) && fs.existsSync(metaFile)) {
+            return;
+        }
+        // 检查响应头是否允许缓存
+        const headers = response.headers();
+        const resType = headers["content-type"] || "";
+        if (resType.includes("text/plain") || url.includes(";")) {
+            return;
+        }
+        const cacheControl = headers["cache-control"] || "";
+        const pragma = headers["pragma"] || "";
+        // 如果明确禁止缓存，则不缓存
+        if (cacheControl.includes("no-store") || pragma.includes("no-cache")) {
+            return;
+        }
+        const type = req.resourceType()
+        if (!(pragma || cacheControl)) {
+            // 如果没有cache-control和pragma头，只缓存document类型的资源
+            if (["xhr", "fetch", "websocket", "document"].includes(type)) {
+                return;
+            }
+            // 如果有参数也不缓存
+            const params = new URL(url).searchParams
+            if (params.toString().length > 0) {
+                return;
+            }
+            // if (["document", "script"].includes(type) && params.size > 0) {
+            //     return;
+            // }
+            // if (["script"].includes(type) && params.size > 38) {
+            //     return;
+            // }
+        }
+
+        try {
+            // 保存到缓存
+            const buffer = await response.body();
+            fs.writeFileSync(cacheFile, buffer);
+            fs.writeFileSync(metaFile, JSON.stringify({
+                url: url,
+                headers: headers,
+                contentType: headers["content-type"],
+                timestamp: Date.now(),
+                // 从header中获取缓存时间，默认1分钟
+                timeout: parseInt(headers["cache-control"]?.match(/max-age=(\d+)/)?.[1] || "99999999") * 1000,
+            }));
+            // console.log(`缓存 ${url}`, resType);
+        } catch (e) {
+            // console.log(`缓存 ${url} 写入失败`, e);
+        }
+    });
 }

package/src/network/resource.ts

@@ -1,62 +1,62 @@
-import type { Page, Route, Request } from "patchright-core";
-
-export async function fetchResource(route: Route, req: Request, page: Page) {
-    // 使用 Node.js 原生 fetch，不继承浏览器代理设置
-    return await fetch(req.url(), {
-        method: req.method(),
-        body: req.postData(),
-        headers: req.headers(),
-    })
-        .then(async (res) => {
-            return route.fulfill({
-                status: res.status,
-                headers: Object.fromEntries(res.headers.entries()),
-                body: Buffer.from(await res.arrayBuffer()),
-            });
-        }).catch(() => {
-            return route.abort();
-        })
-}
-
-export async function routeAssetsLocal(page: Page) {
-    await page.route("**/*", async (route) => {
-        const req = route.request();
-        const url = req.url();
-        const type = req.resourceType();
-        //如果不是get直接放行
-        if (!["GET"].includes(req.method())) {
-            return await route.continue();
-        }
-        if (
-            ["xhr", "fetch", "websocket", "document"].includes(type)
-            || (["script"].includes(type) && url.includes("?"))
-        ) {
-            //使用浏览器代理进行请求
-            return await route.continue();
-        }
-        //使用本地网络进行请求
-        return await fetchResource(route, req, page);
-    });
-}
-
-export async function routeAssetsAbort(page: Page) {
-    await page.route("**/*", async (route) => {
-        const req = route.request();
-        //如果不是get直接放行
-        if (req.method() !== "GET") {
-            return route.continue();
-        }
-        const type = req.resourceType()
-        // if (["script"].includes(type)) {
-        //     return await curlResource(route, req, page);
-        // }
-        if (
-            !["xhr", "fetch", "websocket", "document", "script"].includes(type)
-        ) {
-            //使用fetch进行请求
-            return route.abort();
-        }
-        //其他请求继续
-        return route.continue();
-    });
+import type { Page, Route, Request } from "patchright-core";
+
+export async function fetchResource(route: Route, req: Request, page: Page) {
+    // 使用 Node.js 原生 fetch，不继承浏览器代理设置
+    return await fetch(req.url(), {
+        method: req.method(),
+        body: req.postData(),
+        headers: req.headers(),
+    })
+        .then(async (res) => {
+            return route.fulfill({
+                status: res.status,
+                headers: Object.fromEntries(res.headers.entries()),
+                body: Buffer.from(await res.arrayBuffer()),
+            });
+        }).catch(() => {
+            return route.abort();
+        })
+}
+
+export async function routeAssetsLocal(page: Page) {
+    await page.route("**/*", async (route) => {
+        const req = route.request();
+        const url = req.url();
+        const type = req.resourceType();
+        //如果不是get直接放行
+        if (!["GET"].includes(req.method())) {
+            return await route.continue();
+        }
+        if (
+            ["xhr", "fetch", "websocket", "document"].includes(type)
+            || (["script"].includes(type) && url.includes("?"))
+        ) {
+            //使用浏览器代理进行请求
+            return await route.continue();
+        }
+        //使用本地网络进行请求
+        return await fetchResource(route, req, page);
+    });
+}
+
+export async function routeAssetsAbort(page: Page) {
+    await page.route("**/*", async (route) => {
+        const req = route.request();
+        //如果不是get直接放行
+        if (req.method() !== "GET") {
+            return route.continue();
+        }
+        const type = req.resourceType()
+        // if (["script"].includes(type)) {
+        //     return await curlResource(route, req, page);
+        // }
+        if (
+            !["xhr", "fetch", "websocket", "document", "script"].includes(type)
+        ) {
+            //使用fetch进行请求
+            return route.abort();
+        }
+        //其他请求继续
+        return route.continue();
+    });
 }

package/src/providers/ads_tool.ts

@@ -1,38 +1,38 @@
-
-/** ads专用参数加密 */
-export function adsEncodeBase64(e: string) {
-    let t, r
-    void 0 === t && (t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"),
-        void 0 === r && (r = "hTy1bfRJz4nLPcBCO7WtmNIaGvVeul5Zo8kq32UxrYw_-0gsjp96SDFXQiEMKdHA");
-    var n = t
-        , a = r
-        , i = Buffer.from(e).toString('base64').split("")
-        , s = "";
-    return i.map((function (e) {
-        var t = n.indexOf(e);
-        return s += t < 0 ? e : a.substr(t, 1),
-            e
-    }
-    )),
-        s
-}
-
-
-/** ads专用参数解密 */
-export function adsDecodeBase64(e: string) {
-    let t, r;
-    if (void 0 === t && (t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"),
-        void 0 === r && (r = "hTy1bfRJz4nLPcBCO7WtmNIaGvVeul5Zo8kq32UxrYw_-0gsjp96SDFXQiEMKdHA"),
-        !e)
-        return "";
-    var n = t
-        , a = r
-        , i = e.split("")
-        , s = "";
-    return i.map((function (e) {
-        var t = a.indexOf(e);
-        return s += t < 0 ? e : n.substr(t, 1),
-            e
-    }
-    )), Buffer.from(s, 'base64').toString()
-}
+
+/** ads专用参数加密 */
+export function adsEncodeBase64(e: string) {
+    let t, r
+    void 0 === t && (t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"),
+        void 0 === r && (r = "hTy1bfRJz4nLPcBCO7WtmNIaGvVeul5Zo8kq32UxrYw_-0gsjp96SDFXQiEMKdHA");
+    var n = t
+        , a = r
+        , i = Buffer.from(e).toString('base64').split("")
+        , s = "";
+    return i.map((function (e) {
+        var t = n.indexOf(e);
+        return s += t < 0 ? e : a.substr(t, 1),
+            e
+    }
+    )),
+        s
+}
+
+
+/** ads专用参数解密 */
+export function adsDecodeBase64(e: string) {
+    let t, r;
+    if (void 0 === t && (t = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"),
+        void 0 === r && (r = "hTy1bfRJz4nLPcBCO7WtmNIaGvVeul5Zo8kq32UxrYw_-0gsjp96SDFXQiEMKdHA"),
+        !e)
+        return "";
+    var n = t
+        , a = r
+        , i = e.split("")
+        , s = "";
+    return i.map((function (e) {
+        var t = a.indexOf(e);
+        return s += t < 0 ? e : n.substr(t, 1),
+            e
+    }
+    )), Buffer.from(s, 'base64').toString()
+}

package/src/providers/adspower.ts

@@ -4,17 +4,19 @@ import { faker } from "@faker-js/faker";
 import { adsEncodeBase64, adsDecodeBase64 } from "./ads_tool";
 import { PcScreen, WindowsWebGL, Cpus, Memorys, rSysFonts } from "../const/browser";
 import type { BrowserResult, BrowserStartOptions } from "../types";
-import { checkAutoProxy, rArrItem, rInt, uuidV4, rAutoDigitInt } from "@tocha688/utils";
+import { checkAutoProxy, rArrItem, rInt, uuidV4, rAutoDigitInt, type ProxyServerResult, startProxyServer, getIpInfo } from "@tocha688/utils";
 import { launchBrowserBase } from "./base";
 
 export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<BrowserResult> {
     return launchBrowserBase(opts, {
         prepare: async (userDataDir, devtoolsPort) => {
+
             const webGLFP_path = path.join(userDataDir, "webgl.json")
             const dynamicConfig_path = path.join(userDataDir, "dynamic.config")
             const staticConfig_path = path.join(userDataDir, "static.config")
             const params_path = path.join(userDataDir, "params.config")
 
+
             let params: string;
             let screenSize: string;
 
@@ -29,8 +31,10 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                 if (opts.proxy) {
                     ipinfo = await checkAutoProxy(opts.proxy);
                     proxyInfo = new URL(ipinfo.proxy)
+                } else {
+                    ipinfo = await getIpInfo(ipinfo.proxy);
                 }
-
+                // console.log(ipinfo)
                 // webgl指纹
                 const config = {
                     // 指纹随机数种子
@@ -38,7 +42,7 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                     geop: ipinfo?.latitude ? ipinfo?.latitude + "," + ipinfo?.longitude : "",
                     // 加上随机字符串 MSBYH29R
                     device_name: "PC" + faker.string.alphanumeric(8).toUpperCase(),
-                    timezone: ipinfo?.timezone || "America/Los_Angeles",
+                    timezone: ipinfo?.timezone || ipinfo?.timeZone || "America/Los_Angeles",
                     proxy: {
                         protocol: proxyInfo?.protocol.replace(":", "") || "http",
                         host: proxyInfo?.hostname || "127.0.0.1",
@@ -47,10 +51,11 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                         password: proxyInfo?.password || "",
                     },
                     mac: faker.internet.mac(),
-                    scanPorts: "3389,1080",
+                    scanPorts: "",
                     screenSize: rArrItem(PcScreen),
                     langs: ipinfo?.languages ?? "en-US,en",
                 }
+                // console.log(config)
                 const webGL = rArrItem(WindowsWebGL);
                 const webGLFP = {
                     "UNMASKED_VENDOR_WEBGL": webGL.name,
@@ -116,7 +121,9 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                         }
                     ],
                     "AudioFp": rAutoDigitInt(980, config.fp),
-                    "WebGLMark": rAutoDigitInt("5001", config.fp).toString(),
+                    // "WebGLMark": rAutoDigitInt("5001", config.fp).toString(),
+                    // "WebGLMark": config.fp.toString(),
+                    "WebGLMark": "5001",
                     "StartTime": Math.floor(Date.now() / 1000),
                     "GeolocationSetting": "ask",
                     "FlashPluginSetting": "block",
@@ -125,7 +132,8 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                     "DisableBackgroundMode": true,
                     "DisableWebRTC": true,
                     "HardwareConcurrency": rArrItem(Cpus),
-                    "DeviceMemory": rArrItem(Memorys),
+                    // "DeviceMemory": rArrItem(Memorys),
+                    "DeviceMemory": rArrItem([4, 8]),
                     "LoadExtensionErrorBox": false,
                     "ClientRectFp": rAutoDigitInt("5001", config.fp).toString(),
                     "ForceProcessExit": true,
@@ -184,11 +192,12 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                     "DynamicConfig": dynamicConfig_path,
                     "StaticConfig": staticConfig_path
                 }));
-                
+
                 fs.writeFileSync(params_path, params)
                 screenSize = staticConfig.ScreenSize;
             }
 
+
             const args = [
                 "--disable-background-networking",
                 "--disable-client-side-phishing-detection",
@@ -223,6 +232,7 @@ export async function AdsBrowserStartMain(opts: BrowserStartOptions): Promise<Br
                 "--flag-switches-begin",
                 "--flag-switches-end",
                 "--load-extension=",
+                // "--timezone=" + (ipinfo?.timezone ?? "America/Los_Angeles"),
                 "--no-sandbox"
             ];
 

package/src/providers/base.ts

@@ -1,9 +1,10 @@
-import { makeUniqueBrowserConfig } from "../core/launcher";
+import { makeUniqueBrowserConfig, getBrowserWebSocketUrl } from "../core/launcher";
 import portfinder from 'portfinder';
 import fs from "fs";
 import * as cl from "chrome-launcher";
-import { tryCatch, tryLoop } from "@tocha688/utils";
+import { getIpInfo, startProxyServer, tryCatch, tryLoop, type ProxyServerResult } from "@tocha688/utils";
 import type { BrowserResult, BrowserStartOptions } from "../types";
+import { chromium } from "patchright-core";
 
 export interface BrowserLaunchConfig {
     prepare: (userDataDir: string, devtoolsPort: number) => Promise<{
@@ -13,6 +14,9 @@ export interface BrowserLaunchConfig {
     }>;
 }
 
+
+
+
 export async function launchBrowserBase(
     opts: BrowserStartOptions,
     config: BrowserLaunchConfig
@@ -46,17 +50,25 @@ export async function launchBrowserBase(
             chromeFlags: args,
             startingUrl: hookResult.startingUrl || "about:blank"
         });
+        const wsUrl = await getBrowserWebSocketUrl(brw.port)
 
         return {
             userDataDir,
             port: brw.port,
             browser: brw,
+            wsUrl,
             close: async () => {
                 await tryCatch(async () => await brw.kill());
                 if (hookResult?.cleanup) {
                     await tryCatch(hookResult.cleanup);
                 }
                 await tryLoop(async () => fs.rmSync(userDataDir, { recursive: true, force: true }));
+            },
+            async mainPage() {
+                const browser = await chromium.connectOverCDP(wsUrl)
+                const ctx = browser.contexts()?.[0] ?? await browser.newContext()
+                const page = ctx?.pages()?.[0] ?? await ctx.newPage()
+                return page;
             }
         };
     } catch (e) {

package/src/providers/local.ts

@@ -1,8 +1,10 @@
 import type { BrowserStartOptions, BrowserResult } from "../types";
 import * as cl from "chrome-launcher";
+import { getBrowserWebSocketUrl } from "../core/launcher";
+import { chromium } from "patchright-core";
 
 export async function startLocalBrowser(opts: BrowserStartOptions): Promise<BrowserResult> {
-    const { chromePath, headless = false, proxy, userDataDir } = opts;
+    const { chromePath, headless = false, userDataDir } = opts;
     
     const chromeFlags = [
         "--disable-blink-features=AutomationControlled",
@@ -14,18 +16,25 @@ export async function startLocalBrowser(opts: BrowserStartOptions): Promise<Brow
         chromeFlags.push("--headless");
     }
 
-    // Proxy handling would go here if needed, but usually handled by Playwright context or upstream
-
     const browser = await cl.launch({
         chromePath,
         chromeFlags,
         userDataDir,
     });
 
+    const wsUrl = await getBrowserWebSocketUrl(browser.port);
+
     return {
         userDataDir: userDataDir || "",
         port: browser.port,
         browser: browser,
+        wsUrl,
         close: async () => await browser.kill(),
+        async mainPage() {
+            const brw = await chromium.connectOverCDP(wsUrl)
+            const ctx = brw.contexts()?.[0] ?? await brw.newContext()
+            const page = ctx?.pages()?.[0] ?? await ctx.newPage()
+            return page;
+        }
     };
 }