chore: v2.10.9

chore: update README.md
chore: default API_REVERSE_PROXY
2023-04-03 09:46:46 +08:00 · 2023-04-03 09:21:08 +08:00 · 2023-04-03 09:19:12 +08:00 · 2023-04-03 09:01:56 +08:00 · 2023-04-03 08:53:52 +08:00 · 2023-04-03 08:51:04 +08:00
21 changed files with 2101 additions and 2232 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,2 @@
+docker-compose
+kubernetes
--- a/.github/workflows/issues_close.yml
+++ b/.github/workflows/issues_close.yml
@@ -0,0 +1,22 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          days-before-issue-stale: 10
+          days-before-issue-close: 5
+          stale-issue-label: stale
+          stale-issue-message: This issue is stale because it has been open for 10 days with no activity.
+          close-issue-message: This issue was closed because it has been inactive for 5 days since being marked as stale.
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/CHANGELOG.md
+++ b/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`
--- a/README.en.md
+++ b/README.en.md
@@ -1,337 +0,0 @@
-# ChatGPT Web
-
-<div style="font-size: 1.5rem;">
-  <a href="./README.md">中文</a> |
-  <a href="./README.en.md">English</a>
-</div>
-</br>
-
-> Disclaimer: This project is only released on GitHub, under the MIT License, free and for open-source learning purposes. There will be no account selling, paid services, discussion groups, or forums. Beware of fraud.
-
-![cover](./docs/c1.png)
-![cover2](./docs/c2.png)
-
- [ChatGPT Web](#chatgpt-web)
-	- [Introduction](#introduction)
-	- [Roadmap](#roadmap)
-	- [Prerequisites](#prerequisites)
-		- [Node](#node)
-		- [PNPM](#pnpm)
-		- [Fill in the Keys](#fill-in-the-keys)
-	- [Install Dependencies](#install-dependencies)
-		- [Backend](#backend)
-		- [Frontend](#frontend)
-	- [Run in Test Environment](#run-in-test-environment)
-		- [Backend Service](#backend-service)
-		- [Frontend Webpage](#frontend-webpage)
-	- [Packaging](#packaging)
-		- [Using Docker](#using-docker)
-			- [Docker Parameter Example](#docker-parameter-example)
-			- [Docker Build \& Run](#docker-build--run)
-			- [Docker Compose](#docker-compose)
-		- [Deployment with Railway](#deployment-with-railway)
-			- [Railway Environment Variables](#railway-environment-variables)
-		- [Manual packaging](#manual-packaging)
-			- [Backend service](#backend-service-1)
-			- [Frontend webpage](#frontend-webpage-1)
-	- [Frequently Asked Questions](#frequently-asked-questions)
-	- [Contributing](#contributing)
-	- [Sponsorship](#sponsorship)
-	- [License](#license)
-
-## Introduction
-
-Supports dual models, provides two unofficial `ChatGPT API` methods:
-
-| Method                                        | Free?  | Reliability | Quality |
-| --------------------------------------------- | ------ | ----------- | ------- |
-| `ChatGPTAPI(gpt-3.5-turbo-0301)`                           | No     | Reliable    | Relatively clumsy |
-| `ChatGPTUnofficialProxyAPI(Web accessToken)` | Yes    | Relatively unreliable | Smart |
-
-Comparison:
-1. `ChatGPTAPI` uses `gpt-3.5-turbo-0301` to simulate `ChatGPT` through the official `OpenAI` completion `API` (the most reliable method, but it is not free and does not use models specifically tuned for chat).
-2. `ChatGPTUnofficialProxyAPI` accesses `ChatGPT`'s backend `API` via an unofficial proxy server to bypass `Cloudflare` (uses the real `ChatGPT`, is very lightweight, but depends on third-party servers and has rate limits).
-
-[Details](https://github.com/Chanzhaoyu/chatgpt-web/issues/138)
-
-Switching Methods:
-1. Go to the `service/.env.example` file and copy the contents to the `service/.env` file.
-2. For `OpenAI API Key`, fill in the `OPENAI_API_KEY` field [(Get apiKey)](https://platform.openai.com/overview).
-3. For `Web API`, fill in the `OPENAI_ACCESS_TOKEN` field [(Get accessToken)](https://chat.openai.com/api/auth/session).
-4. When both are present, `OpenAI API Key` takes precedence.
-
-Reverse Proxy:
-
-Available when using `ChatGPTUnofficialProxyAPI`.[Details](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)
-
-```shell
-# service/.env
-API_REVERSE_PROXY=
-```
-
-Environment Variables:
-
-For all parameter variables, check [here](#docker-parameter-example) or see:
-
-```
-/service/.env
-```
-
-## Roadmap
-[✓] Dual models
-
-[✓] Multiple session storage and context logic
-
-[✓] Formatting and beautifying code-like message types
-
-[✓] Access rights control
-
-[✓] Data import and export
-
-[✓] Save message to local image
-
-[✓] Multilingual interface
-
-[✓] Interface themes
-
-[✗] More...
-
-## Prerequisites
-
-### Node
-
-`node` requires version `^16 || ^18` (`node >= 14` requires installation of [fetch polyfill](https://github.com/developit/unfetch#usage-as-a-polyfill)), and multiple local `node` versions can be managed using [nvm](https://github.com/nvm-sh/nvm).
-
-```shell
-node -v
-```
-
-### PNPM
-If you have not installed `pnpm` before:
-```shell
-npm install pnpm -g
-```
-
-### Fill in the Keys
-
-Get `Openai Api Key` or `accessToken` and fill in the local environment variables [jump](#introduction)
-
-```
-# service/.env file
-
-# OpenAI API Key - https://platform.openai.com/overview
-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=
-```
-
-## Install Dependencies
-
-> To make it easier for `backend developers` to understand, we did not use the front-end `workspace` mode, but stored it in different folders. If you only need to do secondary development of the front-end page, delete the `service` folder.
-
-### Backend
-
-Enter the `/service` folder and run the following command
-
-```shell
-pnpm install
-```
-
-### Frontend
-Run the following command in the root directory
-```shell
-pnpm bootstrap
-```
-
-## Run in Test Environment
-### Backend Service
-
-Enter the `/service` folder and run the following command
-
-```shell
-pnpm start
-```
-
-### Frontend Webpage
-Run the following command in the root directory
-```shell
-pnpm dev
-```
-
-## Packaging
-
-### Using Docker
-
-#### Docker Parameter Example
-
- `OPENAI_API_KEY` one of two
- `OPENAI_ACCESS_TOKEN` one of two, `OPENAI_API_KEY` takes precedence when both are present
- `OPENAI_API_BASE_URL` optional, available when `OPENAI_API_KEY` is set
- `OPENAI_API_MODEL` optional, available when `OPENAI_API_KEY` is set
- `API_REVERSE_PROXY` optional, available when `OPENAI_ACCESS_TOKEN` is set [Reference](#introduction)
- `AUTH_SECRET_KEY` Access Password，optional
- `TIMEOUT_MS` timeout, in milliseconds, optional
- `SOCKS_PROXY_HOST` optional, effective with SOCKS_PROXY_PORT
- `SOCKS_PROXY_PORT` optional, effective with SOCKS_PROXY_HOST
- `HTTPS_PROXY` optional, support http，https, socks5
- `ALL_PROXY` optional, support http，https, socks5
-
-![docker](./docs/docker.png)
-
-#### Docker Build & Run
-
-```bash
-docker build -t chatgpt-web .
-
-# foreground operation
-docker run --name chatgpt-web --rm -it -p 127.0.0.1:3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
-
-# background operation
-docker run --name chatgpt-web -d -p 127.0.0.1:3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
-
-# running address
-http://localhost:3002/
-```
-
-#### Docker Compose
-
-[Hub Address](https://hub.docker.com/repository/docker/chenzhaoyu94/chatgpt-web/general)
-
-```yml
-version: '3'
-
-services:
-  app:
-    image: chenzhaoyu94/chatgpt-web # always use latest, pull the tag image again when updating
-    ports:
-      - 127.0.0.1:3002:3002
-    environment:
-      # one of two
-      OPENAI_API_KEY: xxxxxx
-      # one of two
-      OPENAI_ACCESS_TOKEN: xxxxxx
-      # api interface url, optional, available when OPENAI_API_KEY is set
-      OPENAI_API_BASE_URL: xxxx
-      # api model, optional, available when OPENAI_API_KEY is set
-      OPENAI_API_MODEL: xxxx
-      # reverse proxy, optional
-      API_REVERSE_PROXY: xxx
-      # access password，optional
-      AUTH_SECRET_KEY: xxx
-      # timeout, in milliseconds, optional
-      TIMEOUT_MS: 60000
-      # socks proxy, optional, effective with SOCKS_PROXY_PORT
-      SOCKS_PROXY_HOST: xxxx
-      # socks proxy port, optional, effective with SOCKS_PROXY_HOST
-      SOCKS_PROXY_PORT: xxxx
-      # HTTPS Proxy，optional, support http, https, socks5
-      HTTPS_PROXY: http://xxx:7890
-```
-The `OPENAI_API_BASE_URL` is optional and only used when setting the `OPENAI_API_KEY`.
-The `OPENAI_API_MODEL` is optional and only used when setting the `OPENAI_API_KEY`.
-
-### Deployment with Railway
-
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/yytmgc)
-
-#### Railway Environment Variables
-
-| Environment Variable | Required | Description                                                                                       |
-| -------------------- | -------- | ------------------------------------------------------------------------------------------------- |
-| `PORT`               | Required | Default: `3002`                                                                                   |
-| `AUTH_SECRET_KEY`         | Optional | access password                                                                          |
-| `TIMEOUT_MS`         | Optional | Timeout in milliseconds                                                                      |
-| `OPENAI_API_KEY`     | Optional | Required for `OpenAI API`. `apiKey` can be obtained from [here](https://platform.openai.com/overview). |
-| `OPENAI_ACCESS_TOKEN`| Optional | Required for `Web API`. `accessToken` can be obtained from [here](https://chat.openai.com/api/auth/session).|
-| `OPENAI_API_BASE_URL`  | Optional, only for `OpenAI API` |  API endpoint.                                                        |
-| `OPENAI_API_MODEL`  | Optional, only for `OpenAI API` |  API model.                                                        |
-| `API_REVERSE_PROXY`  | Optional, only for `Web API` | Reverse proxy address for `Web API`. [Details](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy) |
-| `SOCKS_PROXY_HOST`   | Optional, effective with `SOCKS_PROXY_PORT` | Socks proxy.                      |
-| `SOCKS_PROXY_PORT`   | Optional, effective with `SOCKS_PROXY_HOST` | Socks proxy port.                 |
-| `HTTPS_PROXY`   | Optional | HTTPS Proxy.                 |
-| `ALL_PROXY`   | Optional | ALL Proxy.                 |
-
-> Note: Changing environment variables in Railway will cause re-deployment.
-
-### Manual packaging
-
-#### Backend service
-
-> If you don't need the `node` interface of this project, you can skip the following steps.
-
-Copy the `service` folder to a server that has a `node` service environment.
-
-```shell
-# Install
-pnpm install
-
-# Build
-pnpm build
-
-# Run
-pnpm prod
-```
-
-PS: You can also run `pnpm start` directly on the server without packaging.
-
-#### Frontend webpage
-
-1. Refer to the root directory `.env.example` file content to create `.env` file, modify `VITE_GLOB_API_URL` in `.env` at the root directory to your actual backend interface address.
-2. Run the following command in the root directory and then copy the files in the `dist` folder to the root directory of your website service.
-
-[Reference information](https://cn.vitejs.dev/guide/static-deploy.html#building-the-app)
-
-```shell
-pnpm build
-```
-
-## Frequently Asked Questions
-
-Q: Why does Git always report an error when committing?
-
-A: Because there is submission information verification, please follow the [Commit Guidelines](./CONTRIBUTING.en.md).
-
-Q: Where to change the request interface if only the frontend page is used?
-
-A: The `VITE_GLOB_API_URL` field in the `.env` file at the root directory.
-
-Q: All red when saving the file?
-
-A: For `vscode`, please install the recommended plug-in of the project or manually install the `Eslint` plug-in.
-
-Q: Why doesn't the frontend have a typewriter effect?
-
-A: One possible reason is that after Nginx reverse proxying, buffering is turned on, and Nginx will try to buffer a certain amount of data from the backend before sending it to the browser. Please try adding `proxy_buffering off;` after the reverse proxy parameter and then reloading Nginx. Other web server configurations are similar.
-
-Q: The content returned is incomplete?
-
-A: There is a length limit for the content returned by the API each time. You can modify the `VITE_GLOB_OPEN_LONG_REPLY` field in the `.env` file under the root directory, set it to `true`, and rebuild the front-end to enable the long reply feature, which can return the full content. It should be noted that using this feature may bring more API usage fees.
-
-## Contributing
-
-Please read the [Contributing Guidelines](./CONTRIBUTING.en.md) before contributing.
-
-Thanks to all the contributors!
-
-<a href="https://github.com/Chanzhaoyu/chatgpt-web/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=Chanzhaoyu/chatgpt-web" />
-</a>
-
-## Sponsorship
-
-If you find this project helpful and circumstances permit, you can give me a little support. Thank you very much for your support~
-
-<div style="display: flex; gap: 20px;">
-	<div style="text-align: center">
-		<img style="max-width: 100%" src="./docs/wechat.png" alt="WeChat" />
-		<p>WeChat Pay</p>
-	</div>
-	<div style="text-align: center">
-		<img style="max-width: 100%" src="./docs/alipay.png" alt="Alipay" />
-		<p>Alipay</p>
-	</div>
-</div>
-
-## License
-MIT © [ChenZhaoYu](./license)
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
 # ChatGPT Web

-<div style="font-size: 1.5rem;">
-  <a href="./README.md">中文</a> |
-  <a href="./README.en.md">English</a>
-</div>
-</br>
-
 > 声明：此项目只发布于 Github，基于 MIT 协议，免费且作为开源学习使用。并且不会有任何形式的卖号、付费服务、讨论群、讨论组等行为。谨防受骗。

 ![cover](./docs/c1.png)
@@ -49,8 +43,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` 方式
@@ -161,6 +155,7 @@ pnpm dev
 - `OPENAI_API_KEY` 和 `OPENAI_ACCESS_TOKEN` 二选一
 - `OPENAI_API_MODEL`  设置模型，可选，默认：`gpt-3.5-turbo`
 - `OPENAI_API_BASE_URL` 设置接口地址，可选，默认：`https://api.openai.com`
