chore: version 2.8.3 (#175)

* feat: 保留已存在的内容直到手动操作

* feat: 支持复制文本

* chore: version 2.8.3

.github/workflows/build_docker.yml

@@ -3,6 +3,8 @@ name: build_docker
 on:
   push:
     branches: [main]
+  release:
+    types: [created] # 表示在创建新的 Release 时触发
 
 jobs:
   build_docker:
@@ -11,11 +13,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Docker meta
+
-        id: meta
+      - run: |
-        uses: docker/metadata-action@v4
+          echo "本次构建的版本为：${GITHUB_REF_NAME} (但是这个变量目前上下文中无法获取到)"
-        with:
+          echo 本次构建的版本为：${{ github.ref_name }}
-          images: chenzhaoyu94/chatgpt-web
+          env
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -32,6 +34,8 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-web:${{ github.ref_name }}
+            ${{ secrets.DOCKERHUB_USERNAME }}/chatgpt-web:latest

.vscode/settings.json

@@ -29,6 +29,7 @@
     "dockerhub",
     "esno",
     "GPTAPI",
+    "hljs",
     "iconify",
     "logprobs",
     "nodata",

CHANGELOG.md

@@ -1,3 +1,51 @@
+## v2.8.3
+
+`2023-03-01`
+
+### Feature
+- 消息已输出内容不会因为中断而消失[#167]
+- 添加复制消息按钮[#133]
+
+### Other
+- `README` 添加声明内容
+
+## v2.8.2
+
+`2023-02-28`
+### Enhancement
+- 代码主题调整为 `One Dark - light|dark` 适配深色模式
+### BugFix
+- 修复普通文本代码渲染和深色模式下的问题[#139][#154]
+
+## v2.8.1
+
+`2023-02-27`
+
+### BugFix
+- 修复 `API` 版本不是 `Markdown` 时，普通 `HTML` 代码会被渲染的问题 [#146]
+
+## v2.8.0
+
+`2023-02-27`
+
+- 感谢 [puppywang](https://github.com/Chanzhaoyu/chatgpt-web/commit/628187f5c3348bda0d0518f90699a86525d19018) 修复了 `2.7.0` 版本中关于流输出数据的问题（使用 `nginx` 需要自行配置 `octet-stream` 相关内容）
+
+- 关于为什么使用 `octet-stream` 而不是 `sse`，是因为更好的兼容之前的模式。
+
+- 建议更新到此版本获得比较完整的体验
+
+### Enhancement
+- 优化了部份代码和类型提示
+- 输入框添加换行提示
+- 移动端输入框现在回车为换行，而不是直接提交
+- 移动端双击标题返回顶部，箭头返回底部
+
+### BugFix
+- 流输出数据下的问题[#122]
+- 修复了 `API Key` 下部份代码不换行的问题
+- 修复移动端深色模式部份样式问题[#123][#126]
+- 修复主题模式图标不一致的问题[#126]
+
 ## v2.7.3
 
 `2023-02-25`

README.md

@@ -1,9 +1,9 @@
 # ChatGPT Web
 
-> 使用 `express` 和 `vue3` 搭建的支持 `ChatGPT` 双模型演示网页
+> 声明：此项目只发布于 Github，基于 MIT 协议，免费且作为开源学习使用。并且不会有任何形式的卖号、付费服务、讨论群、讨论组等行为。谨防受骗。
 
-![cover](./docs/c1.png)
+![cover](./docs/c1-2.8.0.png)
-![cover2](./docs/c2.png)
+![cover2](./docs/c2-2.8.0.png)
 
 - [ChatGPT Web](#chatgpt-web)
 	- [介绍](#介绍)
@@ -30,6 +30,7 @@
 			- [前端网页](#前端网页-1)
 	- [常见问题](#常见问题)
 	- [参与贡献](#参与贡献)
+	- [赞助](#赞助)
 	- [License](#license)
 ## 介绍
 
@@ -38,14 +39,14 @@
 |  方式   | 免费？  | 可靠性  | 质量 |
 |  ----  | ----  | ----  | ----  |
 | `ChatGPTAPI(GPT-3)`  | 否 | 	可靠 | 较笨 |
-| `ChatGPTUnofficialProxyAPI(网页 accessToken)`  | 	是 |  不可靠 | 聪明 |
+| `ChatGPTUnofficialProxyAPI(网页 accessToken)`  | 	是 |  相对不可靠 | 聪明 |
-
-***Note:*** 网页 `accessToken` 存在大约 8 小时，而且国内地区网络问题更推荐使用 `GPT-3` 的方式
 
 对比：
 1. `ChatGPTAPI` 使用 `text-davinci-003` 通过官方`OpenAI`补全`API`模拟`ChatGPT`（最稳健的方法，但它不是免费的，并且没有使用针对聊天进行微调的模型）
 2. `ChatGPTUnofficialProxyAPI` 使用非官方代理服务器访问 `ChatGPT` 的后端`API`，绕过`Cloudflare`（使用真实的的`ChatGPT`，非常轻量级，但依赖于第三方服务器，并且有速率限制）
 
+[查看详情](https://github.com/Chanzhaoyu/chatgpt-web/issues/138)
+
 切换方式：
 1. 进入 `service/.env` 文件
 2. 使用 `OpenAI API Key` 请填写 `OPENAI_API_KEY` 字段 [(获取 apiKey)](https://platform.openai.com/overview)
@@ -173,7 +174,7 @@ version: '3'
 
 services:
   app:
-    image: chenzhaoyu94/chatgpt-web:main
+    image: chenzhaoyu94/chatgpt-web # 总是使用latest,更新时重新pull该tag镜像即可
     ports:
       - 3002:3002
     environment:
@@ -257,5 +258,20 @@ A: `vscode` 请安装项目推荐插件，或手动安装 `Eslint` 插件。
   <img src="https://contrib.rocks/image?repo=Chanzhaoyu/chatgpt-web" />
 </a>
 
+## 赞助
+
+如果你觉得这个项目对你有帮助，并且情况允许的话，可以给我一点点支持，总之非常感谢支持～
+
+<div style="display: flex; gap: 20px;">
+	<div style="text-align: center">
+		<img style="max-width: 100%" src="./docs/wechat.png" alt="微信" />
+		<p>WeChat Pay</p>
+	</div>
+	<div style="text-align: center">
+		<img style="max-width: 100%" src="./docs/alipay.png" alt="支付宝" />
+		<p>Alipay</p>
+	</div>
+</div>
+
 ## License
 MIT © [ChenZhaoYu](./license)

index.html

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="zh-cmn-Hans">
-
 <head>
 	<meta charset="UTF-8">
 	<link rel="icon" type="image/svg+xml" href="/favicon.svg">
@@ -9,7 +8,7 @@
 	<title>ChatGPT Web</title>
 </head>
 
-<body>
+<body class="dark:bg-black">
 	<div id="app">
 		<style>
 			.loading-wrap {

package.json

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

service/.env

@@ -8,4 +8,4 @@ OPENAI_ACCESS_TOKEN=
 API_REVERSE_PROXY=
 
 # timeout
-TIMEOUT_MS=60000
+TIMEOUT_MS=100000

service/package.json

@@ -28,7 +28,9 @@
     "dotenv": "^16.0.3",
     "esno": "^0.16.3",
     "express": "^4.18.2",
-    "isomorphic-fetch": "^3.0.0"
+    "isomorphic-fetch": "^3.0.0",
+    "node-fetch": "^3.3.0",
+    "socks-proxy-agent": "^7.0.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.35.2",

service/pnpm-lock.yaml

@@ -10,7 +10,9 @@ specifiers:
   esno: ^0.16.3
   express: ^4.18.2
   isomorphic-fetch: ^3.0.0
+  node-fetch: ^3.3.0
   rimraf: ^4.1.2
+  socks-proxy-agent: ^7.0.0
   tsup: ^6.6.3
   typescript: ^4.9.5
 
@@ -20,6 +22,8 @@ dependencies:
   esno: 0.16.3
   express: 4.18.2
   isomorphic-fetch: 3.0.0
+  node-fetch: 3.3.0
+  socks-proxy-agent: 7.0.0
 
 devDependencies:
   '@antfu/eslint-config': 0.35.2_7kw3g6rralp5ps6mg3uyzz6azm
@@ -641,6 +645,15 @@ packages:
     hasBin: true
     dev: true
 
+  /agent-base/6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /ajv-formats/2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependenciesMeta:
@@ -999,6 +1012,11 @@ packages:
     hasBin: true
     dev: true
 
+  /data-uri-to-buffer/4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+    dev: false
+
   /debounce-fn/5.1.2:
     resolution: {integrity: sha512-Sr4SdOZ4vw6eQDvPYNxHogvrxmCIld/VenC5JbNrFwMiwd7lY/Z18ZFfo+EWNG4DD9nFlAujWAo/wGuOPHmy5A==}
     engines: {node: '>=12'}
@@ -1038,7 +1056,6 @@ packages:
         optional: true
     dependencies:
       ms: 2.1.2
-    dev: true
 
   /deep-is/0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -1748,6 +1765,14 @@ packages:
       reusify: 1.0.4
     dev: true
 
+  /fetch-blob/3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.2.1
+    dev: false
+
   /file-entry-cache/6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -1819,6 +1844,13 @@ packages:
       is-callable: 1.2.7
     dev: true
 
+  /formdata-polyfill/4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+    dependencies:
+      fetch-blob: 3.2.0
+    dev: false
+
   /forwarded/0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -2086,6 +2118,10 @@ packages:
       side-channel: 1.0.4
     dev: true
 
+  /ip/2.0.0:
+    resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==}
+    dev: false
+
   /ipaddr.js/1.9.1:
     resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
     engines: {node: '>= 0.10'}
@@ -2509,7 +2545,6 @@ packages:
 
   /ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: true
 
   /ms/2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
@@ -2535,6 +2570,11 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
+  /node-domexception/1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    dev: false
+
   /node-fetch/2.6.9:
     resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==}
     engines: {node: 4.x || >=6.0.0}
@@ -2547,6 +2587,15 @@ packages:
       whatwg-url: 5.0.0
     dev: false
 
+  /node-fetch/3.3.0:
+    resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
+    dev: false
+
   /normalize-package-data/2.5.0:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
@@ -3083,6 +3132,30 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /smart-buffer/4.2.0:
+    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+    dev: false
+
+  /socks-proxy-agent/7.0.0:
+    resolution: {integrity: sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==}
+    engines: {node: '>= 10'}
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.3.4
+      socks: 2.7.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /socks/2.7.1:
+    resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==}
+    engines: {node: '>= 10.13.0', npm: '>= 3.0.0'}
+    dependencies:
+      ip: 2.0.0
+      smart-buffer: 4.2.0
+    dev: false
+
   /source-map-support/0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
     dependencies:
@@ -3440,6 +3513,11 @@ packages:
       - supports-color
     dev: true
 
+  /web-streams-polyfill/3.2.1:
+    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
+    engines: {node: '>= 8'}
+    dev: false
+
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
     dev: false

service/src/chatgpt.ts

@@ -1,20 +1,18 @@
 import * as dotenv from 'dotenv'
 import 'isomorphic-fetch'
-import type { ChatGPTAPI, ChatMessage, SendMessageOptions } from 'chatgpt'
+import type { ChatMessage, SendMessageOptions } from 'chatgpt'
-import { ChatGPTUnofficialProxyAPI } from 'chatgpt'
+import { ChatGPTAPI, ChatGPTUnofficialProxyAPI } from 'chatgpt'
+import { SocksProxyAgent } from 'socks-proxy-agent'
+import fetch from 'node-fetch'
 import { sendResponse } from './utils'
+import type { ApiModel, ChatContext, ChatGPTAPIOptions, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from './types'
 
 dotenv.config()
 
-let apiModel: 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined
-
-interface ChatContext {
-  conversationId?: string
-  parentMessageId?: string
-}
-
 const timeoutMs: number = !isNaN(+process.env.TIMEOUT_MS) ? +process.env.TIMEOUT_MS : 30 * 1000
 
+let apiModel: ApiModel
+
 if (!process.env.OPENAI_API_KEY && !process.env.OPENAI_ACCESS_TOKEN)
   throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable')
 
@@ -23,17 +21,34 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
 // To use ESM in CommonJS, you can use a dynamic import
 (async () => {
   // More Info: https://github.com/transitive-bullshit/chatgpt-api
-  const { ChatGPTAPI } = await import('chatgpt')
 
   if (process.env.OPENAI_API_KEY) {
-    api = new ChatGPTAPI({ apiKey: process.env.OPENAI_API_KEY })
+    const options: ChatGPTAPIOptions = {
+      apiKey: process.env.OPENAI_API_KEY,
+      debug: false,
+    }
+
+    api = new ChatGPTAPI({ ...options })
     apiModel = 'ChatGPTAPI'
   }
   else {
-    let options = {}
+    const options: ChatGPTUnofficialProxyAPIOptions = {
+      accessToken: process.env.OPENAI_ACCESS_TOKEN,
+      debug: false,
+    }
+
+    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 })
+      }
+    }
 
     if (process.env.API_REVERSE_PROXY)
-      options = { apiReverseProxyUrl: process.env.API_REVERSE_PROXY }
+      options.apiReverseProxyUrl = process.env.API_REVERSE_PROXY
 
     api = new ChatGPTUnofficialProxyAPI({
       accessToken: process.env.OPENAI_ACCESS_TOKEN,
@@ -65,6 +80,34 @@ async function chatReply(
   }
 }
 
+async function chatReplyProcess(
+  message: string,
+  lastContext?: { conversationId?: string; parentMessageId?: string },
+  process?: (chat: ChatMessage) => void,
+) {
+  if (!message)
+    return sendResponse({ type: 'Fail', message: 'Message is empty' })
+
+  try {
+    let options: SendMessageOptions = { timeoutMs }
+
+    if (lastContext)
+      options = { ...lastContext }
+
+    const response = await api.sendMessage(message, {
+      ...options,
+      onProgress: (partialResponse) => {
+        process?.(partialResponse)
+      },
+    })
+
+    return sendResponse({ type: 'Success', data: response })
+  }
+  catch (error: any) {
+    return sendResponse({ type: 'Fail', message: error.message })
+  }
+}
+
 async function chatConfig() {
   return sendResponse({
     type: 'Success',
@@ -72,10 +115,11 @@ async function chatConfig() {
       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}`) : '-',
+    } as ModelConfig,
   })
 }
 
 export type { ChatContext, ChatMessage }
 
-export { chatReply, chatConfig }
+export { chatReply, chatReplyProcess, chatConfig }

service/src/index.ts

@@ -1,6 +1,6 @@
 import express from 'express'
-import type { ChatContext } from './chatgpt'
+import type { ChatContext, ChatMessage } from './chatgpt'
-import { chatConfig, chatReply } from './chatgpt'
+import { chatConfig, chatReply, chatReplyProcess } from './chatgpt'
 
 const app = express()
 const router = express.Router()
@@ -26,6 +26,25 @@ router.post('/chat', async (req, res) => {
   }
 })
 
+router.post('/chat-process', async (req, res) => {
+  res.setHeader('Content-type', 'application/octet-stream')
+
+  try {
+    const { prompt, options = {} } = req.body as { prompt: string; options?: ChatContext }
+    let firstChunk = true
+    await chatReplyProcess(prompt, options, (chat: ChatMessage) => {
+      res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`)
+      firstChunk = false
+    })
+  }
+  catch (error) {
+    res.write(JSON.stringify(error))
+  }
+  finally {
+    res.end()
+  }
+})
+
 router.post('/config', async (req, res) => {
   try {
     const response = await chatConfig()

service/src/types.ts

@@ -0,0 +1,30 @@
+import type { FetchFn, openai } from 'chatgpt'
+
+export interface ChatContext {
+  conversationId?: string
+  parentMessageId?: string
+}
+
+export interface ChatGPTAPIOptions {
+  apiKey: string
+  debug?: boolean
+  completionParams?: Partial<openai.CompletionParams>
+}
+
+export interface ChatGPTUnofficialProxyAPIOptions {
+  accessToken: string
+  apiReverseProxyUrl?: string
+  model?: string
+  debug?: boolean
+  headers?: Record<string, string>
+  fetch?: FetchFn
+}
+
+export interface ModelConfig {
+  apiModel?: ApiModel
+  reverseProxy?: string
+  timeoutMs?: number
+  socksProxy?: string
+}
+
+export type ApiModel = 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined

src/api/index.ts

@@ -1,4 +1,4 @@
-import type { GenericAbortSignal } from 'axios'
+import type { AxiosProgressEvent, GenericAbortSignal } from 'axios'
 import { post } from '@/utils/request'
 
 export function fetchChatAPI<T = any>(
@@ -18,3 +18,18 @@ export function fetchChatConfig<T = any>() {
     url: '/config',
   })
 }
+
+export function fetchChatAPIProcess<T = any>(
+  params: {
+    prompt: string
+    options?: { conversationId?: string; parentMessageId?: string }
+    signal?: GenericAbortSignal
+    onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void },
+) {
+  return post<T>({
+    url: '/chat-process',
+    data: { prompt: params.prompt, options: params.options },
+    signal: params.signal,
+    onDownloadProgress: params.onDownloadProgress,
+  })
+}

src/components/common/Setting/index.vue

@@ -16,6 +16,7 @@ interface ConfigState {
   timeoutMs?: number
   reverseProxy?: string
   apiModel?: string
+  socksProxy?: string
 }
 
 const props = defineProps<Props>()
@@ -69,6 +70,7 @@ watch(
         <p>API方式：{{ config?.apiModel ?? '-' }}</p>
         <p>反向代理：{{ config?.reverseProxy ?? '-' }}</p>
         <p>超时时间：{{ config?.timeoutMs ?? '-' }}</p>
+        <p>Socks代理：{{ config?.socksProxy ?? '-' }}</p>
       </div>
     </NCard>
   </NModal>

src/directives/highlight.ts

@@ -0,0 +1,23 @@
+import type { App, Directive } from 'vue'
+import hljs from 'highlight.js'
+import { includeCode } from '@/utils/format'
+
+hljs.configure({ ignoreUnescapedHTML: true })
+
+function highlightCode(el: HTMLElement) {
+  if (includeCode(el.textContent))
+    hljs.highlightBlock(el)
+}
+
+export default function setupHighlightDirective(app: App) {
+  const highLightDirective: Directive<HTMLElement> = {
+    mounted(el: HTMLElement) {
+      highlightCode(el)
+    },
+    updated(el: HTMLElement) {
+      highlightCode(el)
+    },
+  }
+
+  app.directive('highlight', highLightDirective)
+}

src/directives/index.ts

@@ -1 +1,6 @@
-export function setupDirectives() {}
+import type { App } from 'vue'
+import setupHighlightDirective from './highlight'
+
+export function setupDirectives(app: App) {
+  setupHighlightDirective(app)
+}

src/hooks/useIconRender.ts

@@ -0,0 +1,36 @@
+import { h } from 'vue'
+import { SvgIcon } from '@/components/common'
+
+export const useIconRender = () => {
+  interface IconConfig {
+    icon?: string
+    color?: string
+    fontSize?: number
+  }
+
+  interface IconStyle {
+    color?: string
+    fontSize?: string
+  }
+
+  const iconRender = (config: IconConfig) => {
+    const { color, fontSize, icon } = config
+
+    const style: IconStyle = {}
+
+    if (color)
+      style.color = color
+
+    if (fontSize)
+      style.fontSize = `${fontSize}px`
+
+    if (!icon)
+      window.console.warn('iconRender: icon is required')
+
+    return () => h(SvgIcon, { icon, style })
+  }
+
+  return {
+    iconRender,
+  }
+}

src/main.ts

@@ -1,5 +1,6 @@
 import { createApp } from 'vue'
 import App from './App.vue'
+import { setupDirectives } from './directives'
 import { setupAssets } from '@/plugins'
 import { setupStore } from '@/store'
 import { setupRouter } from '@/router'
@@ -10,6 +11,8 @@ async function bootstrap() {
 
   setupStore(app)
 
+  setupDirectives(app)
+
   await setupRouter(app)
 
   app.mount('#app')

src/plugins/assets.ts

@@ -1,5 +1,5 @@
-import 'highlight.js/styles/xcode.css'
 import '@/styles/lib/tailwind.css'
+import '@/styles/lib/highlight.less'
 import '@/styles/lib/github-markdown.less'
 import '@/styles/global.less'
 

src/store/modules/chat/index.ts

@@ -6,6 +6,13 @@ export const useChatStore = defineStore('chat-store', {
   state: (): Chat.ChatState => getLocalState(),
 
   getters: {
+    getChatHistoryByCurrentActive(state: Chat.ChatState) {
+      const index = state.history.findIndex(item => item.uuid === state.active)
+      if (index !== -1)
+        return state.history[index]
+      return null
+    },
+
     getChatByUuid(state: Chat.ChatState) {
       return (uuid?: number) => {
         if (uuid)
@@ -68,6 +75,18 @@ export const useChatStore = defineStore('chat-store', {
       return await this.reloadRoute(uuid)
     },
 
+    getChatByUuidAndIndex(uuid: number, index: number) {
+      if (!uuid || uuid === 0) {
+        if (this.chat.length)
+          return this.chat[0].data[index]
+        return null
+      }
+      const chatIndex = this.chat.findIndex(item => item.uuid === uuid)
+      if (chatIndex !== -1)
+        return this.chat[chatIndex].data[index]
+      return null
+    },
+
     addChatByUuid(uuid: number, chat: Chat.Chat) {
       if (!uuid || uuid === 0) {
         if (this.history.length === 0) {
@@ -110,6 +129,22 @@ export const useChatStore = defineStore('chat-store', {
       }
     },
 
+    updateChatSomeByUuid(uuid: number, index: number, chat: Partial<Chat.Chat>) {
+      if (!uuid || uuid === 0) {
+        if (this.chat.length) {
+          this.chat[0].data[index] = { ...this.chat[0].data[index], ...chat }
+          this.recordState()
+        }
+        return
+      }
+
+      const chatIndex = this.chat.findIndex(item => item.uuid === uuid)
+      if (chatIndex !== -1) {
+        this.chat[chatIndex].data[index] = { ...this.chat[chatIndex].data[index], ...chat }
+        this.recordState()
+      }
+    },
+
     deleteChatByUuid(uuid: number, index: number) {
       if (!uuid || uuid === 0) {
         if (this.chat.length) {

src/styles/lib/highlight.less

@@ -0,0 +1,203 @@
+html.dark {
+	pre code.hljs {
+		display: block;
+		overflow-x: auto;
+		padding: 1em
+	}
+
+	code.hljs {
+		padding: 3px 5px
+	}
+
+	.hljs {
+		color: #abb2bf;
+		background: #282c34
+	}
+
+	.hljs-keyword,
+	.hljs-operator,
+	.hljs-pattern-match {
+		color: #f92672
+	}
+
+	.hljs-function,
+	.hljs-pattern-match .hljs-constructor {
+		color: #61aeee
+	}
+
+	.hljs-function .hljs-params {
+		color: #a6e22e
+	}
+
+	.hljs-function .hljs-params .hljs-typing {
+		color: #fd971f
+	}
+
+	.hljs-module-access .hljs-module {
+		color: #7e57c2
+	}
+
+	.hljs-constructor {
+		color: #e2b93d
+	}
+
+	.hljs-constructor .hljs-string {
+		color: #9ccc65
+	}
+
+	.hljs-comment,
+	.hljs-quote {
+		color: #b18eb1;
+		font-style: italic
+	}
+
+	.hljs-doctag,
+	.hljs-formula {
+		color: #c678dd
+	}
+
+	.hljs-deletion,
+	.hljs-name,
+	.hljs-section,
+	.hljs-selector-tag,
+	.hljs-subst {
+		color: #e06c75
+	}
+
+	.hljs-literal {
+		color: #56b6c2
+	}
+
+	.hljs-addition,
+	.hljs-attribute,
+	.hljs-meta .hljs-string,
+	.hljs-regexp,
+	.hljs-string {
+		color: #98c379
+	}
+
+	.hljs-built_in,
+	.hljs-class .hljs-title,
+	.hljs-title.class_ {
+		color: #e6c07b
+	}
+
+	.hljs-attr,
+	.hljs-number,
+	.hljs-selector-attr,
+	.hljs-selector-class,
+	.hljs-selector-pseudo,
+	.hljs-template-variable,
+	.hljs-type,
+	.hljs-variable {
+		color: #d19a66
+	}
+
+	.hljs-bullet,
+	.hljs-link,
+	.hljs-meta,
+	.hljs-selector-id,
+	.hljs-symbol,
+	.hljs-title {
+		color: #61aeee
+	}
+
+	.hljs-emphasis {
+		font-style: italic
+	}
+
+	.hljs-strong {
+		font-weight: 700
+	}
+
+	.hljs-link {
+		text-decoration: underline
+	}
+}
+
+html {
+	pre code.hljs {
+		display: block;
+		overflow-x: auto;
+		padding: 1em
+	}
+
+	code.hljs {
+		padding: 3px 5px
+	}
+
+	.hljs {
+		color: #383a42;
+		background: #fafafa
+	}
+
+	.hljs-comment,
+	.hljs-quote {
+		color: #a0a1a7;
+		font-style: italic
+	}
+
+	.hljs-doctag,
+	.hljs-formula,
+	.hljs-keyword {
+		color: #a626a4
+	}
+
+	.hljs-deletion,
+	.hljs-name,
+	.hljs-section,
+	.hljs-selector-tag,
+	.hljs-subst {
+		color: #e45649
+	}
+
+	.hljs-literal {
+		color: #0184bb
+	}
+
+	.hljs-addition,
+	.hljs-attribute,
+	.hljs-meta .hljs-string,
+	.hljs-regexp,
+	.hljs-string {
+		color: #50a14f
+	}
+
+	.hljs-attr,
+	.hljs-number,
+	.hljs-selector-attr,
+	.hljs-selector-class,
+	.hljs-selector-pseudo,
+	.hljs-template-variable,
+	.hljs-type,
+	.hljs-variable {
+		color: #986801
+	}
+
+	.hljs-bullet,
+	.hljs-link,
+	.hljs-meta,
+	.hljs-selector-id,
+	.hljs-symbol,
+	.hljs-title {
+		color: #4078f2
+	}
+
+	.hljs-built_in,
+	.hljs-class .hljs-title,
+	.hljs-title.class_ {
+		color: #c18401
+	}
+
+	.hljs-emphasis {
+		font-style: italic
+	}
+
+	.hljs-strong {
+		font-weight: 700
+	}
+
+	.hljs-link {
+		text-decoration: underline
+	}
+}

src/utils/format/index.ts

@@ -0,0 +1,27 @@
+// 转义 HTML 字符
+export function encodeHTML(source: string) {
+  return source
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#39;')
+}
+
+// 判断是否为代码块
+export function includeCode(text: string | null | undefined) {
+  const regexp = /^(?:\s{4}|\t).+/gm
+  return !!(text?.includes(' = ') || text?.match(regexp))
+}
+
+// 复制文本
+export function copyText(text: string) {
+  const input = document.createElement('input')
+  input.setAttribute('readonly', 'readonly')
+  input.setAttribute('value', text)
+  document.body.appendChild(input)
+  input.select()
+  if (document.execCommand('copy'))
+    document.execCommand('copy')
+  document.body.removeChild(input)
+}

src/utils/functions/includeCode.ts

@@ -1,6 +0,0 @@
-function includeCode(text: string | null | undefined) {
-  const regexp = /^(?:\s{4}|\t).+/gm
-  return !!(text?.includes(' = ') || text?.match(regexp))
-}
-
-export default includeCode

src/views/chat/components/Message/Text.vue

@@ -2,15 +2,8 @@
 import { computed } from 'vue'
 import { marked } from 'marked'
 import hljs from 'highlight.js'
-
+import { useBasicLayout } from '@/hooks/useBasicLayout'
-const props = defineProps<Props>()
+import { encodeHTML } from '@/utils/format'
-
-marked.setOptions({
-  renderer: new marked.Renderer(),
-  highlight(code) {
-    return hljs.highlightAuto(code).value
-  },
-})
 
 interface Props {
   inversion?: boolean
@@ -19,12 +12,36 @@ interface Props {
   loading?: boolean
 }
 
+const props = defineProps<Props>()
+
+const { isMobile } = useBasicLayout()
+
+const renderer = new marked.Renderer()
+
+renderer.html = (html) => {
+  return `<p>${encodeHTML(html)}</p>`
+}
+
+renderer.code = (code, language) => {
+  const validLang = !!(language && hljs.getLanguage(language))
+  if (validLang)
+    return `<pre><code class="hljs ${language}">${hljs.highlight(language, code).value}</code></pre>`
+  return `<pre style="background: none">${hljs.highlightAuto(code).value}</pre>`
+}
+
+marked.setOptions({
+  renderer,
+  highlight(code) {
+    return hljs.highlightAuto(code).value
+  },
+})
+
 const wrapClass = computed(() => {
   return [
     'text-wrap',
-    'p-3',
     'min-w-[20px]',
     'rounded-md',
+    isMobile.value ? 'p-2' : 'p-3',
     props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
     props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]',
     { 'text-red-500': props.error },
@@ -32,9 +49,10 @@ const wrapClass = computed(() => {
 })
 
 const text = computed(() => {
-  if (props.text && !props.inversion)
+  const value = props.text ?? ''
-    return marked(props.text)
+  if (!props.inversion)
-  return props.text
+    return marked(value)
+  return value
 })
 </script>
 
@@ -46,7 +64,7 @@ const text = computed(() => {
     <template v-else>
       <div class="leading-relaxed break-all">
         <div v-if="!inversion" class="markdown-body" v-html="text" />
-        <div v-else v-text="text" />
+        <div v-else class="whitespace-pre-wrap" v-text="text" />
       </div>
     </template>
   </div>

src/views/chat/components/Message/index.vue

@@ -1,7 +1,10 @@
 <script setup lang='ts'>
+import { NDropdown, useMessage } from 'naive-ui'
 import AvatarComponent from './Avatar.vue'
 import TextComponent from './Text.vue'
 import { SvgIcon } from '@/components/common'
+import { copyText } from '@/utils/format'
+import { useIconRender } from '@/hooks/useIconRender'
 
 interface Props {
   dateTime?: string
@@ -13,18 +16,45 @@ interface Props {
 
 interface Emit {
   (ev: 'regenerate'): void
-  (ev: 'copy'): void
   (ev: 'delete'): void
 }
 
-defineProps<Props>()
+const props = defineProps<Props>()
 
 const emit = defineEmits<Emit>()
 
+const ms = useMessage()
+
+const { iconRender } = useIconRender()
+
+const options = [
+  {
+    label: 'Copy',
+    key: 'copy',
+    icon: iconRender({ icon: 'ri:file-copy-2-line' }),
+  }, {
+    label: 'Delete',
+    key: 'delete',
+    icon: iconRender({ icon: 'ri:delete-bin-line' }),
+  },
+]
+
+function handleSelect(key: 'copy' | 'delete') {
+  if (key === 'copy')
+    handleCopy()
+  else
+    handleDelete()
+}
+
 function handleDelete() {
   emit('delete')
 }
 
+function handleCopy() {
+  copyText(props.text ?? '')
+  ms.success('Copied')
+}
+
 function handleRegenerate() {
   emit('regenerate')
 }
@@ -33,15 +63,15 @@ function handleRegenerate() {
 <template>
   <div class="flex w-full mb-6 overflow-hidden" :class="[{ 'flex-row-reverse': inversion }]">
     <div
-      class="flex items-center justify-center rounded-full overflow-hidden flex-shrink-0 w-[32px] h-[32px]"
+      class="flex items-center justify-center flex-shrink-0 h-8 overflow-hidden rounded-full basis-8"
-      :class="[inversion ? 'ml-3' : 'mr-3']"
+      :class="[inversion ? 'ml-2' : 'mr-2']"
     >
       <AvatarComponent :image="inversion" />
     </div>
-    <div class="flex flex-col flex-1 text-sm" :class="[inversion ? 'items-end' : 'items-start']">
+    <div class="overflow-hidden text-sm " :class="[inversion ? 'items-end' : 'items-start']">
-      <span class="text-xs text-[#b4bbc4]">
+      <p class="text-xs text-[#b4bbc4]" :class="[inversion ? 'text-right' : 'text-left']">
         {{ dateTime }}
-      </span>
+      </p>
       <div
         class="flex items-end gap-2 mt-2"
         :class="[inversion ? 'flex-row-reverse' : 'flex-row']"
@@ -60,12 +90,11 @@ function handleRegenerate() {
           >
             <SvgIcon icon="ri:restart-line" />
           </button>
-          <button
+          <NDropdown :options="options" @select="handleSelect">
-            class="mb-1 transition text-neutral-400 hover:text-neutral-800 dark:hover:text-neutral-200"
+            <button class="transition text-neutral-300 hover:text-neutral-800 dark:hover:text-neutral-200">
-            @click="handleDelete"
+              <SvgIcon icon="ri:function-line" />
-          >
+            </button>
-            <SvgIcon icon="ri:delete-bin-6-line" />
+          </NDropdown>
-          </button>
         </div>
       </div>
     </div>

src/views/chat/components/Message/style.less

@@ -2,6 +2,10 @@
 	background-color: transparent;
 	font-size: 14px;
 
+	p {
+		white-space: pre-wrap;
+	}
+
 	ol {
 		list-style-type: decimal;
 	}
@@ -19,13 +23,16 @@
 	pre {
 		background-color: #fff;
 	}
-}
 
-.dark{
+	code.hljs{
-	.markdown-body{
+		padding: 0;
-		.highlight pre,
+	}
-		pre {
+}
-			background-color: #18181c;
+
-		}
+html.dark {
+
+	.highlight pre,
+	pre {
+		background-color: #282c34;
 	}
 }

src/views/chat/hooks/useChat.ts

@@ -3,6 +3,10 @@ import { useChatStore } from '@/store'
 export function useChat() {
   const chatStore = useChatStore()
 
+  const getChatByUuidAndIndex = (uuid: number, index: number) => {
+    return chatStore.getChatByUuidAndIndex(uuid, index)
+  }
+
   const addChat = (uuid: number, chat: Chat.Chat) => {
     chatStore.addChatByUuid(uuid, chat)
   }
@@ -11,8 +15,14 @@ export function useChat() {
     chatStore.updateChatByUuid(uuid, index, chat)
   }
 
+  const updateChatSome = (uuid: number, index: number, chat: Partial<Chat.Chat>) => {
+    chatStore.updateChatSomeByUuid(uuid, index, chat)
+  }
+
   return {
     addChat,
     updateChat,
+    updateChatSome,
+    getChatByUuidAndIndex,
   }
 }

src/views/chat/index.vue

@@ -8,7 +8,7 @@ import { useChat } from './hooks/useChat'
 import { HoverButton, SvgIcon } from '@/components/common'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
 import { useChatStore } from '@/store'
-import { fetchChatAPI } from '@/api'
+import { fetchChatAPIProcess } from '@/api'
 
 let controller = new AbortController()
 
@@ -19,7 +19,7 @@ const ms = useMessage()
 const chatStore = useChatStore()
 
 const { isMobile } = useBasicLayout()
-const { addChat, updateChat } = useChat()
+const { addChat, updateChat, updateChatSome, getChatByUuidAndIndex } = useChat()
 const { scrollRef, scrollToBottom } = useScroll()
 
 const { uuid } = route.params as { uuid: string }
@@ -71,7 +71,7 @@ async function onConversation() {
     +uuid,
     {
       dateTime: new Date().toLocaleString(),
-      text: 'Aha, Thinking...',
+      text: '',
       loading: true,
       inversion: false,
       error: false,
@@ -82,27 +82,70 @@ async function onConversation() {
   scrollToBottom()
 
   try {
-    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
+    await fetchChatAPIProcess<Chat.ConversationResponse>({
-    updateChat(
+      prompt: message,
-      +uuid,
+      options,
-      dataSources.value.length - 1,
+      signal: controller.signal,
-      {
+      onDownloadProgress: ({ event }) => {
-        dateTime: new Date().toLocaleString(),
+        const xhr = event.target
-        text: data.text ?? '',
+        const { responseText } = xhr
-        inversion: false,
+        // Always process the final line
-        error: false,
+        const lastIndex = responseText.lastIndexOf('\n')
-        loading: false,
+        let chunk = responseText
-        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+        if (lastIndex !== -1)
-        requestOptions: { prompt: message, options: { ...options } },
+          chunk = responseText.substring(lastIndex)
+        try {
+          const data = JSON.parse(chunk)
+          updateChat(
+            +uuid,
+            dataSources.value.length - 1,
+            {
+              dateTime: new Date().toLocaleString(),
+              text: data.text ?? '',
+              inversion: false,
+              error: false,
+              loading: false,
+              conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+              requestOptions: { prompt: message, options: { ...options } },
+            },
+          )
+          scrollToBottom()
+        }
+        catch (error) {
+          //
+        }
       },
-    )
+    })
-    scrollToBottom()
   }
   catch (error: any) {
-    let errorMessage = error?.message ?? 'Something went wrong, please try again later.'
+    const errorMessage = error?.message ?? 'Something went wrong, please try again later.'
 
-    if (error.message === 'canceled')
+    if (error.message === 'canceled') {
-      errorMessage = 'Request canceled. Please try again.'
+      updateChatSome(
+        +uuid,
+        dataSources.value.length - 1,
+        {
+          loading: false,
+        },
+      )
+      scrollToBottom()
+      return
+    }
+
+    const currentChat = getChatByUuidAndIndex(+uuid, dataSources.value.length - 1)
+
+    if (currentChat?.text && currentChat.text !== '') {
+      updateChatSome(
+        +uuid,
+        dataSources.value.length - 1,
+        {
+          text: `${currentChat.text}\n[${errorMessage}]`,
+          error: false,
+          loading: false,
+        },
+      )
+      return
+    }
 
     updateChat(
       +uuid,
@@ -146,7 +189,7 @@ async function onRegenerate(index: number) {
     index,
     {
       dateTime: new Date().toLocaleString(),
-      text: 'Aha, Let me think again...',
+      text: '',
       inversion: false,
       error: false,
       loading: true,
@@ -156,26 +199,53 @@ async function onRegenerate(index: number) {
   )
 
   try {
-    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
+    await fetchChatAPIProcess<Chat.ConversationResponse>({
-    updateChat(
+      prompt: message,
-      +uuid,
+      options,
-      index,
+      signal: controller.signal,
-      {
+      onDownloadProgress: ({ event }) => {
-        dateTime: new Date().toLocaleString(),
+        const xhr = event.target
-        text: data.text ?? '',
+        const { responseText } = xhr
-        inversion: false,
+        // Always process the final line
-        error: false,
+        const lastIndex = responseText.lastIndexOf('\n')
-        loading: false,
+        let chunk = responseText
-        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+        if (lastIndex !== -1)
-        requestOptions: { prompt: message, ...options },
+          chunk = responseText.substring(lastIndex)
+        try {
+          const data = JSON.parse(chunk)
+          updateChat(
+            +uuid,
+            index,
+            {
+              dateTime: new Date().toLocaleString(),
+              text: data.text ?? '',
+              inversion: false,
+              error: false,
+              loading: false,
+              conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+              requestOptions: { prompt: message, ...options },
+            },
+          )
+        }
+        catch (error) {
+          //
+        }
       },
-    )
+    })
   }
   catch (error: any) {
-    let errorMessage = 'Something went wrong, please try again later.'
+    if (error.message === 'canceled') {
+      updateChatSome(
+        +uuid,
+        index,
+        {
+          loading: false,
+        },
+      )
+      return
+    }
 
-    if (error.message === 'canceled')
+    const errorMessage = error?.message ?? 'Something went wrong, please try again later.'
-      errorMessage = 'Request canceled. Please try again.'
 
     updateChat(
       +uuid,
@@ -228,9 +298,11 @@ function handleClear() {
 }
 
 function handleEnter(event: KeyboardEvent) {
-  if (event.key === 'Enter' && !event.shiftKey) {
+  if (!isMobile.value) {
-    event.preventDefault()
+    if (event.key === 'Enter' && !event.shiftKey) {
-    handleSubmit()
+      event.preventDefault()
+      handleSubmit()
+    }
   }
 }
 
@@ -241,6 +313,12 @@ function handleStop() {
   }
 }
 
+const placeholder = computed(() => {
+  if (isMobile.value)
+    return 'Ask me anything...'
+  return 'Ask me anything... (Shift + Enter = line break)'
+})
+
 const buttonDisabled = computed(() => {
   return loading.value || !prompt.value || prompt.value.trim() === ''
 })
@@ -272,7 +350,12 @@ onUnmounted(() => {
 <template>
   <div class="flex flex-col h-full" :class="wrapClass">
     <main class="flex-1 overflow-hidden">
-      <div ref="scrollRef" class="h-full p-4 overflow-hidden overflow-y-auto" :class="[{ 'p-2': isMobile }]">
+      <div
+        id="scrollRef"
+        ref="scrollRef"
+        class="h-full overflow-hidden overflow-y-auto"
+        :class="[isMobile ? 'p-2' : 'p-4']"
+      >
         <template v-if="!dataSources.length">
           <div class="flex items-center justify-center mt-4 text-center text-neutral-300">
             <SvgIcon icon="ri:bubble-chart-fill" class="mr-2 text-3xl" />
@@ -292,8 +375,8 @@ onUnmounted(() => {
               @regenerate="onRegenerate(index)"
               @delete="handleDelete(index)"
             />
-            <div class="flex justify-center">
+            <div class="sticky bottom-0 left-0 flex justify-center">
-              <NButton v-if="loading" ghost @click="handleStop">
+              <NButton v-if="loading" type="warning" @click="handleStop">
                 <template #icon>
                   <SvgIcon icon="ri:stop-circle-line" />
                 </template>
@@ -315,7 +398,7 @@ onUnmounted(() => {
           v-model:value="prompt"
           type="textarea"
           :autosize="{ minRows: 1, maxRows: 2 }"
-          placeholder="Ask me anything..."
+          :placeholder="placeholder"
           @keypress="handleEnter"
         />
         <NButton type="primary" :disabled="buttonDisabled" @click="handleSubmit">

src/views/chat/layout/header/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed } from 'vue'
+import { computed, nextTick } from 'vue'
 import { SvgIcon } from '@/components/common'
 import { useAppStore, useChatStore } from '@/store'
 
@@ -7,25 +7,48 @@ const appStore = useAppStore()
 const chatStore = useChatStore()
 
 const collapsed = computed(() => appStore.siderCollapsed)
-
+const currentChatHistory = computed(() => chatStore.getChatHistoryByCurrentActive)
-function handleAdd() {
-  chatStore.addHistory({ title: 'New Chat', uuid: Date.now(), isEdit: false })
-}
 
 function handleUpdateCollapsed() {
   appStore.setSiderCollapsed(!collapsed.value)
 }
+
+function onScrollToTop() {
+  const scrollRef = document.querySelector('#scrollRef')
+  if (scrollRef)
+    nextTick(() => scrollRef.scrollTop = 0)
+}
+
+function onScrollToBottom() {
+  const scrollRef = document.querySelector('#scrollRef')
+  if (scrollRef)
+    nextTick(() => scrollRef.scrollTop = scrollRef.scrollHeight)
+}
 </script>
 
 <template>
-  <header class="fixed top-0 left-0 right-0 z-30 border-b dark:border-neutral-800 bg-white/80 dark:bg-black/30 backdrop-blur">
+  <header
+    class="fixed top-0 left-0 right-0 z-30 border-b dark:border-neutral-800 bg-white/80 dark:bg-black/20 backdrop-blur"
+  >
     <div class="relative flex items-center justify-between h-14">
-      <button class="flex items-center justify-center w-11 h-11" @click="handleUpdateCollapsed">
+      <button
+        class="flex items-center justify-center w-11 h-11"
+        @click="handleUpdateCollapsed"
+      >
         <SvgIcon v-if="collapsed" class="text-2xl" icon="ri:align-justify" />
         <SvgIcon v-else class="text-2xl" icon="ri:align-right" />
       </button>
-      <button class="flex items-center justify-center w-11 h-11" @click="handleAdd">
+      <h1
-        <SvgIcon class="text-2xl" icon="ri:add-fill" />
+        class="flex-1 px-4 overflow-hidden text-center cursor-pointer select-none text-ellipsis whitespace-nowrap"
+        @dblclick="onScrollToTop"
+      >
+        {{ currentChatHistory?.title ?? '' }}
+      </h1>
+      <button
+        class="flex items-center justify-center w-11 h-11"
+        @click="onScrollToBottom"
+      >
+        <SvgIcon class="text-2xl" icon="ri:arrow-down-s-line" />
       </button>
     </div>
   </header>

src/views/chat/layout/sider/Footer.vue

@@ -1,11 +1,14 @@
 <script setup lang='ts'>
-import { computed, h, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { NDropdown } from 'naive-ui'
 import { HoverButton, Setting, SvgIcon, UserAvatar } from '@/components/common'
 import { useAppStore } from '@/store'
+import { useIconRender } from '@/hooks/useIconRender'
 
 const appStore = useAppStore()
 
+const { iconRender } = useIconRender()
+
 const show = ref(false)
 
 const theme = computed(() => appStore.theme)
@@ -14,26 +17,20 @@ const options = [
   {
     label: 'Dark',
     key: 'dark',
-    icon: renderIcon('ri:moon-foggy-line'),
+    icon: iconRender({ icon: 'ri:moon-foggy-line' }),
   },
   {
     label: 'Light',
     key: 'light',
-    icon: renderIcon('ri:sun-foggy-line'),
+    icon: iconRender({ icon: 'ri:sun-foggy-line' }),
   },
   {
     label: 'Auto',
     key: 'auto',
-    icon: renderIcon('ri:contrast-line'),
+    icon: iconRender({ icon: 'ri:contrast-line' }),
   },
 ]
 
-function renderIcon(icon: string) {
-  return () => {
-    return h(SvgIcon, { icon })
-  }
-}
-
 function handleThemeChange(key: 'light' | 'dark' | 'auto') {
   appStore.setTheme(key)
 }
@@ -46,8 +43,8 @@ function handleThemeChange(key: 'light' | 'dark' | 'auto') {
     <NDropdown :options="options" placement="top" trigger="click" @select="handleThemeChange">
       <HoverButton>
         <span class="text-xl text-[#4f555e] dark:text-white">
-          <SvgIcon v-if="theme === 'dark'" icon="ri:sun-foggy-line" />
+          <SvgIcon v-if="theme === 'dark'" icon="ri:moon-foggy-line" />
-          <SvgIcon v-if="theme === 'light'" icon="ri:moon-foggy-line" />
+          <SvgIcon v-if="theme === 'light'" icon="ri:sun-foggy-line" />
           <SvgIcon v-if="theme === 'auto'" icon="ri:contrast-line" />
         </span>
       </HoverButton>

tsconfig.json

@@ -16,7 +16,6 @@
     "paths": {
       "@/*": ["./src/*"]
     },
-    // @vueuse/core 不能通过 vue-tsc 检查，所以这里需要忽略，以后将移除
     "types": ["vite/client", "node", "naive-ui/volar", "web-bluetooth"]
   },
   "exclude": ["node_modules", "dist", "service"]