alemonjs 2.1.83-alpha.2 → 2.1.83-alpha.4

package/lib/application/index.d.ts

@@ -10,3 +10,7 @@ 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 * 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';

package/lib/application/index.js

@@ -30,3 +30,7 @@ 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 { 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';

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

@@ -17,8 +17,9 @@ async function collectMiddlewares(routeFile) {
             }
         }
         const parent = dirname(dir);
-        if (parent === dir)
+        if (parent === dir) {
             break;
+        }
         dir = parent;
     }
     return middlewares;

package/lib/core/cbp/server/main.js

@@ -14,11 +14,29 @@ import 'v8';
 import 'os';
 import { USER_AGENT_HEADER, USER_AGENT_HEADER_VALUE_MAP, DEVICE_ID_HEADER, FULL_RECEIVE_HEADER } from '../../../common/cbp/constants.js';
 import '../../../common/cbp/runtime.js';
-import { normalizeInboundMessage, getNormalizedDeviceId, getNormalizedEventRouteId } from '../../../common/cbp/normalize.js';
+import { normalizeInboundMessage, getNormalizedDeviceId, getNormalizedEventRouteId, isNormalizedActionRequest, toLegacyActionData, isNormalizedApiRequest, toLegacyApiData } from '../../../common/cbp/normalize.js';
 import { platformClient, childrenClient, fullClient, childrenBind, clientBindCount, unbindClient, bindChannelToClient } from '../processor/config.js';
 import { createTestOneController } from './testone.js';
 import { getClientChild } from '../../process/ipc-bridge.js';
 
+const stringifyForSocket = (payload) => {
+    return flattedJSON.stringify(payload);
+};
+const normalizeTestOneOutboundMessage = (message) => {
+    try {
+        const inbound = flattedJSON.parse(String(message));
+        const normalized = normalizeInboundMessage(inbound);
+        if (isNormalizedActionRequest(normalized)) {
+            return stringifyForSocket(toLegacyActionData(normalized));
+        }
+        if (isNormalizedApiRequest(normalized)) {
+            return stringifyForSocket(toLegacyApiData(normalized));
+        }
+    }
+    catch {
+    }
+    return message.toString();
+};
 const routeNormalizedMessage = (message, input) => {
     const normalized = normalizeInboundMessage(input);
     if (!normalized) {
@@ -156,7 +174,7 @@ const setChildrenClient = (originId, ws) => {
     ws.on('message', (message) => {
         if (global.__sandbox) {
             if (global.testoneClient?.readyState === WebSocket.OPEN) {
-                global.testoneClient.send(message.toString());
+                global.testoneClient.send(normalizeTestOneOutboundMessage(message.toString()));
             }
             return;
         }
@@ -193,7 +211,7 @@ const setFullClient = (originId, ws) => {
     ws.on('message', (message) => {
         if (global.__sandbox) {
             if (global.testoneClient?.readyState === WebSocket.OPEN) {
-                global.testoneClient.send(message.toString());
+                global.testoneClient.send(normalizeTestOneOutboundMessage(message.toString()));
             }
             return;
         }

package/lib/core/process/ipc-bridge.js

@@ -10,6 +10,7 @@ import 'net';
 import 'v8';
 import 'os';
 import '../../common/cbp/runtime.js';
+import { normalizeInboundMessage, isNormalizedActionRequest, toLegacyActionData, isNormalizedApiRequest, toLegacyApiData } from '../../common/cbp/normalize.js';
 
 let platformChild = null;
 let clientChild = null;
@@ -49,7 +50,15 @@ const forwardFromClient = (data) => {
     }
     if (global.__sandbox && global.testoneClient) {
         try {
-            const messageStr = typeof safeData === 'string' ? safeData : flattedJSON.stringify(safeData);
+            const normalized = normalizeInboundMessage(safeData);
+            let outbound = safeData;
+            if (isNormalizedActionRequest(normalized)) {
+                outbound = toLegacyActionData(normalized);
+            }
+            else if (isNormalizedApiRequest(normalized)) {
+                outbound = toLegacyApiData(normalized);
+            }
+            const messageStr = typeof outbound === 'string' ? outbound : flattedJSON.stringify(outbound);
             if (global.testoneClient.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(messageStr);
             }

package/lib/index.d.ts

@@ -1,6 +1,11 @@
 export * from './types/index.js';
 export * from './global.js';
+export * from './common/index.js';
+export * from './core/index.js';
+export * from './platform/index.js';
+export * from './application/index.js';
 export { start } from './main.js';
+export * from './main.js';
 export * as common from './common/index.js';
 export * as core from './core/index.js';
 export * as platform from './platform/index.js';

package/lib/index.js

@@ -1,5 +1,4 @@
 export { ActionsEventEnum } from './types/event/actions.js';
-export { start } from './core/start.js';
 import * as index$1 from './common/index.js';
 export { index$1 as common };
 import * as index$2 from './core/index.js';
@@ -8,3 +7,57 @@ 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 { 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 { 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 { OnResponse, onResponse } from './application/runtime/event-response.js';
+export { Router } from './application/router/dsl.js';
+export { SinglyLinkedList } from './common/SinglyLinkedList.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';
+export { createActionRequestEnvelope, createActionResponseEnvelope, createApiRequestEnvelope, createApiResponseEnvelope, createEventEnvelope, getNormalizedDeviceId, getNormalizedEventRouteId, isCBPEnvelope, isNormalizedActionRequest, isNormalizedApiRequest, normalizeInboundMessage, toLegacyActionData, toLegacyApiData } from './common/cbp/normalize.js';
+export { createDirectClient, createDirectServer, generateSocketPath } from './common/direct-channel.js';
+export { createEvent, useEvent } from './application/hooks/event.js';
+export { createEventName, createHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber } from './common/utils.js';
+export { createEventValue } from './platform/event-value.js';
+export { createResult } from './common/result.js';
+export { createSelects, onSelects, onState, unChildren, unState, useState } from './application/runtime/event-utils.js';
+export { createUserHashKey, fastHash, isMaster, matchIn, useUserHashKey } from './common/identity.js';
+export { createWSConnector } from './common/cbp/ws-connector.js';
+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 { deviceId, generateUniqueId } from './common/cbp/runtime.js';
+export { getConfig, getConfigValue, onWatchConfigValue } from './common/config.js';
+export { normalizeRoutePath, parseMessageText } from './application/router/parser.js';
+export { onGroup } from './application/runtime/event-group.js';
+export { useAnnounce } from './application/hooks/announce.js';
+export { useChannel } from './application/hooks/channel.js';
+export { useClient } from './application/hooks/client.js';
+export { useGuild } from './application/hooks/guild.js';
+export { useHeartbeat } from './common/cbp/heartbeat.js';
+export { useHistory } from './application/hooks/history.js';
+export { useMe } from './application/hooks/me.js';
+export { useMedia } from './application/hooks/media.js';
+export { useMember } from './application/hooks/member.js';
+export { useMention } from './application/hooks/mention.js';
+export { useMessage, useSend, useSends } from './application/hooks/message.js';
+export { useObserver, useSubscribe } from './application/hooks/subscribe.js';
+export { usePermission } from './application/hooks/permission.js';
+export { useReaction } from './application/hooks/reaction.js';
+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';

package/package.json

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