同步上游更新

OPENAI.md

@@ -20,7 +20,7 @@
 ### 示例
 以下以 `curl` 为例
 ```
-curl -kL 'https://hf4all-bingo-api.hf.space/api/v1/chat/completions' \
+curl -kL 'https://copilot.github1s.tk/api/v1/chat/completions' \
   -H 'Content-Type: application/json' \
   -d '{
     "messages":[{"role":"user","content":"你好"}],
@@ -41,7 +41,7 @@ curl -kL 'https://hf4all-bingo-api.hf.space/api/v1/chat/completions' \
 ```
 import openai
 openai.api_key = "dummy"
-openai.api_base = "https://hf4all-bingo-api.hf.space" # 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
+openai.api_base = "https://copilot.github1s.tk" # 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
 
 # create a chat completion
 chat_completion = openai.ChatCompletion.create(model="Creative", messages=[{"role": "user", "content": "Hello"}])
@@ -54,7 +54,7 @@ print(chat_completion.choices[0].message.content)
 ```
 import openai
 openai.api_key = "dummy"
-openai.api_base = "https://hf4all-bingo-api.hf.space" # 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
+openai.api_base = "https://copilot.github1s.tk" # 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
 
 # create a chat completion
 completion = openai.ChatCompletion.create(model="Creative", stream=True, messages=[{"role": "user", "content": "Hello"}])
@@ -71,7 +71,7 @@ for chat_completion in completion:
 import OpenAI from 'openai';
 
 const openai = new OpenAI({
-  baseURL: 'https://hf4all-bingo-api.hf.space' // 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
+  baseURL: 'https://copilot.github1s.tk' // 这里可以改为你自己部署的服务，bingo 服务版本需要 >= 0.9.0
 });
 
 async function main() {
@@ -92,9 +92,9 @@ main();
 
 ## 在线演示
 
-https://huggingface.co/spaces/hf4all/next-web-bing
+1. https://huggingface.co/spaces/hf4all/chatbot-ui-bing [![Deploy Chatbot UI](https://img.shields.io/badge/点此部署-%F0%9F%A4%97-fff)](https://huggingface.co/login?next=%2Fspaces%2Fhf4all%2Fchatbot-ui-bing%3Fduplicate%3Dtrue%26visibility%3Dpublic)
+2. https://huggingface.co/spaces/hf4all/chatgpt-next-web-bing 
+[![Deploy ChatGPT Next Web](https://img.shields.io/badge/点此部署-%F0%9F%A4%97-fff)](https://huggingface.co/login?next=%2Fspaces%2Fhf4all%2Fchatgpt-next-web-bing%3Fduplicate%3Dtrue%26visibility%3Dpublic)
 
-[![Deploy to HuggingFace](https://img.shields.io/badge/点此部署-%F0%9F%A4%97-fff)](https://huggingface.co/login?next=%2Fspaces%2Fhf4all%2Fnext-web-bing%3Fduplicate%3Dtrue%26visibility%3Dpublic) 配置可以不改
 
-
-[![gpt-next-web-bing](./docs/images/openai.png)](https://huggingface.co/spaces/hf4all/next-web-bing)
+[![效果图](./docs/images/openai.png)](https://huggingface.co/spaces/hf4all/chatgpt-next-web-bing)

docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.5'
+
+services:
+  bingo:
+    image: weaigc/bingo
+    container_name: bingo
+    ports:
+      - "7860:7860"
+    environment:
+#      - BING_HEADER=xxx # 这里配置自己的 BING_HEADER 信息

server.js

@@ -33,6 +33,14 @@ app.prepare().then(() => {
         })
       } else if (pathname.endsWith('/completions')) {
         await app.render(req, res, '/api/openai/chat/completions', query)
+      } else if (pathname.endsWith('/models')) {
+        res.end(JSON.stringify({
+          data: [
+            {
+              id: 'gpt-4',
+            }
+          ],
+        }))
       } else {
         await handle(req, res, parsedUrl)
       }

src/lib/bots/bing/types.ts

@@ -146,6 +146,7 @@ export interface ConversationInfo extends ConversationInfoBase {
   conversationStyle: BingConversationStyle
   prompt: string
   imageUrl?: string
+  source?: 'cib' | 'WindowsCopilot'
 }
 
 export interface Throttling {

src/lib/utils.ts

@@ -82,7 +82,7 @@ export function parseHeadersFromCurl(content: string) {
   return headers
 }
 
-export const ChunkKeys = ['BING_HEADER', 'BING_HEADER1', 'BING_HEADER2']
+export const ChunkKeys = ['BING_HEADER0', 'BING_HEADER1', 'BING_HEADER2']
 
 export function encodeHeadersToCookie(content: string) {
   const base64Content = btoa(content)
@@ -90,11 +90,8 @@ export function encodeHeadersToCookie(content: string) {
   return ChunkKeys.map((key, index) => `${key}=${contentChunks[index] ?? ''}`)
 }
 
-export function extraCurlFromCookie(cookies: Partial<{ [key: string]: string }>) {
-  let base64Content = ''
-  ChunkKeys.forEach((key) => {
-    base64Content += (cookies[key] || '')
-  })
+export function extraCurlFromCookie(cookies: Partial<{ [key: string]: string }> = {}) {
+  const base64Content = cookies.BING_HEADER || ChunkKeys.map((key) => cookies[key] || '').join('')
   try {
     return atob(base64Content)
   } catch (e) {
@@ -133,7 +130,7 @@ export function parseCookies(cookie: string, cookieNames: string[]) {
 }
 
 export function resetCookies() {
-  [...ChunkKeys, 'BING_COOKIE', 'BING_UA', '_U', 'BING_IP', 'MUID'].forEach(key => setCookie(key, ''))
+  [...ChunkKeys, 'BING_HEADER', '', 'BING_COOKIE', 'BING_UA', '_U', 'BING_IP', 'MUID'].forEach(key => setCookie(key, ''))
 }
 
 export const DEFAULT_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.0.0'
@@ -145,14 +142,16 @@ export function parseUA(ua?: string, default_ua = DEFAULT_UA) {
 
 export function mockUser(cookies: Partial<{ [key: string]: string }>) {
   const {
-    BING_HEADER = process.env.BING_HEADER || '',
+    BING_HEADER,
+    BING_HEADER0 = process.env.BING_HEADER,
     BING_UA = process.env.BING_UA,
-    BING_IP = process.env.BING_IP || '',
+    BING_IP = process.env.BING_IP,
   } = cookies
   const ua = parseUA(BING_UA)
 
   const { _U, MUID } = parseCookies(extraHeadersFromCookie({
     BING_HEADER,
+    BING_HEADER0,
     ...cookies,
   }).cookie, ['MUID'])
 
@@ -169,16 +168,18 @@ export function mockUser(cookies: Partial<{ [key: string]: string }>) {
 
 export function createHeaders(cookies: Partial<{ [key: string]: string }>, useMock?: boolean) {
   let {
-    BING_HEADER = process.env.BING_HEADER,
-    BING_IP = process.env.BING_IP || '',
+    BING_HEADER,
+    BING_HEADER0 = process.env.BING_HEADER,
+    BING_IP = process.env.BING_IP,
     IMAGE_ONLY = process.env.IMAGE_ONLY ?? '1',
   } = cookies || {}
   useMock = useMock ?? /^(1|true|yes)$/i.test(String(IMAGE_ONLY))
-  if (!BING_HEADER || useMock) {
+  if ((!BING_HEADER && !BING_HEADER0) || useMock) {
     return mockUser(cookies)
   }
   const headers = extraHeadersFromCookie({
     BING_HEADER,
+    BING_HEADER0,
     ...cookies,
   })
   headers['x-forwarded-for'] = BING_IP || randomIP()

src/pages/api/sydney.ts

@@ -14,7 +14,7 @@ const { WS_ENDPOINT = 'sydney.bing.com' } = process.env
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
   const conversationContext = req.body
-  const headers = createHeaders(req.cookies, Boolean(req.cookies['BING_HEADER1']))
+  const headers = createHeaders(req.cookies)
   const id = headers['x-forwarded-for']
   // headers['x-forwarded-for'] = conversationContext?.userIpAddress || headers['x-forwarded-for']
 
@@ -62,7 +62,12 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   await new Promise((resolve) => ws.onopen = resolve)
   ws.send(websocketUtils.packMessage({ protocol: 'json', version: 1 }))
   ws.send(websocketUtils.packMessage({ type: 6 }))
-  ws.send(websocketUtils.packMessage(BingWebBot.buildChatRequest(conversationContext!)))
+  ws.send(websocketUtils.packMessage(
+    BingWebBot.buildChatRequest({
+      ...conversationContext,
+      source: req.cookies?.BING_SOURCE,
+    })
+  ))
   req.socket.once('close', () => {
     debug(id, 'connection close')
     ws.close()