alemonjs 2.1.83-alpha.4 → 2.1.83-alpha.6

package/lib/application/index.d.ts

@@ -2,7 +2,7 @@ export * from '../types/index.js';
 export { defineChildren } from './define-children.js';
 export { defineResponse } from './define-response.js';
 export { defineMiddleware } from './define-middleware.js';
-export { defineRouter } from './define-router.js';
+export { defineRouter, lazy, runHandler } from './define-router.js';
 export * from './expose.js';
 export * from './hooks/index.js';
 export * from './schedule.js';
@@ -10,7 +10,20 @@ export * from './format/message-api.js';
 export * from './format/message-format.js';
 export * from './format/message-format-old.js';
 export * from './router/main.js';
+export { validateRouteArgsForCommand } from './router/validator.js';
 export * from './runtime/event-response.js';
 export * from './runtime/event-middleware.js';
 export { createSelects, onSelects, onState, unChildren, unState, useState } from './runtime/event-utils.js';
 export { onGroup } from './runtime/event-group.js';
+export { Core, Response, ResponseMiddleware, MiddlewareTree, ResponseTree, ResponseRouter, MiddlewareRouter, Middleware, SubscribeList, StateSubscribe, State, ChildrenApp, registerRuntimeApp, updateRuntimeAppStatus, updateRuntimeAppCapabilities, setRuntimeAppKoaRouters, getRuntimeAppKoaRouters, clearRuntimeAppKoaRouters, listRuntimeAppKoaRouters, getRuntimeApp, toRuntimeAppSnapshot, listRuntimeApps, disposeRuntimeApp, disposeAllRuntimeApps, hasRuntimeAppCapability, bumpStoreVersion, getSubscribeList, getChildrenApp, listChildrenApps, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, core } from './runtime/store.js';
+export type { RuntimeAppStatus, RuntimeAppCapability, RuntimeAppError, RuntimeAppRecord } from './runtime/store.js';
+export { loadChildren, loadChildrenFile } from './runtime/load-modules/loadChild.js';
+export { run, loadModels } from './runtime/load-modules/load.js';
+export { onProcessor, OnProcessor } from './runtime/event-processor.js';
+export { expendCycle } from './runtime/event-processor-cycle.js';
+export { expendEvent } from './runtime/event-processor-event.js';
+export { expendMiddleware } from './runtime/event-processor-middleware.js';
+export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './runtime/event-processor-subscribe.js';
+export { withEventContext, withProcessorTrace, getCurrentEvent, getCurrentNext, getCurrentAppName, getCurrentPhase, finishCurrentTrace, markEventSendAttempt, markEventSendSuccess, markEventSendFailure, recordEventSendResults } from './runtime/hook-event-context.js';
+export { registerAppDir, unregisterAppDir, scheduleInterval, scheduleTimeout, scheduleCron, schedulePause, scheduleResume, scheduleCancel, scheduleCancelByApp, scheduleCancelAll, scheduleList } from './runtime/schedule-store.js';
+export { cbpClient } from './runtime/cbp/index.js';

package/lib/application/index.js

@@ -2,7 +2,7 @@ export { ActionsEventEnum } from '../types/event/actions.js';
 export { defineChildren } from './define-children.js';
 export { defineResponse } from './define-response.js';
 export { defineMiddleware } from './define-middleware.js';
-export { defineRouter } from './define-router.js';
+export { defineRouter, lazy, runHandler } from './define-router.js';
 export { Expose, clearAllExpose, disposeExpose, registerExpose } from './expose.js';
 export { useAnnounce } from './hooks/announce.js';
 export { useChannel } from './hooks/channel.js';
@@ -29,8 +29,30 @@ export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Ma
 export { Router } from './router/dsl.js';
 export { checkFallbackHint } from './router/fallback.js';
 export { normalizeRoutePath, parseMessageText } from './router/parser.js';
-export { validateRouteArgs } from './router/validator.js';
+export { validateRouteArgs, validateRouteArgsForCommand } from './router/validator.js';
 export { OnResponse, onResponse } from './runtime/event-response.js';
 export { OnMiddleware, onMiddleware } from './runtime/event-middleware.js';
 export { createSelects, onSelects, onState, unChildren, unState, useState } from './runtime/event-utils.js';
 export { onGroup } from './runtime/event-group.js';
