alemonjs 2.1.42 → 2.1.43

package/lib/app/message-api.js

@@ -45,7 +45,6 @@ class MessageDirect {
             }
         });
     }
-    ;
     async sendToUser(params) {
         if (!params.OpenID || typeof params.OpenID !== 'string') {
             logger.error({
@@ -65,7 +64,6 @@ class MessageDirect {
             }
         });
     }
-    ;
 }
 const sendToChannel = async (SpaceId, data) => {
     if (!SpaceId || typeof SpaceId !== 'string') {

package/lib/cbp/connects/platform.js

@@ -5,7 +5,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import '../../core/utils.js';
+import { sanitizeForSerialization } from '../../core/utils.js';
 import { createWSConnector } from './base.js';
 import { createDirectClient } from '../../process/direct-channel.js';
 
@@ -88,7 +88,7 @@ const cbpPlatformIPC = (open, existingActionReplys, existingApiReplys) => {
         if (typeof process.send === 'function') {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: sanitizeForSerialization(data) });
         }
     };
     const replyAction = (data, payload) => {
@@ -188,7 +188,7 @@ const cbpPlatform = (url, options = {
         if (global.chatbotPlatform && global.chatbotPlatform.readyState === WebSocket.OPEN) {
             data.DeviceId = deviceId;
             data.CreateAt = Date.now();
-            global.chatbotPlatform.send(flattedJSON.stringify(data));
+            global.chatbotPlatform.send(flattedJSON.stringify(sanitizeForSerialization(data)));
         }
     };
     const actionReplys = [];

package/lib/cbp/processor/actions.js

@@ -3,7 +3,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { createResult } from '../../core/utils.js';
+import { sanitizeForSerialization, createResult } from '../../core/utils.js';
 import { generateUniqueId, deviceId, actionResolves, actionTimeouts, timeoutTime } from './config.js';
 import { getDirectSend } from './transport.js';
 
@@ -24,14 +24,15 @@ const sendAction = (data) => {
     return new Promise(resolve => {
         data.actionId = actionId;
         data.DeviceId = deviceId;
+        const safeData = sanitizeForSerialization(data);
         const directSend = getDirectSend();
         if (directSend) {
-            directSend(data);
+            directSend(safeData);
             setupActionResolve(actionId, resolve);
             return;
         }
         if (process.env.__ALEMON_IPC === '1' && typeof process.send === 'function') {
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: safeData });
             setupActionResolve(actionId, resolve);
             return;
         }
@@ -39,7 +40,7 @@ const sendAction = (data) => {
             resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
             return;
         }
-        global.chatbotClient?.send(flattedJSON.stringify(data));
+        global.chatbotClient?.send(flattedJSON.stringify(safeData));
         setupActionResolve(actionId, resolve);
     });
 };

package/lib/cbp/processor/api.js

@@ -2,7 +2,7 @@ import { ResultCode } from '../../core/variable.js';
 import 'fs';
 import 'path';
 import 'yaml';
-import { createResult } from '../../core/utils.js';
+import { sanitizeForSerialization, createResult } from '../../core/utils.js';
 import { generateUniqueId, deviceId, apiResolves, apiTimeouts, timeoutTime } from './config.js';
 import * as flattedJSON from 'flatted';
 import { getDirectSend } from './transport.js';
@@ -24,14 +24,15 @@ const sendAPI = (data) => {
     return new Promise(resolve => {
         data.apiId = ApiId;
         data.DeviceId = deviceId;
+        const safeData = sanitizeForSerialization(data);
         const directSend = getDirectSend();
         if (directSend) {
-            directSend(data);
+            directSend(safeData);
             setupApiResolve(ApiId, resolve);
             return;
         }
         if (process.env.__ALEMON_IPC === '1' && typeof process.send === 'function') {
-            process.send({ type: 'ipc:data', data });
+            process.send({ type: 'ipc:data', data: safeData });
             setupApiResolve(ApiId, resolve);
             return;
         }
@@ -39,7 +40,7 @@ const sendAPI = (data) => {
             resolve([createResult(ResultCode.Fail, 'Chatbot client is not available', null)]);
             return;
         }
-        global.chatbotClient?.send(flattedJSON.stringify(data));
+        global.chatbotClient?.send(flattedJSON.stringify(safeData));
         setupApiResolve(ApiId, resolve);
     });
 };

package/lib/core/index.js

@@ -1,3 +1,3 @@
 export { ResultCode } from './variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './config.js';
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './utils.js';

