configurapi-runner-ws 1.11.0 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "configurapi-runner-ws",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Websocket runner for configurapi.",
   "bin": {
     "configurapi-runner-ws": "src/app.mjs"

package/src/index.js

@@ -58,7 +58,7 @@ module.exports = class HttpRunner extends events.EventEmitter
             e.response.body = Object.keys(connections);
         });
         loader.handlers.set('post_@connection', async (e)=>
-        { 
+        {
             e.response.headers['Content-Type'] = 'application/json';
 
             const connectionId = e.params?.['@connection'];
@@ -142,12 +142,8 @@ module.exports = class HttpRunner extends events.EventEmitter
             }
             this.emit("trace", `[connect] ${connectionId}`);
           
-            let onConnectPromise = config.events.has('on_connect') ? this._requestListener(ws, undefined, 'on_connect') : undefined;
-
             ws.on("message", async (data) => 
             {
-                await onConnectPromise;
-
                 const incomingMessage = typeof data === "string" ? data : data.toString("utf8");
 
                 await this._requestListener(ws, incomingMessage);
@@ -170,6 +166,16 @@ module.exports = class HttpRunner extends events.EventEmitter
                 const message = err instanceof Error ? err.message : err;
                 this.emit("error", `${connectionId} - ${message}`);
             });
+
+            if (config.events.has('on_connect'))
+                {
+                    const response = await this._requestListener(ws, undefined, 'on_connect');
+            
+                    if (response.statusCode >= 400)
+                    {
+                        return ws.close(1008, 'Policy Violation');
+                    }
+                }
         });
     }
 
@@ -225,6 +231,8 @@ module.exports = class HttpRunner extends events.EventEmitter
 
                 await WsAdapter.write(ws, event.response); // Send response back to the caller.
             }
+
+            return event.response;
         }
         catch (error) 
         {
@@ -251,6 +259,8 @@ module.exports = class HttpRunner extends events.EventEmitter
                     console.log(errorFromListner);
                 }
             }
+
+            return response;
         }
     }