fix: connect as middlewares & unit test and enhanced logger

Author: luoling8192

package.json

@@ -20,7 +20,7 @@
     "db:generate": "pnpm -F @tg-search/db db:generate",
     "db:migrate": "pnpm -F @tg-search/db db:migrate",
     "db:push": "pnpm -F @tg-search/db db:push",
-    "test": "pnpm -r test",
+    "test": "pnpm -r test run",
     "test:coverage": "pnpm -r test:coverage"
   },
   "devDependencies": {

packages/cli/src/cli.ts

@@ -7,13 +7,13 @@ import { Command as Commander } from 'commander'
 
 import { registry } from './command'
 import botCommand from './commands/bot'
-import connectCommand from './commands/connect'
 import embedCommand from './commands/embed'
 import exportCommand from './commands/export'
 import importCommand from './commands/import'
 import searchCommand from './commands/search'
 import syncCommand from './commands/sync'
 import watchCommand from './commands/watch'
+import { ensureAuthenticated } from './middlewares/connect'
 
 const logger = useLogger()
 
@@ -22,7 +22,6 @@ const logger = useLogger()
  */
 export function registerCommands() {
   registry.register(botCommand)
-  registry.register(connectCommand)
   registry.register(embedCommand)
   registry.register(exportCommand)
   registry.register(importCommand)
@@ -86,26 +85,8 @@ export function setupCli() {
             (command as { setClient: (client: TelegramAdapter) => void }).setClient(client)
           }
 
-          // Connect to Telegram
-          logger.log('正在连接到 Telegram...')
-          try {
-            await client.connect()
-          }
-          catch (error) {
-            // If connection failed due to authentication, use connect command
-            if (error instanceof Error && (
-              error.message === 'Code is required'
-              || error.message === '2FA password is required'
-              || error.message === 'Code is empty'
-            )) {
-              logger.debug('需要验证，使用 connect 命令...')
-              connectCommand.setClient(client)
-              await connectCommand.execute([], {})
-            }
-            else {
-              throw error
-            }
-          }
+          // Ensure authentication before executing command
+          await ensureAuthenticated(client)
         }
 
         // Execute command

packages/cli/src/commands/bot.ts

@@ -37,7 +37,7 @@ export class BotCommand extends TelegramCommand {
           forwards: message.forwards,
           createdAt: message.createdAt,
         })
-        logger.log('消息已保存到数据库:', result)
+        logger.withFields({ result }).log('消息已保存到数据库')
       }
       catch (error) {
         logger.withError(error).error('保存消息失败:')

packages/cli/src/commands/connect.ts

@@ -0,0 +1,64 @@
+import type { TelegramAdapter } from '@tg-search/core'
+
+import * as input from '@inquirer/prompts'
+import { useLogger } from '@tg-search/common'
+
+const logger = useLogger()
+
+/**
+ * Authentication middleware to handle Telegram login
+ * This middleware ensures that the client is authenticated before executing commands
+ */
+export async function ensureAuthenticated(client: TelegramAdapter): Promise<void> {
+  let retryCount = 0
+  const maxRetries = 3
+
+  while (retryCount < maxRetries) {
+    try {
+      logger.log('正在连接到 Telegram...')
+
+      // Try to connect with callbacks for authentication
+      await client.connect({
+        code: async () => {
+          logger.log('需要验证码')
+          const code = await input.input({ message: '请输入你收到的验证码：' })
+          if (!code)
+            throw new Error('需要验证码')
+          return code
+        },
+        password: async () => {
+          logger.log('需要两步验证密码')
+          const password = await input.password({ message: '请输入两步验证密码：' })
+          if (!password)
+            throw new Error('需要两步验证密码')
+          return password
+        },
+      })
+
+      logger.log('连接成功')
+      return
+    }
+    catch (error) {
+      if (error instanceof Error) {
+        // Skip if already connected
+        if (error.message.includes('already connected')) {
+          logger.log('已经连接')
+          return
+        }
+
+        // Handle invalid code
+        if (error.message.includes('PHONE_CODE_INVALID')) {
+          logger.warn('验证码无效，请重试')
+          retryCount++
+          continue
+        }
+
+        // Log other errors
+        logger.withError(error).error('连接失败')
+      }
+      throw error
+    }
+  }
+
+  throw new Error('验证码重试次数过多，请稍后再试')
+}

packages/cli/src/middlewares/connect.ts

@@ -20,7 +20,8 @@
     "stub": "unbuild --stub",
     "lint": "eslint src",
     "lint:fix": "eslint src --fix",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "vitest"
   },
   "dependencies": {
     "@guiiai/logg": "^1.0.7",
@@ -34,6 +35,7 @@
   "devDependencies": {
     "@types/lodash": "^4.17.15",
     "@types/node": "^22.13.4",
-    "unbuild": "^3.3.1"
+    "unbuild": "^3.3.1",
+    "vitest": "^3.0.6"
   }
 }

