alemonjs 2.1.81 → 2.1.83-alpha.1

package/lib/app/store.js

@@ -2,6 +2,7 @@ import { SinglyLinkedList } from './SinglyLinkedList.js';
 import { mkdirSync } from 'node:fs';
 import log4js from 'log4js';
 import { disposeExpose } from './expose.js';
+import { dispatchRuntimeStatusChange } from './lifecycle-callbacks.js';
 
 const createLogger = () => {
     if (process.env.BROWSER_ENV === 'browser') {
@@ -157,11 +158,7 @@ const normalizeRuntimeAppError = (error) => {
     };
 };
 const sameRuntimeAppCapabilities = (left, right) => {
-    return (left.event === right.event &&
-        left.httpApi === right.httpApi &&
-        left.web === right.web &&
-        left.schedule === right.schedule &&
-        left.expose === right.expose);
+    return (left.event === right.event && left.httpApi === right.httpApi && left.web === right.web && left.schedule === right.schedule && left.expose === right.expose);
 };
 const sameRuntimeAppError = (left, right) => {
     if (!left && !right) {
@@ -205,7 +202,7 @@ const registerRuntimeApp = (record) => {
         updatedAt: now
     };
     if (!current || current.status !== record.status) {
-        logRuntimeAppStatus('info', runtimeApps[record.name]);
+        logRuntimeAppStatus(record.status === 'failed' ? 'warn' : 'debug', runtimeApps[record.name]);
     }
     return runtimeApps[record.name];
 };
@@ -216,13 +213,26 @@ const updateRuntimeAppStatus = (name, status, error) => {
         return;
     }
     const normalizedError = normalizeRuntimeAppError(error);
+    const previousStatus = current.status;
     if (current.status === status && sameRuntimeAppError(current.error, normalizedError)) {
         return current;
     }
     current.status = status;
     current.updatedAt = Date.now();
     current.error = normalizedError;
-    logRuntimeAppStatus(status === 'failed' ? 'warn' : 'info', current);
+    const level = status === 'failed' ? 'warn' : status === 'disposed' ? 'info' : 'debug';
+    logRuntimeAppStatus(level, current);
+    void dispatchRuntimeStatusChange({
+        appName: name,
+        previousStatus,
+        status,
+        error: normalizedError
+            ? {
+                message: normalizedError.message,
+                time: normalizedError.time
+            }
+            : undefined
+    });
     return current;
 };
 const updateRuntimeAppCapabilities = (name, capabilities) => {
@@ -411,6 +421,13 @@ function mergeFileTree(target, source) {
         }
     }
 }
+const attachRouteAppName = (appName, routes = []) => {
+    return routes.map(route => ({
+        ...route,
+        appName,
+        children: route.children ? attachRouteAppName(appName, route.children) : route.children
+    }));
+};
 class MiddlewareTree {
     #cache = null;
     #cacheVersion = -1;
@@ -459,10 +476,10 @@ class ResponseRouter {
                 return [];
             }
             if (alemonjsCore.storeChildrenApp[key].register?.responseRouter) {
-                return alemonjsCore.storeChildrenApp[key].register?.responseRouter?.current ?? [];
+                return attachRouteAppName(key, alemonjsCore.storeChildrenApp[key].register?.responseRouter?.current ?? []);
             }
             if (alemonjsCore.storeChildrenApp[key].register?.response) {
-                return alemonjsCore.storeChildrenApp[key].register?.response?.current ?? [];
+                return attachRouteAppName(key, alemonjsCore.storeChildrenApp[key].register?.response?.current ?? []);
             }
             return [];
         });
@@ -483,10 +500,10 @@ class MiddlewareRouter {
                 return [];
             }
             if (alemonjsCore.storeChildrenApp[key].register?.middlewareRouter) {
-                return alemonjsCore.storeChildrenApp[key].register?.middlewareRouter?.current ?? [];
+                return attachRouteAppName(key, alemonjsCore.storeChildrenApp[key].register?.middlewareRouter?.current ?? []);
             }
             if (alemonjsCore.storeChildrenApp[key].register?.middleware) {
-                return alemonjsCore.storeChildrenApp[key].register?.middleware?.current ?? [];
+                return attachRouteAppName(key, alemonjsCore.storeChildrenApp[key].register?.middleware?.current ?? []);
             }
             return [];
         });
