From 08d4cbc1108e486bfbe7792cd821ad42ce67ab8f Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 30 Dec 2021 14:56:58 -0800
Subject: [PATCH] mqtt: fix erroneous error

---
 .gitmodules                              | 3 +++
 external/scrypted-ffmpeg                 | 1 +
 plugins/mqtt/package-lock.json           | 4 ++--
 plugins/mqtt/package.json                | 2 +-
 plugins/mqtt/src/api/mqtt-device-base.ts | 7 ++-----
 plugins/mqtt/src/main.ts                 | 2 ++
 6 files changed, 11 insertions(+), 8 deletions(-)
 create mode 160000 external/scrypted-ffmpeg

diff --git a/.gitmodules b/.gitmodules
index bf7d7f96a..1574ea742 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "external/sort"]
 	path = external/sort
 	url = git@github.com:koush/sort.git
+[submodule "external/scrypted-ffmpeg"]
+	path = external/scrypted-ffmpeg
+	url = git@github.com:koush/scrypted-ffmpeg
diff --git a/external/scrypted-ffmpeg b/external/scrypted-ffmpeg
new file mode 160000
index 000000000..ff39cb8a8
--- /dev/null
+++ b/external/scrypted-ffmpeg
@@ -0,0 +1 @@
+Subproject commit ff39cb8a8015bcf2f4989548ef1bcbc4c22b247f
diff --git a/plugins/mqtt/package-lock.json b/plugins/mqtt/package-lock.json
index 46d5e22c4..b3f6f3079 100644
--- a/plugins/mqtt/package-lock.json
+++ b/plugins/mqtt/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/mqtt",
-   "version": "0.0.32",
+   "version": "0.0.34",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/mqtt",
-         "version": "0.0.32",
+         "version": "0.0.34",
          "dependencies": {
             "@types/node": "^16.6.1",
             "aedes": "^0.46.1",
diff --git a/plugins/mqtt/package.json b/plugins/mqtt/package.json
index 0dd9571cd..6b8a57f57 100644
--- a/plugins/mqtt/package.json
+++ b/plugins/mqtt/package.json
@@ -38,5 +38,5 @@
       "@scrypted/sdk": "file:../../sdk",
       "@types/nunjucks": "^3.2.0"
    },
-   "version": "0.0.32"
+   "version": "0.0.34"
 }
diff --git a/plugins/mqtt/src/api/mqtt-device-base.ts b/plugins/mqtt/src/api/mqtt-device-base.ts
index 91378873f..3ee009ab0 100644
--- a/plugins/mqtt/src/api/mqtt-device-base.ts
+++ b/plugins/mqtt/src/api/mqtt-device-base.ts
@@ -61,11 +61,8 @@ export class MqttDeviceBase extends ScryptedDeviceBase implements Settings {
         });
         client.setMaxListeners(Infinity);
 
-        client.on('connect', err => {
-            if (err) {
-                this.console.error('error subscribing to mqtt', err);
-                return;
-            }
+        client.on('connect', packet => {
+            this.console.log('connected to mqtt', packet);
         })
         
         return this.client;
diff --git a/plugins/mqtt/src/main.ts b/plugins/mqtt/src/main.ts
index b203af80e..39d1af1ec 100644
--- a/plugins/mqtt/src/main.ts
+++ b/plugins/mqtt/src/main.ts
@@ -295,6 +295,8 @@ class MqttPublisherMixin extends SettingsMixinDeviceBase<any> {
     release() {
         this.client?.end();
         this.client = undefined;
+        this.listener?.removeListener();
+        this.listener = undefined;
     }
 }