+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 } from './runtime/store.js';
+export { loadChildren, loadChildrenFile } from './runtime/load-modules/loadChild.js';
+export { loadModels, run } from './runtime/load-modules/load.js';
+export { OnProcessor, onProcessor } from './runtime/event-processor.js';
+export { expendCycle } from './runtime/event-processor-cycle.js';
+export { expendEvent } from './runtime/event-processor-event.js';
+export { expendMiddleware } from './runtime/event-processor-middleware.js';
+export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './runtime/event-processor-subscribe.js';
+export { finishCurrentTrace, getCurrentAppName, getCurrentEvent, getCurrentNext, getCurrentPhase, markEventSendAttempt, markEventSendFailure, markEventSendSuccess, recordEventSendResults, withEventContext, withProcessorTrace } from './runtime/hook-event-context.js';
+export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './runtime/schedule-store.js';
+export { cbpClient } from './runtime/cbp/connects/client.js';
+import 'flatted';
+import 'fs';
+import 'path';
+import 'yaml';
+import '../common/logger.js';
+import '../common/utils.js';
+import 'net';
+import 'v8';
+import 'os';
+import '../common/cbp/runtime.js';
+import 'ws';

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

@@ -115,9 +115,24 @@ const dispatchRegisteredKoaRouters = async (ctx) => {
             try {
                 const matchedContext = ctx;
                 const beforeMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
-                await koaRouter.routes()(ctx, async () => { });
+                const beforeStatus = ctx.status;
+                const beforeBody = ctx.body;
+                const beforeMatchedRoute = ctx._matchedRoute;
+                const beforeRouterPath = ctx.routerPath;
+                let fallthrough = false;
+                await koaRouter.routes()(ctx, async () => {
+                    fallthrough = true;
+                });
                 const afterMatched = Array.isArray(matchedContext.matched) ? matchedContext.matched.length : 0;
-                if (afterMatched <= beforeMatched) {
+                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 koaRouter.allowedMethods()(ctx, async () => { });

package/lib/index.d.ts

@@ -4,6 +4,8 @@ export * from './common/index.js';
 export * from './core/index.js';
 export * from './platform/index.js';
 export * from './application/index.js';
+export { cbpServer } from './core/cbp/index.js';
+export { Result } from './common/variable.js';
 export { start } from './main.js';
 export * from './main.js';
 export * as common from './common/index.js';

package/lib/index.js

@@ -7,20 +7,24 @@ import * as index$3 from './platform/index.js';
 export { index$3 as platform };
 import * as index from './application/index.js';
 export { index as application };
+export { cbpServer } from './core/cbp/server/main.js';
+export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, Result, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorMaxMapSize, processorRepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime } from './common/variable.js';
 export { start } from './core/start.js';
 export { A, Body, Component, DOCTYPE, Div, H1, Head, Html, P, Style, Title, createElement, renderToString } from './common/react.js';
 export { Attachment, Audio, BT, Button, Image, ImageFile, ImageURL, Link, MD, Markdown, MarkdownOriginal, Mention, Text, Video } from './application/format/message-format-old.js';
+export { ChildrenApp, Core, Middleware, MiddlewareRouter, MiddlewareTree, ProcessorEventAutoClearMap, ProcessorEventUserAutoClearMap, Response, ResponseMiddleware, ResponseRouter, ResponseTree, State, StateSubscribe, SubscribeList, bumpStoreVersion, clearRuntimeAppKoaRouters, disposeAllRuntimeApps, disposeRuntimeApp, getChildrenApp, getRuntimeApp, getRuntimeAppKoaRouters, getSubscribeList, hasRuntimeAppCapability, listChildrenApps, listRuntimeAppKoaRouters, listRuntimeApps, registerRuntimeApp, setRuntimeAppKoaRouters, toRuntimeAppSnapshot, updateRuntimeAppCapabilities, updateRuntimeAppStatus } from './application/runtime/store.js';
 export { DEVICE_ID_HEADER, FULL_RECEIVE_HEADER, HEARTBEAT_INTERVAL, USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE_MAP, reconnectInterval, timeoutTime } from './common/cbp/constants.js';
-export { EventMessageText, Fail, FailAuth, FailInternal, FailParams, Ok, ResultCode, Warn, defaultLogin, defaultPlatformCommonPrefix, defaultPlatformPrefix, defaultPort, filePrefixCommon, fileSuffixMiddleware, fileSuffixResponse, processorMaxMapSize, processorRepeatedClearSize, processorRepeatedClearTimeMax, processorRepeatedClearTimeMin, processorRepeatedEventTime, processorRepeatedUserTime } from './common/variable.js';
 export { Expose, clearAllExpose, disposeExpose, registerExpose } from './application/expose.js';
 export { Format, FormatButtonGroup, FormatMarkDown, FormatSelect } from './application/format/message-format.js';
 export { FormatEvent, wrapEvent } from './platform/event-format.js';
 export { Logger, logger } from './common/logger.js';
 export { MessageDirect, createDataFormat, format, getMessageIntent, sendToChannel, sendToUser } from './application/format/message-api.js';
 export { OnMiddleware, onMiddleware } from './application/runtime/event-middleware.js';
+export { OnProcessor, onProcessor } from './application/runtime/event-processor.js';
 export { OnResponse, onResponse } from './application/runtime/event-response.js';
 export { Router } from './application/router/dsl.js';
 export { SinglyLinkedList } from './common/SinglyLinkedList.js';
+export { cbpClient } from './application/runtime/cbp/connects/client.js';
 export { cbpPlatform } from './platform/cbp-platform.js';
 export { checkFallbackHint } from './application/router/fallback.js';
 export { clearInterval, clearTimeout, listSchedule, pauseSchedule, resumeSchedule, setCron, setInterval, setTimeout } from './application/schedule.js';
@@ -37,11 +41,19 @@ export { defineChildren } from './application/define-children.js';
 export { defineMiddleware } from './application/define-middleware.js';
 export { definePlatform } from './platform/define-platform.js';
 export { defineResponse } from './application/define-response.js';
-export { defineRouter } from './application/define-router.js';
+export { defineRouter, lazy, runHandler } from './application/define-router.js';
 export { deviceId, generateUniqueId } from './common/cbp/runtime.js';
+export { expendCycle } from './application/runtime/event-processor-cycle.js';
+export { expendEvent } from './application/runtime/event-processor-event.js';
+export { expendMiddleware } from './application/runtime/event-processor-middleware.js';
+export { expendSubscribe, expendSubscribeCreate, expendSubscribeMount, expendSubscribeUnmount } from './application/runtime/event-processor-subscribe.js';
+export { finishCurrentTrace, getCurrentAppName, getCurrentEvent, getCurrentNext, getCurrentPhase, markEventSendAttempt, markEventSendFailure, markEventSendSuccess, recordEventSendResults, withEventContext, withProcessorTrace } from './application/runtime/hook-event-context.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './common/config.js';
+export { loadChildren, loadChildrenFile } from './application/runtime/load-modules/loadChild.js';
+export { loadModels, run } from './application/runtime/load-modules/load.js';
 export { normalizeRoutePath, parseMessageText } from './application/router/parser.js';
 export { onGroup } from './application/runtime/event-group.js';
+export { registerAppDir, scheduleCancel, scheduleCancelAll, scheduleCancelByApp, scheduleCron, scheduleInterval, scheduleList, schedulePause, scheduleResume, scheduleTimeout, unregisterAppDir } from './application/runtime/schedule-store.js';
 export { useAnnounce } from './application/hooks/announce.js';
 export { useChannel } from './application/hooks/channel.js';
 export { useClient } from './application/hooks/client.js';
@@ -60,4 +72,4 @@ export { useRequest } from './application/hooks/request.js';
 export { useRole } from './application/hooks/role.js';
 export { useRoute } from './application/hooks/route.js';
 export { useUser } from './application/hooks/user.js';
-export { validateRouteArgs } from './application/router/validator.js';
+export { validateRouteArgs, validateRouteArgsForCommand } from './application/router/validator.js';

package/package.json

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