Unregister adapter events on Controller.stop() (zigbeer#39)

allofmex · Sep 27, 2019 · 5752a23 · 5752a23
1 parent 033a678
commit 5752a23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/controller/controller.ts b/src/controller/controller.ts
@@ -182,6 +182,14 @@ class Controller extends events.EventEmitter {
             group.save();
         }
 
+        // Unregister adapter events
+        this.adapter.removeAllListeners(AdapterEvents.Events.deviceJoined);
+        this.adapter.removeAllListeners(AdapterEvents.Events.zclData);
+        this.adapter.removeAllListeners(AdapterEvents.Events.rawData);
+        this.adapter.removeAllListeners(AdapterEvents.Events.disconnected);
+        this.adapter.removeAllListeners(AdapterEvents.Events.deviceAnnounce);
+        this.adapter.removeAllListeners(AdapterEvents.Events.deviceLeave);
+
         await this.permitJoin(false);
         clearInterval(this.backupTimer);
         await this.backup();

diff --git a/test/controller.test.ts b/test/controller.test.ts
@@ -113,6 +113,7 @@ jest.mock('../src/adapter/z-stack/adapter/zStackAdapter', () => {
     return jest.fn().mockImplementation(() => {
         return {
             on: (event, handler) => mockAdapterEvents[event] = handler,
+            removeAllListeners: (event) => delete mockAdapterEvents[event],
             start: mockAdapterStart,
             getCoordinator: () => {
                 return {