From 33f6e5f00d08da02970c3b1ca41778cefb32ec18 Mon Sep 17 00:00:00 2001 From: zhaoyingbo Date: Thu, 19 Dec 2024 07:08:18 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=81=E7=A7=BB=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E5=8A=A9=E6=89=8B=E5=88=B0Matrix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 3 +- .env.example | 2 - bun.lockb | Bin 166328 -> 163107 bytes constant/config.ts | 22 +-- constant/message.ts | 11 +- controller/groupAgent/agent.ts | 8 +- controller/groupAgent/chatHistory.ts | 21 ++- controller/groupAgent/report.ts | 269 ++++++++++++++++----------- controller/sheet/createKVTemp.ts | 4 +- controller/sheet/insert.ts | 4 +- db/apiKey/index.ts | 6 +- db/grpSumLog/index.ts | 28 +++ db/grpSumSub/index.ts | 59 ++++++ db/index.ts | 6 + db/log/index.ts | 16 +- db/pbClient.ts | 4 +- db/receiveGroup/index.ts | 8 +- db/user/index.ts | 81 ++++++++ docker/deploy/Dockerfile | 2 - index.ts | 7 - package.json | 2 - prisma/index.ts | 5 - prisma/schema.prisma | 31 --- routes/bot/actionMsg.ts | 10 +- routes/bot/eventMsg.ts | 132 ++++++------- routes/bot/index.ts | 11 +- routes/message/index.ts | 94 ++++------ routes/microApp/index.ts | 14 +- routes/sheet/index.ts | 12 +- test/archive/llm.ts | 12 +- types/context.ts | 34 ++-- types/index.ts | 8 + utils/genContext.ts | 4 +- utils/genLarkService.ts | 4 +- 34 files changed, 555 insertions(+), 379 deletions(-) create mode 100644 db/grpSumLog/index.ts create mode 100644 db/grpSumSub/index.ts create mode 100644 db/user/index.ts delete mode 100644 prisma/index.ts delete mode 100644 prisma/schema.prisma diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 30c2168..3fea719 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -30,8 +30,7 @@ "humao.rest-client", "GitHub.copilot", "GitHub.copilot-chat", - "oven.bun-vscode", - "Prisma.prisma" + "oven.bun-vscode" ] } }, diff --git a/.env.example b/.env.example index a3b324d..7eea887 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,6 @@ # Node Environment: dev, production NODE_ENV=dev -DATABASE_URL= - # PocketBase Auth PB_USER= PB_PASS= diff --git a/bun.lockb b/bun.lockb index 33acc9c150fcb7ce93b1d9e4557fbd6ff339303c..6ab4a8e599e985504b65b5c60b053382de4815cc 100755 GIT binary patch delta 28611 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 d9=^*RUr84Pxl66sU&H--;)-V delta 30913 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 diff --git a/constant/config.ts b/constant/config.ts index 1e8e393..a7bc496 100644 --- a/constant/config.ts +++ b/constant/config.ts @@ -3,41 +3,37 @@ import { RecordModel } from "pocketbase" import pbClient from "../db/pbClient" -interface Config extends RecordModel { +interface ConfigModel extends RecordModel { key: string value: string desc: string } -export interface AppInfo extends RecordModel { +export interface AppInfoModel extends RecordModel { name: string - app_id: string - app_secret: string - app_name: string + appId: string + appSecret: string + appName: string } export const APP_CONFIG: Record = {} -export const APP_MAP: Record> = {} +export const APP_MAP: Record = {} /** * 初始化应用配置 */ const initAppConfig = async () => { // 获取所有环境变量 - const envList = await pbClient.collection("env").getFullList() + const envList = await pbClient.collection("env").getFullList() for (const env of envList) { APP_CONFIG[env.key] = env.value } logger.info(`Get env list: ${JSON.stringify(APP_CONFIG)}`) // 获取所有应用信息 - const appList = await pbClient.collection("app").getFullList() + const appList = await pbClient.collection("app").getFullList() for (const app of appList) { - APP_MAP[app.name] = { - app_id: app.app_id, - app_secret: app.app_secret, - app_name: app.app_name, - } + APP_MAP[app.name] = app } logger.info(`Get app list: ${JSON.stringify(APP_MAP)}`) } diff --git a/constant/message.ts b/constant/message.ts index 39d3ec6..5c0ee27 100644 --- a/constant/message.ts +++ b/constant/message.ts @@ -1,5 +1,10 @@ export enum RespMessage { - hasRegistered = "本群已订阅日报，周报", - registerSuccess = "周报、日报订阅成功", - cancelSuccess = "周报、日报订阅取消成功", + hasRegisteredDaily = "本群已订阅日报", + hasRegisteredWeekly = "本群已订阅周报", + registerDailySuccess = "日报订阅成功", + registerWeeklySuccess = "周报订阅成功", + cancelDailySuccess = "日报订阅取消成功", + cancelWeeklySuccess = "周报订阅取消成功", + registerFailed = "订阅失败", + cancelFailed = "取消订阅失败", } diff --git a/controller/groupAgent/agent.ts b/controller/groupAgent/agent.ts index addba25..17883da 100644 --- a/controller/groupAgent/agent.ts +++ b/controller/groupAgent/agent.ts @@ -2,7 +2,7 @@ import { Context } from "../../types" import llm from "../../utils/llm" import getChatHistory from "./chatHistory" -const agent = async (ctx: Context.Data) => { +const agent = async (ctx: Context) => { const { logger, requestId, @@ -26,7 +26,7 @@ const agent = async (ctx: Context.Data) => { const { startTime, endTime } = await llm.timeParser(msgText, requestId) logger.info(`Parsed time: startTime: ${startTime}, endTime: ${endTime}`) // 更新卡片 - updateCard(cardGender.genPendingCard("正在爬楼中，请稍等...")) + await updateCard(cardGender.genPendingCard("正在爬楼中，请稍等...")) // 获取聊天记录 const { messages: chatHistory, mentions: historyMentions } = await getChatHistory(ctx, { @@ -36,7 +36,7 @@ const agent = async (ctx: Context.Data) => { mentions, senderOpenId: openId, excludedMessageIds: [message_id, messageId], - excludeMentions: [appInfo.app_name], + excludeMentions: [appInfo.appName], }) // 如果没有聊天记录，返回错误信息 if (chatHistory.length === 0) { @@ -48,7 +48,7 @@ const agent = async (ctx: Context.Data) => { // 根据Mention，拼装原始消息 let userInput = rawMsgText.trim() for (const mention of mentions ?? []) { - if (mention.name !== appInfo.app_name) { + if (mention.name !== appInfo.appName) { userInput = userInput.replace(mention.key, `@${mention.name}`) } else { userInput = userInput.replace(mention.key, "") diff --git a/controller/groupAgent/chatHistory.ts b/controller/groupAgent/chatHistory.ts index 036c8c9..a1c3e9b 100644 --- a/controller/groupAgent/chatHistory.ts +++ b/controller/groupAgent/chatHistory.ts @@ -43,7 +43,7 @@ const extractTextFromJson = (data: any): string => { * @returns 聊天消息数组 */ const getChatHistory = async ( - { larkService, logger }: Context.Data, + { larkService, logger }: Context, { chatId, startTime, @@ -86,7 +86,7 @@ const getChatHistory = async ( String(endTimeTimestamp) ) - if (chatHistory.length === 0) + if (!chatHistory?.length) return { messages: [], mentions: new Map(), @@ -169,12 +169,17 @@ const getChatHistory = async ( // 从接口获取用户名 if (noMentionSenders.size !== 0) { - const { - data: { items }, - } = await larkService.user.batchGet([...noMentionSenders]) - logger.debug(`Get user info: ${JSON.stringify(items)}`) - for (const item of items) { - mentions.set(item.open_id, item.name) + try { + const { + data: { items }, + } = await larkService.user.batchGet([...noMentionSenders]) + logger.debug(`Get user info: ${JSON.stringify(items)}`) + for (const item of items) { + mentions.set(item.open_id, item.name) + } + } catch (error) { + // 报错了可以不处理，只是没有名字而已 + logger.error(`Failed to get user info: ${error}`) } } diff --git a/controller/groupAgent/report.ts b/controller/groupAgent/report.ts index 6ba644d..37a7ff9 100644 --- a/controller/groupAgent/report.ts +++ b/controller/groupAgent/report.ts @@ -2,7 +2,8 @@ import { LarkService } from "@egg/net-tool" import { APP_MAP } from "../../constant/config" import { RespMessage } from "../../constant/message" -import prisma from "../../prisma" +import db from "../../db" +import { GrpSumSubWithApp } from "../../db/grpSumSub" import { Context } from "../../types" import genContext from "../../utils/genContext" import llm from "../../utils/llm" @@ -11,35 +12,29 @@ import getChatHistory from "./chatHistory" /** * 总结指定聊天记录 - * @param {Context.Data} ctx - 请求上下文 + * @param {Context} ctx - 请求上下文 * @param {string} timeScope - 时间范围 * @param {any} subscription - 订阅信息 * @returns {Promise} */ const genReport = async ( - ctx: Context.Data, + ctx: Context, timeScope: "daily" | "weekly", - subscription: { - id: bigint - chat_id: string - robot_id: string - initiator: string - } + subscription: GrpSumSubWithApp ) => { const { logger, requestId, larkCard } = ctx const cardGender = larkCard.child("groupAgent") try { - const { chat_id: chatId, robot_id: robotId } = subscription - // 获取接口信息 - const appInfo = APP_MAP[robotId] - if (!appInfo) { - logger.error(`Failed to get app info for ${robotId}`) - return - } + const { + chatId, + expand: { + app: { appId, appSecret, appName }, + }, + } = subscription // 组织接口 const larkService = new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, + appId, + appSecret, requestId, }) // 获取时间范围 @@ -50,12 +45,12 @@ const genReport = async ( // 获取聊天记录 const { messages: chatHistory } = await getChatHistory( - { larkService, logger } as Context.Data, + { larkService, logger } as Context, { chatId, startTime, endTime, - excludeMentions: [appInfo.app_name], + excludeMentions: [appName], } ) if (chatHistory.length === 0) { @@ -80,21 +75,18 @@ const genReport = async ( logger.info( `LLM takes time: ${processingTime}s, see detail: http://langfuse.ai.srv/project/cm1j2tkj9001gukrgdvc1swuw/sessions/${requestId}` ) + // 生成卡片内容 + const cardContent = cardGender.genCard("autoReport", { + llmRes, + timeScope: timeScope === "daily" ? "今日日报" : "本周周报", + }) // 发送卡片消息 - await larkService.message.sendCard2Chat( - chatId, - cardGender.genCard("autoReport", { - llmRes, - timeScope: timeScope === "daily" ? "今日日报" : "本周周报", - }) - ) - // 记录发送的卡片 - await prisma.chat_agent_message_log.create({ - data: { - subscription_id: subscription.id, - initiator: subscription.initiator, - langfuse_link: `http://langfuse.ai.srv/project/cm1j2tkj9001gukrgdvc1swuw/sessions/${requestId}`, - }, + await larkService.message.sendCard2Chat(chatId, cardContent) + // 记录总结日志 + await db.grpSumLog.create({ + subscription: subscription.id, + content: JSON.stringify(cardContent), + langfuseLink: `http://langfuse.ai.srv/project/cm1j2tkj9001gukrgdvc1swuw/sessions/${requestId}`, }) } catch (error: any) { logger.error( @@ -113,21 +105,34 @@ const genAllReport = async (timeScope: "daily" | "weekly" = "daily") => { try { // 获取全部需要自动总结的群组 - const subscriptionList = - await prisma.chat_agent_summary_subscription.findMany({ - where: { - terminator: "", - }, - }) + let subList = await db.grpSumSub.getAll( + `terminator = ""${timeScope === "daily" ? ' && timeScope = "daily"' : ""}` + ) - if (subscriptionList.length === 0) { + // 没有需要总结的群组 + if (!subList || subList.length === 0) { logger.info("No group needs to be summarized") return } + // 如果是周五，获取了需要日报和周报的订阅，根据chatId，过滤掉需要周报的日报订阅 + if (timeScope === "weekly") { + const dailySubList = subList.filter((sub) => sub.timeScope === "daily") + const weeklySubList = subList.filter((sub) => sub.timeScope === "weekly") + // 过滤掉需要周报的日报订阅 + subList = dailySubList + .filter( + (dailySub) => + !weeklySubList.find( + (weeklySub) => weeklySub.chatId === dailySub.chatId + ) + ) + .concat(weeklySubList) + } + // 一个一个群组的总结，避免触发频率限制 - for (const subscription of subscriptionList) { - await genReport(ctx, timeScope, subscription) + for (const sub of subList) { + await genReport(ctx, sub.timeScope, sub) } } catch (e: any) { logger.error(`Auto summary error: ${e.message}`) @@ -136,10 +141,10 @@ const genAllReport = async (timeScope: "daily" | "weekly" = "daily") => { /** * 立即生成日报或周报（测试用） - * @param {Context.Data} ctx - 请求上下文 + * @param {Context} ctx - 请求上下文 * @returns {Promise} */ -const gen4Test = async (ctx: Context.Data, timeScope: "daily" | "weekly") => { +const gen4Test = async (ctx: Context, timeScope: "daily" | "weekly") => { const { logger, larkCard, @@ -153,26 +158,24 @@ const gen4Test = async (ctx: Context.Data, timeScope: "daily" | "weekly") => { logger.error("Invalid request body") return } + // 获取订阅信息 - const subscription = await prisma.chat_agent_summary_subscription.findFirst( - { - where: { - chat_id: chatId, - terminator: "", - }, - } + const sub = await db.grpSumSub.getByFilter( + `terminator = "" && chatId = "${chatId}" && timeScope = "${timeScope}"` ) // 没有订阅信息 - if (!subscription) { + if (!sub) { logger.error(`No subscription found for chat ${chatId}`) await larkService.message.sendCard2Chat( chatId, - larkCard.genErrorCard("本群未订阅日报、周报") + larkCard.genErrorCard( + `本群未订阅${timeScope === "daily" ? "日报" : "周报"}` + ) ) return } // 总结 - await genReport(ctx, timeScope, subscription) + await genReport(ctx, timeScope, sub) } catch (error: any) { logger.error(`Failed to summarize chat ${chatId}: ${error.message}`) } @@ -182,54 +185,77 @@ const gen4Test = async (ctx: Context.Data, timeScope: "daily" | "weekly") => { * 注册消息总结的订阅 * @returns */ -const subscribe = async ({ - app, - larkService, - logger, - larkBody, - larkCard, -}: Context.Data) => { +const subscribe = async ( + { app, larkService, logger, larkBody, larkCard }: Context, + timeScope: "daily" | "weekly" +) => { + const cardGender = larkCard.child("groupAgent") + const sendErrorMsg = () => + larkService.message.sendCard2Chat( + larkBody.chatId, + cardGender.genErrorCard(RespMessage.registerFailed) + ) try { - const cardGender = larkCard.child("groupAgent") // 判断是否有 chatId 和 userId if (!larkBody.chatId || !larkBody.userId) { logger.error(`chatId or userId is empty`) return } + + // 获取用户信息 + const user = await db.user.getByCtx({ larkBody, larkService } as Context) + if (!user) { + logger.error(`Failed to get user info`) + await sendErrorMsg() + return + } // 先查询是否已经存在订阅 - const subscription = await prisma.chat_agent_summary_subscription.findFirst( - { - where: { - chat_id: larkBody.chatId, - terminator: "", - }, - } + const sub = await db.grpSumSub.getByFilter( + `terminator = "" && chatId = "${larkBody.chatId} && timeScope = "${timeScope}"` ) - // 如果已经存在订阅，则返回已经注册过了 - if (subscription) { - logger.info(`chatId: ${larkBody.chatId} has been registered`) - // 发送已经注册过的消息 + if (sub) { + logger.info( + `chatId: ${larkBody.chatId} has been registered, timeScope: ${timeScope}` + ) + // 发送已经注册过了的消息 await larkService.message.sendCard2Chat( larkBody.chatId, - cardGender.genSuccessCard(RespMessage.hasRegistered) + cardGender.genSuccessCard( + timeScope === "daily" + ? RespMessage.hasRegisteredDaily + : RespMessage.hasRegisteredWeekly + ) ) return } // 注册订阅 - await prisma.chat_agent_summary_subscription.create({ - data: { - chat_id: larkBody.chatId, - robot_id: app, - initiator: larkBody.userId, - }, + const createRes = await db.grpSumSub.create({ + app: APP_MAP[app].id, + initiator: user.id, + terminator: "", + chatId: larkBody.chatId, + timeScope, }) + + if (!createRes) { + logger.error( + `Failed to register chatId: ${larkBody.chatId}, timeScope: ${timeScope}` + ) + await sendErrorMsg() + return + } // 发送成功消息 await larkService.message.sendCard2Chat( larkBody.chatId, - cardGender.genSuccessCard(RespMessage.registerSuccess) + cardGender.genSuccessCard( + timeScope === "daily" + ? RespMessage.registerDailySuccess + : RespMessage.registerWeeklySuccess + ) ) } catch (e: any) { logger.error(`Subscribe error: ${e.message}`) + await sendErrorMsg() } } @@ -237,54 +263,75 @@ const subscribe = async ({ * 取消消息总结的订阅 * @returns */ -const unsubscribe = async ({ - logger, - larkBody, - larkService, - larkCard, -}: Context.Data) => { +const unsubscribe = async ( + { logger, larkBody, larkService, larkCard }: Context, + timeScope: "daily" | "weekly" +) => { + const cardGender = larkCard.child("groupAgent") + const sendErrorMsg = () => + larkService.message.sendCard2Chat( + larkBody.chatId, + cardGender.genErrorCard(RespMessage.cancelFailed) + ) try { - const cardGender = larkCard.child("groupAgent") // 判断是否有 chatId 和 userId if (!larkBody.chatId || !larkBody.userId) { logger.error(`chatId or userId is empty`) return } - // 查找现有的订阅 - const subscription = await prisma.chat_agent_summary_subscription.findFirst( - { - where: { - chat_id: larkBody.chatId, - terminator: "", - }, - } + + // 获取用户信息 + const user = await db.user.getByCtx({ larkBody, larkService } as Context) + if (!user) { + logger.error(`Failed to get user info`) + await sendErrorMsg() + return + } + // 先查询是否已经存在订阅 + const sub = await db.grpSumSub.getByFilter( + `terminator = "" && chatId = "${larkBody.chatId} && timeScope = "${timeScope}"` ) - // 如果没有找到订阅，则返回错误 - if (!subscription) { - logger.info(`chatId: ${larkBody.chatId} has not been registered`) - // 发送已经取消订阅的消息 + + if (!sub) { + logger.info( + `chatId: ${larkBody.chatId} has not been registered, timeScope: ${timeScope}` + ) + // 发送未注册的消息 await larkService.message.sendCard2Chat( larkBody.chatId, - cardGender.genSuccessCard(RespMessage.cancelSuccess) + cardGender.genSuccessCard( + timeScope === "daily" + ? RespMessage.cancelDailySuccess + : RespMessage.cancelWeeklySuccess + ) ) return } - // 更新订阅，设置终止者和终止时间 - await prisma.chat_agent_summary_subscription.update({ - where: { - id: subscription.id, - }, - data: { - terminator: larkBody.userId, - }, + // 更新订阅 + const updateRes = await db.grpSumSub.update(sub.id, { + terminator: user.id, }) + + if (!updateRes) { + logger.error( + `Failed to cancel chatId: ${larkBody.chatId}, timeScope: ${timeScope}` + ) + await sendErrorMsg() + return + } + // 发送成功消息 await larkService.message.sendCard2Chat( larkBody.chatId, - cardGender.genSuccessCard(RespMessage.cancelSuccess) + cardGender.genSuccessCard( + timeScope === "daily" + ? RespMessage.cancelDailySuccess + : RespMessage.cancelWeeklySuccess + ) ) } catch (e: any) { logger.error(`Unsubscribe error: ${e.message}`) + await sendErrorMsg() } } diff --git a/controller/sheet/createKVTemp.ts b/controller/sheet/createKVTemp.ts index c879acf..614b791 100644 --- a/controller/sheet/createKVTemp.ts +++ b/controller/sheet/createKVTemp.ts @@ -8,7 +8,7 @@ import { Context, LarkServer } from "../../types" const create = async ({ larkService, logger, -}: Context.Data): Promise => { +}: Context): Promise => { const copyRes = await larkService.drive.copyFile( "D6ETfzaU9lN08adVDz3kjLey4Bx", "bask4drDOy7zc3nDVyZb5RYDzOe", @@ -51,7 +51,7 @@ const create = async ({ * 从事件创建键值多维表格 * @param ctx - Context */ -const createFromEvent = async (ctx: Context.Data) => { +const createFromEvent = async (ctx: Context) => { const { larkBody: { chatId, chatType, userId }, larkService, diff --git a/controller/sheet/insert.ts b/controller/sheet/insert.ts index 426876a..ed56a7c 100644 --- a/controller/sheet/insert.ts +++ b/controller/sheet/insert.ts @@ -3,11 +3,11 @@ import { SheetProxy } from "../../types/sheetProxy" /** * 插入表格数据 - * @param {Context.Data} ctx - 上下文数据，包含请求体和响应生成器 + * @param {Context} ctx - 上下文数据，包含请求体和响应生成器 * @param {string} appName - 应用名称 * @returns {Promise} 返回响应对象 */ -const insertSheet = async (ctx: Context.Data) => { +const insertSheet = async (ctx: Context) => { const { genResp, larkService } = ctx const body = ctx.body as SheetProxy.InsertData diff --git a/db/apiKey/index.ts b/db/apiKey/index.ts index c75aec4..ff18155 100644 --- a/db/apiKey/index.ts +++ b/db/apiKey/index.ts @@ -1,10 +1,10 @@ import { RecordModel } from "pocketbase" -import { AppInfo } from "../../constant/config" +import { AppInfoModel } from "../../constant/config" import { managePbError } from "../../utils/pbTools" import pbClient from "../pbClient" -const DB_NAME = "api_key" +const DB_NAME = "apiKey" export interface ApiKey { name: string @@ -16,7 +16,7 @@ export type ApiKeyModel = ApiKey & RecordModel export interface ApiKeyModelWithApp extends ApiKeyModel { expand: { - app: AppInfo + app: AppInfoModel } } diff --git a/db/grpSumLog/index.ts b/db/grpSumLog/index.ts new file mode 100644 index 0000000..e2adf50 --- /dev/null +++ b/db/grpSumLog/index.ts @@ -0,0 +1,28 @@ +import { RecordModel } from "pocketbase" + +import { managePbError } from "../../utils/pbTools" +import pbClient from "../pbClient" + +export interface GroupSummaryLog { + subscription: string + content: string + langfuseLink: string +} + +export type GroupSummaryLogModel = GroupSummaryLog & RecordModel + +/** + * 创建群总结日志 + * @param log + * @returns + */ +const create = async (log: GroupSummaryLog) => + managePbError(() => + pbClient.collection("groupSummaryLog").create(log) + ) + +const grpSumLog = { + create, +} + +export default grpSumLog diff --git a/db/grpSumSub/index.ts b/db/grpSumSub/index.ts new file mode 100644 index 0000000..1845f0c --- /dev/null +++ b/db/grpSumSub/index.ts @@ -0,0 +1,59 @@ +import { RecordModel } from "pocketbase" + +import { AppInfoModel } from "../../constant/config" +import { managePbError } from "../../utils/pbTools" +import pbClient from "../pbClient" + +export interface GroupSummarySubscription { + app: string + initiator: string + terminator: string + chatId: string + timeScope: "daily" | "weekly" +} + +export type GroupSummarySubscriptionModel = GroupSummarySubscription & + RecordModel + +export interface GrpSumSubWithApp extends GroupSummarySubscriptionModel { + expand: { + app: AppInfoModel + } +} + +const create = async (subscription: GroupSummarySubscription) => + managePbError(() => + pbClient.collection("groupSummarySubscription").create(subscription) + ) + +const update = async ( + id: string, + subscription: Partial +) => + managePbError(() => + pbClient.collection("groupSummarySubscription").update(id, subscription) + ) + +const getAll = async (filter: string = "") => + managePbError(() => + pbClient.collection("groupSummarySubscription").getFullList({ + filter, + expand: "app", + }) + ) + +const getByFilter = async (filter: string) => + managePbError(() => + pbClient + .collection("groupSummarySubscription") + .getFirstListItem(filter, { expand: "app" }) + ) + +const grpSumSub = { + create, + update, + getAll, + getByFilter, +} + +export default grpSumSub diff --git a/db/index.ts b/db/index.ts index 6755ace..d0fd63f 100644 --- a/db/index.ts +++ b/db/index.ts @@ -1,11 +1,17 @@ import apiKey from "./apiKey" +import grpSumLog from "./grpSumLog" +import grpSumSub from "./grpSumSub" import log from "./log" import receiveGroup from "./receiveGroup" +import user from "./user" const db = { apiKey, receiveGroup, log, + user, + grpSumLog, + grpSumSub, } export default db diff --git a/db/log/index.ts b/db/log/index.ts index 9d3c0e5..20e611e 100644 --- a/db/log/index.ts +++ b/db/log/index.ts @@ -3,17 +3,17 @@ import { RecordModel } from "pocketbase" import { managePbError } from "../../utils/pbTools" import pbClient from "../pbClient" -const DB_NAME = "message_log" +const DB_NAME = "messageLog" export interface Log { - api_key: string - group_id?: string - receive_id?: string - receive_id_type?: string - msg_type: string + apiKey: string + groupId?: string + receiveId?: string + receiveIdType?: string + msgType: string content: string - final_content?: string - send_result?: any + finalContent?: string + sendResult?: any error?: string } diff --git a/db/pbClient.ts b/db/pbClient.ts index dfb520f..f6a2c9a 100644 --- a/db/pbClient.ts +++ b/db/pbClient.ts @@ -1,11 +1,11 @@ import PocketBase from "pocketbase" -const pbClient = new PocketBase("https://lark-egg-preview.ai.xiaomi.com") +const pbClient = new PocketBase(Bun.env.PB_URL) pbClient.autoCancellation(false) await pbClient .collection("_superusers") - .authWithPassword(Bun.env.PB_USER!, Bun.env.PB_PASS!) + .authWithPassword(Bun.env.PB_USER, Bun.env.PB_PASS) export default pbClient diff --git a/db/receiveGroup/index.ts b/db/receiveGroup/index.ts index 1983442..7b0e638 100644 --- a/db/receiveGroup/index.ts +++ b/db/receiveGroup/index.ts @@ -8,10 +8,10 @@ const DB_NAME = "message_group" export interface ReceiveGroup { name: string email?: string[] - chat_id?: string[] - open_id?: string[] - union_id?: string[] - user_id?: string[] + chatId?: string[] + openId?: string[] + unionId?: string[] + userId?: string[] } export type ReceiveGroupModel = ReceiveGroup & RecordModel diff --git a/db/user/index.ts b/db/user/index.ts new file mode 100644 index 0000000..48106ca --- /dev/null +++ b/db/user/index.ts @@ -0,0 +1,81 @@ +import { RecordModel } from "pocketbase" + +import { Context } from "../../types" +import { managePbError } from "../../utils/pbTools" +import pbClient from "../pbClient" + +// 用户接口定义 +interface User { + email: string + name: string + openId: string + userId: string + avatar: string + password: string + emailVisibility: boolean + verified: boolean +} + +// 用户模型类型 +export type UserModel = User & RecordModel + +/** + * 创建用户 + * @param {User} user - 用户信息 + * @returns {Promise} - 创建的用户模型 + */ +const create = async (user: User) => + managePbError(() => pbClient.collection("user").create(user)) + +/** + * 通过用户ID获取用户 + * @param {string} userId - 用户ID + * @returns {Promise} - 用户模型或null + */ +const getByUserId = async (userId: string) => + managePbError(() => + pbClient.collection("user").getFirstListItem(`user_id = "${userId}"`) + ) + +/** + * 通过上下文获取用户 + * @param {Context} context - 上下文对象 + * @returns {Promise} - 用户模型或null + */ +const getByCtx = async ({ larkBody, larkService }: Context) => { + if (!larkBody.userId) return null + // 先从数据库获取用户信息 + const user = await getByUserId(larkBody.userId) + if (user) return user + // 如果数据库中没有用户信息，从larkService获取用户信息 + const userInfo = await larkService.user.getOne(larkBody.userId, "user_id") + if (userInfo.code !== 0) return null + // 解构用户信息 + const { + user_id, + open_id, + avatar: { avatar_origin }, + email, + name, + } = userInfo.data.user + const newUser = { + userId: user_id, + openId: open_id, + avatar: avatar_origin, + email, + name, + emailVisibility: false, + verified: false, + password: email, + } + // 创建新用户 + const finalUser = await create(newUser) + return finalUser +} + +// 用户对象 +const user = { + getByCtx, +} + +export default user diff --git a/docker/deploy/Dockerfile b/docker/deploy/Dockerfile index 5520a04..74c03e2 100644 --- a/docker/deploy/Dockerfile +++ b/docker/deploy/Dockerfile @@ -12,8 +12,6 @@ RUN bun install COPY . . -RUN bunx prisma generate - EXPOSE 3000 CMD ["bun", "start"] \ No newline at end of file diff --git a/index.ts b/index.ts index 5d1c119..7192885 100644 --- a/index.ts +++ b/index.ts @@ -1,7 +1,6 @@ import logger from "@egg/logger" import initAppConfig from "./constant/config" -import prisma from "./prisma" import { manageBotReq } from "./routes/bot" import { manageMessageReq } from "./routes/message" import { manageMicroAppReq } from "./routes/microApp" @@ -56,9 +55,3 @@ const server = Bun.serve({ }) logger.info(`Listening on ${server.hostname}:${server.port}`) - -// 关闭数据库连接 -process.on("SIGINT", async () => { - await prisma.$disconnect() - process.exit(0) -}) diff --git a/package.json b/package.json index 57766af..4c91a60 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "lint-staged": "^15.2.11", "oxlint": "^0.13.2", "prettier": "^3.4.2", - "prisma": "5.22.0", "typescript-eslint": "^8.18.1" }, "peerDependencies": { @@ -44,7 +43,6 @@ "@egg/path-tool": "^1.4.1", "@langchain/core": "^0.3.24", "@langchain/openai": "^0.3.14", - "@prisma/client": "5.22.0", "joi": "^17.13.3", "langfuse-langchain": "^3.32.0", "node-schedule": "^2.1.1", diff --git a/prisma/index.ts b/prisma/index.ts deleted file mode 100644 index fdc7831..0000000 --- a/prisma/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { PrismaClient } from "@prisma/client" - -const prisma = new PrismaClient() - -export default prisma diff --git a/prisma/schema.prisma b/prisma/schema.prisma deleted file mode 100644 index aea0978..0000000 --- a/prisma/schema.prisma +++ /dev/null @@ -1,31 +0,0 @@ -// This is your Prisma schema file, -// learn more about it in the docs: https://pris.ly/d/prisma-schema - -// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions? -// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init - -generator client { - provider = "prisma-client-js" -} - -datasource db { - provider = "mysql" - url = env("DATABASE_URL") -} - -model chat_agent_summary_subscription { - id BigInt @id @default(autoincrement()) // 摘要订阅 ID - chat_id String @default("") // 关联的聊天 ID - robot_id String @default("") // 机器人 ID - initiator String @default("") // 发起者 ID - terminator String @default("") // 终止者 ID - created_at DateTime @default(now()) // 创建时间 - updated_at DateTime @updatedAt // 更新时间 -} - -model chat_agent_message_log { - id BigInt @id @default(autoincrement()) // 消息日志 ID - subscription_id BigInt @default(0) // 关联的摘要订阅 ID - initiator String @default("") // 发起者 ID - langfuse_link String @default("") // Langfuse 日志 -} diff --git a/routes/bot/actionMsg.ts b/routes/bot/actionMsg.ts index 497648a..ff5e91c 100644 --- a/routes/bot/actionMsg.ts +++ b/routes/bot/actionMsg.ts @@ -4,9 +4,9 @@ const GROUP_MAP = {} /** * 处理点击事件 - * @param {Context.Data} ctx - 上下文数据，包含body, larkService和logger + * @param {Context} ctx - 上下文数据，包含body, larkService和logger */ -const manageAction = async (ctx: Context.Data) => { +const manageAction = async (ctx: Context) => { const { larkBody: { actionValue }, logger, @@ -16,16 +16,16 @@ const manageAction = async (ctx: Context.Data) => { } logger.info(`Got lark action cardGroup: ${cardGroup}`) if (!cardGroup) return - const func = GROUP_MAP[cardGroup] as (ctx: Context.Data) => Promise + const func = GROUP_MAP[cardGroup] as (ctx: Context) => Promise if (!func) return return func(ctx) } /** * 处理Action消息 - * @param {Context.Data} ctx - 上下文数据 + * @param {Context} ctx - 上下文数据 */ -export const manageActionMsg = async (ctx: Context.Data) => { +export const manageActionMsg = async (ctx: Context) => { const { larkBody: { actionType }, } = ctx diff --git a/routes/bot/eventMsg.ts b/routes/bot/eventMsg.ts index 1f4494c..67607f5 100644 --- a/routes/bot/eventMsg.ts +++ b/routes/bot/eventMsg.ts @@ -5,7 +5,7 @@ import { Context } from "../../types" /** * 过滤出非法消息，如果发表情包就直接发回去 - * @param {Context.Data} ctx - 上下文数据，包含body, logger和larkService + * @param {Context} ctx - 上下文数据，包含body, logger和larkService * @returns {boolean} 是否为非法消息 */ const filterIllegalMsg = async ({ @@ -14,14 +14,14 @@ const filterIllegalMsg = async ({ larkService, larkBody, appInfo, -}: Context.Data): Promise => { +}: Context): Promise => { const { chatId, msgType, msgText } = larkBody // 没有chatId的消息不处理 logger.info(`bot req chatId: ${chatId}`) if (!chatId) return true // 非私聊和群聊中艾特机器人的消息不处理 - if (!larkBody.isP2P && !larkBody.isAtBot(appInfo.app_name)) { + if (!larkBody.isP2P && !larkBody.isAtBot(appInfo.appName)) { return true } @@ -59,40 +59,37 @@ const filterIllegalMsg = async ({ /** * 发送ID消息 - * @param {Context.Data} ctx - 上下文数据 + * @param {Context} ctx - 上下文数据 */ const manageIdMsg = ({ larkBody: { chatId }, larkCard, larkService, -}: Context.Data): void => { +}: Context) => larkService.message.sendCard2Chat( chatId, larkCard.genTempCard("chatId", { chat_id: chatId }) ) -} /** * 回复引导消息 - * @param {Context.Data} ctx - 上下文数据 + * @param {Context} ctx - 上下文数据 */ const manageHelpMsg = ( - { larkBody: { chatId }, larkCard, larkService }: Context.Data, + { larkBody: { chatId }, larkCard, larkService }: Context, tempKey: keyof typeof tempMap -): void => { +) => larkService.message.sendCard2Chat( chatId, larkCard.genTempCard(tempKey, { chat_id: chatId }) as string ) -} /** * 处理命令消息 - * @param {Context.Data} ctx - 上下文数据 + * @param {Context} ctx - 上下文数据 */ -const manageCMDMsg = (ctx: Context.Data) => { +const manageCMDMsg = async (ctx: Context) => { const { - app, body, logger, larkService, @@ -104,66 +101,75 @@ const manageCMDMsg = (ctx: Context.Data) => { // 处理命令消息 if (msgText === "/id") { logger.info(`bot command is /id, chatId: ${chatId}`) - manageIdMsg(ctx) + await manageIdMsg(ctx) return } - // 小煎蛋专属功能 - if (app === "egg") { - // CI监控 - if (msgText === "/ci") { - logger.info(`bot command is /ci, chatId: ${chatId}`) - attachService.ciMonitor(chatId) - return - } - // 简报 - if (msgText.includes("share") && msgText.includes("简报")) { - logger.info(`bot command is share report, chatId: ${chatId}`) - // 这个用时比较久，先发一条提醒用户收到了请求 - // TODO: 迁移到简报服务中 - larkService.message.send( - "chat_id", - chatId, - "text", - "正在为您收集简报，请稍等片刻~" - ) - attachService.reportCollector(body) - return - } - // 创建Sheet DB - if (msgText === "/gen db") { - logger.info(`bot command is /gen db, chatId: ${chatId}`) - createKVTemp.createFromEvent(ctx) - return - } - - // 私聊场景下或者/help命令 - if (msgText === "/help" || isP2P) { - logger.info(`bot command is /help, chatId: ${chatId}`) - manageHelpMsg(ctx, "eggGuide") - return - } + // CI监控 + if (msgText === "/ci") { + logger.info(`bot command is /ci, chatId: ${chatId}`) + await attachService.ciMonitor(chatId) + return + } + // 简报 + if (msgText.includes("share") && msgText.includes("简报")) { + logger.info(`bot command is share report, chatId: ${chatId}`) + // 这个用时比较久，先发一条提醒用户收到了请求 + // TODO: 迁移到简报服务中 + await larkService.message.sendText2Chat( + chatId, + "正在为您收集简报，请稍等片刻~" + ) + await attachService.reportCollector(body) + return + } + // 创建Sheet DB + if (msgText === "/gen db") { + logger.info(`bot command is /gen db, chatId: ${chatId}`) + await createKVTemp.createFromEvent(ctx) + return } - // michat私聊场景下，先回复提示消息 - if (isP2P && app === "michat") { + // 私聊场景下或者/help命令 + if (msgText === "/help" || isP2P) { logger.info(`bot command is /help, chatId: ${chatId}`) - manageHelpMsg(ctx, "miChatGuide") + await manageHelpMsg(ctx, "eggGuide") return } // 仅限群组功能 if (isInGroup) { - // 注册群组 - if (msgText === "开启日报、周报") { - logger.info(`bot command is register, chatId: ${chatId}`) - groupAgent.report.subscribe(ctx) + // 注册群组日报 + if (msgText === "开启日报") { + logger.info( + `bot command is register, chatId: ${chatId}, timeScope: daily` + ) + groupAgent.report.subscribe(ctx, "daily") return } - // 注销群组 - if (msgText === "关闭日报、周报") { - logger.info(`bot command is unregister, chatId: ${chatId}`) - groupAgent.report.unsubscribe(ctx) + // 注册群组周报 + if (msgText === "开启周报") { + logger.info( + `bot command is register, chatId: ${chatId}, timeScope: weekly` + ) + groupAgent.report.subscribe(ctx, "weekly") + return + } + + // 注销群组日报 + if (msgText === "关闭日报") { + logger.info( + `bot command is unregister, chatId: ${chatId}, timeScope: daily` + ) + groupAgent.report.unsubscribe(ctx, "daily") + return + } + // 注销群组周报 + if (msgText === "关闭周报") { + logger.info( + `bot command is unregister, chatId: ${chatId}, timeScope: weekly` + ) + groupAgent.report.unsubscribe(ctx, "weekly") return } // 立即发送日简报 @@ -187,11 +193,11 @@ const manageCMDMsg = (ctx: Context.Data) => { /** * 处理Event消息 - * @param {Context.Data} ctx - 上下文数据 + * @param {Context} ctx - 上下文数据 */ -export const manageEventMsg = async (ctx: Context.Data) => { +export const manageEventMsg = async (ctx: Context) => { // 过滤非法消息 if (await filterIllegalMsg(ctx)) return // 处理命令消息 - manageCMDMsg(ctx) + await manageCMDMsg(ctx) } diff --git a/routes/bot/index.ts b/routes/bot/index.ts index 7f97f48..c7bb959 100644 --- a/routes/bot/index.ts +++ b/routes/bot/index.ts @@ -4,11 +4,11 @@ import { manageEventMsg } from "./eventMsg" /** * 处理机器人请求 - * @param {Context.Data} ctx - 上下文数据，包含请求体、日志记录器和响应生成器 + * @param {Context} ctx - 上下文数据，包含请求体、日志记录器和响应生成器 * @returns {Promise} 返回响应对象 */ -export const manageBotReq = async (ctx: Context.Data): Promise => { - const { body, larkBody, app, attachService } = ctx +export const manageBotReq = async (ctx: Context): Promise => { + const { body, larkBody } = ctx // 检查请求体是否为空 if (!body) { @@ -21,11 +21,6 @@ export const manageBotReq = async (ctx: Context.Data): Promise => { return Response.json({ challenge: body.challenge }) } - // 如果是michat的Event转发给MiChatServer - if (app === "michat" && larkBody.isEvent && !larkBody.isMessageEvent) { - attachService.proxyMiChatEvent(body) - } - // 处理消息事件 if (larkBody.isMessageEvent) manageEventMsg(ctx) // 处理Action消息 diff --git a/routes/message/index.ts b/routes/message/index.ts index 008d671..7c94b50 100644 --- a/routes/message/index.ts +++ b/routes/message/index.ts @@ -1,20 +1,24 @@ import { stringifyJson } from "@egg/hooks" -import { LarkService } from "@egg/net-tool" -import { APP_MAP } from "../../constant/config" import db from "../../db" import { Log } from "../../db/log" import { Context, LarkServer, MsgProxy } from "../../types" +import genLarkService from "../../utils/genLarkService" + +const ID_TYPE_MAP = { + chat_id: "chatId", + open_id: "openId", + union_id: "unionId", + user_id: "userId", + email: "email", +} /** * 校验消息请求的参数 - * @param {Context.Data} ctx - 上下文数据，包含请求体和响应生成器 + * @param {Context} ctx - 上下文数据，包含请求体和响应生成器 * @returns {false | Response} 如果校验失败，返回响应对象；否则返回 false */ -const validateMessageReq = ({ - body, - genResp, -}: Context.Data): false | Response => { +const validateMessageReq = ({ body, genResp }: Context): false | Response => { if (!body.api_key) { return genResp.badRequest("api_key is required") } @@ -35,12 +39,10 @@ const validateMessageReq = ({ /** * 处理消息请求 - * @param {Context.Data} ctx - 上下文数据，包含请求体、日志记录器、响应生成器和 Lark 服务 + * @param {Context} ctx - 上下文数据，包含请求体、日志记录器、响应生成器和 Lark 服务 * @returns {Promise} 返回响应对象 */ -export const manageMessageReq = async ( - ctx: Context.Data -): Promise => { +export const manageMessageReq = async (ctx: Context): Promise => { const { body: rawBody, genResp, requestId } = ctx const body = rawBody as MsgProxy.Body @@ -55,12 +57,12 @@ export const manageMessageReq = async ( : body.content // 初始化发送结果对象 - const sendRes = { - chat_id: {} as Record, - open_id: {} as Record, - union_id: {} as Record, - user_id: {} as Record, - email: {} as Record, + const sendResult: Record> = { + chatId: {}, + openId: {}, + unionId: {}, + userId: {}, + email: {}, } // 发送消息列表 @@ -68,39 +70,25 @@ export const manageMessageReq = async ( // 构造消息记录 const baseLog: Log = { - ...body, - final_content: finalContent, + apiKey: body.api_key, + groupId: body.group_id, + receiveId: body.receive_id, + receiveIdType: body.receive_id_type, + msgType: body.msg_type, + content: body.content, + finalContent, } // 校验 api_key const apiKeyInfo = await db.apiKey.getOne(body.api_key) if (!apiKeyInfo) { const error = "api key not found" - db.log.create({ ...baseLog, error }) + await db.log.create({ ...baseLog, error }) return genResp.notFound(error) } - // 获取 app name - const appName = apiKeyInfo.expand?.app?.name - if (!appName) { - const error = "app name not found" - db.log.create({ ...baseLog, error }) - return genResp.notFound(error) - } - - // 获取 app info - const appInfo = APP_MAP[appName] - if (!appInfo) { - const error = "app not found" - db.log.create({ ...baseLog, error }) - return genResp.notFound(error) - } - - const larkService = new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, - requestId, - }) + // 生成 Lark 服务 + const larkService = genLarkService(apiKeyInfo.expand.app.name, requestId) // 如果有 group_id，则发送给所有 group_id 中的人 if (body.group_id) { @@ -108,11 +96,11 @@ export const manageMessageReq = async ( const group = await db.receiveGroup.getOne(body.group_id!) if (!group) { const error = "message group not found" - db.log.create({ ...baseLog, error }) + await db.log.create({ ...baseLog, error }) return genResp.notFound(error) } - const { chat_id, open_id, union_id, user_id, email } = group + const { chatId, openId, unionId, userId, email } = group // 构造发送消息函数 const makeSendFunc = (receive_id_type: LarkServer.ReceiveIDType) => { @@ -121,17 +109,17 @@ export const manageMessageReq = async ( larkService.message .send(receive_id_type, receive_id, body.msg_type, finalContent) .then((res) => { - sendRes[receive_id_type][receive_id] = res + sendResult[ID_TYPE_MAP[receive_id_type]][receive_id] = res }) ) } } // 创建消息列表 - if (chat_id) chat_id.map(makeSendFunc("chat_id")) - if (open_id) open_id.map(makeSendFunc("open_id")) - if (union_id) union_id.map(makeSendFunc("union_id")) - if (user_id) user_id.map(makeSendFunc("user_id")) + if (chatId) chatId.map(makeSendFunc("chat_id")) + if (openId) openId.map(makeSendFunc("open_id")) + if (unionId) unionId.map(makeSendFunc("union_id")) + if (userId) userId.map(makeSendFunc("user_id")) if (email) email.map(makeSendFunc("email")) } @@ -142,7 +130,7 @@ export const manageMessageReq = async ( larkService.message .send(body.receive_id_type, receive_id, body.msg_type, finalContent) .then((res) => { - sendRes[body.receive_id_type][receive_id] = res + sendResult[ID_TYPE_MAP[body.receive_id_type]][receive_id] = res }) ) }) @@ -152,11 +140,11 @@ export const manageMessageReq = async ( // 发送消息 await Promise.allSettled(sendList) // 保存消息记录 - db.log.create({ ...baseLog, send_result: sendRes }) - return genResp.ok(sendRes) + await db.log.create({ ...baseLog, sendResult }) + return genResp.ok(sendResult) } catch { const error = "send msg failed" - db.log.create({ ...baseLog, error }) - return genResp.serverError(error, sendRes) + await db.log.create({ ...baseLog, error }) + return genResp.serverError(error, sendResult) } } diff --git a/routes/microApp/index.ts b/routes/microApp/index.ts index d5e3217..59dddfc 100644 --- a/routes/microApp/index.ts +++ b/routes/microApp/index.ts @@ -8,7 +8,7 @@ import { Context } from "../../types" * @param req * @returns */ -const manageLogin = async (ctx: Context.Data) => { +const manageLogin = async (ctx: Context) => { const { req, genResp, logger, requestId } = ctx logger.info("micro app login") const url = new URL(req.url) @@ -27,8 +27,8 @@ const manageLogin = async (ctx: Context.Data) => { } const larkService = new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, + appId: appInfo.appId, + appSecret: appInfo.appSecret, requestId, }) @@ -52,7 +52,7 @@ const manageLogin = async (ctx: Context.Data) => { * @param req * @returns */ -const manageBatchUser = async (ctx: Context.Data) => { +const manageBatchUser = async (ctx: Context) => { const { body, genResp, logger, requestId } = ctx logger.info("batch get user info") if (!body) return genResp.badRequest("req body is empty") @@ -73,8 +73,8 @@ const manageBatchUser = async (ctx: Context.Data) => { } const larkService = new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, + appId: appInfo.appId, + appSecret: appInfo.appSecret, requestId, }) @@ -97,7 +97,7 @@ const manageBatchUser = async (ctx: Context.Data) => { * @param req * @returns */ -export const manageMicroAppReq = async (ctx: Context.Data) => { +export const manageMicroAppReq = async (ctx: Context) => { const path = ctx.path.child("/micro_app") // 处理登录请求 if (path.exact("/login")) { diff --git a/routes/sheet/index.ts b/routes/sheet/index.ts index 7184a64..c73026b 100644 --- a/routes/sheet/index.ts +++ b/routes/sheet/index.ts @@ -9,13 +9,13 @@ import { SheetProxy } from "../../types/sheetProxy" /** * 校验表格请求的参数 - * @param {Context.Data} ctx - 上下文数据，包含请求体和响应生成器 + * @param {Context} ctx - 上下文数据，包含请求体和响应生成器 * @returns {Promise} 如果校验失败，返回响应对象；否则返回 false */ const validateSheetReq = async ({ body, genResp, -}: Context.Data): Promise => { +}: Context): Promise => { // 定义基础的Schema let schema = Joi.object({ api_key: Joi.string() @@ -61,10 +61,10 @@ const validateSheetReq = async ({ /** * 处理表格请求 - * @param {Context.Data} ctx - 上下文数据，包含请求体、响应生成器和 Lark 服务 + * @param {Context} ctx - 上下文数据，包含请求体、响应生成器和 Lark 服务 * @returns {Promise} 返回响应对象 */ -export const manageSheetReq = async (ctx: Context.Data): Promise => { +export const manageSheetReq = async (ctx: Context): Promise => { const { body: rawBody, genResp, requestId } = ctx const body = rawBody as SheetProxy.InsertData @@ -92,8 +92,8 @@ export const manageSheetReq = async (ctx: Context.Data): Promise => { // 组织新的LarkService ctx.larkService = new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, + appId: appInfo.appId, + appSecret: appInfo.appSecret, requestId, }) diff --git a/test/archive/llm.ts b/test/archive/llm.ts index 2be6028..60a288b 100644 --- a/test/archive/llm.ts +++ b/test/archive/llm.ts @@ -13,9 +13,13 @@ const chatHistory = [ }, ] -const res = await llm.invoke("summary-qwen-72b-instruct-int4", { - chatHistory: JSON.stringify(chatHistory), - time: new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }), -}) +const res = await llm.invoke( + "summary-qwen-72b-instruct-int4", + { + chatHistory: JSON.stringify(chatHistory), + time: new Date().toLocaleString("zh-CN", { timeZone: "Asia/Shanghai" }), + }, + "123456" +) console.log(res) diff --git a/types/context.ts b/types/context.ts index d5efa36..a656131 100644 --- a/types/context.ts +++ b/types/context.ts @@ -3,27 +3,25 @@ import { LarkService, NetTool } from "@egg/net-tool" import { PathCheckTool } from "@egg/path-tool" import { Logger } from "winston" -import { AppInfo } from "../constant/appMap" import cardMap from "../constant/card" +import { AppInfoModel } from "../constant/config" import functionMap from "../constant/function" import tempMap from "../constant/template" import { AttachService } from "../services" -export namespace Context { - export interface Data { - req: Request - requestId: string - logger: Logger - genResp: NetTool - body: any - text: string - larkService: LarkService - larkBody: LarkBody - larkCard: LarkCard - attachService: AttachService - path: PathCheckTool - searchParams: URLSearchParams - app: "michat" | "egg" | string - appInfo: AppInfo - } +export interface Context { + req: Request + requestId: string + logger: Logger + genResp: NetTool + body: any + text: string + larkService: LarkService + larkBody: LarkBody + larkCard: LarkCard + attachService: AttachService + path: PathCheckTool + searchParams: URLSearchParams + app: "michat" | "egg" | string + appInfo: AppInfoModel } diff --git a/types/index.ts b/types/index.ts index 783e846..ef12df5 100644 --- a/types/index.ts +++ b/types/index.ts @@ -3,3 +3,11 @@ import type { LarkServer } from "./larkServer" import type { MsgProxy } from "./msgProxy" export { Context, LarkServer, MsgProxy } + +declare module "bun" { + interface Env { + PB_USER: string + PB_PASS: string + PB_URL: string + } +} diff --git a/utils/genContext.ts b/utils/genContext.ts index 36d1bd4..6104e34 100644 --- a/utils/genContext.ts +++ b/utils/genContext.ts @@ -29,7 +29,7 @@ const getPreRequestId = (larkBody: LarkBody) => { * 生成请求上下文。 * * @param {Request} req - 请求对象。 - * @returns {Promise} 返回包含请求上下文的对象。 + * @returns {Promise} 返回包含请求上下文的对象。 */ const genContext = async (req: Request) => { let body: any = null @@ -74,7 +74,7 @@ const genContext = async (req: Request) => { searchParams, app, appInfo, - } as Context.Data + } as Context } export default genContext diff --git a/utils/genLarkService.ts b/utils/genLarkService.ts index 2de651e..2a15d08 100644 --- a/utils/genLarkService.ts +++ b/utils/genLarkService.ts @@ -5,8 +5,8 @@ import { APP_MAP } from "../constant/config" const genLarkService = (app: string, requestId: string) => { const appInfo = APP_MAP[app] return new LarkService({ - appId: appInfo.app_id, - appSecret: appInfo.app_secret, + appId: appInfo.appId, + appSecret: appInfo.appSecret, requestId, }) }