feat: handles edge case for second subscribe call and adds todo for h…

…andling client disconnect on server side

experimentation/sockets.js

@@ -2,38 +2,30 @@ var socket;
 var socketid;
 
 function subscribe(uri, query, variables = null, callback) { 
+  console.log(`subscribing to ${query}`);
   if (!socket) {
-    socket = io('http://localhost:4000');
+    socket = io(uri);
     socket.on('init', ({id}) => {
       socketid = id;
       socket.on(socketid, (data) => { callback(data) });
       socket.emit(socketid, { query });
     });
+  }else{
+    socket.emit(socketid, {query});
   }
-
-  // var xhr = new XMLHttpRequest();
-  // xhr.responseType = 'json';
-  // xhr.open("GET", uri, false);
-  // xhr.setRequestHeader("Content-Type", "application/json");
-  // xhr.setRequestHeader("Accept", "application/json");
-  // xhr.send(JSON.stringify({
-  //   query: query,
-  //   variables: variables
-  // }));
-  // return xhr.responseText;
 }
 
 function unsubscribe() { 
   socket.emit('unsubscribe', { socketid });
 }
+// subscribe(null, '{ getMessages(id: 0, test:"testarg", another:"anotherarg", something:"somethingarg"){content, author} }', null, function (data) { console.log(data) });
 
-//subscribe(null, '{ getMessages(id: 0, test:"testarg", another:"anotherarg", something:"somethingarg"){content, author} }', null, function (data) {
-subscribe(null, `
-{
-  getMessage(id: 0){
-    id, content, author
-  }
-}
-`, null, function (data) {
-  console.log(data);
-});
+    // subscribe(null, `
+    // {
+    //   getMessage(id: 0){
+    //     id, content, author
+    //   }
+    // }
+    // `, null, function (data) {
+    //   console.log(data);
+    // });

src/jobqueue.js

@@ -23,7 +23,7 @@ class JobQueue {
     return this.jobQueue.length;
   }
 
-  addObservable(name, callback, errCallback, completeCallback, loopback=true, interval = 5000) {
+  addObservable(name, callback, errCallback, completeCallback, loopback=true, interval = 100) {
     if(!this.watchdogs[name]) {
       let subscribeCallback = (intervalTime) => {
         if(this.jobQueue.length > 0) {

src/subql.js

@@ -123,7 +123,12 @@ function handleSubscribe(query, socketid) {
     query.query,
     root
   ).then((result) => {
-    connected[socketid].socket.emit(socketid, result);
+    if(connected[socketid]){
+      connected[socketid].socket.emit(socketid, result);
+    }else{
+      // client has disconnected.
+      // TODO add in logic for removing data about disconnected client
+    }
   });
 }