@zhin.js/http 1.0.7 → 1.0.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @zhin.js/http
 
+## 1.0.9
+
+### Patch Changes
+
+- d16a69c: fix: test trust publish
+- Updated dependencies [d16a69c]
+  - @zhin.js/schema@1.0.2
+  - zhin.js@1.0.18
+
 ## 1.0.7
 
 ### Patch Changes

package/lib/index.d.ts

@@ -1,12 +1,32 @@
+import { Schema } from "@zhin.js/schema";
 import { Server } from "http";
 import Koa from "koa";
 import { Router } from "./router.js";
 export * from "./router.js";
-declare module "@zhin.js/types" {
-    interface GlobalContext {
-        koa: Koa;
-        router: Router;
-        server: Server;
+declare module "zhin.js" {
+    namespace Plugin {
+        interface Contexts {
+            koa: Koa;
+            router: Router;
+            server: Server;
+        }
     }
 }
+export declare const httpSchema: Schema<{
+    port?: number | undefined;
+    username?: string | undefined;
+    password?: string | undefined;
+    base?: string | undefined;
+}, {
+    port?: number | undefined;
+    username?: string | undefined;
+    password?: string | undefined;
+    base?: string | undefined;
+}>;
+export interface HttpConfig {
+    port?: number;
+    username?: string;
+    password?: string;
+    base?: string;
+}
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,EAAgB,MAAM,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAGrC,cAAc,aAAa,CAAC;AAE5B,OAAO,QAAQ,gBAAgB,CAAC;IAC9B,UAAU,aAAa;QACrB,GAAG,EAAE,GAAG,CAAC;QACT,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB;CACF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAgB,MAAM,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,GAAG,MAAM,KAAK,CAAC;AAGtB,OAAO,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAEnD,cAAc,aAAa,CAAC;AAE5B,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAU,MAAM,CAAC;QACf,UAAU,QAAQ;YAChB,GAAG,EAAE,GAAG,CAAC;YACT,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,EAAE,MAAM,CAAC;SAChB;KACF;CACF;AAGD,eAAO,MAAM,UAAU;;;;;;;;;;EAWrB,CAAC;AAEH,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}

package/lib/index.js

@@ -1,54 +1,61 @@
-import { register, defineSchema, Schema, usePlugin, useApp, useDatabase, } from "@zhin.js/core";
+import { usePlugin, Adapter } from "zhin.js";
+import { Schema } from "@zhin.js/schema";
 import { createServer } from "http";
 import os from "node:os";
 import Koa from "koa";
 import auth from "koa-basic-auth";
-import KoaBodyParser from "koa-bodyparser";
+import body from "koa-body";
 import { Router } from "./router.js";
-import * as process from "process";
 export * from "./router.js";
-const plugin = usePlugin();
-const schema = defineSchema(Schema.object({
-    port: Schema.number("port").default(8086).description("HTTP 服务端口"),
-    username: Schema.string("username").description("HTTP 基本认证用户名, 默认为当前系统用户名"),
-    password: Schema.string("password").description("HTTP 基本认证密码, 默认为随机生成的6位字符串"),
-    base: Schema.string("base")
+// Schema 定义
+export const httpSchema = Schema.object({
+    port: Schema.number().default(8086).description("HTTP 服务端口"),
+    username: Schema.string().description("HTTP 基本认证用户名, 默认为当前系统用户名"),
+    password: Schema.string().description("HTTP 基本认证密码, 默认为随机生成的6位字符串"),
+    base: Schema.string()
         .default("/api")
         .description("HTTP 路由前缀, 默认为 /api"),
-}));
-const koa = new Koa();
-const server = createServer(koa.callback());
-const router = new Router(server, { prefix: process.env.routerPrefix || "" });
+});
 // 获取当前计算机登录用户名
 const getCurrentUsername = () => {
     try {
         return os.userInfo().username;
     }
     catch {
-        return "admin"; // 如果获取失败，使用默认用户名
+        return "admin";
     }
 };
 // 生成6位随机密码
 const generateRandomPassword = () => {
     const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    let result = "";
-    for (let i = 0; i < 6; i++) {
-        result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
+    return Array.from({ length: 6 }, () => chars.charAt(Math.floor(Math.random() * chars.length))).join("");
 };
-const { port = 8086, username = getCurrentUsername(), password = generateRandomPassword(), base = "/api", } = schema(plugin.config, "http");
-const app = useApp();
-koa.use(auth({
-    name: username,
-    pass: password,
-}));
-// ============================================================================
-// API 路由
-// ============================================================================
-// 系统状态 API
-router.get(`${base}/system/status`, async (ctx) => {
-    try {
+const { provide, root, useContext, logger } = usePlugin();
+// 创建实例
+const koa = new Koa();
+const server = createServer(koa.callback());
+const router = new Router(server, { prefix: process.env.routerPrefix || "" });
+// 注册 server 上下文
+provide({
+    name: "server",
+    description: "http server",
+    value: server,
+    dispose(s) {
+        s.close();
+    },
+});
+// 使用配置服务
+useContext("config", (configService) => {
+    const appConfig = configService.get("zhin.config.yml");
+    const httpConfig = appConfig.http || {};
+    const { port = 8086, username = getCurrentUsername(), password = generateRandomPassword(), base = "/api", } = httpConfig;
+    // 设置基本认证
+    koa.use(auth({ name: username, pass: password }));
+    // ============================================================================
+    // API 路由
+    // ============================================================================
+    // 系统状态 API
+    router.get(`${base}/system/status`, async (ctx) => {
         ctx.body = {
             success: true,
             data: {
@@ -61,319 +68,215 @@ router.get(`${base}/system/status`, async (ctx) => {
                 timestamp: new Date().toISOString(),
             },
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 健康检查 API
-router.get(`${base}/health`, async (ctx) => {
-    ctx.body = {
-        success: true,
-        status: "ok",
-        timestamp: new Date().toISOString(),
-    };
-});
-// 统计信息 API
-router.get(`${base}/stats`, async (ctx) => {
-    try {
-        // 统计插件数量
-        const pluginCount = app.dependencyList.length;
-        const activePluginCount = app.dependencyList.filter((dep) => dep.mounted).length;
+    });
+    // 健康检查 API
+    router.get(`${base}/health`, async (ctx) => {
+        ctx.body = {
+            success: true,
+            status: "ok",
+            timestamp: new Date().toISOString(),
+        };
+    });
+    // 统计信息 API
+    router.get(`${base}/stats`, async (ctx) => {
+        const allPlugins = root.children;
         // 统计机器人数量
         let botCount = 0;
         let onlineBotCount = 0;
-        for (const context of app.contextList) {
-            const adapter = app.getContext(context.name);
-            if (adapter && typeof adapter === "object" && "bots" in adapter) {
-                const adapterBots = adapter.bots;
-                if (adapterBots && adapterBots instanceof Map) {
-                    botCount += adapterBots.size;
-                    for (const bot of adapterBots.values()) {
-                        if (bot.$connected)
-                            onlineBotCount++;
-                    }
+        for (const adapterName of root.adapters) {
+            const adapter = root.inject(adapterName);
+            if (adapter instanceof Adapter) {
+                botCount += adapter.bots.size;
+                for (const bot of adapter.bots.values()) {
+                    if (bot.$connected)
+                        onlineBotCount++;
                 }
             }
         }
         // 统计命令和组件
-        let commandCount = 0;
-        let componentCount = 0;
-        for (const dep of app.dependencyList) {
-            commandCount += dep.commands.length;
-            componentCount += dep.components.size;
-        }
+        const commandService = root.inject("command");
+        const componentService = root.inject("component");
+        const commandCount = commandService?.items.length || 0;
+        const componentCount = componentService?.byName.size || 0;
         ctx.body = {
             success: true,
             data: {
-                plugins: { total: pluginCount, active: activePluginCount },
+                plugins: { total: allPlugins.length, active: allPlugins.length },
                 bots: { total: botCount, online: onlineBotCount },
                 commands: commandCount,
                 components: componentCount,
                 uptime: process.uptime(),
-                memory: process.memoryUsage().heapUsed / 1024 / 1024, // MB
+                memory: process.memoryUsage().heapUsed / 1024 / 1024,
             },
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 插件管理 API
-router.get(`${base}/plugins`, async (ctx) => {
-    try {
-        // 获取详细的插件数据
-        const plugins = app.dependencyList.map((dep) => {
+    });
+    // 插件列表 API
+    router.get(`${base}/plugins`, async (ctx) => {
+        const plugins = root.children.map((p) => {
+            const features = p.features;
             return {
-                name: dep.name,
-                status: dep.mounted ? "active" : "inactive",
-                commandCount: dep.commands.length,
-                componentCount: dep.components.size,
-                middlewareCount: dep.middlewares.length,
-                contextCount: dep.contexts.size,
-                description: dep.description || "无描述",
+                name: p.name,
+                status: "active",
+                // 向后兼容：返回各项数量
+                commandCount: features.commands.length,
+                componentCount: features.components.length,
+                middlewareCount: features.middlewares.length,
+                cronCount: features.crons.length,
+                contextCount: p.contexts.size,
+                filePath: p.filePath,
+                description: p.name,
+                // 新格式：也返回 features 对象
+                features,
             };
         });
         ctx.body = { success: true, data: plugins, total: plugins.length };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 插件详情 API
-router.get("/api/plugins/:name", async (ctx) => {
-    try {
+    });
+    // 插件详情 API
+    router.get(`${base}/plugins/:name`, async (ctx) => {
         const pluginName = ctx.params.name;
-        const plugin = app.dependencyList.find((dep) => dep.name === pluginName);
+        const plugin = root.children.find((p) => p.name === pluginName);
         if (!plugin) {
             ctx.status = 404;
             ctx.body = { success: false, error: "插件不存在" };
             return;
         }
-        // 获取命令详情
-        const commands = plugin.commands.map((cmd) => ({
+        const commandService = root.inject("command");
+        const commands = (commandService?.items || []).map((cmd) => ({
             name: cmd.pattern,
+            desc: cmd.helpInfo?.desc,
+            usage: cmd.helpInfo?.usage,
+            examples: cmd.helpInfo?.examples,
         }));
-        // 获取组件详情
-        const components = Array.from(plugin.components.entries()).map(([name, comp]) => ({
+        const contexts = Array.from(plugin.contexts.entries()).map(([name]) => ({
             name,
-            props: comp.props || {},
-            type: typeof comp,
         }));
-        // 获取中间件详情
-        const middlewares = plugin.middlewares.map((_, index) => ({
-            id: `middleware-${index}`,
-            type: "function",
-        }));
-        // 获取上下文详情
-        const contexts = Array.from(plugin.contexts.entries()).map(([name, ctx]) => ({
+        const features = plugin.features;
+        // 构建组件列表
+        const components = features.components.map((name) => ({
             name,
-            description: ctx.description || "无描述",
+            type: "component",
+            props: {},
         }));
-        // 获取定时任务详情
-        const crons = plugin.crons.map((cron, index) => ({
-            id: `cron-${index}`,
-            pattern: cron.pattern || "unknown",
-            running: cron.running || false,
+        // 构建中间件列表
+        const middlewares = features.middlewares.map((name, index) => ({
+            id: `middleware-${index}`,
+            type: name,
         }));
-        // 获取数据模型详情
-        const definitions = Array.from(plugin.definitions.entries()).map(([name, definition]) => ({
-            name,
-            fields: Object.keys(definition),
+        // 构建定时任务列表
+        const crons = features.crons.map((expression, index) => ({
+            id: `cron-${index}`,
+            pattern: expression,
+            running: true,
         }));
         ctx.body = {
             success: true,
             data: {
                 name: plugin.name,
-                filename: plugin.filename,
-                status: plugin.mounted ? "active" : "inactive",
-                description: plugin.description || "无描述",
+                filename: plugin.filePath,
+                filePath: plugin.filePath,
+                status: "active",
+                description: plugin.name,
+                features,
+                contexts,
                 commands,
                 components,
                 middlewares,
-                contexts,
                 crons,
-                definitions,
+                definitions: [],
                 statistics: {
-                    commandCount: commands.length,
-                    componentCount: components.length,
-                    middlewareCount: middlewares.length,
+                    commandCount: features.commands.length,
+                    componentCount: features.components.length,
                     contextCount: contexts.length,
-                    cronCount: crons.length,
-                    definitionCount: definitions.length,
+                    cronCount: features.crons.length,
+                    middlewareCount: features.middlewares.length,
+                    definitionCount: 0,
                 },
             },
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 适配器和机器人状态 API
-router.get(`${base}/bots`, async (ctx) => {
-    try {
+    });
+    // 机器人列表 API
+    router.get(`${base}/bots`, async (ctx) => {
         const bots = [];
-        // 遍历所有上下文，查找适配器
-        for (const context of app.contextList) {
-            const adapter = app.getContext(context.name);
-            if (adapter && typeof adapter === "object" && "bots" in adapter) {
-                const adapterBots = adapter.bots;
-                if (adapterBots && adapterBots instanceof Map) {
-                    for (const [botName, bot] of adapterBots.entries()) {
-                        bots.push({
-                            name: botName,
-                            adapter: context.name,
-                            connected: bot.$connected || false,
-                            status: bot.$connected ? "online" : "offline",
-                            // 移除 config 字段以保护隐私
-                        });
-                    }
+        for (const name of root.adapters) {
+            const adapter = root.inject(name);
+            if (adapter instanceof Adapter) {
+                for (const [botName, bot] of adapter.bots.entries()) {
+                    bots.push({
+                        name: botName,
+                        adapter: name,
+                        connected: bot.$connected || false,
+                        status: bot.$connected ? "online" : "offline",
+                    });
                 }
             }
         }
         ctx.body = { success: true, data: bots, total: bots.length };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 框架配置信息 API
-router.get(`${base}/config`, async (ctx) => {
-    try {
-        const config = app.getConfig();
-        ctx.body = { success: true, data: config };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 获取所有插件的 Schema API
-router.get(`${base}/schemas`, async (ctx) => {
-    try {
-        const schemas = {};
-        // 获取 App 的 Schema
-        const appSchema = app.schema.toJSON();
-        if (appSchema) {
-            schemas["app"] = appSchema;
-        }
-        // 获取所有插件的 Schema
-        for (const plugin of app.dependencyList) {
-            const schema = plugin.schema.toJSON();
-            if (schema) {
-                schemas[plugin.name] = schema;
-            }
-        }
-        ctx.body = {
-            success: true,
-            data: schemas,
-            total: Object.keys(schemas).length,
-        };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 获取单个插件的 Schema API
-router.get(`${base}/schemas/:name`, async (ctx) => {
-    try {
-        const { name } = ctx.params;
-        if (name === "app") {
-            const schema = app.schema?.toJSON();
-            if (!schema) {
-                ctx.status = 404;
-                ctx.body = { success: false, error: "App schema not found" };
-                return;
-            }
-            ctx.body = { success: true, data: schema };
-            return;
-        }
-        const plugin = app.findPluginByName(name);
-        if (!plugin) {
-            ctx.status = 404;
-            ctx.body = { success: false, error: `Plugin ${name} not found` };
-            return;
-        }
-        const schema = plugin.schema.toJSON();
-        if (!schema) {
-            ctx.status = 404;
-            ctx.body = {
-                success: false,
-                error: `Schema for plugin ${name} not found`,
-            };
-            return;
-        }
-        ctx.body = { success: true, data: schema };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 获取插件配置 API
-router.get(`${base}/config/:name`, async (ctx) => {
-    try {
+    });
+    // 配置 API
+    router.get(`${base}/config`, async (ctx) => {
+        ctx.body = { success: true, data: configService.get("zhin.config.yml") };
+    });
+    router.get(`${base}/config/:name`, async (ctx) => {
         const { name } = ctx.params;
         if (name === "app") {
-            const config = app.getConfig();
-            ctx.body = { success: true, data: config };
+            ctx.body = { success: true, data: configService.get("zhin.config.yml") };
             return;
         }
-        const plugin = app.findPluginByName(name);
+        const plugin = root.children.find((p) => p.name === name);
         if (!plugin) {
             ctx.status = 404;
             ctx.body = { success: false, error: `Plugin ${name} not found` };
             return;
         }
-        const config = plugin.config;
-        ctx.body = { success: true, data: config };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 更新插件配置 API
-router.post(`${base}/config/:name`, async (ctx) => {
-    try {
+        ctx.body = {
+            success: true,
+            data: { name: plugin.name, filePath: plugin.filePath },
+        };
+    });
+    router.post(`${base}/config/:name`, async (ctx) => {
         const { name } = ctx.params;
-        const newConfig = ctx.request.body;
         if (name === "app") {
-            app.config = newConfig;
             ctx.body = {
                 success: true,
-                message: "App configuration updated successfully",
-                data: app.getConfig(),
+                message: "App configuration update not implemented yet",
             };
             return;
         }
-        const plugin = app.findPluginByName(name);
+        const plugin = root.children.find((p) => p.name === name);
         if (!plugin) {
             ctx.status = 404;
             ctx.body = { success: false, error: `Plugin ${name} not found` };
             return;
         }
-        plugin.config = newConfig;
         ctx.body = {
             success: true,
-            message: `Plugin ${name} configuration updated successfully`,
-            data: plugin.config,
+            message: "Plugin configuration update not implemented yet",
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 消息发送 API
-router.post(`${base}/message/send`, async (ctx) => {
-    try {
+    });
+    // Schema API - 获取所有插件 Schema
+    router.get(`${base}/schemas`, async (ctx) => {
+        const schemaService = root.inject('schema');
+        const schemas = {};
+        if (schemaService) {
+            for (const [name, schema] of schemaService.items.entries()) {
+                schemas[name] = schema.toJSON();
+            }
+        }
+        ctx.body = { success: true, data: schemas };
+    });
+    // Schema API - 获取单个插件 Schema
+    router.get(`${base}/schema/:name`, async (ctx) => {
+        const schemaService = root.inject('schema');
+        const { name } = ctx.params;
+        const schema = schemaService?.get(name);
+        if (!schema) {
+            ctx.body = { success: true, data: null };
+            return;
+        }
+        ctx.body = { success: true, data: schema.toJSON() };
+    });
+    // 消息发送 API
+    router.post(`${base}/message/send`, async (ctx) => {
         const body = ctx.request.body;
         const { context, bot, id, type, content } = body;
         if (!context || !bot || !id || !type || !content) {
@@ -384,8 +287,6 @@ router.post(`${base}/message/send`, async (ctx) => {
             };
             return;
         }
-        // 模拟发送消息（实际环境中会调用应用实例的sendMessage方法）
-        // console.log 已替换为注释
         ctx.body = {
             success: true,
             message: "Message sent successfully",
@@ -398,112 +299,85 @@ router.post(`${base}/message/send`, async (ctx) => {
                 timestamp: new Date().toISOString(),
             },
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 日志 API - 获取日志
-router.get(`${base}/logs`, async (ctx) => {
-    try {
-        const database = useDatabase();
-        if (!database) {
-            ctx.status = 503;
-            ctx.body = { success: false, error: "Database not available" };
+    });
+    server.listen({ host: "127.0.0.1", port }, () => {
+        const address = server.address();
+        if (!address)
             return;
-        }
-        // 获取查询参数
+        const visitAddress = typeof address === "string"
+            ? address
+            : `localhost:${address.port}`;
+        const apiUrl = `http://${visitAddress}${base}`;
+        logger.info("╔════════════════════════════════════════╗");
+        logger.info("║      HTTP 服务已启动                  ║");
+        logger.info("╠════════════════════════════════════════╣");
+        logger.info(`║  监听端口: ${port.toString().padEnd(32)}║`);
+        logger.info(`║  API 地址: ${apiUrl.padEnd(32)}║`);
+        logger.info(`║  基础认证: ${username.padEnd(32)}║`);
+        logger.info(`║  密码:     ${password.padEnd(32)}║`);
+        logger.info("╚════════════════════════════════════════╝");
+    });
+});
+// 使用数据库服务（可选）
+useContext("database", (database) => {
+    const configService = root.inject("config");
+    const appConfig = configService.get("zhin.config.yml");
+    const base = appConfig.http?.base || "/api";
+    // 日志 API - 获取日志
+    router.get(`${base}/logs`, async (ctx) => {
         const limit = parseInt(ctx.query.limit) || 100;
         const level = ctx.query.level;
-        const LogModel = database.model("SystemLog");
+        const LogModel = database.models.get("SystemLog");
         if (!LogModel) {
             ctx.status = 500;
             ctx.body = { success: false, error: "SystemLog model not found" };
             return;
         }
-        // 查询日志
         let selection = LogModel.select();
-        // 按级别过滤
         if (level && level !== "all") {
             selection = selection.where({ level });
         }
-        // 按时间倒序，限制数量
         const logs = await selection.orderBy("timestamp", "DESC").limit(limit);
-        // 格式化返回数据
-        const formattedLogs = logs.map((log) => ({
-            level: log.level,
-            name: log.name,
-            message: log.message,
-            source: log.source,
-            timestamp: log.timestamp instanceof Date
-                ? log.timestamp.toISOString()
-                : log.timestamp,
-        }));
         ctx.body = {
             success: true,
-            data: formattedLogs,
-            total: formattedLogs.length,
+            data: logs.map((log) => ({
+                level: log.level,
+                name: log.name,
+                message: log.message,
+                source: log.source,
+                timestamp: log.timestamp instanceof Date
+                    ? log.timestamp.toISOString()
+                    : log.timestamp,
+            })),
+            total: logs.length,
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 日志 API - 清空日志
-router.delete(`${base}/logs`, async (ctx) => {
-    try {
-        const database = useDatabase();
-        if (!database) {
-            ctx.status = 503;
-            ctx.body = { success: false, error: "Database not available" };
-            return;
-        }
-        const LogModel = database.model("SystemLog");
+    });
+    // 日志 API - 清空日志
+    router.delete(`${base}/logs`, async (ctx) => {
+        const LogModel = database.models.get("SystemLog");
         if (!LogModel) {
             ctx.status = 500;
             ctx.body = { success: false, error: "SystemLog model not found" };
             return;
         }
-        // 删除所有日志
         await LogModel.delete({});
-        ctx.body = {
-            success: true,
-            message: "日志已清空",
-        };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 日志 API - 获取日志统计
-router.get(`${base}/logs/stats`, async (ctx) => {
-    try {
-        const database = useDatabase();
-        if (!database) {
-            ctx.status = 503;
-            ctx.body = { success: false, error: "Database not available" };
-            return;
-        }
-        const LogModel = database.model("SystemLog");
+        ctx.body = { success: true, message: "日志已清空" };
+    });
+    // 日志统计 API
+    router.get(`${base}/logs/stats`, async (ctx) => {
+        const LogModel = database.models.get("SystemLog");
         if (!LogModel) {
             ctx.status = 500;
             ctx.body = { success: false, error: "SystemLog model not found" };
             return;
         }
-        // 获取总日志数
         const total = await LogModel.select();
-        const totalCount = total.length;
-        // 获取各级别日志数
         const levels = ["info", "warn", "error"];
         const levelCounts = {};
         for (const level of levels) {
             const count = await LogModel.select().where({ level });
             levelCounts[level] = count.length;
         }
-        // 获取最旧日志时间
         const oldestLog = await LogModel.select("timestamp")
             .orderBy("timestamp", "ASC")
             .limit(1);
@@ -514,28 +388,12 @@ router.get(`${base}/logs/stats`, async (ctx) => {
             : null;
         ctx.body = {
             success: true,
-            data: {
-                total: totalCount,
-                byLevel: levelCounts,
-                oldestTimestamp,
-            },
+            data: { total: total.length, byLevel: levelCounts, oldestTimestamp },
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// 日志 API - 清理旧日志（手动触发）
-router.post(`${base}/logs/cleanup`, async (ctx) => {
-    try {
-        const database = useDatabase();
-        if (!database) {
-            ctx.status = 503;
-            ctx.body = { success: false, error: "Database not available" };
-            return;
-        }
-        const LogModel = database.model("SystemLog");
+    });
+    // 日志清理 API
+    router.post(`${base}/logs/cleanup`, async (ctx) => {
+        const LogModel = database.models.get("SystemLog");
         if (!LogModel) {
             ctx.status = 500;
             ctx.body = { success: false, error: "SystemLog model not found" };
@@ -543,27 +401,25 @@ router.post(`${base}/logs/cleanup`, async (ctx) => {
         }
         const { days, maxRecords } = ctx.request.body || {};
         let deletedCount = 0;
-        // 按天数清理
         if (days && typeof days === "number" && days > 0) {
             const cutoffDate = new Date();
             cutoffDate.setDate(cutoffDate.getDate() - days);
             const deleted = await LogModel.delete({ timestamp: { $lt: cutoffDate } });
-            deletedCount += deleted || 0;
+            deletedCount +=
+                typeof deleted === "number" ? deleted : deleted?.length || 0;
         }
-        // 按数量清理
         if (maxRecords && typeof maxRecords === "number" && maxRecords > 0) {
-            const totalCount = await LogModel.select();
-            if (totalCount.length > maxRecords) {
-                const excessCount = totalCount - maxRecords;
+            const totalLogs = await LogModel.select();
+            if (totalLogs.length > maxRecords) {
+                const excessCount = totalLogs.length - maxRecords;
                 const oldestLogs = await LogModel.select("id", "timestamp")
                     .orderBy("timestamp", "ASC")
                     .limit(excessCount);
                 const idsToDelete = oldestLogs.map((log) => log.id);
                 if (idsToDelete.length > 0) {
-                    const deleted = await LogModel
-                        .delete()
-                        .where({ id: { $in: idsToDelete } });
-                    deletedCount += deleted || 0;
+                    const deleted = await LogModel.delete({ id: { $in: idsToDelete } });
+                    deletedCount +=
+                        typeof deleted === "number" ? deleted : deleted?.length || 0;
                 }
             }
         }
@@ -572,50 +428,19 @@ router.post(`${base}/logs/cleanup`, async (ctx) => {
             message: `已清理 ${deletedCount} 条日志`,
             deletedCount,
         };
-    }
-    catch (error) {
-        ctx.status = 500;
-        ctx.body = { success: false, error: error.message };
-    }
-});
-// ============================================================================
-// 上下文注册
-// ============================================================================
-register({
-    name: "server",
-    description: "http server",
-    mounted(p) {
-        return new Promise((resolve) => {
-            server.listen({
-                host: "0.0.0.0",
-                port: port,
-            }, () => {
-                const address = server.address();
-                if (!address)
-                    return;
-                const visitAddress = typeof address === "string"
-                    ? address
-                    : `${address.address}:${address.port}`;
-                p.logger.info(`server is running at http://${visitAddress}`);
-                p.logger.info("your username is：", username);
-                p.logger.info("your password is：", password);
-                resolve(server);
-            });
-        });
-    },
-    dispose(s) {
-        s.close();
-    },
+    });
 });
-register({
+// 注册 koa 和 router 上下文
+provide({
     name: "koa",
     description: "koa instance",
     value: koa,
 });
-register({
+provide({
     name: "router",
     description: "koa router",
     value: router,
 });
-koa.use(KoaBodyParser()).use(router.routes()).use(router.allowedMethods());
+// 应用中间件
+koa.use(body()).use(router.routes()).use(router.allowedMethods());
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoB,OAAO,EAAqB,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAU,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,gBAAgB,CAAC;AAClC,OAAO,IAAwC,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AAEnD,cAAc,aAAa,CAAC;AAY5B,YAAY;AACZ,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CACnC,0BAA0B,CAC3B;IACD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,WAAW,CACnC,4BAA4B,CAC7B;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE;SAClB,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,qBAAqB,CAAC;CACtC,CAAC,CAAC;AASH,eAAe;AACf,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC,CAAC;AAEF,WAAW;AACX,MAAM,sBAAsB,GAAG,GAAG,EAAE;IAClC,MAAM,KAAK,GACT,gEAAgE,CAAC;IACnE,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,CACpC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CACvD,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAAC;AAE1D,OAAO;AACP,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;AACtB,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC5C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC,CAAC;AAE9E,gBAAgB;AAChB,OAAO,CAAC;IACN,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,aAAa;IAC1B,KAAK,EAAE,MAAM;IACb,OAAO,CAAC,CAAC;QACP,CAAC,CAAC,KAAK,EAAE,CAAC;IACZ,CAAC;CACF,CAAC,CAAC;AAEH,SAAS;AACT,UAAU,CAAC,QAAQ,EAAE,CAAC,aAAa,EAAE,EAAE;IACrC,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAwB,iBAAiB,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC;IACxC,MAAM,EACJ,IAAI,GAAG,IAAI,EACX,QAAQ,GAAG,kBAAkB,EAAE,EAC/B,QAAQ,GAAG,sBAAsB,EAAE,EACnC,IAAI,GAAG,MAAM,GACd,GAAG,UAAU,CAAC;IAEf,SAAS;IACT,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAElD,+EAA+E;IAC/E,SAAS;IACT,+EAA+E;IAE/E,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAChD,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;gBACxB,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE;gBAC7B,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE;gBACvB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,WAAW,EAAE,OAAO,CAAC,OAAO;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACzC,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEjC,UAAU;QACV,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxC,MAAM,OAAO,GAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YACtC,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;gBAC/B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC9B,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;oBACxC,IAAI,GAAG,CAAC,UAAU;wBAAE,cAAc,EAAE,CAAC;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;QAED,UAAU;QACV,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,cAAc,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,gBAAgB,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC;QAE1D,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,OAAO,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE;gBAChE,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE;gBACjD,QAAQ,EAAE,YAAY;gBACtB,UAAU,EAAE,cAAc;gBAC1B,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE;gBACxB,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,GAAG,IAAI,GAAG,IAAI;aACrD;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;YAC5B,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,MAAM,EAAE,QAAQ;gBAChB,cAAc;gBACd,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;gBACtC,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM;gBAC1C,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM;gBAC5C,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM;gBAChC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI;gBAC7B,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,WAAW,EAAE,CAAC,CAAC,IAAI;gBACnB,sBAAsB;gBACtB,QAAQ;aACT,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAChD,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAEhE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAQ,EAAE,EAAE,CAAC,CAAC;YAChE,IAAI,EAAE,GAAG,CAAC,OAAO;YACjB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI;YACxB,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,KAAK;YAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,QAAQ;SACjC,CAAC,CAAC,CAAC;QAEJ,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACtE,IAAI;SACL,CAAC,CAAC,CAAC;QACJ,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAEjC,SAAS;QACT,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACpD,IAAI;YACJ,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,EAAE;SACV,CAAC,CAAC,CAAC;QAEJ,UAAU;QACV,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7D,EAAE,EAAE,cAAc,KAAK,EAAE;YACzB,IAAI,EAAE,IAAI;SACX,CAAC,CAAC,CAAC;QAEJ,WAAW;QACX,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACvD,EAAE,EAAE,QAAQ,KAAK,EAAE;YACnB,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,CAAC;QAEJ,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,MAAM,CAAC,IAAI;gBACxB,QAAQ;gBACR,QAAQ;gBACR,QAAQ;gBACR,UAAU;gBACV,WAAW;gBACX,KAAK;gBACL,WAAW,EAAE,EAAE;gBACf,UAAU,EAAE;oBACV,YAAY,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM;oBACtC,cAAc,EAAE,QAAQ,CAAC,UAAU,CAAC,MAAM;oBAC1C,YAAY,EAAE,QAAQ,CAAC,MAAM;oBAC7B,SAAS,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM;oBAChC,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM;oBAC5C,eAAe,EAAE,CAAC;iBACnB;aACF;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,YAAY;IACZ,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAOvC,MAAM,IAAI,GAAc,EAAE,CAAC;QAE3B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClC,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;gBAC/B,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;oBACpD,IAAI,CAAC,IAAI,CAAC;wBACR,IAAI,EAAE,OAAO;wBACb,OAAO,EAAE,IAAI;wBACb,SAAS,EAAE,GAAG,CAAC,UAAU,IAAI,KAAK;wBAClC,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;qBAC9C,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,SAAS;IACT,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACzC,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,eAAe,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC/C,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAE5B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACzE,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE;SACvD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,eAAe,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAChD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAE5B,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,GAAG;gBACT,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,8CAA8C;aACxD,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,IAAI,YAAY,EAAE,CAAC;YACjE,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,iDAAiD;SAC3D,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAe,CAAC,CAAC;QACnD,MAAM,OAAO,GAAwB,EAAE,CAAC;QACxC,IAAI,aAAa,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAK,aAAqB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBACpE,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,6BAA6B;IAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,eAAe,EAAE,KAAK,EAAE,GAAiB,EAAE,EAAE;QAC7D,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAe,CAAC,CAAC;QACnD,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAC5B,MAAM,MAAM,GAAI,aAAqB,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YACzC,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,eAAe,EAAE,KAAK,EAAE,GAAiB,EAAE,EAAE;QAQ9D,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,IAAuB,CAAC;QACjD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QAEjD,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjD,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG;gBACT,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,0DAA0D;aAClE,CAAC;YACF,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,2BAA2B;YACpC,IAAI,EAAE;gBACJ,OAAO;gBACP,GAAG;gBACH,EAAE;gBACF,IAAI;gBACJ,OAAO;gBACP,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE;QAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,MAAM,YAAY,GAChB,OAAO,OAAO,KAAK,QAAQ;YACzB,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,aAAa,OAAO,CAAC,IAAI,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG,UAAU,YAAY,GAAG,IAAI,EAAE,CAAC;QAE/C,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,cAAc,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,YAAY,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAChD,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,cAAc;AACd,UAAU,CAAC,UAAU,EAAE,CAAC,QAA+B,EAAE,EAAE;IACzD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAwB,iBAAiB,CAAC,CAAC;IAC9E,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC;IAE5C,gBAAgB;IAChB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,IAAI,GAAG,CAAC;QACzD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC;QAExC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,KAAK,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YAC7B,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAEvE,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAc,EAAE,EAAE,CAAC,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAC,KAAK;gBAChB,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,SAAS,EACP,GAAG,CAAC,SAAS,YAAY,IAAI;oBAC3B,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE;oBAC7B,CAAC,CAAC,GAAG,CAAC,SAAS;aACpB,CAAC,CAAC;YACH,KAAK,EAAE,IAAI,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,gBAAgB;IAChB,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC1B,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,aAAa,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAC7C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,WAAW,GAA2B,EAAE,CAAC;QAE/C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACvD,WAAW,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC;QACpC,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC;aACjD,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;aAC3B,KAAK,CAAC,CAAC,CAAC,CAAC;QACZ,MAAM,eAAe,GACnB,SAAS,CAAC,MAAM,GAAG,CAAC;YAClB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,YAAY,IAAI;gBACtC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE;gBACtC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YAC1B,CAAC,CAAC,IAAI,CAAC;QAEX,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE;SACrE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,eAAe,EAAE,KAAK,EAAE,GAAiB,EAAE,EAAE;QAC9D,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GACvB,GAAG,CAAC,OAAO,CAAC,IAA+C,IAAI,EAAE,CAAC;QACrE,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC9B,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;YAC1E,YAAY;gBACV,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;YACnE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1C,IAAI,SAAS,CAAC,MAAM,GAAG,UAAU,EAAE,CAAC;gBAClC,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,GAAG,UAAU,CAAC;gBAClD,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;qBACxD,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;qBAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;gBACtB,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAChC,CAAC,GAAwC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CACrD,CAAC;gBAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;oBACpE,YAAY;wBACV,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;QACH,CAAC;QAED,GAAG,CAAC,IAAI,GAAG;YACT,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,OAAO,YAAY,MAAM;YAClC,YAAY;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,sBAAsB;AACtB,OAAO,CAAC;IACN,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,cAAc;IAC3B,KAAK,EAAE,GAAG;CACX,CAAC,CAAC;AAEH,OAAO,CAAC;IACN,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,YAAY;IACzB,KAAK,EAAE,MAAM;CACd,CAAC,CAAC;AACH,QAAQ;AACR,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC"}

package/lib/router.d.ts

@@ -1,17 +1,22 @@
-import { Layer, RouterOptions } from '@koa/router';
-import KoaRouter from "@koa/router";
-import * as http from 'http';
-import { ServerOptions, WebSocketServer } from 'ws';
+import { Layer, RouterOptions } from "@koa/router";
+import KoaRouter, { RouterContext as KoaRouterContext } from "@koa/router";
+import * as http from "http";
+import { ServerOptions, WebSocketServer } from "ws";
 type Path = string | RegExp;
+export type RouterContext = KoaRouterContext & {
+    request: Request & {
+        body: any;
+    };
+};
 export declare class Router extends KoaRouter {
     server: http.Server;
     wsStack: WebSocketServer[];
     whiteList: Path[];
     constructor(server: http.Server, options?: RouterOptions);
-    register(...args: Parameters<KoaRouter['register']>): Layer;
+    register(...args: Parameters<KoaRouter["register"]>): ReturnType<KoaRouter["register"]>;
     destroy(layer: Layer): void;
     destroyWs(wsServer: WebSocketServer): void;
-    ws(path: string, options?: Omit<ServerOptions, 'noServer' | 'path'>): WebSocketServer;
+    ws(path: string, options?: Omit<ServerOptions, "noServer" | "path">): WebSocketServer;
 }
 export {};
 //# sourceMappingURL=router.d.ts.map

package/lib/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAGpD,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;AAE5B,qBAAa,MAAO,SAAQ,SAAS;IAI1B,MAAM,EAAE,IAAI,CAAC,MAAM;IAH5B,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,SAAS,EAAE,IAAI,EAAE,CAAM;gBAEd,MAAM,EAAE,IAAI,CAAC,MAAM,EAC1B,OAAO,CAAC,EAAE,aAAa;IAKzB,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAMnD,OAAO,CAAC,KAAK,EAAE,KAAK;IAIpB,SAAS,CAAC,QAAQ,EAAE,eAAe;IAKnC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,IAAI,CAAC,aAAa,EAAE,UAAU,GAAG,MAAM,CAAM,GAAG,eAAe;CAoB1F"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,SAAS,EAAE,EAAE,aAAa,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAGpD,KAAK,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;AAW5B,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG;IAC3C,OAAO,EAAE,OAAO,GAAG;QACf,IAAI,EAAE,GAAG,CAAC;KACb,CAAC;CACL,CAAC;AACF,qBAAa,MAAO,SAAQ,SAAS;IAIhB,MAAM,EAAE,IAAI,CAAC,MAAM;IAHtC,OAAO,EAAE,eAAe,EAAE,CAAM;IAChC,SAAS,EAAE,IAAI,EAAE,CAAM;gBAEJ,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa;IAI/D,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAMvF,OAAO,CAAC,KAAK,EAAE,KAAK;IAIpB,SAAS,CAAC,QAAQ,EAAE,eAAe;IAKnC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,IAAI,CAAC,aAAa,EAAE,UAAU,GAAG,MAAM,CAAM,GAAG,eAAe;CAoB1F"}

package/lib/router.js

@@ -1,11 +1,19 @@
-import { remove } from '@zhin.js/core';
 import KoaRouter from "@koa/router";
-import { WebSocketServer } from 'ws';
-import { parse } from 'url';
+import { WebSocketServer } from "ws";
+import { parse } from "url";
+// 工具函数：从数组中移除元素
+const remove = (arr, item) => {
+    const index = arr.indexOf(item);
+    if (index !== -1) {
+        arr.splice(index, 1);
+        return true;
+    }
+    return false;
+};
 export class Router extends KoaRouter {
     server;
     wsStack = [];
-    whiteList = []; //用于historyApi排除
+    whiteList = [];
     constructor(server, options) {
         super(options);
         this.server = server;
@@ -29,14 +37,14 @@ export class Router extends KoaRouter {
             ...options,
         });
         this.wsStack.push(wsServer);
-        this.server.on('upgrade', (request, socket, head) => {
+        this.server.on("upgrade", (request, socket, head) => {
             const { pathname } = parse(request.url);
-            if (this.wsStack.findIndex(wss => wss.options.path === path) === -1) {
+            if (this.wsStack.findIndex((wss) => wss.options.path === path) === -1) {
                 socket.destroy();
             }
             else if (pathname === path) {
-                wsServer.handleUpgrade(request, socket, head, ws => {
-                    wsServer.emit('connection', ws, request);
+                wsServer.handleUpgrade(request, socket, head, (ws) => {
+                    wsServer.emit("connection", ws, request);
                 });
             }
         });

package/lib/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAiB,eAAe,EAAE,MAAM,IAAI,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC;AAI5B,MAAM,OAAO,MAAO,SAAQ,SAAS;IAI1B;IAHT,OAAO,GAAsB,EAAE,CAAC;IAChC,SAAS,GAAW,EAAE,CAAC,CAAC,gBAAgB;IACxC,YACS,MAAmB,EAC1B,OAAuB;QAEvB,KAAK,CAAC,OAAO,CAAC,CAAC;QAHR,WAAM,GAAN,MAAM,CAAa;IAI5B,CAAC;IAED,QAAQ,CAAC,GAAG,IAAuC;QACjD,MAAM,IAAI,GAAS,IAAI,CAAC,CAAC,CAAQ,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,KAAY;QAClB,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,SAAS,CAAC,QAAyB;QACjC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,EAAE,CAAC,IAAY,EAAE,UAAoD,EAAE;QACrE,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,QAAQ,EAAE,IAAI;YACd,IAAI;YACJ,GAAG,OAAO;SACX,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YACnD,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAI,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACpE,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;iBAAM,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC7B,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE;oBACjD,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AACA,OAAO,SAAgD,MAAM,aAAa,CAAC;AAE3E,OAAO,EAAiB,eAAe,EAAE,MAAM,IAAI,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,CAAC;AAI5B,gBAAgB;AAChB,MAAM,MAAM,GAAG,CAAI,GAAQ,EAAE,IAAO,EAAW,EAAE;IAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAMF,MAAM,OAAO,MAAO,SAAQ,SAAS;IAIhB;IAHnB,OAAO,GAAsB,EAAE,CAAC;IAChC,SAAS,GAAW,EAAE,CAAC;IAEvB,YAAmB,MAAmB,EAAE,OAAuB;QAC7D,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,WAAM,GAAN,MAAM,CAAa;IAEtC,CAAC;IAED,QAAQ,CAAC,GAAG,IAAuC;QACjD,MAAM,IAAI,GAAS,IAAI,CAAC,CAAC,CAAQ,CAAC;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,KAAY;QAClB,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,SAAS,CAAC,QAAyB;QACjC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,EAAE,CAAC,IAAY,EAAE,UAAoD,EAAE;QACrE,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,QAAQ,EAAE,IAAI;YACd,IAAI;YACJ,GAAG,OAAO;SACX,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;YAClD,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAI,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBACtE,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;iBAAM,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC7B,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE;oBACnD,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/http",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Zhin机器人框架HTTP工具",
   "type": "module",
   "main": "./lib/index.js",
@@ -8,6 +8,7 @@
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
+      "development": "./src/index.ts",
       "import": "./lib/index.js"
     }
   },
@@ -25,21 +26,21 @@
   },
   "dependencies": {
     "@koa/router": "latest",
-    "koa": "latest",
+    "koa": "^3.1.1",
     "ws": "^8.18.3",
     "koa-basic-auth": "latest",
-    "koa-bodyparser": "latest"
+    "koa-body": "latest",
+    "@zhin.js/schema": "1.0.2"
   },
   "peerDependencies": {
-    "@zhin.js/core": "^1.0.14"
+    "zhin.js": "1.0.18"
   },
   "devDependencies": {
     "@types/koa": "latest",
     "@types/koa-basic-auth": "latest",
     "@types/koa-bodyparser": "latest",
     "@types/koa__router": "latest",
-    "@types/ws": "latest",
-    "@zhin.js/types": "^1.0.5"
+    "@types/ws": "latest"
   },
   "files": [
     "lib",