+- `OPENAI_API_DISABLE_DEBUG` 设置接口关闭 debug 日志，可选，默认：empty 不关闭

 `ACCESS_TOKEN` 可用：

@@ -258,6 +253,8 @@ services:
 | `API_REVERSE_PROXY`   | 可选，`Web API` 时可用 | `Web API` 反向代理地址 [详情](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)    |
 | `SOCKS_PROXY_HOST`   | 可选，和 `SOCKS_PROXY_PORT` 一起时生效 | Socks代理    |
 | `SOCKS_PROXY_PORT`   | 可选，和 `SOCKS_PROXY_HOST` 一起时生效 | Socks代理端口    |
+| `SOCKS_PROXY_USERNAME`   | 可选，和 `SOCKS_PROXY_HOST` 一起时生效 | Socks代理用户名    |
+| `SOCKS_PROXY_PASSWORD`   | 可选，和 `SOCKS_PROXY_HOST` 一起时生效 | Socks代理密码    |
 | `HTTPS_PROXY`   | 可选 | HTTPS 代理，支持 http，https, socks5    |
 | `ALL_PROXY`   | 可选 | 所有代理 代理，支持 http，https, socks5    |

--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -2,33 +2,39 @@ version: '3'

 services:
  app:
+    container_name: chatgpt-web
    image: chenzhaoyu94/chatgpt-web # 总是使用latest,更新时重新pull该tag镜像即可
    ports:
      - 3002:3002
    environment:
      # 二选一
