configurapi-runner-ws 1.18.0 → 1.20.0

package/package.json

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

package/src/index.js

@@ -5,7 +5,8 @@ const events = require('events');
 const Configurapi = require('configurapi');
 const { WebSocketServer } = require('ws');
 const { randomUUID } = require("node:crypto");
-const { Response, Route, Policy, PolicyHandlerLoader, LogLevel } = require('configurapi');
+const { Route, Policy, PolicyHandlerLoader, LogLevel } = require('configurapi');
+const { WsFrame } = require('configurapi-handler-ws');
 const oneliner = require('one-liner');
 const wsAdapter = require('./wsAdapter');
 const URL = require('url');
@@ -64,9 +65,10 @@ module.exports = class HttpRunner extends events.EventEmitter
 
             if(connectionId && connections.has(connectionId))
             {
-                let wsResponse = new Response(e.payload, 200, {...e.request.headers, 'connection-id': connectionId})
-                await wsAdapter.write(connections.get(connectionId).ws, wsResponse)
-                e.response.statusCode = 204
+                e.payload.headers = e.payload.headers || {};
+                e.payload.headers['connection-id'] = connectionId;
+                
+                await wsAdapter.write(connections.get(connectionId).ws, e.payload);
             }
             else
             {
@@ -240,7 +242,7 @@ module.exports = class HttpRunner extends events.EventEmitter
                     event.response.headers['Sec-WebSocket-Protocol'] = protocol;
                 }
 
-                await wsAdapter.write(ws, event.response); 
+                await wsAdapter.write(ws, new WsFrame(event.response)); 
             }
             else
             {
@@ -252,7 +254,7 @@ module.exports = class HttpRunner extends events.EventEmitter
                 }
                 event.response.headers['message-id'] = event.request.headers?.['message-id'];
 
-                await wsAdapter.write(ws, event.response); // Send response back to the caller.
+                await wsAdapter.write(ws, new WsFrame(event.response)); // Send response back to the caller.
             }
 
             return event.response;
@@ -269,7 +271,7 @@ module.exports = class HttpRunner extends events.EventEmitter
             
             try
             {
-                await wsAdapter.write(ws, response);
+                await wsAdapter.write(ws, new WsFrame(response));
             }
             catch(err)
             {
@@ -296,7 +298,7 @@ module.exports = class HttpRunner extends events.EventEmitter
             await this.service.process(event);
 
             serverResponse.writeHead(200, event.response.headers);
-            serverResponse.end(JSON.stringify(event.response));
+            serverResponse.end(JSON.stringify(event.response.body));
         }
         catch (error) 
         {

package/src/wsAdapter.js

@@ -3,6 +3,7 @@ const { WebSocket } = require('ws');
 const StreamResponse = require('configurapi-handler-ws').StreamResponse;
 const Response = require('configurapi').Response;
 const { randomUUID } = require("node:crypto");
+const WsFrame = require('configurapi-handler-ws').WsFrame;
 
 module.exports = {
     write: async function(ws, message)
@@ -72,9 +73,11 @@ module.exports = {
                         }
 
                         const headers = { 'message-id': streamId, 'x-stream': 'chunk', 'x-stream-id': streamId, 'Content-Type': 'text/plain' };
-                        const response = new Response(bucket, 200, headers);
+                        
+                        const chunkResponse = new Response(bucket, 200, { });
+                        const frame = new WsFrame(chunkResponse, headers);
 
-                        ws.send(JSON.stringify(response), (err) =>
+                        ws.send(JSON.stringify(frame), (err) =>
                         {
                             if (err) { cleanup(); return safeReject(err); }
                         });
@@ -140,9 +143,11 @@ module.exports = {
                         if (ws.readyState === WebSocket.OPEN) 
                         {
                             const headers = { 'message-id': streamId, 'x-stream-id': streamId, 'x-stream': 'done' };
-                            const response = new Response('', 204, headers);
                             
-                            ws.send(JSON.stringify(response), (err) =>
+                            const doneResponse = new Response('', 204);
+                            const frame = new WsFrame(doneResponse, headers);
+
+                            ws.send(JSON.stringify(frame), (err) =>
                             {
                                 cleanup();
                                 return err ? safeReject(err) : safeResolve();

package/src/wsPostbackFunction.js

@@ -4,8 +4,8 @@ async function wsPostbackFunction(endpoint, response)
 {
     let resp = await fetch(endpoint, {
         method: 'POST',
-        headers: response.headers || {},
-        body: typeof response === 'object' ? JSON.stringify(response) : response
+        headers: {...response.headers, 'content-type': 'application/json'},
+        body: typeof response === 'string' ? response: JSON.stringify(response)
     });
 
     if(resp.status >= 400)