feat: v2.7.2 消息样式美化和优化代码 (#111)

* perf: 优化代码

* feat: 美化消息，支持 markdown 全语法

* chore: version 2.7.2

.env

@@ -3,4 +3,5 @@ VITE_GLOB_API_URL=/api
 
 VITE_APP_API_BASE_URL=http://localhost:3002/
 
+# Glob API Timeout (ms)
 VITE_GLOB_API_TIMEOUT=100000

CHANGELOG.md

@@ -1,3 +1,50 @@
+## 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`
+
+### Feature
+- 使用消息流返回信息，反应更迅速
+
+### Enhancement
+- 样式的一点小改动
+
+## v2.6.2
+
+`2023-02-22`
+### BugFix
+- 还原修改代理导致的异常问题
+
+## v2.6.1
+
+`2023-02-22`
+
+### Feature
+- 新增 `Railway` 部署模版
+
+### BugFix
+- 手动打包 `Proxy` 问题
+
 ## v2.6.0
 
 `2023-02-21`

README.md

@@ -1,10 +1,36 @@
 # ChatGPT Web
 
-使用 `express` 和 `vue3` 搭建的支持 `ChatGPT` 双模型演示网页
+> 使用 `express` 和 `vue3` 搭建的支持 `ChatGPT` 双模型演示网页
 
 ![cover](./docs/cover.png)
 ![cover2](./docs/cover2.png)
 
+- [ChatGPT Web](#chatgpt-web)
+	- [介绍](#介绍)
+	- [待实现路线](#待实现路线)
+	- [前置要求](#前置要求)
+		- [Node](#node)
+		- [PNPM](#pnpm)
+		- [填写密钥](#填写密钥)
+	- [安装依赖](#安装依赖)
+		- [后端](#后端)
+		- [前端](#前端)
+	- [测试环境运行](#测试环境运行)
+		- [后端服务](#后端服务)
+		- [前端网页](#前端网页)
+	- [打包](#打包)
+		- [使用 Docker](#使用-docker)
+			- [Docker 参数示例](#docker-参数示例)
+			- [Docker build \& Run](#docker-build--run)
+			- [Docker compose](#docker-compose)
+		- [使用 Railway 部署](#使用-railway-部署)
+			- [Railway 环境变量](#railway-环境变量)
+		- [手动打包](#手动打包)
+			- [后端服务](#后端服务-1)
+			- [前端网页](#前端网页-1)
+	- [常见问题](#常见问题)
+	- [参与贡献](#参与贡献)
+	- [License](#license)
 ## 介绍
 
 支持双模型，提供了两种非官方 `ChatGPT API` 方法
@@ -52,7 +78,7 @@ API_REVERSE_PROXY=
 
 ### Node
 
-`node` 需要 `^16 || ^18` 版本（或者 `node >= 14` 需要安装 [fetch polyfill](https://github.com/developit/unfetch#usage-as-a-polyfill)），使用 [nvm](https://github.com/nvm-sh/nvm) 可管理本地多个 `node` 版本
+`node` 需要 `^16 || ^18` 版本（`node >= 14` 需要安装 [fetch polyfill](https://github.com/developit/unfetch#usage-as-a-polyfill)），使用 [nvm](https://github.com/nvm-sh/nvm) 可管理本地多个 `node` 版本
 
 ```shell
 node -v
@@ -81,7 +107,7 @@ OPENAI_ACCESS_TOKEN=
 
 > 为了简便 `后端开发人员` 的了解负担，所以并没有采用前端 `workspace` 模式，而是分文件夹存放。如果只需要前端页面做二次开发，删除 `service` 文件夹即可。
 
-### 后端服务
+### 后端
 
 进入文件夹 `/service` 运行以下命令
 
@@ -89,7 +115,7 @@ OPENAI_ACCESS_TOKEN=
 pnpm install
 ```
 
-### 网页
+### 前端
 根目录下运行以下命令
 ```shell
 pnpm bootstrap
@@ -114,7 +140,7 @@ pnpm dev
 
 ### 使用 Docker
 
-### Docker 参数示例
+#### Docker 参数示例
 
 - `OPENAI_API_KEY` 二选一
 - `OPENAI_ACCESS_TOKEN`  二选一，同时存在时，`OPENAI_API_KEY` 优先
@@ -123,7 +149,7 @@ pnpm dev
 
 ![docker](./docs/docker.png)
 
-### Docker build & Run
+#### Docker build & Run
 
 ```bash
 docker build -t chatgpt-web .
@@ -138,7 +164,7 @@ docker run --name chatgpt-web -d -p 3002:3002 --env OPENAI_API_KEY=your_api_key
 http://localhost:3002/
 ```
 
-### Docker compose
+#### Docker compose
 
 [Hub 地址](https://hub.docker.com/repository/docker/chenzhaoyu94/chatgpt-web/general)
 
@@ -161,9 +187,24 @@ services:
       TIMEOUT_MS: 60000
 ```
 
+###  使用 Railway 部署
 
-## 手动打包
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template/yytmgc)
-### 后端服务
+
+#### Railway 环境变量
+
+| 环境变量名称                | 必填 | 备注                    |
+| --------------------------- | ---- | ----------------------- |
+| `PORT` | 必填    | 默认 `3002`  |
+| `TIMEOUT_MS` | 可选    | 超时时间，单位毫秒，   |
+| `OPENAI_API_KEY` | `OpenAI API` 二选一    | 使用 `OpenAI API` 所需的 `apiKey` [(获取 apiKey)](https://platform.openai.com/overview)   |
+| `OPENAI_ACCESS_TOKEN` | `Web API` 二选一   | 使用 `Web API` 所需的 `accessToken` [(获取 accessToken)](https://chat.openai.com/api/auth/session)   |
+| `API_REVERSE_PROXY` | 可选，`Web API` 时可用    | `Web API` 反向代理地址 [详情](https://github.com/transitive-bullshit/chatgpt-api#reverse-proxy)   |
+
+> 注意: `Railway` 修改环境变量会重新 `Deploy`
+
+### 手动打包
+#### 后端服务
 > 如果你不需要本项目的 `node` 接口，可以省略如下操作
 
 复制 `service` 文件夹到你有 `node` 服务环境的服务器上。
@@ -181,7 +222,7 @@ pnpm prod
 
 PS: 不进行打包，直接在服务器上运行 `pnpm start` 也可
 
-### 前端网页
+#### 前端网页
 
 1、修改根目录下 `.env` 内 `VITE_APP_API_BASE_URL` 为你的实际后端接口地址
 
@@ -193,7 +234,7 @@ PS: 不进行打包，直接在服务器上运行 `pnpm start` 也可
 pnpm build
 ```
 
-### 常见问题
+## 常见问题
 Q: 为什么 `Git` 提交总是报错？
 
 A: 因为有提交信息验证，请遵循 [Commit 指南](./CONTRIBUTING.md)

config/index.ts

@@ -0,0 +1 @@
+export * from './proxy'

config/proxy.ts

@@ -0,0 +1,16 @@
+import type { ProxyOptions } from 'vite'
+
+export function createViteProxy(isOpenProxy: boolean, viteEnv: ImportMetaEnv) {
+  if (!isOpenProxy)
+    return
+
+  const proxy: Record<string, string | ProxyOptions> = {
+    '/api': {
+      target: viteEnv.VITE_APP_API_BASE_URL,
+      changeOrigin: true,
+      rewrite: path => path.replace('/api/', '/'),
+    },
+  }
+
+  return proxy
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web",
-  "version": "2.6.0",
+  "version": "2.7.2",
   "private": false,
   "description": "ChatGPT Web",
   "author": "ChenZhaoYu <chenzhaoyu1994@gmail.com>",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@vueuse/core": "^9.13.0",
+    "github-markdown-css": "^5.2.0",
     "highlight.js": "^11.7.0",
     "marked": "^4.2.12",
     "naive-ui": "^2.34.3",

pnpm-lock.yaml

@@ -15,6 +15,7 @@ specifiers:
   axios: ^1.3.3
   crypto-js: ^4.1.1
   eslint: ^8.34.0
+  github-markdown-css: ^5.2.0
   highlight.js: ^11.7.0
   husky: ^8.0.3
   less: ^4.1.3
@@ -34,6 +35,7 @@ specifiers:
 
 dependencies:
   '@vueuse/core': 9.13.0_vue@3.2.47
+  github-markdown-css: 5.2.0
   highlight.js: 11.7.0
   marked: 4.2.12
   naive-ui: 2.34.3_vue@3.2.47
@@ -2524,6 +2526,10 @@ packages:
       through2: 4.0.2
     dev: true
 
+  /github-markdown-css/5.2.0:
+    resolution: {integrity: sha512-hq5RaCInSUZ48bImOZpkppW2/MT44StRgsbsZ8YA4vJFwLKB/Vo3k7R2t+pUGqO+ThG0QDMi96TewV/B3vyItg==}
+    dev: false
+
   /glob-parent/5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}

service/package.json

@@ -15,6 +15,7 @@
   },
   "scripts": {
     "start": "esno ./src/index.ts",
+    "dev": "esno watch ./src/index.ts",
     "prod": "esno ./build/index.js",
     "build": "pnpm clean && tsup",
     "clean": "rimraf build",

service/src/chatgpt.ts

@@ -1,6 +1,6 @@
 import * as dotenv from 'dotenv'
 import 'isomorphic-fetch'
-import type { ChatGPTAPI, SendMessageOptions } from 'chatgpt'
+import type { ChatGPTAPI, ChatMessage, SendMessageOptions } from 'chatgpt'
 import { ChatGPTUnofficialProxyAPI } from 'chatgpt'
 import { sendResponse } from './utils'
 
@@ -8,7 +8,7 @@ dotenv.config()
 
 let apiModel: 'ChatGPTAPI' | 'ChatGPTUnofficialProxyAPI' | undefined
 
-export interface ChatContext {
+interface ChatContext {
   conversationId?: string
   parentMessageId?: string
 }
@@ -76,4 +76,6 @@ async function chatConfig() {
   })
 }
 
+export type { ChatContext, ChatMessage }
+
 export { chatReply, chatConfig }

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>
+          ，免费并且协议为 MIT，其他来源均为盗版，使用时请注意。如果你觉得此项目对你有帮助，请帮我点个 Star，谢谢！
+        </p>
+        <hr>
         <p>API方式：{{ config?.apiModel ?? '-' }}</p>
         <p>反向代理：{{ config?.reverseProxy ?? '-' }}</p>
         <p>超时时间：{{ config?.timeoutMs ?? '-' }}</p>

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/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,4 +1,5 @@
 import 'highlight.js/styles/xcode.css'
+import 'github-markdown-css/github-markdown.css'
 import '@/styles/global.css'
 
 /** Tailwind's Preflight Style Override */

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/utils/functions/includeCode.ts

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

src/utils/request/index.ts

@@ -1,4 +1,4 @@
-import type { AxiosResponse, GenericAbortSignal } from 'axios'
+import type { AxiosProgressEvent, AxiosResponse, GenericAbortSignal } from 'axios'
 import request from './axios'
 
 export interface HttpOption {
@@ -6,6 +6,7 @@ export interface HttpOption {
   data?: any
   method?: string
   headers?: any
+  onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void
   signal?: GenericAbortSignal
   beforeRequest?: () => void
   afterRequest?: () => void
@@ -17,9 +18,11 @@ export interface Response<T = any> {
   status: string
 }
 
-function http<T = any>({ url, data, method, headers, signal, beforeRequest, afterRequest }: HttpOption) {
+function http<T = any>(
+  { url, data, method, headers, onDownloadProgress, signal, beforeRequest, afterRequest }: HttpOption,
+) {
   const successHandler = (res: AxiosResponse<Response<T>>) => {
-    if (res.data.status === 'Success')
+    if (res.data.status === 'Success' || typeof res.data === 'string')
       return res.data
 
     return Promise.reject(res.data)
@@ -37,17 +40,18 @@ function http<T = any>({ url, data, method, headers, signal, beforeRequest, afte
   const params = Object.assign(typeof data === 'function' ? data() : data ?? {}, {})
 
   return method === 'GET'
-    ? request.get(url, { params, signal }).then(successHandler, failHandler)
+    ? request.get(url, { params, signal, onDownloadProgress }).then(successHandler, failHandler)
-    : request.post(url, params, { headers, signal }).then(successHandler, failHandler)
+    : request.post(url, params, { headers, signal, onDownloadProgress }).then(successHandler, failHandler)
 }
 
 export function get<T = any>(
-  { url, data, method = 'GET', signal, beforeRequest, afterRequest }: HttpOption,
+  { url, data, method = 'GET', onDownloadProgress, signal, beforeRequest, afterRequest }: HttpOption,
 ): Promise<Response<T>> {
   return http<T>({
     url,
     method,
     data,
+    onDownloadProgress,
     signal,
     beforeRequest,
     afterRequest,
@@ -55,13 +59,14 @@ export function get<T = any>(
 }
 
 export function post<T = any>(
-  { url, data, method = 'POST', headers, signal, beforeRequest, afterRequest }: HttpOption,
+  { url, data, method = 'POST', headers, onDownloadProgress, signal, beforeRequest, afterRequest }: HttpOption,
 ): Promise<Response<T>> {
   return http<T>({
     url,
     method,
     data,
     headers,
+    onDownloadProgress,
     signal,
     beforeRequest,
     afterRequest,

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,12 +19,10 @@ interface Props {
   loading?: boolean
 }
 
-const props = defineProps<Props>()
-
 const wrapClass = computed(() => {
   return [
     'text-wrap',
-    'p-2',
+    'p-3',
     'min-w-[20px]',
     'rounded-md',
     props.inversion ? 'bg-[#d2f9d1]' : 'bg-[#f4f6f8]',
@@ -24,11 +31,8 @@ const wrapClass = computed(() => {
 })
 
 const text = computed(() => {
-  if (props.text) {
+  if (props.text)
-    if (!includeCode(props.text))
+    return marked(props.text)
-      return marked.parse(props.text)
-    return props.text
-  }
   return ''
 })
 </script>
@@ -36,25 +40,16 @@ const text = computed(() => {
 <template>
   <div :class="wrapClass">
     <template v-if="loading">
-      <span class="w-[3px] h-[20px] block animate-blink" />
+      <span class="w-[5px] 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 :class="[{ 'markdown-body': !inversion }]" v-html="text" />
+      </div>
     </template>
   </div>
 </template>
 
 <style lang="less">
-.text-wrap{
+@import url(./style.less);
-  img{
-    max-width: 100%;
-    vertical-align: middle;
-  }
-}
-
-.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,12 +13,18 @@ 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')
 }
@@ -30,21 +36,34 @@ function handleRegenerate() {
       class="flex items-center justify-center rounded-full overflow-hidden 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 class="flex items-end gap-2 mt-2" :class="[inversion ? 'flex-row-reverse' : 'flex-row']">
-        <Text :inversion="inversion" :error="error" :text="text" :loading="loading" />
+        <TextComponent
-        <button
+          :inversion="inversion"
-          v-if="!inversion && !loading"
+          :error="error"
-          class="mb-2 ml-2 transition text-neutral-400 hover:text-neutral-800"
+          :text="text"
-          @click="handleRegenerate"
+          :loading="loading"
-        >
+        />
-          <SvgIcon icon="ri:restart-line" />
+        <div class="flex flex-col">
-        </button>
+          <button
+            v-if="!inversion"
+            class="mb-2 transition text-neutral-400 hover:text-neutral-800"
+            @click="handleRegenerate"
+          >
+            <SvgIcon icon="ri:restart-line" />
+          </button>
+          <button
+            class="mb-1 transition text-neutral-400 hover:text-neutral-800"
+            @click="handleDelete"
+          >
+            <SvgIcon icon="ri:delete-bin-6-line" />
+          </button>
+        </div>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,22 @@
+.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;
+	}
+}

src/views/chat/index.vue

@@ -1,7 +1,7 @@
 <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'
@@ -14,6 +14,7 @@ let controller = new AbortController()
 
 const route = useRoute()
 const dialog = useDialog()
+const ms = useMessage()
 
 const chatStore = useChatStore()
 
@@ -195,6 +196,22 @@ async function onRegenerate(index: number) {
   }
 }
 
+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
@@ -217,6 +234,13 @@ 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() === ''
 })
@@ -266,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>

vite.config.ts

@@ -13,8 +13,8 @@ export default defineConfig((env) => {
     },
     plugins: [vue()],
     server: {
-      port: 1002,
       host: '0.0.0.0',
+      port: 1002,
       open: false,
       proxy: {
         '/api': {