-      OPENAI_API_KEY: sk-xxx
+      OPENAI_API_KEY:
      # 二选一
-      OPENAI_ACCESS_TOKEN: xxx
+      OPENAI_ACCESS_TOKEN:
      # API接口地址，可选，设置 OPENAI_API_KEY 时可用
-      OPENAI_API_BASE_URL: xxx
+      OPENAI_API_BASE_URL:
      # API模型，可选，设置 OPENAI_API_KEY 时可用
-      OPENAI_API_MODEL: xxx
+      OPENAI_API_MODEL:
      # 反向代理，可选
-      API_REVERSE_PROXY: xxx
+      API_REVERSE_PROXY:
      # 访问权限密钥，可选
-      AUTH_SECRET_KEY: xxx
+      AUTH_SECRET_KEY:
      # 每小时最大请求次数，可选，默认无限
      MAX_REQUEST_PER_HOUR: 0
      # 超时，单位毫秒，可选
      TIMEOUT_MS: 60000
      # Socks代理，可选，和 SOCKS_PROXY_PORT 一起时生效
-      SOCKS_PROXY_HOST: xxx
+      SOCKS_PROXY_HOST:
      # Socks代理端口，可选，和 SOCKS_PROXY_HOST 一起时生效
-      SOCKS_PROXY_PORT: xxx
+      SOCKS_PROXY_PORT:
+      # Socks代理用户名，可选，和 SOCKS_PROXY_HOST & SOCKS_PROXY_PORT 一起时生效
+      SOCKS_PROXY_USERNAME:
+      # Socks代理密码，可选，和 SOCKS_PROXY_HOST & SOCKS_PROXY_PORT 一起时生效
+      SOCKS_PROXY_PASSWORD:
      # HTTPS_PROXY 代理，可选
