alemonjs 2.1.83 → 2.1.85

package/lib/{app/load_modules → application/runtime/load-modules}/loadChild.js

@@ -1,9 +1,9 @@
 import { dirname, join } from 'path';
 import { existsSync } from 'fs';
-import { showErrorModule, getRecursiveDirFiles, createEventName } from '../../core/utils.js';
+import { showErrorModule, getRecursiveDirFiles, createEventName } from '../../../common/utils.js';
 import { registerRuntimeApp, updateRuntimeAppStatus, ChildrenApp, clearRuntimeAppKoaRouters, setRuntimeAppKoaRouters, updateRuntimeAppCapabilities } from '../store.js';
-import { registerExpose } from '../expose.js';
-import { ResultCode, fileSuffixMiddleware } from '../../core/variable.js';
+import { registerExpose } from '../../expose.js';
+import { ResultCode, fileSuffixMiddleware } from '../../../common/variable.js';
 import { registerAppDir, scheduleCancelByApp, unregisterAppDir } from '../schedule-store.js';
 import module$1 from 'module';
 import { dispatchRuntimeStatusChange, dispatchAppDispose, dispatchAppReady } from '../lifecycle-callbacks.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/lib/{app → application/runtime}/schedule-store.d.ts

@@ -1,4 +1,4 @@
-import { ScheduleId, ScheduleItem, ScheduleStatus, ScheduleCallback, CronExpression } from '../types/schedule';
+import { ScheduleId, ScheduleItem, ScheduleStatus, ScheduleCallback, CronExpression } from '../../types/schedule';
 export declare const registerAppDir: (appName: string, mainDir: string) => void;
 export declare const unregisterAppDir: (appName: string) => void;
 export declare const scheduleInterval: (callback: ScheduleCallback, ms: number, appName?: string) => ScheduleId;

package/lib/{app → application/runtime}/schedule-store.js

@@ -1,4 +1,4 @@
-import { ResultCode } from '../core/variable.js';
+import { ResultCode } from '../../common/variable.js';
 import { CronJob } from 'cron';
 
 const scheduleMap = new Map();

package/lib/{app → application/runtime}/store.d.ts

@@ -1,6 +1,7 @@
-import { SinglyLinkedList } from './SinglyLinkedList';
-import { childrenCallbackRes, ChildrenCycle, EventCycleEnum, EventKeys, FileTreeNode, StoreMiddlewareItem, StoreResponseItem, SubscribeValue } from '../types';
+import { SinglyLinkedList } from '../../common/SinglyLinkedList.js';
+import { childrenCallbackRes, ChildrenCycle, EventCycleEnum, EventKeys, FileTreeNode, StoreMiddlewareItem, StoreResponseItem, SubscribeValue } from '../../types';
 import type KoaRouter from 'koa-router';
