connect and immediate disconnect

gilesbradshaw · Apr 23, 2016 · fcc3cb0 · fcc3cb0
1 parent ed091e5
commit fcc3cb0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/NodeSocket.js b/NodeSocket.js
@@ -75,20 +75,31 @@ class NodeSocket {
 						if(nodeId.split(':')[0] !== 'Executable') {
 							// install monitored item
 							//console.log('monitoring', nodeId);
-							let monitoredItem  = subscription.monitor(nodeDefinition,
-							{
-									samplingInterval: 1000,
-									discardOldest: true,
-									queueSize: 10
-							},
-							opcua.read_service.TimestampsToReturn.Both
-							);
 
-							monitoredItem.on("changed",function(dataValue){
+							let monitoredPromise =  new Promise((resolve, reject)=>{
+								let monitoredItem  = subscription.monitor(nodeDefinition,
+									{
+											samplingInterval: 1000,
+											discardOldest: true,
+											queueSize: 10
+									},
+									opcua.read_service.TimestampsToReturn.Both,
+									(err)=>{
+										if(err) {
+											reject(err);
+										} else {
+											resolve(monitoredItem);
+										}
+									}
+								);	
+
+								monitoredItem.on("changed",function(dataValue){
 									obs.onNext(dataValue);
+								});
+								console.log("-monitoring",  subscription.subscriptionId, nodeId);	
 							});
-							console.log("-monitoring",  subscription.subscriptionId, nodeId);
-							return ()=>monitoredItem.terminate();	
+							return ()=>
+								monitoredPromise.then((item)=>item.terminate());
 						} else {
 							let requiredPoll = {
 								obs,

diff --git a/server.production.js b/server.production.js
@@ -73,11 +73,21 @@ io.on('connection', (mySocket)=> {
 
 
   });
-  mySocket.on('leave', (nodeId) => leaveRoom(mySocket, nodeId, myRooms, myConnection));
+  mySocket.on('leave', (nodeId) => {
+    console.log('leave:' , nodeId);
+    leaveRoom(mySocket, nodeId, myRooms, myConnection);
+  });
+
 
   mySocket.on('disconnect', function(){
+    console.log('disconnecting...');
     for(const node of Object.keys(myRooms)) {
-      leaveRoom(mySocket, node, myRooms, myConnection);
+      try {
+        leaveRoom(mySocket, node, myRooms, myConnection);  
+      } catch(ex){
+
+      }
+
     }
   });
 });