-      HTTPS_PROXY: http://xxx:7890
+      HTTPS_PROXY:
  nginx:
+    container_name: nginx
    image: nginx:alpine
    ports:
      - '80:80'
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -0,0 +1,9 @@
+## 增加一个Kubernetes的部署方式
+```
+kubectl apply -f deploy.yaml
+```
+
+### 如果需要Ingress域名接入
+```
+kubectl apply -f ingress.yaml
+```
--- a/kubernetes/deploy.yaml
+++ b/kubernetes/deploy.yaml
@@ -0,0 +1,66 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: chatgpt-web
+  labels:
+    app: chatgpt-web
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chatgpt-web
+  strategy:
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: chatgpt-web
+    spec:
+      containers:
+        - image: chenzhaoyu94/chatgpt-web
+          name: chatgpt-web
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 3002
+          env:
+            - name: OPENAI_API_KEY
+              value: sk-xxx
+            - name: OPENAI_API_BASE_URL
+              value: 'https://api.openai.com'
+            - name: OPENAI_API_MODEL
+              value: gpt-3.5-turbo
+            - name: API_REVERSE_PROXY
+              value: https://bypass.churchless.tech/api/conversation
+            - name: AUTH_SECRET_KEY
+              value: '123456'
+            - name: TIMEOUT_MS
+              value: '60000'
+            - name: SOCKS_PROXY_HOST
+              value: ''
+            - name: SOCKS_PROXY_PORT
+              value: ''
+            - name: HTTPS_PROXY
+              value: ''
+          resources:
+            limits:
+              cpu: 500m
+              memory: 500Mi
+            requests:
+              cpu: 300m
+              memory: 300Mi
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: chatgpt-web
+  name: chatgpt-web
+spec:
+  ports:
+    - name: chatgpt-web
+      port: 3002
+      protocol: TCP
+      targetPort: 3002
+  selector:
+    app: chatgpt-web
+  type: ClusterIP
--- a/kubernetes/ingress.yaml
+++ b/kubernetes/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/proxy-connect-timeout: '5'
+  name: chatgpt-web
+spec:
+  rules:
+    - host: chatgpt.example.com
+      http:
+        paths:
+          - backend:
+              service:
+                name: chatgpt-web
+                port:
+                  number: 3002
+            path: /
+            pathType: ImplementationSpecific
+  tls:
+    - secretName: chatgpt-web-tls
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "chatgpt-web",
-  "version": "2.10.8",
+  "version": "2.10.9",
  "private": false,
  "description": "ChatGPT Web",
  "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/service/.env.example
