@digipair/skill-client-websocket 0.57.4 → 0.57.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.cjs.js +40 -20
- package/index.esm.js +45 -25
- package/package.json +1 -1
- package/schema.fr.json +2 -2
- package/schema.json +2 -2
package/index.cjs.js
CHANGED
|
@@ -17,18 +17,18 @@ function _extends() {
|
|
|
17
17
|
|
|
18
18
|
const WS = typeof WebSocket === 'undefined' ? require('ws') : WebSocket;
|
|
19
19
|
let ClientWebSocketService = class ClientWebSocketService {
|
|
20
|
-
async send(params, _pinsSettingsList,
|
|
20
|
+
async send(params, _pinsSettingsList, context) {
|
|
21
21
|
var _websocket_ws;
|
|
22
|
-
const { websocket, message } = params;
|
|
22
|
+
const { websocket = context.websocket, message } = params;
|
|
23
23
|
return (_websocket_ws = websocket.ws) == null ? void 0 : _websocket_ws.send(JSON.stringify(message));
|
|
24
24
|
}
|
|
25
|
-
async close(params, _pinsSettingsList,
|
|
25
|
+
async close(params, _pinsSettingsList, context) {
|
|
26
26
|
var _websocket_ws;
|
|
27
|
-
const { websocket } = params;
|
|
27
|
+
const { websocket = context.websocket } = params;
|
|
28
28
|
websocket.cwssForceClose = true;
|
|
29
29
|
return (_websocket_ws = websocket.ws) == null ? void 0 : _websocket_ws.close();
|
|
30
30
|
}
|
|
31
|
-
async connect(params,
|
|
31
|
+
async connect(params, pinsSettingsList, context) {
|
|
32
32
|
var _context_protected;
|
|
33
33
|
const { url = '', message = [], open = [], close = [], error = [], retryInterval = 1000, maxRetries = 10 } = params;
|
|
34
34
|
this.retryInterval = retryInterval;
|
|
@@ -40,34 +40,54 @@ let ClientWebSocketService = class ClientWebSocketService {
|
|
|
40
40
|
// Event onopen: Connexion réussie
|
|
41
41
|
this.ws.onopen = async ()=>{
|
|
42
42
|
this.retryCount = 0; // Réinitialise le compteur de tentatives après une connexion réussie
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
try {
|
|
44
|
+
await engine.executePinsList(open, _extends({}, context, {
|
|
45
|
+
websocket: this
|
|
46
|
+
}));
|
|
47
|
+
} catch (error) {
|
|
48
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
49
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
50
|
+
}
|
|
46
51
|
};
|
|
47
52
|
// Event onmessage: Réception d'un message
|
|
48
53
|
this.ws.onmessage = async (event)=>{
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
54
|
+
try {
|
|
55
|
+
await engine.executePinsList(message, _extends({}, context, {
|
|
56
|
+
message: JSON.parse(event.data),
|
|
57
|
+
websocket: this
|
|
58
|
+
}));
|
|
59
|
+
} catch (error) {
|
|
60
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
61
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
62
|
+
}
|
|
53
63
|
};
|
|
54
64
|
// Event onclose: Déconnexion
|
|
55
65
|
this.ws.onclose = async ()=>{
|
|
56
66
|
this.ws = null;
|
|
57
|
-
const reconnect = this.cwssForceClose ? false : this.reconnectWebSocket(params,
|
|
67
|
+
const reconnect = this.cwssForceClose ? false : this.reconnectWebSocket(params, pinsSettingsList, context);
|
|
58
68
|
if (!reconnect) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
69
|
+
try {
|
|
70
|
+
await engine.executePinsList(close, _extends({}, context, {
|
|
71
|
+
websocket: this
|
|
72
|
+
}));
|
|
73
|
+
} catch (error) {
|
|
74
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
75
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
76
|
+
}
|
|
62
77
|
}
|
|
63
78
|
};
|
|
64
79
|
// Event onerror: Erreur
|
|
65
80
|
this.ws.onerror = async (err)=>{
|
|
66
81
|
var _this_ws;
|
|
67
|
-
|
|
68
|
-
error
|
|
69
|
-
|
|
70
|
-
|
|
82
|
+
try {
|
|
83
|
+
await engine.executePinsList(error, _extends({}, context, {
|
|
84
|
+
error: err,
|
|
85
|
+
websocket: this
|
|
86
|
+
}));
|
|
87
|
+
} catch (error) {
|
|
88
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
89
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
90
|
+
}
|
|
71
91
|
(_this_ws = this.ws) == null ? void 0 : _this_ws.close(); // Ferme la connexion en cas d'erreur
|
|
72
92
|
};
|
|
73
93
|
return this;
|
package/index.esm.js
CHANGED
|
@@ -23899,14 +23899,14 @@ function indent(str, spaces) {
|
|
|
23899
23899
|
var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
|
|
23900
23900
|
// match is required
|
|
23901
23901
|
if (!match) {
|
|
23902
|
-
return
|
|
23902
|
+
return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
|
|
23903
23903
|
v: nextMatch1
|
|
23904
23904
|
};
|
|
23905
23905
|
}
|
|
23906
23906
|
var token = match.token, offset = match.offset;
|
|
23907
23907
|
i1 += offset;
|
|
23908
23908
|
if (token === " ") {
|
|
23909
|
-
return
|
|
23909
|
+
return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
|
|
23910
23910
|
}
|
|
23911
23911
|
tokens1 = _to_consumable_array$1(tokens1).concat([
|
|
23912
23912
|
token
|
|
@@ -23925,7 +23925,7 @@ function indent(str, spaces) {
|
|
|
23925
23925
|
if (contextKeys.some(function(el) {
|
|
23926
23926
|
return el.startsWith(name);
|
|
23927
23927
|
})) {
|
|
23928
|
-
return
|
|
23928
|
+
return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
|
|
23929
23929
|
}
|
|
23930
23930
|
if (dateTimeIdentifiers.some(function(el) {
|
|
23931
23931
|
return el === name;
|
|
@@ -23944,9 +23944,9 @@ function indent(str, spaces) {
|
|
|
23944
23944
|
if (dateTimeIdentifiers.some(function(el) {
|
|
23945
23945
|
return el.startsWith(name);
|
|
23946
23946
|
})) {
|
|
23947
|
-
return
|
|
23947
|
+
return i = i1, tokens = tokens1, nextMatch = nextMatch1, "continue";
|
|
23948
23948
|
}
|
|
23949
|
-
return
|
|
23949
|
+
return i = i1, tokens = tokens1, nextMatch = nextMatch1, {
|
|
23950
23950
|
v: nextMatch1
|
|
23951
23951
|
};
|
|
23952
23952
|
};
|
|
@@ -27955,18 +27955,18 @@ const preparePinsSettings = async (settings, context)=>{
|
|
|
27955
27955
|
|
|
27956
27956
|
const WS = typeof WebSocket === 'undefined' ? require('ws') : WebSocket;
|
|
27957
27957
|
let ClientWebSocketService = class ClientWebSocketService {
|
|
27958
|
-
async send(params, _pinsSettingsList,
|
|
27958
|
+
async send(params, _pinsSettingsList, context) {
|
|
27959
27959
|
var _websocket_ws;
|
|
27960
|
-
const { websocket, message } = params;
|
|
27960
|
+
const { websocket = context.websocket, message } = params;
|
|
27961
27961
|
return (_websocket_ws = websocket.ws) == null ? void 0 : _websocket_ws.send(JSON.stringify(message));
|
|
27962
27962
|
}
|
|
27963
|
-
async close(params, _pinsSettingsList,
|
|
27963
|
+
async close(params, _pinsSettingsList, context) {
|
|
27964
27964
|
var _websocket_ws;
|
|
27965
|
-
const { websocket } = params;
|
|
27965
|
+
const { websocket = context.websocket } = params;
|
|
27966
27966
|
websocket.cwssForceClose = true;
|
|
27967
27967
|
return (_websocket_ws = websocket.ws) == null ? void 0 : _websocket_ws.close();
|
|
27968
27968
|
}
|
|
27969
|
-
async connect(params,
|
|
27969
|
+
async connect(params, pinsSettingsList, context) {
|
|
27970
27970
|
var _context_protected;
|
|
27971
27971
|
const { url = '', message = [], open = [], close = [], error = [], retryInterval = 1000, maxRetries = 10 } = params;
|
|
27972
27972
|
this.retryInterval = retryInterval;
|
|
@@ -27978,34 +27978,54 @@ let ClientWebSocketService = class ClientWebSocketService {
|
|
|
27978
27978
|
// Event onopen: Connexion réussie
|
|
27979
27979
|
this.ws.onopen = async ()=>{
|
|
27980
27980
|
this.retryCount = 0; // Réinitialise le compteur de tentatives après une connexion réussie
|
|
27981
|
-
|
|
27982
|
-
|
|
27983
|
-
|
|
27981
|
+
try {
|
|
27982
|
+
await executePinsList(open, _extends({}, context, {
|
|
27983
|
+
websocket: this
|
|
27984
|
+
}));
|
|
27985
|
+
} catch (error) {
|
|
27986
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
27987
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
27988
|
+
}
|
|
27984
27989
|
};
|
|
27985
27990
|
// Event onmessage: Réception d'un message
|
|
27986
27991
|
this.ws.onmessage = async (event)=>{
|
|
27987
|
-
|
|
27988
|
-
message
|
|
27989
|
-
|
|
27990
|
-
|
|
27992
|
+
try {
|
|
27993
|
+
await executePinsList(message, _extends({}, context, {
|
|
27994
|
+
message: JSON.parse(event.data),
|
|
27995
|
+
websocket: this
|
|
27996
|
+
}));
|
|
27997
|
+
} catch (error) {
|
|
27998
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
27999
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
28000
|
+
}
|
|
27991
28001
|
};
|
|
27992
28002
|
// Event onclose: Déconnexion
|
|
27993
28003
|
this.ws.onclose = async ()=>{
|
|
27994
28004
|
this.ws = null;
|
|
27995
|
-
const reconnect = this.cwssForceClose ? false : this.reconnectWebSocket(params,
|
|
28005
|
+
const reconnect = this.cwssForceClose ? false : this.reconnectWebSocket(params, pinsSettingsList, context);
|
|
27996
28006
|
if (!reconnect) {
|
|
27997
|
-
|
|
27998
|
-
|
|
27999
|
-
|
|
28007
|
+
try {
|
|
28008
|
+
await executePinsList(close, _extends({}, context, {
|
|
28009
|
+
websocket: this
|
|
28010
|
+
}));
|
|
28011
|
+
} catch (error) {
|
|
28012
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
28013
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
28014
|
+
}
|
|
28000
28015
|
}
|
|
28001
28016
|
};
|
|
28002
28017
|
// Event onerror: Erreur
|
|
28003
28018
|
this.ws.onerror = async (err)=>{
|
|
28004
28019
|
var _this_ws;
|
|
28005
|
-
|
|
28006
|
-
error
|
|
28007
|
-
|
|
28008
|
-
|
|
28020
|
+
try {
|
|
28021
|
+
await executePinsList(error, _extends({}, context, {
|
|
28022
|
+
error: err,
|
|
28023
|
+
websocket: this
|
|
28024
|
+
}));
|
|
28025
|
+
} catch (error) {
|
|
28026
|
+
const skillLogger = require('@digipair/skill-logger');
|
|
28027
|
+
skillLogger.addLog(context, 'ERROR', error.message);
|
|
28028
|
+
}
|
|
28009
28029
|
(_this_ws = this.ws) == null ? void 0 : _this_ws.close(); // Ferme la connexion en cas d'erreur
|
|
28010
28030
|
};
|
|
28011
28031
|
return this;
|
package/package.json
CHANGED
package/schema.fr.json
CHANGED
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
{
|
|
101
101
|
"name": "websocket",
|
|
102
102
|
"summary": "Websocket",
|
|
103
|
-
"required":
|
|
103
|
+
"required": false,
|
|
104
104
|
"description": "Websocket à utiliser",
|
|
105
105
|
"schema": {
|
|
106
106
|
"type": "object"
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
{
|
|
128
128
|
"name": "websocket",
|
|
129
129
|
"summary": "Websocket",
|
|
130
|
-
"required":
|
|
130
|
+
"required": false,
|
|
131
131
|
"description": "Websocket à fermer",
|
|
132
132
|
"schema": {
|
|
133
133
|
"type": "object"
|
package/schema.json
CHANGED
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
{
|
|
100
100
|
"name": "websocket",
|
|
101
101
|
"summary": "Websocket",
|
|
102
|
-
"required":
|
|
102
|
+
"required": false,
|
|
103
103
|
"description": "Websocket to use",
|
|
104
104
|
"schema": {
|
|
105
105
|
"type": "object"
|
|
@@ -126,7 +126,7 @@
|
|
|
126
126
|
{
|
|
127
127
|
"name": "websocket",
|
|
128
128
|
"summary": "Websocket",
|
|
129
|
-
"required":
|
|
129
|
+
"required": false,
|
|
130
130
|
"description": "Websocket to close",
|
|
131
131
|
"schema": {
|
|
132
132
|
"type": "object"
|