packages/common/package.json

@@ -81,7 +81,7 @@ function loadYamlConfig(configPath: string): Partial<Config> {
     return yaml.parse(content)
   }
   catch {
-    const logger = useLogger('config')
+    const logger = useLogger()
     logger.debug(`Failed to load config file: ${configPath}`)
     return {}
   }
@@ -108,7 +108,7 @@ function validateConfig(config: Config) {
 }
 
 export function initConfig() {
-  const logger = useLogger('config')
+  const logger = useLogger()
 
   try {
     // Find config directory
@@ -140,7 +140,7 @@ export function initConfig() {
     }
 
     // Log merged config
-    logger.withFields({ mergedConfig: JSON.stringify(mergedConfig, null, 2) }).debug('Config initialized successfully')
+    logger.withFields({ mergedConfig: JSON.stringify(mergedConfig) }).debug('Config initialized successfully')
 
     // Validate configuration
     validateConfig(mergedConfig)

packages/common/src/composable/config.ts

@@ -7,7 +7,7 @@ import { getConfig } from './config'
 let dbInstance: ReturnType<typeof drizzle>
 
 export function initDB() {
-  const logger = useLogger('db')
+  const logger = useLogger()
   logger.debug('Initializing database...')
 
   // Database connection

packages/common/src/composable/db.ts

@@ -0,0 +1,59 @@
+import { describe, expect, it } from 'vitest'
+
+import { initLogger, useLogger } from './logger'
+
+describe('logger', () => {
+  describe('initLogger', () => {
+    it('should initialize logger without error', () => {
+      expect(() => initLogger()).not.toThrow()
+    })
+  })
+
+  describe('useLogger', () => {
+    it('should create logger with provided name', () => {
+      const logger = useLogger('test')
+      expect(logger).toBeDefined()
+      expect(logger.log).toBeInstanceOf(Function)
+      expect(logger.debug).toBeInstanceOf(Function)
+      expect(logger.warn).toBeInstanceOf(Function)
+      expect(logger.error).toBeInstanceOf(Function)
+      expect(logger.withFields).toBeInstanceOf(Function)
+      expect(logger.withError).toBeInstanceOf(Function)
+    })
+
+    it('should create logger with auto-detected name', () => {
+      const logger = useLogger()
+      expect(logger).toBeDefined()
+    })
+
+    it('should log message with fields', () => {
+      const logger = useLogger('test')
+      expect(() => {
+        logger.log('test message', { field: 'value' })
+        logger.debug('test message', { field: 'value' })
+        logger.warn('test message', { field: 'value' })
+        logger.error('test message', { field: 'value' })
+      }).not.toThrow()
+    })
+
+    it('should log message without fields', () => {
+      const logger = useLogger('test')
+      expect(() => {
+        logger.log('test message')
+        logger.debug('test message')
+        logger.warn('test message')
+        logger.error('test message')
+      }).not.toThrow()
+    })
+
+    it('should chain withFields and withError', () => {
+      const logger = useLogger('test')
+      const error = new Error('test error')
+
+      expect(() => {
+        logger.withFields({ field: 'value' }).log('test message')
+        logger.withError(error).error('test message')
+      }).not.toThrow()
+    })
+  })
+})