@digipair/skill-client-websocket 0.49.4 → 0.49.6

package/index.cjs.js

@@ -17,6 +17,15 @@ function _extends() {
 
 const WS = typeof WebSocket === 'undefined' ? require('ws') : WebSocket;
 let ClientWebSocketService = class ClientWebSocketService {
+    async send(params, _pinsSettingsList, _context) {
+        const { websocket, message } = params;
+        return websocket.send(JSON.stringify(message));
+    }
+    async close(params, _pinsSettingsList, _context) {
+        const { websocket } = params;
+        websocket.cwssForceClose = true;
+        return websocket.close();
+    }
     async connect(params, _pinsSettingsList, context) {
         var _context_protected;
         const { url = '', message = [], open = [], close = [], error = [], retryInterval = 1000, maxRetries = 10 } = params;
@@ -32,15 +41,17 @@ let ClientWebSocketService = class ClientWebSocketService {
             await engine.executePinsList(open, _extends({}, context));
         };
         // Event onmessage: Réception d'un message
-        this.ws.onmessage = async (notification)=>{
+        this.ws.onmessage = async (event)=>{
             await engine.executePinsList(message, _extends({}, context, {
-                message: JSON.parse(notification)
+                message: JSON.parse(event.data)
             }));
         };
         // Event onclose: Déconnexion
         this.ws.onclose = async ()=>{
-            await engine.executePinsList(close, _extends({}, context));
-            this.reconnectWebSocket(params, _pinsSettingsList, context);
+            const reconnect = this.ws.cwssForceClose ? false : this.reconnectWebSocket(params, _pinsSettingsList, context);
+            if (!reconnect) {
+                await engine.executePinsList(close, _extends({}, context));
+            }
         };
         // Event onerror: Erreur
         this.ws.onerror = async (err)=>{
@@ -51,20 +62,25 @@ let ClientWebSocketService = class ClientWebSocketService {
         };
         return this.ws;
     }
-    reconnectWebSocket(params, _pinsSettingsList, context) {
+    reconnectWebSocket(params, pinsSettingsList, context) {
         if (this.retryCount >= this.maxRetries) {
-            return;
+            return false;
         }
         setTimeout(()=>{
             this.retryCount++;
             this.retryInterval *= 2; // Double l'intervalle entre les tentatives
-            this.connect(params, _pinsSettingsList, context);
+            this.connect(params, pinsSettingsList, context);
         }, this.retryInterval);
+        return true;
     }
     constructor(){
         this.retryCount = 0;
     }
 };
 const connect = (params, pinsSettingsList, context)=>new ClientWebSocketService().connect(params, pinsSettingsList, context);
+const send = (params, pinsSettingsList, context)=>new ClientWebSocketService().send(params, pinsSettingsList, context);
+const close = (params, pinsSettingsList, context)=>new ClientWebSocketService().close(params, pinsSettingsList, context);
 
+exports.close = close;
 exports.connect = connect;
+exports.send = send;

package/index.esm.js

@@ -23899,14 +23899,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23925,7 +23925,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23944,9 +23944,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
+            return i = i1, nextMatch = nextMatch1, tokens = tokens1, "continue";
         }
-        return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
+        return i = i1, nextMatch = nextMatch1, tokens = tokens1, {
             v: nextMatch1
         };
     };
@@ -27955,6 +27955,15 @@ const preparePinsSettings = async (settings, context)=>{
 
 const WS = typeof WebSocket === 'undefined' ? require('ws') : WebSocket;
 let ClientWebSocketService = class ClientWebSocketService {
+    async send(params, _pinsSettingsList, _context) {
+        const { websocket, message } = params;
+        return websocket.send(JSON.stringify(message));
+    }
+    async close(params, _pinsSettingsList, _context) {
+        const { websocket } = params;
+        websocket.cwssForceClose = true;
+        return websocket.close();
+    }
     async connect(params, _pinsSettingsList, context) {
         var _context_protected;
         const { url = '', message = [], open = [], close = [], error = [], retryInterval = 1000, maxRetries = 10 } = params;
@@ -27970,15 +27979,17 @@ let ClientWebSocketService = class ClientWebSocketService {
             await executePinsList(open, _extends({}, context));
         };
         // Event onmessage: Réception d'un message
-        this.ws.onmessage = async (notification)=>{
+        this.ws.onmessage = async (event)=>{
             await executePinsList(message, _extends({}, context, {
-                message: JSON.parse(notification)
+                message: JSON.parse(event.data)
             }));
         };
         // Event onclose: Déconnexion
         this.ws.onclose = async ()=>{
-            await executePinsList(close, _extends({}, context));
-            this.reconnectWebSocket(params, _pinsSettingsList, context);
+            const reconnect = this.ws.cwssForceClose ? false : this.reconnectWebSocket(params, _pinsSettingsList, context);
+            if (!reconnect) {
+                await executePinsList(close, _extends({}, context));
+            }
         };
         // Event onerror: Erreur
         this.ws.onerror = async (err)=>{
@@ -27989,20 +28000,23 @@ let ClientWebSocketService = class ClientWebSocketService {
         };
         return this.ws;
     }
-    reconnectWebSocket(params, _pinsSettingsList, context) {
+    reconnectWebSocket(params, pinsSettingsList, context) {
         if (this.retryCount >= this.maxRetries) {
-            return;
+            return false;
         }
         setTimeout(()=>{
             this.retryCount++;
             this.retryInterval *= 2; // Double l'intervalle entre les tentatives
-            this.connect(params, _pinsSettingsList, context);
+            this.connect(params, pinsSettingsList, context);
         }, this.retryInterval);
+        return true;
     }
     constructor(){
         this.retryCount = 0;
     }
 };
 const connect = (params, pinsSettingsList, context)=>new ClientWebSocketService().connect(params, pinsSettingsList, context);
+const send = (params, pinsSettingsList, context)=>new ClientWebSocketService().send(params, pinsSettingsList, context);
+const close = (params, pinsSettingsList, context)=>new ClientWebSocketService().close(params, pinsSettingsList, context);
 
-export { connect };
+export { close, connect, send };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-client-websocket",
-  "version": "0.49.4",
+  "version": "0.49.6",
   "dependencies": {
     "ws": "^8.18.0"
   },

package/schema.fr.json

@@ -10,7 +10,7 @@
   "paths": {
     "/connect": {
       "post": {
-        "tags": ["web", "service"],
+        "tags": ["service", "web", "spacial"],
         "summary": "Connexion Websocket",
         "parameters": [
           {
@@ -39,9 +39,7 @@
             "schema": {
               "type": "integer"
             }
-          }
-        ],
-        "x-events": [
+          },
           {
             "name": "message",
             "summary": "Lors d'un message",
@@ -90,7 +88,53 @@
               }
             }
           }
-        ]
+        ],
+        "x-events": []
+      }
+    },
+    "/send": {
+      "post": {
+        "tags": ["service", "web", "spacial"],
+        "summary": "Envoi de message",
+        "parameters": [
+          {
+            "name": "websocket",
+            "summary": "Websocket",
+            "required": true,
+            "description": "Websocket à utiliser",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "message",
+            "summary": "Message",
+            "required": true,
+            "description": "Message à envoyer",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/close": {
+      "post": {
+        "tags": ["service", "web", "spacial"],
+        "summary": "Fermeture Websocket",
+        "parameters": [
+          {
+            "name": "websocket",
+            "summary": "Websocket",
+            "required": true,
+            "description": "Websocket à fermer",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
       }
     }
   },

package/schema.json

@@ -10,7 +10,7 @@
   "paths": {
     "/connect": {
       "post": {
-        "tags": ["web", "service"],
+        "tags": ["service", "web", "spacial"],
         "summary": "Websocket server connection",
         "parameters": [
           {
@@ -39,9 +39,7 @@
             "schema": {
               "type": "integer"
             }
-          }
-        ],
-        "x-events": [
+          },
           {
             "name": "message",
             "summary": "Upon a message",
@@ -92,6 +90,51 @@
           }
         ]
       }
+    },
+    "/send": {
+      "post": {
+        "tags": ["service", "web", "spacial"],
+        "summary": "Send message",
+        "parameters": [
+          {
+            "name": "websocket",
+            "summary": "Websocket",
+            "required": true,
+            "description": "Websocket to use",
+            "schema": {
+              "type": "object"
+            }
+          },
+          {
+            "name": "message",
+            "summary": "Message",
+            "required": true,
+            "description": "Message to send",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
+    },
+    "/close": {
+      "post": {
+        "tags": ["service", "web", "spacial"],
+        "summary": "Close Websocket",
+        "parameters": [
+          {
+            "name": "websocket",
+            "summary": "Websocket",
+            "required": true,
+            "description": "Websocket to close",
+            "schema": {
+              "type": "object"
+            }
+          }
+        ],
+        "x-events": []
+      }
     }
   },
   "components": {

package/src/lib/skill-client-websocket.d.ts

@@ -1,2 +1,4 @@
 import { PinsSettings } from '@digipair/engine';
 export declare const connect: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const send: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;
+export declare const close: (params: any, pinsSettingsList: PinsSettings[], context: any) => Promise<any>;