+++ b/service/.env.example
@@ -10,7 +10,12 @@ OPENAI_API_BASE_URL=
 # OpenAI API Model - https://platform.openai.com/docs/models
 OPENAI_API_MODEL=

-# Reverse Proxy
+# set `true` to disable OpenAI API debug log
+OPENAI_API_DISABLE_DEBUG=
+
+# 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
@@ -28,6 +33,12 @@ SOCKS_PROXY_HOST=
 # Socks Proxy Port
 SOCKS_PROXY_PORT=

+# Socks Proxy Username
+SOCKS_PROXY_USERNAME=
+
+# Socks Proxy Password
+SOCKS_PROXY_PASSWORD=
+
 # HTTPS PROXY
 HTTPS_PROXY=

--- a/service/package.json
+++ b/service/package.json
@@ -25,7 +25,7 @@
  },
  "dependencies": {
    "axios": "^1.3.4",
-    "chatgpt": "^5.1.2",
+    "chatgpt": "^5.2.2",
    "dotenv": "^16.0.3",
    "esno": "^0.16.3",
    "express": "^4.18.2",
--- a/service/pnpm-lock.yaml
+++ b/service/pnpm-lock.yaml
--- a/service/src/chatgpt/index.ts
+++ b/service/src/chatgpt/index.ts
@@ -25,6 +25,7 @@ const ErrorCodeMessage: Record<string, string> = {
 }

 const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT_MS : 30 * 1000
+const disableDebug: boolean = process.env.OPENAI_API_DISABLE_DEBUG === 'true'

 let apiModel: ApiModel

@@ -44,7 +45,7 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
    const options: ChatGPTAPIOptions = {
      apiKey: process.env.OPENAI_API_KEY,
      completionParams: { model },
-      debug: true,
+      debug: !disableDebug,
    }

    // increase max token limit if use gpt-4
@@ -72,13 +73,15 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
    const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
    const options: ChatGPTUnofficialProxyAPIOptions = {
      accessToken: process.env.OPENAI_ACCESS_TOKEN,
-      debug: true,
+      debug: !disableDebug,
    }
+
    if (isNotEmptyString(OPENAI_API_MODEL))
      options.model = OPENAI_API_MODEL

-    if (isNotEmptyString(process.env.API_REVERSE_PROXY))
-      options.apiReverseProxyUrl = process.env.API_REVERSE_PROXY
+    options.apiReverseProxyUrl = isNotEmptyString(process.env.API_REVERSE_PROXY)
+      ? process.env.API_REVERSE_PROXY
+      : 'https://bypass.churchless.tech/api/conversation'

    setupProxy(options)

@@ -158,17 +161,19 @@ async function chatConfig() {
 }

 function setupProxy(options: ChatGPTAPIOptions | ChatGPTUnofficialProxyAPIOptions) {
-  if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) {
+  if (isNotEmptyString(process.env.SOCKS_PROXY_HOST) && isNotEmptyString(process.env.SOCKS_PROXY_PORT)) {
    const agent = new SocksProxyAgent({
      hostname: process.env.SOCKS_PROXY_HOST,
      port: process.env.SOCKS_PROXY_PORT,
+      userId: isNotEmptyString(process.env.SOCKS_PROXY_USERNAME) ? process.env.SOCKS_PROXY_USERNAME : undefined,
+      password: isNotEmptyString(process.env.SOCKS_PROXY_PASSWORD) ? process.env.SOCKS_PROXY_PASSWORD : undefined,
    })
    options.fetch = (url, options) => {
      return fetch(url, { agent, ...options })
    }
  }
  else {
-    if (process.env.HTTPS_PROXY || process.env.ALL_PROXY) {
+    if (isNotEmptyString(process.env.HTTPS_PROXY) || isNotEmptyString(process.env.ALL_PROXY)) {
      const httpsProxy = process.env.HTTPS_PROXY || process.env.ALL_PROXY
      if (httpsProxy) {
        const agent = new HttpsProxyAgent(httpsProxy)
--- a/service/src/index.ts
+++ b/service/src/index.ts
@@ -25,21 +25,12 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
  try {
    const { prompt, options = {}, systemMessage } = req.body as RequestProps
    let firstChunk = true
-    let chatLength = 0
-    let newChatLength = 0
    await chatReplyProcess({
      message: prompt,
      lastContext: options,
      process: (chat: ChatMessage) => {
-        if (firstChunk) {
-          res.write(`${JSON.stringify(chat)}t1h1i4s5i1s4a1s9i1l9l8y1s0plit`)
-          firstChunk = false
-        }
-        else if (chatLength !== chat.text.length) {
-          newChatLength = chat.text.length
-          res.write(chat.text.substring(chatLength, newChatLength))
-          chatLength = newChatLength
-        }
+        res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`)
+        firstChunk = false
      },
      systemMessage,
    })
@@ -85,7 +76,7 @@ router.post('/verify', async (req, res) => {
    res.send({ status: 'Success', message: 'Verify successfully', data: null })
  }
  catch (error) {
-    res.send({ status: 'Fail', message: error.messagen, data: null })
+    res.send({ status: 'Fail', message: error.message, data: null })
  }
 })

--- a/src/components/common/Setting/Advanced.vue
+++ b/src/components/common/Setting/Advanced.vue
@@ -29,7 +29,7 @@ function handleReset() {
      <div class="flex items-center space-x-4">
        <span class="flex-shrink-0 w-[100px]">{{ $t('setting.role') }}</span>
        <div class="flex-1">
-          <NInput v-model:value="systemMessage" placeholder="" />
+          <NInput v-model:value="systemMessage" type="textarea" :autosize="{ minRows: 1, maxRows: 4 }" />
        </div>
        <NButton size="tiny" text type="primary" @click="updateSettings({ systemMessage })">
          {{ $t('common.save') }}
--- a/src/store/modules/settings/helper.ts
+++ b/src/store/modules/settings/helper.ts
@@ -7,9 +7,8 @@ export interface SettingsState {
 }

 export function defaultSetting(): SettingsState {
-  const currentDate = new Date().toISOString().split('T')[0]
  return {
-    systemMessage: `You are ChatGPT, a large language model trained by OpenAI. Answer as concisely as possible.\nKnowledge cutoff: 2021-09-01\nCurrent date: ${currentDate}`,
+    systemMessage: 'You are ChatGPT, a large language model trained by OpenAI. Follow the user\'s instructions carefully. Respond using markdown.',
  }
 }

--- a/src/styles/lib/highlight.less
+++ b/src/styles/lib/highlight.less
@@ -123,7 +123,10 @@ html {
 	}

 	code.hljs {
-		padding: 3px 5px
+		padding: 3px 5px;
+		&::-webkit-scrollbar {
+			height: 4px;
+		}
 	}

 	.hljs {
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -65,18 +65,14 @@ defineExpose({ textRef })

 <template>
  <div class="text-black" :class="wrapClass">
-    <template v-if="loading">
-      <span class="dark:text-white w-[4px] h-[20px] block animate-blink" />
-    </template>
-    <template v-else>
-      <div ref="textRef" class="leading-relaxed break-words">
-        <div v-if="!inversion">
-          <div v-if="!asRawText" class="markdown-body" v-html="text" />
-          <div v-else class="whitespace-pre-wrap" v-text="text" />
-        </div>
-        <div v-else class="whitespace-pre-wrap" v-text="text" />
+    <div ref="textRef" class="leading-relaxed break-words">
+      <div v-if="!inversion" class="flex items-end">
+        <div v-if="!asRawText" class="w-full markdown-body" v-html="text" />
+        <div v-else class="w-full whitespace-pre-wrap" v-text="text" />
+        <span v-if="loading" class="dark:text-white w-[4px] h-[20px] block animate-blink" />
      </div>
-    </template>
+      <div v-else class="whitespace-pre-wrap" v-text="text" />
+    </div>
  </div>
 </template>

--- a/src/views/chat/index.vue
+++ b/src/views/chat/index.vue
@@ -107,9 +107,7 @@ async function onConversation() {
  scrollToBottom()

  try {
-    const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
-    let renderText = ''
-    let firstTime = true
+    let lastText = ''
    const fetchChatAPIOnce = async () => {
      await fetchChatAPIProcess<Chat.ConversationResponse>({
        prompt: message,
@@ -119,49 +117,43 @@ async function onConversation() {
          const xhr = event.target
          const { responseText } = xhr
          // Always process the final line
+          const lastIndex = responseText.lastIndexOf('\n', responseText.length - 2)
+          let chunk = responseText
+          if (lastIndex !== -1)
+            chunk = responseText.substring(lastIndex)
+          try {
+            const data = JSON.parse(chunk)
+            updateChat(
+              +uuid,
+              dataSources.value.length - 1,
+              {
+                dateTime: new Date().toLocaleString(),
+                text: lastText + (data.text ?? ''),
+                inversion: false,
+                error: false,
+                loading: true,
+                conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+                requestOptions: { prompt: message, options: { ...options } },
+              },
+            )

-          const splitIndexBegin = responseText.search(magicSplit)
-          if (splitIndexBegin !== -1) {
-            const splitIndexEnd = splitIndexBegin + magicSplit.length
-
-            const firstChunk = responseText.substring(0, splitIndexBegin)
-            const deltaText = responseText.substring(splitIndexEnd)
-            try {
-              const data = JSON.parse(firstChunk)
-              if (firstTime) {
-                firstTime = false
-                renderText = data.text ?? ''
-              }
-              else {
-                renderText = deltaText ?? ''
-              }
-              updateChat(
-                +uuid,
-                dataSources.value.length - 1,
-                {
-                  dateTime: new Date().toLocaleString(),
-                  text: renderText,
-                  inversion: false,
-                  error: false,
-                  loading: false,
-                  conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-                  requestOptions: { prompt: message, ...options },
-                },
-              )
-
-              if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
-                options.parentMessageId = data.id
-                message = ''
-                return fetchChatAPIOnce()
-              }
-            }
-            catch (error) {
-              //
+            if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
+              options.parentMessageId = data.id
+              lastText = data.text
+              message = ''
+              return fetchChatAPIOnce()
            }
+
+            scrollToBottomIfAtBottom()
+          }
+          catch (error) {
+            //
          }
        },
      })
+      updateChatSome(+uuid, dataSources.value.length - 1, { loading: false })
    }
+
    await fetchChatAPIOnce()
  }
  catch (error: any) {
@@ -246,9 +238,7 @@ async function onRegenerate(index: number) {
  )

  try {
-    const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
-    let renderText = ''
-    let firstTime = true
+    let lastText = ''
    const fetchChatAPIOnce = async () => {
      await fetchChatAPIProcess<Chat.ConversationResponse>({
        prompt: message,
@@ -258,48 +248,39 @@ async function onRegenerate(index: number) {
          const xhr = event.target
          const { responseText } = xhr
          // Always process the final line
+          const lastIndex = responseText.lastIndexOf('\n', responseText.length - 2)
+          let chunk = responseText
+          if (lastIndex !== -1)
+            chunk = responseText.substring(lastIndex)
+          try {
+            const data = JSON.parse(chunk)
+            updateChat(
+              +uuid,
+              index,
+              {
+                dateTime: new Date().toLocaleString(),
+                text: lastText + (data.text ?? ''),
+                inversion: false,
+                error: false,
+                loading: true,
+                conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+                requestOptions: { prompt: message, ...options },
+              },
+            )

-          const splitIndexBegin = responseText.search(magicSplit)
-          if (splitIndexBegin !== -1) {
-            const splitIndexEnd = splitIndexBegin + magicSplit.length
-
-            const firstChunk = responseText.substring(0, splitIndexBegin)
-            const deltaText = responseText.substring(splitIndexEnd)
-            try {
-              const data = JSON.parse(firstChunk)
-              if (firstTime) {
-                firstTime = false
-                renderText = data.text ?? ''
-              }
-              else {
-                renderText = deltaText ?? ''
-              }
-              updateChat(
-                +uuid,
-                index,
-                {
-                  dateTime: new Date().toLocaleString(),
-                  text: renderText,
-                  inversion: false,
-                  error: false,
-                  loading: false,
-                  conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-                  requestOptions: { prompt: message, ...options },
-                },
-              )
-
-              if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
-                options.parentMessageId = data.id
-                message = ''
-                return fetchChatAPIOnce()
-              }
-            }
-            catch (error) {
-              //
+            if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
+              options.parentMessageId = data.id
+              lastText = data.text
+              message = ''
+              return fetchChatAPIOnce()
            }
          }
+          catch (error) {
+            //
+          }
        },
      })
+      updateChatSome(+uuid, index, { loading: false })
    }
    await fetchChatAPIOnce()
  }
@@ -488,13 +469,16 @@ onUnmounted(() => {
 <template>
  <div class="flex flex-col w-full h-full">
    <HeaderComponent
-      v-if="isMobile" :using-context="usingContext" @export="handleExport"
+      v-if="isMobile"
+      :using-context="usingContext"
+      @export="handleExport"
      @toggle-using-context="toggleUsingContext"
    />
    <main class="flex-1 overflow-hidden">
      <div id="scrollRef" ref="scrollRef" class="h-full overflow-hidden overflow-y-auto">
        <div
-          id="image-wrapper" class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
+          id="image-wrapper"
+          class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
          :class="[isMobile ? 'p-2' : 'p-4']"
        >
          <template v-if="!dataSources.length">
@@ -506,8 +490,14 @@ onUnmounted(() => {
          <template v-else>
            <div>
              <Message
-                v-for="(item, index) of dataSources" :key="index" :date-time="item.dateTime" :text="item.text"
-                :inversion="item.inversion" :error="item.error" :loading="item.loading" @regenerate="onRegenerate(index)"
+                v-for="(item, index) of dataSources"
+                :key="index"
+                :date-time="item.dateTime"
+                :text="item.text"
+                :inversion="item.inversion"
+                :error="item.error"
+                :loading="item.loading"
+                @regenerate="onRegenerate(index)"
                @delete="handleDelete(index)"
              />
              <div class="sticky bottom-0 left-0 flex justify-center">
@@ -544,9 +534,15 @@ onUnmounted(() => {
          <NAutoComplete v-model:value="prompt" :options="searchOptions" :render-label="renderOption">
            <template #default="{ handleInput, handleBlur, handleFocus }">
              <NInput
-                ref="inputRef" v-model:value="prompt" type="textarea" :placeholder="placeholder"
-                :autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }" @input="handleInput" @focus="handleFocus"
-                @blur="handleBlur" @keypress="handleEnter"
+                ref="inputRef"
+                v-model:value="prompt"
+                type="textarea"
+                :placeholder="placeholder"
+                :autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }"
+                @input="handleInput"
+                @focus="handleFocus"
+                @blur="handleBlur"
+                @keypress="handleEnter"
              />
            </template>
          </NAutoComplete>
Author	SHA1	Message	Date
ChenZhaoYu	a7c97026b7	chore: v2.10.9	2023-04-03 09:46:46 +08:00
ChenZhaoYu	0ff7825387	chore: update README.md	2023-04-03 09:21:08 +08:00
ChenZhaoYu	c2b25a84c7	chore: default API_REVERSE_PROXY	2023-04-03 09:19:12 +08:00
ChenZhaoYu	553e239db3	chore: update .env.examples	2023-04-03 09:01:56 +08:00
idawnwon	e3a3e4dc29	fix: Update @acheong08 Reverse Proxy URL (#1085 )	2023-04-03 08:53:52 +08:00
ChenZhaoYu	4e4e41b0d6	chore: update deps	2023-04-03 08:51:04 +08:00
vchenpeng	5594b0baa9	fix: 空引用显示undefined (#1103 ) Co-authored-by: peng.chen <peng.chen@freemud.com>	2023-04-03 08:48:59 +08:00
Fog3211	e2ad3fe248	fix: x-scrollbar height (#1153 ) Co-authored-by: Fog3211 <23151576+Fog3211@users.noreply.github.com>	2023-04-03 08:25:07 +08:00
ChenZhaoYu	9bd88eac84	fix: 宽度问题	2023-03-31 14:52:54 +08:00
ChenZhaoYu	431de382dc	perf: input auto size	2023-03-31 14:43:40 +08:00
ChenZhaoYu	b241240fc6	perf: 默认 systemMessage	2023-03-31 13:42:16 +08:00
ChenZhaoYu	40fa028408	fix: some error	2023-03-31 13:37:07 +08:00
ChenZhaoYu	15f3aac88e	perf: 调整光标位置	2023-03-31 13:20:55 +08:00
Hank	90f0c3a80b	feat: add socks username/password config (#890 ) Co-authored-by: Redon <790348264@qq.com>	2023-03-31 13:09:51 +08:00
ChenZhaoYu	d2a852d5eb	chore: .eslintignore	2023-03-31 13:05:30 +08:00
yimiaoxiehou	85543deca3	feat: 添加 socks5 代理认证 (#999 ) * support socks5 proxy auth * Update build_docker.yml * Update README.md * perf: 增加判断 * fix: lint --------- Co-authored-by: ChenZhaoYu <790348264@qq.com>	2023-03-31 12:23:26 +08:00
ChenZhaoYu	142759ac50	chore: lint fix	2023-03-31 11:53:10 +08:00
Miku	da20aed4b0	feat: add kubernetes deploy (#1001 )	2023-03-31 11:52:10 +08:00
puppywang	c0f4af05e3	feat: add typing effect (#1017 ) * feat: add typing effect * fix: ts2339 xxx not exist on type 'never' --------- Co-authored-by: WangYi <wangyi@windimg.com>	2023-03-31 11:50:32 +08:00
cong	468bed7705	feat: allow user disable openai API debug log (#1041 ) * feat: allow user disable openai API debug log * chore: fix pnpm lock	2023-03-31 11:40:01 +08:00
LOVECHEN	0878af0239	perf: 加入容器名字 (#1035 ) 这样查看服务的时候会更优雅	2023-03-31 11:34:31 +08:00
ChenZhaoYu	aa0487edc4	chore: gitHub action	2023-03-29 16:21:08 +08:00