feat: 增加 MUID

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingo",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "scripts": {
     "dev": "cross-env DEBUG=bingo* next dev --hostname 0.0.0.0",

src/components/settings.tsx

@@ -129,7 +129,7 @@ export function Settings() {
                   const maxAge = 86400 * 30
                   encodeHeadersToCookie(headerValue).forEach(cookie => document.cookie = `${cookie}; Max-Age=${maxAge}; Path=/; SameSite=None; Secure`)
                 } else {
-                  [...ChunkKeys, 'BING_COOKIE', 'BING_UA', 'BING_IP'].forEach(key => setCookie(key, ''))
+                  [...ChunkKeys, 'BING_COOKIE', 'BING_UA', 'BING_IP', '_U'].forEach(key => setCookie(key, ''))
                 }
                 setCookie('IMAGE_ONLY', RegExp.$1 === 'cn' || imageOnly || !headerValue ? '1' : '0')
 

src/lib/utils.ts

@@ -6,6 +6,7 @@ import { lookup } from 'dns'
 // @ts-ignore
 import randomip from 'random-ip'
 import cidr from './cidr.json'
+import { debug } from './isomorphic'
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
@@ -69,8 +70,8 @@ export function parseHeadersFromCurl(content: string) {
   return headers
 }
 
-
 export const ChunkKeys = ['BING_HEADER', 'BING_HEADER1', 'BING_HEADER2']
+
 export function encodeHeadersToCookie(content: string) {
   const base64Content = btoa(content)
   const contentChunks = base64Content.match(/.{1,4000}/g) || []
@@ -125,6 +126,7 @@ export function parseUA(ua?: string, default_ua = DEFAULT_UA) {
 export function mockUser(cookies: Partial<{ [key: string]: string }>) {
   const {
     BING_UA = process.env.BING_UA,
+    MUID = process.env.MUID,
     BING_IP = '',
     _U = defaultUID,
   } = cookies
@@ -136,7 +138,7 @@ export function mockUser(cookies: Partial<{ [key: string]: string }>) {
     'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
     'User-Agent': ua!,
     'x-ms-useragent': 'azsdk-js-api-client-factory/1.0.0-beta.1 core-rest-pipeline/1.10.3 OS/Win32',
-    cookie: `_U=${_U}`,
+    cookie: `_U=${_U}; MUID=${MUID || ''}`,
   }
 }
 

src/pages/api/create.ts

@@ -2,7 +2,7 @@
 
 import { NextApiRequest, NextApiResponse } from 'next'
 import { fetch, debug } from '@/lib/isomorphic'
-import { createHeaders, randomIP, lookupPromise } from '@/lib/utils'
+import { createHeaders, randomIP, extraHeadersFromCookie } from '@/lib/utils'
 import { sleep } from '@/lib/bots/bing/utils'
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -32,19 +32,18 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         if (!json?.conversationSignature) {
           continue
         }
-        const cookies = [
-          headers.cookie,
-          `BING_IP=${headers['x-forwarded-for']}`,
-        ]
+        const { cookie } = extraHeadersFromCookie(req.cookies) || {}
+        const cookies = cookie?.split(';') || []
+        cookies.push(`BING_IP=${headers['x-forwarded-for']}`)
 
-        res.setHeader('set-cookie', cookies.map(cookie => `${cookie}; Max-Age=${86400 * 30}; Path=/; SameSite=None; Secure`))
+        res.setHeader('set-cookie', cookies.map(cookie => `${cookie.trim()}; Max-Age=${86400 * 30}; Path=/; SameSite=None; Secure`))
         debug('headers', headers)
         res.writeHead(200, {
           'Content-Type': 'application/json',
         })
         res.end(JSON.stringify({
           ...json,
-          userIpAddress: endpoint && !endpoint.endsWith('.bing.com') ? await lookupPromise(endpoint.split('/')[0]) : headers['x-forwarded-for']
+          // userIpAddress: endpoint && !endpoint.endsWith('.bing.com') ? await lookupPromise(endpoint.split('/')[0]) : headers['x-forwarded-for']
         }))
         return
       }