monocart-reporter 1.7.2 → 1.7.4

package/lib/plugins/state/state.js

@@ -14,23 +14,6 @@ const defaultClientOptions = {
     timeout: 3000
 };
 
-const defaultStateOptions = {
-
-    server: defaultServerOptions,
-
-    // onReceive: function(... args) {
-    //     console.log('receive on server', args);
-    //     return ['custom response', ... args];
-    // },
-
-    // onClose: function(data, config) {
-    //     Object.assign(config.metadata, data);
-    // },
-
-    // key-value state data
-    data: {}
-};
-
 // ===============================================================================
 
 const clientMap = new Map();
@@ -93,34 +76,41 @@ const getActions = (stateData) => {
     };
 };
 
+const getResponseData = async (data, options) => {
+    let res;
+    // first argument is action name always
+    const action = data.shift();
+    if (action === 'send') {
+        // EC.logCyan('send', data[0]);
+        // send handler
+        if (typeof options.onReceive === 'function') {
+            res = await options.onReceive(... data);
+        }
+        return res;
+    }
+
+    // get/set/remove handler
+    const actions = getActions(options.data);
+    const handler = actions[action];
+    if (handler) {
+        res = handler.apply(options, data);
+    }
+    return res;
+};
+
 const onMessage = async (ws, buf, options) => {
     const message = JSON.parse(buf.toString());
     if (!message) {
+        Util.logDebug(EC.red('invalid message buffer'));
         return;
     }
     const { id, data } = message;
     if (!id || !Array.isArray(data)) {
+        Util.logDebug(EC.red('invalid message id or data'));
         return;
     }
 
-    // first argument is action name always
-    const action = data.shift();
-
-    let resData;
-    if (action === 'send') {
-        // send handler
-        if (typeof options.onReceive === 'function') {
-            resData = await options.onReceive.apply(options, data);
-        }
-    } else {
-        // get/set/remove handler
-        const actions = getActions(options.data);
-        const handler = actions[action];
-        if (handler) {
-            resData = handler.apply(options, data);
-        }
-    }
-
+    const resData = await getResponseData(data, options);
     const response = JSON.stringify({
         id,
         data: resData
@@ -134,13 +124,34 @@ const onMessage = async (ws, buf, options) => {
 
 const createStateServer = (stateOptions) => {
 
+    const defaultStateOptions = {
+
+        // key-value state data
+        data: {},
+
+        server: {}
+
+        // onReceive: function(... args) {
+        //     console.log('receive on server', args);
+        //     return ['custom response', ... args];
+        // },
+
+        // onClose: function(data, config) {
+        //     Object.assign(config.metadata, data);
+        // },
+
+    };
+
     const options = Util.mergeOption(defaultStateOptions, stateOptions);
 
     if (!options.data || typeof options.data !== 'object') {
         options.data = {};
     }
 
-    const serverOptions = options.server;
+    const serverOptions = {
+        ... defaultServerOptions,
+        ... options.server
+    };
 
     const wss = new WebSocketServer(serverOptions);
 
@@ -153,6 +164,8 @@ const createStateServer = (stateOptions) => {
 
     wss.on('connection', (ws) => {
 
+        // Util.logDebug('a client connected');
+
         // data {Buffer|ArrayBuffer|Buffer[]}
         ws.on('message', (data) => {
             // console.log(data, isBinary);
@@ -169,7 +182,7 @@ const createStateServer = (stateOptions) => {
         close: async (config) => {
             wss.close();
             if (typeof options.onClose === 'function') {
-                await options.onClose.call(options, options.data, config);
+                await options.onClose(options.data, config);
             }
         }
     };