Merge remote-tracking branch 'github/main'

# Conflicts:
#	README.en.md
#	README.md
#	package.json
#	service/pnpm-lock.yaml
#	service/src/chatgpt/index.ts
#	src/components/common/Setting/About.vue
#	src/locales/en-US.ts
#	src/locales/zh-CN.ts
#	src/locales/zh-TW.ts

Author: Kerwin

CHANGELOG.md

@@ -1,3 +1,33 @@
+## v2.10.9
+
+`2023-04-03`
+
+> 更新默认 `accessToken` 反代地址为 [[acheong08](https://github.com/acheong08)] 的 `https://bypass.churchless.tech/api/conversation`
+
+## Enhancement
+- 添加 `socks5` 代理认证 [[yimiaoxiehou](https://github.com/Chanzhaoyu/chatgpt-web/pull/999)]
+- 添加 `socks` 代理用户名密码的配置 [[hank-cp](https://github.com/Chanzhaoyu/chatgpt-web/pull/890)]
+- 添加可选日志打印 [[zcong1993](https://github.com/Chanzhaoyu/chatgpt-web/pull/1041)]
+- 更新侧边栏按钮本地化[[simonwu53](https://github.com/Chanzhaoyu/chatgpt-web/pull/911)]
+- 优化代码块滚动条高度 [[Fog3211](https://github.com/Chanzhaoyu/chatgpt-web/pull/1153)]
+## BugFix
+- 修复 `PWA` 问题 [[bingo235](https://github.com/Chanzhaoyu/chatgpt-web/pull/807)]
+- 修复 `ESM` 错误 [[kidonng](https://github.com/Chanzhaoyu/chatgpt-web/pull/826)]
+- 修复反向代理开启时限流失效的问题 [[gitgitgogogo](https://github.com/Chanzhaoyu/chatgpt-web/pull/863)]
+- 修复 `docker` 构建时 `.env` 可能被忽略的问题 [[zaiMoe](https://github.com/Chanzhaoyu/chatgpt-web/pull/877)]
+- 修复导出异常错误 [[KingTwinkle](https://github.com/Chanzhaoyu/chatgpt-web/pull/938)]
+- 修复空值异常 [[vchenpeng](https://github.com/Chanzhaoyu/chatgpt-web/pull/1103)]
+- 移动端上的体验问题
+
+## Other
+- `Docker` 容器名字名义 [[LOVECHEN](https://github.com/Chanzhaoyu/chatgpt-web/pull/1035)]
+- `kubernetes` 部署配置 [[CaoYunzhou](https://github.com/Chanzhaoyu/chatgpt-web/pull/1001)]
+- 感谢 [[assassinliujie](https://github.com/Chanzhaoyu/chatgpt-web/pull/962)] 和 [[puppywang](https://github.com/Chanzhaoyu/chatgpt-web/pull/1017)] 的某些贡献
+- 更新 `kubernetes/deploy.yaml` [[idawnwon](https://github.com/Chanzhaoyu/chatgpt-web/pull/1085)]
+- 文档更新 [[#yi-ge](https://github.com/Chanzhaoyu/chatgpt-web/pull/883)]
+- 文档更新 [[weifeng12x](https://github.com/Chanzhaoyu/chatgpt-web/pull/880)]
+- 依赖更新
+
 ## v2.10.8
 
 `2023-03-23`

README.md

@@ -56,8 +56,8 @@
 | `ChatGPTUnofficialProxyAPI(网页 accessToken)` | 是     | 相对不可靠 | 聪明 |
 
 对比：
-1. `ChatGPTAPI` 使用 `gpt-3.5-turbo-0301` 通过官方`OpenAI`补全`API`模拟`ChatGPT`（最稳健的方法，但它不是免费的，并且没有使用针对聊天进行微调的模型）
-2. `ChatGPTUnofficialProxyAPI` 使用非官方代理服务器访问 `ChatGPT` 的后端`API`，绕过`Cloudflare`（使用真实的的`ChatGPT`，非常轻量级，但依赖于第三方服务器，并且有速率限制）
+1. `ChatGPTAPI` 使用 `gpt-3.5-turbo` 通过 `OpenAI` 官方 `API` 调用 `ChatGPT`
+2. `ChatGPTUnofficialProxyAPI` 使用非官方代理服务器访问 `ChatGPT` 的后端`API`，绕过`Cloudflare`（依赖于第三方服务器，并且有速率限制）
 
 警告：
 1. 你应该首先使用 `API` 方式

kubernetes/deploy.yaml

@@ -30,7 +30,7 @@ spec:
             - name: OPENAI_API_MODEL
               value: gpt-3.5-turbo
             - name: API_REVERSE_PROXY
-              value: https://bypass.duti.tech/api/conversation
+              value: https://bypass.churchless.tech/api/conversation
             - name: AUTH_SECRET_KEY
               value: '123456'
             - name: TIMEOUT_MS

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web",
-  "version": "2.11.1",
+  "version": "2.11.7",
   "private": false,
   "description": "ChatGPT Web",
   "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",

service/.env.example

@@ -13,7 +13,9 @@ OPENAI_API_MODEL=
 # set `true` to disable OpenAI API debug log
 OPENAI_API_DISABLE_DEBUG=
 
-# Reverse Proxy
+# Reverse Proxy - Available on accessToken
+# Default: https://bypass.churchless.tech/api/conversation
+# More: https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy
 API_REVERSE_PROXY=
 
 # timeout

service/src/chatgpt/index.ts

@@ -5,12 +5,11 @@ import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt'
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import httpsProxyAgent from 'https-proxy-agent'
 import fetch from 'node-fetch'
-import axios from 'axios'
 import { getCacheConfig, getOriginConfig } from '../storage/config'
 import { sendResponse } from '../utils'
 import { isNotEmptyString } from '../utils/is'
 import type { ApiModel, ChatContext, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types'
-import type { RequestOptions } from './types'
+import type { BalanceResponse, RequestOptions } from './types'
 
 const { HttpsProxyAgent } = httpsProxyAgent
 
@@ -72,11 +71,15 @@ export async function initApi() {
       accessToken: config.accessToken,
       debug: !config.apiDisableDebug,
     }
+
     if (isNotEmptyString(OPENAI_API_MODEL))
       options.model = OPENAI_API_MODEL
 
-    if (isNotEmptyString(config.reverseProxy))
-      options.apiReverseProxyUrl = config.reverseProxy
+    if (isNotEmptyString(config.reverseProxy)) {
+      options.apiReverseProxyUrl = isNotEmptyString(config.reverseProxy)
+        ? config.reverseProxy
+        : 'https://bypass.churchless.tech/api/conversation'
+    }
 
     await setupProxy(options)
 
@@ -122,6 +125,7 @@ async function chatReplyProcess(options: RequestOptions) {
 }
 
 async function fetchBalance() {
+  // 计算起始日期和结束日期
   const config = await getCacheConfig()
   const OPENAI_API_KEY = config.apiKey
   const OPENAI_API_BASE_URL = config.apiBaseUrl
@@ -133,17 +137,38 @@ async function fetchBalance() {
     ? OPENAI_API_BASE_URL
     : 'https://api.openai.com'
 
+  const [startDate, endDate] = formatDate()
+
+  // 每月使用量
+  const urlUsage = `${API_BASE_URL}/v1/dashboard/billing/usage?start_date=${startDate}&end_date=${endDate}`
+
+  const headers = {
+    'Authorization': `Bearer ${OPENAI_API_KEY}`,
+    'Content-Type': 'application/json',
+  }
+
   try {
-    const headers = { 'Content-Type': 'application/json', 'Authorization': `Bearer ${OPENAI_API_KEY}` }
-    const response = await axios.get(`${API_BASE_URL}/dashboard/billing/credit_grants`, { headers })
-    const balance = response.data.total_available ?? 0
-    return Promise.resolve(balance.toFixed(3))
+    // 获取已使用量
+    const useResponse = await fetch(urlUsage, { headers })
+    const usageData = await useResponse.json() as BalanceResponse
+    const usage = Math.round(usageData.total_usage) / 100
+    return Promise.resolve(usage ? `$${usage}` : '-')
   }
   catch {
     return Promise.resolve('-')
   }
 }
 
+function formatDate(): string[] {
+  const today = new Date()
+  const year = today.getFullYear()
+  const month = today.getMonth() + 1
+  const lastDay = new Date(year, month, 0)
+  const formattedFirstDay = `${year}-${month.toString().padStart(2, '0')}-01`
+  const formattedLastDay = `${year}-${month.toString().padStart(2, '0')}-${lastDay.getDate().toString().padStart(2, '0')}`
+  return [formattedFirstDay, formattedLastDay]
+}
+
 async function chatConfig() {
   const config = await getOriginConfig() as ModelConfig
   config.balance = await fetchBalance()

service/src/chatgpt/types.ts

@@ -6,3 +6,7 @@ export interface RequestOptions {
   process?: (chat: ChatMessage) => void
   systemMessage?: string
 }
+
+export interface BalanceResponse {
+  total_usage: number
+}

src/locales/en-US.ts

@@ -36,7 +36,7 @@ export default {
   },
   chat: {
     newChatButton: 'New Chat',
-    placeholder: 'Ask me anything...(Shift + Enter = line break)',
+    placeholder: 'Ask me anything...(Shift + Enter = line break, "/" to trigger prompts)',
     placeholderMobile: 'Ask me anything...',
     copy: 'Copy',
     copied: 'Copied',
@@ -94,6 +94,7 @@ export default {
     loginEnabled: 'Login Enabled',
     loginSalt: 'Login Salt',
     loginSaltTip: 'Changes will invalidate all logged in',
+    monthlyUsage: 'Monthly Usage',
   },
   store: {
     siderButton: 'Prompt Store',

src/locales/zh-CN.ts

@@ -36,7 +36,7 @@ export default {
   },
   chat: {
     newChatButton: '新建聊天',
-    placeholder: '来说点什么吧...（Shift + Enter = 换行）',
+    placeholder: '来说点什么吧...（Shift + Enter = 换行，"/" 触发提示词）',
     placeholderMobile: '来说点什么...',
     copy: '复制',
     copied: '复制成功',
@@ -94,6 +94,7 @@ export default {
     loginEnabled: '注册登录',
     loginSalt: '登录混淆盐',
     loginSaltTip: '变更会导致所有已登录失效',
+    monthlyUsage: '本月使用量',
   },
   store: {
     siderButton: '提示词商店',

src/locales/zh-TW.ts

@@ -36,7 +36,7 @@ export default {
   },
   chat: {
     newChatButton: '新建對話',
-    placeholder: '來說點什麼...（Shift + Enter = 換行）',
+    placeholder: '來說點什麼...（Shift + Enter = 換行，"/" 觸發提示詞）',
     placeholderMobile: '來說點什麼...',
     copy: '複製',
     copied: '複製成功',
@@ -94,6 +94,7 @@ export default {
     loginEnabled: '注册登录',
     loginSalt: '登录混淆盐',
     loginSaltTip: '变更会导致所有已登录失效',
+    monthlyUsage: '本月使用量',
   },
   store: {
     siderButton: '提示詞商店',

src/styles/lib/highlight.less

@@ -123,7 +123,10 @@ html {
 	}
 
 	code.hljs {
-		padding: 3px 5px
+		padding: 3px 5px;
+		&::-webkit-scrollbar {
+			height: 4px;
+		}
 	}
 
 	.hljs {

src/views/chat/index.vue

@@ -140,7 +140,7 @@ async function onConversation() {
               dataSources.value.length - 1,
               {
                 dateTime: new Date().toLocaleString(),
-                text: lastText + data.text ?? '',
+                text: lastText + (data.text ?? ''),
                 inversion: false,
                 error: false,
                 loading: true,
@@ -245,7 +245,7 @@ async function onRegenerate(index: number) {
       error: false,
       loading: true,
       conversationOptions: null,
-      requestOptions: { prompt: message, ...options },
+      requestOptions: { prompt: message, options: { ...options } },
     },
   )
 
@@ -274,12 +274,12 @@ async function onRegenerate(index: number) {
               index,
               {
                 dateTime: new Date().toLocaleString(),
-                text: lastText + data.text ?? '',
+                text: lastText + (data.text ?? ''),
                 inversion: false,
                 error: false,
                 loading: true,
                 conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-                requestOptions: { prompt: message, ...options },
+                requestOptions: { prompt: message, options: { ...options } },
               },
             )
 
@@ -323,7 +323,7 @@ async function onRegenerate(index: number) {
         error: true,
         loading: false,
         conversationOptions: null,
-        requestOptions: { prompt: message, ...options },
+        requestOptions: { prompt: message, options: { ...options } },
       },
     )
   }