chore: version 2.7.3 (#120)

* fix: 用户输入也被渲染的问题 (#117)

* fix: 用户输入不转换

* feat: 基础深色模式适配

* feat: 主题模式跟随系统

* feat: 深色适配补漏

* chore: version 2.7.3

CHANGELOG.md

@@ -1,3 +1,33 @@
+## v2.7.3
+
+`2023-02-25`
+
+### Feature
+- 适配系统深色模式 [#118](https://github.com/Chanzhaoyu/chatgpt-web/issues/103)
+### BugFix
+- 修复用户消息能被渲染为 `HTML` 问题 [#117](https://github.com/Chanzhaoyu/chatgpt-web/issues/117)
+
+## v2.7.2
+
+`2023-02-24`
+### Enhancement
+- 消息使用 [github-markdown-css](https://www.npmjs.com/package/github-markdown-css) 进行美化，现在支持全语法
+- 移除测试无用函数
+
+## v2.7.1
+
+`2023-02-23`
+
+因为消息流在 `accessToken` 中存在解析失败和消息不完整等一系列的问题，调整回正常消息形式
+
+### Feature
+- 现在可以中断请求过长没有答复的消息
+- 现在可以删除单条消息
+- 设置中显示当前版本信息
+
+### BugFix
+- 回退 `2.7.0` 的消息不稳定的问题
+
 ## v2.7.0
 
 `2023-02-23`

README.md

@@ -2,8 +2,8 @@
 
 > 使用 `express` 和 `vue3` 搭建的支持 `ChatGPT` 双模型演示网页
 
-![cover](./docs/cover.png)
+![cover](./docs/c1.png)
-![cover2](./docs/cover2.png)
+![cover2](./docs/c2.png)
 
 - [ChatGPT Web](#chatgpt-web)
 	- [介绍](#介绍)

config/proxy.ts

@@ -6,9 +6,9 @@ export function createViteProxy(isOpenProxy: boolean, viteEnv: ImportMetaEnv) {
 
   const proxy: Record<string, string | ProxyOptions> = {
     '/api': {
-      target: viteEnv.VITE_GLOB_API_URL,
+      target: viteEnv.VITE_APP_API_BASE_URL,
       changeOrigin: true,
-      rewrite: path => path.replace(/^\/api/, ''),
+      rewrite: path => path.replace('/api/', '/'),
     },
   }
 

index.html

@@ -61,6 +61,12 @@
 					transform: translateX(100%);
 				}
 			}
+
+			@media (prefers-color-scheme: dark) {
+				body {
+					background: #121212;
+				}
+			}
 		</style>
 		<div class="loading-wrap">
 			<div class="balls">

package.json

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

service/src/chatgpt.ts

@@ -65,34 +65,6 @@ 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',
@@ -106,4 +78,4 @@ async function chatConfig() {
 
 export type { ChatContext, ChatMessage }
 
-export { chatReply, chatReplyProcess, chatConfig }
+export { chatReply, chatConfig }

service/src/index.ts

@@ -1,6 +1,6 @@
 import express from 'express'
-import type { ChatContext, ChatMessage } from './chatgpt'
+import type { ChatContext } from './chatgpt'
-import { chatConfig, chatReply, chatReplyProcess } from './chatgpt'
+import { chatConfig, chatReply } from './chatgpt'
 
 const app = express()
 const router = express.Router()
@@ -26,23 +26,6 @@ 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 }
-    await chatReplyProcess(prompt, options, (chat: ChatMessage) => {
-      res.write(JSON.stringify(chat))
-    })
-  }
-  catch (error) {
-    res.write(JSON.stringify(error))
-  }
-  finally {
-    res.end()
-  }
-})
-
 router.post('/config', async (req, res) => {
   try {
     const response = await chatConfig()

src/App.vue

@@ -1,10 +1,17 @@
 <script setup lang="ts">
 import { NConfigProvider } from 'naive-ui'
 import { NaiveProvider } from '@/components/common'
+import { useTheme } from '@/hooks/useTheme'
+
+const { theme, themeOverrides } = useTheme()
 </script>
 
 <template>
-  <NConfigProvider class="h-full">
+  <NConfigProvider
+    class="h-full"
+    :theme="theme"
+    :theme-overrides="themeOverrides"
+  >
     <NaiveProvider>
       <RouterView />
     </NaiveProvider>

src/api/index.ts

@@ -1,4 +1,4 @@
-import type { AxiosProgressEvent, GenericAbortSignal } from 'axios'
+import type { GenericAbortSignal } from 'axios'
 import { post } from '@/utils/request'
 
 export function fetchChatAPI<T = any>(
@@ -13,21 +13,6 @@ export function fetchChatAPI<T = any>(
   })
 }
 
-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,
-  })
-}
-
 export function fetchChatConfig<T = any>() {
   return post<T>({
     url: '/config',

src/components/common/HoverButton/Button.vue

@@ -12,7 +12,7 @@ function handleClick() {
 
 <template>
   <button
-    class="flex items-center justify-center w-10 h-10 transition rounded-full hover:bg-neutral-100"
+    class="flex items-center justify-center w-10 h-10 transition rounded-full hover:bg-neutral-100 dark:hover:bg-[#414755]"
     @click="handleClick"
   >
     <slot />

src/components/common/Setting/index.vue

@@ -1,6 +1,7 @@
 <script setup lang='ts'>
 import { computed, ref, watch } from 'vue'
 import { NCard, NModal } from 'naive-ui'
+import pkg from '../../../../package.json'
 import { fetchChatConfig } from '@/api'
 
 interface Props {
@@ -55,9 +56,16 @@ watch(
   <NModal v-model:show="show" style="width: 80%; max-width: 460px;">
     <NCard>
       <div class="space-y-4">
-        <h1 class="text-xl font-bold">
+        <h2 class="text-xl font-bold text-center">
-          当前后台设置
+          Version - {{ pkg.version }}
-        </h1>
+        </h2>
+        <hr>
+        <p>
+          此项目开源于
+          <a class="text-blue-600" href="https://github.com/Chanzhaoyu/chatgpt-web" target="_blank">Github</a>
+          如果你觉得此项目对你有帮助，请帮我点个 Star，谢谢！
+        </p>
+        <hr>
         <p>API方式：{{ config?.apiModel ?? '-' }}</p>
         <p>反向代理：{{ config?.reverseProxy ?? '-' }}</p>
         <p>超时时间：{{ config?.timeoutMs ?? '-' }}</p>

src/components/custom/GithubSite.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="text-center text-neutral-500">
+  <div class="text-neutral-400">
-    <span>❤️ Star on</span>
+    <span>Star on</span>
     <a href="https://github.com/Chanzhaoyu/chatgpt-bot" target="_blank" class="text-blue-500">
       GitHub
     </a>

src/directives/highlight.ts

@@ -1,21 +0,0 @@
-import type { App, Directive } from 'vue'
-import hljs from 'highlight.js'
-import includeCode from '@/utils/functions/includeCode'
-
-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,6 +1 @@
-import type { App } from 'vue'
+export function setupDirectives() {}
-import setupHighlightDirective from './highlight'
-
-export function setupDirectives(app: App) {
-  setupHighlightDirective(app)
-}

src/hooks/useTheme.ts

@@ -0,0 +1,43 @@
+import type { GlobalThemeOverrides } from 'naive-ui'
+import { computed, watch } from 'vue'
+import { darkTheme, useOsTheme } from 'naive-ui'
+import { useAppStore } from '@/store'
+
+export function useTheme() {
+  const appStore = useAppStore()
+
+  const OsTheme = useOsTheme()
+
+  const isDark = computed(() => {
+    if (appStore.theme === 'auto')
+      return OsTheme.value === 'dark'
+    else
+      return appStore.theme === 'dark'
+  })
+
+  const theme = computed(() => {
+    return isDark.value ? darkTheme : undefined
+  })
+
+  const themeOverrides = computed<GlobalThemeOverrides>(() => {
+    if (isDark.value) {
+      return {
+        common: {},
+      }
+    }
+    return {}
+  })
+
+  watch(
+    () => isDark.value,
+    (dark) => {
+      if (dark)
+        document.documentElement.classList.add('dark')
+      else
+        document.documentElement.classList.remove('dark')
+    },
+    { immediate: true },
+  )
+
+  return { theme, themeOverrides }
+}

src/main.ts

@@ -1,6 +1,5 @@
 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'
@@ -11,8 +10,6 @@ async function bootstrap() {
 
   setupStore(app)
 
-  setupDirectives(app)
-
   await setupRouter(app)
 
   app.mount('#app')

src/plugins/assets.ts

@@ -1,5 +1,7 @@
 import 'highlight.js/styles/xcode.css'
-import '@/styles/global.css'
+import '@/styles/lib/tailwind.css'
+import '@/styles/lib/github-markdown.less'
+import '@/styles/global.less'
 
 /** Tailwind's Preflight Style Override */
 function naiveStyleOverride() {

src/store/modules/app/helper.ts

@@ -2,19 +2,22 @@ import { ss } from '@/utils/storage'
 
 const LOCAL_NAME = 'appSetting'
 
+export type Theme = 'light' | 'dark' | 'auto'
+
 export interface AppState {
   siderCollapsed: boolean
+  theme: Theme
 }
 
-export function defaultSetting() {
+export function defaultSetting(): AppState {
-  return { siderCollapsed: false }
+  return { siderCollapsed: false, theme: 'light' }
 }
 
-export function getLocalSetting() {
+export function getLocalSetting(): AppState {
   const localSetting: AppState | undefined = ss.get(LOCAL_NAME)
-  return localSetting ?? defaultSetting()
+  return { ...defaultSetting(), ...localSetting }
 }
 
-export function setLocalSetting(setting: AppState) {
+export function setLocalSetting(setting: AppState): void {
   ss.set(LOCAL_NAME, setting)
 }

src/store/modules/app/index.ts

@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import type { AppState } from './helper'
+import type { AppState, Theme } from './helper'
 import { getLocalSetting, setLocalSetting } from './helper'
 
 export const useAppStore = defineStore('app-store', {
@@ -7,6 +7,15 @@ export const useAppStore = defineStore('app-store', {
   actions: {
     setSiderCollapsed(collapsed: boolean) {
       this.siderCollapsed = collapsed
+      this.recordState()
+    },
+
+    setTheme(theme: Theme) {
+      this.theme = theme
+      this.recordState()
+    },
+
+    recordState() {
       setLocalSetting(this.$state)
     },
   },

src/store/modules/chat/index.ts

@@ -110,6 +110,22 @@ export const useChatStore = defineStore('chat-store', {
       }
     },
 
+    deleteChatByUuid(uuid: number, index: number) {
+      if (!uuid || uuid === 0) {
+        if (this.chat.length) {
+          this.chat[0].data.splice(index, 1)
+          this.recordState()
+        }
+        return
+      }
+
+      const chatIndex = this.chat.findIndex(item => item.uuid === uuid)
+      if (chatIndex !== -1) {
+        this.chat[chatIndex].data.splice(index, 1)
+        this.recordState()
+      }
+    },
+
     clearChatByUuid(uuid: number) {
       if (!uuid || uuid === 0) {
         if (this.chat.length) {

src/styles/global.less

@@ -0,0 +1,5 @@
+html,
+body,
+#app {
+	height: 100%;
+}

src/styles/lib/tailwind.css

@@ -1,9 +1,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-html,
-body,
-#app {
-	height: 100%;
-}

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

@@ -8,9 +8,9 @@ defineProps<Props>()
 
 <template>
   <img v-if="image" src="@/assets/avatar.jpg" class="object-cover w-full h-full " alt="avatar">
-  <span v-else class="text-[27px]">
+  <span v-else class="text-[27px] dark:text-white">
     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" aria-hidden="true" width="1em" height="1em">
-      <path d="M29.71,13.09A8.09,8.09,0,0,0,20.34,2.68a8.08,8.08,0,0,0-13.7,2.9A8.08,8.08,0,0,0,2.3,18.9,8,8,0,0,0,3,25.45a8.08,8.08,0,0,0,8.69,3.87,8,8,0,0,0,6,2.68,8.09,8.09,0,0,0,7.7-5.61,8,8,0,0,0,5.33-3.86A8.09,8.09,0,0,0,29.71,13.09Zm-12,16.82a6,6,0,0,1-3.84-1.39l.19-.11,6.37-3.68a1,1,0,0,0,.53-.91v-9l2.69,1.56a.08.08,0,0,1,.05.07v7.44A6,6,0,0,1,17.68,29.91ZM4.8,24.41a6,6,0,0,1-.71-4l.19.11,6.37,3.68a1,1,0,0,0,1,0l7.79-4.49V22.8a.09.09,0,0,1,0,.08L13,26.6A6,6,0,0,1,4.8,24.41ZM3.12,10.53A6,6,0,0,1,6.28,7.9v7.57a1,1,0,0,0,.51.9l7.75,4.47L11.85,22.4a.14.14,0,0,1-.09,0L5.32,18.68a6,6,0,0,1-2.2-8.18Zm22.13,5.14-7.78-4.52L20.16,9.6a.08.08,0,0,1,.09,0l6.44,3.72a6,6,0,0,1-.9,10.81V16.56A1.06,1.06,0,0,0,25.25,15.67Zm2.68-4-.19-.12-6.36-3.7a1,1,0,0,0-1.05,0l-7.78,4.49V9.2a.09.09,0,0,1,0-.09L19,5.4a6,6,0,0,1,8.91,6.21ZM11.08,17.15,8.38,15.6a.14.14,0,0,1-.05-.08V8.1a6,6,0,0,1,9.84-4.61L18,3.6,11.61,7.28a1,1,0,0,0-.53.91ZM12.54,14,16,12l3.47,2v4L16,20l-3.47-2Z" />
+      <path d="M29.71,13.09A8.09,8.09,0,0,0,20.34,2.68a8.08,8.08,0,0,0-13.7,2.9A8.08,8.08,0,0,0,2.3,18.9,8,8,0,0,0,3,25.45a8.08,8.08,0,0,0,8.69,3.87,8,8,0,0,0,6,2.68,8.09,8.09,0,0,0,7.7-5.61,8,8,0,0,0,5.33-3.86A8.09,8.09,0,0,0,29.71,13.09Zm-12,16.82a6,6,0,0,1-3.84-1.39l.19-.11,6.37-3.68a1,1,0,0,0,.53-.91v-9l2.69,1.56a.08.08,0,0,1,.05.07v7.44A6,6,0,0,1,17.68,29.91ZM4.8,24.41a6,6,0,0,1-.71-4l.19.11,6.37,3.68a1,1,0,0,0,1,0l7.79-4.49V22.8a.09.09,0,0,1,0,.08L13,26.6A6,6,0,0,1,4.8,24.41ZM3.12,10.53A6,6,0,0,1,6.28,7.9v7.57a1,1,0,0,0,.51.9l7.75,4.47L11.85,22.4a.14.14,0,0,1-.09,0L5.32,18.68a6,6,0,0,1-2.2-8.18Zm22.13,5.14-7.78-4.52L20.16,9.6a.08.08,0,0,1,.09,0l6.44,3.72a6,6,0,0,1-.9,10.81V16.56A1.06,1.06,0,0,0,25.25,15.67Zm2.68-4-.19-.12-6.36-3.7a1,1,0,0,0-1.05,0l-7.78,4.49V9.2a.09.09,0,0,1,0-.09L19,5.4a6,6,0,0,1,8.91,6.21ZM11.08,17.15,8.38,15.6a.14.14,0,0,1-.05-.08V8.1a6,6,0,0,1,9.84-4.61L18,3.6,11.61,7.28a1,1,0,0,0-.53.91ZM12.54,14,16,12l3.47,2v4L16,20l-3.47-2Z" fill="currentColor" />
     </svg>
   </span>
 </template>

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

@@ -1,7 +1,16 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { marked } from 'marked'
-import includeCode from '@/utils/functions/includeCode'
+import hljs from 'highlight.js'
+
+const props = defineProps<Props>()
+
+marked.setOptions({
+  renderer: new marked.Renderer(),
+  highlight(code) {
+    return hljs.highlightAuto(code).value
+  },
+})
 
 interface Props {
   inversion?: boolean
@@ -10,8 +19,6 @@ interface Props {
   loading?: boolean
 }
 
-const props = defineProps<Props>()
-
 const wrapClass = computed(() => {
   return [
     'text-wrap',
@@ -19,45 +26,32 @@ const wrapClass = computed(() => {
     'min-w-[20px]',
     'rounded-md',
     props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
+    props.inversion ? 'dark:bg-[#a1dc95]' : 'dark:bg-[#1e1e20]',
     { 'text-red-500': props.error },
   ]
 })
 
 const text = computed(() => {
-  if (props.text) {
+  if (props.text && !props.inversion)
-    if (!includeCode(props.text))
+    return marked(props.text)
-      return marked.parse(props.text)
+  return props.text
-    return props.text
-  }
-  return ''
 })
 </script>
 
 <template>
-  <div :class="wrapClass">
+  <div class="text-black" :class="wrapClass">
     <template v-if="loading">
-      <span class="w-[3px] h-[20px] block animate-blink" />
+      <span class="dark:text-white w-[4px] h-[20px] block animate-blink" />
     </template>
     <template v-else>
-      <code v-if="includeCode(text)" v-highlight class="leading-relaxed" v-text="text" />
+      <div class="leading-relaxed break-all">
-      <div v-else class="leading-relaxed break-all" v-html="text" />
+        <div v-if="!inversion" class="markdown-body" v-html="text" />
+        <div v-else v-text="text" />
+      </div>
     </template>
   </div>
 </template>
 
 <style lang="less">
-.text-wrap{
+@import url(./style.less);
-  img{
-    max-width: 100%;
-    vertical-align: middle;
-  }
-  a {
-    color: #2d5cf6
-  }
-}
-
-.hljs {
-  background-color: #fff0 !important;
-  white-space: break-spaces;
-}
 </style>

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

@@ -1,6 +1,6 @@
 <script setup lang='ts'>
-import Avatar from './Avatar.vue'
+import AvatarComponent from './Avatar.vue'
-import Text from './Text.vue'
+import TextComponent from './Text.vue'
 import { SvgIcon } from '@/components/common'
 
 interface Props {
@@ -13,38 +13,60 @@ interface Props {
 
 interface Emit {
   (ev: 'regenerate'): void
+  (ev: 'copy'): void
+  (ev: 'delete'): void
 }
 
 defineProps<Props>()
 
 const emit = defineEmits<Emit>()
 
+function handleDelete() {
+  emit('delete')
+}
+
 function handleRegenerate() {
   emit('regenerate')
 }
 </script>
 
 <template>
-  <div class="flex w-full mb-6" :class="[{ 'flex-row-reverse': inversion }]">
+  <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 w-[32px] h-[32px]"
+      class="flex items-center justify-center rounded-full overflow-hidden flex-shrink-0 w-[32px] h-[32px]"
       :class="[inversion ? 'ml-3' : 'mr-3']"
     >
-      <Avatar :image="inversion" />
+      <AvatarComponent :image="inversion" />
     </div>
     <div class="flex flex-col flex-1 text-sm" :class="[inversion ? 'items-end' : 'items-start']">
       <span class="text-xs text-[#b4bbc4]">
         {{ dateTime }}
       </span>
-      <div class="flex items-end mt-2">
+      <div
-        <Text :inversion="inversion" :error="error" :text="text" :loading="loading" />
+        class="flex items-end gap-2 mt-2"
-        <button
+        :class="[inversion ? 'flex-row-reverse' : 'flex-row']"
-          v-if="!inversion && !loading"
+      >
-          class="mb-2 ml-2 transition text-neutral-400 hover:text-neutral-800"
+        <TextComponent
-          @click="handleRegenerate"
+          :inversion="inversion"
-        >
+          :error="error"
-          <SvgIcon icon="ri:restart-line" />
+          :text="text"
-        </button>
+          :loading="loading"
+        />
+        <div class="flex flex-col">
+          <button
+            v-if="!inversion"
+            class="mb-2 transition text-neutral-400 hover:text-neutral-800 dark:hover:text-neutral-200"
+            @click="handleRegenerate"
+          >
+            <SvgIcon icon="ri:restart-line" />
+          </button>
+          <button
+            class="mb-1 transition text-neutral-400 hover:text-neutral-800 dark:hover:text-neutral-200"
+            @click="handleDelete"
+          >
+            <SvgIcon icon="ri:delete-bin-6-line" />
+          </button>
+        </div>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,31 @@
+.markdown-body {
+	background-color: transparent;
+	font-size: 14px;
+
+	ol {
+		list-style-type: decimal;
+	}
+
+	ul {
+		list-style-type: disc;
+	}
+
+	pre code,
+	pre tt {
+		line-height: 1.65;
+	}
+
+	.highlight pre,
+	pre {
+		background-color: #fff;
+	}
+}
+
+.dark{
+	.markdown-body{
+		.highlight pre,
+		pre {
+			background-color: #18181c;
+		}
+	}
+}

src/views/chat/index.vue

@@ -1,19 +1,20 @@
 <script setup lang='ts'>
 import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
-import { NButton, NInput, useDialog } from 'naive-ui'
+import { NButton, NInput, useDialog, useMessage } from 'naive-ui'
 import { Message } from './components'
 import { useScroll } from './hooks/useScroll'
 import { useChat } from './hooks/useChat'
 import { HoverButton, SvgIcon } from '@/components/common'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
 import { useChatStore } from '@/store'
-import { fetchChatAPIProcess } from '@/api'
+import { fetchChatAPI } from '@/api'
 
 let controller = new AbortController()
 
 const route = useRoute()
 const dialog = useDialog()
+const ms = useMessage()
 
 const chatStore = useChatStore()
 
@@ -80,39 +81,22 @@ async function onConversation() {
   )
   scrollToBottom()
 
-  let offset = 0
   try {
-    await fetchChatAPIProcess<Chat.ConversationResponse>({
+    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
-      prompt: message,
+    updateChat(
-      options,
+      +uuid,
-      signal: controller.signal,
+      dataSources.value.length - 1,
-      onDownloadProgress: ({ event }) => {
+      {
-        const xhr = event.target
+        dateTime: new Date().toLocaleString(),
-        const { responseText } = xhr
+        text: data.text ?? '',
-        const chunk = responseText.substring(offset)
+        inversion: false,
-        offset = responseText.length
+        error: false,
-        try {
+        loading: false,
-          const data = JSON.parse(chunk)
+        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-          updateChat(
+        requestOptions: { prompt: message, options: { ...options } },
-            +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.'
@@ -136,7 +120,6 @@ async function onConversation() {
     scrollToBottom()
   }
   finally {
-    offset = 0
     loading.value = false
   }
 }
@@ -172,41 +155,24 @@ async function onRegenerate(index: number) {
     },
   )
 
-  let offset = 0
   try {
-    await fetchChatAPIProcess<Chat.ConversationResponse>({
+    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
-      prompt: message,
+    updateChat(
-      options,
+      +uuid,
-      signal: controller.signal,
+      index,
-      onDownloadProgress: ({ event }) => {
+      {
-        const xhr = event.target
+        dateTime: new Date().toLocaleString(),
-        const { responseText } = xhr
+        text: data.text ?? '',
-        const chunk = responseText.substring(offset)
+        inversion: false,
-        offset = responseText.length
+        error: false,
-        try {
+        loading: false,
-          const data = JSON.parse(chunk)
+        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-          updateChat(
+        requestOptions: { prompt: message, ...options },
-            +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 = error?.message ?? 'Something went wrong, please try again later.'
+    let errorMessage = 'Something went wrong, please try again later.'
 
     if (error.message === 'canceled')
       errorMessage = 'Request canceled. Please try again.'
@@ -227,10 +193,25 @@ async function onRegenerate(index: number) {
   }
   finally {
     loading.value = false
-    offset = 0
   }
 }
 
+function handleDelete(index: number) {
+  if (loading.value)
+    return
+
+  dialog.warning({
+    title: 'Delete Message',
+    content: 'Are you sure to delete this message?',
+    positiveText: 'Yes',
+    negativeText: 'No',
+    onPositiveClick: () => {
+      chatStore.deleteChatByUuid(+uuid, index)
+      ms.success('Message deleted successfully.')
+    },
+  })
+}
+
 function handleClear() {
   if (loading.value)
     return
@@ -253,13 +234,20 @@ function handleEnter(event: KeyboardEvent) {
   }
 }
 
+function handleStop() {
+  if (loading.value) {
+    controller.abort()
+    loading.value = false
+  }
+}
+
 const buttonDisabled = computed(() => {
   return loading.value || !prompt.value || prompt.value.trim() === ''
 })
 
 const wrapClass = computed(() => {
   if (isMobile.value)
-    return ['pt-14', 'pb-14']
+    return ['pt-14', 'pb-16']
 
   return []
 })
@@ -302,7 +290,16 @@ onUnmounted(() => {
               :error="item.error"
               :loading="item.loading"
               @regenerate="onRegenerate(index)"
+              @delete="handleDelete(index)"
             />
+            <div class="flex justify-center">
+              <NButton v-if="loading" ghost @click="handleStop">
+                <template #icon>
+                  <SvgIcon icon="ri:stop-circle-line" />
+                </template>
+                Stop Responding
+              </NButton>
+            </div>
           </div>
         </template>
       </div>
@@ -310,7 +307,7 @@ onUnmounted(() => {
     <footer :class="footerClass">
       <div class="flex items-center justify-between space-x-2">
         <HoverButton @click="handleClear">
-          <span class="text-xl text-[#4f555e]">
+          <span class="text-xl text-[#4f555e] dark:text-white">
             <SvgIcon icon="ri:delete-bin-line" />
           </span>
         </HoverButton>
@@ -323,7 +320,9 @@ onUnmounted(() => {
         />
         <NButton type="primary" :disabled="buttonDisabled" @click="handleSubmit">
           <template #icon>
-            <SvgIcon icon="ri:send-plane-fill" />
+            <span class="dark:text-black">
+              <SvgIcon icon="ri:send-plane-fill" />
+            </span>
           </template>
         </NButton>
       </div>

src/views/chat/layout/Layout.vue

@@ -20,7 +20,7 @@ const collapsed = computed(() => appStore.siderCollapsed)
 const getMobileClass = computed(() => {
   if (isMobile.value)
     return ['rounded-none', 'shadow-none']
-  return ['border', 'rounded-md', 'shadow-md']
+  return ['border', 'rounded-md', 'shadow-md', 'dark:border-neutral-800']
 })
 
 const getContainerClass = computed(() => {
@@ -32,7 +32,7 @@ const getContainerClass = computed(() => {
 </script>
 
 <template>
-  <div class="h-full" :class="[isMobile ? 'p-0' : 'p-4']">
+  <div class="h-full dark:bg-[#24272e] transition-all" :class="[isMobile ? 'p-0' : 'p-4']">
     <div class="h-full overflow-hidden" :class="getMobileClass">
       <NLayout class="z-40 transition" :class="getContainerClass" has-sider>
         <Sider />

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

@@ -18,7 +18,7 @@ function handleUpdateCollapsed() {
 </script>
 
 <template>
-  <header class="fixed top-0 left-0 right-0 z-30 border-b bg-white/80 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/30 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">
         <SvgIcon v-if="collapsed" class="text-2xl" icon="ri:align-justify" />

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

@@ -1,15 +1,60 @@
 <script setup lang='ts'>
-import { ref } from 'vue'
+import { computed, h, ref } from 'vue'
+import { NDropdown } from 'naive-ui'
 import { HoverButton, Setting, SvgIcon, UserAvatar } from '@/components/common'
+import { useAppStore } from '@/store'
+
+const appStore = useAppStore()
 
 const show = ref(false)
+
+const theme = computed(() => appStore.theme)
+
+const options = [
+  {
+    label: 'Dark',
+    key: 'dark',
+    icon: renderIcon('ri:moon-foggy-line'),
+  },
+  {
+    label: 'Light',
+    key: 'light',
+    icon: renderIcon('ri:sun-foggy-line'),
+  },
+  {
+    label: 'Auto',
+    key: 'auto',
+    icon: renderIcon('ri:contrast-line'),
+  },
+]
+
+function renderIcon(icon: string) {
+  return () => {
+    return h(SvgIcon, { icon })
+  }
+}
+
+function handleThemeChange(key: 'light' | 'dark' | 'auto') {
+  appStore.setTheme(key)
+}
 </script>
 
 <template>
-  <footer class="flex items-center justify-between min-w-0 p-4 overflow-hidden border-t">
+  <footer class="flex items-center justify-between min-w-0 p-4 overflow-hidden border-t dark:border-neutral-800">
     <UserAvatar />
+
+    <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 === 'light'" icon="ri:moon-foggy-line" />
+          <SvgIcon v-if="theme === 'auto'" icon="ri:contrast-line" />
+        </span>
+      </HoverButton>
+    </NDropdown>
+
     <HoverButton tooltip="Setting" @click="show = true">
-      <span class="text-xl text-[#4f555e]">
+      <span class="text-xl text-[#4f555e] dark:text-white">
         <SvgIcon icon="ri:settings-4-line" />
       </span>
     </HoverButton>

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

@@ -55,8 +55,8 @@ function isActive(uuid: number) {
       <template v-else>
         <div v-for="(item, index) of dataSources" :key="index">
           <a
-            class="relative flex items-center gap-3 px-3 py-3 break-all border rounded-md cursor-pointer hover:bg-neutral-100 group"
+            class="relative flex items-center gap-3 px-3 py-3 break-all border rounded-md cursor-pointer hover:bg-neutral-100 group dark:border-neutral-800 dark:hover:bg-[#24272e]"
-            :class="isActive(item.uuid) && ['border-[#4b9e5f]', 'bg-neutral-100', 'text-[#4b9e5f]', 'pr-14']"
+            :class="isActive(item.uuid) && ['border-[#4b9e5f]', 'bg-neutral-100', 'text-[#4b9e5f]', 'dark:bg-[#24272e]', 'dark:border-[#4b9e5f]', 'pr-14']"
             @click="handleSelect(item)"
           >
             <span>

tailwind.config.js

@@ -1,5 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
+  darkMode: 'class',
   content: [
     './index.html',
     './src/**/*.{vue,js,ts,jsx,tsx}',
@@ -11,7 +12,7 @@ module.exports = {
       },
       keyframes: {
         blink: {
-          '0%, 100%': { 'background-color': '#000' },
+          '0%, 100%': { 'background-color': 'currentColor' },
           '50%': { 'background-color': 'transparent' },
         },
       },