@@ -635,6 +652,12 @@ class ChildrenApp {
         return alemonjsCore.storeChildrenApp[this.#name];
     }
 }
+const getChildrenApp = (name) => {
+    return alemonjsCore.storeChildrenApp[name] ?? null;
+};
+const listChildrenApps = () => {
+    return Object.values(alemonjsCore.storeChildrenApp);
+};
 const ProcessorEventAutoClearMap = new Map();
 const ProcessorEventUserAutoClearMap = new Map();
 const logger = new Logger().value;
@@ -648,4 +671,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, getRuntimeApp, getRuntimeAppKoaRouters, getSubscribeList, hasRuntimeAppCapability, listRuntimeAppKoaRouters, listRuntimeApps, logger, registerRuntimeApp, setRuntimeAppKoaRouters, toRuntimeAppSnapshot, updateRuntimeAppCapabilities, updateRuntimeAppStatus };
+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 };

package/lib/cbp/connects/client.js

@@ -14,8 +14,9 @@ import { onProcessor } from '../../app/event-processor.js';
 import '../../app/event-response.js';
 import { createResult } from '../../core/utils.js';
 import '../../app/hook-event-context.js';
-import { apiResolves, apiTimeouts, actionResolves, actionTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
+import { apiRequestResolves, apiRequestTimeouts, actionRequestResolves, actionRequestTimeouts, FULL_RECEIVE_HEADER } from '../processor/config.js';
 import { setDirectSend } from '../processor/transport.js';
+import { normalizeInboundMessage } from '../normalize.js';
 import '../../app/message-format-old.js';
 import 'cron';
 import '../../app/event-utils.js';
@@ -23,48 +24,60 @@ import '../../app/message-api.js';
 import { createWSConnector } from './base.js';
 import { createDirectServer } from '../../process/direct-channel.js';
 
-const handleParsedMessage = (parsedMessage) => {
-    if (parsedMessage?.apiId) {
-        const resolve = apiResolves.get(parsedMessage.apiId);
+const handleInboundMessage = (message) => {
+    const normalized = normalizeInboundMessage(message);
+    if (!normalized) {
+        return;
+    }
+    if (normalized.kind === 'api.res') {
+        const resolve = apiRequestResolves.get(normalized.replyTo);
         if (resolve) {
-            apiResolves.delete(parsedMessage.apiId);
-            const timeout = apiTimeouts.get(parsedMessage.apiId);
+            apiRequestResolves.delete(normalized.replyTo);
+            const timeout = apiRequestTimeouts.get(normalized.replyTo);
             if (timeout) {
-                apiTimeouts.delete(parsedMessage.apiId);
+                apiRequestTimeouts.delete(normalized.replyTo);
                 clearTimeout(timeout);
             }
-            if (Array.isArray(parsedMessage.payload)) {
-                resolve(parsedMessage.payload);
+            if (Array.isArray(normalized.results)) {
+                resolve(normalized.results);
             }
             else {
                 resolve([createResult(ResultCode.Fail, '接口处理错误', null)]);
             }
         }
     }
-    else if (parsedMessage?.actionId) {
-        const resolve = actionResolves.get(parsedMessage.actionId);
+    else if (normalized.kind === 'action.res') {
+        const resolve = actionRequestResolves.get(normalized.replyTo);
         if (resolve) {
-            actionResolves.delete(parsedMessage.actionId);
-            const timeout = actionTimeouts.get(parsedMessage.actionId);
+            actionRequestResolves.delete(normalized.replyTo);
+            const timeout = actionRequestTimeouts.get(normalized.replyTo);
             if (timeout) {
-                actionTimeouts.delete(parsedMessage.actionId);
+                actionRequestTimeouts.delete(normalized.replyTo);
                 clearTimeout(timeout);
             }
-            if (Array.isArray(parsedMessage.payload)) {
-                resolve(parsedMessage.payload);
+            if (Array.isArray(normalized.results)) {
+                resolve(normalized.results);
             }
             else {
                 resolve([createResult(ResultCode.Fail, '消费处理错误', null)]);
             }
         }
     }
-    else if (parsedMessage.name) {
-        onProcessor(parsedMessage.name, parsedMessage, parsedMessage.value);
+    else if (normalized.kind === 'event') {
+        onProcessor(normalized.eventName, normalized.event, normalized.raw);
+    }
+    else if (normalized.kind === 'control' && normalized.op === 'sync') {
+        const env = normalized.payload?.env;
+        if (env && typeof env === 'object') {
+            for (const key in env) {
+                process.env[key] = String(env[key]);
+            }
+        }
     }
 };
 const cbpClientDirect = (sockPath, open) => {
     createDirectServer(sockPath, (data) => {
-        handleParsedMessage(data);
+        handleInboundMessage(data);
     })
         .then(channel => {
         setDirectSend(channel.send);
@@ -89,7 +102,7 @@ const cbpClientIPC = (open) => {
         try {
             const msg = typeof message === 'string' ? JSON.parse(message) : message;
             if (msg?.type === 'ipc:data') {
-                handleParsedMessage(msg.data);
+                handleInboundMessage(msg.data);
             }
         }
         catch (error) {
@@ -128,18 +141,7 @@ const cbpClient = (url, options = {}) => {
         onMessage: (messageStr) => {
             try {
                 const parsedMessage = flattedJSON.parse(messageStr);
-                if (parsedMessage?.activeId) {
-                    if (parsedMessage.active === 'sync') {
-                        const configs = parsedMessage.payload;
-                        const env = configs.env || {};
-                        for (const key in env) {
-                            process.env[key] = env[key];
-                        }
-                    }
-                }
-                else {
-                    handleParsedMessage(parsedMessage);
-                }
+                handleInboundMessage(parsedMessage);
             }
             catch (error) {
                 logger.error({

package/lib/cbp/connects/platform.js

@@ -8,7 +8,30 @@ import 'yaml';
 import { sanitizeForSerialization } from '../../core/utils.js';
 import { createWSConnector } from './base.js';
 import { createDirectClient } from '../../process/direct-channel.js';
+import { createEventEnvelope, normalizeInboundMessage, isNormalizedApiRequest, toLegacyApiData, createApiResponseEnvelope, isNormalizedActionRequest, toLegacyActionData, createActionResponseEnvelope } from '../normalize.js';
 
+const dispatchLegacyActionHandlers = (actionReplys, replyAction, input) => {
+    const normalized = normalizeInboundMessage(input);
+    if (!isNormalizedActionRequest(normalized)) {
+        return false;
+    }
+    const legacy = toLegacyActionData(normalized);
+    for (const cb of actionReplys) {
+        void cb(legacy, val => replyAction(legacy, val));
+    }
+    return true;
+};
+const dispatchLegacyApiHandlers = (apiReplys, replyApi, input) => {
+    const normalized = normalizeInboundMessage(input);
+    if (!isNormalizedApiRequest(normalized)) {
+        return false;
+    }
+    const legacy = toLegacyApiData(normalized);
+    for (const cb of apiReplys) {
+        void cb(legacy, val => replyApi(legacy, val));
+    }
+    return true;
+};
 const cbpPlatformDirect = (sockPath, open) => {
     const actionReplys = [];
     const apiReplys = [];
@@ -17,28 +40,19 @@ const cbpPlatformDirect = (sockPath, open) => {
     const send = (data) => {
         data.DeviceId = deviceId;
         data.CreateAt = Date.now();
+        const envelope = createEventEnvelope(data);
         if (channel) {
-            channel.send(data);
+            channel.send(envelope);
         }
         else {
-            pendingQueue.push({ ...data });
+            pendingQueue.push(envelope);
         }
     };
     const replyAction = (data, payload) => {
-        channel?.send({
-            action: data.action,
-            payload: payload,
-            actionId: data.actionId,
-            DeviceId: data.DeviceId
-        });
+        channel?.send(createActionResponseEnvelope(data, payload));
     };
     const replyApi = (data, payload) => {
-        channel?.send({
-            action: data.action,
-            apiId: data.apiId,
-            DeviceId: data.DeviceId,
-            payload: payload
-        });
+        channel?.send(createApiResponseEnvelope(data, payload));
     };
     const onactions = (reply) => {
         actionReplys.push(reply);
@@ -47,16 +61,10 @@ const cbpPlatformDirect = (sockPath, open) => {
         apiReplys.push(reply);
     };
     createDirectClient(sockPath, (data) => {
-        if (data?.apiId) {
-            for (const cb of apiReplys) {
-                void cb(data, val => replyApi(data, val));
-            }
-        }
-        else if (data?.actionId) {
-            for (const cb of actionReplys) {
-                void cb(data, val => replyAction(data, val));
-            }
+        if (dispatchLegacyApiHandlers(apiReplys, replyApi, data)) {
+            return;
         }
+        dispatchLegacyActionHandlers(actionReplys, replyAction, data);
     })
         .then(ch => {
         channel = ch;
@@ -88,19 +96,15 @@ const cbpPlatformIPC = (open, existingActionReplys, existingApiReplys) => {
         if (typeof process.send === 'function') {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            process.send({ type: 'ipc:data', data: sanitizeForSerialization(data) });
+            const envelope = createEventEnvelope(data);
+            process.send({ type: 'ipc:data', data: sanitizeForSerialization(envelope) });
         }
     };
     const replyAction = (data, payload) => {
         if (typeof process.send === 'function') {
             process.send({
                 type: 'ipc:data',
-                data: {
-                    action: data.action,
-                    payload: payload,
-                    actionId: data.actionId,
-                    DeviceId: data.DeviceId
-                }
+                data: sanitizeForSerialization(createActionResponseEnvelope(data, payload))
             });
         }
     };
@@ -108,12 +112,7 @@ const cbpPlatformIPC = (open, existingActionReplys, existingApiReplys) => {
         if (typeof process.send === 'function') {
             process.send({
                 type: 'ipc:data',
-                data: {
-                    action: data.action,
-                    apiId: data.apiId,
-                    DeviceId: data.DeviceId,
-                    payload: payload
-                }
+                data: sanitizeForSerialization(createApiResponseEnvelope(data, payload))
             });
         }
     };
@@ -127,17 +126,10 @@ const cbpPlatformIPC = (open, existingActionReplys, existingApiReplys) => {
         try {
             const msg = typeof message === 'string' ? JSON.parse(message) : message;
             if (msg?.type === 'ipc:data') {
-                const data = msg.data;
-                if (data?.apiId) {
-                    for (const cb of apiReplys) {
-                        void cb(data, val => replyApi(data, val));
-                    }
-                }
-                else if (data?.actionId) {
-                    for (const cb of actionReplys) {
-                        void cb(data, val => replyAction(data, val));
-                    }
+                if (dispatchLegacyApiHandlers(apiReplys, replyApi, msg.data)) {
+                    return;
                 }
+                dispatchLegacyActionHandlers(actionReplys, replyAction, msg.data);
             }
         }
         catch (error) {
@@ -188,29 +180,20 @@ const cbpPlatform = (url, options = {
         if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            global.chatbotPlatform.send(flattedJSON.stringify(sanitizeForSerialization(data)));
+            const envelope = createEventEnvelope(data);
+            global.chatbotPlatform.send(flattedJSON.stringify(sanitizeForSerialization(envelope)));
         }
     };
     const actionReplys = [];
     const apiReplys = [];
     const replyAction = (data, payload) => {
         if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
-            global.chatbotPlatform.send(flattedJSON.stringify({
-                action: data.action,
-                payload: payload,
-                actionId: data.actionId,
-                DeviceId: data.DeviceId
-            }));
+            global.chatbotPlatform.send(flattedJSON.stringify(createActionResponseEnvelope(data, payload)));
         }
     };
     const replyApi = (data, payload) => {
         if (global.chatbotPlatform?.readyState === WebSocket.OPEN) {
-            global.chatbotPlatform.send(flattedJSON.stringify({
-                action: data.action,
-                apiId: data.apiId,
-                DeviceId: data.DeviceId,
-                payload: payload
-            }));
+            global.chatbotPlatform.send(flattedJSON.stringify(createApiResponseEnvelope(data, payload)));
         }
     };
     const onactions = (reply) => {
@@ -227,16 +210,10 @@ const cbpPlatform = (url, options = {
         onMessage: (messageStr) => {
             try {
                 const data = flattedJSON.parse(messageStr);
-                if (data.apiId) {
-                    for (const cb of apiReplys) {
-                        void cb(data, val => replyApi(data, val));
-                    }
-                }
-                else if (data.actionId) {
-                    for (const cb of actionReplys) {
-                        void cb(data, val => replyAction(data, val));
-                    }
+                if (dispatchLegacyApiHandlers(apiReplys, replyApi, data)) {
+                    return;
                 }
+                dispatchLegacyActionHandlers(actionReplys, replyAction, data);
             }
             catch (error) {
                 logger.error({

package/lib/cbp/normalize.d.ts

@@ -0,0 +1,16 @@
+import type { Actions, Apis } from '../types';
+import type { Result } from '../core/utils';
+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;