refactor: 为core中每个子模块添加index.ts 减少import层级

TBXark · Nov 15, 2024 · 7454920 · 7454920
1 parent 76928f4
commit 7454920
Show file tree

Hide file tree

Showing 39 changed files with 359 additions and 462 deletions.
diff --git a/dist/buildinfo.json b/dist/buildinfo.json
diff --git a/dist/index.js b/dist/index.js
diff --git a/packages/lib/core/src/agent/agent.test.ts b/packages/lib/core/src/agent/agent.test.ts
@@ -1,5 +1,5 @@
 import type { LLMChatParams } from './types';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { loadChatLLM } from './agent';
 import '../config/env.test';
 

diff --git a/packages/lib/core/src/agent/agent.ts b/packages/lib/core/src/agent/agent.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { ChatAgent, ImageAgent } from './types';
 import { Anthropic } from './anthropic';
 import { AzureChatAI, AzureImageAI } from './azure';

diff --git a/packages/lib/core/src/agent/anthropic.ts b/packages/lib/core/src/agent/anthropic.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { SseChatCompatibleOptions } from './request';
 import type { SSEMessage, SSEParserResult } from './stream';
 import type {
@@ -8,7 +8,7 @@ import type {
     HistoryItem,
     LLMChatParams,
 } from './types';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { imageToBase64String } from '../utils/image';
 import { requestChatCompletions } from './request';
 import { Stream } from './stream';

diff --git a/packages/lib/core/src/agent/azure.ts b/packages/lib/core/src/agent/azure.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type {
     ChatAgent,
     ChatAgentResponse,

diff --git a/packages/lib/core/src/agent/chat.ts b/packages/lib/core/src/agent/chat.ts
@@ -1,6 +1,6 @@
-import type { WorkerContext } from '../config/context';
+import type { WorkerContext } from '../config';
 import type { ChatAgent, HistoryItem, HistoryModifier, LLMChatParams, UserMessageItem } from './types';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { extractTextContent } from './utils';
 
 /**

diff --git a/packages/lib/core/src/agent/cohere.ts b/packages/lib/core/src/agent/cohere.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { SseChatCompatibleOptions } from './request';
 import type { ChatAgent, ChatAgentResponse, ChatStreamTextHandler, LLMChatParams } from './types';
 import { renderOpenAIMessages } from './openai';

diff --git a/packages/lib/core/src/agent/gemini.ts b/packages/lib/core/src/agent/gemini.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { ChatAgent, ChatAgentResponse, ChatStreamTextHandler, LLMChatParams } from './types';
 import { renderOpenAIMessages } from './openai';
 import { requestChatCompletions } from './request';

diff --git a/packages/lib/core/src/agent/index.ts b/packages/lib/core/src/agent/index.ts
@@ -1,3 +1,4 @@
 export * from './agent';
+export * from './chat';
 export * from './request';
 export * from './types';
diff --git a/packages/lib/core/src/agent/mistralai.ts b/packages/lib/core/src/agent/mistralai.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { ChatAgent, ChatAgentResponse, ChatStreamTextHandler, LLMChatParams } from './types';
 import { renderOpenAIMessages } from './openai';
 import { requestChatCompletions } from './request';

diff --git a/packages/lib/core/src/agent/openai.ts b/packages/lib/core/src/agent/openai.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type {
     ChatAgent,
     ChatAgentResponse,
@@ -7,7 +7,7 @@ import type {
     ImageAgent,
     LLMChatParams,
 } from './types';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { imageToBase64String } from '../utils/image';
 import { requestChatCompletions } from './request';
 import { convertStringToResponseMessages, extractImageContent, loadModelsList } from './utils';

diff --git a/packages/lib/core/src/agent/request.ts b/packages/lib/core/src/agent/request.ts
@@ -1,5 +1,5 @@
 import type { ChatStreamTextHandler } from './types';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { Stream } from './stream';
 
 export interface SseChatCompatibleOptions {

diff --git a/packages/lib/core/src/agent/types.ts b/packages/lib/core/src/agent/types.ts
@@ -1,9 +1,19 @@
-import type { AgentUserConfig } from '../config/env';
-import type { CoreAssistantMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, DataContent } from './message';
+import type { AgentUserConfig } from '../config';
+import type {
+    CoreAssistantMessage,
+    CoreSystemMessage,
+    CoreToolMessage,
+    CoreUserMessage,
+    DataContent,
+    FilePart,
+    ImagePart,
+    TextPart,
+} from './message';
 //  当使用 `ai` 包时，取消注释以下行并注释掉上一行
 // import type { CoreAssistantMessage, CoreSystemMessage, CoreToolMessage, CoreUserMessage, DataContent } from 'ai';
 
 export type DataItemContent = DataContent;
+export type UserContentPart = TextPart | ImagePart | FilePart;
 
 export type SystemMessageItem = CoreSystemMessage;
 export type UserMessageItem = CoreUserMessage;

diff --git a/packages/lib/core/src/agent/workersai.ts b/packages/lib/core/src/agent/workersai.ts
@@ -1,4 +1,4 @@
-import type { AgentUserConfig } from '../config/env';
+import type { AgentUserConfig } from '../config';
 import type { SseChatCompatibleOptions } from './request';
 import type {
     ChatAgent,

diff --git a/packages/lib/core/src/config/context.ts b/packages/lib/core/src/config/context.ts
@@ -1,6 +1,6 @@
 import type * as Telegram from 'telegram-bot-api-types';
 import type { AgentUserConfig } from './env';
-import { ENV } from './env';
+import { ENV, ENV_KEY_MAPPER } from './env';
 import { ConfigMerger } from './merger';
 
 export class ShareContext {
@@ -84,6 +84,7 @@ export class WorkerContext {
     constructor(USER_CONFIG: AgentUserConfig, SHARE_CONTEXT: ShareContext) {
         this.USER_CONFIG = USER_CONFIG;
         this.SHARE_CONTEXT = SHARE_CONTEXT;
+        this.execChangeAndSave = this.execChangeAndSave.bind(this);
     }
 
     static async from(token: string, update: Telegram.Update): Promise<WorkerContext> {
@@ -98,6 +99,30 @@ export class WorkerContext {
         }
         return new WorkerContext(USER_CONFIG, SHARE_CONTEXT);
     }
+
+    async execChangeAndSave(values: Record<string, any>): Promise<void> {
+        for (const ent of Object.entries(values || {})) {
+            let [key, value] = ent;
+            key = ENV_KEY_MAPPER[key] || key;
+            if (ENV.LOCK_USER_CONFIG_KEYS.includes(key)) {
+                throw new Error(`Key ${key} is locked`);
+            }
+            const configKeys = Object.keys(this.USER_CONFIG || {}) || [];
+            if (!configKeys.includes(key)) {
+                throw new Error(`Key ${key} is not allowed`);
+            }
+            this.USER_CONFIG.DEFINE_KEYS.push(key);
+            ConfigMerger.merge(this.USER_CONFIG, {
+                [key]: value,
+            });
+            console.log('Update user config: ', key, this.USER_CONFIG[key]);
+        }
+        this.USER_CONFIG.DEFINE_KEYS = Array.from(new Set(this.USER_CONFIG.DEFINE_KEYS));
+        await ENV.DATABASE.put(
+            this.SHARE_CONTEXT.configStoreKey,
+            JSON.stringify(ConfigMerger.trim(this.USER_CONFIG, ENV.LOCK_USER_CONFIG_KEYS)),
+        );
+    }
 }
 
 class UpdateContext {

diff --git a/packages/lib/core/src/config/env.ts b/packages/lib/core/src/config/env.ts
@@ -50,6 +50,8 @@ export const ENV_KEY_MAPPER: Record<string, string> = {
     WORKERS_AI_MODEL: 'WORKERS_CHAT_MODEL',
 };
 
+export type CustomMessageRender = (mode: string | null, message: string) => string;
+
 class Environment extends EnvironmentConfig {
     // -- 版本数据 --
     //
@@ -68,6 +70,8 @@ class Environment extends EnvironmentConfig {
     DATABASE: KVNamespace = null as any;
     API_GUARD: APIGuard | null = null;
 
+    CUSTOM_MESSAGE_RENDER: CustomMessageRender | null = null;
+
     constructor() {
         super();
         this.merge = this.merge.bind(this);

diff --git a/packages/lib/core/src/config/index.ts b/packages/lib/core/src/config/index.ts
@@ -0,0 +1,6 @@
+export * from './config';
+export * from './context';
+export * from './env';
+export * from './merger';
+export * from './types';
+export * from './version';
diff --git a/packages/lib/core/src/config/version.ts b/packages/lib/core/src/config/version.ts
@@ -1,2 +1,2 @@
-export const BUILD_TIMESTAMP = 1731643971;
-export const BUILD_VERSION = '2977d62';
+export const BUILD_TIMESTAMP = 1731649723;
+export const BUILD_VERSION = '76928f4';
diff --git a/packages/lib/core/src/index.ts b/packages/lib/core/src/index.ts
@@ -1,12 +1,10 @@
-import { ENV } from './config/env';
+import { ENV } from './config';
 import { createRouter } from './route';
 
 export * from './agent';
-export * from './config/env';
+export * from './config';
 export * from './route';
-export * from './telegram/api';
-export * from './telegram/handler';
-export * from '@chatgpt-telegram-workers/plugins';
+export * from './telegram';
 
 export const Workers = {
     async fetch(request: Request, env: any): Promise<Response> {

diff --git a/packages/lib/core/src/route/index.ts b/packages/lib/core/src/route/index.ts
@@ -1,6 +1,6 @@
 import type * as Telegram from 'telegram-bot-api-types';
 import type { RouterRequest } from '../utils/router';
-import { ENV } from '../config/env';
+import { ENV } from '../config';
 import { createTelegramBotAPI } from '../telegram/api';
 import { commandsBindScope, commandsDocument } from '../telegram/command';
 import { handleUpdate } from '../telegram/handler';

diff --git a/packages/lib/core/src/telegram/api/index.ts b/packages/lib/core/src/telegram/api/index.ts
@@ -1,5 +1,5 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import { ENV } from '../../config/env';
+import { ENV } from '../../config';
 
 class APIClientBase {
     readonly token: string;

diff --git a/packages/lib/core/src/telegram/auth/auth.ts → packages/lib/core/src/telegram/auth/index.ts b/packages/lib/core/src/telegram/auth/auth.ts → packages/lib/core/src/telegram/auth/index.ts
@@ -1,15 +1,14 @@
-import { ENV } from '../../config/env';
-import { isTelegramChatTypeGroup } from '../utils/utils';
+import { ENV } from '../../config';
 
 export const TELEGRAM_AUTH_CHECKER = {
     default(chatType: string): string[] | null {
-        if (isTelegramChatTypeGroup(chatType)) {
+        if (isGroupChat(chatType)) {
             return ['administrator', 'creator'];
         }
         return null;
     },
     shareModeGroup(chatType: string): string[] | null {
-        if (isTelegramChatTypeGroup(chatType)) {
+        if (isGroupChat(chatType)) {
             // 每个人在群里有上下文的时候，不限制
             if (!ENV.GROUP_CHAT_BOT_SHARE_MODE) {
                 return null;
@@ -19,3 +18,7 @@ export const TELEGRAM_AUTH_CHECKER = {
         return null;
     },
 };
+
+export function isGroupChat(type: string): boolean {
+    return type === 'group' || type === 'supergroup';
+}
diff --git a/packages/lib/core/src/telegram/callback_query/index.ts b/packages/lib/core/src/telegram/callback_query/index.ts
@@ -1,7 +1,7 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import type { WorkerContext } from '../../config/context';
+import type { WorkerContext } from '../../config';
 import { loadChatRoleWithContext } from '../command/auth';
-import { MessageSender } from '../utils/send';
+import { MessageSender } from '../sender';
 import { AgentListCallbackQueryHandler, ModelChangeCallbackQueryHandler, ModelListCallbackQueryHandler } from './system';
 
 const QUERY_HANDLERS = [

diff --git a/packages/lib/core/src/telegram/callback_query/system.ts b/packages/lib/core/src/telegram/callback_query/system.ts
@@ -1,12 +1,10 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import type { WorkerContext } from '../../config/context';
-import type { AgentUserConfig } from '../../config/env';
+import type { AgentUserConfig, WorkerContext } from '../../config';
 import type { CallbackQueryHandler } from './types';
 import { CHAT_AGENTS, loadChatLLM } from '../../agent';
-import { ENV } from '../../config/env';
-import { TELEGRAM_AUTH_CHECKER } from '../auth/auth';
-import { MessageSender } from '../utils/send';
-import { setUserConfig } from '../utils/utils';
+import { ENV } from '../../config';
+import { TELEGRAM_AUTH_CHECKER } from '../auth';
+import { MessageSender } from '../sender';
 
 export class AgentListCallbackQueryHandler implements CallbackQueryHandler {
     prefix = 'al:';
@@ -145,10 +143,10 @@ export class ModelChangeCallbackQueryHandler implements CallbackQueryHandler {
         if (!chatAgent?.modelKey) {
             throw new Error(`modelKey not found: ${agent}`);
         }
-        await setUserConfig({
+        await context.execChangeAndSave({
             AI_PROVIDER: agent,
             [chatAgent.modelKey]: model,
-        }, context);
+        });
         console.log('Change model:', agent, model);
         const message: Telegram.EditMessageTextParams = {
             chat_id: query.message.chat.id,

diff --git a/packages/lib/core/src/telegram/callback_query/types.ts b/packages/lib/core/src/telegram/callback_query/types.ts
@@ -1,5 +1,5 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import type { WorkerContext } from '../../config/context';
+import type { WorkerContext } from '../../config';
 
 export interface CallbackQueryHandler {
     prefix: string;

diff --git a/...ges/lib/core/src/telegram/handler/chat.ts → packages/lib/core/src/telegram/chat/index.ts b/...ges/lib/core/src/telegram/handler/chat.ts → packages/lib/core/src/telegram/chat/index.ts
@@ -1,16 +1,12 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import type { HistoryModifier, UserMessageItem } from '../../agent';
-import type { StreamResultHandler } from '../../agent/chat';
-import type { FilePart, ImagePart, TextPart } from '../../agent/message';
-import type { WorkerContext } from '../../config/context';
-import type { MessageHandler } from './types';
-import { loadChatLLM } from '../../agent';
-import { requestCompletionsFromLLM } from '../../agent/chat';
-import { ENV } from '../../config/env';
+import type { HistoryModifier, StreamResultHandler, UserContentPart, UserMessageItem } from '../../agent';
+import type { WorkerContext } from '../../config';
+import { loadChatLLM, requestCompletionsFromLLM } from '../../agent';
+import { ENV } from '../../config';
 import { createTelegramBotAPI } from '../api';
-import { MessageSender } from '../utils/send';
+import { MessageSender } from '../sender';
 
-export async function chatWithLLM(message: Telegram.Message, params: UserMessageItem | null, context: WorkerContext, modifier: HistoryModifier | null): Promise<Response> {
+export async function chatWithMessage(message: Telegram.Message, params: UserMessageItem | null, context: WorkerContext, modifier: HistoryModifier | null): Promise<Response> {
     const sender = MessageSender.fromMessage(context.SHARE_CONTEXT.botToken, message);
     try {
         try {
@@ -77,7 +73,7 @@ export async function chatWithLLM(message: Telegram.Message, params: UserMessage
     }
 }
 
-async function extractImageURL(fileId: string | null, context: WorkerContext): Promise<URL | null> {
+export async function extractImageURL(fileId: string | null, context: WorkerContext): Promise<URL | null> {
     if (!fileId) {
         return null;
     }
@@ -93,7 +89,7 @@ async function extractImageURL(fileId: string | null, context: WorkerContext): P
     return null;
 }
 
-function extractImageFileID(message: Telegram.Message): string | null {
+export function extractImageFileID(message: Telegram.Message): string | null {
     if (message.photo && message.photo.length > 0) {
         const offset = ENV.TELEGRAM_PHOTO_SIZE_OFFSET;
         const length = message.photo.length;
@@ -105,22 +101,20 @@ function extractImageFileID(message: Telegram.Message): string | null {
     return null;
 }
 
-export class ChatHandler implements MessageHandler {
-    handle = async (message: Telegram.Message, context: WorkerContext): Promise<Response | null> => {
-        const text = message.text || message.caption || '';
-        const params: UserMessageItem = {
-            role: 'user',
-            content: text,
-        };
-        const url = await extractImageURL(extractImageFileID(message), context);
-        if (url) {
-            const contents = new Array<TextPart | ImagePart | FilePart>();
-            if (text) {
-                contents.push({ type: 'text', text });
-            }
-            contents.push({ type: 'image', image: url });
-            params.content = contents;
-        }
-        return chatWithLLM(message, params, context, null);
+export async function extractUserMessageItem(message: Telegram.Message, context: WorkerContext): Promise<UserMessageItem> {
+    const text = message.text || message.caption || '';
+    const params: UserMessageItem = {
+        role: 'user',
+        content: text,
     };
+    const url = await extractImageURL(extractImageFileID(message), context);
+    if (url) {
+        const contents = new Array<UserContentPart>();
+        if (text) {
+            contents.push({ type: 'text', text });
+        }
+        contents.push({ type: 'image', image: url });
+        params.content = contents;
+    }
+    return params;
 }
diff --git a/packages/lib/core/src/telegram/command/auth.ts b/packages/lib/core/src/telegram/command/auth.ts
@@ -1,6 +1,6 @@
 import type * as Telegram from 'telegram-bot-api-types';
-import type { WorkerContext } from '../../config/context';
-import { ENV } from '../../config/env';
+import type { WorkerContext } from '../../config';
+import { ENV } from '../../config';
 import { createTelegramBotAPI } from '../api';
 
 export async function loadChatRoleWithContext(chatId: number, speakerId: number, context: WorkerContext): Promise<string | null> {