alemonjs 2.1.86 → 2.1.87

package/lib/application/define-router.js

@@ -21,5 +21,6 @@ const defineRouter = routes => {
         current: routes
     };
 };
+global.defineRouter = defineRouter;
 
 export { defineRouter, lazy, runHandler };

package/lib/application/runtime/client-runtime.d.ts

@@ -1 +1,9 @@
-export {};
+import '../define-children.js';
+import '../define-response.js';
+import '../define-middleware.js';
+import '../define-router.js';
+import '../format/message-api.js';
+import './event-response.js';
+import './event-middleware.js';
+import './event-utils.js';
+import './event-group.js';

package/lib/application/runtime/client-runtime.js

@@ -1,3 +1,12 @@
+import '../define-children.js';
+import '../define-response.js';
+import '../define-middleware.js';
+import '../define-router.js';
+import '../format/message-api.js';
+import './event-response.js';
+import './event-middleware.js';
+import './event-utils.js';
+import './event-group.js';
 import { cbpClient } from './cbp/connects/client.js';
 import 'flatted';
 import 'fs';

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

@@ -177,19 +177,19 @@ const dispatchAppKoaRouters = async (ctx, appName) => {
                 const beforeRouterPath = ctx.routerPath;
                 let fallthrough = false;
                 await rewriteCtxPath(ctx, rewrittenPath, async () => {
-                    await koaRouter.routes()(ctx, () => {
+                    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;
+                const handled = afterMatched > beforeMatched ||
+                    afterMatchedRoute !== beforeMatchedRoute ||
+                    afterRouterPath !== beforeRouterPath ||
+                    ctx.status !== beforeStatus ||
+                    ctx.body !== beforeBody ||
+                    !fallthrough;
                 if (!handled) {
                     continue;
                 }

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

@@ -1,5 +1,5 @@
 import { dirname, join } from 'path';
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
 import { showErrorModule, getRecursiveDirFiles, createEventName } from '../../../common/utils.js';
 import { registerRuntimeApp, updateRuntimeAppStatus, ChildrenApp, clearRuntimeAppKoaRouters, setRuntimeAppKoaRouters, updateRuntimeAppCapabilities } from '../store.js';
 import { registerExpose } from '../../expose.js';
@@ -11,6 +11,50 @@ import { dispatchRuntimeStatusChange, dispatchAppDispose, dispatchAppReady } fro
 const initRequire = () => { };
 initRequire.resolve = () => '';
 const require$1 = module$1?.createRequire?.(import.meta.url) ?? initRequire;
+const resolvePackageDir = (appName) => {
+    const resolveWithPaths = require$1.resolve;
+    const candidatePaths = resolveWithPaths?.paths?.(appName) ?? [];
+    for (const basePath of candidatePaths) {
+        const packageDir = join(basePath, appName);
+        if (existsSync(join(packageDir, 'package.json'))) {
+            return packageDir;
+        }
+    }
+    return null;
+};
+const resolvePackageEntryFromPackageJson = (packageDir) => {
+    const packageJsonPath = join(packageDir, 'package.json');
+    if (!existsSync(packageJsonPath)) {
+        return null;
+    }
+    try {
+        const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf-8')) ?? {};
+        const exportsField = pkg?.exports;
+        let entry = null;
+        if (typeof exportsField === 'string') {
+            entry = exportsField;
+        }
+        else if (exportsField && typeof exportsField === 'object') {
+            const rootExport = exportsField['.'];
+            if (typeof rootExport === 'string') {
+                entry = rootExport;
+            }
+            else if (rootExport && typeof rootExport === 'object') {
+                entry = rootExport.import ?? rootExport.default ?? rootExport.require ?? null;
+            }
+        }
+        if (!entry) {
+            entry = pkg?.module ?? pkg?.main ?? 'index.js';
+        }
+        if (typeof entry !== 'string' || !entry.trim()) {
+            return null;
+        }
+        return join(packageDir, entry);
+    }
+    catch {
+        return null;
+    }
+};
 const resolvePackageRoot = (startDir) => {
     let currentDir = startDir;
     while (currentDir && currentDir !== dirname(currentDir)) {
@@ -253,7 +297,14 @@ const loadChildrenFile = (appName) => {
         return;
     }
     try {
-        const mainPath = require$1.resolve(appName);
+        let mainPath = require$1.resolve(appName);
+        if (!existsSync(mainPath)) {
+            const packageDir = resolvePackageDir(appName);
+            const fallbackMainPath = packageDir ? resolvePackageEntryFromPackageJson(packageDir) : null;
+            if (fallbackMainPath) {
+                mainPath = fallbackMainPath;
+            }
+        }
         if (!existsSync(mainPath)) {
             updateRuntimeAppStatus(appName, 'failed', new Error('The main file does not exist,' + mainPath));
             logger.error({
@@ -274,6 +325,20 @@ const loadChildrenFile = (appName) => {
         void loadChildren(mainPath, appName);
     }
     catch (e) {
+        const packageDir = resolvePackageDir(appName);
+        const fallbackMainPath = packageDir ? resolvePackageEntryFromPackageJson(packageDir) : null;
+        if (fallbackMainPath && existsSync(fallbackMainPath)) {
+            registerRuntimeApp({
+                name: appName,
+                kind: 'plugin',
+                enabled: true,
+                status: 'discovered',
+                rootDir: dirname(fallbackMainPath),
+                mainPath: fallbackMainPath
+            });
+            void loadChildren(fallbackMainPath, appName);
+            return;
+        }
         updateRuntimeAppStatus(appName, 'failed', e);
         showErrorModule(e);
     }

package/lib/application/runtime/store.js

@@ -107,8 +107,8 @@ const registerRuntimeApp = (record) => {
         createdAt: current?.createdAt ?? now,
         updatedAt: now
     };
-    if (current?.status !== record.status) {
-        logRuntimeAppStatus(record.status === 'failed' ? 'warn' : 'debug', runtimeApps[record.name]);
+    if (current?.status !== record.status && process.env.NODE_ENV === 'development') {
+        logRuntimeAppStatus('debug', runtimeApps[record.name]);
     }
     return runtimeApps[record.name];
 };

package/lib/global.d.ts

@@ -1,4 +1,4 @@
-import type { DefineChildrenFunc, OnResponseReversalFunc, OnMiddlewareReversalFunc, OnSelectsFunc, OnDataFormatFunc, OnResponseReversalFuncBack, OnGroupFunc, OnMiddlewareReversalFuncBack, DefineResponseFunc, defineMiddlewareFunc, StoreChildrenApp, StateSubscribeMap, SubscribeKeysMap, LoggerUtils, ResponseState, StartOptions } from './types';
+import type { DefineChildrenFunc, OnResponseReversalFunc, OnMiddlewareReversalFunc, OnSelectsFunc, OnDataFormatFunc, OnResponseReversalFuncBack, OnGroupFunc, OnMiddlewareReversalFuncBack, DefineResponseFunc, defineMiddlewareFunc, DefineRouterFunc, StoreChildrenApp, StateSubscribeMap, SubscribeKeysMap, LoggerUtils, ResponseState, StartOptions } from './types';
 import { type Server } from 'ws';
 import type WebSocket from 'ws';
 import type { IncomingMessage } from 'http';
@@ -7,6 +7,9 @@ import type { RuntimeAppRecord } from './application/runtime/store.js';
 declare global {
     var __config: any;
     var __options: StartOptions;
+    var __sandbox: boolean | undefined;
+    var __client_loaded: boolean | undefined;
+    var __publicIp: string | undefined;
     var logger: LoggerUtils;
     var alemonjsCore: {
         storeState: ResponseState;
@@ -25,6 +28,7 @@ declare global {
     var chatbotServer: Server<typeof WebSocket, typeof IncomingMessage>;
     var chatbotPlatform: WebSocket;
     var chatbotClient: WebSocket;
+    var testoneClient: WebSocket | undefined;
     var onResponse: OnResponseReversalFunc;
     var OnResponse: OnResponseReversalFuncBack;
     var onMiddleware: OnMiddlewareReversalFunc;
@@ -32,6 +36,7 @@ declare global {
     var defineChildren: DefineChildrenFunc;
     var defineResponse: DefineResponseFunc;
     var defineMiddleware: defineMiddlewareFunc;
+    var defineRouter: DefineRouterFunc;
     var onSelects: OnSelectsFunc;
     var format: OnDataFormatFunc;
     var onGroup: OnGroupFunc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.86",
+  "version": "2.1.87",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",