aotrautils-srv 0.0.322 → 0.0.323
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.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
-
/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-02:
|
|
3
|
+
/*utils COMMONS library associated with aotra version : «1_29072022-2359 (04/12/2022-02:54:45)»*/
|
|
4
4
|
/*-----------------------------------------------------------------------------*/
|
|
5
5
|
|
|
6
6
|
|
|
@@ -4827,7 +4827,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
|
|
|
4827
4827
|
|
|
4828
4828
|
|
|
4829
4829
|
|
|
4830
|
-
/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-02:
|
|
4830
|
+
/*utils SERVER library associated with aotra version : «1_29072022-2359 (04/12/2022-02:54:45)»*/
|
|
4831
4831
|
/*-----------------------------------------------------------------------------*/
|
|
4832
4832
|
|
|
4833
4833
|
|
|
@@ -5186,14 +5186,14 @@ WebsocketImplementation={
|
|
|
5186
5186
|
serverSocket:serverSocket,
|
|
5187
5187
|
receptionEntryPoints:[],
|
|
5188
5188
|
|
|
5189
|
-
receive:(
|
|
5189
|
+
receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
|
|
5190
5190
|
|
|
5191
5191
|
// DBG
|
|
5192
|
-
lognow("(SERVER) Registering receive for «"+
|
|
5192
|
+
lognow("(SERVER) Registering receive for «"+channelNameParam+"»...",doOnIncomingMessage);
|
|
5193
5193
|
|
|
5194
5194
|
|
|
5195
5195
|
const receptionEntryPoint={
|
|
5196
|
-
channelName:
|
|
5196
|
+
channelName:channelNameParam,
|
|
5197
5197
|
clientsRoomsTag:clientsRoomsTag,
|
|
5198
5198
|
execute:(eventOrMessage, clientSocketParam)=>{
|
|
5199
5199
|
|
|
@@ -5219,7 +5219,7 @@ WebsocketImplementation={
|
|
|
5219
5219
|
|
|
5220
5220
|
|
|
5221
5221
|
// DBG
|
|
5222
|
-
lognow("(SERVER) ENTRY POINT IS OF THE RIGHT CHANNEL:", channelName);
|
|
5222
|
+
lognow("(SERVER) ENTRY POINT IS OF THE RIGHT CHANNEL:", receptionEntryPoint.channelName);
|
|
5223
5223
|
|
|
5224
5224
|
|
|
5225
5225
|
|
|
@@ -5540,10 +5540,10 @@ WebsocketImplementation={
|
|
|
5540
5540
|
|
|
5541
5541
|
receptionEntryPoints:[],
|
|
5542
5542
|
|
|
5543
|
-
receive:(
|
|
5543
|
+
receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
|
|
5544
5544
|
|
|
5545
5545
|
const receptionEntryPoint={
|
|
5546
|
-
channelName:
|
|
5546
|
+
channelName:channelNameParam,
|
|
5547
5547
|
clientsRoomsTag:clientsRoomsTag,
|
|
5548
5548
|
execute:(eventOrMessage)=>{
|
|
5549
5549
|
|
|
@@ -5554,7 +5554,7 @@ WebsocketImplementation={
|
|
|
5554
5554
|
const dataWrapped=WebsocketImplementation.getMessageDataBothImplementations(eventOrMessage);
|
|
5555
5555
|
|
|
5556
5556
|
// Channel information is stored in exchanged data :
|
|
5557
|
-
if(dataWrapped.channelName && dataWrapped.channelName!==
|
|
5557
|
+
if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
|
|
5558
5558
|
|
|
5559
5559
|
const clientSocket=nodeClientInstance.clientSocket;
|
|
5560
5560
|
|
|
@@ -5574,7 +5574,7 @@ WebsocketImplementation={
|
|
|
5574
5574
|
},
|
|
5575
5575
|
|
|
5576
5576
|
|
|
5577
|
-
send:(
|
|
5577
|
+
send:(channelNameParam, data, clientsRoomsTag=null)=>{
|
|
5578
5578
|
|
|
5579
5579
|
const clientSocket=nodeClientInstance.clientSocket;
|
|
5580
5580
|
|
|
@@ -5591,7 +5591,7 @@ WebsocketImplementation={
|
|
|
5591
5591
|
if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
|
|
5592
5592
|
|
|
5593
5593
|
// Channel information is stored in exchanged data :
|
|
5594
|
-
let dataWrapped={channelName:
|
|
5594
|
+
let dataWrapped={channelName:channelNameParam, data:data};
|
|
5595
5595
|
|
|
5596
5596
|
|
|
5597
5597
|
// // DBG
|
|
@@ -5602,12 +5602,12 @@ WebsocketImplementation={
|
|
|
5602
5602
|
|
|
5603
5603
|
|
|
5604
5604
|
// // DBG
|
|
5605
|
-
// console.log("(NODE CLIENT) SENDING DATA !
|
|
5605
|
+
// console.log("(NODE CLIENT) SENDING DATA ! channelNameParam:«"+channelNameParam+"» ; clientsRoomsTag:«"+clientsRoomsTag+"»");
|
|
5606
5606
|
// console.log("(NODE CLIENT) SENDING DATA ! dataWrapped:",dataWrapped);
|
|
5607
5607
|
|
|
5608
5608
|
// TODO : FIXME : Use one single interface !
|
|
5609
5609
|
if(!WebsocketImplementation.useSocketIOImplementation) clientSocket.send(dataWrapped);
|
|
5610
|
-
else clientSocket.emit(
|
|
5610
|
+
else clientSocket.emit(channelNameParam,dataWrapped);
|
|
5611
5611
|
|
|
5612
5612
|
return nodeClientInstance;
|
|
5613
5613
|
},
|
|
@@ -5645,7 +5645,7 @@ WebsocketImplementation={
|
|
|
5645
5645
|
|
|
5646
5646
|
const clientSocket=nodeClientInstance.clientSocket;
|
|
5647
5647
|
if(!WebsocketImplementation.useSocketIOImplementation) clientSocket.addEventListener("message", doOnMessage);
|
|
5648
|
-
else clientSocket.on(
|
|
5648
|
+
else clientSocket.on(channelNameParam, doOnMessage);
|
|
5649
5649
|
|
|
5650
5650
|
doOnConnection(nodeClientInstance, clientSocket);
|
|
5651
5651
|
|
|
@@ -5711,10 +5711,10 @@ WebsocketImplementation={
|
|
|
5711
5711
|
const browserInstance={
|
|
5712
5712
|
clientSocket:clientSocket,
|
|
5713
5713
|
|
|
5714
|
-
receive:(
|
|
5714
|
+
receive:(channelNameParam, doOnIncomingMessage, clientsRoomsTag=null)=>{
|
|
5715
5715
|
|
|
5716
5716
|
// DBG
|
|
5717
|
-
lognow("INFO : (CLIENT-BROWSER) SETTING UP RECEIVE for :",
|
|
5717
|
+
lognow("INFO : (CLIENT-BROWSER) SETTING UP RECEIVE for :",channelNameParam);
|
|
5718
5718
|
|
|
5719
5719
|
|
|
5720
5720
|
const doOnMessage=(eventOrMessage)=>{
|
|
@@ -5726,7 +5726,7 @@ WebsocketImplementation={
|
|
|
5726
5726
|
|
|
5727
5727
|
|
|
5728
5728
|
// Channel information is stored in exchanged data :
|
|
5729
|
-
if(dataWrapped.channelName && dataWrapped.channelName!==
|
|
5729
|
+
if(dataWrapped.channelName && dataWrapped.channelName!==channelNameParam) return;
|
|
5730
5730
|
|
|
5731
5731
|
const clientSocket=browserInstance.clientSocket;
|
|
5732
5732
|
|
|
@@ -5739,14 +5739,14 @@ WebsocketImplementation={
|
|
|
5739
5739
|
|
|
5740
5740
|
|
|
5741
5741
|
if(!WebsocketImplementation.useSocketIOImplementation) browserInstance.clientSocket.addEventListener("message", doOnMessage);
|
|
5742
|
-
else browserInstance.clientSocket.on(
|
|
5742
|
+
else browserInstance.clientSocket.on(channelNameParam, doOnMessage);
|
|
5743
5743
|
|
|
5744
5744
|
|
|
5745
5745
|
return browserInstance;
|
|
5746
5746
|
},
|
|
5747
5747
|
|
|
5748
5748
|
|
|
5749
|
-
send:(
|
|
5749
|
+
send:(channelNameParam, data, clientsRoomsTag=null)=>{
|
|
5750
5750
|
|
|
5751
5751
|
const clientSocket=browserInstance.clientSocket;
|
|
5752
5752
|
|
|
@@ -5763,7 +5763,7 @@ WebsocketImplementation={
|
|
|
5763
5763
|
if(!WebsocketImplementation.isInRoom(clientSocket,clientsRoomsTag)) return;
|
|
5764
5764
|
|
|
5765
5765
|
// Channel information is stored in exchanged data :
|
|
5766
|
-
let dataWrapped={channelName:
|
|
5766
|
+
let dataWrapped={channelName:channelNameParam, data:data};
|
|
5767
5767
|
|
|
5768
5768
|
|
|
5769
5769
|
// DBG
|
|
@@ -5776,7 +5776,7 @@ WebsocketImplementation={
|
|
|
5776
5776
|
|
|
5777
5777
|
// TODO : FIXME : Use one single interface !
|
|
5778
5778
|
if(!WebsocketImplementation.useSocketIOImplementation) clientSocket.send(dataWrapped);
|
|
5779
|
-
else clientSocket.emit(
|
|
5779
|
+
else clientSocket.emit(channelNameParam,dataWrapped);
|
|
5780
5780
|
|
|
5781
5781
|
|
|
5782
5782
|
return browserInstance;
|
aotrautils-srv/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aotrautils-srv",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.323",
|
|
4
4
|
"main": "aotrautils-srv.build.js",
|
|
5
5
|
"description": "A library for vanilla javascript utils (server-side) used in aotra javascript CMS",
|
|
6
6
|
"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",
|