alemonjs 2.1.83-alpha.5 → 2.1.83-alpha.7

package/lib/application/runtime/http/routers/router.js

@@ -16,7 +16,7 @@ import 'os';
 import 'flatted';
 import '../../../../common/cbp/runtime.js';
 import 'ws';
-import { listRuntimeApps, getRuntimeApp, toRuntimeAppSnapshot, listRuntimeAppKoaRouters, hasRuntimeAppCapability, getRuntimeAppKoaRouters } from '../../store.js';
+import { listRuntimeApps, getRuntimeApp, toRuntimeAppSnapshot, listRuntimeAppKoaRouters, hasRuntimeAppCapability, getChildrenApp, getRuntimeAppKoaRouters } from '../../store.js';
 import { dispatchHttpError } from '../../lifecycle-callbacks.js';
 
 const initRequire = () => { };
@@ -38,10 +38,46 @@ const resolvePackageRoot = (startDir) => {
 const readWebRootConfig = (packageRoot) => {
     const packageJsonPath = path__default.join(packageRoot, 'package.json');
     if (!existsSync(packageJsonPath)) {
+        if (existsSync(path__default.join(packageRoot, 'dist', 'index.html'))) {
+            return 'dist';
+        }
         return '';
     }
     const pkg = require$1(packageJsonPath) ?? {};
-    return pkg?.alemonjs?.web?.root ?? '';
+    const configuredRoot = pkg?.alemonjs?.web?.root ?? '';
+    if (typeof configuredRoot === 'string' && configuredRoot.trim()) {
+        return configuredRoot;
+    }
+    if (existsSync(path__default.join(packageRoot, 'dist', 'index.html'))) {
+        return 'dist';
+    }
+    return '';
+};
+const matchBasePath = (requestPath, basePath) => {
+    if (!basePath) {
+        return requestPath;
+    }
+    if (requestPath === basePath) {
+        return '/';
+    }
+    if (requestPath.startsWith(`${basePath}/`)) {
+        return requestPath.slice(basePath.length) || '/';
+    }
+    return '';
+};
+const rewriteCtxPath = async (ctx, nextPath, handler) => {
+    const search = ctx.querystring ? `?${ctx.querystring}` : '';
+    const originalUrl = ctx.url;
+    const originalReqUrl = ctx.req.url;
+    ctx.url = `${nextPath}${search}`;
+    ctx.req.url = `${nextPath}${search}`;
+    try {
+        await handler();
+    }
+    finally {
+        ctx.url = originalUrl;
+        ctx.req.url = originalReqUrl;
+    }
 };
 const denyRuntimeAppAccess = (ctx, appName, capability) => {
     const runtimeApp = getRuntimeApp(appName);
@@ -105,48 +141,85 @@ const denyRuntimeAppAccess = (ctx, appName, capability) => {
 };
 const dispatchRegisteredKoaRouters = async (ctx) => {
     const registeredRouters = listRuntimeAppKoaRouters();
-    for (const item of registeredRouters) {
-        const runtimeApp = getRuntimeApp(item.name);
-        if (!runtimeApp || !runtimeApp.enabled || runtimeApp.status !== 'ready' || !hasRuntimeAppCapability(item.name, 'httpApi')) {
+    const candidates = new Set(registeredRouters.map(item => item.name));
+    const runtimeApps = listRuntimeApps();
+    runtimeApps.forEach(item => {
+        if (item.capabilities?.httpApi) {
+            candidates.add(item.name);
+        }
+    });
+    for (const appName of candidates) {
+        const runtimeApp = getRuntimeApp(appName);
+        if (!runtimeApp || !runtimeApp.enabled || runtimeApp.status !== 'ready' || !hasRuntimeAppCapability(appName, 'httpApi')) {
             continue;
         }
-        const routers = getRuntimeAppKoaRouters(item.name);
+        const registerRouters = getChildrenApp(appName)?.register?.koaRouter;
+        const storedRouters = getRuntimeAppKoaRouters(appName);
+        const routers = (storedRouters.length
+            ? storedRouters
+            : (Array.isArray(registerRouters) ? registerRouters : registerRouters ? [registerRouters] : [])).filter(Boolean);
+        const aliasBases = appName === 'main' ? ['', '/app'] : ['', `/apps/${appName}`];
         for (const koaRouter of routers) {
-            try {
-                const matchedContext = ctx;
-                const beforeMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
-                await koaRouter.routes()(ctx, async () => { });
-                const afterMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
-                if (afterMatched <= beforeMatched) {
+            for (const basePath of aliasBases) {
+                const rewrittenPath = matchBasePath(ctx.path, basePath);
+                if (!rewrittenPath) {
                     continue;
                 }
-                await koaRouter.allowedMethods()(ctx, async () => { });
-                return true;
-            }
-            catch (error) {
-                const handled = await dispatchHttpError({
-                    ctx,
-                    error,
-                    appName: item.name,
-                    path: ctx.path,
-                    method: ctx.method,
-                    kind: 'koa-router'
-                });
-                if (handled) {
+                try {
+                    const matchedContext = ctx;
+                    const beforeMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
+                    const beforeStatus = ctx.status;
+                    const beforeBody = ctx.body;
+                    const beforeMatchedRoute = ctx._matchedRoute;
+                    const beforeRouterPath = ctx.routerPath;
+                    let fallthrough = false;
+                    await rewriteCtxPath(ctx, rewrittenPath, async () => {
+                        await koaRouter.routes()(ctx, async () => {
+                            fallthrough = true;
+                        });
+                    });
+                    const afterMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
+                    const afterMatchedRoute = ctx._matchedRoute;
+                    const afterRouterPath = ctx.routerPath;
+                    const handled = afterMatched > beforeMatched
+                        || afterMatchedRoute !== beforeMatchedRoute
+                        || afterRouterPath !== beforeRouterPath
+                        || ctx.status !== beforeStatus
+                        || ctx.body !== beforeBody
+                        || !fallthrough;
+                    if (!handled) {
+                        continue;
+                    }
+                    await rewriteCtxPath(ctx, rewrittenPath, async () => {
+                        await koaRouter.allowedMethods()(ctx, async () => { });
+                    });
+                    return true;
+                }
+                catch (error) {
+                    const handled = await dispatchHttpError({
+                        ctx,
+                        error,
+                        appName,
+                        path: ctx.path,
+                        method: ctx.method,
+                        kind: 'koa-router'
+                    });
+                    if (handled) {
+                        return true;
+                    }
+                    logger.warn({
+                        code: ResultCode.Fail,
+                        message: `Error request ${ctx.path}:`,
+                        data: error instanceof Error ? error.message : String(error)
+                    });
+                    ctx.status = 500;
+                    ctx.body = {
+                        code: 500,
+                        message: '处理 Koa Router 请求时发生错误。',
+                        error: error instanceof Error ? error.message : String(error)
+                    };
                     return true;
                 }
-                logger.warn({
-                    code: ResultCode.Fail,
-                    message: `Error request ${ctx.path}:`,
-                    data: error instanceof Error ? error.message : String(error)
-                });
-                ctx.status = 500;
-                ctx.body = {
-                    code: 500,
-                    message: '处理 Koa Router 请求时发生错误。',
-                    error: error instanceof Error ? error.message : String(error)
-                };
-                return true;
             }
         }
     }
@@ -206,7 +279,7 @@ router.use(async (ctx, next) => {
     }
     await next();
 });
-router.all('app/{*path}', async (ctx) => {
+const handleMainAppRequest = async (ctx) => {
     if (!process.env.input) {
         ctx.status = 400;
         ctx.body = {
@@ -376,11 +449,11 @@ router.all('app/{*path}', async (ctx) => {
             };
         }
     }
-});
-router.all('app', ctx => {
-    ctx.redirect('/app/');
-});
-router.all('apps/:app/{*path}', async (ctx) => {
+};
+router.all('app', handleMainAppRequest);
+router.all('app/', handleMainAppRequest);
+router.all('app/{*path}', handleMainAppRequest);
+const handlePluginAppRequest = async (ctx) => {
     const appName = ctx.params.app;
     if (!isValidPackageName(appName)) {
         ctx.status = 400;
@@ -549,11 +622,9 @@ router.all('apps/:app/{*path}', async (ctx) => {
             };
         }
     }
-});
-router.all('apps/:name', ctx => {
-    if (ctx.path === `/apps/${ctx.params.name}`) {
-        ctx.redirect(`/apps/${ctx.params.name}/`);
-    }
-});
+};
+router.all('apps/:app', handlePluginAppRequest);
+router.all('apps/:app/', handlePluginAppRequest);
+router.all('apps/:app/{*path}', handlePluginAppRequest);
 
 export { router as default };

package/lib/application/runtime/http/routers/utils.js

@@ -36,7 +36,7 @@ const getModuelFile = (dir) => {
 };
 const formatPath = (pathValue) => {
     if (!pathValue || pathValue === '/') {
-        return '/index.html';
+        return 'index.html';
     }
     const pates = pathValue.split('/');
     const lastPath = pates[pates.length - 1];

package/lib/application/runtime/load-modules/loadChild.js

@@ -21,11 +21,20 @@ const resolvePackageRoot = (startDir) => {
     }
     return startDir;
 };
+const detectDefaultWebRoot = (packageRoot) => {
+    if (existsSync(join(packageRoot, 'dist', 'index.html'))) {
+        return 'dist';
+    }
+    if (existsSync(join(packageRoot, 'index.html'))) {
+        return '';
+    }
+    return null;
+};
 const detectWebCapability = (startDir) => {
     const packageRoot = resolvePackageRoot(startDir);
     const packageJsonPath = join(packageRoot, 'package.json');
     if (!existsSync(packageJsonPath)) {
-        return existsSync(join(packageRoot, 'index.html'));
+        return Boolean(detectDefaultWebRoot(packageRoot));
     }
     try {
         const pkg = require$1(packageJsonPath) ?? {};
@@ -36,7 +45,7 @@ const detectWebCapability = (startDir) => {
     }
     catch {
     }
-    return existsSync(join(packageRoot, 'index.html'));
+    return Boolean(detectDefaultWebRoot(packageRoot));
 };
 const loadChildren = async (mainPath, appName) => {
     if (!mainPath || typeof mainPath !== 'string') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.83-alpha.5",
+  "version": "2.1.83-alpha.7",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",