From ba3a4ceb1dbf0cdf6a6d1b4d304aaa59f0c4bd7b Mon Sep 17 00:00:00 2001
From: javis86 <jcolombera@gmail.com>
Date: Mon, 23 Aug 2021 19:45:02 -0300
Subject: [PATCH 1/2] Added librae8226/node-red-contrib-socketio solution for
 node-red instance hangs when is binded to node-red

---
 README.md    |  9 +++++++--
 package.json | 10 +++++-----
 socketio.js  | 11 ++++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2e5b9a0..4cc2e05 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-# node-red-contrib-socketio
+# node-red-contrib-socketio-javis86
 Implementation for [Node-RED](https://nodered.org/) of the popular [Socket.IO](http://socket.io/).
 
+from original project node-red-contrib-socketio
+
 ## Installation
 To install node-red-contrib-socketio use this command
 
-`npm i node-red-contrib-socketio`
+`npm i node-red-contrib-socketio-javis86`
 
 ## Composition
 The Socket.IO implementation is made with
@@ -26,3 +28,6 @@ Thank to:
 * @bimalyn-IBM for implementig rooms
 * @essuraj for implementig rooms listing node
 * @cazellap for pushong adding compatibility to socketIO 3.0
+* @javis86 individual contributor for fixing node-red hangs when deploy flows
+
+
diff --git a/package.json b/package.json
index a97907b..726ae28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "node-red-contrib-socketio",
-  "version": "1.1.0",
+  "name": "node-red-contrib-socketio-javis86",
+  "version": "1.1.1",
   "description": "Implementation for Node-RED of a SocketIO Sever",
   "dependencies": {
    "socket.io": ">=3.1.0"
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wperw/node-red-contrib-socketio.git"
+    "url": "git+https://github.com/javis86/node-red-contrib-socketio.git"
   },
   "keywords": [
     "node-red"
@@ -24,7 +24,7 @@
   "author": "Telemaco Gallimberti",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/wperw/node-red-contrib-socketio/issues"
+    "url": "https://github.com/javis86/node-red-contrib-socketio/issues"
   },
-  "homepage": "https://github.com/wperw/node-red-contrib-socketio#readme"
+  "homepage": "https://github.com/javis86/node-red-contrib-socketio#readme"
 }
