Compare commits

...

62 Commits

Author SHA1 Message Date
ChenZhaoYu
88740c13f0 test: output 2023-03-28 16:11:52 +08:00
ChenZhaoYu
76cef650b4 chore: build rollback 2023-03-28 16:06:11 +08:00
assassinliujie
78bcf7f4ce perf: optimized output (#962)
* Update index.ts

* Update index.vue

* Update index.ts
2023-03-28 15:47:40 +08:00
ChenZhaoYu
c0a9fd5208 fix: 快速按下删除会话导致的问题 #917 2023-03-28 13:48:49 +08:00
ChenZhaoYu
07123b70ad chore: rolled back to clear the impact 2023-03-28 13:20:55 +08:00
assassinliujie
b579d24d19 pref: message output optimization (#935)
* Update index.ts

修改后端,让保留打字机效果的同时优化前后端之间传输的内容,节省流量和性能

* Update index.vue

修改前端,和之前修改的后端匹配,保留打字机效果同时优化性能和流量传输

* chore: lint fix

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-28 09:40:20 +08:00
KingTwinkle
e2eeee455a fix: local import error and NModal not as expected (#938) 2023-03-28 09:34:15 +08:00
weifeng
32ad20416c chore: Update README.md (#880)
* Update README.md

docker-compose 文件中注释掉未使用的配置节点,因为 留xxx 会导代码读取节点内容值为xxx,而不是期望的默认值,导致代码运行异常
增加 对模型可选参数的备注

* style: eslint fix

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-27 15:58:54 +08:00
吴杉(Shan Wu)
799af86739 perf: add localization for sider (#911) 2023-03-27 15:49:42 +08:00
ChenZhaoYu
c3f431118b chore: update docs 2023-03-26 10:08:01 +08:00
zaimoe
a3944f86b7 fix: missing VITE_GLOB_API_URL when docker build, fixed #690 #717 # (#877) 2023-03-25 17:23:57 +08:00
Yige
365a7df1ff Merge pull request #883 from yi-ge/dev-main
docs: 更新README.md,添加长回复使用方法
2023-03-25 17:06:20 +08:00
yi-ge
639152f987 docs: update README.md, add long reply feature 2023-03-25 17:01:12 +08:00
gitgitgogogo
fb8ad3790d fix: 反向代理限流失效 (#863)
https://docs.colyseus.io/zh_hk/colyseus/how-to/rate-limit/

使用nginx限流会只识别为服务器ip,需启用trust proxy
2023-03-25 08:30:15 +08:00
ChenZhaoYu
902321026b perf: 本地地址 2023-03-24 08:14:51 +08:00
ChenZhaoYu
9b0d7dbee8 fix: 移动端焦点不触发的问题 2023-03-23 21:12:36 +08:00
ChenZhaoYu
634c879108 perf: 自动焦点时移动端上的不便 2023-03-23 20:51:20 +08:00
Kid
57a1d6e3cd fix: ESM error (#826) 2023-03-23 20:43:47 +08:00
ChenZhaoYu
9081b22ce9 perf: 移动端删除 chat 时,侧边栏应该收起 2023-03-23 16:56:59 +08:00
Redon
73e12b1fdd fix: 移动端新建会话关闭侧边栏 (#813) 2023-03-23 16:23:57 +08:00
Bing
5fca2e9fa3 fix: PWA 未添加的问题 (#807)
Co-authored-by: bingo235 <>
2023-03-23 15:55:51 +08:00
ChenZhaoYu
917feec5d8 fix: 重置时应该移除本地储存 2023-03-23 14:50:36 +08:00
ChenZhaoYu
c52195cef8 chore: v2.10.8 2023-03-23 14:26:37 +08:00
ChenZhaoYu
630e88b8c4 fix: prompt store 样式问题 2023-03-23 14:04:06 +08:00
Peter Dave Hello
734eb7a3fb feat: add zh-TW prompts in the Promt Store (#796) 2023-03-23 13:57:26 +08:00
东子
e55fc06686 docs: fix docker port to private (#802) 2023-03-23 13:56:52 +08:00
ChenZhaoYu
5fee11323b perf: 网络连接时 500 自动跳转到主页 2023-03-22 20:01:39 +08:00
Allen
814c3a2565 feat: 切换 history 时自动聚焦输入框 (#735)
* feat: 修改 scrollToBottom 行为(当滚动条在底部或发送问题时才会进入自动滚动,滚轮向上滚动会中止自动滚动,方便复制和查看之前的代码; 切换 history 时自动聚焦输入框,方便直接输入文字,不用再次去点击输入框;)

* chore: 通过eslint检查

* perf: 清理重复功能

---------

Co-authored-by: Redon <790348264@qq.com>
2023-03-22 19:53:21 +08:00
ChenZhaoYu
d2a22a3ee5 feat: PWA 默认不开启 2023-03-22 19:42:40 +08:00
Yi
92278932ef chore: 显示原文时使用 .whitespace-pre-wrap (#779)
显示 ChatGPT 输出的原文时保留空格和换行
2023-03-22 19:42:01 +08:00
hncboy
9c6a3d6110 feat: 增加 ChatGPTUnofficialProxyAPI 的模型自定义配置 (#632)
* feat: 增加 ChatGPTUnofficialProxyAPI 的模型自定义配置(#618)

* perf: 修改判断

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-22 19:00:58 +08:00
Liut
e30217542d fix line end with new-line in some backend (#474)
* fix line end with new-line in some backend

In backend with golang (like https://github.com/sashabaranov/go-openai), the responseText always has '\n'.

* feat: 补全遗漏

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-22 18:49:40 +08:00
KeepRunning
1edf591721 chore(vsc-debug): 增加 visual-studio-code 的 debug 启动文件 (#296) 2023-03-22 18:35:10 +08:00
vulgate
60fd2ae0e0 feat: Create start.cmd (#656)
在windows下也可以运行
2023-03-22 18:31:52 +08:00
吴杉(Shan Wu)
3e509f6663 feat: 当用gpt-4的API 时增加可用的 Max Tokens (#729)
* fix: 用GPT-4 API时增加max token

* style: eslint fix

---------

Co-authored-by: Redon <790348264@qq.com>
2023-03-22 18:31:04 +08:00
ChenZhaoYu
bf48eae9fe feat: 更新依赖并兼容已存在的代理 2023-03-22 18:23:31 +08:00
舜岳
31a84325d4 perf: scrollToBottom 改成 scrollToBottomIfAtBottom (#771) 2023-03-22 18:00:53 +08:00
舜岳
b1d0056429 perf: 重置回答时滚动定位至该回答 (#781)
* chore: 重置回答时滚动定位至该回答

* perf: format code

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-22 17:54:29 +08:00
quzard
6ecc61ac5d feat: 添加角色设定预留API 设定页(#768)
* add systemMessage

* perf: 优化代码和类型

* perf: 补全翻译和为以后做准备

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-22 17:47:07 +08:00
xiaozhu
e02ab1fbad feat: 新增限流功能 (#718)
* 请求速率限制

* perf: 优化代码

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-21 09:20:27 +08:00
Yi
47dc009505 feat: 添加用于显示回复消息原文的选项 (#672)
* feat: 添加显示用于原文的选项

* chore: 修复暗色主题下文本颜色问题

给输入和输出气泡添加了 css 类,用来处理在暗色主题下聊天气泡的文本颜色

* feat: 用户输入不应该被渲染,防止 xss

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-21 08:44:40 +08:00
ChenZhaoYu
f1584b60e8 fix: 手动重置异常的 loading 2023-03-19 18:12:49 +08:00
ChenZhaoYu
d1c15f58c4 perf: config 接口添加权限验证 2023-03-19 12:31:14 +08:00
ChenZhaoYu
d422a805f6 feat: 渲染的链接新窗口打开 2023-03-17 16:06:55 +08:00
ChenZhaoYu
08b5772420 feat: 查询余额使用 API_BASE_URL 参数 2023-03-17 13:19:03 +08:00
ChenZhaoYu
8fad91ade7 chore: v2.10.7 2023-03-17 11:43:42 +08:00
ChenZhaoYu
560378fd45 fix: 添加 usingContext 缺省 2023-03-17 11:40:05 +08:00
ChenZhaoYu
95ce026813 fix: 回退 chatgpt 版本导致的代理失效 2023-03-17 11:37:33 +08:00
ChenZhaoYu
71c5a88c01 chore: v2.10.6 2023-03-17 10:01:35 +08:00
ChenZhaoYu
a8e9a24ca7 fix: highlight.js 控制台兼容性警告 2023-03-17 09:49:43 +08:00
ChenZhaoYu
95724845cf feat: session 返回接口方式做显示判断 2023-03-17 09:36:12 +08:00
ChenZhaoYu
c5552893d7 chore: update deps and lint fix 2023-03-17 09:25:16 +08:00
pzcn
e46d3685a0 feat: show api balance (#582)
* feat: show api balance

* Update index.ts

* 保留小数点后五位

* perf: 判断优化

---------

Co-authored-by: Redon <790348264@qq.com>
2023-03-17 09:21:25 +08:00
ChenZhaoYu
116ed7b0bf docs: 移除 docker-compose.yml 省略 2023-03-17 08:59:49 +08:00
ChenZhaoYu
2ad7567548 perf: 优化部份判断 2023-03-17 08:57:27 +08:00
ChenZhaoYu
b3cfe7a976 perf: 记录上下文设定保存到本地 2023-03-17 08:40:45 +08:00
Kirk Lin
0b13846861 chore: extract proxy setup code into reusable function (#583) 2023-03-17 08:26:16 +08:00
CornerSkyless
951e9d8d39 perf: 优化移动端 prompt 商店样式 (#608)
* feat: 修改移动端 prompt 商店样式

* add: 修改移动端 prompt 商店样式

* perf: 清理代码

---------

Co-authored-by: ChenZhaoYu <790348264@qq.com>
2023-03-17 08:14:31 +08:00
碎花爱洋裙
1411c45811 fix: typo (#636) 2023-03-17 08:04:11 +08:00
Hayden Chen
c797ff5cb3 fix: 🐛 fix scroll bar style (#617) 2023-03-16 11:51:07 +08:00
Wisdom
25692f8371 fix: inverted parameter for before each function (#585) 2023-03-15 08:46:11 +08:00
ChenZhaoYu
3a1466bace fix: 修复导入、导出错误 2023-03-14 08:28:43 +08:00
56 changed files with 1140 additions and 515 deletions

View File

@@ -4,3 +4,4 @@ node_modules
Dockerfile Dockerfile
.* .*
*/.* */.*
!.env

5
.env
View File

@@ -1,7 +1,10 @@
# Glob API URL # Glob API URL
VITE_GLOB_API_URL=/api VITE_GLOB_API_URL=/api
VITE_APP_API_BASE_URL=http://localhost:3002/ VITE_APP_API_BASE_URL=http://127.0.0.1:3002/
# Whether long replies are supported, which may result in higher API fees # Whether long replies are supported, which may result in higher API fees
VITE_GLOB_OPEN_LONG_REPLY=false VITE_GLOB_OPEN_LONG_REPLY=false
# When you want to use PWA
VITE_GLOB_APP_PWA=false

25
.vscode/launch.json vendored Normal file
View File

@@ -0,0 +1,25 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Web App",
"url": "http://localhost:1002",
"webRoot": "${workspaceFolder}"
},
{
"type": "node",
"request": "launch",
"name": "Launch Service Server",
"runtimeExecutable": "${workspaceFolder}/service/node_modules/.bin/esno",
"skipFiles": ["<node_internals>/**"],
"program": "${workspaceFolder}/service/src/index.ts",
"outFiles": ["${workspaceFolder}/service/**/*.js"],
"envFile": "${workspaceFolder}/service/.env"
}
]
}

View File

@@ -37,6 +37,7 @@
"linkify", "linkify",
"logprobs", "logprobs",
"mdhljs", "mdhljs",
"mila",
"nodata", "nodata",
"OPENAI", "OPENAI",
"pinia", "pinia",

View File

@@ -1,3 +1,72 @@
## v2.10.8
`2023-03-23`
如遇问题,请删除 `node_modules` 重新安装依赖。
## Feature
- 显示回复消息原文的选项 [[yilozt](https://github.com/Chanzhaoyu/chatgpt-web/pull/672)]
- 添加单 `IP` 每小时请求限制。环境变量: `MAX_REQUEST_PER_HOUR` [[zhuxindong ](https://github.com/Chanzhaoyu/chatgpt-web/pull/718)]
- 前端添加角色设定,仅 `API` 方式可见 [[quzard](https://github.com/Chanzhaoyu/chatgpt-web/pull/768)]
- `OPENAI_API_MODEL` 变量现在对 `ChatGPTUnofficialProxyAPI` 也生效,注意:`Token``API` 的模型命名不一致,不能直接填入 `gpt-3.5` 或者 `gpt-4` [[hncboy](https://github.com/Chanzhaoyu/chatgpt-web/pull/632)]
- 添加繁体中文 `Prompts` [[PeterDaveHello](https://github.com/Chanzhaoyu/chatgpt-web/pull/796)]
## Enhancement
- 重置回答时滚动定位至该回答 [[shunyue1320](https://github.com/Chanzhaoyu/chatgpt-web/pull/781)]
-`API``gpt-4` 时增加可用的 `Max Tokens` [[simonwu53](https://github.com/Chanzhaoyu/chatgpt-web/pull/729)]
- 判断和忽略回复字符 [[liut](https://github.com/Chanzhaoyu/chatgpt-web/pull/474)]
- 切换会话时,自动聚焦输入框 [[JS-an](https://github.com/Chanzhaoyu/chatgpt-web/pull/735)]
- 渲染的链接新窗口打开
- 查询余额可选 `API_BASE_URL` 代理地址
- `config` 接口添加验证防止被无限制调用
- `PWA` 默认不开启,现在需手动修改 `.env` 文件 `VITE_GLOB_APP_PWA` 变量
- 当网络连接时,刷新页面,`500` 错误页自动跳转到主页
## BugFix
- `scrollToBottom` 调回 `scrollToBottomIfAtBottom` [[shunyue1320](https://github.com/Chanzhaoyu/chatgpt-web/pull/771)]
- 重置异常的 `loading` 会话
## Common
- 创建 `start.cmd``windows` 下也可以运行 [vulgatecnn](https://github.com/Chanzhaoyu/chatgpt-web/pull/656)]
- 添加 `visual-studio-code` 中调试配置 [[ChandlerVer5](https://github.com/Chanzhaoyu/chatgpt-web/pull/296)]
- 修复文档中 `docker` 端口为本地 [[kilvn](https://github.com/Chanzhaoyu/chatgpt-web/pull/802)]
## Other
- 依赖更新
## v2.10.7
`2023-03-17`
## BugFix
- 回退 `chatgpt` 版本,原因:导致 `OPENAI_API_BASE_URL` 代理失效
- 修复缺省状态的 `usingContext` 默认值
## v2.10.6
`2023-03-17`
## Feature
- 显示 `API` 余额 [[pzcn](https://github.com/Chanzhaoyu/chatgpt-web/pull/582)]
## Enhancement
- 美化滚动条样式和 `UI` 保持一致 [[haydenull](https://github.com/Chanzhaoyu/chatgpt-web/pull/617)]
- 优化移动端 `Prompt` 样式 [[CornerSkyless](https://github.com/Chanzhaoyu/chatgpt-web/pull/608)]
- 上下文开关改为全局开关,现在记录在本地缓存中
- 配置信息按接口类型显示
## Perf
- 优化函数方法 [[kirklin](https://github.com/Chanzhaoyu/chatgpt-web/pull/583)]
- 字符错误 [[pdsuwwz](https://github.com/Chanzhaoyu/chatgpt-web/pull/585)]
- 文档描述错误 [[lizhongyuan3](https://github.com/Chanzhaoyu/chatgpt-web/pull/636)]
## BugFix
- 修复 `Prompt` 导入、导出兼容性错误
- 修复 `highlight.js` 控制台兼容性警告
## Other
- 依赖更新
## v2.10.5 ## v2.10.5
`2023-03-13` `2023-03-13`

View File

@@ -185,10 +185,10 @@ pnpm dev
docker build -t chatgpt-web . docker build -t chatgpt-web .
# foreground operation # foreground operation
docker run --name chatgpt-web --rm -it -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web 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 # background operation
docker run --name chatgpt-web -d -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web docker run --name chatgpt-web -d -p 127.0.0.1:3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
# running address # running address
http://localhost:3002/ http://localhost:3002/
@@ -205,7 +205,7 @@ services:
app: app:
image: chenzhaoyu94/chatgpt-web # always use latest, pull the tag image again when updating image: chenzhaoyu94/chatgpt-web # always use latest, pull the tag image again when updating
ports: ports:
- 3002:3002 - 127.0.0.1:3002:3002
environment: environment:
# one of two # one of two
OPENAI_API_KEY: xxxxxx OPENAI_API_KEY: xxxxxx
@@ -277,7 +277,7 @@ PS: You can also run `pnpm start` directly on the server without packaging.
#### Frontend webpage #### Frontend webpage
1. Refer to the root directory `.env.example` file content to create `.env` file, modify `VITE_APP_API_BASE_URL` in `.env` at the root directory to your actual backend interface address. 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. 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) [Reference information](https://cn.vitejs.dev/guide/static-deploy.html#building-the-app)
@@ -304,6 +304,10 @@ 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. 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 ## Contributing
Please read the [Contributing Guidelines](./CONTRIBUTING.en.md) before contributing. Please read the [Contributing Guidelines](./CONTRIBUTING.en.md) before contributing.

View File

@@ -56,7 +56,7 @@
1. 你应该首先使用 `API` 方式 1. 你应该首先使用 `API` 方式
2. 使用 `API` 时,如果网络不通,那是国内被墙了,你需要自建代理,绝对不要使用别人的公开代理,那是危险的。 2. 使用 `API` 时,如果网络不通,那是国内被墙了,你需要自建代理,绝对不要使用别人的公开代理,那是危险的。
3. 使用 `accessToken` 方式时反向代理将向第三方暴露您的访问令牌,这样做应该不会产生任何不良影响,但在使用这种方法之前请考虑风险。 3. 使用 `accessToken` 方式时反向代理将向第三方暴露您的访问令牌,这样做应该不会产生任何不良影响,但在使用这种方法之前请考虑风险。
4. 使用 `accessToken` 时,不管你是国内还是国外的机器,都会使用代理。默认代理为 [acheong08](https://github.com/acheong08) 大佬的 `https://bypass.duti.tech/api/conversation`,这不是后门也不是监听,除非你有能力自己翻过 `CF` 验证,用前请知悉。[社区代理](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)(注意:只有这两个是推荐,其他第三方来源,请自行甄别) 4. 使用 `accessToken` 时,不管你是国内还是国外的机器,都会使用代理。默认代理为 [acheong08](https://github.com/acheong08) 大佬的 `https://bypass.churchless.tech/api/conversation`,这不是后门也不是监听,除非你有能力自己翻过 `CF` 验证,用前请知悉。[社区代理](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)(注意:只有这两个是推荐,其他第三方来源,请自行甄别)
5. 把项目发布到公共网络时,你应该设置 `AUTH_SECRET_KEY` 变量添加你的密码访问权限,你也应该修改 `index.html` 中的 `title`,防止被关键词搜索到。 5. 把项目发布到公共网络时,你应该设置 `AUTH_SECRET_KEY` 变量添加你的密码访问权限,你也应该修改 `index.html` 中的 `title`,防止被关键词搜索到。
切换方式: 切换方式:
@@ -165,11 +165,12 @@ pnpm dev
`ACCESS_TOKEN` 可用: `ACCESS_TOKEN` 可用:
- `OPENAI_ACCESS_TOKEN``OPENAI_API_KEY` 二选一,同时存在时,`OPENAI_API_KEY` 优先 - `OPENAI_ACCESS_TOKEN``OPENAI_API_KEY` 二选一,同时存在时,`OPENAI_API_KEY` 优先
- `API_REVERSE_PROXY` 设置反向代理,可选,默认:`https://bypass.duti.tech/api/conversation`[社区](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)(注意:只有这两个是推荐,其他第三方来源,请自行甄别) - `API_REVERSE_PROXY` 设置反向代理,可选,默认:`https://bypass.churchless.tech/api/conversation`[社区](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)(注意:只有这两个是推荐,其他第三方来源,请自行甄别)
通用: 通用:
- `AUTH_SECRET_KEY` 访问权限密钥,可选 - `AUTH_SECRET_KEY` 访问权限密钥,可选
- `MAX_REQUEST_PER_HOUR` 每小时最大请求次数,可选,默认无限
- `TIMEOUT_MS` 超时,单位毫秒,可选 - `TIMEOUT_MS` 超时,单位毫秒,可选
- `SOCKS_PROXY_HOST``SOCKS_PROXY_PORT` 一起时生效,可选 - `SOCKS_PROXY_HOST``SOCKS_PROXY_PORT` 一起时生效,可选
- `SOCKS_PROXY_PORT``SOCKS_PROXY_HOST` 一起时生效,可选 - `SOCKS_PROXY_PORT``SOCKS_PROXY_HOST` 一起时生效,可选
@@ -190,10 +191,10 @@ pnpm dev
docker build -t chatgpt-web . docker build -t chatgpt-web .
# 前台运行 # 前台运行
docker run --name chatgpt-web --rm -it -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web docker run --name chatgpt-web --rm -it -p 127.0.0.1:3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
# 后台运行 # 后台运行
docker run --name chatgpt-web -d -p 3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web docker run --name chatgpt-web -d -p 127.0.0.1:3002:3002 --env OPENAI_API_KEY=your_api_key chatgpt-web
# 运行地址 # 运行地址
http://localhost:3002/ http://localhost:3002/
@@ -210,28 +211,31 @@ services:
app: app:
image: chenzhaoyu94/chatgpt-web # 总是使用 latest ,更新时重新 pull 该 tag 镜像即可 image: chenzhaoyu94/chatgpt-web # 总是使用 latest ,更新时重新 pull 该 tag 镜像即可
ports: ports:
- 3002:3002 - 127.0.0.1:3002:3002
environment: environment:
# 二选一 # 二选一
OPENAI_API_KEY: xxxxxx OPENAI_API_KEY: sk-xxx
# 二选一 # 二选一
OPENAI_ACCESS_TOKEN: xxxxxx OPENAI_ACCESS_TOKEN: xxx
# API接口地址可选设置 OPENAI_API_KEY 时可用 # API接口地址可选设置 OPENAI_API_KEY 时可用
OPENAI_API_BASE_URL: xxxx OPENAI_API_BASE_URL: xxx
# API模型可选设置 OPENAI_API_KEY 时可用 # API模型可选设置 OPENAI_API_KEY 时可用https://platform.openai.com/docs/models
OPENAI_API_MODEL: xxxx # gpt-4, gpt-4-0314, gpt-4-32k, gpt-4-32k-0314, gpt-3.5-turbo, gpt-3.5-turbo-0301, text-davinci-003, text-davinci-002, code-davinci-002
OPENAI_API_MODEL: xxx
# 反向代理,可选 # 反向代理,可选
API_REVERSE_PROXY: xxx API_REVERSE_PROXY: xxx
# 访问权限密钥,可选 # 访问权限密钥,可选
AUTH_SECRET_KEY: xxx AUTH_SECRET_KEY: xxx
# 每小时最大请求次数,可选,默认无限
MAX_REQUEST_PER_HOUR: 0
# 超时,单位毫秒,可选 # 超时,单位毫秒,可选
TIMEOUT_MS: 60000 TIMEOUT_MS: 60000
# Socks代理可选和 SOCKS_PROXY_PORT 一起时生效 # Socks代理可选和 SOCKS_PROXY_PORT 一起时生效
SOCKS_PROXY_HOST: xxxx SOCKS_PROXY_HOST: xxx
# Socks代理端口可选和 SOCKS_PROXY_HOST 一起时生效 # Socks代理端口可选和 SOCKS_PROXY_HOST 一起时生效
SOCKS_PROXY_PORT: xxxx SOCKS_PROXY_PORT: xxx
# HTTPS 代理,可选,支持 httphttpssocks5 # HTTPS 代理,可选,支持 httphttpssocks5
HTTPS_PROXY: http://xxxx:7890 HTTPS_PROXY: http://xxx:7890
``` ```
- `OPENAI_API_BASE_URL` 可选,设置 `OPENAI_API_KEY` 时可用 - `OPENAI_API_BASE_URL` 可选,设置 `OPENAI_API_KEY` 时可用
- `OPENAI_API_MODEL` 可选,设置 `OPENAI_API_KEY` 时可用 - `OPENAI_API_MODEL` 可选,设置 `OPENAI_API_KEY` 时可用
@@ -245,6 +249,7 @@ services:
| --------------------- | ---------------------- | -------------------------------------------------------------------------------------------------- | | --------------------- | ---------------------- | -------------------------------------------------------------------------------------------------- |
| `PORT` | 必填 | 默认 `3002` | `PORT` | 必填 | 默认 `3002`
| `AUTH_SECRET_KEY` | 可选 | 访问权限密钥 | | `AUTH_SECRET_KEY` | 可选 | 访问权限密钥 |
| `MAX_REQUEST_PER_HOUR` | 可选 | 每小时最大请求次数,可选,默认无限 |
| `TIMEOUT_MS` | 可选 | 超时时间,单位毫秒 | | `TIMEOUT_MS` | 可选 | 超时时间,单位毫秒 |
| `OPENAI_API_KEY` | `OpenAI API` 二选一 | 使用 `OpenAI API` 所需的 `apiKey` [(获取 apiKey)](https://platform.openai.com/overview) | | `OPENAI_API_KEY` | `OpenAI API` 二选一 | 使用 `OpenAI API` 所需的 `apiKey` [(获取 apiKey)](https://platform.openai.com/overview) |
| `OPENAI_ACCESS_TOKEN` | `Web API` 二选一 | 使用 `Web API` 所需的 `accessToken` [(获取 accessToken)](https://chat.openai.com/api/auth/session) | | `OPENAI_ACCESS_TOKEN` | `Web API` 二选一 | 使用 `Web API` 所需的 `accessToken` [(获取 accessToken)](https://chat.openai.com/api/auth/session) |
@@ -279,7 +284,7 @@ PS: 不进行打包,直接在服务器上运行 `pnpm start` 也可
#### 前端网页 #### 前端网页
1、修改根目录下 `.env` 文件中的 `VITE_APP_API_BASE_URL` 为你的实际后端接口地址 1、修改根目录下 `.env` 文件中的 `VITE_GLOB_API_URL` 为你的实际后端接口地址
2、根目录下运行以下命令然后将 `dist` 文件夹内的文件复制到你网站服务的根目录下 2、根目录下运行以下命令然后将 `dist` 文件夹内的文件复制到你网站服务的根目录下

View File

@@ -7,25 +7,27 @@ services:
- 3002:3002 - 3002:3002
environment: environment:
# 二选一 # 二选一
OPENAI_API_KEY: xxxx OPENAI_API_KEY: sk-xxx
# 二选一 # 二选一
OPENAI_ACCESS_TOKEN: xxxxxx OPENAI_ACCESS_TOKEN: xxx
# API接口地址可选设置 OPENAI_API_KEY 时可用 # API接口地址可选设置 OPENAI_API_KEY 时可用
OPENAI_API_BASE_URL: xxxx OPENAI_API_BASE_URL: xxx
# API模型可选设置 OPENAI_API_KEY 时可用 # API模型可选设置 OPENAI_API_KEY 时可用
OPENAI_API_MODEL: xxxx OPENAI_API_MODEL: xxx
# 反向代理,可选 # 反向代理,可选
API_REVERSE_PROXY: xxx API_REVERSE_PROXY: xxx
# 访问权限密钥,可选 # 访问权限密钥,可选
AUTH_SECRET_KEY: xxx AUTH_SECRET_KEY: xxx
# 每小时最大请求次数,可选,默认无限
MAX_REQUEST_PER_HOUR: 0
# 超时,单位毫秒,可选 # 超时,单位毫秒,可选
TIMEOUT_MS: 60000 TIMEOUT_MS: 60000
# Socks代理可选和 SOCKS_PROXY_PORT 一起时生效 # Socks代理可选和 SOCKS_PROXY_PORT 一起时生效
SOCKS_PROXY_HOST: xxxx SOCKS_PROXY_HOST: xxx
# Socks代理端口可选和 SOCKS_PROXY_HOST 一起时生效 # Socks代理端口可选和 SOCKS_PROXY_HOST 一起时生效
SOCKS_PROXY_PORT: xxxx SOCKS_PROXY_PORT: xxx
# HTTPS_PROXY 代理,可选 # HTTPS_PROXY 代理,可选
HTTPS_PROXY: http://xxxx:7890 HTTPS_PROXY: http://xxx:7890
nginx: nginx:
image: nginx:alpine image: nginx:alpine
ports: ports:

View File

@@ -1,6 +1,6 @@
{ {
"name": "chatgpt-web", "name": "chatgpt-web",
"version": "2.10.5", "version": "2.10.8",
"private": false, "private": false,
"description": "ChatGPT Web", "description": "ChatGPT Web",
"author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>", "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",
@@ -30,7 +30,7 @@
"katex": "^0.16.4", "katex": "^0.16.4",
"markdown-it": "^13.0.1", "markdown-it": "^13.0.1",
"naive-ui": "^2.34.3", "naive-ui": "^2.34.3",
"pinia": "^2.0.32", "pinia": "^2.0.33",
"vue": "^3.2.47", "vue": "^3.2.47",
"vue-i18n": "^9.2.2", "vue-i18n": "^9.2.2",
"vue-router": "^4.1.6" "vue-router": "^4.1.6"
@@ -43,6 +43,7 @@
"@types/crypto-js": "^4.1.1", "@types/crypto-js": "^4.1.1",
"@types/katex": "^0.16.0", "@types/katex": "^0.16.0",
"@types/markdown-it": "^12.2.3", "@types/markdown-it": "^12.2.3",
"@types/markdown-it-link-attributes": "^3.0.1",
"@types/node": "^18.14.6", "@types/node": "^18.14.6",
"@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue": "^4.0.0",
"autoprefixer": "^10.4.13", "autoprefixer": "^10.4.13",
@@ -52,12 +53,13 @@
"husky": "^8.0.3", "husky": "^8.0.3",
"less": "^4.1.3", "less": "^4.1.3",
"lint-staged": "^13.1.2", "lint-staged": "^13.1.2",
"markdown-it-link-attributes": "^4.0.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"postcss": "^8.4.21", "postcss": "^8.4.21",
"rimraf": "^4.2.0", "rimraf": "^4.2.0",
"tailwindcss": "^3.2.7", "tailwindcss": "^3.2.7",
"typescript": "~4.9.5", "typescript": "~4.9.5",
"vite": "^4.1.4", "vite": "^4.2.0",
"vite-plugin-pwa": "^0.14.4", "vite-plugin-pwa": "^0.14.4",
"vue-tsc": "^1.2.0" "vue-tsc": "^1.2.0"
}, },

188
pnpm-lock.yaml generated
View File

@@ -9,6 +9,7 @@ specifiers:
'@types/crypto-js': ^4.1.1 '@types/crypto-js': ^4.1.1
'@types/katex': ^0.16.0 '@types/katex': ^0.16.0
'@types/markdown-it': ^12.2.3 '@types/markdown-it': ^12.2.3
'@types/markdown-it-link-attributes': ^3.0.1
'@types/node': ^18.14.6 '@types/node': ^18.14.6
'@vitejs/plugin-vue': ^4.0.0 '@vitejs/plugin-vue': ^4.0.0
'@vueuse/core': ^9.13.0 '@vueuse/core': ^9.13.0
@@ -23,14 +24,15 @@ specifiers:
less: ^4.1.3 less: ^4.1.3
lint-staged: ^13.1.2 lint-staged: ^13.1.2
markdown-it: ^13.0.1 markdown-it: ^13.0.1
markdown-it-link-attributes: ^4.0.1
naive-ui: ^2.34.3 naive-ui: ^2.34.3
npm-run-all: ^4.1.5 npm-run-all: ^4.1.5
pinia: ^2.0.32 pinia: ^2.0.33
postcss: ^8.4.21 postcss: ^8.4.21
rimraf: ^4.2.0 rimraf: ^4.2.0
tailwindcss: ^3.2.7 tailwindcss: ^3.2.7
typescript: ~4.9.5 typescript: ~4.9.5
vite: ^4.1.4 vite: ^4.2.0
vite-plugin-pwa: ^0.14.4 vite-plugin-pwa: ^0.14.4
vue: ^3.2.47 vue: ^3.2.47
vue-i18n: ^9.2.2 vue-i18n: ^9.2.2
@@ -58,8 +60,9 @@ devDependencies:
'@types/crypto-js': 4.1.1 '@types/crypto-js': 4.1.1
'@types/katex': 0.16.0 '@types/katex': 0.16.0
'@types/markdown-it': 12.2.3 '@types/markdown-it': 12.2.3
'@types/markdown-it-link-attributes': 3.0.1
'@types/node': 18.14.6 '@types/node': 18.14.6
'@vitejs/plugin-vue': 4.0.0_vite@4.1.4+vue@3.2.47 '@vitejs/plugin-vue': 4.0.0_vite@4.2.0+vue@3.2.47
autoprefixer: 10.4.13_postcss@8.4.21 autoprefixer: 10.4.13_postcss@8.4.21
axios: 1.3.4 axios: 1.3.4
crypto-js: 4.1.1 crypto-js: 4.1.1
@@ -67,13 +70,14 @@ devDependencies:
husky: 8.0.3 husky: 8.0.3
less: 4.1.3 less: 4.1.3
lint-staged: 13.1.2 lint-staged: 13.1.2
markdown-it-link-attributes: 4.0.1
npm-run-all: 4.1.5 npm-run-all: 4.1.5
postcss: 8.4.21 postcss: 8.4.21
rimraf: 4.3.0 rimraf: 4.3.0
tailwindcss: 3.2.7_postcss@8.4.21 tailwindcss: 3.2.7_postcss@8.4.21
typescript: 4.9.5 typescript: 4.9.5
vite: 4.1.4_4l5pdn5ozbjpiwj3fcgseihr44 vite: 4.2.0_4l5pdn5ozbjpiwj3fcgseihr44
vite-plugin-pwa: 0.14.4_vite@4.1.4 vite-plugin-pwa: 0.14.4_vite@4.2.0
vue-tsc: 1.2.0_typescript@4.9.5 vue-tsc: 1.2.0_typescript@4.9.5
packages: packages:
@@ -1531,8 +1535,8 @@ packages:
resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==} resolution: {integrity: sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==}
dev: false dev: false
/@esbuild/android-arm/0.16.17: /@esbuild/android-arm/0.17.11:
resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==} resolution: {integrity: sha512-CdyX6sRVh1NzFCsf5vw3kULwlAhfy9wVt8SZlrhQ7eL2qBjGbFhRBWkkAzuZm9IIEOCKJw4DXA6R85g+qc8RDw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm] cpu: [arm]
os: [android] os: [android]
@@ -1540,8 +1544,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/android-arm64/0.16.17: /@esbuild/android-arm64/0.17.11:
resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==} resolution: {integrity: sha512-QnK4d/zhVTuV4/pRM4HUjcsbl43POALU2zvBynmrrqZt9LPcLA3x1fTZPBg2RRguBQnJcnU059yKr+bydkntjg==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm64] cpu: [arm64]
os: [android] os: [android]
@@ -1549,8 +1553,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/android-x64/0.16.17: /@esbuild/android-x64/0.17.11:
resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==} resolution: {integrity: sha512-3PL3HKtsDIXGQcSCKtWD/dy+mgc4p2Tvo2qKgKHj9Yf+eniwFnuoQ0OUhlSfAEpKAFzF9N21Nwgnap6zy3L3MQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [android] os: [android]
@@ -1558,8 +1562,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/darwin-arm64/0.16.17: /@esbuild/darwin-arm64/0.17.11:
resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==} resolution: {integrity: sha512-pJ950bNKgzhkGNO3Z9TeHzIFtEyC2GDQL3wxkMApDEghYx5Qers84UTNc1bAxWbRkuJOgmOha5V0WUeh8G+YGw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
@@ -1567,8 +1571,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/darwin-x64/0.16.17: /@esbuild/darwin-x64/0.17.11:
resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==} resolution: {integrity: sha512-iB0dQkIHXyczK3BZtzw1tqegf0F0Ab5texX2TvMQjiJIWXAfM4FQl7D909YfXWnB92OQz4ivBYQ2RlxBJrMJOw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
@@ -1576,8 +1580,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/freebsd-arm64/0.16.17: /@esbuild/freebsd-arm64/0.17.11:
resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==} resolution: {integrity: sha512-7EFzUADmI1jCHeDRGKgbnF5sDIceZsQGapoO6dmw7r/ZBEKX7CCDnIz8m9yEclzr7mFsd+DyasHzpjfJnmBB1Q==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm64] cpu: [arm64]
os: [freebsd] os: [freebsd]
@@ -1585,8 +1589,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/freebsd-x64/0.16.17: /@esbuild/freebsd-x64/0.17.11:
resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==} resolution: {integrity: sha512-iPgenptC8i8pdvkHQvXJFzc1eVMR7W2lBPrTE6GbhR54sLcF42mk3zBOjKPOodezzuAz/KSu8CPyFSjcBMkE9g==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [freebsd] os: [freebsd]
@@ -1594,8 +1598,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-arm/0.16.17: /@esbuild/linux-arm/0.17.11:
resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==} resolution: {integrity: sha512-M9iK/d4lgZH0U5M1R2p2gqhPV/7JPJcRz+8O8GBKVgqndTzydQ7B2XGDbxtbvFkvIs53uXTobOhv+RyaqhUiMg==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
@@ -1603,8 +1607,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-arm64/0.16.17: /@esbuild/linux-arm64/0.17.11:
resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==} resolution: {integrity: sha512-Qxth3gsWWGKz2/qG2d5DsW/57SeA2AmpSMhdg9TSB5Svn2KDob3qxfQSkdnWjSd42kqoxIPy3EJFs+6w1+6Qjg==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
@@ -1612,8 +1616,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-ia32/0.16.17: /@esbuild/linux-ia32/0.17.11:
resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==} resolution: {integrity: sha512-dB1nGaVWtUlb/rRDHmuDQhfqazWE0LMro/AIbT2lWM3CDMHJNpLckH+gCddQyhhcLac2OYw69ikUMO34JLt3wA==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [ia32] cpu: [ia32]
os: [linux] os: [linux]
@@ -1621,8 +1625,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-loong64/0.16.17: /@esbuild/linux-loong64/0.17.11:
resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==} resolution: {integrity: sha512-aCWlq70Q7Nc9WDnormntGS1ar6ZFvUpqr8gXtO+HRejRYPweAFQN615PcgaSJkZjhHp61+MNLhzyVALSF2/Q0g==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [loong64] cpu: [loong64]
os: [linux] os: [linux]
@@ -1630,8 +1634,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-mips64el/0.16.17: /@esbuild/linux-mips64el/0.17.11:
resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==} resolution: {integrity: sha512-cGeGNdQxqY8qJwlYH1BP6rjIIiEcrM05H7k3tR7WxOLmD1ZxRMd6/QIOWMb8mD2s2YJFNRuNQ+wjMhgEL2oCEw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [mips64el] cpu: [mips64el]
os: [linux] os: [linux]
@@ -1639,8 +1643,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-ppc64/0.16.17: /@esbuild/linux-ppc64/0.17.11:
resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==} resolution: {integrity: sha512-BdlziJQPW/bNe0E8eYsHB40mYOluS+jULPCjlWiHzDgr+ZBRXPtgMV1nkLEGdpjrwgmtkZHEGEPaKdS/8faLDA==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
@@ -1648,8 +1652,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-riscv64/0.16.17: /@esbuild/linux-riscv64/0.17.11:
resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==} resolution: {integrity: sha512-MDLwQbtF+83oJCI1Cixn68Et/ME6gelmhssPebC40RdJaect+IM+l7o/CuG0ZlDs6tZTEIoxUe53H3GmMn8oMA==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
@@ -1657,8 +1661,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-s390x/0.16.17: /@esbuild/linux-s390x/0.17.11:
resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==} resolution: {integrity: sha512-4N5EMESvws0Ozr2J94VoUD8HIRi7X0uvUv4c0wpTHZyZY9qpaaN7THjosdiW56irQ4qnJ6Lsc+i+5zGWnyqWqQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
@@ -1666,8 +1670,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/linux-x64/0.16.17: /@esbuild/linux-x64/0.17.11:
resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==} resolution: {integrity: sha512-rM/v8UlluxpytFSmVdbCe1yyKQd/e+FmIJE2oPJvbBo+D0XVWi1y/NQ4iTNx+436WmDHQBjVLrbnAQLQ6U7wlw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
@@ -1675,8 +1679,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/netbsd-x64/0.16.17: /@esbuild/netbsd-x64/0.17.11:
resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==} resolution: {integrity: sha512-4WaAhuz5f91h3/g43VBGdto1Q+X7VEZfpcWGtOFXnggEuLvjV+cP6DyLRU15IjiU9fKLLk41OoJfBFN5DhPvag==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [netbsd] os: [netbsd]
@@ -1684,8 +1688,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/openbsd-x64/0.16.17: /@esbuild/openbsd-x64/0.17.11:
resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==} resolution: {integrity: sha512-UBj135Nx4FpnvtE+C8TWGp98oUgBcmNmdYgl5ToKc0mBHxVVqVE7FUS5/ELMImOp205qDAittL6Ezhasc2Ev/w==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [openbsd] os: [openbsd]
@@ -1693,8 +1697,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/sunos-x64/0.16.17: /@esbuild/sunos-x64/0.17.11:
resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==} resolution: {integrity: sha512-1/gxTifDC9aXbV2xOfCbOceh5AlIidUrPsMpivgzo8P8zUtczlq1ncFpeN1ZyQJ9lVs2hILy1PG5KPp+w8QPPg==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [sunos] os: [sunos]
@@ -1702,8 +1706,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/win32-arm64/0.16.17: /@esbuild/win32-arm64/0.17.11:
resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==} resolution: {integrity: sha512-vtSfyx5yRdpiOW9yp6Ax0zyNOv9HjOAw8WaZg3dF5djEHKKm3UnoohftVvIJtRh0Ec7Hso0RIdTqZvPXJ7FdvQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
@@ -1711,8 +1715,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/win32-ia32/0.16.17: /@esbuild/win32-ia32/0.17.11:
resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==} resolution: {integrity: sha512-GFPSLEGQr4wHFTiIUJQrnJKZhZjjq4Sphf+mM76nQR6WkQn73vm7IsacmBRPkALfpOCHsopSvLgqdd4iUW2mYw==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
@@ -1720,8 +1724,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@esbuild/win32-x64/0.16.17: /@esbuild/win32-x64/0.17.11:
resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==} resolution: {integrity: sha512-N9vXqLP3eRL8BqSy8yn4Y98cZI2pZ8fyuHx6lKjiG2WABpT2l01TXdzq5Ma2ZUBzfB7tx5dXVhge8X9u0S70ZQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
@@ -2065,6 +2069,12 @@ packages:
resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==} resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
dev: false dev: false
/@types/markdown-it-link-attributes/3.0.1:
resolution: {integrity: sha512-K8RnNb1q8j7rDOJbMF7AnlhCC/45BjrQ8z3WZWOrvkBIl8u9RXvmBdG/hfpnmK1JhhEZcmFEKWt+ilW1Mly+2Q==}
dependencies:
'@types/markdown-it': 12.2.3
dev: true
/@types/markdown-it/12.2.3: /@types/markdown-it/12.2.3:
resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==} resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
dependencies: dependencies:
@@ -2246,14 +2256,14 @@ packages:
eslint-visitor-keys: 3.3.0 eslint-visitor-keys: 3.3.0
dev: true dev: true
/@vitejs/plugin-vue/4.0.0_vite@4.1.4+vue@3.2.47: /@vitejs/plugin-vue/4.0.0_vite@4.2.0+vue@3.2.47:
resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==} resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
engines: {node: ^14.18.0 || >=16.0.0} engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies: peerDependencies:
vite: ^4.0.0 vite: ^4.0.0
vue: ^3.2.25 vue: ^3.2.25
dependencies: dependencies:
vite: 4.1.4_4l5pdn5ozbjpiwj3fcgseihr44 vite: 4.2.0_4l5pdn5ozbjpiwj3fcgseihr44
vue: 3.2.47 vue: 3.2.47
dev: true dev: true
@@ -3317,34 +3327,34 @@ packages:
is-symbol: 1.0.4 is-symbol: 1.0.4
dev: true dev: true
/esbuild/0.16.17: /esbuild/0.17.11:
resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==} resolution: {integrity: sha512-pAMImyokbWDtnA/ufPxjQg0fYo2DDuzAlqwnDvbXqHLphe+m80eF++perYKVm8LeTuj2zUuFXC+xgSVxyoHUdg==}
engines: {node: '>=12'} engines: {node: '>=12'}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true
optionalDependencies: optionalDependencies:
'@esbuild/android-arm': 0.16.17 '@esbuild/android-arm': 0.17.11
'@esbuild/android-arm64': 0.16.17 '@esbuild/android-arm64': 0.17.11
'@esbuild/android-x64': 0.16.17 '@esbuild/android-x64': 0.17.11
'@esbuild/darwin-arm64': 0.16.17 '@esbuild/darwin-arm64': 0.17.11
'@esbuild/darwin-x64': 0.16.17 '@esbuild/darwin-x64': 0.17.11
'@esbuild/freebsd-arm64': 0.16.17 '@esbuild/freebsd-arm64': 0.17.11
'@esbuild/freebsd-x64': 0.16.17 '@esbuild/freebsd-x64': 0.17.11
'@esbuild/linux-arm': 0.16.17 '@esbuild/linux-arm': 0.17.11
'@esbuild/linux-arm64': 0.16.17 '@esbuild/linux-arm64': 0.17.11
'@esbuild/linux-ia32': 0.16.17 '@esbuild/linux-ia32': 0.17.11
'@esbuild/linux-loong64': 0.16.17 '@esbuild/linux-loong64': 0.17.11
'@esbuild/linux-mips64el': 0.16.17 '@esbuild/linux-mips64el': 0.17.11
'@esbuild/linux-ppc64': 0.16.17 '@esbuild/linux-ppc64': 0.17.11
'@esbuild/linux-riscv64': 0.16.17 '@esbuild/linux-riscv64': 0.17.11
'@esbuild/linux-s390x': 0.16.17 '@esbuild/linux-s390x': 0.17.11
'@esbuild/linux-x64': 0.16.17 '@esbuild/linux-x64': 0.17.11
'@esbuild/netbsd-x64': 0.16.17 '@esbuild/netbsd-x64': 0.17.11
'@esbuild/openbsd-x64': 0.16.17 '@esbuild/openbsd-x64': 0.17.11
'@esbuild/sunos-x64': 0.16.17 '@esbuild/sunos-x64': 0.17.11
'@esbuild/win32-arm64': 0.16.17 '@esbuild/win32-arm64': 0.17.11
'@esbuild/win32-ia32': 0.16.17 '@esbuild/win32-ia32': 0.17.11
'@esbuild/win32-x64': 0.16.17 '@esbuild/win32-x64': 0.17.11
dev: true dev: true
/escalade/3.1.1: /escalade/3.1.1:
@@ -3912,7 +3922,7 @@ packages:
resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==} resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==}
engines: {node: '>=14.14'} engines: {node: '>=14.14'}
dependencies: dependencies:
graceful-fs: 4.2.10 graceful-fs: 4.2.11
jsonfile: 6.1.0 jsonfile: 6.1.0
universalify: 2.0.0 universalify: 2.0.0
dev: true dev: true
@@ -3922,7 +3932,7 @@ packages:
engines: {node: '>=10'} engines: {node: '>=10'}
dependencies: dependencies:
at-least-node: 1.0.0 at-least-node: 1.0.0
graceful-fs: 4.2.10 graceful-fs: 4.2.11
jsonfile: 6.1.0 jsonfile: 6.1.0
universalify: 2.0.0 universalify: 2.0.0
dev: true dev: true
@@ -4083,8 +4093,8 @@ packages:
get-intrinsic: 1.2.0 get-intrinsic: 1.2.0
dev: true dev: true
/graceful-fs/4.2.10: /graceful-fs/4.2.11:
resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
dev: true dev: true
/grapheme-splitter/1.0.4: /grapheme-splitter/1.0.4:
@@ -4580,7 +4590,7 @@ packages:
dependencies: dependencies:
universalify: 2.0.0 universalify: 2.0.0
optionalDependencies: optionalDependencies:
graceful-fs: 4.2.10 graceful-fs: 4.2.11
dev: true dev: true
/jsonparse/1.3.1: /jsonparse/1.3.1:
@@ -4615,7 +4625,7 @@ packages:
tslib: 2.5.0 tslib: 2.5.0
optionalDependencies: optionalDependencies:
errno: 0.1.8 errno: 0.1.8
graceful-fs: 4.2.10 graceful-fs: 4.2.11
image-size: 0.5.5 image-size: 0.5.5
make-dir: 2.1.0 make-dir: 2.1.0
mime: 1.6.0 mime: 1.6.0
@@ -4704,7 +4714,7 @@ packages:
resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==} resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
engines: {node: '>=4'} engines: {node: '>=4'}
dependencies: dependencies:
graceful-fs: 4.2.10 graceful-fs: 4.2.11
parse-json: 4.0.0 parse-json: 4.0.0
pify: 3.0.0 pify: 3.0.0
strip-bom: 3.0.0 strip-bom: 3.0.0
@@ -4848,6 +4858,10 @@ packages:
engines: {node: '>=8'} engines: {node: '>=8'}
dev: true dev: true
/markdown-it-link-attributes/4.0.1:
resolution: {integrity: sha512-pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ==}
dev: true
/markdown-it/13.0.1: /markdown-it/13.0.1:
resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==} resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==}
hasBin: true hasBin: true
@@ -6395,7 +6409,7 @@ packages:
vue: 3.2.47 vue: 3.2.47
dev: false dev: false
/vite-plugin-pwa/0.14.4_vite@4.1.4: /vite-plugin-pwa/0.14.4_vite@4.2.0:
resolution: {integrity: sha512-M7Ct0so8OlouMkTWgXnl8W1xU95glITSKIe7qswZf1tniAstO2idElGCnsrTJ5NPNSx1XqfTCOUj8j94S6FD7Q==} resolution: {integrity: sha512-M7Ct0so8OlouMkTWgXnl8W1xU95glITSKIe7qswZf1tniAstO2idElGCnsrTJ5NPNSx1XqfTCOUj8j94S6FD7Q==}
peerDependencies: peerDependencies:
vite: ^3.1.0 || ^4.0.0 vite: ^3.1.0 || ^4.0.0
@@ -6405,7 +6419,7 @@ packages:
fast-glob: 3.2.12 fast-glob: 3.2.12
pretty-bytes: 6.1.0 pretty-bytes: 6.1.0
rollup: 3.18.0 rollup: 3.18.0
vite: 4.1.4_4l5pdn5ozbjpiwj3fcgseihr44 vite: 4.2.0_4l5pdn5ozbjpiwj3fcgseihr44
workbox-build: 6.5.4 workbox-build: 6.5.4
workbox-window: 6.5.4 workbox-window: 6.5.4
transitivePeerDependencies: transitivePeerDependencies:
@@ -6413,8 +6427,8 @@ packages:
- supports-color - supports-color
dev: true dev: true
/vite/4.1.4_4l5pdn5ozbjpiwj3fcgseihr44: /vite/4.2.0_4l5pdn5ozbjpiwj3fcgseihr44:
resolution: {integrity: sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==} resolution: {integrity: sha512-AbDTyzzwuKoRtMIRLGNxhLRuv1FpRgdIw+1y6AQG73Q5+vtecmvzKo/yk8X/vrHDpETRTx01ABijqUHIzBXi0g==}
engines: {node: ^14.18.0 || >=16.0.0} engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true hasBin: true
peerDependencies: peerDependencies:
@@ -6439,7 +6453,7 @@ packages:
optional: true optional: true
dependencies: dependencies:
'@types/node': 18.14.6 '@types/node': 18.14.6
esbuild: 0.16.17 esbuild: 0.17.11
less: 4.1.3 less: 4.1.3
postcss: 8.4.21 postcss: 8.4.21
resolve: 1.22.1 resolve: 1.22.1

View File

@@ -16,6 +16,9 @@ API_REVERSE_PROXY=
# timeout # timeout
TIMEOUT_MS=100000 TIMEOUT_MS=100000
# Rate Limit
MAX_REQUEST_PER_HOUR=
# Secret key # Secret key
AUTH_SECRET_KEY= AUTH_SECRET_KEY=
@@ -27,3 +30,4 @@ SOCKS_PROXY_PORT=
# HTTPS PROXY # HTTPS PROXY
HTTPS_PROXY= HTTPS_PROXY=

View File

@@ -16,7 +16,7 @@
"scripts": { "scripts": {
"start": "esno ./src/index.ts", "start": "esno ./src/index.ts",
"dev": "esno watch ./src/index.ts", "dev": "esno watch ./src/index.ts",
"prod": "esno ./build/index.js", "prod": "node ./build/index.mjs",
"build": "pnpm clean && tsup", "build": "pnpm clean && tsup",
"clean": "rimraf build", "clean": "rimraf build",
"lint": "eslint .", "lint": "eslint .",
@@ -24,10 +24,12 @@
"common:cleanup": "rimraf node_modules && rimraf pnpm-lock.yaml" "common:cleanup": "rimraf node_modules && rimraf pnpm-lock.yaml"
}, },
"dependencies": { "dependencies": {
"chatgpt": "^5.0.10", "axios": "^1.3.4",
"chatgpt": "^5.1.2",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"esno": "^0.16.3", "esno": "^0.16.3",
"express": "^4.18.2", "express": "^4.18.2",
"express-rate-limit": "^6.7.0",
"https-proxy-agent": "^5.0.1", "https-proxy-agent": "^5.0.1",
"isomorphic-fetch": "^3.0.0", "isomorphic-fetch": "^3.0.0",
"node-fetch": "^3.3.0", "node-fetch": "^3.3.0",

76
service/pnpm-lock.yaml generated
View File

@@ -4,11 +4,13 @@ specifiers:
'@antfu/eslint-config': ^0.35.3 '@antfu/eslint-config': ^0.35.3
'@types/express': ^4.17.17 '@types/express': ^4.17.17
'@types/node': ^18.14.6 '@types/node': ^18.14.6
chatgpt: ^5.0.10 axios: ^1.3.4
chatgpt: ^5.1.2
dotenv: ^16.0.3 dotenv: ^16.0.3
eslint: ^8.35.0 eslint: ^8.35.0
esno: ^0.16.3 esno: ^0.16.3
express: ^4.18.2 express: ^4.18.2
express-rate-limit: ^6.7.0
https-proxy-agent: ^5.0.1 https-proxy-agent: ^5.0.1
isomorphic-fetch: ^3.0.0 isomorphic-fetch: ^3.0.0
node-fetch: ^3.3.0 node-fetch: ^3.3.0
@@ -18,10 +20,12 @@ specifiers:
typescript: ^4.9.5 typescript: ^4.9.5
dependencies: dependencies:
chatgpt: 5.0.10 axios: 1.3.4
chatgpt: 5.1.2
dotenv: 16.0.3 dotenv: 16.0.3
esno: 0.16.3 esno: 0.16.3
express: 4.18.2 express: 4.18.2
express-rate-limit: 6.7.0_express@4.18.2
https-proxy-agent: 5.0.1 https-proxy-agent: 5.0.1
isomorphic-fetch: 3.0.0 isomorphic-fetch: 3.0.0
node-fetch: 3.3.0 node-fetch: 3.3.0
@@ -152,8 +156,8 @@ packages:
chalk: 2.4.2 chalk: 2.4.2
js-tokens: 4.0.0 js-tokens: 4.0.0
/@dqbd/tiktoken/0.4.0: /@dqbd/tiktoken/1.0.2:
resolution: {integrity: sha512-iaHgmwKAOqowBFZKxelyszoeGLoNw62eOULcmyme1aA1Ymr3JgYl0V7jwpuUm7fksalycZajx3loFn9TRUaviw==} resolution: {integrity: sha512-AjGTBRWsMoVmVeN55NLyupyM8TNamOUBl6tj5t/leLDVup3CFGO9tVagNL1jf3GyZLkWZSTmYVbPQ/M2LEcNzw==}
dev: false dev: false
/@esbuild-kit/cjs-loader/2.4.2: /@esbuild-kit/cjs-loader/2.4.2:
@@ -766,6 +770,10 @@ packages:
es-shim-unscopables: 1.0.0 es-shim-unscopables: 1.0.0
dev: true dev: true
/asynckit/0.4.0:
resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
dev: false
/atomically/2.0.1: /atomically/2.0.1:
resolution: {integrity: sha512-sxBhVZUFBFhqSAsYMM3X2oaUi2NVDJ8U026FsIusM8gYXls9AYs/eXzgGrufs1Qjpkxi9zunds+75QUFz+m7UQ==} resolution: {integrity: sha512-sxBhVZUFBFhqSAsYMM3X2oaUi2NVDJ8U026FsIusM8gYXls9AYs/eXzgGrufs1Qjpkxi9zunds+75QUFz+m7UQ==}
dependencies: dependencies:
@@ -778,6 +786,16 @@ packages:
engines: {node: '>= 0.4'} engines: {node: '>= 0.4'}
dev: true dev: true
/axios/1.3.4:
resolution: {integrity: sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==}
dependencies:
follow-redirects: 1.15.2
form-data: 4.0.0
proxy-from-env: 1.1.0
transitivePeerDependencies:
- debug
dev: false
/balanced-match/1.0.2: /balanced-match/1.0.2:
resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
dev: true dev: true
@@ -904,12 +922,12 @@ packages:
resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==} resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
dev: true dev: true
/chatgpt/5.0.10: /chatgpt/5.1.2:
resolution: {integrity: sha512-R3vtPlhCapFLkDXED0Cnt1DBcOZAXygr0M5U5kbSI0Fwm4uDQmc7qoIOnr17rd8eaa0JO/UDOevJdEWvd079qA==} resolution: {integrity: sha512-b/NnDQHDOpouK+gmhUCKcKuvnKEh+DotwXlP6Qgw1mqmkcfVl9Wt3/3noT8jbGJpMEpFOfzexXn5Rehpea1N0w==}
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
dependencies: dependencies:
'@dqbd/tiktoken': 0.4.0 '@dqbd/tiktoken': 1.0.2
cac: 6.7.14 cac: 6.7.14
conf: 11.0.1 conf: 11.0.1
eventsource-parser: 0.0.5 eventsource-parser: 0.0.5
@@ -966,6 +984,13 @@ packages:
resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
dev: true dev: true
/combined-stream/1.0.8:
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
engines: {node: '>= 0.8'}
dependencies:
delayed-stream: 1.0.0
dev: false
/commander/4.1.1: /commander/4.1.1:
resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
@@ -1082,6 +1107,11 @@ packages:
object-keys: 1.1.1 object-keys: 1.1.1
dev: true dev: true
/delayed-stream/1.0.0:
resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
engines: {node: '>=0.4.0'}
dev: false
/depd/2.0.0: /depd/2.0.0:
resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
engines: {node: '>= 0.8'} engines: {node: '>= 0.8'}
@@ -1712,6 +1742,15 @@ packages:
strip-final-newline: 2.0.0 strip-final-newline: 2.0.0
dev: true dev: true
/express-rate-limit/6.7.0_express@4.18.2:
resolution: {integrity: sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA==}
engines: {node: '>= 12.9.0'}
peerDependencies:
express: ^4 || ^5
dependencies:
express: 4.18.2
dev: false
/express/4.18.2: /express/4.18.2:
resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
engines: {node: '>= 0.10.0'} engines: {node: '>= 0.10.0'}
@@ -1852,12 +1891,31 @@ packages:
resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
dev: true dev: true
/follow-redirects/1.15.2:
resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
engines: {node: '>=4.0'}
peerDependencies:
debug: '*'
peerDependenciesMeta:
debug:
optional: true
dev: false
/for-each/0.3.3: /for-each/0.3.3:
resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
dependencies: dependencies:
is-callable: 1.2.7 is-callable: 1.2.7
dev: true dev: true
/form-data/4.0.0:
resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
engines: {node: '>= 6'}
dependencies:
asynckit: 0.4.0
combined-stream: 1.0.8
mime-types: 2.1.35
dev: false
/formdata-polyfill/4.0.10: /formdata-polyfill/4.0.10:
resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
engines: {node: '>=12.20.0'} engines: {node: '>=12.20.0'}
@@ -2918,6 +2976,10 @@ packages:
ipaddr.js: 1.9.1 ipaddr.js: 1.9.1
dev: false dev: false
/proxy-from-env/1.1.0:
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
dev: false
/punycode/2.3.0: /punycode/2.3.0:
resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
engines: {node: '>=6'} engines: {node: '>=6'}

View File

@@ -3,10 +3,17 @@ import 'isomorphic-fetch'
import type { ChatGPTAPIOptions, ChatMessage, SendMessageOptions } from 'chatgpt' import type { ChatGPTAPIOptions, ChatMessage, SendMessageOptions } from 'chatgpt'
import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt' import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt'
import { SocksProxyAgent } from 'socks-proxy-agent' import { SocksProxyAgent } from 'socks-proxy-agent'
import { HttpsProxyAgent } from 'https-proxy-agent' import httpsProxyAgent from 'https-proxy-agent'
import fetch from 'node-fetch' import fetch from 'node-fetch'
import axios from 'axios'
import { sendResponse } from '../utils' import { sendResponse } from '../utils'
import { isNotEmptyString } from '../utils/is'
import type { ApiModel, ChatContext, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types' import type { ApiModel, ChatContext, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types'
import type { RequestOptions } from './types'
const { HttpsProxyAgent } = httpsProxyAgent
dotenv.config()
const ErrorCodeMessage: Record<string, string> = { const ErrorCodeMessage: Record<string, string> = {
401: '[OpenAI] 提供错误的API密钥 | Incorrect API key provided', 401: '[OpenAI] 提供错误的API密钥 | Incorrect API key provided',
@@ -17,13 +24,11 @@ const ErrorCodeMessage: Record<string, string> = {
500: '[OpenAI] 服务器繁忙,请稍后再试 | Internal Server Error', 500: '[OpenAI] 服务器繁忙,请稍后再试 | Internal Server Error',
} }
dotenv.config()
const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT_MS : 30 * 1000 const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT_MS : 30 * 1000
let apiModel: ApiModel let apiModel: ApiModel
if (!process.env.OPENAI_API_KEY && !process.env.OPENAI_ACCESS_TOKEN) if (!isNotEmptyString(process.env.OPENAI_API_KEY) && !isNotEmptyString(process.env.OPENAI_ACCESS_TOKEN))
throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable') throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable')
let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
@@ -31,88 +36,70 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
(async () => { (async () => {
// More Info: https://github.com/transitive-bullshit/chatgpt-api // More Info: https://github.com/transitive-bullshit/chatgpt-api
if (process.env.OPENAI_API_KEY) { if (isNotEmptyString(process.env.OPENAI_API_KEY)) {
const OPENAI_API_BASE_URL = process.env.OPENAI_API_BASE_URL
const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
const model = (typeof OPENAI_API_MODEL === 'string' && OPENAI_API_MODEL.length > 0) const model = isNotEmptyString(OPENAI_API_MODEL) ? OPENAI_API_MODEL : 'gpt-3.5-turbo'
? OPENAI_API_MODEL
: 'gpt-3.5-turbo'
const options: ChatGPTAPIOptions = { const options: ChatGPTAPIOptions = {
apiKey: process.env.OPENAI_API_KEY, apiKey: process.env.OPENAI_API_KEY,
completionParams: { model }, completionParams: { model },
debug: false, debug: true,
} }
if (process.env.OPENAI_API_BASE_URL && process.env.OPENAI_API_BASE_URL.trim().length > 0) // increase max token limit if use gpt-4
options.apiBaseUrl = process.env.OPENAI_API_BASE_URL if (model.toLowerCase().includes('gpt-4')) {
// if use 32k model
if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) { if (model.toLowerCase().includes('32k')) {
const agent = new SocksProxyAgent({ options.maxModelTokens = 32768
hostname: process.env.SOCKS_PROXY_HOST, options.maxResponseTokens = 8192
port: process.env.SOCKS_PROXY_PORT, }
}) else {
options.fetch = (url, options) => { options.maxModelTokens = 8192
return fetch(url, { agent, ...options }) options.maxResponseTokens = 2048
} }
} }
const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy if (isNotEmptyString(OPENAI_API_BASE_URL))
if (httpsProxy) { options.apiBaseUrl = `${OPENAI_API_BASE_URL}/v1`
const agent = new HttpsProxyAgent(httpsProxy)
options.fetch = (url, options) => { setupProxy(options)
return fetch(url, { agent, ...options })
}
}
api = new ChatGPTAPI({ ...options }) api = new ChatGPTAPI({ ...options })
apiModel = 'ChatGPTAPI' apiModel = 'ChatGPTAPI'
} }
else { else {
const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
const options: ChatGPTUnofficialProxyAPIOptions = { const options: ChatGPTUnofficialProxyAPIOptions = {
accessToken: process.env.OPENAI_ACCESS_TOKEN, accessToken: process.env.OPENAI_ACCESS_TOKEN,
debug: false, debug: true,
} }
if (isNotEmptyString(OPENAI_API_MODEL))
options.model = OPENAI_API_MODEL
if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) { if (isNotEmptyString(process.env.API_REVERSE_PROXY))
const agent = new SocksProxyAgent({
hostname: process.env.SOCKS_PROXY_HOST,
port: process.env.SOCKS_PROXY_PORT,
})
options.fetch = (url, options) => {
return fetch(url, { agent, ...options })
}
}
const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy
if (httpsProxy) {
const agent = new HttpsProxyAgent(httpsProxy)
options.fetch = (url, options) => {
return fetch(url, { agent, ...options })
}
}
if (process.env.API_REVERSE_PROXY)
options.apiReverseProxyUrl = process.env.API_REVERSE_PROXY options.apiReverseProxyUrl = process.env.API_REVERSE_PROXY
setupProxy(options)
api = new ChatGPTUnofficialProxyAPI({ ...options }) api = new ChatGPTUnofficialProxyAPI({ ...options })
apiModel = 'ChatGPTUnofficialProxyAPI' apiModel = 'ChatGPTUnofficialProxyAPI'
} }
})() })()
async function chatReplyProcess( async function chatReplyProcess(options: RequestOptions) {
message: string, const { message, lastContext, process, systemMessage } = options
lastContext?: { conversationId?: string; parentMessageId?: string },
process?: (chat: ChatMessage) => void,
) {
// if (!message)
// return sendResponse({ type: 'Fail', message: 'Message is empty' })
try { try {
let options: SendMessageOptions = { timeoutMs } let options: SendMessageOptions = { timeoutMs }
if (lastContext) { if (apiModel === 'ChatGPTAPI') {
if (isNotEmptyString(systemMessage))
options.systemMessage = systemMessage
}
if (lastContext != null) {
if (apiModel === 'ChatGPTAPI') if (apiModel === 'ChatGPTAPI')
options = { parentMessageId: lastContext.parentMessageId } options.parentMessageId = lastContext.parentMessageId
else else
options = { ...lastContext } options = { ...lastContext }
} }
@@ -135,21 +122,68 @@ async function chatReplyProcess(
} }
} }
async function chatConfig() { async function fetchBalance() {
const httpsProxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy const OPENAI_API_KEY = process.env.OPENAI_API_KEY
const OPENAI_API_BASE_URL = process.env.OPENAI_API_BASE_URL
return sendResponse({ if (!isNotEmptyString(OPENAI_API_KEY))
return Promise.resolve('-')
const API_BASE_URL = isNotEmptyString(OPENAI_API_BASE_URL)
? OPENAI_API_BASE_URL
: 'https://api.openai.com'
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))
}
catch {
return Promise.resolve('-')
}
}
async function chatConfig() {
const balance = await fetchBalance()
const reverseProxy = process.env.API_REVERSE_PROXY ?? '-'
const httpsProxy = (process.env.HTTPS_PROXY || process.env.ALL_PROXY) ?? '-'
const socksProxy = (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT)
? (`${process.env.SOCKS_PROXY_HOST}:${process.env.SOCKS_PROXY_PORT}`)
: '-'
return sendResponse<ModelConfig>({
type: 'Success', type: 'Success',
data: { data: { apiModel, reverseProxy, timeoutMs, socksProxy, httpsProxy, balance },
apiModel,
reverseProxy: process.env.API_REVERSE_PROXY,
timeoutMs,
socksProxy: (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) ? (`${process.env.SOCKS_PROXY_HOST}:${process.env.SOCKS_PROXY_PORT}`) : '-',
httpsProxy,
} as ModelConfig,
}) })
} }
function setupProxy(options: ChatGPTAPIOptions | ChatGPTUnofficialProxyAPIOptions) {
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,
})
options.fetch = (url, options) => {
return fetch(url, { agent, ...options })
}
}
else {
if (process.env.HTTPS_PROXY || process.env.ALL_PROXY) {
const httpsProxy = process.env.HTTPS_PROXY || process.env.ALL_PROXY
if (httpsProxy) {
const agent = new HttpsProxyAgent(httpsProxy)
options.fetch = (url, options) => {
return fetch(url, { agent, ...options })
}
}
}
}
}
function currentModel(): ApiModel {
return apiModel
}
export type { ChatContext, ChatMessage } export type { ChatContext, ChatMessage }
export { chatReplyProcess, chatConfig } export { chatReplyProcess, chatConfig, currentModel }

View File

@@ -0,0 +1,8 @@
import type { ChatMessage } from 'chatgpt'
export interface RequestOptions {
message: string
lastContext?: { conversationId?: string; parentMessageId?: string }
process?: (chat: ChatMessage) => void
systemMessage?: string
}

View File

@@ -1,7 +1,10 @@
import express from 'express' import express from 'express'
import type { ChatContext, ChatMessage } from './chatgpt' import type { RequestProps } from './types'
import { chatConfig, chatReplyProcess } from './chatgpt' import type { ChatMessage } from './chatgpt'
import { chatConfig, chatReplyProcess, currentModel } from './chatgpt'
import { auth } from './middleware/auth' import { auth } from './middleware/auth'
import { limiter } from './middleware/limiter'
import { isNotEmptyString } from './utils/is'
const app = express() const app = express()
const router = express.Router() const router = express.Router()
@@ -16,15 +19,29 @@ app.all('*', (_, res, next) => {
next() next()
}) })
router.post('/chat-process', auth, async (req, res) => { router.post('/chat-process', [auth, limiter], async (req, res) => {
res.setHeader('Content-type', 'application/octet-stream') res.setHeader('Content-type', 'application/octet-stream')
try { try {
const { prompt, options = {} } = req.body as { prompt: string; options?: ChatContext } const { prompt, options = {}, systemMessage } = req.body as RequestProps
let firstChunk = true let firstChunk = true
await chatReplyProcess(prompt, options, (chat: ChatMessage) => { let chatLength = 0
res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`) let newChatLength = 0
firstChunk = false 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
}
},
systemMessage,
}) })
} }
catch (error) { catch (error) {
@@ -35,7 +52,7 @@ router.post('/chat-process', auth, async (req, res) => {
} }
}) })
router.post('/config', async (req, res) => { router.post('/config', auth, async (req, res) => {
try { try {
const response = await chatConfig() const response = await chatConfig()
res.send(response) res.send(response)
@@ -48,8 +65,8 @@ router.post('/config', async (req, res) => {
router.post('/session', async (req, res) => { router.post('/session', async (req, res) => {
try { try {
const AUTH_SECRET_KEY = process.env.AUTH_SECRET_KEY const AUTH_SECRET_KEY = process.env.AUTH_SECRET_KEY
const hasAuth = typeof AUTH_SECRET_KEY === 'string' && AUTH_SECRET_KEY.length > 0 const hasAuth = isNotEmptyString(AUTH_SECRET_KEY)
res.send({ status: 'Success', message: '', data: { auth: hasAuth } }) res.send({ status: 'Success', message: '', data: { auth: hasAuth, model: currentModel() } })
} }
catch (error) { catch (error) {
res.send({ status: 'Fail', message: error.message, data: null }) res.send({ status: 'Fail', message: error.message, data: null })
@@ -68,11 +85,12 @@ router.post('/verify', async (req, res) => {
res.send({ status: 'Success', message: 'Verify successfully', data: null }) res.send({ status: 'Success', message: 'Verify successfully', data: null })
} }
catch (error) { catch (error) {
res.send({ status: 'Fail', message: error.message, data: null }) res.send({ status: 'Fail', message: error.messagen, data: null })
} }
}) })
app.use('', router) app.use('', router)
app.use('/api', router) app.use('/api', router)
app.set('trust proxy', 1)
app.listen(3002, () => globalThis.console.log('Server is running on port 3002')) app.listen(3002, () => globalThis.console.log('Server is running on port 3002'))

View File

@@ -1,6 +1,8 @@
import { isNotEmptyString } from '../utils/is'
const auth = async (req, res, next) => { const auth = async (req, res, next) => {
const AUTH_SECRET_KEY = process.env.AUTH_SECRET_KEY const AUTH_SECRET_KEY = process.env.AUTH_SECRET_KEY
if (typeof AUTH_SECRET_KEY === 'string' && AUTH_SECRET_KEY.length > 0) { if (isNotEmptyString(AUTH_SECRET_KEY)) {
try { try {
const Authorization = req.header('Authorization') const Authorization = req.header('Authorization')
if (!Authorization || Authorization.replace('Bearer ', '').trim() !== AUTH_SECRET_KEY.trim()) if (!Authorization || Authorization.replace('Bearer ', '').trim() !== AUTH_SECRET_KEY.trim())

View File

@@ -0,0 +1,19 @@
import { rateLimit } from 'express-rate-limit'
import { isNotEmptyString } from '../utils/is'
const MAX_REQUEST_PER_HOUR = process.env.MAX_REQUEST_PER_HOUR
const maxCount = (isNotEmptyString(MAX_REQUEST_PER_HOUR) && !isNaN(Number(MAX_REQUEST_PER_HOUR)))
? parseInt(MAX_REQUEST_PER_HOUR)
: 0 // 0 means unlimited
const limiter = rateLimit({
windowMs: 60 * 60 * 1000, // Maximum number of accesses within an hour
max: maxCount,
statusCode: 200, // 200 means successbut the message is 'Too many request from this IP in 1 hour'
message: async (req, res) => {
res.send({ status: 'Fail', message: 'Too many request from this IP in 1 hour', data: null })
},
})
export { limiter }

View File

@@ -1,5 +1,11 @@
import type { FetchFn } from 'chatgpt' import type { FetchFn } from 'chatgpt'
export interface RequestProps {
prompt: string
options?: ChatContext
systemMessage: string
}
export interface ChatContext { export interface ChatContext {
conversationId?: string conversationId?: string
parentMessageId?: string parentMessageId?: string
@@ -20,6 +26,7 @@ export interface ModelConfig {
timeoutMs?: number timeoutMs?: number
socksProxy?: string socksProxy?: string
httpsProxy?: string httpsProxy?: string
balance?: string
} }
export type ApiModel = 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined export type ApiModel = 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined

View File

@@ -1,10 +1,10 @@
interface SendResponseOptions { interface SendResponseOptions<T = any> {
type: 'Success' | 'Fail' type: 'Success' | 'Fail'
message?: string message?: string
data?: any data?: T
} }
export function sendResponse(options: SendResponseOptions) { export function sendResponse<T>(options: SendResponseOptions<T>) {
if (options.type === 'Success') { if (options.type === 'Success') {
return Promise.resolve({ return Promise.resolve({
message: options.message ?? null, message: options.message ?? null,

19
service/src/utils/is.ts Normal file
View File

@@ -0,0 +1,19 @@
export function isNumber<T extends number>(value: T | unknown): value is number {
return Object.prototype.toString.call(value) === '[object Number]'
}
export function isString<T extends string>(value: T | unknown): value is string {
return Object.prototype.toString.call(value) === '[object String]'
}
export function isNotEmptyString(value: any): boolean {
return typeof value === 'string' && value.length > 0
}
export function isBoolean<T extends boolean>(value: T | unknown): value is boolean {
return Object.prototype.toString.call(value) === '[object Boolean]'
}
export function isFunction<T extends (...args: any[]) => any | void | never>(value: T | unknown): value is T {
return Object.prototype.toString.call(value) === '[object Function]'
}

View File

@@ -4,7 +4,7 @@ export default defineConfig({
entry: ['src/index.ts'], entry: ['src/index.ts'],
outDir: 'build', outDir: 'build',
target: 'es2020', target: 'es2020',
format: ['cjs'], format: ['esm'],
splitting: false, splitting: false,
sourcemap: true, sourcemap: true,
minify: false, minify: false,

View File

@@ -1,5 +1,6 @@
import type { AxiosProgressEvent, GenericAbortSignal } from 'axios' import type { AxiosProgressEvent, GenericAbortSignal } from 'axios'
import { post } from '@/utils/request' import { post } from '@/utils/request'
import { useSettingStore } from '@/store'
export function fetchChatAPI<T = any>( export function fetchChatAPI<T = any>(
prompt: string, prompt: string,
@@ -26,9 +27,11 @@ export function fetchChatAPIProcess<T = any>(
signal?: GenericAbortSignal signal?: GenericAbortSignal
onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void }, onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void },
) { ) {
const settingStore = useSettingStore()
return post<T>({ return post<T>({
url: '/chat-process', url: '/chat-process',
data: { prompt: params.prompt, options: params.options }, data: { prompt: params.prompt, options: params.options, systemMessage: settingStore.systemMessage },
signal: params.signal, signal: params.signal,
onDownloadProgress: params.onDownloadProgress, onDownloadProgress: params.onDownloadProgress,
}) })

View File

@@ -1,14 +1,14 @@
[ [
{
"key": "chatgpt-prompt-collection",
"desc": "Nothing1024收集整理的prompts",
"downloadUrl": "https://raw.githubusercontent.com/Nothing1024/chatgpt-prompt-collection/main/awesome-chatgpt-prompts-zh.json",
"url": "https://github.com/Nothing1024/chatgpt-prompt-collection"
},
{ {
"key": "awesome-chatgpt-prompts-zh", "key": "awesome-chatgpt-prompts-zh",
"desc": "ChatGPT 中文调教指南", "desc": "ChatGPT 中文调教指南",
"downloadUrl": "https://raw.githubusercontent.com/PlexPt/awesome-chatgpt-prompts-zh/main/prompts-zh.json", "downloadUrl": "https://raw.githubusercontent.com/PlexPt/awesome-chatgpt-prompts-zh/main/prompts-zh.json",
"url": "https://github.com/PlexPt/awesome-chatgpt-prompts-zh" "url": "https://github.com/PlexPt/awesome-chatgpt-prompts-zh"
},
{
"key": "awesome-chatgpt-prompts-zh-TW",
"desc": "ChatGPT 中文調教指南 (透過 OpenAI / OpenCC 協助,從簡體中文轉換為繁體中文的版本)",
"downloadUrl": "https://raw.githubusercontent.com/PlexPt/awesome-chatgpt-prompts-zh/main/prompts-zh-TW.json",
"url": "https://github.com/PlexPt/awesome-chatgpt-prompts-zh"
} }
] ]

View File

@@ -1,7 +1,7 @@
<script setup lang='ts'> <script setup lang='ts'>
import type { DataTableColumns } from 'naive-ui' import type { DataTableColumns } from 'naive-ui'
import { computed, h, ref, watch } from 'vue' import { computed, h, ref, watch } from 'vue'
import { NButton, NCard, NDataTable, NDivider, NInput, NLayoutContent, NMessageProvider, NModal, NPopconfirm, NSpace, NTabPane, NTabs, useMessage } from 'naive-ui' import { NButton, NCard, NDataTable, NDivider, NInput, NList, NListItem, NModal, NPopconfirm, NSpace, NTabPane, NTabs, NThing, useMessage } from 'naive-ui'
import PromptRecommend from '../../../assets/recommend.json' import PromptRecommend from '../../../assets/recommend.json'
import { SvgIcon } from '..' import { SvgIcon } from '..'
import { usePromptStore } from '@/store' import { usePromptStore } from '@/store'
@@ -61,7 +61,7 @@ const modalMode = ref('')
const tempModifiedItem = ref<any>({}) const tempModifiedItem = ref<any>({})
// 添加修改导入都使用一个Modal, 临时修改内容占用tempPromptKey,切换状态前先将内容都清楚 // 添加修改导入都使用一个Modal, 临时修改内容占用tempPromptKey,切换状态前先将内容都清楚
const changeShowModal = (mode: string, selected = { key: '', value: '' }) => { const changeShowModal = (mode: 'add' | 'modify' | 'local_import', selected = { key: '', value: '' }) => {
if (mode === 'add') { if (mode === 'add') {
tempPromptKey.value = '' tempPromptKey.value = ''
tempPromptValue.value = '' tempPromptValue.value = ''
@@ -103,7 +103,7 @@ const addPromptTemplate = () => {
} }
promptList.value.unshift({ key: tempPromptKey.value, value: tempPromptValue.value } as never) promptList.value.unshift({ key: tempPromptKey.value, value: tempPromptValue.value } as never)
message.success(t('common.addSuccess')) message.success(t('common.addSuccess'))
changeShowModal('') changeShowModal('add')
} }
const modifyPromptTemplate = () => { const modifyPromptTemplate = () => {
@@ -132,7 +132,7 @@ const modifyPromptTemplate = () => {
promptList.value = [{ key: tempPromptKey.value, value: tempPromptValue.value }, ...tempList] as never promptList.value = [{ key: tempPromptKey.value, value: tempPromptValue.value }, ...tempList] as never
message.success(t('common.editSuccess')) message.success(t('common.editSuccess'))
changeShowModal('') changeShowModal('modify')
} }
const deletePromptTemplate = (row: { key: string; value: string }) => { const deletePromptTemplate = (row: { key: string; value: string }) => {
@@ -147,7 +147,7 @@ const clearPromptTemplate = () => {
message.success(t('common.clearSuccess')) message.success(t('common.clearSuccess'))
} }
const importPromptTemplate = () => { const importPromptTemplate = (from = 'online') => {
try { try {
const jsonData = JSON.parse(tempPromptValue.value) const jsonData = JSON.parse(tempPromptValue.value)
let key = '' let key = ''
@@ -168,7 +168,7 @@ const importPromptTemplate = () => {
} }
for (const i of jsonData) { for (const i of jsonData) {
if (!('key' in i) || !('value' in i)) if (!(key in i) || !(value in i))
throw new Error(t('store.importError')) throw new Error(t('store.importError'))
let safe = true let safe = true
for (const j of promptList.value) { for (const j of promptList.value) {
@@ -187,12 +187,12 @@ const importPromptTemplate = () => {
promptList.value.unshift({ key: i[key], value: i[value] } as never) promptList.value.unshift({ key: i[key], value: i[value] } as never)
} }
message.success(t('common.importSuccess')) message.success(t('common.importSuccess'))
changeShowModal('')
} }
catch { catch {
message.error('JSON 格式错误,请检查 JSON 格式') message.error('JSON 格式错误,请检查 JSON 格式')
changeShowModal('')
} }
if (from === 'local')
showModal.value = !showModal.value
} }
// 模板导出 // 模板导出
@@ -213,17 +213,25 @@ const exportPromptTemplate = () => {
const downloadPromptTemplate = async () => { const downloadPromptTemplate = async () => {
try { try {
importLoading.value = true importLoading.value = true
await fetch(downloadURL.value) const response = await fetch(downloadURL.value)
.then(response => response.json()) const jsonData = await response.json()
.then((jsonData) => { if ('key' in jsonData[0] && 'value' in jsonData[0])
tempPromptValue.value = JSON.stringify(jsonData) tempPromptValue.value = JSON.stringify(jsonData)
}).then(() => { if ('act' in jsonData[0] && 'prompt' in jsonData[0]) {
importPromptTemplate() const newJsonData = jsonData.map((item: { act: string; prompt: string }) => {
return {
key: item.act,
value: item.prompt,
}
}) })
tempPromptValue.value = JSON.stringify(newJsonData)
}
importPromptTemplate()
downloadURL.value = '' downloadURL.value = ''
} }
catch { catch {
message.error(t('store.downloadError')) message.error(t('store.downloadError'))
downloadURL.value = ''
} }
finally { finally {
importLoading.value = false importLoading.value = false
@@ -232,7 +240,7 @@ const downloadPromptTemplate = async () => {
// 移动端自适应相关 // 移动端自适应相关
const renderTemplate = () => { const renderTemplate = () => {
const [keyLimit, valueLimit] = isMobile.value ? [6, 9] : [15, 50] const [keyLimit, valueLimit] = isMobile.value ? [10, 30] : [15, 50]
return promptList.value.map((item: { key: string; value: string }) => { return promptList.value.map((item: { key: string; value: string }) => {
return { return {
@@ -319,145 +327,154 @@ const dataSource = computed(() => {
</script> </script>
<template> <template>
<NMessageProvider> <NModal v-model:show="show" style="width: 90%; max-width: 900px;" preset="card">
<NModal v-model:show="show" style="width: 90%; max-width: 900px;" preset="card"> <div class="space-y-4">
<div class="space-y-4"> <NTabs type="segment">
<NTabs type="segment"> <NTabPane name="local" :tab="$t('store.local')">
<NTabPane name="local" :tab="$t('store.local')"> <div
<div class="flex gap-3 mb-4"
class="flex gap-3" :class="[isMobile ? 'flex-col' : 'flex-row justify-between']"
:class="[isMobile ? 'flex-col' : 'flex-row justify-between']" >
> <div class="flex items-center space-x-4">
<div class="flex items-center space-x-4">
<NButton
type="primary"
size="small"
@click="changeShowModal('add')"
>
{{ $t('common.add') }}
</NButton>
<NButton
size="small"
@click="changeShowModal('local_import')"
>
{{ $t('common.import') }}
</NButton>
<NButton
size="small"
:loading="exportLoading"
@click="exportPromptTemplate()"
>
{{ $t('common.export') }}
</NButton>
<NPopconfirm @positive-click="clearPromptTemplate">
<template #trigger>
<NButton size="small">
{{ $t('common.clear') }}
</NButton>
</template>
{{ $t('store.clearStoreConfirm') }}
</NPopconfirm>
</div>
<div class="flex items-center">
<NInput v-model:value="searchValue" style="width: 100%" />
</div>
</div>
<br>
<NDataTable
:max-height="400"
:columns="columns"
:data="dataSource"
:pagination="pagination"
:bordered="false"
/>
</NTabPane>
<NTabPane name="download" :tab="$t('store.online')">
<p class="mb-4">
{{ $t('store.onlineImportWarning') }}
</p>
<div class="flex items-center gap-4">
<NInput v-model:value="downloadURL" placeholder="" />
<NButton <NButton
strong type="primary"
secondary size="small"
:disabled="downloadDisabled" @click="changeShowModal('add')"
:loading="importLoading"
@click="downloadPromptTemplate()"
> >
{{ $t('common.download') }} {{ $t('common.add') }}
</NButton> </NButton>
</div> <NButton
<NDivider /> size="small"
<NLayoutContent @click="changeShowModal('local_import')"
style="height: 360px"
content-style="background: none;"
:native-scrollbar="false"
>
<NCard
v-for="info in promptRecommendList"
:key="info.key" :title="info.key"
style="margin: 5px;"
embedded
:bordered="true"
> >
<p {{ $t('common.import') }}
class="overflow-hidden text-ellipsis whitespace-nowrap" </NButton>
:title="info.desc" <NButton
> size="small"
{{ info.desc }} :loading="exportLoading"
</p> @click="exportPromptTemplate()"
<template #footer> >
<div class="flex items-center justify-end space-x-4"> {{ $t('common.export') }}
<NButton text> </NButton>
<a <NPopconfirm @positive-click="clearPromptTemplate">
:href="info.url" <template #trigger>
target="_blank" <NButton size="small">
> {{ $t('common.clear') }}
<SvgIcon class="text-xl" icon="ri:link" /> </NButton>
</a>
</NButton>
<NButton text @click="setDownloadURL(info.downloadUrl) ">
<SvgIcon class="text-xl" icon="ri:add-fill" />
</NButton>
</div>
</template> </template>
</NCard> {{ $t('store.clearStoreConfirm') }}
</NLayoutContent> </NPopconfirm>
</NTabPane> </div>
</NTabs> <div class="flex items-center">
</div> <NInput v-model:value="searchValue" style="width: 100%" />
</NModal> </div>
<NModal v-model:show="showModal" style="width: 90%; max-width: 600px;" preset="card"> </div>
<NSpace v-if="modalMode === 'add' || modalMode === 'modify'" vertical> <NDataTable
{{ t('store.title') }} v-if="!isMobile"
<NInput v-model:value="tempPromptKey" /> :max-height="400"
{{ t('store.description') }} :columns="columns"
<NInput v-model:value="tempPromptValue" type="textarea" /> :data="dataSource"
<NButton :pagination="pagination"
block :bordered="false"
type="primary" />
:disabled="inputStatus" <NList v-if="isMobile" style="max-height: 400px; overflow-y: auto;">
@click="() => { modalMode === 'add' ? addPromptTemplate() : modifyPromptTemplate() }" <NListItem v-for="(item, index) of dataSource" :key="index">
> <NThing :title="item.renderKey" :description="item.renderValue" />
{{ t('common.confirm') }} <template #suffix>
</NButton> <div class="flex flex-col items-center gap-2">
</NSpace> <NButton tertiary size="small" type="info" @click="changeShowModal('modify', item)">
<NSpace v-if="modalMode === 'local_import'" vertical> {{ t('common.edit') }}
<NInput </NButton>
v-model:value="tempPromptValue" <NButton tertiary size="small" type="error" @click="deletePromptTemplate(item)">
:placeholder="t('store.importPlaceholder')" {{ t('common.delete') }}
:autosize="{ minRows: 3, maxRows: 15 }" </NButton>
type="textarea" </div>
/> </template>
<NButton </NListItem>
block </NList>
type="primary" </NTabPane>
:disabled="inputStatus" <NTabPane name="download" :tab="$t('store.online')">
@click="() => { importPromptTemplate() }" <p class="mb-4">
> {{ $t('store.onlineImportWarning') }}
{{ t('common.import') }} </p>
</NButton> <div class="flex items-center gap-4">
</NSpace> <NInput v-model:value="downloadURL" placeholder="" />
</NModal> <NButton
</NMessageProvider> strong
secondary
:disabled="downloadDisabled"
:loading="importLoading"
@click="downloadPromptTemplate()"
>
{{ $t('common.download') }}
</NButton>
</div>
<NDivider />
<div class="max-h-[360px] overflow-y-auto space-y-4">
<NCard
v-for="info in promptRecommendList"
:key="info.key" :title="info.key"
:bordered="true"
embedded
>
<p
class="overflow-hidden text-ellipsis whitespace-nowrap"
:title="info.desc"
>
{{ info.desc }}
</p>
<template #footer>
<div class="flex items-center justify-end space-x-4">
<NButton text>
<a
:href="info.url"
target="_blank"
>
<SvgIcon class="text-xl" icon="ri:link" />
</a>
</NButton>
<NButton text @click="setDownloadURL(info.downloadUrl) ">
<SvgIcon class="text-xl" icon="ri:add-fill" />
</NButton>
</div>
</template>
</NCard>
</div>
</NTabPane>
</NTabs>
</div>
</NModal>
<NModal v-model:show="showModal" style="width: 90%; max-width: 600px;" preset="card">
<NSpace v-if="modalMode === 'add' || modalMode === 'modify'" vertical>
{{ t('store.title') }}
<NInput v-model:value="tempPromptKey" />
{{ t('store.description') }}
<NInput v-model:value="tempPromptValue" type="textarea" />
<NButton
block
type="primary"
:disabled="inputStatus"
@click="() => { modalMode === 'add' ? addPromptTemplate() : modifyPromptTemplate() }"
>
{{ t('common.confirm') }}
</NButton>
</NSpace>
<NSpace v-if="modalMode === 'local_import'" vertical>
<NInput
v-model:value="tempPromptValue"
:placeholder="t('store.importPlaceholder')"
:autosize="{ minRows: 3, maxRows: 15 }"
type="textarea"
/>
<NButton
block
type="primary"
:disabled="inputStatus"
@click="() => { importPromptTemplate('local') }"
>
{{ t('common.import') }}
</NButton>
</NSpace>
</NModal>
</template> </template>

View File

@@ -1,8 +1,9 @@
<script setup lang='ts'> <script setup lang='ts'>
import { onMounted, ref } from 'vue' import { computed, onMounted, ref } from 'vue'
import { NSpin } from 'naive-ui' import { NSpin } from 'naive-ui'
import { fetchChatConfig } from '@/api' import { fetchChatConfig } from '@/api'
import pkg from '@/../package.json' import pkg from '@/../package.json'
import { useAuthStore } from '@/store'
interface ConfigState { interface ConfigState {
timeoutMs?: number timeoutMs?: number
@@ -10,12 +11,17 @@ interface ConfigState {
apiModel?: string apiModel?: string
socksProxy?: string socksProxy?: string
httpsProxy?: string httpsProxy?: string
balance?: string
} }
const authStore = useAuthStore()
const loading = ref(false) const loading = ref(false)
const config = ref<ConfigState>() const config = ref<ConfigState>()
const isChatGPTAPI = computed<boolean>(() => !!authStore.isChatGPTAPI)
async function fetchConfig() { async function fetchConfig() {
try { try {
loading.value = true loading.value = true
@@ -55,7 +61,12 @@ onMounted(() => {
</p> </p>
</div> </div>
<p>{{ $t("setting.api") }}{{ config?.apiModel ?? '-' }}</p> <p>{{ $t("setting.api") }}{{ config?.apiModel ?? '-' }}</p>
<p>{{ $t("setting.reverseProxy") }}{{ config?.reverseProxy ?? '-' }}</p> <p v-if="isChatGPTAPI">
{{ $t("setting.balance") }}{{ config?.balance ?? '-' }}
</p>
<p v-if="!isChatGPTAPI">
{{ $t("setting.reverseProxy") }}{{ config?.reverseProxy ?? '-' }}
</p>
<p>{{ $t("setting.timeout") }}{{ config?.timeoutMs ?? '-' }}</p> <p>{{ $t("setting.timeout") }}{{ config?.timeoutMs ?? '-' }}</p>
<p>{{ $t("setting.socks") }}{{ config?.socksProxy ?? '-' }}</p> <p>{{ $t("setting.socks") }}{{ config?.socksProxy ?? '-' }}</p>
<p>{{ $t("setting.httpsProxy") }}{{ config?.httpsProxy ?? '-' }}</p> <p>{{ $t("setting.httpsProxy") }}{{ config?.httpsProxy ?? '-' }}</p>

View File

@@ -0,0 +1,46 @@
<script lang="ts" setup>
import { ref } from 'vue'
import { NButton, NInput, useMessage } from 'naive-ui'
import { useSettingStore } from '@/store'
import type { SettingsState } from '@/store/modules/settings/helper'
import { t } from '@/locales'
const settingStore = useSettingStore()
const ms = useMessage()
const systemMessage = ref(settingStore.systemMessage ?? '')
function updateSettings(options: Partial<SettingsState>) {
settingStore.updateSetting(options)
ms.success(t('common.success'))
}
function handleReset() {
settingStore.resetSetting()
ms.success(t('common.success'))
window.location.reload()
}
</script>
<template>
<div class="p-4 space-y-5 min-h-[200px]">
<div class="space-y-6">
<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="" />
</div>
<NButton size="tiny" text type="primary" @click="updateSettings({ systemMessage })">
{{ $t('common.save') }}
</NButton>
</div>
<div class="flex items-center space-x-4">
<span class="flex-shrink-0 w-[100px]">&nbsp;</span>
<NButton size="small" @click="handleReset">
{{ $t('common.reset') }}
</NButton>
</div>
</div>
</div>
</template>

View File

@@ -150,7 +150,6 @@ function handleImportButtonClick(): void {
{{ $t('common.save') }} {{ $t('common.save') }}
</NButton> </NButton>
</div> </div>
<div <div
class="flex items-center space-x-4" class="flex items-center space-x-4"
:class="isMobile && 'items-start'" :class="isMobile && 'items-start'"

View File

@@ -2,13 +2,11 @@
import { computed, ref } from 'vue' import { computed, ref } from 'vue'
import { NModal, NTabPane, NTabs } from 'naive-ui' import { NModal, NTabPane, NTabs } from 'naive-ui'
import General from './General.vue' import General from './General.vue'
import Advanced from './Advanced.vue'
import About from './About.vue' import About from './About.vue'
import { useAuthStore } from '@/store'
import { SvgIcon } from '@/components/common' import { SvgIcon } from '@/components/common'
const props = defineProps<Props>()
const emit = defineEmits<Emit>()
interface Props { interface Props {
visible: boolean visible: boolean
} }
@@ -17,6 +15,14 @@ interface Emit {
(e: 'update:visible', visible: boolean): void (e: 'update:visible', visible: boolean): void
} }
const props = defineProps<Props>()
const emit = defineEmits<Emit>()
const authStore = useAuthStore()
const isChatGPTAPI = computed<boolean>(() => !!authStore.isChatGPTAPI)
const active = ref('General') const active = ref('General')
const show = computed({ const show = computed({
@@ -42,6 +48,15 @@ const show = computed({
<General /> <General />
</div> </div>
</NTabPane> </NTabPane>
<NTabPane v-if="isChatGPTAPI" name="Advanced" tab="Advanced">
<template #tab>
<SvgIcon class="text-lg" icon="ri:equalizer-line" />
<span class="ml-2">{{ $t('setting.advanced') }}</span>
</template>
<div class="min-h-[100px]">
<Advanced />
</div>
</NTabPane>
<NTabPane name="Config" tab="Config"> <NTabPane name="Config" tab="Config">
<template #tab> <template #tab>
<SvgIcon class="text-lg" icon="ri:list-settings-line" /> <SvgIcon class="text-lg" icon="ri:list-settings-line" />

View File

@@ -28,6 +28,7 @@ export default {
unauthorizedTips: 'Unauthorized, please verify first.', unauthorizedTips: 'Unauthorized, please verify first.',
}, },
chat: { chat: {
newChatButton: 'New Chat',
placeholder: 'Ask me anything...(Shift + Enter = line break)', placeholder: 'Ask me anything...(Shift + Enter = line break)',
placeholderMobile: 'Ask me anything...', placeholderMobile: 'Ask me anything...',
copy: 'Copy', copy: 'Copy',
@@ -46,14 +47,18 @@ export default {
deleteMessageConfirm: 'Are you sure to delete this message?', deleteMessageConfirm: 'Are you sure to delete this message?',
deleteHistoryConfirm: 'Are you sure to clear this history?', deleteHistoryConfirm: 'Are you sure to clear this history?',
clearHistoryConfirm: 'Are you sure to clear chat history?', clearHistoryConfirm: 'Are you sure to clear chat history?',
preview: 'Preview',
showRawText: 'Show as raw text',
}, },
setting: { setting: {
setting: 'Setting', setting: 'Setting',
general: 'General', general: 'General',
advanced: 'Advanced',
config: 'Config', config: 'Config',
avatarLink: 'Avatar Link', avatarLink: 'Avatar Link',
name: 'Name', name: 'Name',
description: 'Description', description: 'Description',
role: 'Role',
resetUserInfo: 'Reset UserInfo', resetUserInfo: 'Reset UserInfo',
chatHistory: 'ChatHistory', chatHistory: 'ChatHistory',
theme: 'Theme', theme: 'Theme',
@@ -63,8 +68,10 @@ export default {
timeout: 'Timeout', timeout: 'Timeout',
socks: 'Socks', socks: 'Socks',
httpsProxy: 'HTTPS Proxy', httpsProxy: 'HTTPS Proxy',
balance: 'API Balance',
}, },
store: { store: {
siderButton: 'Prompt Store',
local: 'Local', local: 'Local',
online: 'Online', online: 'Online',
title: 'Title', title: 'Title',

View File

@@ -28,6 +28,7 @@ export default {
unauthorizedTips: '未经授权,请先进行验证。', unauthorizedTips: '未经授权,请先进行验证。',
}, },
chat: { chat: {
newChatButton: '新建聊天',
placeholder: '来说点什么吧...Shift + Enter = 换行)', placeholder: '来说点什么吧...Shift + Enter = 换行)',
placeholderMobile: '来说点什么...', placeholderMobile: '来说点什么...',
copy: '复制', copy: '复制',
@@ -46,14 +47,18 @@ export default {
deleteMessageConfirm: '是否删除此消息?', deleteMessageConfirm: '是否删除此消息?',
deleteHistoryConfirm: '确定删除此记录?', deleteHistoryConfirm: '确定删除此记录?',
clearHistoryConfirm: '确定清空聊天记录?', clearHistoryConfirm: '确定清空聊天记录?',
preview: '预览',
showRawText: '显示原文',
}, },
setting: { setting: {
setting: '设置', setting: '设置',
general: '总览', general: '总览',
advanced: '高级',
config: '配置', config: '配置',
avatarLink: '头像链接', avatarLink: '头像链接',
name: '名称', name: '名称',
description: '描述', description: '描述',
role: '角色设定',
resetUserInfo: '重置用户信息', resetUserInfo: '重置用户信息',
chatHistory: '聊天记录', chatHistory: '聊天记录',
theme: '主题', theme: '主题',
@@ -63,8 +68,10 @@ export default {
timeout: '超时', timeout: '超时',
socks: 'Socks', socks: 'Socks',
httpsProxy: 'HTTPS Proxy', httpsProxy: 'HTTPS Proxy',
balance: 'API余额',
}, },
store: { store: {
siderButton: '提示词商店',
local: '本地', local: '本地',
online: '在线', online: '在线',
title: '标题', title: '标题',

View File

@@ -28,6 +28,7 @@ export default {
unauthorizedTips: '未經授權,請先進行驗證。', unauthorizedTips: '未經授權,請先進行驗證。',
}, },
chat: { chat: {
newChatButton: '新建對話',
placeholder: '來說點什麼...Shift + Enter = 換行)', placeholder: '來說點什麼...Shift + Enter = 換行)',
placeholderMobile: '來說點什麼...', placeholderMobile: '來說點什麼...',
copy: '複製', copy: '複製',
@@ -46,14 +47,18 @@ export default {
deleteMessageConfirm: '是否刪除此訊息?', deleteMessageConfirm: '是否刪除此訊息?',
deleteHistoryConfirm: '確定刪除此紀錄?', deleteHistoryConfirm: '確定刪除此紀錄?',
clearHistoryConfirm: '確定清除紀錄?', clearHistoryConfirm: '確定清除紀錄?',
preview: '預覽',
showRawText: '顯示原文',
}, },
setting: { setting: {
setting: '設定', setting: '設定',
general: '總覽', general: '總覽',
advanced: '高級',
config: '設定', config: '設定',
avatarLink: '頭貼連結', avatarLink: '頭貼連結',
name: '名稱', name: '名稱',
description: '描述', description: '描述',
role: '角色設定',
resetUserInfo: '重設使用者資訊', resetUserInfo: '重設使用者資訊',
chatHistory: '紀錄', chatHistory: '紀錄',
theme: '主題', theme: '主題',
@@ -63,8 +68,10 @@ export default {
timeout: '逾時', timeout: '逾時',
socks: 'Socks', socks: 'Socks',
httpsProxy: 'HTTPS Proxy', httpsProxy: 'HTTPS Proxy',
balance: 'API余額',
}, },
store: { store: {
siderButton: '提示詞商店',
local: '本機', local: '本機',
online: '線上', online: '線上',
title: '標題', title: '標題',

View File

@@ -1,7 +1,7 @@
import { createApp } from 'vue' import { createApp } from 'vue'
import App from './App.vue' import App from './App.vue'
import { setupI18n } from './locales' import { setupI18n } from './locales'
import { setupAssets } from './plugins' import { setupAssets, setupScrollbarStyle } from './plugins'
import { setupStore } from './store' import { setupStore } from './store'
import { setupRouter } from './router' import { setupRouter } from './router'
@@ -9,6 +9,8 @@ async function bootstrap() {
const app = createApp(App) const app = createApp(App)
setupAssets() setupAssets()
setupScrollbarStyle()
setupStore(app) setupStore(app)
setupI18n(app) setupI18n(app)

View File

@@ -1,3 +1,4 @@
import setupAssets from './assets' import setupAssets from './assets'
import setupScrollbarStyle from './scrollbarStyle'
export { setupAssets } export { setupAssets, setupScrollbarStyle }

View File

@@ -0,0 +1,28 @@
import { darkTheme, lightTheme } from 'naive-ui'
const setupScrollbarStyle = () => {
const style = document.createElement('style')
const styleContent = `
::-webkit-scrollbar {
background-color: transparent;
width: ${lightTheme.Scrollbar.common?.scrollbarWidth};
}
::-webkit-scrollbar-thumb {
background-color: ${lightTheme.Scrollbar.common?.scrollbarColor};
border-radius: ${lightTheme.Scrollbar.common?.scrollbarBorderRadius};
}
html.dark ::-webkit-scrollbar {
background-color: transparent;
width: ${darkTheme.Scrollbar.common?.scrollbarWidth};
}
html.dark ::-webkit-scrollbar-thumb {
background-color: ${darkTheme.Scrollbar.common?.scrollbarColor};
border-radius: ${darkTheme.Scrollbar.common?.scrollbarBorderRadius};
}
`
style.innerHTML = styleContent
document.head.appendChild(style)
}
export default setupScrollbarStyle

View File

@@ -2,17 +2,20 @@ import type { Router } from 'vue-router'
import { useAuthStoreWithout } from '@/store/modules/auth' import { useAuthStoreWithout } from '@/store/modules/auth'
export function setupPageGuard(router: Router) { export function setupPageGuard(router: Router) {
router.beforeEach(async (from, to, next) => { router.beforeEach(async (to, from, next) => {
const authStore = useAuthStoreWithout() const authStore = useAuthStoreWithout()
if (!authStore.session) { if (!authStore.session) {
try { try {
const data = await authStore.getSession() const data = await authStore.getSession()
if (String(data.auth) === 'false' && authStore.token) if (String(data.auth) === 'false' && authStore.token)
authStore.removeToken() authStore.removeToken()
next() if (to.path === '/500')
next({ name: 'Root' })
else
next()
} }
catch (error) { catch (error) {
if (from.path !== '/500') if (to.path !== '/500')
next({ name: '500' }) next({ name: '500' })
else else
next() next()

View File

@@ -3,9 +3,14 @@ import { getToken, removeToken, setToken } from './helper'
import { store } from '@/store' import { store } from '@/store'
import { fetchSession } from '@/api' import { fetchSession } from '@/api'
interface SessionResponse {
auth: boolean
model: 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI'
}
export interface AuthState { export interface AuthState {
token: string | undefined token: string | undefined
session: { auth: boolean } | null session: SessionResponse | null
} }
export const useAuthStore = defineStore('auth-store', { export const useAuthStore = defineStore('auth-store', {
@@ -14,10 +19,16 @@ export const useAuthStore = defineStore('auth-store', {
session: null, session: null,
}), }),
getters: {
isChatGPTAPI(state): boolean {
return state.session?.model === 'ChatGPTAPI'
},
},
actions: { actions: {
async getSession() { async getSession() {
try { try {
const { data } = await fetchSession<{ auth: boolean }>() const { data } = await fetchSession<SessionResponse>()
this.session = { ...data } this.session = { ...data }
return Promise.resolve(data) return Promise.resolve(data)
} }

View File

@@ -4,12 +4,17 @@ const LOCAL_NAME = 'chatStorage'
export function defaultState(): Chat.ChatState { export function defaultState(): Chat.ChatState {
const uuid = 1002 const uuid = 1002
return { active: uuid, history: [{ uuid, title: 'New Chat', isEdit: false }], chat: [{ uuid, data: [] }] } return {
active: uuid,
usingContext: true,
history: [{ uuid, title: 'New Chat', isEdit: false }],
chat: [{ uuid, data: [] }],
}
} }
export function getLocalState(): Chat.ChatState { export function getLocalState(): Chat.ChatState {
const localState = ss.get(LOCAL_NAME) const localState = ss.get(LOCAL_NAME)
return localState ?? defaultState() return { ...defaultState(), ...localState }
} }
export function setLocalState(state: Chat.ChatState) { export function setLocalState(state: Chat.ChatState) {

View File

@@ -23,6 +23,11 @@ export const useChatStore = defineStore('chat-store', {
}, },
actions: { actions: {
setUsingContext(context: boolean) {
this.usingContext = context
this.recordState()
},
addHistory(history: Chat.History, chatData: Chat.Chat[] = []) { addHistory(history: Chat.History, chatData: Chat.Chat[] = []) {
this.history.unshift(history) this.history.unshift(history)
this.chat.unshift({ uuid: history.uuid, data: chatData }) this.chat.unshift({ uuid: history.uuid, data: chatData })

View File

@@ -2,4 +2,5 @@ export * from './app'
export * from './chat' export * from './chat'
export * from './user' export * from './user'
export * from './prompt' export * from './prompt'
export * from './settings'
export * from './auth' export * from './auth'

View File

@@ -0,0 +1,27 @@
import { ss } from '@/utils/storage'
const LOCAL_NAME = 'settingsStorage'
export interface SettingsState {
systemMessage: string
}
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}`,
}
}
export function getLocalState(): SettingsState {
const localSetting: SettingsState | undefined = ss.get(LOCAL_NAME)
return { ...defaultSetting(), ...localSetting }
}
export function setLocalState(setting: SettingsState): void {
ss.set(LOCAL_NAME, setting)
}
export function removeLocalState() {
ss.remove(LOCAL_NAME)
}

View File

@@ -0,0 +1,22 @@
import { defineStore } from 'pinia'
import type { SettingsState } from './helper'
import { defaultSetting, getLocalState, removeLocalState, setLocalState } from './helper'
export const useSettingStore = defineStore('setting-store', {
state: (): SettingsState => getLocalState(),
actions: {
updateSetting(settings: Partial<SettingsState>) {
this.$state = { ...this.$state, ...settings }
this.recordState()
},
resetSetting() {
this.$state = defaultSetting()
removeLocalState()
},
recordState() {
setLocalState(this.$state)
},
},
})

View File

@@ -18,6 +18,7 @@ declare namespace Chat {
interface ChatState { interface ChatState {
active: number | null active: number | null
usingContext: boolean;
history: History[] history: History[]
chat: { uuid: number; data: Chat[] }[] chat: { uuid: number; data: Chat[] }[]
} }

View File

@@ -2,6 +2,7 @@
interface ImportMetaEnv { interface ImportMetaEnv {
readonly VITE_GLOB_API_URL: string; readonly VITE_GLOB_API_URL: string;
readonly VITE_GLOB_API_TIMEOUT: string;
readonly VITE_APP_API_BASE_URL: string; readonly VITE_APP_API_BASE_URL: string;
readonly VITE_GLOB_OPEN_LONG_REPLY: string;
readonly VITE_GLOB_APP_PWA: string;
} }

View File

@@ -0,0 +1,18 @@
type CallbackFunc<T extends unknown[]> = (...args: T) => void
export function debounce<T extends unknown[]>(
func: CallbackFunc<T>,
wait: number,
): (...args: T) => void {
let timeoutId: ReturnType<typeof setTimeout> | undefined
return (...args: T) => {
const later = () => {
clearTimeout(timeoutId)
func(...args)
}
clearTimeout(timeoutId)
timeoutId = setTimeout(later, wait)
}
}

View File

@@ -2,6 +2,7 @@
import { computed, ref } from 'vue' import { computed, ref } from 'vue'
import MarkdownIt from 'markdown-it' import MarkdownIt from 'markdown-it'
import mdKatex from '@traptitech/markdown-it-katex' import mdKatex from '@traptitech/markdown-it-katex'
import mila from 'markdown-it-link-attributes'
import hljs from 'highlight.js' import hljs from 'highlight.js'
import { useBasicLayout } from '@/hooks/useBasicLayout' import { useBasicLayout } from '@/hooks/useBasicLayout'
import { t } from '@/locales' import { t } from '@/locales'
@@ -11,6 +12,7 @@ interface Props {
error?: boolean error?: boolean
text?: string text?: string
loading?: boolean loading?: boolean
asRawText?: boolean
} }
const props = defineProps<Props>() const props = defineProps<Props>()
@@ -25,12 +27,13 @@ const mdi = new MarkdownIt({
const validLang = !!(language && hljs.getLanguage(language)) const validLang = !!(language && hljs.getLanguage(language))
if (validLang) { if (validLang) {
const lang = language ?? '' const lang = language ?? ''
return highlightBlock(hljs.highlight(lang, code, true).value, lang) return highlightBlock(hljs.highlight(code, { language: lang }).value, lang)
} }
return highlightBlock(hljs.highlightAuto(code).value, '') return highlightBlock(hljs.highlightAuto(code).value, '')
}, },
}) })
mdi.use(mila, { attrs: { target: '_blank', rel: 'noopener' } })
mdi.use(mdKatex, { blockClass: 'katexmath-block rounded-md p-[10px]', errorColor: ' #cc0000' }) mdi.use(mdKatex, { blockClass: 'katexmath-block rounded-md p-[10px]', errorColor: ' #cc0000' })
const wrapClass = computed(() => { const wrapClass = computed(() => {
@@ -41,13 +44,14 @@ const wrapClass = computed(() => {
isMobile.value ? 'p-2' : 'px-3 py-2', isMobile.value ? 'p-2' : 'px-3 py-2',
props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]', props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]', props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]',
props.inversion ? 'message-request' : 'message-reply',
{ 'text-red-500': props.error }, { 'text-red-500': props.error },
] ]
}) })
const text = computed(() => { const text = computed(() => {
const value = props.text ?? '' const value = props.text ?? ''
if (!props.inversion) if (!props.asRawText)
return mdi.render(value) return mdi.render(value)
return value return value
}) })
@@ -66,7 +70,10 @@ defineExpose({ textRef })
</template> </template>
<template v-else> <template v-else>
<div ref="textRef" class="leading-relaxed break-words"> <div ref="textRef" class="leading-relaxed break-words">
<div v-if="!inversion" class="markdown-body" v-html="text" /> <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 v-else class="whitespace-pre-wrap" v-text="text" />
</div> </div>
</template> </template>

View File

@@ -1,5 +1,5 @@
<script setup lang='ts'> <script setup lang='ts'>
import { ref } from 'vue' import { computed, ref } from 'vue'
import { NDropdown } from 'naive-ui' import { NDropdown } from 'naive-ui'
import AvatarComponent from './Avatar.vue' import AvatarComponent from './Avatar.vue'
import TextComponent from './Text.vue' import TextComponent from './Text.vue'
@@ -7,6 +7,7 @@ import { SvgIcon } from '@/components/common'
import { copyText } from '@/utils/format' import { copyText } from '@/utils/format'
import { useIconRender } from '@/hooks/useIconRender' import { useIconRender } from '@/hooks/useIconRender'
import { t } from '@/locales' import { t } from '@/locales'
import { useBasicLayout } from '@/hooks/useBasicLayout'
interface Props { interface Props {
dateTime?: string dateTime?: string
@@ -25,40 +26,66 @@ const props = defineProps<Props>()
const emit = defineEmits<Emit>() const emit = defineEmits<Emit>()
const { isMobile } = useBasicLayout()
const { iconRender } = useIconRender() const { iconRender } = useIconRender()
const textRef = ref<HTMLElement>() const textRef = ref<HTMLElement>()
const options = [ const asRawText = ref(props.inversion)
{
label: t('chat.copy'),
key: 'copyText',
icon: iconRender({ icon: 'ri:file-copy-2-line' }),
},
{
label: t('common.delete'),
key: 'delete',
icon: iconRender({ icon: 'ri:delete-bin-line' }),
},
]
function handleSelect(key: 'copyRaw' | 'copyText' | 'delete') { const messageRef = ref<HTMLElement>()
const options = computed(() => {
const common = [
{
label: t('chat.copy'),
key: 'copyText',
icon: iconRender({ icon: 'ri:file-copy-2-line' }),
},
{
label: t('common.delete'),
key: 'delete',
icon: iconRender({ icon: 'ri:delete-bin-line' }),
},
]
if (!props.inversion) {
common.unshift({
label: asRawText.value ? t('chat.preview') : t('chat.showRawText'),
key: 'toggleRenderType',
icon: iconRender({ icon: asRawText.value ? 'ic:outline-code-off' : 'ic:outline-code' }),
})
}
return common
})
function handleSelect(key: 'copyText' | 'delete' | 'toggleRenderType') {
switch (key) { switch (key) {
case 'copyText': case 'copyText':
copyText({ text: props.text ?? '' }) copyText({ text: props.text ?? '' })
return return
case 'toggleRenderType':
asRawText.value = !asRawText.value
return
case 'delete': case 'delete':
emit('delete') emit('delete')
} }
} }
function handleRegenerate() { function handleRegenerate() {
messageRef.value?.scrollIntoView()
emit('regenerate') emit('regenerate')
} }
</script> </script>
<template> <template>
<div class="flex w-full mb-6 overflow-hidden" :class="[{ 'flex-row-reverse': inversion }]"> <div
ref="messageRef"
class="flex w-full mb-6 overflow-hidden"
:class="[{ 'flex-row-reverse': inversion }]"
>
<div <div
class="flex items-center justify-center flex-shrink-0 h-8 overflow-hidden rounded-full basis-8" class="flex items-center justify-center flex-shrink-0 h-8 overflow-hidden rounded-full basis-8"
:class="[inversion ? 'ml-2' : 'mr-2']" :class="[inversion ? 'ml-2' : 'mr-2']"
@@ -79,6 +106,7 @@ function handleRegenerate() {
:error="error" :error="error"
:text="text" :text="text"
:loading="loading" :loading="loading"
:as-raw-text="asRawText"
/> />
<div class="flex flex-col"> <div class="flex flex-col">
<button <button
@@ -88,7 +116,12 @@ function handleRegenerate() {
> >
<SvgIcon icon="ri:restart-line" /> <SvgIcon icon="ri:restart-line" />
</button> </button>
<NDropdown :placement="!inversion ? 'right' : 'left'" :options="options" @select="handleSelect"> <NDropdown
:trigger="isMobile ? 'click' : 'hover'"
:placement="!inversion ? 'right' : 'left'"
:options="options"
@select="handleSelect"
>
<button class="transition text-neutral-300 hover:text-neutral-800 dark:hover:text-neutral-200"> <button class="transition text-neutral-300 hover:text-neutral-800 dark:hover:text-neutral-200">
<SvgIcon icon="ri:more-2-fill" /> <SvgIcon icon="ri:more-2-fill" />
</button> </button>

View File

@@ -45,20 +45,29 @@
align-items: center; align-items: center;
color: #b3b3b3; color: #b3b3b3;
&__copy{ &__copy {
cursor: pointer; cursor: pointer;
margin-left: 0.5rem; margin-left: 0.5rem;
user-select: none; user-select: none;
&:hover { &:hover {
color: #65a665; color: #65a665;
} }
} }
} }
} }
} }
html.dark { html.dark {
.message-reply {
.whitespace-pre-wrap {
white-space: pre-wrap;
color: var(--n-text-color);
}
}
.highlight pre, .highlight pre,
pre { pre {
background-color: #282c34; background-color: #282c34;

View File

@@ -28,7 +28,7 @@ export function useScroll(): ScrollReturn {
const scrollToBottomIfAtBottom = async () => { const scrollToBottomIfAtBottom = async () => {
await nextTick() await nextTick()
if (scrollRef.value) { if (scrollRef.value) {
const threshold = 50 // 阈值,表示滚动条到底部的距离阈值 const threshold = 100 // 阈值,表示滚动条到底部的距离阈值
const distanceToBottom = scrollRef.value.scrollHeight - scrollRef.value.scrollTop - scrollRef.value.clientHeight const distanceToBottom = scrollRef.value.scrollHeight - scrollRef.value.scrollTop - scrollRef.value.clientHeight
if (distanceToBottom <= threshold) if (distanceToBottom <= threshold)
scrollRef.value.scrollTop = scrollRef.value.scrollHeight scrollRef.value.scrollTop = scrollRef.value.scrollHeight

View File

@@ -1,13 +1,15 @@
import { ref } from 'vue' import { computed } from 'vue'
import { useMessage } from 'naive-ui' import { useMessage } from 'naive-ui'
import { t } from '@/locales' import { t } from '@/locales'
import { useChatStore } from '@/store'
export function useUsingContext() { export function useUsingContext() {
const ms = useMessage() const ms = useMessage()
const usingContext = ref<boolean>(true) const chatStore = useChatStore()
const usingContext = computed<boolean>(() => chatStore.usingContext)
function toggleUsingContext() { function toggleUsingContext() {
usingContext.value = !usingContext.value chatStore.setUsingContext(!usingContext.value)
if (usingContext.value) if (usingContext.value)
ms.success(t('chat.turnOnContext')) ms.success(t('chat.turnOnContext'))
else else

View File

@@ -1,4 +1,5 @@
<script setup lang='ts'> <script setup lang='ts'>
import type { Ref } from 'vue'
import { computed, onMounted, onUnmounted, ref } from 'vue' import { computed, onMounted, onUnmounted, ref } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
import { storeToRefs } from 'pinia' import { storeToRefs } from 'pinia'
@@ -30,7 +31,7 @@ useCopyCode()
const { isMobile } = useBasicLayout() const { isMobile } = useBasicLayout()
const { addChat, updateChat, updateChatSome, getChatByUuidAndIndex } = useChat() const { addChat, updateChat, updateChatSome, getChatByUuidAndIndex } = useChat()
const { scrollRef, scrollToBottom } = useScroll() const { scrollRef, scrollToBottom, scrollToBottomIfAtBottom } = useScroll()
const { usingContext, toggleUsingContext } = useUsingContext() const { usingContext, toggleUsingContext } = useUsingContext()
const { uuid } = route.params as { uuid: string } const { uuid } = route.params as { uuid: string }
@@ -40,12 +41,20 @@ const conversationList = computed(() => dataSources.value.filter(item => (!item.
const prompt = ref<string>('') const prompt = ref<string>('')
const loading = ref<boolean>(false) const loading = ref<boolean>(false)
const inputRef = ref<Ref | null>(null)
// 添加PromptStore // 添加PromptStore
const promptStore = usePromptStore() const promptStore = usePromptStore()
// 使用storeToRefs保证store修改后联想部分能够重新渲染 // 使用storeToRefs保证store修改后联想部分能够重新渲染
const { promptList: promptTemplate } = storeToRefs<any>(promptStore) const { promptList: promptTemplate } = storeToRefs<any>(promptStore)
// 未知原因刷新页面loading 状态不会重置,手动重置
dataSources.value.forEach((item, index) => {
if (item.loading)
updateChatSome(+uuid, index, { loading: false })
})
function handleSubmit() { function handleSubmit() {
onConversation() onConversation()
} }
@@ -98,7 +107,9 @@ async function onConversation() {
scrollToBottom() scrollToBottom()
try { try {
let lastText = '' const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
let renderText = ''
let firstTime = true
const fetchChatAPIOnce = async () => { const fetchChatAPIOnce = async () => {
await fetchChatAPIProcess<Chat.ConversationResponse>({ await fetchChatAPIProcess<Chat.ConversationResponse>({
prompt: message, prompt: message,
@@ -108,42 +119,49 @@ async function onConversation() {
const xhr = event.target const xhr = event.target
const { responseText } = xhr const { responseText } = xhr
// Always process the final line // Always process the final line
const lastIndex = responseText.lastIndexOf('\n')
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: false,
conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
requestOptions: { prompt: message, options: { ...options } },
},
)
if (openLongReply && data.detail.choices[0].finish_reason === 'length') { const splitIndexBegin = responseText.search(magicSplit)
options.parentMessageId = data.id if (splitIndexBegin !== -1) {
lastText = data.text const splitIndexEnd = splitIndexBegin + magicSplit.length
message = ''
return fetchChatAPIOnce() 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) {
//
} }
scrollToBottom()
}
catch (error) {
//
} }
}, },
}) })
} }
await fetchChatAPIOnce() await fetchChatAPIOnce()
} }
catch (error: any) { catch (error: any) {
@@ -157,7 +175,7 @@ async function onConversation() {
loading: false, loading: false,
}, },
) )
scrollToBottom() scrollToBottomIfAtBottom()
return return
} }
@@ -189,7 +207,7 @@ async function onConversation() {
requestOptions: { prompt: message, options: { ...options } }, requestOptions: { prompt: message, options: { ...options } },
}, },
) )
scrollToBottom() scrollToBottomIfAtBottom()
} }
finally { finally {
loading.value = false loading.value = false
@@ -228,7 +246,9 @@ async function onRegenerate(index: number) {
) )
try { try {
let lastText = '' const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
let renderText = ''
let firstTime = true
const fetchChatAPIOnce = async () => { const fetchChatAPIOnce = async () => {
await fetchChatAPIProcess<Chat.ConversationResponse>({ await fetchChatAPIProcess<Chat.ConversationResponse>({
prompt: message, prompt: message,
@@ -238,35 +258,45 @@ async function onRegenerate(index: number) {
const xhr = event.target const xhr = event.target
const { responseText } = xhr const { responseText } = xhr
// Always process the final line // Always process the final line
const lastIndex = responseText.lastIndexOf('\n')
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: false,
conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
requestOptions: { prompt: message, ...options },
},
)
if (openLongReply && data.detail.choices[0].finish_reason === 'length') { const splitIndexBegin = responseText.search(magicSplit)
options.parentMessageId = data.id if (splitIndexBegin !== -1) {
lastText = data.text const splitIndexEnd = splitIndexBegin + magicSplit.length
message = ''
return fetchChatAPIOnce() 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) {
//
} }
}
catch (error) {
//
} }
}, },
}) })
@@ -416,6 +446,7 @@ const searchOptions = computed(() => {
return [] return []
} }
}) })
// value反渲染key // value反渲染key
const renderOption = (option: { label: string }) => { const renderOption = (option: { label: string }) => {
for (const i of promptTemplate.value) { for (const i of promptTemplate.value) {
@@ -444,6 +475,8 @@ const footerClass = computed(() => {
onMounted(() => { onMounted(() => {
scrollToBottom() scrollToBottom()
if (inputRef.value && !isMobile.value)
inputRef.value?.focus()
}) })
onUnmounted(() => { onUnmounted(() => {
@@ -455,20 +488,13 @@ onUnmounted(() => {
<template> <template>
<div class="flex flex-col w-full h-full"> <div class="flex flex-col w-full h-full">
<HeaderComponent <HeaderComponent
v-if="isMobile" v-if="isMobile" :using-context="usingContext" @export="handleExport"
:using-context="usingContext"
@export="handleExport"
@toggle-using-context="toggleUsingContext" @toggle-using-context="toggleUsingContext"
/> />
<main class="flex-1 overflow-hidden"> <main class="flex-1 overflow-hidden">
<div <div id="scrollRef" ref="scrollRef" class="h-full overflow-hidden overflow-y-auto">
id="scrollRef"
ref="scrollRef"
class="h-full overflow-hidden overflow-y-auto"
>
<div <div
id="image-wrapper" id="image-wrapper" class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
:class="[isMobile ? 'p-2' : 'p-4']" :class="[isMobile ? 'p-2' : 'p-4']"
> >
<template v-if="!dataSources.length"> <template v-if="!dataSources.length">
@@ -480,14 +506,8 @@ onUnmounted(() => {
<template v-else> <template v-else>
<div> <div>
<Message <Message
v-for="(item, index) of dataSources" v-for="(item, index) of dataSources" :key="index" :date-time="item.dateTime" :text="item.text"
:key="index" :inversion="item.inversion" :error="item.error" :loading="item.loading" @regenerate="onRegenerate(index)"
:date-time="item.dateTime"
:text="item.text"
:inversion="item.inversion"
:error="item.error"
:loading="item.loading"
@regenerate="onRegenerate(index)"
@delete="handleDelete(index)" @delete="handleDelete(index)"
/> />
<div class="sticky bottom-0 left-0 flex justify-center"> <div class="sticky bottom-0 left-0 flex justify-center">
@@ -524,14 +544,9 @@ onUnmounted(() => {
<NAutoComplete v-model:value="prompt" :options="searchOptions" :render-label="renderOption"> <NAutoComplete v-model:value="prompt" :options="searchOptions" :render-label="renderOption">
<template #default="{ handleInput, handleBlur, handleFocus }"> <template #default="{ handleInput, handleBlur, handleFocus }">
<NInput <NInput
v-model:value="prompt" ref="inputRef" v-model:value="prompt" type="textarea" :placeholder="placeholder"
type="textarea" :autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }" @input="handleInput" @focus="handleFocus"
:placeholder="placeholder" @blur="handleBlur" @keypress="handleEnter"
:autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }"
@input="handleInput"
@focus="handleFocus"
@blur="handleBlur"
@keypress="handleEnter"
/> />
</template> </template>
</NAutoComplete> </NAutoComplete>

View File

@@ -12,7 +12,8 @@ const show = ref(false)
<div class="flex-1 flex-shrink-0 overflow-hidden"> <div class="flex-1 flex-shrink-0 overflow-hidden">
<UserAvatar /> <UserAvatar />
</div> </div>
<HoverButton :tooltip="$t('setting.setting')" @click="show = true">
<HoverButton @click="show = true">
<span class="text-xl text-[#4f555e] dark:text-white"> <span class="text-xl text-[#4f555e] dark:text-white">
<SvgIcon icon="ri:settings-4-line" /> <SvgIcon icon="ri:settings-4-line" />
</span> </span>

View File

@@ -4,6 +4,7 @@ import { NInput, NPopconfirm, NScrollbar } from 'naive-ui'
import { SvgIcon } from '@/components/common' import { SvgIcon } from '@/components/common'
import { useAppStore, useChatStore } from '@/store' import { useAppStore, useChatStore } from '@/store'
import { useBasicLayout } from '@/hooks/useBasicLayout' import { useBasicLayout } from '@/hooks/useBasicLayout'
import { debounce } from '@/utils/functions/debounce'
const { isMobile } = useBasicLayout() const { isMobile } = useBasicLayout()
@@ -32,8 +33,12 @@ function handleEdit({ uuid }: Chat.History, isEdit: boolean, event?: MouseEvent)
function handleDelete(index: number, event?: MouseEvent | TouchEvent) { function handleDelete(index: number, event?: MouseEvent | TouchEvent) {
event?.stopPropagation() event?.stopPropagation()
chatStore.deleteHistory(index) chatStore.deleteHistory(index)
if (isMobile.value)
appStore.setSiderCollapsed(true)
} }
const handleDeleteDebounce = debounce(handleDelete, 600)
function handleEnter({ uuid }: Chat.History, isEdit: boolean, event: KeyboardEvent) { function handleEnter({ uuid }: Chat.History, isEdit: boolean, event: KeyboardEvent) {
event?.stopPropagation() event?.stopPropagation()
if (event.key === 'Enter') if (event.key === 'Enter')
@@ -67,8 +72,7 @@ function isActive(uuid: number) {
<div class="relative flex-1 overflow-hidden break-all text-ellipsis whitespace-nowrap"> <div class="relative flex-1 overflow-hidden break-all text-ellipsis whitespace-nowrap">
<NInput <NInput
v-if="item.isEdit" v-if="item.isEdit"
v-model:value="item.title" v-model:value="item.title" size="tiny"
size="tiny"
@keypress="handleEnter(item, false, $event)" @keypress="handleEnter(item, false, $event)"
/> />
<span v-else>{{ item.title }}</span> <span v-else>{{ item.title }}</span>
@@ -83,7 +87,7 @@ function isActive(uuid: number) {
<button class="p-1"> <button class="p-1">
<SvgIcon icon="ri:edit-line" @click="handleEdit(item, true, $event)" /> <SvgIcon icon="ri:edit-line" @click="handleEdit(item, true, $event)" />
</button> </button>
<NPopconfirm placement="bottom" @positive-click="handleDelete(index, $event)"> <NPopconfirm placement="bottom" @positive-click="handleDeleteDebounce(index, $event)">
<template #trigger> <template #trigger>
<button class="p-1"> <button class="p-1">
<SvgIcon icon="ri:delete-bin-line" /> <SvgIcon icon="ri:delete-bin-line" />

View File

@@ -18,6 +18,8 @@ const collapsed = computed(() => appStore.siderCollapsed)
function handleAdd() { function handleAdd() {
chatStore.addHistory({ title: 'New Chat', uuid: Date.now(), isEdit: false }) chatStore.addHistory({ title: 'New Chat', uuid: Date.now(), isEdit: false })
if (isMobile.value)
appStore.setSiderCollapsed(true)
} }
function handleUpdateCollapsed() { function handleUpdateCollapsed() {
@@ -71,7 +73,7 @@ watch(
<main class="flex flex-col flex-1 min-h-0"> <main class="flex flex-col flex-1 min-h-0">
<div class="p-4"> <div class="p-4">
<NButton dashed block @click="handleAdd"> <NButton dashed block @click="handleAdd">
New chat {{ $t('chat.newChatButton') }}
</NButton> </NButton>
</div> </div>
<div class="flex-1 min-h-0 pb-4 overflow-hidden"> <div class="flex-1 min-h-0 pb-4 overflow-hidden">
@@ -79,7 +81,7 @@ watch(
</div> </div>
<div class="p-4"> <div class="p-4">
<NButton block @click="show = true"> <NButton block @click="show = true">
Prompt Store {{ $t('store.siderButton') }}
</NButton> </NButton>
</div> </div>
</main> </main>

9
start.cmd Normal file
View File

@@ -0,0 +1,9 @@
cd ./service
start pnpm start > service.log &
echo "Start service complete!"
cd ..
echo "" > front.log
start pnpm dev > front.log &
echo "Start front complete!"

View File

@@ -1,8 +1,26 @@
import path from 'path' import path from 'path'
import type { PluginOption } from 'vite'
import { defineConfig, loadEnv } from 'vite' import { defineConfig, loadEnv } from 'vite'
import vue from '@vitejs/plugin-vue' import vue from '@vitejs/plugin-vue'
import { VitePWA } from 'vite-plugin-pwa' import { VitePWA } from 'vite-plugin-pwa'
function setupPlugins(env: ImportMetaEnv): PluginOption[] {
return [
vue(),
env.VITE_GLOB_APP_PWA === 'true' && VitePWA({
injectRegister: 'auto',
manifest: {
name: 'chatGPT',
short_name: 'chatGPT',
icons: [
{ src: 'pwa-192x192.png', sizes: '192x192', type: 'image/png' },
{ src: 'pwa-512x512.png', sizes: '512x512', type: 'image/png' },
],
},
}),
]
}
export default defineConfig((env) => { export default defineConfig((env) => {
const viteEnv = loadEnv(env.mode, process.cwd()) as unknown as ImportMetaEnv const viteEnv = loadEnv(env.mode, process.cwd()) as unknown as ImportMetaEnv
@@ -12,20 +30,7 @@ export default defineConfig((env) => {
'@': path.resolve(process.cwd(), 'src'), '@': path.resolve(process.cwd(), 'src'),
}, },
}, },
plugins: [ plugins: setupPlugins(viteEnv),
vue(),
VitePWA({
injectRegister: 'auto',
manifest: {
name: 'chatGPT',
short_name: 'chatGPT',
icons: [
{ src: 'pwa-192x192.png', sizes: '192x192', type: 'image/png' },
{ src: 'pwa-512x512.png', sizes: '512x512', type: 'image/png' },
],
},
}),
],
server: { server: {
host: '0.0.0.0', host: '0.0.0.0',
port: 1002, port: 1002,