Merge pull request #34 from jaguardo/remove_listeners

Remove listeners
flynneva · Apr 29, 2021 · 1c715f7 · 1c715f7
2 parents 2884d16 + 0127553
commit 1c715f7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-standard": "^4.0.1",
     "gh-pages": "^2.2.0",
-    "microbundle-crl": "^0.13.10",
+    "microbundle-crl": "^0.13.11",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.4",
     "react": "^16.13.1",

diff --git a/src/components/ROS.js b/src/components/ROS.js
@@ -77,7 +77,7 @@ function useROS() {
       }
     }
     ros.listeners.push(newListener);
-    console.log('Listener created');
+    console.log('Listener ' + newListener.name + ' created');
     return newListener;
   }
 
@@ -105,17 +105,40 @@ function useROS() {
       ros.ROS.close();
       setROS(ros => ({ ...ros, isConnected: false }));
       setROS(ros => ({ ...ros, topics: [] }));
+      setROS(ros => ({ ...ros, listeners: [] }));
     } catch (e) {
       console.log(e);
     }
+    console.log('Disconnect Requested');
   }
 
+const removeAllListeners = () =>{
+  for(var mlistener in ros.listeners){
+    ros.listeners[mlistener].removeAllListeners();
+  }
+  setROS(ros => ({ ...ros, listeners: [] }));
+}
+
+function removeListener (listener){
+  for(var mlistener in ros.listeners){
+    if(listener.name === ros.listeners[mlistener].name){
+      console.log('Listener: ' + listener.name + ' is removed')
+      ros.listeners.splice(mlistener,1)
+      listener.removeAllListeners();
+      return
+    }
+  }
+  console.log('Listener: ' + listener + ' is not a listener')
+}
+
   return {
     toggleConnection,
     changeUrl,
     getTopics,
     createListener,
     toggleAutoconnect,
+    removeAllListeners,
+    removeListener,
     ros: ros.ROS,
     isConnected: ros.isConnected,
     autoconnect: ros.autoconnect,