diff --git a/socketio.js b/socketio.js
index 1ee6319..0e71d23 100644
--- a/socketio.js
+++ b/socketio.js
@@ -6,6 +6,7 @@ module.exports = function(RED) {
   const { Server } = require("socket.io");
   var io;
   var customProperties = {};
+  var sockets = [];
 
   function socketIoConfig(n) {
     RED.nodes.createNode(this, n);
@@ -29,7 +30,14 @@ module.exports = function(RED) {
     node.log("Created server " + bindOn);
 
     node.on("close", function() {
-      io.close();
+      if (!this.bindToNode) {
+        io.close();
+      }
+      sockets.forEach(function (socket) {
+        node.log('disconnect:' + socket.id);
+        socket.disconnect(true);
+      });
+      sockets = [];
     });
   }
 
@@ -80,6 +88,7 @@ module.exports = function(RED) {
     }
 
     io.on("connection", function(socket) {
+      sockets.push(socket);
       node.rules.forEach(function(val, i) {
         addListener(socket, val, i);
       });

From 4fd5560124c92b889c104e31d726606233a02ef7 Mon Sep 17 00:00:00 2001
From: javis86 <jcolombera@gmail.com>
Date: Fri, 27 Aug 2021 10:39:51 -0300
Subject: [PATCH 2/2] CORS config added

---
 package.json  |  10 +--
 socketio.html | 238 ++++++++++++++++++++++++++------------------------
 socketio.js   |  29 ++++--
 3 files changed, 155 insertions(+), 122 deletions(-)

diff --git a/package.json b/package.json
index 726ae28..a97907b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "node-red-contrib-socketio-javis86",
-  "version": "1.1.1",
+  "name": "node-red-contrib-socketio",
+  "version": "1.1.0",
   "description": "Implementation for Node-RED of a SocketIO Sever",
   "dependencies": {
    "socket.io": ">=3.1.0"
@@ -16,7 +16,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/javis86/node-red-contrib-socketio.git"
+    "url": "git+https://github.com/wperw/node-red-contrib-socketio.git"
   },
   "keywords": [
     "node-red"
@@ -24,7 +24,7 @@
   "author": "Telemaco Gallimberti",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/javis86/node-red-contrib-socketio/issues"
+    "url": "https://github.com/wperw/node-red-contrib-socketio/issues"
   },
-  "homepage": "https://github.com/javis86/node-red-contrib-socketio#readme"
+  "homepage": "https://github.com/wperw/node-red-contrib-socketio#readme"
 }
diff --git a/socketio.html b/socketio.html
index 59dbd20..4e484b6 100644
--- a/socketio.html
+++ b/socketio.html
@@ -1,32 +1,35 @@
 <!-- socketIO config node, will aim to maintain the information for the context of nodes socketIo in and out-->
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-config',{
+    RED.nodes.registerType('socketio-config', {
         category: 'config',
         defaults: {
-			port:{value:80, required:true, validate:RED.validators.number()},
-            sendClient: {value:true},
-            path: {value:"/socket.io"},
-			bindToNode: {value: false}
+            port: { value: 80, required: true, validate: RED.validators.number() },
+            sendClient: { value: true },
+            path: { value: "/socket.io" },
+            bindToNode: { value: false },
+            corsOrigins: { value: "*" },
+            corsMethods: { value: "GET,POST" },
+            enableCors: { value: false }
         },
-        label: function() {
+        label: function () {
             return this.bindToNode ? "socketIO server bind to Node-red" : "socketIO server at " + this.port;
         },
-		oneditprepare: function() {
-			$("#node-config-input-bindToNode").change(function() {
-				if($(this).is(":checked")) {
-					$("#node-row-bindToNode").hide();
-				}
-				else {
-					$("#node-row-bindToNode").show();
-				}
-			});
-			if (this.bindToNode) {
+        oneditprepare: function () {
+            $("#node-config-input-bindToNode").change(function () {
+                if ($(this).is(":checked")) {
+                    $(".node-row-bindToNode").hide();
+                }
+                else {
+                    $(".node-row-bindToNode").show();
+                }
+            });
+            if (this.bindToNode) {
                 $("#node-config-input-bindToNode").prop('checked', true);
             } else {
                 $("#node-config-input-bindToNode").prop('checked', false);
             }
-			$("#node-config-input-bindToNode").change();
-		}
+            $("#node-config-input-bindToNode").change();
+        }
     });
 </script>
 
@@ -34,10 +37,10 @@
     <div class="form-row">
 		<input type="checkbox" id="node-config-input-bindToNode" style="display: inline-block; width: auto; vertical-align: top;">
 		<label for="node-config-input-bindToNode" style="width: auto"> Bind to Node-red Instance</label>
-		<div id="node-row-bindToNode" class="hide">
+		<div class="form-row node-row-bindToNode" class="hide">
 			<label for="node-config-input-port"><i class="fa fa-terminal"></i> Port</label>
 			<input type="text" id="node-config-input-port">
-		</div>
+		</div>		
     </div>
 	<div class="form-row">
 		<label for="node-config-input-sendClient"><i class="fa fa-share-square-o"></i> Serve client js file?</label>
@@ -47,7 +50,18 @@
 		<label for="node-config-input-path"><i class="fa fa-paper-plane-o"></i> InputPath?</label>
 		<input type="text" id="node-config-input-path" placeholder="/socket.io">
 	</div>
-
+    <div class="form-row">
+		<input type="checkbox" id="node-config-input-enableCors" style="display: inline-block; width: auto; vertical-align: top;">
+		<label for="node-config-input-enableCors" style="width: auto"> Enable Cors</label>			
+    </div>
+    <div class="form-row" class="hide">
+	    <label for="node-config-input-corsOrigins"></i> Cors Origins</label>
+	    <input type="text" id="node-config-input-corsOrigins">
+	</div>
+    <div class="form-row" class="hide">
+	    <label for="node-config-input-corsMethods"></i> Cors Methods</label>
+		<input type="text" id="node-config-input-corsMethods">
+	</div>
 </script>
 
 <script type="text/x-red" data-help-name="socketio-config">
@@ -59,52 +73,52 @@
 <!-- che sia il caso di settare la proprietà di uscita? -->
 <!-- devo validari i caratterii dei topic per evitare anche quelli vuoti -->
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-in',{
-		category:"SocketIO",
-        color:"rgb(0, 230, 184)",
-		defaults:{
-			name:{value:""},
-			server:{value:"", required:true, type:"socketio-config"},
-			rules: {value:[{v:""}]}
-		},
-		inputs: 0,
-		outputs: 1,
-		icon: "bridge.png",
-		label: function(){
-			return this.name || "SocketIO IN";
-		},
-		oneditprepare: function(){
-			var node = this;
-			$("#node-input-rule-container").css('min-height','250px').css('min-width','450px').editableList({
-				sortable: true,
+    RED.nodes.registerType('socketio-in', {
+        category: "SocketIO",
+        color: "rgb(0, 230, 184)",
+        defaults: {
+            name: { value: "" },
+            server: { value: "", required: true, type: "socketio-config" },
+            rules: { value: [{ v: "" }] }
+        },
+        inputs: 0,
+        outputs: 1,
+        icon: "bridge.png",
+        label: function () {
+            return this.name || "SocketIO IN";
+        },
+        oneditprepare: function () {
+            var node = this;
+            $("#node-input-rule-container").css('min-height', '250px').css('min-width', '450px').editableList({
+                sortable: true,
                 removable: true,
-				addItem: function(container,i,opt) {
-					if (!opt.hasOwnProperty('r')) {
-                        opt.r = {v:""};
+                addItem: function (container, i, opt) {
+                    if (!opt.hasOwnProperty('r')) {
+                        opt.r = { v: "" };
                     }
-					var row = $('<div/>').appendTo(container);
-					var label = $('<label/>',{for:"node-input-rule-value-"+i,style:"margin-left: 3px;"}).text("Topic " + i).appendTo(row);
-					var valueField = $('<input/>',{class:"node-input-rule-value",type:"text",style:"margin-left: 5px;"}).appendTo(row);
-					valueField.val(opt.r.v);
-				}
-			});
-			for (var i=0;i<this.rules.length;i++) {
-				var rule = this.rules[i];
-				$("#node-input-rule-container").editableList('addItem',{r:rule,i:i});
-			}
-		},
-		oneditsave: function() {
-			var rules = $("#node-input-rule-container").editableList('items');
-			var node = this;
-			node.rules = [];
-			rules.each(function(i) {
+                    var row = $('<div/>').appendTo(container);
+                    var label = $('<label/>', { for: "node-input-rule-value-" + i, style: "margin-left: 3px;" }).text("Topic " + i).appendTo(row);
+                    var valueField = $('<input/>', { class: "node-input-rule-value", type: "text", style: "margin-left: 5px;" }).appendTo(row);
+                    valueField.val(opt.r.v);
+                }
+            });
+            for (var i = 0; i < this.rules.length; i++) {
+                var rule = this.rules[i];
+                $("#node-input-rule-container").editableList('addItem', { r: rule, i: i });
+            }
+        },
+        oneditsave: function () {
+            var rules = $("#node-input-rule-container").editableList('items');
+            var node = this;
+            node.rules = [];
+            rules.each(function (i) {
                 var ruleData = $(this).data('data');
                 var rule = $(this);
-				var r = {};
+                var r = {};
                 r.v = rule.find(".node-input-rule-value").val();
                 node.rules.push(r);
             });
-		}
+        }
     });
 </script>
 
@@ -139,19 +153,19 @@
 
 <!-- nodo socketIO out, avrà lo scopo di effettuare l'emit dei dati verso il server-->
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-out',{
-		category:"SocketIO",
-        color:"rgb(0, 230, 184)",
-		defaults:{
-			name: {value:""},
-			server: {value:"", required:true, type:"socketio-config"}
-		},
-		inputs: 1,
-		outputs: 0,
-		icon: "bridge.png",
-		label: function(){
-			return this.name || "SocketIO OUT";
-		}		
+    RED.nodes.registerType('socketio-out', {
+        category: "SocketIO",
+        color: "rgb(0, 230, 184)",
+        defaults: {
+            name: { value: "" },
+            server: { value: "", required: true, type: "socketio-config" }
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "bridge.png",
+        label: function () {
+            return this.name || "SocketIO OUT";
+        }
     });
 </script>
 
@@ -187,19 +201,19 @@
 
 <!-- node socketIO join, join a room-->
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-join',{
-		category:"SocketIO",
-        color:"rgb(0, 230, 184)",
-		defaults:{
-			name: {value:""},
-			server: {value:"", required:true, type:"socketio-config"}
-		},
-		inputs: 1,
-		outputs: 0,
-		icon: "bridge.png",
-		label: function(){
-			return this.name || "SocketIO JOIN";
-		}		
+    RED.nodes.registerType('socketio-join', {
+        category: "SocketIO",
+        color: "rgb(0, 230, 184)",
+        defaults: {
+            name: { value: "" },
+            server: { value: "", required: true, type: "socketio-config" }
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "bridge.png",
+        label: function () {
+            return this.name || "SocketIO JOIN";
+        }
     });
 </script>
 
@@ -226,19 +240,19 @@
 
 <!-- node socketIO leave, leave a room-->
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-leave',{
-		category:"SocketIO",
-        color:"rgb(0, 230, 184)",
-		defaults:{
-			name: {value:""},
-			server: {value:"", required:true, type:"socketio-config"}
-		},
-		inputs: 1,
-		outputs: 0,
-		icon: "bridge.png",
-		label: function(){
-			return this.name || "SocketIO LEAVE";
-		}		
+    RED.nodes.registerType('socketio-leave', {
+        category: "SocketIO",
+        color: "rgb(0, 230, 184)",
+        defaults: {
+            name: { value: "" },
+            server: { value: "", required: true, type: "socketio-config" }
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "bridge.png",
+        label: function () {
+            return this.name || "SocketIO LEAVE";
+        }
     });
 </script>
 
@@ -264,19 +278,19 @@
 </script>
 
 <script type="text/javascript">
-    RED.nodes.registerType('socketio-rooms',{
-       category:"SocketIO",
-        color:"rgb(0, 230, 184)",
-		defaults:{
-			name: {value:""},
-			server: {value:"", required:true, type:"socketio-config"}
-		},
-        inputs:1,
-        outputs:1,
+    RED.nodes.registerType('socketio-rooms', {
+        category: "SocketIO",
+        color: "rgb(0, 230, 184)",
+        defaults: {
+            name: { value: "" },
+            server: { value: "", required: true, type: "socketio-config" }
+        },
+        inputs: 1,
+        outputs: 1,
         icon: "bridge.png",
-		label: function(){
-			return this.name || "SocketIO ROOMS";
-		}	
+        label: function () {
+            return this.name || "SocketIO ROOMS";
+        }
     });
 </script>
 
@@ -297,4 +311,4 @@
 <script type="text/x-red" data-help-name="socketio-rooms">
     <p>A node that gives you the list of rooms in socketio</p>
     
-</script>
+</script>
\ No newline at end of file
diff --git a/socketio.js b/socketio.js
index 0e71d23..355e51b 100644
--- a/socketio.js
+++ b/socketio.js
@@ -14,12 +14,31 @@ module.exports = function(RED) {
     this.port = n.port || 80;
     this.sendClient = n.sendClient;
     this.path = n.path || "/socket.io";
-    this.bindToNode = n.bindToNode || false;
+    this.bindToNode = n.bindToNode || false;    
+    this.corsOrigins = n.corsOrigins || "*";
+    this.corsMethods = n.corsMethods.toUpperCase().split(",") || "GET,POST";
+    this.enableCors = n.enableCors || false;
+
+    node.log("socketIoConfig - CORS METHODS " + JSON.stringify(this.corsMethods));
+    node.log("socketIoConfig - CORS ORIGINS " + JSON.stringify(this.corsOrigins));
+    node.log("socketIoConfig - CORS METHODS " + JSON.stringify(this.enableCors));
+
+    let corsOptions = {};
+    
+    if (this.enableCors) {
+      corsOptions = {
+        cors: {
+          origin: this.corsOrigins,
+          methods: this.corsMethods
+        }
+      };
+    }
 
-    if (this.bindToNode) {
-      io = new Server(RED.server);
-    } else {
-      io = new Server();
+    if (this.bindToNode) {      
+      io = new Server(RED.server, corsOptions);
+    } else {            
+      io = new Server(corsOptions);
+      
       io.serveClient(node.sendClient);
       io.path(node.path);
       io.listen(node.port);