From a7f3acd573471613a45aeddde430087208f41be1 Mon Sep 17 00:00:00 2001 From: David Maher Date: Sat, 20 Feb 2021 20:41:22 -0500 Subject: [PATCH] Dropped legacy MQTT settings --- README.md | 2 - config.schema.json | 9 +- package-lock.json | 256 +++++++++++++++++++++++++++++++++++---------- package.json | 4 +- src/configTypes.ts | 1 - src/index.ts | 8 -- 6 files changed, 201 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index ea8d3a20..223acbc6 100755 --- a/README.md +++ b/README.md @@ -177,7 +177,6 @@ Other users have been sharing configurations that work for them on our GitHub si - `tlsmqtt`: Use TLS to connect to the MQTT broker. (Default: `false`) - `usermqtt`: The username used to connect to your MQTT broker. If not set, no authentication is used. - `passmqtt`: The password used to connect to your MQTT broker. If not set, no authentication is used. -- `topic`: The base MQTT topic to subscribe to. (Default: `homebridge`) - `porthttp`: The port to listen on for HTTP-based automation. If not set, HTTP support is not started. See the project site for [more information on using HTTP](https://sunoo.github.io/homebridge-camera-ffmpeg/automation/http.html). - `localhttp`: Only allow HTTP calls from localhost. Useful if using helper plugins that translate to HTTP. (Default: `false`) @@ -187,7 +186,6 @@ Other users have been sharing configurations that work for them on our GitHub si { "platform": "Camera-ffmpeg", "mqtt": "127.0.0.1", - "topic": "homebridge", "porthttp": "8080", "cameras": [] } diff --git a/config.schema.json b/config.schema.json index 988914f7..44f4c907 100644 --- a/config.schema.json +++ b/config.schema.json @@ -44,12 +44,6 @@ "type": "string", "description": "The password used to connect to your MQTT broker. If not set, no authentication is used." }, - "topic": { - "title": "MQTT Topic", - "type": "string", - "placeholder": "homebridge", - "description": "The base MQTT topic to subscribe to." - }, "porthttp": { "title": "HTTP Port", "type": "integer", @@ -431,8 +425,7 @@ "portmqtt", "tlsmqtt", "usermqtt", - "passmqtt", - "topic" + "passmqtt" ] } ] diff --git a/package-lock.json b/package-lock.json index 8aec68c5..796d4bde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,11 +31,11 @@ "mqtt": "^4.2.6" }, "devDependencies": { - "@types/node": "^14.14.28", + "@types/node": "^14.14.31", "@typescript-eslint/eslint-plugin": "^4.15.1", "@typescript-eslint/parser": "^4.15.1", "eslint": "^7.20.0", - "homebridge": "^1.1.7", + "homebridge": "^1.3.0", "rimraf": "^3.0.2", "typescript": "^4.1.5" }, @@ -153,6 +153,27 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/@homebridge/ciao": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.1.2.tgz", + "integrity": "sha512-31IfDKMqxfT+uVNXj0/TmYMou57gP8CUrh0vABzsc5QMsoCQ4Oo5uYQp0oJJyzxTBkF2pFvjR3XlWAapl0VyCg==", + "dev": true, + "dependencies": { + "debug": "^4.3.1", + "fast-deep-equal": "^3.1.3", + "source-map-support": "^0.5.19", + "tslib": "^2.0.3" + }, + "bin": { + "ciao-bcs": "lib/bonjour-conformance-testing.js" + } + }, + "node_modules/@homebridge/ciao/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -195,9 +216,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.14.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.28.tgz", - "integrity": "sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g==", + "version": "14.14.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { @@ -466,6 +487,15 @@ "node": ">=8" } }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", @@ -754,12 +784,6 @@ } } }, - "node_modules/decimal.js": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", - "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==", - "dev": true - }, "node_modules/decompress-response": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", @@ -1250,9 +1274,9 @@ "dev": true }, "node_modules/fast-srp-hap": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.2.tgz", - "integrity": "sha512-wABhZRrFhlovqJQ1HygOUB4R6WZW2hmlpvVYh2dVCy8BPLabDrB/Tu6XI3B4QfmhtHk8s1OeiFqJHY7FBsphug==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.3.tgz", + "integrity": "sha512-4P8TBD0all202L9FbeSsWc9qDlpaYp065VbUwbuNYZDYdOJ02UlWaDkai6d/+6/I8/sdtVYAVd17PEZDKbqopQ==", "dev": true, "engines": { "node": ">=10.17.0" @@ -1329,6 +1353,21 @@ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", "dev": true }, + "node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -1538,24 +1577,39 @@ "node": ">= 4" } }, + "node_modules/graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "dev": true + }, "node_modules/hap-nodejs": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.7.10.tgz", - "integrity": "sha512-582WHUCRVKFtw1ITYvKsGrGw2Hhc/AINej0LuFhCYvzPqVf2/m+v5PdgEt4wqyJSTM9rG5uoVYp1t/hoDnlLsw==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.9.1.tgz", + "integrity": "sha512-NtGTGf9UwT3QDZZiz23i8DwnlASPT5mmNADTge3AxvwlTo24CLVjDksTDaZCqKJlvcv/wwkmb7B548pdC+2ASg==", "dev": true, "dependencies": { + "@homebridge/ciao": "~1.1.2", "bonjour-hap": "~3.6.2", - "debug": "^4.1.1", - "decimal.js": "^10.2.0", - "fast-srp-hap": "2.0.2", + "debug": "^4.3.1", + "fast-srp-hap": "2.0.3", "futoin-hkdf": "~1.3.2", + "ip": "^1.1.3", "node-persist": "^0.0.11", + "source-map-support": "^0.5.19", + "tslib": "^2.1.0", "tweetnacl": "^1.0.3" }, "engines": { "node": ">=10.17.0" } }, + "node_modules/hap-nodejs/node_modules/tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -1601,17 +1655,17 @@ } }, "node_modules/homebridge": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/homebridge/-/homebridge-1.1.7.tgz", - "integrity": "sha512-A+cf5ZBatZu34wEVc1S5ztNtNjIbA31jwOMSZ6so8TeAQfcIYJRDHueHD7FgslMxkHol27nXt9vVMrugH4LtLA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/homebridge/-/homebridge-1.3.0.tgz", + "integrity": "sha512-3ex//Kox7wmgkI0DgesLGJtb/BIEtcuq/IEsXLpz7Kcg9DB+gNXUE0vm3RmSxZX6jPOyRkTDkoLivy2HhiEX3Q==", "dev": true, "dependencies": { "chalk": "^4.1.0", "commander": "5.1.0", - "hap-nodejs": "^0.7.10", - "node-persist": "^0.0.11", + "fs-extra": "^9.1.0", + "hap-nodejs": "0.9.1", "qrcode-terminal": "^0.12.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "source-map-support": "^0.5.19" }, "bin": { @@ -2009,6 +2063,18 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, "node_modules/leven": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", @@ -2231,12 +2297,12 @@ } }, "node_modules/object-is": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz", - "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3" }, "engines": { @@ -3077,6 +3143,15 @@ "through2-filter": "^3.0.0" } }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -3309,6 +3384,26 @@ "strip-json-comments": "^3.1.1" } }, + "@homebridge/ciao": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.1.2.tgz", + "integrity": "sha512-31IfDKMqxfT+uVNXj0/TmYMou57gP8CUrh0vABzsc5QMsoCQ4Oo5uYQp0oJJyzxTBkF2pFvjR3XlWAapl0VyCg==", + "dev": true, + "requires": { + "debug": "^4.3.1", + "fast-deep-equal": "^3.1.3", + "source-map-support": "^0.5.19", + "tslib": "^2.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } + } + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -3342,9 +3437,9 @@ "dev": true }, "@types/node": { - "version": "14.14.28", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.28.tgz", - "integrity": "sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g==", + "version": "14.14.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz", + "integrity": "sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g==", "dev": true }, "@typescript-eslint/eslint-plugin": { @@ -3509,6 +3604,12 @@ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "available-typed-arrays": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz", @@ -3727,12 +3828,6 @@ "ms": "2.1.2" } }, - "decimal.js": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", - "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==", - "dev": true - }, "decompress-response": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", @@ -4127,9 +4222,9 @@ "dev": true }, "fast-srp-hap": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.2.tgz", - "integrity": "sha512-wABhZRrFhlovqJQ1HygOUB4R6WZW2hmlpvVYh2dVCy8BPLabDrB/Tu6XI3B4QfmhtHk8s1OeiFqJHY7FBsphug==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fast-srp-hap/-/fast-srp-hap-2.0.3.tgz", + "integrity": "sha512-4P8TBD0all202L9FbeSsWc9qDlpaYp065VbUwbuNYZDYdOJ02UlWaDkai6d/+6/I8/sdtVYAVd17PEZDKbqopQ==", "dev": true }, "fastq": { @@ -4193,6 +4288,18 @@ "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", "dev": true }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, "fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -4361,19 +4468,36 @@ } } }, + "graceful-fs": { + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", + "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "dev": true + }, "hap-nodejs": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.7.10.tgz", - "integrity": "sha512-582WHUCRVKFtw1ITYvKsGrGw2Hhc/AINej0LuFhCYvzPqVf2/m+v5PdgEt4wqyJSTM9rG5uoVYp1t/hoDnlLsw==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.9.1.tgz", + "integrity": "sha512-NtGTGf9UwT3QDZZiz23i8DwnlASPT5mmNADTge3AxvwlTo24CLVjDksTDaZCqKJlvcv/wwkmb7B548pdC+2ASg==", "dev": true, "requires": { + "@homebridge/ciao": "~1.1.2", "bonjour-hap": "~3.6.2", - "debug": "^4.1.1", - "decimal.js": "^10.2.0", - "fast-srp-hap": "2.0.2", + "debug": "^4.3.1", + "fast-srp-hap": "2.0.3", "futoin-hkdf": "~1.3.2", + "ip": "^1.1.3", "node-persist": "^0.0.11", + "source-map-support": "^0.5.19", + "tslib": "^2.1.0", "tweetnacl": "^1.0.3" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } } }, "has": { @@ -4409,17 +4533,17 @@ } }, "homebridge": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/homebridge/-/homebridge-1.1.7.tgz", - "integrity": "sha512-A+cf5ZBatZu34wEVc1S5ztNtNjIbA31jwOMSZ6so8TeAQfcIYJRDHueHD7FgslMxkHol27nXt9vVMrugH4LtLA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/homebridge/-/homebridge-1.3.0.tgz", + "integrity": "sha512-3ex//Kox7wmgkI0DgesLGJtb/BIEtcuq/IEsXLpz7Kcg9DB+gNXUE0vm3RmSxZX6jPOyRkTDkoLivy2HhiEX3Q==", "dev": true, "requires": { "chalk": "^4.1.0", "commander": "5.1.0", - "hap-nodejs": "^0.7.10", - "node-persist": "^0.0.11", + "fs-extra": "^9.1.0", + "hap-nodejs": "0.9.1", "qrcode-terminal": "^0.12.0", - "semver": "^7.3.2", + "semver": "^7.3.4", "source-map-support": "^0.5.19" } }, @@ -4680,6 +4804,16 @@ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=" }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, "leven": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", @@ -4851,12 +4985,12 @@ "dev": true }, "object-is": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz", - "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3" } }, @@ -5480,6 +5614,12 @@ "through2-filter": "^3.0.0" } }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", diff --git a/package.json b/package.json index 81b649c6..4e3a6f25 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,11 @@ "README.md" ], "devDependencies": { - "@types/node": "^14.14.28", + "@types/node": "^14.14.31", "@typescript-eslint/eslint-plugin": "^4.15.1", "@typescript-eslint/parser": "^4.15.1", "eslint": "^7.20.0", - "homebridge": "^1.1.7", + "homebridge": "^1.3.0", "rimraf": "^3.0.2", "typescript": "^4.1.5" }, diff --git a/src/configTypes.ts b/src/configTypes.ts index 5272b28f..cd9874cb 100644 --- a/src/configTypes.ts +++ b/src/configTypes.ts @@ -9,7 +9,6 @@ export type FfmpegPlatformConfig = { tlsmqtt?: boolean; usermqtt?: string; passmqtt?: string; - topic?: string; porthttp?: number; localhttp?: boolean; cameras?: Array; diff --git a/src/index.ts b/src/index.ts index 41142f21..6de3aa7a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -183,14 +183,6 @@ class FfmpegPlatform implements DynamicPlatformPlugin { {accessory: accessory, active: true, doorbell: true}); } } - if (this.config.topic) { - this.addMqttAction(this.config.topic + '/motion', cameraConfig.name!, - {accessory: accessory, active: true, doorbell: false}); - this.addMqttAction(this.config.topic + '/motion/reset', cameraConfig.name!, - {accessory: accessory, active: false, doorbell: false}); - this.addMqttAction(this.config.topic + '/doorbell', cameraConfig.name!, - {accessory: accessory, active: true, doorbell: true}); - } } }