Merge pull request #15 from jianjianai/dev

go-bingai-pass
jianjianai · Jun 17, 2024 · c3d4205 · c3d4205
2 parents 344833f + 806b26c
commit c3d4205
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "download-go-bingai-pass": "wget https://github.com/Harry-zklcdc/go-bingai-pass/releases/latest/download/go-bingai-pass.wasm -O go-bingai-pass.wasm",
-    "deploy": "wrangler deploy",
+    "deploy": "npm run build-worker && wrangler deploy",
     "dev": "wrangler dev",
     "build-worker-only": "rollup --config rollup.config.workers.mjs && cp go-bingai-pass.wasm ./dist/",
     "build-page-only": "rollup --config rollup.config.pages.mjs && cp go-bingai-pass.wasm ./functions/",

diff --git a/src/proxy/bingPorxyWorker.ts b/src/proxy/bingPorxyWorker.ts
@@ -8,7 +8,7 @@ import { verify } from './goBingaiPass';
 import ChallengeResponseBody from '../html/ChallengeResponseBody.html'
 
 
-const XForwardedForIP = usIps[Math.floor(Math.random() * usIps.length)][0];
+
 
 /** websocket */
 async function websocketPorxy(request: Request): Promise<Response> {
@@ -51,7 +51,7 @@ function injectionHtmlToBody(html: string, sc: string) {
     return html.replace("<body>", `<body>${sc}`)
 }
 
-export const bingPorxyWorker = newProxyLinkHttp<Env>({
+const bingProxyLink = newProxyLinkHttp<Env>({
     async intercept(req, env) {//拦截
         // 处理 websocket
         const upgradeHeader = req.headers.get('Upgrade');
@@ -152,7 +152,9 @@ export const bingPorxyWorker = newProxyLinkHttp<Env>({
         }
 
         // XForwardedForIP 设置
-        (config.init.headers as Headers).set("X-forwarded-for", XForwardedForIP);
+        if(env.XForwardedForIP){
+            (config.init.headers as Headers).set("X-forwarded-for", env.XForwardedForIP);
+        }
 
         {// origin 设置
             const resHeaders = config.init.headers as Headers;
@@ -332,3 +334,12 @@ export const bingPorxyWorker = newProxyLinkHttp<Env>({
     }
 });
 
+const XForwardedForIP = usIps[Math.floor(Math.random() * usIps.length)][0];
+export const bingPorxyWorker = (req: Request,env:Env)=>{
+    // 初始化 环境变量
+    env.XForwardedForIP = env.XForwardedForIP || XForwardedForIP;
+    // 开始请求
+    return bingProxyLink(req,env);
+}
+
+
diff --git a/src/proxy/goBingaiPass.ts b/src/proxy/goBingaiPass.ts
@@ -1,7 +1,10 @@
 import { fCFF } from '../go-bingai-pass/worker';
 
-async function verifyFCFF(request: Request): Promise<Response> {
-    const cookie: string = request.headers.get('Cookie') || '';
+async function verifyFCFF(request: Request,evn:Env): Promise<Response> {
+    let cookie: string = request.headers.get('Cookie') || '';
+    // if(evn.XForwardedForIP){
+    //     cookie = `${cookie?(cookie+"; "):""}BingAI_Rand_IP=${evn.XForwardedForIP}`;
+    // }
     const currentUrl = new URL(request.url);
     const resData = await fCFF({
         'IG': currentUrl.searchParams.get('IG'),
@@ -58,5 +61,5 @@ export async function verify(request: Request,evn:Env): Promise<Response> {
     if(evn.BYPASS_SERVER){
         return verifyPass(request,evn.BYPASS_SERVER);//使用远程服务器验证
     }
-    return verifyFCFF(request);//本地验证
+    return verifyFCFF(request,evn);//本地验证
 };
diff --git a/worker-configuration.d.ts b/worker-configuration.d.ts
@@ -1,5 +1,6 @@
 // Generated by Wrangler
 // After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
 interface Env {
-    BYPASS_SERVER?: string
+    BYPASS_SERVER?: string,
+    XForwardedForIP?: string
 }