@zhin.js/core 1.0.19 → 1.0.21

package/src/plugin.ts

@@ -15,7 +15,7 @@ import { fileURLToPath } from "url";
 import logger, { Logger } from "@zhin.js/logger";
 import { compose, remove, resolveEntry } from "./utils.js";
 import { MessageMiddleware, RegisteredAdapter, MaybePromise, ArrayItem, ConfigService, PermissionService, SendOptions } from "./types.js";
-import { Adapter } from "./adapter.js";
+import { Adapter, Adapters } from "./adapter.js";
 import { createHash } from "crypto";
 const contextsKey = Symbol("contexts");
 const loadedModules = new Map<string, Plugin>(); // 记录已加载的模块
@@ -685,7 +685,7 @@ export namespace Plugin {
    * 服务类型扩展点
    * 各个 Context 通过 declare module 扩展此接口
    */
-  export interface Contexts extends RegisteredAdapters {
+  export interface Contexts extends Adapters {
     config: ConfigService;
     permission: PermissionService;
   }

package/src/types.ts

@@ -4,6 +4,7 @@ import {Adapter} from "./adapter.js";
 import {Bot} from "./bot.js";
 import { SystemLog } from "./models/system-log.js";
 import { User } from "./models/user.js";
+import { Adapters } from "./adapter.js";
 import { Databases,Registry } from "@zhin.js/database";
 import { MessageComponent } from "./message.js";
 import { ProcessAdapter } from "./built/adapter-process.js";
@@ -30,7 +31,7 @@ export type ObjectItem<T extends object>=T[keyof T]
 /**
  * 已注册适配器名类型
  */
-export type RegisteredAdapter=Extract<keyof RegisteredAdapters, string>
+export type RegisteredAdapter=Extract<keyof Adapters, string>
 /**
  * 指定适配器的消息类型
  */

package/src/utils.ts

@@ -187,11 +187,25 @@ export namespace segment {
     if (!Array.isArray(content)) content = [content];
     const toString = (template: string | MessageElement) => {
       if (typeof template !== "string") return [template];
+      
+      // 安全检查：限制输入长度，防止 ReDoS 攻击
+      const MAX_TEMPLATE_LENGTH = 100000; // 100KB
+      if (template.length > MAX_TEMPLATE_LENGTH) {
+        throw new Error(`Template too large: ${template.length} > ${MAX_TEMPLATE_LENGTH}`);
+      }
+      
       template = unescape(template);
       const result: MessageElement[] = [];
-      const closingReg = /<(\S+)(\s[^>]+)?\/>/;
-      const twinningReg = /<(\S+)(\s[^>]+)?>([\s\S]*?)<\/\1>/;
-      while (template.length) {
+      // 修复 ReDoS 漏洞：使用更安全的正则表达式
+      // 原: /<(\S+)(\s[^>]+)?\/>/  可能导致回溯
+      const closingReg = /<(\w+)(?:\s+[^>]*?)?\/>/;
+      // 原: /<(\S+)(\s[^>]+)?>([\s\S]*?)<\/\1>/  可能导致回溯
+      const twinningReg = /<(\w+)(?:\s+[^>]*?)?>([^]*?)<\/\1>/;
+      
+      let iterations = 0;
+      const MAX_ITERATIONS = 1000; // 防止无限循环
+      
+      while (template.length && iterations++ < MAX_ITERATIONS) {
         const [_, type, attrStr = "", child = ""] =
           template.match(twinningReg) || template.match(closingReg) || [];
         if (!type) break;
@@ -209,8 +223,10 @@ export namespace segment {
             },
           });
         template = template.slice(index + matched.length);
+        // 修复 ReDoS 漏洞：使用更简单的正则表达式
+        // 原: /\s([^=]+)(?=(?=="([^"]+)")|(?=='([^']+)'))/g  嵌套前瞻断言
         const attrArr = [
-          ...attrStr.matchAll(/\s([^=]+)(?=(?=="([^"]+)")|(?=='([^']+)'))/g),
+          ...attrStr.matchAll(/\s+([^=\s]+)=(?:"([^"]*)"|'([^']*)')/g),
         ];
         const data = Object.fromEntries(
           attrArr.map(([source, key, v1, v2]) => {

package/tests/adapter.test.ts

@@ -1,7 +1,384 @@
-import { describe, it, expect } from "vitest"
+import { describe, it, expect, beforeEach, vi } from 'vitest'
+import { Adapter } from '../src/adapter'
+import { Bot } from '../src/bot'
+import { Plugin } from '../src/plugin'
+import { Message, MessageBase } from '../src/message'
+import { EventEmitter } from 'events'
 
-describe("适配器测试", () => {
-  it("应该通过基本测试", () => {
-    expect(true).toBe(true)
+// Mock Bot 实现用于测试
+class MockBot implements Bot<any, any> {
+  $id: string
+  $config: any
+  $connected: boolean = false
+  adapter: Adapter
+
+  constructor(adapter: Adapter, config: any) {
+    this.adapter = adapter
+    this.$config = config
+    this.$id = config.id || 'mock-bot'
+  }
+
+  $formatMessage(event: any): Message<any> {
+    const base: MessageBase = {
+      $id: event.id || 'mock-id',
+      $adapter: 'test' as any,
+      $bot: this.$id,
+      $content: [],
+      $sender: { id: 'mock-sender', name: 'Mock Sender' },
+      $channel: { id: 'mock-channel', type: 'private' },
+      $timestamp: Date.now(),
+      $raw: event.raw || event,
+      $reply: async (content: any) => 'mock-reply-id',
+      $recall: async () => {}
+    }
+    return Message.from(event, base)
+  }
+
+  async $connect(): Promise<void> {
+    this.$connected = true
+  }
+
+  async $disconnect(): Promise<void> {
+    this.$connected = false
+  }
+
+  async $sendMessage(options: any): Promise<string> {
+    return 'mock-message-id'
+  }
+
+  async $recallMessage(id: string): Promise<void> {
+    // Mock 撤回消息
+  }
+}
+
+// Mock Adapter 类用于测试
+class MockAdapter extends Adapter<MockBot> {
+  createBot(config: any): MockBot {
+    return new MockBot(this, config)
+  }
+}
+
+describe('Adapter Core Functionality', () => {
+  let plugin: Plugin
+  let adapter: MockAdapter
+
+  beforeEach(() => {
+    plugin = new Plugin('/test/plugin.ts')
+    adapter = new MockAdapter(plugin, 'test', [])
+  })
+
+  describe('Adapter Constructor', () => {
+    it('should create adapter with plugin, name and config', () => {
+      const config = [{ id: 'bot1' }]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      expect(adapter.plugin).toBe(plugin)
+      expect(adapter.name).toBe('test')
+      expect(adapter.config).toBe(config)
+    })
+
+    it('should initialize with empty bots map', () => {
+      expect(adapter.bots).toBeInstanceOf(Map)
+      expect(adapter.bots.size).toBe(0)
+    })
+
+    it('should inherit from EventEmitter', () => {
+      expect(adapter).toBeInstanceOf(EventEmitter)
+    })
+
+    it('should register message.receive listener', () => {
+      const listeners = adapter.listeners('message.receive')
+      expect(listeners.length).toBeGreaterThan(0)
+    })
+
+    it('should register call.sendMessage listener', () => {
+      const listeners = adapter.listeners('call.sendMessage')
+      expect(listeners.length).toBeGreaterThan(0)
+    })
+
+    it('should register call.recallMessage listener', () => {
+      const listeners = adapter.listeners('call.recallMessage')
+      expect(listeners.length).toBeGreaterThan(0)
+    })
+  })
+
+  describe('Adapter Logger', () => {
+    it('should get logger from plugin', () => {
+      expect(adapter.logger).toBeDefined()
+      expect(adapter.logger).toBe(plugin.logger)
+    })
+
+    it('should throw error if plugin is not set', () => {
+      const adapter = new MockAdapter(plugin, 'test', [])
+      adapter.plugin = null as any
+      
+      expect(() => adapter.logger).toThrow('Adapter is not associated with any plugin')
+    })
+  })
+
+  describe('Adapter Binding', () => {
+    it('should bind to a plugin', () => {
+      const newPlugin = new Plugin('/test/new-plugin.ts')
+      adapter.binding(newPlugin)
+      
+      expect(adapter.plugin).toBe(newPlugin)
+    })
+  })
+
+  describe('Adapter Start', () => {
+    it('should start without config', async () => {
+      await adapter.start()
+      expect(plugin.root.adapters).toContain('test')
+    })
+
+    it('should create and connect bots from config', async () => {
+      const config = [
+        { id: 'bot1' },
+        { id: 'bot2' }
+      ]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      await adapter.start()
+      
+      expect(adapter.bots.size).toBe(2)
+      expect(adapter.bots.has('bot1')).toBe(true)
+      expect(adapter.bots.has('bot2')).toBe(true)
+    })
+
+    it('should add adapter name to plugin adapters', async () => {
+      await adapter.start()
+      expect(plugin.root.adapters).toContain('test')
+    })
+
+    it('should handle empty config array', async () => {
+      const adapter = new MockAdapter(plugin, 'test', [])
+      await adapter.start()
+      expect(adapter.bots.size).toBe(0)
+    })
+  })
+
+  describe('Adapter Stop', () => {
+    it('should disconnect all bots', async () => {
+      const config = [{ id: 'bot1' }, { id: 'bot2' }]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      await adapter.start()
+      expect(adapter.bots.size).toBe(2)
+      
+      await adapter.stop()
+      expect(adapter.bots.size).toBe(0)
+    })
+
+    it('should remove adapter from plugin adapters', async () => {
+      await adapter.start()
+      expect(plugin.root.adapters).toContain('test')
+      
+      await adapter.stop()
+      expect(plugin.root.adapters).not.toContain('test')
+    })
+
+    it('should remove all event listeners', async () => {
+      await adapter.start()
+      const beforeCount = adapter.listenerCount('message.receive')
+      
+      await adapter.stop()
+      const afterCount = adapter.listenerCount('message.receive')
+      
+      expect(afterCount).toBe(0)
+      expect(beforeCount).toBeGreaterThan(0)
+    })
+
+    it('should handle bot disconnect errors gracefully', async () => {
+      const config = [{ id: 'bot1' }, { id: 'bot2' }]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      await adapter.start()
+      
+      // Mock first bot disconnect to throw error
+      const bot1 = adapter.bots.get('bot1')!
+      bot1.$disconnect = vi.fn().mockRejectedValue(new Error('Disconnect failed'))
+      
+      // Mock logger to spy on error logging
+      const loggerSpy = vi.spyOn(adapter.logger, 'error')
+      
+      // The adapter should continue cleanup despite errors
+      // Note: Current implementation throws, but this test documents the desired behavior
+      // where adapter.stop() should handle errors gracefully and continue cleanup
+      await expect(adapter.stop()).rejects.toThrow('Disconnect failed')
+      
+      // Even though it throws, we document that graceful handling would be:
+      // - Log the error
+      // - Continue disconnecting other bots
+      // - Complete cleanup (clear bots, remove from adapters list, remove listeners)
+    })
+  })
+
+  describe('Adapter Events', () => {
+    describe('call.recallMessage', () => {
+      it('should recall message from bot', async () => {
+        const config = [{ id: 'bot1' }]
+        const adapter = new MockAdapter(plugin, 'test', config)
+        await adapter.start()
+        
+        const bot = adapter.bots.get('bot1')!
+        const recallSpy = vi.spyOn(bot, '$recallMessage')
+        
+        await adapter.emit('call.recallMessage', 'bot1', 'message-id')
+        
+        expect(recallSpy).toHaveBeenCalledWith('message-id')
+      })
+
+      it('should require valid bot id', () => {
+        // 验证 adapter 不包含不存在的 bot
+        expect(adapter.bots.has('non-existent-bot')).toBe(false)
+      })
+    })
+
+    describe('call.sendMessage', () => {
+      it('should send message through bot', async () => {
+        const config = [{ id: 'bot1' }]
+        const adapter = new MockAdapter(plugin, 'test', config)
+        await adapter.start()
+        
+        const bot = adapter.bots.get('bot1')!
+        const sendSpy = vi.spyOn(bot, '$sendMessage')
+        
+        const options = {
+          context: 'test',
+          bot: 'bot1',
+          content: 'Hello',
+          id: 'channel-id',
+          type: 'text' as const
+        }
+        
+        await adapter.emit('call.sendMessage', 'bot1', options)
+        
+        expect(sendSpy).toHaveBeenCalledWith(options)
+      })
+
+      it('should validate bot existence before sending', () => {
+        // 验证发送消息前应该检查 bot 是否存在
+        expect(adapter.bots.has('non-existent-bot')).toBe(false)
+        
+        // 在实际使用中，应该先检查 bot 是否存在
+        const botExists = adapter.bots.has('bot1')
+        expect(botExists).toBe(false) // 因为还没有 start
+      })
+
+      it('should call before.sendMessage handlers', async () => {
+        const config = [{ id: 'bot1' }]
+        const adapter = new MockAdapter(plugin, 'test', config)
+        await adapter.start()
+        
+        let handlerCalled = false
+        plugin.root.on('before.sendMessage', (options) => {
+          handlerCalled = true
+          return options
+        })
+        
+        const options = {
+          context: 'test',
+          bot: 'bot1',
+          content: 'Hello',
+          id: 'channel-id',
+          type: 'text' as const
+        }
+        
+        await adapter.emit('call.sendMessage', 'bot1', options)
+        expect(handlerCalled).toBe(true)
+      })
+    })
+
+    describe('message.receive', () => {
+      it('should process received message through middleware', async () => {
+        const config = [{ id: 'bot1' }]
+        const adapter = new MockAdapter(plugin, 'test', config)
+        await adapter.start()
+        
+        let middlewareCalled = false
+        plugin.addMiddleware(async (message, next) => {
+          middlewareCalled = true
+          await next()
+        })
+        
+        const message = {
+          $bot: 'bot1',
+          $adapter: 'test',
+          $channel: { id: 'channel-id', type: 'text' },
+          $content: 'Hello'
+        } as any
+        
+        adapter.emit('message.receive', message)
+        
+        // 等待异步处理
+        await new Promise(resolve => setTimeout(resolve, 10))
+        expect(middlewareCalled).toBe(true)
+      })
+    })
+  })
+
+  describe('Adapter createBot', () => {
+    it('should be abstract method', () => {
+      expect(typeof adapter.createBot).toBe('function')
+    })
+
+    it('should create bot with config', () => {
+      const config = { id: 'test-bot' }
+      const bot = adapter.createBot(config)
+      
+      expect(bot).toBeInstanceOf(MockBot)
+      expect(bot.$id).toBe('test-bot')
+    })
+  })
+
+  describe('Adapter Bots Management', () => {
+    it('should manage multiple bots', async () => {
+      const config = [
+        { id: 'bot1' },
+        { id: 'bot2' },
+        { id: 'bot3' }
+      ]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      await adapter.start()
+      
+      expect(adapter.bots.size).toBe(3)
+      expect(Array.from(adapter.bots.keys())).toEqual(['bot1', 'bot2', 'bot3'])
+    })
+
+    it('should access bot by id', async () => {
+      const config = [{ id: 'bot1' }]
+      const adapter = new MockAdapter(plugin, 'test', config)
+      
+      await adapter.start()
+      
+      const bot = adapter.bots.get('bot1')
+      expect(bot).toBeDefined()
+      expect(bot!.$id).toBe('bot1')
+    })
+  })
+})
+
+describe('Adapter Registry', () => {
+  it('should have a Registry Map', () => {
+    expect(Adapter.Registry).toBeInstanceOf(Map)
+  })
+
+  it('should register adapter factory', () => {
+    const factory = MockAdapter as any
+    Adapter.register('mock', factory)
+    
+    expect(Adapter.Registry.has('mock')).toBe(true)
+    expect(Adapter.Registry.get('mock')).toBe(factory)
+  })
+
+  it('should allow multiple adapter registrations', () => {
+    const factory1 = MockAdapter as any
+    const factory2 = MockAdapter as any
+    
+    Adapter.register('adapter1', factory1)
+    Adapter.register('adapter2', factory2)
+    
+    expect(Adapter.Registry.size).toBeGreaterThanOrEqual(2)
   })
 })

package/tests/config.test.ts

@@ -1,7 +1,150 @@
-import { describe, it, expect } from "vitest"
+import { describe, it, expect, beforeEach, afterEach } from 'vitest'
+import { ConfigLoader } from '../src/built/config'
+import fs from 'fs'
+import path from 'path'
 
-describe("配置系统测试", () => {
-  it("应该通过基本测试", () => {
-    expect(true).toBe(true)
+describe('ConfigLoader', () => {
+  const testConfigPath = path.join(process.cwd(), 'test-config.json')
+  
+  afterEach(() => {
+    // 清理测试文件
+    if (fs.existsSync(testConfigPath)) {
+      fs.unlinkSync(testConfigPath)
+    }
+  })
+
+  describe('Proxy behavior', () => {
+    it('should handle array methods correctly', () => {
+      const config = {
+        items: ['item1', 'item2', 'item3'],
+        bots: [
+          { context: 'sandbox', name: 'bot1' },
+          { context: 'sandbox', name: 'bot2' }
+        ]
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      // 测试数组的 map 方法
+      expect(() => {
+        const mapped = proxiedData.items.map((item: string) => item.toUpperCase())
+        expect(mapped).toEqual(['ITEM1', 'ITEM2', 'ITEM3'])
+      }).not.toThrow()
+      
+      // 测试数组的 filter 方法
+      expect(() => {
+        const filtered = proxiedData.bots.filter((bot: any) => bot.name === 'bot1')
+        expect(filtered).toHaveLength(1)
+      }).not.toThrow()
+    })
+
+    it('should handle nested objects', () => {
+      const config = {
+        database: {
+          dialect: 'sqlite',
+          filename: './data/bot.db'
+        },
+        http: {
+          port: 8086,
+          username: '${username}',
+          password: '${password}'
+        }
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      expect(proxiedData.database.dialect).toBe('sqlite')
+      expect(proxiedData.http.port).toBe(8086)
+    })
+
+    it('should resolve environment variables', () => {
+      process.env.TEST_VAR = 'test_value'
+      
+      const config = {
+        testValue: '${TEST_VAR}'
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      expect(proxiedData.testValue).toBe('test_value')
+      
+      delete process.env.TEST_VAR
+    })
+
+    it('should handle escaped environment variables', () => {
+      const config = {
+        escapedValue: '\\${NOT_A_VAR}'
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      expect(proxiedData.escapedValue).toBe('${NOT_A_VAR}')
+    })
+
+    it('should handle default values for missing env vars', () => {
+      const config = {
+        valueWithDefault: '${MISSING_VAR:default_value}'
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      expect(proxiedData.valueWithDefault).toBe('default_value')
+    })
+
+    it('should not proxy function properties', () => {
+      const config = {
+        items: [1, 2, 3]
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      // 确保数组方法可以正常调用
+      expect(typeof proxiedData.items.map).toBe('function')
+      expect(typeof proxiedData.items.filter).toBe('function')
+      expect(typeof proxiedData.items.reduce).toBe('function')
+    })
+
+    it('should handle Set operations from array', () => {
+      const config = {
+        bots: [
+          { context: 'sandbox', name: 'bot1' },
+          { context: 'process', name: 'bot2' },
+          { context: 'sandbox', name: 'bot3' }
+        ]
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      const proxiedData = loader.data
+      
+      // 模拟 setup.ts 中的操作
+      expect(() => {
+        const contexts = new Set(proxiedData.bots.map((bot: any) => bot.context))
+        expect(contexts.size).toBe(2)
+        expect(contexts.has('sandbox')).toBe(true)
+        expect(contexts.has('process')).toBe(true)
+      }).not.toThrow()
+    })
+  })
+
+  describe('Raw data access', () => {
+    it('should provide raw data without proxy', () => {
+      const config = {
+        value: '${TEST_VAR}'
+      }
+      
+      const loader = new ConfigLoader(testConfigPath, config)
+      
+      // raw 应该返回原始值，不解析环境变量
+      expect(loader.raw.value).toBe('${TEST_VAR}')
+      
+      // data 应该尝试解析环境变量
+      expect(loader.data.value).toBeTruthy()
+    })
   })
 })

package/tests/cron.test.ts

@@ -274,4 +274,15 @@ describe('Cron定时任务系统测试', () => {
       expect(mockCallback).toHaveBeenCalledTimes(1)
     })
   })
+
+  describe('Cron错误处理', () => {
+    it('should throw error for invalid cron expression that cannot determine next run', () => {
+      // 创建一个永远不会执行的 cron 表达式
+      // 例如：2月30日（不存在的日期）
+      expect(() => {
+        cron = new Cron('0 0 30 2 *', mockCallback)
+        cron.start()
+      }).toThrow()
+    })
+  })
 })

package/tests/jsx-runtime.test.ts

@@ -0,0 +1,45 @@
+import { describe, it, expect } from 'vitest'
+import * as jsxRuntime from '../src/jsx-runtime'
+import * as jsxDevRuntime from '../src/jsx-dev-runtime'
+
+describe('JSX Runtime', () => {
+  it('should export jsx function', () => {
+    expect(typeof jsxRuntime.jsx).toBe('function')
+  })
+
+  it('should export jsxs function', () => {
+    expect(typeof jsxRuntime.jsxs).toBe('function')
+  })
+
+  it('should export Fragment', () => {
+    expect(jsxRuntime.Fragment).toBeDefined()
+  })
+
+  it('should export renderJSX function', () => {
+    expect(typeof jsxRuntime.renderJSX).toBe('function')
+  })
+
+  it('should have default export', () => {
+    expect(jsxRuntime.default).toBeDefined()
+    expect(typeof jsxRuntime.default.jsx).toBe('function')
+    expect(typeof jsxRuntime.default.jsxs).toBe('function')
+  })
+})
+
+describe('JSX Dev Runtime', () => {
+  it('should export jsx function', () => {
+    expect(typeof jsxDevRuntime.jsx).toBe('function')
+  })
+
+  it('should export jsxDEV function', () => {
+    expect(typeof jsxDevRuntime.jsxDEV).toBe('function')
+  })
+
+  it('should export Fragment', () => {
+    expect(jsxDevRuntime.Fragment).toBeDefined()
+  })
+
+  it('should export renderJSX function', () => {
+    expect(typeof jsxDevRuntime.renderJSX).toBe('function')
+  })
+})