Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
71c5a88c01 | ||
|
|
a8e9a24ca7 | ||
|
|
95724845cf | ||
|
|
c5552893d7 | ||
|
|
e46d3685a0 | ||
|
|
116ed7b0bf | ||
|
|
2ad7567548 | ||
|
|
b3cfe7a976 | ||
|
|
0b13846861 | ||
|
|
951e9d8d39 | ||
|
|
1411c45811 | ||
|
|
c797ff5cb3 | ||
|
|
25692f8371 | ||
|
|
3a1466bace |
25
CHANGELOG.md
25
CHANGELOG.md
@@ -1,3 +1,28 @@
|
|||||||
|
## 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`
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
16
README.md
16
README.md
@@ -213,13 +213,13 @@ services:
|
|||||||
- 3002:3002
|
- 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 时可用
|
||||||
OPENAI_API_MODEL: xxxx
|
OPENAI_API_MODEL: xxx
|
||||||
# 反向代理,可选
|
# 反向代理,可选
|
||||||
API_REVERSE_PROXY: xxx
|
API_REVERSE_PROXY: xxx
|
||||||
# 访问权限密钥,可选
|
# 访问权限密钥,可选
|
||||||
@@ -227,11 +227,11 @@ services:
|
|||||||
# 超时,单位毫秒,可选
|
# 超时,单位毫秒,可选
|
||||||
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 代理,可选,支持 http,https,socks5
|
# HTTPS 代理,可选,支持 http,https,socks5
|
||||||
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` 时可用
|
||||||
@@ -279,7 +279,7 @@ PS: 不进行打包,直接在服务器上运行 `pnpm start` 也可
|
|||||||
|
|
||||||
#### 前端网页
|
#### 前端网页
|
||||||
|
|
||||||
1、修改根目录下 `.env` 文件中的 `VITE_APP_API_BASE_URL` 为你的实际后端接口地址
|
1、修改根目录下 `.env` 文件中的 `VITE_GLOB_API_URL` 为你的实际后端接口地址
|
||||||
|
|
||||||
2、根目录下运行以下命令,然后将 `dist` 文件夹内的文件复制到你网站服务的根目录下
|
2、根目录下运行以下命令,然后将 `dist` 文件夹内的文件复制到你网站服务的根目录下
|
||||||
|
|
||||||
|
|||||||
@@ -7,13 +7,13 @@ 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
|
||||||
# 访问权限密钥,可选
|
# 访问权限密钥,可选
|
||||||
@@ -21,11 +21,11 @@ services:
|
|||||||
# 超时,单位毫秒,可选
|
# 超时,单位毫秒,可选
|
||||||
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:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "chatgpt-web",
|
"name": "chatgpt-web",
|
||||||
"version": "2.10.5",
|
"version": "2.10.6",
|
||||||
"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"
|
||||||
@@ -57,7 +57,7 @@
|
|||||||
"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"
|
||||||
},
|
},
|
||||||
|
|||||||
174
pnpm-lock.yaml
generated
174
pnpm-lock.yaml
generated
@@ -25,12 +25,12 @@ specifiers:
|
|||||||
markdown-it: ^13.0.1
|
markdown-it: ^13.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
|
||||||
@@ -59,7 +59,7 @@ devDependencies:
|
|||||||
'@types/katex': 0.16.0
|
'@types/katex': 0.16.0
|
||||||
'@types/markdown-it': 12.2.3
|
'@types/markdown-it': 12.2.3
|
||||||
'@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
|
||||||
@@ -72,8 +72,8 @@ devDependencies:
|
|||||||
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 +1531,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 +1540,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 +1549,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 +1558,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 +1567,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 +1576,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 +1585,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 +1594,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 +1603,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 +1612,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 +1621,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 +1630,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 +1639,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 +1648,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 +1657,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 +1666,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 +1675,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 +1684,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 +1693,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 +1702,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 +1711,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 +1720,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]
|
||||||
@@ -2246,14 +2246,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 +3317,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 +3912,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 +3922,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 +4083,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 +4580,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 +4615,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 +4704,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
|
||||||
@@ -6395,7 +6395,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 +6405,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 +6413,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 +6439,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
|
||||||
|
|||||||
@@ -24,7 +24,8 @@
|
|||||||
"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.1",
|
||||||
"dotenv": "^16.0.3",
|
"dotenv": "^16.0.3",
|
||||||
"esno": "^0.16.3",
|
"esno": "^0.16.3",
|
||||||
"express": "^4.18.2",
|
"express": "^4.18.2",
|
||||||
|
|||||||
59
service/pnpm-lock.yaml
generated
59
service/pnpm-lock.yaml
generated
@@ -4,7 +4,8 @@ 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.1
|
||||||
dotenv: ^16.0.3
|
dotenv: ^16.0.3
|
||||||
eslint: ^8.35.0
|
eslint: ^8.35.0
|
||||||
esno: ^0.16.3
|
esno: ^0.16.3
|
||||||
@@ -18,7 +19,8 @@ specifiers:
|
|||||||
typescript: ^4.9.5
|
typescript: ^4.9.5
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
chatgpt: 5.0.10
|
axios: 1.3.4
|
||||||
|
chatgpt: 5.1.1
|
||||||
dotenv: 16.0.3
|
dotenv: 16.0.3
|
||||||
esno: 0.16.3
|
esno: 0.16.3
|
||||||
express: 4.18.2
|
express: 4.18.2
|
||||||
@@ -766,6 +768,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 +784,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,8 +920,8 @@ packages:
|
|||||||
resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
|
resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
/chatgpt/5.0.10:
|
/chatgpt/5.1.1:
|
||||||
resolution: {integrity: sha512-R3vtPlhCapFLkDXED0Cnt1DBcOZAXygr0M5U5kbSI0Fwm4uDQmc7qoIOnr17rd8eaa0JO/UDOevJdEWvd079qA==}
|
resolution: {integrity: sha512-ml1u4/KqXdAKfaRwqE0uvRTh5JoRgosstH2LF4PpsawG7MUtIzAVaE/MMEAaV02uGbOlAH4IgKI3mDHkQ0Dmlw==}
|
||||||
engines: {node: '>=14'}
|
engines: {node: '>=14'}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -966,6 +982,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 +1105,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'}
|
||||||
@@ -1852,12 +1880,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 +2965,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'}
|
||||||
|
|||||||
@@ -5,7 +5,9 @@ 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'
|
||||||
|
|
||||||
const ErrorCodeMessage: Record<string, string> = {
|
const ErrorCodeMessage: Record<string, string> = {
|
||||||
@@ -33,36 +35,18 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
|
|||||||
|
|
||||||
if (process.env.OPENAI_API_KEY) {
|
if (process.env.OPENAI_API_KEY) {
|
||||||
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)
|
if (isNotEmptyString(process.env.OPENAI_API_BASE_URL))
|
||||||
options.apiBaseUrl = process.env.OPENAI_API_BASE_URL
|
options.apiBaseUrl = process.env.OPENAI_API_BASE_URL
|
||||||
|
|
||||||
if (process.env.SOCKS_PROXY_HOST && process.env.SOCKS_PROXY_PORT) {
|
setupProxy(options)
|
||||||
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 })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
api = new ChatGPTAPI({ ...options })
|
api = new ChatGPTAPI({ ...options })
|
||||||
apiModel = 'ChatGPTAPI'
|
apiModel = 'ChatGPTAPI'
|
||||||
@@ -70,30 +54,14 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
|
|||||||
else {
|
else {
|
||||||
const options: ChatGPTUnofficialProxyAPIOptions = {
|
const options: ChatGPTUnofficialProxyAPIOptions = {
|
||||||
accessToken: process.env.OPENAI_ACCESS_TOKEN,
|
accessToken: process.env.OPENAI_ACCESS_TOKEN,
|
||||||
debug: false,
|
debug: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
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'
|
||||||
}
|
}
|
||||||
@@ -104,9 +72,6 @@ async function chatReplyProcess(
|
|||||||
lastContext?: { conversationId?: string; parentMessageId?: string },
|
lastContext?: { conversationId?: string; parentMessageId?: string },
|
||||||
process?: (chat: ChatMessage) => void,
|
process?: (chat: ChatMessage) => void,
|
||||||
) {
|
) {
|
||||||
// if (!message)
|
|
||||||
// return sendResponse({ type: 'Fail', message: 'Message is empty' })
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let options: SendMessageOptions = { timeoutMs }
|
let options: SendMessageOptions = { timeoutMs }
|
||||||
|
|
||||||
@@ -135,21 +100,65 @@ 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
|
||||||
|
if (!isNotEmptyString(OPENAI_API_KEY))
|
||||||
|
return Promise.resolve('-')
|
||||||
|
|
||||||
return sendResponse({
|
try {
|
||||||
|
const headers = {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Authorization': `Bearer ${OPENAI_API_KEY}`,
|
||||||
|
}
|
||||||
|
const response = await axios.get('https://api.openai.com/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 }
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import express from 'express'
|
import express from 'express'
|
||||||
import type { ChatContext, ChatMessage } from './chatgpt'
|
import type { ChatContext, ChatMessage } from './chatgpt'
|
||||||
import { chatConfig, chatReplyProcess } from './chatgpt'
|
import { chatConfig, chatReplyProcess, currentModel } from './chatgpt'
|
||||||
import { auth } from './middleware/auth'
|
import { auth } from './middleware/auth'
|
||||||
|
import { isNotEmptyString } from './utils/is'
|
||||||
|
|
||||||
const app = express()
|
const app = express()
|
||||||
const router = express.Router()
|
const router = express.Router()
|
||||||
@@ -48,8 +49,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 })
|
||||||
|
|||||||
@@ -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())
|
||||||
|
|||||||
@@ -20,6 +20,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
|
||||||
|
|||||||
@@ -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
19
service/src/utils/is.ts
Normal 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]'
|
||||||
|
}
|
||||||
@@ -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, NLayoutContent, 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 }) => {
|
||||||
@@ -187,11 +187,9 @@ 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('')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -213,17 +211,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 +238,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 +325,159 @@ 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 />
|
||||||
|
<NLayoutContent
|
||||||
|
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
|
||||||
|
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>
|
||||||
|
</NLayoutContent>
|
||||||
|
</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() }"
|
||||||
|
>
|
||||||
|
{{ t('common.import') }}
|
||||||
|
</NButton>
|
||||||
|
</NSpace>
|
||||||
|
</NModal>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export default {
|
|||||||
timeout: 'Timeout',
|
timeout: 'Timeout',
|
||||||
socks: 'Socks',
|
socks: 'Socks',
|
||||||
httpsProxy: 'HTTPS Proxy',
|
httpsProxy: 'HTTPS Proxy',
|
||||||
|
balance: 'API Balance',
|
||||||
},
|
},
|
||||||
store: {
|
store: {
|
||||||
local: 'Local',
|
local: 'Local',
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export default {
|
|||||||
timeout: '超时',
|
timeout: '超时',
|
||||||
socks: 'Socks',
|
socks: 'Socks',
|
||||||
httpsProxy: 'HTTPS Proxy',
|
httpsProxy: 'HTTPS Proxy',
|
||||||
|
balance: 'API余额',
|
||||||
},
|
},
|
||||||
store: {
|
store: {
|
||||||
local: '本地',
|
local: '本地',
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export default {
|
|||||||
timeout: '逾時',
|
timeout: '逾時',
|
||||||
socks: 'Socks',
|
socks: 'Socks',
|
||||||
httpsProxy: 'HTTPS Proxy',
|
httpsProxy: 'HTTPS Proxy',
|
||||||
|
balance: 'API余額',
|
||||||
},
|
},
|
||||||
store: {
|
store: {
|
||||||
local: '本機',
|
local: '本機',
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
import setupAssets from './assets'
|
import setupAssets from './assets'
|
||||||
|
import setupScrollbarStyle from './scrollbarStyle'
|
||||||
|
|
||||||
export { setupAssets }
|
export { setupAssets, setupScrollbarStyle }
|
||||||
|
|||||||
28
src/plugins/scrollbarStyle.ts
Normal file
28
src/plugins/scrollbarStyle.ts
Normal 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
|
||||||
@@ -2,7 +2,7 @@ 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 {
|
||||||
@@ -12,7 +12,7 @@ export function setupPageGuard(router: Router) {
|
|||||||
next()
|
next()
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
if (from.path !== '/500')
|
if (to.path !== '/500')
|
||||||
next({ name: '500' })
|
next({ name: '500' })
|
||||||
else
|
else
|
||||||
next()
|
next()
|
||||||
|
|||||||
@@ -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)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,12 @@ 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 {
|
||||||
|
|||||||
@@ -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 })
|
||||||
|
|||||||
1
src/typings/chat.d.ts
vendored
1
src/typings/chat.d.ts
vendored
@@ -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[] }[]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ 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, '')
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -416,6 +416,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) {
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
Reference in New Issue
Block a user