alemonjs 2.1.66 → 2.1.67

package/lib/app/event-processor-callHandler.js

@@ -2,7 +2,7 @@ import 'fs';
 import 'path';
 import 'yaml';
 import { showErrorModule } from '../core/utils.js';
-import { withEventContext } from './hook-event-context.js';
+import { withEventContext, finishCurrentTrace } from './hook-event-context.js';
 
 const createCallHandler = valueEvent => {
     const callHandler = (currents, nextEvent) => {
@@ -26,10 +26,15 @@ const createCallHandler = valueEvent => {
                 };
                 const res = await withEventContext(valueEvent, nextFn, () => currents[index](valueEvent, nextFn));
                 if (res !== true) {
+                    if (!isNext) {
+                        finishCurrentTrace('consumed');
+                        return;
+                    }
                     isClose = true;
                 }
             }
             catch (err) {
+                finishCurrentTrace('error');
                 showErrorModule(err);
                 return;
             }

package/lib/app/event-processor-cycle.d.ts

@@ -1,2 +1,2 @@
 import { Events, EventKeys } from '../types';
-export declare const expendCycle: <T extends EventKeys>(valueEvent: Events[T], select: T, config?: any) => void;
+export declare const expendCycle: <T extends EventKeys>(valueEvent: Events[T], select: T, _config?: any) => void;

package/lib/app/event-processor-cycle.js

@@ -1,42 +1,12 @@
-import { ResultCode } from '../core/variable.js';
 import { expendEvent } from './event-processor-event.js';
 import { expendMiddleware } from './event-processor-middleware.js';
 import { expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './event-processor-subscribe.js';
-import { getConfigValue } from '../core/config.js';
+import { finishCurrentTrace } from './hook-event-context.js';
 
-const showLog = (event, select) => {
-    if (process.env.NODE_ENV === 'development') {
-        const log = {
-            Name: select
-        };
-        for (const key in event) {
-            if (Object.prototype.hasOwnProperty.call(event, key)) {
-                const value = event[key];
-                if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-                    log[key] = value;
-                }
-            }
-        }
-        logger.debug({
-            code: ResultCode.Ok,
-            message: 'new event',
-            data: log
-        });
-    }
-    else {
-        const parts = [`[Name:${select}]`];
-        const fields = ['GuildId', 'ChannelId', 'UserKey', 'UserId', 'MessageId', 'MessageText'];
-        for (const f of fields) {
-            const v = event[f];
-            if (typeof v === 'string' && v !== '') {
-                parts.push(`[${f}:${v}]`);
-            }
-        }
-        logger.info(parts.join(''));
-    }
-};
-const expendCycle = (valueEvent, select, config) => {
-    const nextEnd = () => { };
+const expendCycle = (valueEvent, select, _config) => {
+    const nextEnd = () => {
+        finishCurrentTrace('completed');
+    };
     const nextUnMount = (cn, ...cns) => {
         if (cn) {
             nextEnd(...cns);
@@ -65,16 +35,6 @@ const expendCycle = (valueEvent, select, config) => {
         }
         void expendMiddleware(valueEvent, select, nextMount);
     };
-    const value = config ?? getConfigValue() ?? {};
-    if (Array.isArray(value?.logs?.channel_id)) {
-        const channelIds = value?.logs?.channel_id;
-        if (channelIds && channelIds.length > 0 && channelIds.includes(valueEvent['ChannelId'])) {
-            showLog(valueEvent, select);
-        }
-    }
-    else {
-        showLog(valueEvent, select);
-    }
     void expendSubscribeCreate(valueEvent, select, nextCreate);
 };
 

package/lib/app/event-processor-subscribe.js

@@ -1,6 +1,10 @@
+import 'fs';
+import 'path';
+import 'yaml';
+import { showErrorModule } from '../core/utils.js';
 import { getSubscribeList } from './store.js';
 import { SubscribeStatus } from './config.js';
-import { withEventContext } from './hook-event-context.js';
+import { withEventContext, finishCurrentTrace } from './hook-event-context.js';
 
 const expendSubscribe = (valueEvent, select, next, choose) => {
     const subListValue = getSubscribeList(choose, select);
@@ -51,13 +55,35 @@ const expendSubscribe = (valueEvent, select, next, choose) => {
             }
         };
         onPaused();
+        let isContinue = false;
         const Continue = (cn, ...cns) => {
             onActive();
             if (cn) {
+                isContinue = true;
                 nextObserver(...cns);
             }
         };
-        withEventContext(valueEvent, Continue, () => item.data.current(valueEvent, Continue));
+        try {
+            const result = withEventContext(valueEvent, Continue, () => item.data.current(valueEvent, Continue));
+            if (result && typeof result.then === 'function') {
+                void result.then(() => {
+                    if (!isContinue) {
+                        finishCurrentTrace('consumed');
+                    }
+                }, error => {
+                    finishCurrentTrace('error');
+                    showErrorModule(error);
+                });
+                return;
+            }
+            if (!isContinue) {
+                finishCurrentTrace('consumed');
+            }
+        }
+        catch (error) {
+            finishCurrentTrace('error');
+            showErrorModule(error);
+        }
     };
     nextObserver();
 };

package/lib/app/event-processor.js

@@ -1,6 +1,7 @@
 import { getConfigValue } from '../core/config.js';
 import { processorRepeatedClearTimeMin, processorRepeatedClearTimeMax, processorRepeatedEventTime, processorRepeatedUserTime, processorRepeatedClearSize, processorMaxMapSize } from '../core/variable.js';
 import { expendCycle } from './event-processor-cycle.js';
+import { withProcessorTrace, finishCurrentTrace } from './hook-event-context.js';
 import { ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap } from './store.js';
 import { getCachedRegExp, matchIn, fastHash } from '../core/utils.js';
 
@@ -58,85 +59,99 @@ const callback = () => {
 };
 setTimeout(callback, processorRepeatedClearTimeMin);
 const onProcessor = (name, event, data) => {
-    const value = getConfigValue();
-    const disabledTextRegular = value?.disabled_text_regular;
-    if (disabledTextRegular && event['MessageText']) {
-        if (getCachedRegExp(disabledTextRegular).test(event['MessageText'])) {
-            return;
-        }
-    }
-    const disabledSelects = value?.disabled_selects ?? {};
-    if (disabledSelects[name]) {
-        return;
-    }
-    const disabledUserId = value?.disabled_user_id;
-    if (event['UserId'] && matchIn(disabledUserId, event['UserId'])) {
-        return;
-    }
-    const disabledUserKey = value?.disabled_user_key;
-    if (event['UserKey'] && matchIn(disabledUserKey, event['UserKey'])) {
-        return;
-    }
-    const redirectRegular = value?.redirect_regular ?? value?.redirect_text_regular;
-    const redirectTarget = value?.redirect_target ?? value?.redirect_text_target;
-    if (redirectRegular && redirectTarget && event['MessageText']) {
-        const cachedReg = getCachedRegExp(redirectRegular);
-        if (cachedReg.test(event['MessageText'])) {
-            event['MessageText'] = event['MessageText'].replace(cachedReg, redirectTarget);
-        }
-    }
-    const mappingText = value?.mapping_text ?? [];
-    if (event['MessageText']) {
-        for (const mapping of mappingText) {
-            const { regular, target } = mapping ?? {};
-            if (!regular) {
-                continue;
+    withProcessorTrace(name, event, () => {
+        try {
+            const value = getConfigValue();
+            const disabledTextRegular = value?.disabled_text_regular;
+            if (disabledTextRegular && event['MessageText']) {
+                if (getCachedRegExp(disabledTextRegular).test(event['MessageText'])) {
+                    finishCurrentTrace('filtered');
+                    return;
+                }
             }
-            const cachedReg = getCachedRegExp(regular);
-            if (cachedReg.test(event['MessageText'])) {
-                event['MessageText'] = event['MessageText'].replace(cachedReg, target);
+            const disabledSelects = value?.disabled_selects ?? {};
+            if (disabledSelects[name]) {
+                finishCurrentTrace('filtered');
+                return;
             }
+            const disabledUserId = value?.disabled_user_id;
+            if (event['UserId'] && matchIn(disabledUserId, event['UserId'])) {
+                finishCurrentTrace('filtered');
+                return;
+            }
+            const disabledUserKey = value?.disabled_user_key;
+            if (event['UserKey'] && matchIn(disabledUserKey, event['UserKey'])) {
+                finishCurrentTrace('filtered');
+                return;
+            }
+            const redirectRegular = value?.redirect_regular ?? value?.redirect_text_regular;
+            const redirectTarget = value?.redirect_target ?? value?.redirect_text_target;
+            if (redirectRegular && redirectTarget && event['MessageText']) {
+                const cachedReg = getCachedRegExp(redirectRegular);
+                if (cachedReg.test(event['MessageText'])) {
+                    event['MessageText'] = event['MessageText'].replace(cachedReg, redirectTarget);
+                }
+            }
+            const mappingText = value?.mapping_text ?? [];
+            if (event['MessageText']) {
+                for (const mapping of mappingText) {
+                    const { regular, target } = mapping ?? {};
+                    if (!regular) {
+                        continue;
+                    }
+                    const cachedReg = getCachedRegExp(regular);
+                    if (cachedReg.test(event['MessageText'])) {
+                        event['MessageText'] = event['MessageText'].replace(cachedReg, target);
+                    }
+                }
+            }
+            else {
+                event['MessageText'] = '';
+            }
+            const masterId = value?.master_id;
+            const masterKey = value?.master_key;
+            if (event['UserId'] && matchIn(masterId, event['UserId'])) {
+                event['isMaster'] = true;
+            }
+            else if (event['UserKey'] && matchIn(masterKey, event['UserKey'])) {
+                event['isMaster'] = true;
+            }
+            const botId = value?.bot_id;
+            const botKey = value?.bot_key;
+            if (event['UserId'] && matchIn(botId, event['UserId'])) {
+                event['isBot'] = true;
+            }
+            else if (event['UserKey'] && matchIn(botKey, event['UserKey'])) {
+                event['isBot'] = true;
+            }
+            const Now = Date.now();
+            const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processorRepeatedEventTime;
+            if (event['MessageId']) {
+                const MessageId = fastHash(event['MessageId']);
+                if (filter({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap }, MessageId)) {
+                    finishCurrentTrace('filtered');
+                    return;
+                }
+            }
+            const USER_INTERVAL = value?.processor?.repeated_user_time ?? processorRepeatedUserTime;
+            if (event['UserId']) {
+                const UserId = fastHash(event['UserId']);
+                if (filter({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAutoClearMap }, UserId)) {
+                    finishCurrentTrace('filtered');
+                    return;
+                }
+            }
+            if (data) {
+                event['value'] = data;
+            }
+            event['name'] = name;
+            expendCycle(event, name, value);
         }
-    }
-    else {
-        event['MessageText'] = '';
-    }
-    const masterId = value?.master_id;
-    const masterKey = value?.master_key;
-    if (event['UserId'] && matchIn(masterId, event['UserId'])) {
-        event['isMaster'] = true;
-    }
-    else if (event['UserKey'] && matchIn(masterKey, event['UserKey'])) {
-        event['isMaster'] = true;
-    }
-    const botId = value?.bot_id;
-    const botKey = value?.bot_key;
-    if (event['UserId'] && matchIn(botId, event['UserId'])) {
-        event['isBot'] = true;
-    }
-    else if (event['UserKey'] && matchIn(botKey, event['UserKey'])) {
-        event['isBot'] = true;
-    }
-    const Now = Date.now();
-    const EVENT_INTERVAL = value?.processor?.repeated_event_time ?? processorRepeatedEventTime;
-    if (event['MessageId']) {
-        const MessageId = fastHash(event['MessageId']);
-        if (filter({ Now, INTERVAL: EVENT_INTERVAL, store: ProcessorEventAutoClearMap }, MessageId)) {
-            return;
-        }
-    }
-    const USER_INTERVAL = value?.processor?.repeated_user_time ?? processorRepeatedUserTime;
-    if (event['UserId']) {
-        const UserId = fastHash(event['UserId']);
-        if (filter({ Now, INTERVAL: USER_INTERVAL, store: ProcessorEventUserAutoClearMap }, UserId)) {
-            return;
+        catch (error) {
+            finishCurrentTrace('error');
+            throw error;
         }
-    }
-    if (data) {
-        event['value'] = data;
-    }
-    event['name'] = name;
-    expendCycle(event, name, value);
+    });
 };
 const OnProcessor = (event, name) => {
     onProcessor(name, event);

package/lib/app/hook-event-context.d.ts

@@ -1,4 +1,7 @@
 import { EventKeys, Events } from '../types';
+export type EventTraceReason = 'filtered' | 'completed' | 'consumed' | 'error';
 export declare const withEventContext: <T extends EventKeys, R>(event: Events[T], next: (...args: boolean[]) => void, runner: () => R) => R;
+export declare const withProcessorTrace: <T extends EventKeys, R>(select: T, event: Events[T], runner: () => R) => R;
 export declare const getCurrentEvent: <T extends EventKeys>() => Events[T] | undefined;
 export declare const getCurrentNext: () => ((...args: boolean[]) => void) | undefined;
+export declare const finishCurrentTrace: (reason: EventTraceReason) => void;

package/lib/app/hook-event-context.js

@@ -1,8 +1,88 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { performance } from 'node:perf_hooks';
+import { getConfigValue } from '../core/config.js';
+import { ResultCode } from '../core/variable.js';
 
 const eventStore = new AsyncLocalStorage();
+const shouldShowLog = (event) => {
+    const value = getConfigValue() ?? {};
+    if (Array.isArray(value?.logs?.channel_id)) {
+        const channelIds = value.logs.channel_id;
+        return channelIds.length > 0 && channelIds.includes(event['ChannelId']);
+    }
+    return true;
+};
+const createLogData = (event, select, reason, duration) => {
+    const log = {
+        Name: select,
+        reason,
+        duration
+    };
+    for (const key in event) {
+        if (Object.prototype.hasOwnProperty.call(event, key)) {
+            const value = event[key];
+            if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+                log[key] = value;
+            }
+        }
+    }
+    return log;
+};
+const createLogText = (event, select, reason, duration) => {
+    const parts = [`[Name:${select}]`, `[reason:${reason}]`, `[duration:${duration}ms]`];
+    const fields = ['GuildId', 'ChannelId', 'UserKey', 'UserId', 'MessageId', 'MessageText'];
+    for (const f of fields) {
+        const v = event[f];
+        if (typeof v === 'string' && v !== '') {
+            parts.push(`[${f}:${v}]`);
+        }
+    }
+    return parts.join('');
+};
+const createEventTrace = (select) => {
+    const trace = {
+        select,
+        startTime: performance.now(),
+        ended: false,
+        finish(reason) {
+            if (trace.ended) {
+                return;
+            }
+            trace.ended = true;
+            const store = eventStore.getStore();
+            const event = store?.event;
+            const duration = Number((performance.now() - trace.startTime).toFixed(2));
+            if (!event || !shouldShowLog(event)) {
+                return;
+            }
+            if (process.env.NODE_ENV === 'development') {
+                logger.debug({
+                    code: ResultCode.Ok,
+                    message: 'event processor finished',
+                    data: createLogData(event, trace.select, reason, duration)
+                });
+                return;
+            }
+            logger.info(createLogText(event, trace.select, reason, duration));
+        }
+    };
+    return trace;
+};
 const withEventContext = (event, next, runner) => {
-    return eventStore.run({ event, next }, runner);
+    const current = eventStore.getStore();
+    return eventStore.run({
+        event,
+        next,
+        trace: current?.trace
+    }, runner);
+};
+const withProcessorTrace = (select, event, runner) => {
+    const current = eventStore.getStore();
+    return eventStore.run({
+        event,
+        next: current?.next,
+        trace: current?.trace ?? createEventTrace(select)
+    }, runner);
 };
 const getCurrentEvent = () => {
     return eventStore.getStore()?.event;
@@ -10,5 +90,8 @@ const getCurrentEvent = () => {
 const getCurrentNext = () => {
     return eventStore.getStore()?.next;
 };
+const finishCurrentTrace = (reason) => {
+    eventStore.getStore()?.trace?.finish(reason);
+};
 
-export { getCurrentEvent, getCurrentNext, withEventContext };
+export { finishCurrentTrace, getCurrentEvent, getCurrentNext, withEventContext, withProcessorTrace };

package/lib/app/index.js

@@ -34,7 +34,7 @@ export { useUser } from './hook-use/user.js';
 export { useObserver, useSubscribe } from './hook-use/subscribe.js';
 export { createEvent, useEvent } from './hook-use/event.js';
 export { clearInterval, clearTimeout, listSchedule, pauseSchedule, resumeSchedule, setCron, setInterval, setTimeout } from './api/schedule.js';
-export { getCurrentEvent, getCurrentNext, withEventContext } from './hook-event-context.js';
+export { finishCurrentTrace, getCurrentEvent, getCurrentNext, withEventContext, withProcessorTrace } from './hook-event-context.js';
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './message-api.js';

package/lib/index.js

@@ -41,7 +41,7 @@ export { useUser } from './app/hook-use/user.js';
 export { useObserver, useSubscribe } from './app/hook-use/subscribe.js';
 export { createEvent, useEvent } from './app/hook-use/event.js';
 export { clearInterval, clearTimeout, listSchedule, pauseSchedule, resumeSchedule, setCron, setInterval, setTimeout } from './app/api/schedule.js';
-export { getCurrentEvent, getCurrentNext, withEventContext } from './app/hook-event-context.js';
+export { finishCurrentTrace, getCurrentEvent, getCurrentNext, withEventContext, withProcessorTrace } from './app/hook-event-context.js';
 export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './app/schedule-store.js';
 export { createEventValue, createSelects, onSelects, onState, unChildren, unState, useState } from './app/event-utils.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './app/message-api.js';

package/package.json

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