From a757f8b07072340fa56f17c7ceb9c3a63f83ecaa Mon Sep 17 00:00:00 2001 From: David Miller Date: Fri, 31 Dec 2021 00:49:19 +0000 Subject: [PATCH] Update to mqtt 4.3.2 --- .gitignore | 1 + package-lock.json | 118 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- run2.sh | 2 +- test2/config.json | 2 +- 5 files changed, 111 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 15f9d27..8a7289f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ test2/auth.json test2/config.json.* test2/persist/ControllerStorage.*.json test2/backups/* +test2/accessories/uiAccessoriesLayout.json diff --git a/package-lock.json b/package-lock.json index 11c34e2..97dce41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "homebridge-mqttthing", - "version": "1.1.33", + "version": "1.1.36", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "homebridge-mqttthing", - "version": "1.1.33", + "version": "1.1.36", "license": "Apache-2.0", "dependencies": { "fakegato-history": "^0.6.2", "homebridge-lib": "~5.1.4", "jsonpath": "^1.1.1", - "mqtt": "^4.2.6" + "mqtt": "^4.3.2" }, "engines": { "homebridge": "^1.3.5", @@ -223,6 +223,14 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/collections": { + "version": "5.1.13", + "resolved": "https://registry.npmjs.org/collections/-/collections-5.1.13.tgz", + "integrity": "sha512-SCb6Qd+d3Z02corWQ7/mqXiXeeTdHvkP6TeFSYfGYdCFp1WrjSNZ3j6y8Y3T/7osGEe0iOcU2g1d346l99m4Lg==", + "dependencies": { + "weak-map": "~1.0.x" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1067,10 +1075,11 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "node_modules/mqtt": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz", - "integrity": "sha512-DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.2.tgz", + "integrity": "sha512-cSmPOvTL9diVV7nZVHobwFR//fLZw8c1Yw04z49sLwJx45ooiiqcg2soFLYdjI4iXlkw49lP6BZ2ZRv9kGpOyw==", "dependencies": { + "collections": "^5.1.13", "commist": "^1.0.0", "concat-stream": "^2.0.0", "debug": "^4.1.1", @@ -1079,11 +1088,13 @@ "inherits": "^2.0.3", "minimist": "^1.2.5", "mqtt-packet": "^6.8.0", + "number-allocator": "^1.0.8", "pump": "^3.0.0", "readable-stream": "^3.6.0", "reinterval": "^1.1.0", + "rfdc": "^1.3.0", "split2": "^3.1.0", - "ws": "^7.5.0", + "ws": "^7.5.5", "xtend": "^4.0.2" }, "bin": { @@ -1185,6 +1196,36 @@ "node": ">= 6.0.0" } }, + "node_modules/number-allocator": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.8.tgz", + "integrity": "sha512-5lhaurSl3Kvn6j47S2ELzyv5X7b+UvvcZONUjL5/bFGNiOU7GkG/HUmtqef9ayEzS2i6BtsqB0FTTyu+8QrRrg==", + "dependencies": { + "collections": "^5.1.13", + "debug": "^4.3.1" + } + }, + "node_modules/number-allocator/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/number-allocator/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/object-inspect": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", @@ -1334,6 +1375,11 @@ "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz", "integrity": "sha1-M2Hs+jymwYKDOA3Qu5VG85D17Oc=" }, + "node_modules/rfdc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -1516,6 +1562,11 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/weak-map": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", + "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" + }, "node_modules/which-boxed-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", @@ -1750,6 +1801,14 @@ "supports-color": "^7.1.0" } }, + "collections": { + "version": "5.1.13", + "resolved": "https://registry.npmjs.org/collections/-/collections-5.1.13.tgz", + "integrity": "sha512-SCb6Qd+d3Z02corWQ7/mqXiXeeTdHvkP6TeFSYfGYdCFp1WrjSNZ3j6y8Y3T/7osGEe0iOcU2g1d346l99m4Lg==", + "requires": { + "weak-map": "~1.0.x" + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2360,10 +2419,11 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mqtt": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.2.8.tgz", - "integrity": "sha512-DJYjlXODVXtSDecN8jnNzi6ItX3+ufGsEs9OB3YV24HtkRrh7kpx8L5M1LuyF0KzaiGtWr2PzDcMGAY60KGOSA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.2.tgz", + "integrity": "sha512-cSmPOvTL9diVV7nZVHobwFR//fLZw8c1Yw04z49sLwJx45ooiiqcg2soFLYdjI4iXlkw49lP6BZ2ZRv9kGpOyw==", "requires": { + "collections": "^5.1.13", "commist": "^1.0.0", "concat-stream": "^2.0.0", "debug": "^4.1.1", @@ -2372,11 +2432,13 @@ "inherits": "^2.0.3", "minimist": "^1.2.5", "mqtt-packet": "^6.8.0", + "number-allocator": "^1.0.8", "pump": "^3.0.0", "readable-stream": "^3.6.0", "reinterval": "^1.1.0", + "rfdc": "^1.3.0", "split2": "^3.1.0", - "ws": "^7.5.0", + "ws": "^7.5.5", "xtend": "^4.0.2" }, "dependencies": { @@ -2449,6 +2511,30 @@ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" }, + "number-allocator": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.8.tgz", + "integrity": "sha512-5lhaurSl3Kvn6j47S2ELzyv5X7b+UvvcZONUjL5/bFGNiOU7GkG/HUmtqef9ayEzS2i6BtsqB0FTTyu+8QrRrg==", + "requires": { + "collections": "^5.1.13", + "debug": "^4.3.1" + }, + "dependencies": { + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "object-inspect": { "version": "1.10.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", @@ -2556,6 +2642,11 @@ "resolved": "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz", "integrity": "sha1-M2Hs+jymwYKDOA3Qu5VG85D17Oc=" }, + "rfdc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==" + }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2696,6 +2787,11 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" }, + "weak-map": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", + "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" + }, "which-boxed-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", diff --git a/package.json b/package.json index 471f693..b176d7d 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,6 @@ "fakegato-history": "^0.6.2", "homebridge-lib": "~5.1.4", "jsonpath": "^1.1.1", - "mqtt": "^4.2.6" + "mqtt": "^4.3.2" } } diff --git a/run2.sh b/run2.sh index 3ebfafb..9cd7bf9 100755 --- a/run2.sh +++ b/run2.sh @@ -1,2 +1,2 @@ #export DEBUG=* -homebridge -U test2 -D -P . +homebridge -U test2 -D -I -P . diff --git a/test2/config.json b/test2/config.json index 432d0ad..5b21436 100644 --- a/test2/config.json +++ b/test2/config.json @@ -514,7 +514,7 @@ }, { "name": "AMAX", "accessory": "mqttthing", - "url": "url", + "url": "homebridge2", "username": "user", "password": "passwd", "type": "securitySystem",