chore: version 2.9.2 (#261)

* feat: 添加 OPENAI_API_BASE_URL 可选参数[#249] * fix: 生成的代码块不能复制的问题[#251][#260] * perf: 限制高分屏上的宽度[#257] * perf: 文字按单词换行[#215][#225] * perf: highlight.js 新语法警告 * fix: 移动端输入框不会被键盘弹起[#256] * chore: 更新文档 * chore: version 2.9.2
2025-07-21 03:44:21 +00:00 · 2023-03-04 09:34:28 +08:00
parent 2293969070
commit 0fdf75eba0
17 changed files with 237 additions and 120 deletions
--- a/service/.env
+++ b/service/.env
@@ -4,13 +4,16 @@ OPENAI_API_KEY=
 # change this to an `accessToken` extracted from the ChatGPT site's `https://chat.openai.com/api/auth/session` response
 OPENAI_ACCESS_TOKEN=

+# OpenAI API Base URL - https://api.openai.com
+OPENAI_API_BASE_URL=
+
 # Reverse Proxy
 API_REVERSE_PROXY=

 # timeout
 TIMEOUT_MS=100000

-# Socks Proxy Port
+# Socks Proxy Host
 SOCKS_PROXY_HOST=

 # Socks Proxy Port
--- a/service/package.json
+++ b/service/package.json
@@ -24,7 +24,7 @@
    "common:cleanup": "rimraf node_modules && rimraf pnpm-lock.yaml"
  },
  "dependencies": {
-    "chatgpt": "^5.0.4",
+    "chatgpt": "^5.0.6",
    "dotenv": "^16.0.3",
    "esno": "^0.16.3",
    "express": "^4.18.2",
@@ -35,9 +35,9 @@
  "devDependencies": {
    "@antfu/eslint-config": "^0.35.3",
    "@types/express": "^4.17.17",
-    "@types/node": "^18.14.4",
+    "@types/node": "^18.14.6",
    "eslint": "^8.35.0",
-    "rimraf": "^4.1.3",
+    "rimraf": "^4.2.0",
    "tsup": "^6.6.3",
    "typescript": "^4.9.5"
  }
--- a/service/pnpm-lock.yaml
+++ b/service/pnpm-lock.yaml
@@ -3,21 +3,21 @@ lockfileVersion: 5.4
 specifiers:
  '@antfu/eslint-config': ^0.35.3
  '@types/express': ^4.17.17
-  '@types/node': ^18.14.4
-  chatgpt: ^5.0.4
+  '@types/node': ^18.14.6
+  chatgpt: ^5.0.6
  dotenv: ^16.0.3
  eslint: ^8.35.0
  esno: ^0.16.3
  express: ^4.18.2
  isomorphic-fetch: ^3.0.0
  node-fetch: ^3.3.0
-  rimraf: ^4.1.3
+  rimraf: ^4.2.0
  socks-proxy-agent: ^7.0.0
  tsup: ^6.6.3
  typescript: ^4.9.5

 dependencies:
-  chatgpt: 5.0.4
+  chatgpt: 5.0.6
  dotenv: 16.0.3
  esno: 0.16.3
  express: 4.18.2
@@ -28,9 +28,9 @@ dependencies:
 devDependencies:
  '@antfu/eslint-config': 0.35.3_ycpbpc6yetojsgtrx3mwntkhsu
  '@types/express': 4.17.17
-  '@types/node': 18.14.4
+  '@types/node': 18.14.6
  eslint: 8.35.0
-  rimraf: 4.1.3
+  rimraf: 4.2.0
  tsup: 6.6.3_typescript@4.9.5
  typescript: 4.9.5

@@ -428,19 +428,19 @@ packages:
    resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
    dependencies:
      '@types/connect': 3.4.35
-      '@types/node': 18.14.4
+      '@types/node': 18.14.6
    dev: true

  /@types/connect/3.4.35:
    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
    dependencies:
-      '@types/node': 18.14.4
+      '@types/node': 18.14.6
    dev: true

  /@types/express-serve-static-core/4.17.33:
    resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==}
    dependencies:
-      '@types/node': 18.14.4
+      '@types/node': 18.14.6
      '@types/qs': 6.9.7
      '@types/range-parser': 1.2.4
    dev: true
@@ -472,8 +472,8 @@ packages:
    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
    dev: true

-  /@types/node/18.14.4:
-    resolution: {integrity: sha512-VhCw7I7qO2X49+jaKcAUwi3rR+hbxT5VcYF493+Z5kMLI0DL568b7JI4IDJaxWFH0D/xwmGJNoXisyX+w7GH/g==}
+  /@types/node/18.14.6:
+    resolution: {integrity: sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==}
    dev: true

  /@types/normalize-package-data/2.4.1:
@@ -495,7 +495,7 @@ packages:
    resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
    dependencies:
      '@types/mime': 3.0.1
-      '@types/node': 18.14.4
+      '@types/node': 18.14.6
    dev: true

  /@types/unist/2.0.6:
@@ -816,6 +816,12 @@ packages:
      concat-map: 0.0.1
    dev: true

+  /brace-expansion/2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+    dependencies:
+      balanced-match: 1.0.2
+    dev: true
+
  /braces/3.0.2:
    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
    engines: {node: '>=8'}
@@ -896,8 +902,8 @@ packages:
    resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
    dev: true

-  /chatgpt/5.0.4:
-    resolution: {integrity: sha512-qkppO2IDYDJC1eaXfqupXdZcOPNqtBkToRcvr9CAGM1rdsKfBDpWLTx4Y6OMNH02sgWu48aJB//0lO1M17K58w==}
+  /chatgpt/5.0.6:
+    resolution: {integrity: sha512-BQ0eN2GpAlw9ojsxkHmW+bTuekbllZbOkKqjDSIVSMtbMoYDx59vcg6xXnCPkB0OBFGuG89eqGhLAfMIW34Hcw==}
    engines: {node: '>=14'}
    hasBin: true
    dependencies:
@@ -1955,6 +1961,16 @@ packages:
      path-is-absolute: 1.0.1
    dev: true

+  /glob/9.2.1:
+    resolution: {integrity: sha512-Pxxgq3W0HyA3XUvSXcFhRSs+43Jsx0ddxcFrbjxNGkL2Ak5BAUBxLqI5G6ADDeCHLfzzXFhe0b1yYcctGmytMA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 7.4.2
+      minipass: 4.2.4
+      path-scurry: 1.6.1
+    dev: true
+
  /globals/13.20.0:
    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
    engines: {node: '>=8'}
@@ -2439,6 +2455,11 @@ packages:
    dependencies:
      yallist: 4.0.0

+  /lru-cache/7.18.1:
+    resolution: {integrity: sha512-8/HcIENyQnfUTCDizRu9rrDyG6XG/21M4X7/YEGZeD76ZJilFPAUVb/2zysFf7VVO1LEjCDFyHp8pMMvozIrvg==}
+    engines: {node: '>=12'}
+    dev: true
+
  /mdast-util-from-markdown/0.8.5:
    resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==}
    dependencies:
@@ -2534,10 +2555,22 @@ packages:
      brace-expansion: 1.1.11
    dev: true

+  /minimatch/7.4.2:
+    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
+    dev: true
+
  /minimist/1.2.8:
    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
    dev: true

+  /minipass/4.2.4:
+    resolution: {integrity: sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ==}
+    engines: {node: '>=8'}
+    dev: true
+
  /ms/2.0.0:
    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
    dev: false
@@ -2804,6 +2837,14 @@ packages:
    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
    dev: true

+  /path-scurry/1.6.1:
+    resolution: {integrity: sha512-OW+5s+7cw6253Q4E+8qQ/u1fVvcJQCJo/VFD8pje+dbJCF1n5ZRMV2AEHbGp+5Q7jxQIYJxkHopnj6nzdGeZLA==}
+    engines: {node: '>=14'}
+    dependencies:
+      lru-cache: 7.18.1
+      minipass: 4.2.4
+    dev: true
+
  /path-to-regexp/0.1.7:
    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
    dev: false
@@ -3007,10 +3048,12 @@ packages:
      glob: 7.2.3
    dev: true

-  /rimraf/4.1.3:
-    resolution: {integrity: sha512-iyzalDLo3l5FZxxaIGUY7xI4Bf90Xt7pCipc1Mr7RsdU7H3538z+M0tlsUDrz0aHeGS9uNqiKHUJyTewwRP91Q==}
+  /rimraf/4.2.0:
+    resolution: {integrity: sha512-tPt+gLORNVqRCk0NwuJ5SlMEcOGvt4CCU8sUPqgCFtCbnoNCTd9Q6vq7JlBbxQlACiH14OR28y7piA2Bak9Sxw==}
    engines: {node: '>=14'}
    hasBin: true
+    dependencies:
+      glob: 9.2.1
    dev: true

  /rollup/3.15.0:
--- a/service/src/chatgpt/index.ts
+++ b/service/src/chatgpt/index.ts
@@ -1,11 +1,11 @@
 import * as dotenv from 'dotenv'
 import 'isomorphic-fetch'
-import type { ChatMessage, SendMessageOptions } from 'chatgpt'
+import type { ChatGPTAPIOptions, ChatMessage, SendMessageOptions } from 'chatgpt'
 import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt'
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import fetch from 'node-fetch'
 import { sendResponse } from '../utils'
-import type { ApiModel, ChatContext, ChatGPTAPIOptions, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types'
+import type { ApiModel, ChatContext, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types'

 dotenv.config()

@@ -18,7 +18,6 @@ if (!process.env.OPENAI_API_KEY && !process.env.OPENAI_ACCESS_TOKEN)

 let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI

-// To use ESM in CommonJS, you can use a dynamic import
 (async () => {
  // More Info: https://github.com/transitive-bullshit/chatgpt-api

@@ -27,17 +26,21 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
      apiKey: process.env.OPENAI_API_KEY,
      debug: false,
    }
-    let fetchFn
+
+    if (process.env.OPENAI_API_BASE_URL && process.env.OPENAI_API_BASE_URL.trim().length > 0)
+      options.apiBaseUrl = process.env.OPENAI_API_BASE_URL
+
    if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) {
      const agent = new SocksProxyAgent({
        hostname: process.env.SOCKS_PROXY_HOST,
        port: process.env.SOCKS_PROXY_PORT,
      })
-      fetchFn = (url, options) => {
+      options.fetch = (url, options) => {
        return fetch(url, { agent, ...options })
      }
    }
-    api = new ChatGPTAPI({ ...options, fetch: fetchFn })
+
+    api = new ChatGPTAPI({ ...options })
    apiModel = 'ChatGPTAPI'
  }
  else {
@@ -59,10 +62,7 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
    if (process.env.API_REVERSE_PROXY)
      options.apiReverseProxyUrl = process.env.API_REVERSE_PROXY

-    api = new ChatGPTUnofficialProxyAPI({
-      accessToken: process.env.OPENAI_ACCESS_TOKEN,
-      ...options,
-    })
+    api = new ChatGPTUnofficialProxyAPI({ ...options })
    apiModel = 'ChatGPTUnofficialProxyAPI'
  }
 })()
--- a/service/src/types.ts
+++ b/service/src/types.ts
@@ -1,16 +1,10 @@
-import type { FetchFn, openai } from 'chatgpt'
+import type { FetchFn } from 'chatgpt'

 export interface ChatContext {
  conversationId?: string
  parentMessageId?: string
 }

-export interface ChatGPTAPIOptions {
-  apiKey: string
-  debug?: boolean
-  completionParams?: Partial<openai.CompletionParams>
-}
-
 export interface ChatGPTUnofficialProxyAPIOptions {
  accessToken: string
  apiReverseProxyUrl?: string