package/lib/core/utils.d.ts

@@ -17,6 +17,7 @@ export declare const getRecursiveDirFiles: (dir: string, condition?: (func: Dire
     name: string;
 }[];
 export declare const showErrorModule: (e: Error) => void;
+export declare const sanitizeForSerialization: (data: any) => any;
 export declare const getInputExportPath: (input?: string) => any;
 export type Result<T = any> = {
     code: ResultCode;

package/lib/core/utils.js

@@ -96,6 +96,10 @@ const showErrorModule = (e) => {
         data: e
     });
 };
+const sanitizeForSerialization = (data) => {
+    const flatted = require('flatted');
+    return flatted.parse(flatted.stringify(data));
+};
 const createExports = (packageJson) => {
     if (packageJson?.exports) {
         if (typeof packageJson.exports === 'string') {
@@ -131,4 +135,4 @@ const createResult = (code, message, data) => {
     };
 };
 
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey };
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey };

package/lib/index.js

@@ -1,7 +1,7 @@
 export { ActionsEventEnum } from './types/event/actions.js';
 export { ResultCode } from './core/variable.js';
 export { getConfig, getConfigValue, onWatchConfigValue } from './core/config.js';
-export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
+export { createEventName, createHash, createResult, fastHash, getCachedRegExp, getInputExportPath, getRecursiveDirFiles, sanitizeForSerialization, showErrorModule, stringToNumber, useUserHashKey } from './core/utils.js';
 export { cbpClient } from './cbp/connects/client.js';
 export { cbpPlatform } from './cbp/connects/platform.js';
 export { cbpServer } from './cbp/server/main.js';

package/lib/process/direct-channel.js

@@ -3,6 +3,7 @@ import * as v8 from 'v8';
 import * as os from 'os';
 import * as path from 'path';
 import * as fs from 'fs';
+import * as flattedJSON from 'flatted';
 
 const generateSocketPath = () => {
     if (process.platform === 'win32') {
@@ -11,7 +12,8 @@ const generateSocketPath = () => {
     return path.join(os.tmpdir(), `alemon-direct-${process.pid}-${Date.now()}.sock`);
 };
 const encodeMessage = (data) => {
-    const serialized = v8.serialize(data);
+    const safeData = flattedJSON.parse(flattedJSON.stringify(data));
+    const serialized = v8.serialize(safeData);
     const buf = Buffer.allocUnsafe(4 + serialized.length);
     buf.writeUInt32BE(serialized.length, 0);
     serialized.copy(buf, 4);

package/lib/process/ipc-bridge.js

@@ -1,6 +1,10 @@
 import { WebSocket } from 'ws';
 import { fullClient } from '../cbp/processor/config.js';
 import * as flattedJSON from 'flatted';
+import 'fs';
+import 'path';
+import 'yaml';
+import { sanitizeForSerialization } from '../core/utils.js';
 
 let platformChild = null;
 let clientChild = null;
@@ -13,12 +17,13 @@ const setClientChild = (child) => {
 const getPlatformChild = () => platformChild;
 const getClientChild = () => clientChild;
 const forwardFromPlatform = (data) => {
+    const safeData = sanitizeForSerialization(data);
     if (clientChild?.connected) {
-        clientChild.send({ type: 'ipc:data', data });
+        clientChild.send({ type: 'ipc:data', data: safeData });
     }
     if (fullClient.size > 0) {
         try {
-            const messageStr = flattedJSON.stringify(data);
+            const messageStr = flattedJSON.stringify(safeData);
             fullClient.forEach((ws, id) => {
                 if (ws.readyState === WebSocket.OPEN) {
                     ws.send(messageStr);
@@ -33,12 +38,13 @@ const forwardFromPlatform = (data) => {
     }
 };
 const forwardFromClient = (data) => {
+    const safeData = sanitizeForSerialization(data);
     if (platformChild?.connected) {
-        platformChild.send({ type: 'ipc:data', data });
+        platformChild.send({ type: 'ipc:data', data: safeData });
     }
     if (global.__sandbox && global.testoneClient) {
         try {
-            const messageStr = typeof data === 'string' ? data : flattedJSON.stringify(data);
+            const messageStr = typeof safeData === 'string' ? safeData : flattedJSON.stringify(safeData);
             if (global.testoneClient.readyState === WebSocket.OPEN) {
                 global.testoneClient.send(messageStr);
             }

package/package.json

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