Merge branch 'zwave-js:master' into import-config-ShellyQubino-00004

zwave-js · Jan 23, 2024 · 4888945 · 4888945
2 parents 2419a00 + 7bfda37
commit 4888945
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@
 <!--
 	Add placeholder for next release with `wip` snippet
 -->
+## 12.4.2 (2024-01-23)
+### Bugfixes
+* The check for a changed device config now always returns `false` for the controller (#6625)
+
+### Config file changes
+* Disable Supervision for Alfred DB1 Digital Deadbolt Lock to work around battery drain issue (#6629)
+* Add 2nd product ID for Ring Panic Button Gen2 (#6595)
+
+### Changes under the hood
+* Fix compatibility of ESLint plugin with Node.js 18 (#6580)
+
 ## 12.4.1 (2023-12-09)
 ### Bugfixes
 * Handle more cases of unexpected Serial API restarts (#6551)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/repo",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "private": true,
   "description": "Z-Wave driver written entirely in JavaScript/TypeScript",
   "keywords": [],

diff --git a/packages/cc/package.json b/packages/cc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/cc",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: Command Classes",
   "keywords": [],
   "publishConfig": {

diff --git a/packages/config/config/devices/0x021d/db1.json b/packages/config/config/devices/0x021d/db1.json
@@ -19,5 +19,16 @@
 		"exclusion": "-Follow the user guide of hub to enter exclusion mode.\n-Operate on lock following guide below:\n1.Enter master mode(refer to programming instruction)\n2.Input “8” to enter “function extension settings”\n3.Input “2” to log off a network",
 		"reset": "※Please use this procedure only when the network primary controller is missing or inoperable.\n-Operations on lock\n1.Open the door and keep the lock in \"unlock\" status\n2.Open battery box and find the reset button. \n3.Use a sharp thing to press and hold the reset button.\n4.Keep holding the reset button and remove a battery from battery box then replace it.\n5.Keep holding the reset button until hearing voice guide",
 		"manual": "https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/3373/Alfred%20Z-Wave%20Plus%20System%20Integrators%20Guide(DB1)%20V1.2.pdf"
+	},
+	"compat": {
+		"commandClasses": {
+			"remove": {
+				// The device has a bug where it stays awake after receiving a Supervision Get command
+				// with "request updates" set to true, which quickly drains the battery.
+				"Supervision": {
+					"endpoints": "*"
+				}
+			}
+		}
 	}
 }
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/config",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: configuration files",
   "publishConfig": {
     "access": "public"

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/eslint-plugin",
-  "version": "12.4.0",
+  "version": "12.4.2",
   "description": "zwave-js: custom ESLint rules",
   "private": true,
   "keywords": [],

diff --git a/packages/flash/package.json b/packages/flash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/flash",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: firmware flash utility",
   "keywords": [],
   "publishConfig": {

diff --git a/packages/host/package.json b/packages/host/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/host",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: Host abstractions",
   "keywords": [],
   "publishConfig": {

diff --git a/packages/serial/package.json b/packages/serial/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/serial",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: Serialport driver",
   "publishConfig": {
     "access": "public"

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zwave-js/testing",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "zwave-js: testing utilities",
   "keywords": [],
   "publishConfig": {

diff --git a/packages/zwave-js/package.json b/packages/zwave-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zwave-js",
-  "version": "12.4.1",
+  "version": "12.4.2",
   "description": "Z-Wave driver written entirely in JavaScript/TypeScript",
   "keywords": [],
   "main": "build/index.js",

diff --git a/packages/zwave-js/src/lib/node/Node.ts b/packages/zwave-js/src/lib/node/Node.ts
@@ -6601,6 +6601,9 @@ ${formatRouteHealthCheckSummary(this.id, otherNode.id, summary)}`,
 		// We can't know if the node is not fully interviewed
 		if (this.interviewStage !== InterviewStage.Complete) return NOT_KNOWN;
 
+		// The controller cannot be re-interviewed
+		if (this.isControllerNode) return false;
+
 		// If the hash was never stored, we can only (very likely) know if the config has not changed
 		const actualHash = this.deviceConfig?.getHash();
 		if (this.deviceConfigHash == undefined) {