+export { Logger, logger } from '../../common/logger.js';
 export type RuntimeAppStatus = 'discovered' | 'loading' | 'ready' | 'failed' | 'disposed';
 export type RuntimeAppCapability = {
     event: boolean;
@@ -26,19 +27,14 @@ export type RuntimeAppRecord = {
     createdAt: number;
     updatedAt: number;
 };
-export declare class Logger {
-    #private;
-    constructor();
-    get value(): any;
-}
 export declare class Core {
     constructor();
     get value(): {
-        storeState: import("../types").ResponseState;
-        storeStateSubscribe: import("../types").StateSubscribeMap;
-        storeSubscribeList: import("../types").SubscribeKeysMap;
+        storeState: import("../index.js").ResponseState;
+        storeStateSubscribe: import("../index.js").StateSubscribeMap;
+        storeSubscribeList: import("../index.js").SubscribeKeysMap;
         storeChildrenApp: {
-            [key: string]: import("../types").StoreChildrenApp;
+            [key: string]: import("../index.js").StoreChildrenApp;
         };
         runtimeApps?: {
             [key: string]: RuntimeAppRecord;
@@ -185,19 +181,18 @@ export declare class ChildrenApp {
     pushCycle(data: ChildrenCycle): void;
     on(): void;
     un(): void;
-    get value(): import("../types").StoreChildrenApp;
+    get value(): import("../index.js").StoreChildrenApp;
 }
-export declare const getChildrenApp: (name: string) => import("../types").StoreChildrenApp;
-export declare const listChildrenApps: () => import("../types").StoreChildrenApp[];
+export declare const getChildrenApp: (name: string) => import("../index.js").StoreChildrenApp;
+export declare const listChildrenApps: () => import("../index.js").StoreChildrenApp[];
 export declare const ProcessorEventAutoClearMap: Map<any, any>;
 export declare const ProcessorEventUserAutoClearMap: Map<any, any>;
-export declare const logger: any;
 export declare const core: {
-    storeState: import("../types").ResponseState;
-    storeStateSubscribe: import("../types").StateSubscribeMap;
-    storeSubscribeList: import("../types").SubscribeKeysMap;
+    storeState: import("../index.js").ResponseState;
+    storeStateSubscribe: import("../index.js").StateSubscribeMap;
+    storeSubscribeList: import("../index.js").SubscribeKeysMap;
     storeChildrenApp: {
-        [key: string]: import("../types").StoreChildrenApp;
+        [key: string]: import("../index.js").StoreChildrenApp;
     };
     runtimeApps?: {
         [key: string]: RuntimeAppRecord;

package/lib/{app → application/runtime}/store.js

@@ -1,102 +1,8 @@
-import { SinglyLinkedList } from './SinglyLinkedList.js';
-import { mkdirSync } from 'node:fs';
-import log4js from 'log4js';
-import { disposeExpose } from './expose.js';
+import { SinglyLinkedList } from '../../common/SinglyLinkedList.js';
+import { disposeExpose } from '../expose.js';
 import { dispatchRuntimeStatusChange } from './lifecycle-callbacks.js';
+export { Logger, logger } from '../../common/logger.js';
 
-const createLogger = () => {
-    if (process.env.BROWSER_ENV === 'browser') {
-        return {
-            trace: console.trace.bind(console),
-            debug: console.debug.bind(console),
-            info: console.info.bind(console),
-            mark: console.info.bind(console),
-            warn: console.warn.bind(console),
-            error: console.error.bind(console),
-            fatal: console.error.bind(console)
-        };
-    }
-    const logDir = process.env?.LOG_PATH ?? `./logs/${process.env.LOG_NAME ?? ''}`;
-    mkdirSync(logDir, { recursive: true });
-    const level = process.env.NODE_ENV === 'development' ? 'trace' : 'info';
-    const hideTime = process.env.LOGGER_TIME === 'false' ? true : false;
-    const hideLevel = process.env.LOGGER_LEVEL === 'false' ? true : false;
-    let pattern = '';
-    if (hideTime && hideLevel) {
-        pattern = '%m';
-    }
-    else if (hideTime && !hideLevel) {
-        pattern = '[%p] %m';
-    }
-    else if (!hideTime && hideLevel) {
-        pattern = '[%d{yyyy-MM-dd hh:mm:ss}] %m';
-    }
-    else {
-        pattern = '[%d{yyyy-MM-dd hh:mm:ss}][%p] %m';
-    }
-    log4js.configure({
-        appenders: {
-            console: {
-                type: 'console',
-                layout: {
-                    type: 'pattern',
-                    pattern: pattern
-                }
-            },
-            command: {
-                type: 'dateFile',
-                filename: `${logDir}/command`,
-                pattern: 'yyyy-MM-dd.log',
-                numBackups: 15,
-                alwaysIncludePattern: true,
-                layout: {
-                    type: 'pattern',
-                    pattern: pattern
-                }
-            },
-            error: {
-                type: 'dateFile',
-                filename: `${logDir}/error`,
-                pattern: 'yyyy-MM-dd.log',
-                numBackups: 15,
-                alwaysIncludePattern: true,
-                layout: {
-                    type: 'pattern',
-                    pattern: pattern
-                }
-            }
-        },
-        categories: {
-            default: { appenders: ['console'], level: level },
-            command: { appenders: ['console', 'command'], level: 'info' },
-            error: { appenders: ['console', 'command', 'error'], level: 'warn' }
-        }
-    });
-    const defaultLogger = log4js.getLogger('default');
-    const commandLogger = log4js.getLogger('command');
-    const errorLogger = log4js.getLogger('error');
-    return {
-        trace: defaultLogger.trace.bind(defaultLogger),
-        debug: defaultLogger.debug.bind(defaultLogger),
-        info: commandLogger.info.bind(commandLogger),
-        mark: commandLogger.mark.bind(commandLogger),
-        warn: errorLogger.warn.bind(errorLogger),
-        error: errorLogger.error.bind(errorLogger),
-        fatal: errorLogger.fatal.bind(errorLogger)
-    };
-};
-class Logger {
-    #logger = null;
-    constructor() {
-        this.#logger = createLogger();
-        if (!global.logger) {
-            global.logger = this.#logger;
-        }
-    }
-    get value() {
-        return this.#logger;
-    }
-}
 class Core {
     constructor() {
         if (!global.alemonjsCore) {
@@ -201,7 +107,7 @@ const registerRuntimeApp = (record) => {
         createdAt: current?.createdAt ?? now,
         updatedAt: now
     };
-    if (!current || current.status !== record.status) {
+    if (current?.status !== record.status) {
         logRuntimeAppStatus(record.status === 'failed' ? 'warn' : 'debug', runtimeApps[record.name]);
     }
     return runtimeApps[record.name];
@@ -255,7 +161,7 @@ const updateRuntimeAppCapabilities = (name, capabilities) => {
 const setRuntimeAppKoaRouters = (name, koaRouters) => {
     const koaRouterStore = getRuntimeAppKoaRouterStore();
     if (!koaRouters) {
-        delete koaRouterStore[name];
+        Reflect.deleteProperty(koaRouterStore, name);
         return [];
     }
     const normalizedRouters = (Array.isArray(koaRouters) ? koaRouters : [koaRouters]).filter(Boolean);
@@ -267,7 +173,7 @@ const getRuntimeAppKoaRouters = (name) => {
 };
 const clearRuntimeAppKoaRouters = (name) => {
     const koaRouterStore = getRuntimeAppKoaRouterStore();
-    delete koaRouterStore[name];
+    Reflect.deleteProperty(koaRouterStore, name);
 };
 const listRuntimeAppKoaRouters = () => {
     return Object.entries(getRuntimeAppKoaRouterStore())
@@ -642,7 +548,7 @@ class ChildrenApp {
     }
     un() {
         disposeExpose(this.#name);
-        delete alemonjsCore.storeChildrenApp[this.#name];
+        Reflect.deleteProperty(alemonjsCore.storeChildrenApp, this.#name);
         bumpStoreVersion();
     }
     get value() {
@@ -660,7 +566,6 @@ const listChildrenApps = () => {
 };
 const ProcessorEventAutoClearMap = new Map();
 const ProcessorEventUserAutoClearMap = new Map();
-const logger = new Logger().value;
 const core = new Core().value;
 ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
     process?.on?.(sig, () => {
@@ -671,4 +576,4 @@ process?.on?.('exit', code => {
     logger.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
 });
 
-export { ChildrenApp, Core, Logger, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, clearRuntimeAppKoaRouters, core, disposeAllRuntimeApps, disposeRuntimeApp, getChildrenApp, getRuntimeApp, getRuntimeAppKoaRouters, getSubscribeList, hasRuntimeAppCapability, listChildrenApps, listRuntimeAppKoaRouters, listRuntimeApps, logger, registerRuntimeApp, setRuntimeAppKoaRouters, toRuntimeAppSnapshot, updateRuntimeAppCapabilities, updateRuntimeAppStatus };
+export { ChildrenApp, Core, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, clearRuntimeAppKoaRouters, core, disposeAllRuntimeApps, disposeRuntimeApp, getChildrenApp, getRuntimeApp, getRuntimeAppKoaRouters, getSubscribeList, hasRuntimeAppCapability, listChildrenApps, listRuntimeAppKoaRouters, listRuntimeApps, registerRuntimeApp, setRuntimeAppKoaRouters, toRuntimeAppSnapshot, updateRuntimeAppCapabilities, updateRuntimeAppStatus };

package/lib/application/schedule.d.ts

@@ -0,0 +1,17 @@
+import { ScheduleCallback, CronExpression } from '../types/schedule';
+export declare const setInterval: (callback: ScheduleCallback, ms: number) => string;
+export declare const setTimeout: (callback: ScheduleCallback, ms: number) => string;
+export declare const setCron: (expression: CronExpression, callback: ScheduleCallback) => string;
+export declare const clearInterval: (id: import("./index.js").ScheduleId) => boolean;
+export declare const clearTimeout: (id: import("./index.js").ScheduleId) => boolean;
+export declare const pauseSchedule: (id: import("./index.js").ScheduleId) => boolean;
+export declare const resumeSchedule: (id: import("./index.js").ScheduleId) => boolean;
+export declare const listSchedule: (appName?: string) => Array<{
+    id: import("./index.js").ScheduleId;
+    type: import("./index.js").ScheduleItem["type"];
+    status: import("./index.js").ScheduleStatus;
+    ms?: number;
+    cron?: string;
+    appName?: string;
+    createdAt: number;
+}>;

package/lib/{app/api → application}/schedule.js

@@ -1,4 +1,4 @@
-import { scheduleCancel, scheduleList, schedulePause, scheduleResume, scheduleCron, scheduleInterval, scheduleTimeout } from '../schedule-store.js';
+import { scheduleCancel, scheduleList, schedulePause, scheduleResume, scheduleCron, scheduleInterval, scheduleTimeout } from './runtime/schedule-store.js';
 
 const setInterval = (callback, ms) => scheduleInterval(callback, ms);
 const setTimeout = (callback, ms) => scheduleTimeout(callback, ms);

package/lib/client.d.ts

@@ -1 +1 @@
-export {};
+import './application/runtime/client-runtime.js';

package/lib/client.js

@@ -1,117 +1 @@
-import './types/event/actions.js';
-import { defaultPort } from './core/variable.js';
-import 'fs';
-import 'path';
-import 'yaml';
-import './core/utils.js';
-import { cbpClient } from './cbp/connects/client.js';
-import 'flatted';
-import 'ws';
-import './cbp/processor/config.js';
-import 'net';
-import 'v8';
-import 'os';
-import 'koa';
-import '@koa/cors';
-import './cbp/routers/router.js';
-import 'lodash';
-import 'fs/promises';
-import { disposeAllRuntimeApps } from './app/store.js';
-import { loadModels } from './app/load_modules/load.js';
-import './app/load_modules/loadChild.js';
-import './app/define-children.js';
-import './app/define-response.js';
-import './app/define-middleware.js';
-import './app/event-group.js';
-import './app/event-middleware.js';
-import './app/event-processor.js';
-import './app/event-response.js';
-import './app/hook-event-context.js';
-import './app/message-format-old.js';
-import { scheduleCancelByApp, unregisterAppDir } from './app/schedule-store.js';
-import './app/event-utils.js';
-import './app/message-api.js';
-import './process/platform.js';
-import './process/module.js';
-import { createServer } from './server/main.js';
-import { dispatchDisposeAllApps } from './app/lifecycle-callbacks.js';
-
-global.__client_loaded = true;
-let runtimeDisposed = false;
-const disposeRuntime = async () => {
-    if (runtimeDisposed) {
-        return;
-    }
-    runtimeDisposed = true;
-    await dispatchDisposeAllApps();
-    const apps = disposeAllRuntimeApps();
-    apps.forEach(app => {
-        scheduleCancelByApp(app.name);
-        unregisterAppDir(app.name);
-    });
-};
-const shutdown = async (reason) => {
-    logger.info?.(`[alemonjs][${reason}] 收到信号，正在关闭...`);
-    await disposeRuntime();
-    process.exit(0);
-};
-const mainServer = () => {
-    const port = process.env.serverPort;
-    if (!port) {
-        return;
-    }
-    createServer(port, () => {
-        const httpURL = `http://127.0.0.1:${port}`;
-        logger.info(`应用服务器: ${httpURL}`);
-    });
-};
-const main = () => {
-    const login = process.env.login ?? '';
-    const platform = process.env.platform ?? '';
-    const url = process.env.url ?? '';
-    const port = process.env.port ?? defaultPort;
-    const isFullReceive = process.env.is_full_receive === 'true' || process.env.is_full_receive === '1';
-    if (!login && !platform && url) {
-        logger.info(`[Connecting to CBP server at ${url}]`);
-        cbpClient(url);
-    }
-    else {
-        const httpURL = `http://127.0.0.1:${port}`;
-        cbpClient(httpURL, { isFullReceive });
-    }
-    loadModels();
-};
-const mainProcess = () => {
-    process.on('unhandledRejection', (reason) => {
-        logger.error('[alemonjs][unhandledRejection] 未捕获的 Promise 拒绝:', reason);
-    });
-    process.on('uncaughtException', (error) => {
-        logger.error('[alemonjs][uncaughtException] 未捕获的异常:', error);
-    });
-    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-        process?.on?.(sig, () => {
-            void shutdown(sig);
-        });
-    });
-    process?.on?.('exit', code => {
-        void disposeRuntime();
-        logger.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
-    });
-    process.on('message', msg => {
-        try {
-            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-            if (data?.type === 'start') {
-                main();
-                mainServer();
-            }
-            else if (data?.type === 'stop') {
-                void shutdown('stop');
-            }
-        }
-        catch { }
-    });
-    if (process.send) {
-        process.send({ type: 'ready' });
-    }
-};
-mainProcess();
+import './application/runtime/client-runtime.js';

package/lib/common/cbp/constants.d.ts

@@ -0,0 +1,11 @@
+export declare const USER_AGENT_HEADER = "user-agent";
+export declare const USER_AGENT_HEADER_VALUE_MAP: {
+    readonly platform: "platform";
+    readonly client: "client";
+    readonly testone: "testone";
+};
+export declare const DEVICE_ID_HEADER = "x-device-id";
+export declare const FULL_RECEIVE_HEADER = "x-full-receive";
+export declare const timeoutTime: number;
+export declare const reconnectInterval: number;
+export declare const HEARTBEAT_INTERVAL: number;

package/lib/common/cbp/constants.js

@@ -0,0 +1,13 @@
+const USER_AGENT_HEADER = 'user-agent';
+const USER_AGENT_HEADER_VALUE_MAP = {
+    platform: 'platform',
+    client: 'client',
+    testone: 'testone'
+};
+const DEVICE_ID_HEADER = 'x-device-id';
+const FULL_RECEIVE_HEADER = 'x-full-receive';
+const timeoutTime = 1000 * 60 * 3;
+const reconnectInterval = 1000 * 6;
+const HEARTBEAT_INTERVAL = 1000 * 18;
+
+export { DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, HEARTBEAT_INTERVAL, USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE_MAP, reconnectInterval, timeoutTime };

package/lib/{cbp/connects/connect.js → common/cbp/heartbeat.js}

@@ -1,9 +1,6 @@
-import { ResultCode } from '../../core/variable.js';
-import 'fs';
-import 'path';
-import 'yaml';
-import '../../core/utils.js';
-import { HEARTBEAT_INTERVAL } from '../processor/config.js';
+import { logger } from '../logger.js';
+import { ResultCode } from '../variable.js';
+import { HEARTBEAT_INTERVAL } from './constants.js';
 
 const useHeartbeat = ({ ping, isConnected, terminate }) => {
     let heartbeatTimer = null;

package/lib/common/cbp/normalize.d.ts

@@ -0,0 +1,16 @@
+import type { Actions, Apis } from '../../types/index.js';
+import type { Result } from '../result.js';
+import type { CBPEnvelope, CBPError, CBPResult, NormalizedActionRequestMessage, NormalizedApiRequestMessage, NormalizedCBPMessage } from './typings';
+export declare const isCBPEnvelope: (input: unknown) => input is CBPEnvelope;
+export declare const normalizeInboundMessage: (input: unknown) => NormalizedCBPMessage | null;
+export declare const toLegacyActionData: (message: NormalizedActionRequestMessage) => Actions;
+export declare const toLegacyApiData: (message: NormalizedApiRequestMessage) => Apis;
+export declare const isNormalizedActionRequest: (message: NormalizedCBPMessage | null | undefined) => message is NormalizedActionRequestMessage;
+export declare const isNormalizedApiRequest: (message: NormalizedCBPMessage | null | undefined) => message is NormalizedApiRequestMessage;
+export declare const getNormalizedDeviceId: (message: NormalizedCBPMessage) => string;
+export declare const getNormalizedEventRouteId: (message: NormalizedCBPMessage) => string;
+export declare const createActionRequestEnvelope: (data: Actions) => CBPEnvelope;
+export declare const createApiRequestEnvelope: (data: Apis) => CBPEnvelope;
+export declare const createActionResponseEnvelope: (data: Actions, payload: CBPResult[] | Result[], error?: CBPError) => CBPEnvelope;
+export declare const createApiResponseEnvelope: (data: Apis, payload: CBPResult[] | Result[], error?: CBPError) => CBPEnvelope;
+export declare const createEventEnvelope: (data: Record<string, unknown>) => CBPEnvelope;