alemonjs 2.1.83-alpha.3 → 2.1.83-alpha.4

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/package.json

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