alemonjs 2.1.0-alpha.45 → 2.1.0-alpha.46

package/lib/adapter.js

@@ -109,14 +109,5 @@ function startAdapterWithFallback() {
     };
     startByFork();
 }
-['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-    process?.on?.(sig, () => {
-        logger?.info?.(`[${sig}] 收到信号，正在关闭...`);
-        setImmediate(() => process.exit(0));
-    });
-});
-process?.on?.('exit', (code) => {
-    logger?.info?.(`[exit] 进程退出，code=${code}`);
-});
 
 export { startAdapterWithFallback };

package/lib/cbp/router-middleware.js

@@ -0,0 +1,51 @@
+import { existsSync } from 'fs';
+import path, { dirname } from 'path';
+
+/**
+ * 递归向上查找所有目录级 _middleware 文件
+ * 支持 .ts/.js/.cjs/.mjs/.tsx/.jsx
+ * 按目录从上到下顺序合成
+ */
+async function collectMiddlewares(routeFile) {
+    const middlewares = [];
+    let dir = dirname(routeFile);
+    // 支持的后缀
+    const suffixes = ['.ts', '.js', '.cjs', '.mjs', '.tsx', '.jsx'];
+    while (true) {
+        for (const ext of suffixes) {
+            const mwPath = path.join(dir, `_middleware${ext}`);
+            if (existsSync(mwPath)) {
+                const mw = (await import(`file://${mwPath}`)).default;
+                if (typeof mw === 'function') {
+                    middlewares.unshift(mw);
+                }
+            }
+        }
+        const parent = dirname(dir);
+        if (parent === dir) {
+            break;
+        }
+        dir = parent;
+    }
+    return middlewares;
+}
+/**
+ * 依次执行中间件链，最后执行 handler
+ * 如果有任意中间件或 handler 抛错，自动捕获并处理
+ */
+async function runMiddlewares(middlewares, ctx, handler) {
+    let idx = 0;
+    async function dispatch() {
+        if (idx < middlewares.length) {
+            // 执行下一个中间件
+            await middlewares[idx++](ctx, dispatch);
+        }
+        else {
+            // 执行最终 handler
+            await handler(ctx);
+        }
+    }
+    await dispatch();
+}
+
+export { collectMiddlewares, runMiddlewares };

package/lib/cbp/router-utils.js

@@ -0,0 +1,40 @@
+import fs, { existsSync } from 'fs';
+
+// 输入一个文件路径。
+const getModuelFile = (dir) => {
+    const dirMap = {
+        '.js': `${dir}.js`,
+        '.jsx': `${dir}.jsx`,
+        '.mjs': `${dir}.mjs`,
+        '.cjs': `${dir}.cjs`,
+        '/index.js': `${dir}/index.js`,
+        '/index.jsx': `${dir}/index.jsx`,
+        '/index.mjs': `${dir}/index.mjs`,
+        '/index.cjs': `${dir}/index.cjs`,
+        '.ts': `${dir}.ts`,
+        '.tsx': `${dir}.tsx`,
+        '/index.ts': `${dir}/index.ts`,
+        '/index.tsx': `${dir}/index.tsx`
+    };
+    for (const key in dirMap) {
+        const filePath = dirMap[key];
+        if (existsSync(filePath) && fs.statSync(filePath)) {
+            return filePath;
+        }
+    }
+    return '';
+};
+const formatPath = (path) => {
+    if (!path || path === '/') {
+        return '/index.html';
+    }
+    const pates = path.split('/');
+    const lastPath = pates[pates.length - 1];
+    if (lastPath.includes('.')) {
+        return path;
+    }
+    path += '.html';
+    return path;
+};
+
+export { formatPath, getModuelFile };

package/lib/cbp/router.js

@@ -4,45 +4,11 @@ import path, { join, dirname } from 'path';
 import mime from 'mime-types';
 import { createRequire } from 'module';
 import { html } from './hello.html.js';
+import { getModuelFile, formatPath } from './router-utils.js';
+import { collectMiddlewares, runMiddlewares } from './router-middleware.js';
 
 const require = createRequire(import.meta.url);
 const mainDirMap = new Map();
-const formatPath = (path) => {
-    if (!path || path === '/') {
-        return '/index.html';
-    }
-    const pates = path.split('/');
-    const lastPath = pates[pates.length - 1];
-    if (lastPath.includes('.')) {
-        return path;
-    }
-    path += '.html';
-    return path;
-};
-// 输入一个文件路径。
-const getModuelFile = (dir) => {
-    const dirMap = {
-        '.js': `${dir}.js`,
-        '.jsx': `${dir}.jsx`,
-        '.mjs': `${dir}.mjs`,
-        '.cjs': `${dir}.cjs`,
-        '/index.js': `${dir}/index.js`,
-        '/index.jsx': `${dir}/index.jsx`,
-        '/index.mjs': `${dir}/index.mjs`,
-        '/index.cjs': `${dir}/index.cjs`,
-        '.ts': `${dir}.ts`,
-        '.tsx': `${dir}.tsx`,
-        '/index.ts': `${dir}/index.ts`,
-        '/index.tsx': `${dir}/index.tsx`
-    };
-    for (const key in dirMap) {
-        const filePath = dirMap[key];
-        if (existsSync(filePath) && fs.statSync(filePath)) {
-            return filePath;
-        }
-    }
-    return '';
-};
 const router = new KoaRouter({
     prefix: '/'
 });
@@ -109,11 +75,13 @@ router.all('app/{*path}', async (ctx) => {
                 return;
             }
             const apiModule = await import(`file://${modulePath}`);
-            if (!apiModule[ctx.method] || typeof apiModule[ctx.method] !== 'function') {
+            const handler = apiModule[ctx.method];
+            if (!handler || typeof handler !== 'function') {
                 ctx.status = 405;
                 return;
             }
-            await apiModule[ctx.method](ctx);
+            const middlewares = await collectMiddlewares(modulePath);
+            await runMiddlewares(middlewares, ctx, handler);
         }
         catch (err) {
             console.error(`Error handling API request ${ctx.path}`);
@@ -214,17 +182,19 @@ router.all('apps/:app/{*path}', async (ctx) => {
                 ctx.status = 404;
                 ctx.body = {
                     code: 404,
-                    message: `API 'route/${ctx.path}' 未找到。`,
-                    data: null
+                    message: `API '${ctx.path}' 未找到。`,
+                    data: 'existsSync modulePath'
                 };
                 return;
             }
             const apiModule = await import(`file://${modulePath}`);
-            if (!apiModule[ctx.method] || typeof apiModule[ctx.method] !== 'function') {
+            const handler = apiModule[ctx.method];
+            if (!handler || typeof handler !== 'function') {
                 ctx.status = 405;
                 return;
             }
-            await apiModule[ctx.method](ctx);
+            const middlewares = await collectMiddlewares(modulePath);
+            await runMiddlewares(middlewares, ctx, handler);
         }
         catch (err) {
             logger.warn(`Error request ${ctx.path}:`, err?.message || '');

package/lib/index.js

@@ -23,3 +23,14 @@ export { cbpClient } from './cbp/client.js';
 export { cbpServer } from './cbp/server.js';
 export { cbpPlatform } from './cbp/platform.js';
 export { run, start } from './main.js';
+
+// 导出类型
+['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+    process?.on?.(sig, () => {
+        logger?.info?.(`[alemonjs][${sig}] 收到信号，正在关闭...`);
+        setImmediate(() => process.exit(0));
+    });
+});
+process?.on?.('exit', code => {
+    logger?.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.0-alpha.45",
+  "version": "2.1.0-alpha.46",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",