diff --git a/package-lock.json b/package-lock.json index 061b9f89d..7aa8830dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,10 +35,10 @@ "semver": "^7.5.4", "ts-node": "^10.9.1", "typescript": "^5.1.6", - "zwave-js": "^12.2.1" + "zwave-js": "^12.4.0" }, "peerDependencies": { - "zwave-js": "^12.2.1" + "zwave-js": "^12.4.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -65,13 +65,13 @@ } }, "node_modules/@alcalzone/pak": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.9.0.tgz", - "integrity": "sha512-to2mQdMPxu/fF3at1QozRfEqrKTv7p0kLFXdv/kadjFm9Tph5JZCPC+gzQQhe5Cw2pQc8JkbmvOasENNHlezPQ==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.10.1.tgz", + "integrity": "sha512-h7XjOabYWFXWy4gv4KI1TZdzI/0oqe4bGZ2iyi7phldchCxf8+fgz3/ThGdQSd7oJMGJH+hmO1z/b9mb887bvg==", "dev": true, "dependencies": { - "axios": "^0.27.2", - "execa": "~5.0.0", + "axios": "^1.6.2", + "execa": "~5.0.1", "fs-extra": "^10.1.0", "semver": "^7.3.7", "tiny-glob": "^0.2.9" @@ -1110,14 +1110,14 @@ "dev": true }, "node_modules/@zwave-js/cc": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.3.0.tgz", - "integrity": "sha512-oEajP6yigFlHtGmorlQQ6L5RacwZciDBFihjZJxvxbbzOcoKskaxdR62SR51nf6o7jeWMudSP1jra6dYz5Q18A==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.4.0.tgz", + "integrity": "sha512-9hPhgvksVMcyWgf8/b9EHWuWQyUSDJldcISSYoiJefeOx8wcTe8DY1ZjZRCJntnC7H563oHX/leUWDvkQ+QJTA==", "dev": true, "dependencies": { - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", @@ -1131,12 +1131,12 @@ } }, "node_modules/@zwave-js/config": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-12.3.0.tgz", - "integrity": "sha512-idwjJrYFFaPZ70ZZV8kOQSee/dVQmz1qAKy53aS0bLrKihX/qr66hjApnyAR+fgqKBXsvaFk1QJm8dy+Q/g1WQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-12.4.0.tgz", + "integrity": "sha512-92ZIcVNVjDACBxjSxSE+4JCaQYIumCxQjIq6K9DFLzsgHYQ9VbofMI7WxdOGEVe2K8ryfgIeKd/RtpTm5GQrcg==", "dev": true, "dependencies": { - "@zwave-js/core": "12.3.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", @@ -1154,9 +1154,9 @@ } }, "node_modules/@zwave-js/config/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -1168,9 +1168,9 @@ } }, "node_modules/@zwave-js/core": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-12.3.0.tgz", - "integrity": "sha512-QHH5brGId+gr/bwrAkkjg4CGDRJb9PKCqy6jdLNxPhJdNSRaQ2DLzlWfKbfGnyYd39U6/b/JdGg9h+Gutb9s0w==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-12.4.0.tgz", + "integrity": "sha512-9YCq1xFOF8B6qWDtyY/G5OvrIiIn4I1NCkTZyyjInposuXKs6gn9csRAblIj8PQgyJPJZO5XWAXfBiWeWLXsNw==", "dev": true, "dependencies": { "@alcalzone/jsonl-db": "^3.1.0", @@ -1194,13 +1194,13 @@ } }, "node_modules/@zwave-js/host": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-12.3.0.tgz", - "integrity": "sha512-2ngot/kI363S2iLglKCTqwHjhVeuX6nCjynuak1RZXSRO1oH0W8JxNfVL9WexadBj9ygrdHtRTIUY4e1csbcIw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-12.4.0.tgz", + "integrity": "sha512-7PgJQYJbd4SuxnlHtGVeRen0mKmJHs+2i9wEp64onH8lZXDlzz2wIUXigHLv2iDMpg2v83HWB66K9loEZOrgfA==", "dev": true, "dependencies": { - "@zwave-js/config": "12.3.0", - "@zwave-js/core": "12.3.0", + "@zwave-js/config": "12.4.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8" }, @@ -1212,12 +1212,12 @@ } }, "node_modules/@zwave-js/nvmedit": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.3.0.tgz", - "integrity": "sha512-eAPvpOSNS5wzS6Hs7+BOmDtAbIoozfOyB6/TOW9DtwEHdvKreR4x4D/tUVvxqnc7icCOcLo+iOM8jqR3VYXbMg==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.4.0.tgz", + "integrity": "sha512-HdUeaE6V3vWRiyXfn4NNVUlpdGkpwYsBZUtXfPMXHzAjBY7kPFb8l73rRgDSqKzEo8yRHIu2CurenI6+7L9Rxw==", "dev": true, "dependencies": { - "@zwave-js/core": "12.3.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "fs-extra": "^11.1.1", @@ -1236,9 +1236,9 @@ } }, "node_modules/@zwave-js/nvmedit/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -1250,14 +1250,14 @@ } }, "node_modules/@zwave-js/serial": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.3.0.tgz", - "integrity": "sha512-mNjGI2BzDua+dL7T9nqxAqBqwL8cZvP5SJw0aZ4vPUERnSJGd230dbTSjvOA0VrO7DwU21UHcI86uMUD2yOgDQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.4.0.tgz", + "integrity": "sha512-A59rtGdMBuy0l1hCDXfcQFlETvi/G7cymJzCp01NSxDG6Etu2v5mWuFqkfqUkf0OAJQbRWRH/KBYIg8ttaFsZg==", "dev": true, "dependencies": { "@serialport/stream": "^12.0.0", - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "serialport": "^12.0.0", @@ -1287,9 +1287,9 @@ } }, "node_modules/@zwave-js/shared/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -1301,14 +1301,14 @@ } }, "node_modules/@zwave-js/testing": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.3.0.tgz", - "integrity": "sha512-mAyimQf+uuTj3CfciAGw+xBRz5WvbEAaUCATI0aHoSxd21pbYFcrspLpnotQK8rbAbUHTb+fGzHj4unFTVrkvw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.4.0.tgz", + "integrity": "sha512-VH9RLWgyT178Qbtw0ThLZpV/aERi0w5wvKUOIHFZHZGX3i7y1fSrpWfqQoh2hOP8WMLxfcNE2/iB97qt9cAagg==", "dev": true, "dependencies": { - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3" @@ -1472,13 +1472,14 @@ "dev": true }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "dev": true, "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/balanced-match": { @@ -2313,9 +2314,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true, "funding": [ { @@ -3421,9 +3422,9 @@ } }, "node_modules/nrf-intel-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.3.0.tgz", - "integrity": "sha512-oXwBJxX/0Jc4fe2Jxjv3Mw9/qw9JdToDLvJuozfVx+twpkc2oSUm8W/OODX6W4kmWOaYA11ORpGLfQ8BP7mndw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.4.0.tgz", + "integrity": "sha512-q3+GGRIpe0VvCjUP1zaqW5rk6IpCZzhD0lu7Sguo1bgWwFcA9kZRjsaKUb0jBQMnefyOl5o0BBGAxvqMqYx8Sg==", "dev": true, "engines": { "node": ">=6.0.0" @@ -3710,6 +3711,12 @@ "signal-exit": "^3.0.2" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -4545,21 +4552,21 @@ } }, "node_modules/zwave-js": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-12.3.0.tgz", - "integrity": "sha512-ZiGFyWSHT6xXgFsMj0gh+5D76h4oKSqoDBBVlrZitJShpan6LqE9eEhocP4XFTXs7XrLlbbo54gEz7y5P0KP9Q==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-12.4.0.tgz", + "integrity": "sha512-vCp893t+AmAtwIG+1JVJaweUbOGV4wl461G13PaGUNln/OVcPkmmKZjJ7iftir1d6E9ymmgslf7Vqx37+GpGBQ==", "dev": true, "dependencies": { "@alcalzone/jsonl-db": "^3.1.0", - "@alcalzone/pak": "^0.9.0", - "@zwave-js/cc": "12.3.0", - "@zwave-js/config": "12.3.0", - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/nvmedit": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@alcalzone/pak": "^0.10.1", + "@zwave-js/cc": "12.4.0", + "@zwave-js/config": "12.4.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/nvmedit": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", - "@zwave-js/testing": "12.3.0", + "@zwave-js/testing": "12.4.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "execa": "^5.1.1", @@ -4619,13 +4626,13 @@ } }, "@alcalzone/pak": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.9.0.tgz", - "integrity": "sha512-to2mQdMPxu/fF3at1QozRfEqrKTv7p0kLFXdv/kadjFm9Tph5JZCPC+gzQQhe5Cw2pQc8JkbmvOasENNHlezPQ==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.10.1.tgz", + "integrity": "sha512-h7XjOabYWFXWy4gv4KI1TZdzI/0oqe4bGZ2iyi7phldchCxf8+fgz3/ThGdQSd7oJMGJH+hmO1z/b9mb887bvg==", "dev": true, "requires": { - "axios": "^0.27.2", - "execa": "~5.0.0", + "axios": "^1.6.2", + "execa": "~5.0.1", "fs-extra": "^10.1.0", "semver": "^7.3.7", "tiny-glob": "^0.2.9" @@ -5342,14 +5349,14 @@ "dev": true }, "@zwave-js/cc": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.3.0.tgz", - "integrity": "sha512-oEajP6yigFlHtGmorlQQ6L5RacwZciDBFihjZJxvxbbzOcoKskaxdR62SR51nf6o7jeWMudSP1jra6dYz5Q18A==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.4.0.tgz", + "integrity": "sha512-9hPhgvksVMcyWgf8/b9EHWuWQyUSDJldcISSYoiJefeOx8wcTe8DY1ZjZRCJntnC7H563oHX/leUWDvkQ+QJTA==", "dev": true, "requires": { - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", @@ -5357,12 +5364,12 @@ } }, "@zwave-js/config": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-12.3.0.tgz", - "integrity": "sha512-idwjJrYFFaPZ70ZZV8kOQSee/dVQmz1qAKy53aS0bLrKihX/qr66hjApnyAR+fgqKBXsvaFk1QJm8dy+Q/g1WQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/config/-/config-12.4.0.tgz", + "integrity": "sha512-92ZIcVNVjDACBxjSxSE+4JCaQYIumCxQjIq6K9DFLzsgHYQ9VbofMI7WxdOGEVe2K8ryfgIeKd/RtpTm5GQrcg==", "dev": true, "requires": { - "@zwave-js/core": "12.3.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", @@ -5374,9 +5381,9 @@ }, "dependencies": { "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -5387,9 +5394,9 @@ } }, "@zwave-js/core": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-12.3.0.tgz", - "integrity": "sha512-QHH5brGId+gr/bwrAkkjg4CGDRJb9PKCqy6jdLNxPhJdNSRaQ2DLzlWfKbfGnyYd39U6/b/JdGg9h+Gutb9s0w==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/core/-/core-12.4.0.tgz", + "integrity": "sha512-9YCq1xFOF8B6qWDtyY/G5OvrIiIn4I1NCkTZyyjInposuXKs6gn9csRAblIj8PQgyJPJZO5XWAXfBiWeWLXsNw==", "dev": true, "requires": { "@alcalzone/jsonl-db": "^3.1.0", @@ -5407,24 +5414,24 @@ } }, "@zwave-js/host": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-12.3.0.tgz", - "integrity": "sha512-2ngot/kI363S2iLglKCTqwHjhVeuX6nCjynuak1RZXSRO1oH0W8JxNfVL9WexadBj9ygrdHtRTIUY4e1csbcIw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/host/-/host-12.4.0.tgz", + "integrity": "sha512-7PgJQYJbd4SuxnlHtGVeRen0mKmJHs+2i9wEp64onH8lZXDlzz2wIUXigHLv2iDMpg2v83HWB66K9loEZOrgfA==", "dev": true, "requires": { - "@zwave-js/config": "12.3.0", - "@zwave-js/core": "12.3.0", + "@zwave-js/config": "12.4.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8" } }, "@zwave-js/nvmedit": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.3.0.tgz", - "integrity": "sha512-eAPvpOSNS5wzS6Hs7+BOmDtAbIoozfOyB6/TOW9DtwEHdvKreR4x4D/tUVvxqnc7icCOcLo+iOM8jqR3VYXbMg==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.4.0.tgz", + "integrity": "sha512-HdUeaE6V3vWRiyXfn4NNVUlpdGkpwYsBZUtXfPMXHzAjBY7kPFb8l73rRgDSqKzEo8yRHIu2CurenI6+7L9Rxw==", "dev": true, "requires": { - "@zwave-js/core": "12.3.0", + "@zwave-js/core": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "fs-extra": "^11.1.1", @@ -5434,9 +5441,9 @@ }, "dependencies": { "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -5447,14 +5454,14 @@ } }, "@zwave-js/serial": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.3.0.tgz", - "integrity": "sha512-mNjGI2BzDua+dL7T9nqxAqBqwL8cZvP5SJw0aZ4vPUERnSJGd230dbTSjvOA0VrO7DwU21UHcI86uMUD2yOgDQ==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.4.0.tgz", + "integrity": "sha512-A59rtGdMBuy0l1hCDXfcQFlETvi/G7cymJzCp01NSxDG6Etu2v5mWuFqkfqUkf0OAJQbRWRH/KBYIg8ttaFsZg==", "dev": true, "requires": { "@serialport/stream": "^12.0.0", - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "serialport": "^12.0.0", @@ -5472,9 +5479,9 @@ }, "dependencies": { "fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "requires": { "graceful-fs": "^4.2.0", @@ -5485,14 +5492,14 @@ } }, "@zwave-js/testing": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.3.0.tgz", - "integrity": "sha512-mAyimQf+uuTj3CfciAGw+xBRz5WvbEAaUCATI0aHoSxd21pbYFcrspLpnotQK8rbAbUHTb+fGzHj4unFTVrkvw==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.4.0.tgz", + "integrity": "sha512-VH9RLWgyT178Qbtw0ThLZpV/aERi0w5wvKUOIHFZHZGX3i7y1fSrpWfqQoh2hOP8WMLxfcNE2/iB97qt9cAagg==", "dev": true, "requires": { - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3" @@ -5607,13 +5614,14 @@ "dev": true }, "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", + "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", "dev": true, "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "balanced-match": { @@ -6263,9 +6271,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "dev": true }, "form-data": { @@ -7041,9 +7049,9 @@ } }, "nrf-intel-hex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.3.0.tgz", - "integrity": "sha512-oXwBJxX/0Jc4fe2Jxjv3Mw9/qw9JdToDLvJuozfVx+twpkc2oSUm8W/OODX6W4kmWOaYA11ORpGLfQ8BP7mndw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.4.0.tgz", + "integrity": "sha512-q3+GGRIpe0VvCjUP1zaqW5rk6IpCZzhD0lu7Sguo1bgWwFcA9kZRjsaKUb0jBQMnefyOl5o0BBGAxvqMqYx8Sg==", "dev": true }, "object-hash": { @@ -7237,6 +7245,12 @@ "signal-exit": "^3.0.2" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -7801,21 +7815,21 @@ "dev": true }, "zwave-js": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-12.3.0.tgz", - "integrity": "sha512-ZiGFyWSHT6xXgFsMj0gh+5D76h4oKSqoDBBVlrZitJShpan6LqE9eEhocP4XFTXs7XrLlbbo54gEz7y5P0KP9Q==", + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/zwave-js/-/zwave-js-12.4.0.tgz", + "integrity": "sha512-vCp893t+AmAtwIG+1JVJaweUbOGV4wl461G13PaGUNln/OVcPkmmKZjJ7iftir1d6E9ymmgslf7Vqx37+GpGBQ==", "dev": true, "requires": { "@alcalzone/jsonl-db": "^3.1.0", - "@alcalzone/pak": "^0.9.0", - "@zwave-js/cc": "12.3.0", - "@zwave-js/config": "12.3.0", - "@zwave-js/core": "12.3.0", - "@zwave-js/host": "12.3.0", - "@zwave-js/nvmedit": "12.3.0", - "@zwave-js/serial": "12.3.0", + "@alcalzone/pak": "^0.10.1", + "@zwave-js/cc": "12.4.0", + "@zwave-js/config": "12.4.0", + "@zwave-js/core": "12.4.0", + "@zwave-js/host": "12.4.0", + "@zwave-js/nvmedit": "12.4.0", + "@zwave-js/serial": "12.4.0", "@zwave-js/shared": "12.2.3", - "@zwave-js/testing": "12.3.0", + "@zwave-js/testing": "12.4.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "execa": "^5.1.1", diff --git a/package.json b/package.json index cd3d33297..67634ccd4 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "ws": "^8.13.0" }, "peerDependencies": { - "zwave-js": "^12.2.1" + "zwave-js": "^12.4.0" }, "devDependencies": { "@tsconfig/node18": "^18.2.1", @@ -54,7 +54,7 @@ "semver": "^7.5.4", "ts-node": "^10.9.1", "typescript": "^5.1.6", - "zwave-js": "^12.2.1" + "zwave-js": "^12.4.0" }, "husky": { "hooks": { diff --git a/src/lib/const.ts b/src/lib/const.ts index fa3ca11ad..0a135b807 100644 --- a/src/lib/const.ts +++ b/src/lib/const.ts @@ -4,7 +4,7 @@ export const version = require("../../package.json").version; export const minSchemaVersion = 0; // maximal/current schema version the server supports -export const maxSchemaVersion = 33; +export const maxSchemaVersion = 34; export const applicationName = "zwave-js-server"; export const dnssdServiceType = applicationName; diff --git a/src/lib/state.ts b/src/lib/state.ts index f6f231d97..1453a6dfa 100644 --- a/src/lib/state.ts +++ b/src/lib/state.ts @@ -22,6 +22,7 @@ import { ControllerStatistics, InclusionState, FoundNode, + RebuildRoutesStatus, } from "zwave-js"; import { DeviceConfig } from "@zwave-js/config"; import { @@ -110,13 +111,18 @@ type ControllerStateSchema32 = Omit< "isHealNetworkActive" >; +type ControllerStateSchema34 = ControllerStateSchema32 & { + rebuildRoutesProgress?: ReadonlyMap; +}; + export type ControllerState = | ControllerStateSchema0 | ControllerStateSchema16 | ControllerStateSchema22 | ControllerStateSchema25 | ControllerStateSchema31 - | ControllerStateSchema32; + | ControllerStateSchema32 + | ControllerStateSchema34; export interface ZwaveState { driver: DriverState; @@ -853,7 +859,13 @@ export const dumpController = ( const controller32 = controller31 as Partial; controller32.isRebuildingRoutes = controller.isRebuildingRoutes; - return controller32 as ControllerStateSchema32; + if (schemaVersion < 34) { + return controller32 as ControllerStateSchema32; + } + + const controller34 = controller32 as ControllerStateSchema34; + controller34.rebuildRoutesProgress = controller.rebuildRoutesProgress; + return controller34; }; export const dumpState = (