updated magic-home to latest version and added suport for the new command_timeout parameter

This commit is contained in:
Jan Scheiper 2020-07-29 18:01:13 +02:00
parent f31a49da6c
commit 247c49919a
4 changed files with 11 additions and 8 deletions

View File

@ -17,6 +17,7 @@ class HCMagicHome extends HCColorLamp {
ack: (this._configuration.ack !== undefined) ? Control.ackMask(this._configuration.ack) : true, ack: (this._configuration.ack !== undefined) ? Control.ackMask(this._configuration.ack) : true,
log_all_received: (this._configuration.logall !== undefined) ? this._configuration.logall : false, log_all_received: (this._configuration.logall !== undefined) ? this._configuration.logall : false,
connect_timeout: (this._configuration.connect_timeout !== undefined) ? this._configuration.connect_timeout : 10000, connect_timeout: (this._configuration.connect_timeout !== undefined) ? this._configuration.connect_timeout : 10000,
command_timeout: (this._configuration.command_timeout !== undefined) ? this._configuration.command_timeout : 5000,
}; };
this._control = new Control(this._configuration.address, opts); this._control = new Control(this._configuration.address, opts);

View File

@ -6,3 +6,5 @@ Bitmask to set `ack` in the constructor.
Sets `log_all_received` in the constructor. Sets `log_all_received` in the constructor.
- `connect_timeout` - `connect_timeout`
Sets `connect_timeout` in the constructor. (Default: 10000) Sets `connect_timeout` in the constructor. (Default: 10000)
- `command_timeout`
Sets `command_timeout` in the constructor. (Default: 5000)

10
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "hc-magichome", "name": "hc-magichome",
"version": "1.1.0", "version": "1.3.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -10,7 +10,7 @@
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
}, },
"homecontrol-control-base": { "homecontrol-control-base": {
"version": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git#c37d47a85bc9f08cba7f4c8aa36ae6c6232800bd", "version": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git#b2bf9ba767050ec1581dd3641885fe1132ac45aa",
"from": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git", "from": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git",
"requires": { "requires": {
"merge-options": "^1.0.1", "merge-options": "^1.0.1",
@ -23,9 +23,9 @@
"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
}, },
"magic-home": { "magic-home": {
"version": "2.3.0", "version": "2.6.0",
"resolved": "https://registry.npmjs.org/magic-home/-/magic-home-2.3.0.tgz", "resolved": "https://registry.npmjs.org/magic-home/-/magic-home-2.6.0.tgz",
"integrity": "sha512-Qycy4vzAzDbjr0Ic1zBJ2OzCaHKIkNDIMHGli8ea3HmWwdSKiCcDPgIB5gpyPWxCHg0wcpPPOTd/XLOWyIq4wQ==", "integrity": "sha512-UNHYmbgm/GsS82JurRjPKOkmVj8dAGUK2Cq6/gAHL22yP7y1R/F4Zyqtb1zzI79QALiYzg9AW80KPbUuX/TbKg==",
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
"merge-options": "^1.0.1" "merge-options": "^1.0.1"

View File

@ -1,6 +1,6 @@
{ {
"name": "hc-magichome", "name": "hc-magichome",
"version": "1.2.0", "version": "1.3.0",
"description": "Magic Home Plugin for Homecontrol", "description": "Magic Home Plugin for Homecontrol",
"main": "HCMagicHome.js", "main": "HCMagicHome.js",
"scripts": { "scripts": {
@ -14,6 +14,6 @@
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"homecontrol-control-base": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git", "homecontrol-control-base": "git+https://git.literalchaos.de/jan/homecontrol-control-base.git",
"magic-home": "^2.3.0" "magic-home": "^2.6.0"
} }
} }