perf: 优化代码和类型

service/src/chatgpt/index.ts

@@ -9,6 +9,9 @@ import axios from 'axios'
 import { sendResponse } from '../utils'
 import { isNotEmptyString } from '../utils/is'
 import type { ApiModel, ChatContext, ChatGPTUnofficialProxyAPIOptions, ModelConfig } from '../types'
+import type { RequestOptions } from './types'
+
+dotenv.config()
 
 const ErrorCodeMessage: Record<string, string> = {
  401: '[OpenAI] 提供错误的API密钥 | Incorrect API key provided',
@@ -19,21 +22,19 @@ const ErrorCodeMessage: Record<string, string> = {
  500: '[OpenAI] 服务器繁忙，请稍后再试 | Internal Server Error',
 }
 
-dotenv.config()
-
 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)
+if (!isNotEmptyString(process.env.OPENAI_API_KEY) && !isNotEmptyString(process.env.OPENAI_ACCESS_TOKEN))
  throw new Error('Missing OPENAI_API_KEY or OPENAI_ACCESS_TOKEN environment variable')
 
 let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
 
 (async () => {
  // More Info: https://github.com/transitive-bullshit/chatgpt-api
 
- if (process.env.OPENAI_API_KEY) {
+ if (isNotEmptyString(process.env.OPENAI_API_KEY)) {
  const OPENAI_API_MODEL = process.env.OPENAI_API_MODEL
  const model = isNotEmptyString(OPENAI_API_MODEL) ? OPENAI_API_MODEL : 'gpt-3.5-turbo'
 
@@ -67,20 +68,15 @@ let api: ChatGPTAPI | ChatGPTUnofficialProxyAPI
  }
 })()
 
-async function chatReplyProcess(
- message: string,
- lastContext?: { conversationId?: string; parentMessageId?: string },
- process?: (chat: ChatMessage) => void,
- systemMessage?: string,
-) {
+async function chatReplyProcess(options: RequestOptions) {
+ const { message, lastContext, process, systemMessage } = options
  try {
  let options: SendMessageOptions = { timeoutMs }
 
- if (apiModel === 'ChatGPTAPI'){
- if (systemMessage != null && systemMessage.length > 0){
- options.systemMessage = systemMessage
- }
- }
+ if (apiModel === 'ChatGPTAPI') {
+ if (isNotEmptyString(systemMessage))
+ options.systemMessage = systemMessage
+ }
 
  if (lastContext != null) {
  if (apiModel === 'ChatGPTAPI')

service/src/chatgpt/types.ts

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

service/src/index.ts

@@ -1,5 +1,6 @@
 import express from 'express'
-import type { ChatContext, ChatMessage } from './chatgpt'
+import type { RequestProps } from './types'
+import type { ChatMessage } from './chatgpt'
 import { chatConfig, chatReplyProcess, currentModel } from './chatgpt'
 import { auth } from './middleware/auth'
 import { limiter } from './middleware/limiter'
@@ -22,12 +23,17 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
  res.setHeader('Content-type', 'application/octet-stream')
 
  try {
- const { prompt, options = {},systemMessage } = req.body as { prompt: string; options?: ChatContext; systemMessage: string }
+ const { prompt, options = {}, systemMessage } = req.body as RequestProps
  let firstChunk = true
- await chatReplyProcess(prompt, options, (chat: ChatMessage) => {
- res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`)
- firstChunk = false
- }, systemMessage)
+ await chatReplyProcess({
+ message: prompt,
+ lastContext: options,
+ process: (chat: ChatMessage) => {
+ res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`)
+ firstChunk = false
+ },
+ systemMessage,
+ })
  }
  catch (error) {
  res.write(JSON.stringify(error))

service/src/types.ts

@@ -1,5 +1,11 @@
 import type { FetchFn } from 'chatgpt'
 
+export interface RequestProps {
+ prompt: string
+ options?: ChatContext
+ systemMessage: string
+}
+
 export interface ChatContext {
  conversationId?: string
  parentMessageId?: string