homebridge-freeathome-local-api 0.2.2-pre → 0.3.1-pre
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +30 -0
- package/README.md +1 -0
- package/dist/dimmerAccessory.d.ts +2 -4
- package/dist/dimmerAccessory.d.ts.map +1 -1
- package/dist/dimmerAccessory.js +18 -10
- package/dist/dimmerAccessory.js.map +1 -1
- package/dist/functionId.d.ts +3 -1
- package/dist/functionId.d.ts.map +1 -1
- package/dist/functionId.js +2 -0
- package/dist/functionId.js.map +1 -1
- package/dist/platform.d.ts +6 -4
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +39 -18
- package/dist/platform.js.map +1 -1
- package/dist/roomTemperatureControllerAccessory.d.ts +2 -4
- package/dist/roomTemperatureControllerAccessory.d.ts.map +1 -1
- package/dist/roomTemperatureControllerAccessory.js +14 -10
- package/dist/roomTemperatureControllerAccessory.js.map +1 -1
- package/dist/switchActuatorAccessory.d.ts +1 -2
- package/dist/switchActuatorAccessory.d.ts.map +1 -1
- package/dist/switchActuatorAccessory.js +6 -3
- package/dist/switchActuatorAccessory.js.map +1 -1
- package/dist/util.d.ts +0 -2
- package/dist/util.d.ts.map +1 -1
- package/dist/util.js +1 -3
- package/dist/util.js.map +1 -1
- package/package.json +4 -5
- package/sonar-project.properties +1 -1
- package/test/TestAccessory.mock.ts +27 -0
- package/test/dimmerAccessory.spec.ts +307 -7
- package/test/freeAtHomeAccessory.spec.ts +70 -0
- package/test/index.spec.ts +11 -0
- package/test/platform.mock.ts +8 -0
- package/test/platform.spec.ts +373 -13
- package/test/roomTemperatureControllerAccessory.spec.ts +826 -10
- package/test/switchActuatorAccessory.spec.ts +163 -7
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,36 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## 0.3.1-pre - 20.06.2022
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- [PG-194](https://pgerke.atlassian.net/browse/PG-194):
|
|
13
|
+
Re-added support for switch accessories (was removed accidentally)
|
|
14
|
+
|
|
15
|
+
## 0.3.0-pre - 20.06.2022
|
|
16
|
+
|
|
17
|
+
### Added
|
|
18
|
+
|
|
19
|
+
- [PG-186](https://pgerke.atlassian.net/browse/PG-186):
|
|
20
|
+
Automatic reconnection to System Access Point web socket after connection loss.
|
|
21
|
+
- [PG-192](https://pgerke.atlassian.net/browse/PG-192):
|
|
22
|
+
Support automatic door opener
|
|
23
|
+
- [PG-190](https://pgerke.atlassian.net/browse/PG-190):
|
|
24
|
+
Meet test coverage target
|
|
25
|
+
|
|
26
|
+
### Fixed
|
|
27
|
+
|
|
28
|
+
- [PG-193](https://pgerke.atlassian.net/browse/PG-193):
|
|
29
|
+
Rolled back to ts-node@10.8.0 to fix an issue with code coverage calculation.
|
|
30
|
+
|
|
31
|
+
## 0.2.3-pre - 17.06.2022
|
|
32
|
+
|
|
33
|
+
### Fixed
|
|
34
|
+
|
|
35
|
+
- [PG-188](https://pgerke.atlassian.net/browse/PG-188), [#7](https://github.com/pgerke/homebridge-freeathome-local-api/issues/7):
|
|
36
|
+
Fixed dimmer brightness fallback issue
|
|
37
|
+
|
|
8
38
|
## 0.2.2-pre - 16.06.2022
|
|
9
39
|
|
|
10
40
|
### Fixed
|
package/README.md
CHANGED
|
@@ -20,6 +20,7 @@ A Homebridge plugin that allows the user to control BUSCH-JAEGER free@home devic
|
|
|
20
20
|
- Switch actuators: Binary switches, outlets, simple (on/off) lights
|
|
21
21
|
- Dimmable Lights
|
|
22
22
|
- Thermostats
|
|
23
|
+
- The automatic door opener (which will be displayed as a switch)
|
|
23
24
|
|
|
24
25
|
I'll add further accessories over time, but feel free to request your favorite accessory type in a [GitHub issue](https://github.com/pgerke/homebridge-freeathome-local-api/issues).
|
|
25
26
|
|
|
@@ -9,16 +9,14 @@ export declare class DimmerAccessory extends FreeAtHomeAccessory {
|
|
|
9
9
|
private readonly service;
|
|
10
10
|
private stateOn;
|
|
11
11
|
private stateBrightness;
|
|
12
|
-
private readonly setOn;
|
|
13
|
-
private readonly setBrightness;
|
|
14
12
|
/**
|
|
15
13
|
* Constructs a new dimming actuator accessory instance.
|
|
16
14
|
* @param platform The free@home Homebridge platform controlling the accessory
|
|
17
15
|
* @param accessory The platform accessory.
|
|
18
16
|
*/
|
|
19
17
|
constructor(platform: FreeAtHomeHomebridgePlatform, accessory: PlatformAccessory<FreeAtHomeContext>);
|
|
20
|
-
private
|
|
21
|
-
private
|
|
18
|
+
private setOn;
|
|
19
|
+
private setBrightness;
|
|
22
20
|
updateDatapoint(datapoint: string, value: string): void;
|
|
23
21
|
}
|
|
24
22
|
//# sourceMappingURL=dimmerAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dimmerAccessory.d.ts","sourceRoot":"","sources":["../src/dimmerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dimmerAccessory.d.ts","sourceRoot":"","sources":["../src/dimmerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAG1D,mCAAmC;AACnC,qBAAa,eAAgB,SAAQ,mBAAmB;IAWpD,QAAQ,CAAC,QAAQ,EAAE,4BAA4B;IAC/C,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAX1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,eAAe,CAAS;IAEhC;;;;OAIG;gBAEQ,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;YAgC5C,KAAK;YA0BL,aAAa;IAsBX,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CA6BxE"}
|
package/dist/dimmerAccessory.js
CHANGED
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DimmerAccessory = void 0;
|
|
4
4
|
const freeAtHomeAccessory_1 = require("./freeAtHomeAccessory");
|
|
5
5
|
const util_1 = require("./util");
|
|
6
|
-
const debounce_1 = require("debounce");
|
|
7
6
|
/** A dimming actuator accessory.*/
|
|
8
7
|
class DimmerAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
|
|
9
8
|
/**
|
|
@@ -12,17 +11,13 @@ class DimmerAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
|
|
|
12
11
|
* @param accessory The platform accessory.
|
|
13
12
|
*/
|
|
14
13
|
constructor(platform, accessory) {
|
|
15
|
-
var _a, _b, _c, _d, _e;
|
|
14
|
+
var _a, _b, _c, _d, _e, _f;
|
|
16
15
|
super(platform, accessory);
|
|
17
16
|
this.platform = platform;
|
|
18
17
|
this.accessory = accessory;
|
|
19
|
-
this.setOn = (0, debounce_1.debounce)((value) => this.setOnDebounced(value), util_1.DefaultDebounce);
|
|
20
|
-
this.setBrightness = (0, debounce_1.debounce)((value) => this.setBrightnessDebounced(value), util_1.DefaultDebounce);
|
|
21
18
|
// set initial state
|
|
22
19
|
this.stateOn = !!parseInt((_b = (_a = this.accessory.context.channel.outputs) === null || _a === void 0 ? void 0 : _a.odp0000.value) !== null && _b !== void 0 ? _b : "0");
|
|
23
|
-
this.stateBrightness = parseInt((
|
|
24
|
-
? (_c = this.accessory.context.channel.outputs) === null || _c === void 0 ? void 0 : _c.odp0001.value
|
|
25
|
-
: (_d = this.accessory.context.channel.inputs) === null || _d === void 0 ? void 0 : _d.idp0002.value)) !== null && _e !== void 0 ? _e : "0");
|
|
20
|
+
this.stateBrightness = parseInt((_f = (_d = (_c = this.accessory.context.channel.outputs) === null || _c === void 0 ? void 0 : _c.odp0001.value) !== null && _d !== void 0 ? _d : (_e = this.accessory.context.channel.inputs) === null || _e === void 0 ? void 0 : _e.idp0002.value) !== null && _f !== void 0 ? _f : "0");
|
|
26
21
|
// get the Lightbulb service if it exists, otherwise create a new service instance
|
|
27
22
|
this.service =
|
|
28
23
|
this.accessory.getService(this.platform.Service.Lightbulb) ||
|
|
@@ -38,16 +33,26 @@ class DimmerAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
|
|
|
38
33
|
.onSet(this.setBrightness.bind(this))
|
|
39
34
|
.onGet(() => this.stateBrightness);
|
|
40
35
|
}
|
|
41
|
-
async
|
|
36
|
+
async setOn(value) {
|
|
37
|
+
// avoid unncessary updates or update cache
|
|
38
|
+
if (value === this.stateOn)
|
|
39
|
+
return;
|
|
40
|
+
else
|
|
41
|
+
this.stateOn = value;
|
|
42
42
|
// log event
|
|
43
43
|
this.platform.log.info(`${this.accessory.displayName} (Dimmer Accessory ${this.serialNumber}) set characteristic On -> ${value.toString()}`);
|
|
44
44
|
// set data point at SysAP
|
|
45
45
|
await this.platform.sysap.setDatapoint(util_1.EmptyGuid, this.accessory.context.deviceSerial, this.accessory.context.channelId, "idp0000", value ? "1" : "0");
|
|
46
46
|
// restore previous brightness
|
|
47
47
|
if (value && this.stateBrightness)
|
|
48
|
-
await this.
|
|
48
|
+
await this.setBrightness(this.stateBrightness);
|
|
49
49
|
}
|
|
50
|
-
async
|
|
50
|
+
async setBrightness(value) {
|
|
51
|
+
// avoid unncessary updates or update cache
|
|
52
|
+
if (value === this.stateBrightness)
|
|
53
|
+
return;
|
|
54
|
+
else
|
|
55
|
+
this.stateBrightness = value;
|
|
51
56
|
// log event
|
|
52
57
|
this.platform.log.info(`${this.accessory.displayName} (Dimmer Accessory ${this.serialNumber}) set characteristic Brightness -> ${value.toString()}`);
|
|
53
58
|
// set data point at SysAP
|
|
@@ -62,6 +67,9 @@ class DimmerAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
|
|
|
62
67
|
this.doUpdateDatapoint("Dimmer Accessory", this.service, this.platform.Characteristic.On, this.stateOn);
|
|
63
68
|
return;
|
|
64
69
|
case "odp0001":
|
|
70
|
+
// Do NOT set brightness to 0, otherwise when turning the dimmer back on, brightness will be 100%.
|
|
71
|
+
if (value === "0")
|
|
72
|
+
return;
|
|
65
73
|
this.stateBrightness = parseInt(value);
|
|
66
74
|
this.doUpdateDatapoint("Dimmer Accessory", this.service, this.platform.Characteristic.Brightness, this.stateBrightness);
|
|
67
75
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dimmerAccessory.js","sourceRoot":"","sources":["../src/dimmerAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"dimmerAccessory.js","sourceRoot":"","sources":["../src/dimmerAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/functionId.d.ts
CHANGED
|
@@ -12,6 +12,8 @@ export declare enum FunctionID {
|
|
|
12
12
|
/** A dim actuator that can also control the light hue */
|
|
13
13
|
FID_RGB_W_ACTUATOR = "2E",
|
|
14
14
|
/** A dim actuator that can also control the light hue */
|
|
15
|
-
FID_RGB_ACTUATOR = "2F"
|
|
15
|
+
FID_RGB_ACTUATOR = "2F",
|
|
16
|
+
/** An automatic door opener */
|
|
17
|
+
FID_DES_AUTOMATIC_DOOR_OPENER_ACTUATOR = "20"
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=functionId.d.ts.map
|
package/dist/functionId.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionId.d.ts","sourceRoot":"","sources":["../src/functionId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,UAAU;IACpB,kCAAkC;IAClC,mBAAmB,MAAM;IACzB,uEAAuE;IACvE,kDAAkD,OAAO;IACzD,sBAAsB;IACtB,oBAAoB,OAAO;IAC3B,yDAAyD;IACzD,kBAAkB,OAAO;IACzB,yDAAyD;IACzD,gBAAgB,OAAO;
|
|
1
|
+
{"version":3,"file":"functionId.d.ts","sourceRoot":"","sources":["../src/functionId.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,oBAAY,UAAU;IACpB,kCAAkC;IAClC,mBAAmB,MAAM;IACzB,uEAAuE;IACvE,kDAAkD,OAAO;IACzD,sBAAsB;IACtB,oBAAoB,OAAO;IAC3B,yDAAyD;IACzD,kBAAkB,OAAO;IACzB,yDAAyD;IACzD,gBAAgB,OAAO;IACvB,+BAA+B;IAC/B,sCAAsC,OAAO;CAC9C"}
|
package/dist/functionId.js
CHANGED
|
@@ -17,5 +17,7 @@ var FunctionID;
|
|
|
17
17
|
FunctionID["FID_RGB_W_ACTUATOR"] = "2E";
|
|
18
18
|
/** A dim actuator that can also control the light hue */
|
|
19
19
|
FunctionID["FID_RGB_ACTUATOR"] = "2F";
|
|
20
|
+
/** An automatic door opener */
|
|
21
|
+
FunctionID["FID_DES_AUTOMATIC_DOOR_OPENER_ACTUATOR"] = "20";
|
|
20
22
|
})(FunctionID = exports.FunctionID || (exports.FunctionID = {}));
|
|
21
23
|
//# sourceMappingURL=functionId.js.map
|
package/dist/functionId.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionId.js","sourceRoot":"","sources":["../src/functionId.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"functionId.js","sourceRoot":"","sources":["../src/functionId.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,IAAY,UAaX;AAbD,WAAY,UAAU;IACpB,kCAAkC;IAClC,uCAAyB,CAAA;IACzB,uEAAuE;IACvE,uEAAyD,CAAA;IACzD,sBAAsB;IACtB,yCAA2B,CAAA;IAC3B,yDAAyD;IACzD,uCAAyB,CAAA;IACzB,yDAAyD;IACzD,qCAAuB,CAAA;IACvB,+BAA+B;IAC/B,2DAA6C,CAAA;AAC/C,CAAC,EAbW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAarB"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { API, DynamicPlatformPlugin, Logger, PlatformAccessory, PlatformConfig, Service, Characteristic } from "homebridge";
|
|
2
|
-
import {
|
|
2
|
+
import { SystemAccessPoint } from "freeathome-local-api-client";
|
|
3
3
|
import { FreeAtHomeContext } from "./freeAtHomeContext";
|
|
4
4
|
/** The free@home Homebridge platform. */
|
|
5
5
|
export declare class FreeAtHomeHomebridgePlatform implements DynamicPlatformPlugin {
|
|
@@ -14,9 +14,11 @@ export declare class FreeAtHomeHomebridgePlatform implements DynamicPlatformPlug
|
|
|
14
14
|
readonly accessories: Array<PlatformAccessory<FreeAtHomeContext>>;
|
|
15
15
|
/** The system access point */
|
|
16
16
|
readonly sysap: SystemAccessPoint;
|
|
17
|
-
private fahAccessories;
|
|
18
|
-
private fahLogger;
|
|
17
|
+
private readonly fahAccessories;
|
|
18
|
+
private readonly fahLogger;
|
|
19
19
|
private readonly webSocketSubscription;
|
|
20
|
+
private wsConnectionAttempt;
|
|
21
|
+
private readonly maxWsRetryCount;
|
|
20
22
|
/**
|
|
21
23
|
* Constructs a new free@home Homebridge platform instance.
|
|
22
24
|
* @param log {Logger} The logger instance.
|
|
@@ -34,7 +36,7 @@ export declare class FreeAtHomeHomebridgePlatform implements DynamicPlatformPlug
|
|
|
34
36
|
configureAccessory(accessory: PlatformAccessory): void;
|
|
35
37
|
/** Discovers the supported free@home devices from the System Access Point. */
|
|
36
38
|
private discoverDevices;
|
|
37
|
-
isViableChannel
|
|
39
|
+
private isViableChannel;
|
|
38
40
|
private createAccessory;
|
|
39
41
|
private processWebSocketMesage;
|
|
40
42
|
}
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,cAAc,EACf,MAAM,YAAY,CAAC;AAEpB,OAAO,
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EACH,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,cAAc,EACf,MAAM,YAAY,CAAC;AAEpB,OAAO,EAEL,iBAAiB,EAIlB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAU/E,6CAA6C;AAC7C,qBAAa,4BAA6B,YAAW,qBAAqB;aAuBtD,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAxB1B,4BAA4B;IAC5B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,mCAAmC;IACnC,SAAgB,cAAc,EAAE,OAAO,cAAc,CACvB;IAC9B,8CAA8C;IAC9C,SAAgB,WAAW,EAAE,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAM;IAC9E,8BAA8B;IAC9B,SAAgB,KAAK,EAAE,iBAAiB,CAAC;IACzC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA0C;IACzE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAe;IACrD,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC;;;;;OAKG;gBAEe,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAoF1B;;;;;;OAMG;IACI,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAQtD,kFAAkF;YACpE,eAAe;IAmF7B,OAAO,CAAC,eAAe;IAiCvB,OAAO,CAAC,eAAe;IAmCvB,OAAO,CAAC,sBAAsB;CAoB/B"}
|
package/dist/platform.js
CHANGED
|
@@ -9,6 +9,7 @@ const functionId_1 = require("./functionId");
|
|
|
9
9
|
const dimmerAccessory_1 = require("./dimmerAccessory");
|
|
10
10
|
const roomTemperatureControllerAccessory_1 = require("./roomTemperatureControllerAccessory");
|
|
11
11
|
const util_1 = require("./util");
|
|
12
|
+
const DelayFactor = 200;
|
|
12
13
|
/** The free@home Homebridge platform. */
|
|
13
14
|
class FreeAtHomeHomebridgePlatform {
|
|
14
15
|
/**
|
|
@@ -18,6 +19,7 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
18
19
|
* @param api {API} The API instance.
|
|
19
20
|
*/
|
|
20
21
|
constructor(log, config, api) {
|
|
22
|
+
var _a;
|
|
21
23
|
this.log = log;
|
|
22
24
|
this.config = config;
|
|
23
25
|
this.api = api;
|
|
@@ -28,15 +30,34 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
28
30
|
/** The list of restored cached accessories */
|
|
29
31
|
this.accessories = [];
|
|
30
32
|
this.fahAccessories = new Map();
|
|
33
|
+
this.wsConnectionAttempt = 0;
|
|
34
|
+
// set maximum reconnection attempt count
|
|
35
|
+
this.maxWsRetryCount = (_a = this.config.maxWsRetryCount) !== null && _a !== void 0 ? _a : 10;
|
|
31
36
|
// Create a logger for the free@home Local API Client
|
|
32
37
|
this.fahLogger = {
|
|
33
|
-
debug: (message, ...optionalParams) =>
|
|
34
|
-
error: (message, ...optionalParams) =>
|
|
35
|
-
log: (message, ...optionalParams) =>
|
|
36
|
-
warn: (message, ...optionalParams) =>
|
|
38
|
+
debug: (message, ...optionalParams) => log.debug(message, ...optionalParams),
|
|
39
|
+
error: (message, ...optionalParams) => log.error(message, ...optionalParams),
|
|
40
|
+
log: (message, ...optionalParams) => log.info(message, ...optionalParams),
|
|
41
|
+
warn: (message, ...optionalParams) => log.warn(message, ...optionalParams),
|
|
37
42
|
};
|
|
38
43
|
// Create a system access point instance
|
|
39
44
|
this.sysap = new freeathome_local_api_client_1.SystemAccessPoint(this.config.host, this.config.user, this.config.password, this.config.tlsEnabled, this.config.verboseErrors, this.fahLogger);
|
|
45
|
+
// React to web socket events
|
|
46
|
+
this.sysap.on("websocket-open", () => {
|
|
47
|
+
this.wsConnectionAttempt = 0;
|
|
48
|
+
});
|
|
49
|
+
this.sysap.on("websocket-close", (code, reason) => {
|
|
50
|
+
if (code === 1000)
|
|
51
|
+
return;
|
|
52
|
+
this.log.warn(`Websocket to System Access Point was closed with code ${code.toString()}: ${reason.toString()}`);
|
|
53
|
+
if (this.wsConnectionAttempt >= this.maxWsRetryCount) {
|
|
54
|
+
this.log.error("Maximum retry count exceeded. Will not try to reconnect to websocket again.");
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const delay = DelayFactor * 2 ** this.wsConnectionAttempt++;
|
|
58
|
+
this.log.info(`Attempting to reconnect in ${delay}ms [${this.wsConnectionAttempt}/${this.maxWsRetryCount}]`);
|
|
59
|
+
setTimeout(() => this.sysap.connectWebSocket(this.config.tlsEnabled), delay);
|
|
60
|
+
});
|
|
40
61
|
// Subscribe to web socket messages
|
|
41
62
|
this.webSocketSubscription = this.sysap
|
|
42
63
|
.getWebSocketMessages()
|
|
@@ -88,8 +109,10 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
88
109
|
const locationConfiguredOnDeviceLevel = !!device.floor && !!device.room;
|
|
89
110
|
// Enumerate the channels
|
|
90
111
|
Object.keys(device.channels).forEach((channelId) => {
|
|
91
|
-
var _a
|
|
92
|
-
|
|
112
|
+
var _a;
|
|
113
|
+
// We are enumerating the keys of the channels object. Neither the channels object nor the channelId can possibly be undefined.
|
|
114
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
115
|
+
const channel = device.channels[channelId];
|
|
93
116
|
if (!this.isViableChannel(serial, channelId, channel, locationConfiguredOnDeviceLevel))
|
|
94
117
|
return;
|
|
95
118
|
// Create or restore the accessory
|
|
@@ -113,7 +136,7 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
113
136
|
// the accessory does not yet exist, so we need to create it
|
|
114
137
|
this.log.info("Adding new accessory:", channel.displayName);
|
|
115
138
|
// create a new accessory
|
|
116
|
-
accessory = new this.api.platformAccessory((
|
|
139
|
+
accessory = new this.api.platformAccessory((_a = channel.displayName) !== null && _a !== void 0 ? _a : uuid, uuid);
|
|
117
140
|
accessory.context.deviceSerial = serial;
|
|
118
141
|
accessory.context.device = device;
|
|
119
142
|
accessory.context.channel = channel;
|
|
@@ -123,7 +146,10 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
123
146
|
accessory,
|
|
124
147
|
]);
|
|
125
148
|
}
|
|
126
|
-
//
|
|
149
|
+
// This check is used to apply the type guard so the accessory can be used as a free@home accesory without a cast.
|
|
150
|
+
// Given that the accessory context is constructed in the previous lines, it is impossible for the type check to fail.
|
|
151
|
+
// Consequently the branch can never be covered and is excluded from the coverage.
|
|
152
|
+
/* istanbul ignore next */
|
|
127
153
|
if (!(0, freeAtHomeContext_1.isFreeAtHomeAccessory)(accessory, this.fahLogger))
|
|
128
154
|
return;
|
|
129
155
|
// create accessory
|
|
@@ -134,11 +160,9 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
134
160
|
}
|
|
135
161
|
isViableChannel(serial, channelId, channel, locationConfiguredOnDeviceLevel) {
|
|
136
162
|
var _a;
|
|
137
|
-
if (!channel)
|
|
138
|
-
return false;
|
|
139
163
|
// Filter unsupported channels
|
|
140
164
|
if (!(channel.functionID &&
|
|
141
|
-
Object.values(functionId_1.FunctionID).includes(channel.functionID))) {
|
|
165
|
+
Object.values(functionId_1.FunctionID).includes(channel.functionID.toUpperCase()))) {
|
|
142
166
|
this.log.debug(`Ignored ${serial} (${channelId}): FunctionID '${(_a = channel.functionID) !== null && _a !== void 0 ? _a : "<UNDEFINED>"}' is not supported.`);
|
|
143
167
|
return false;
|
|
144
168
|
}
|
|
@@ -150,7 +174,8 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
150
174
|
return true;
|
|
151
175
|
}
|
|
152
176
|
createAccessory(serial, functionID, channelId, accessory) {
|
|
153
|
-
switch (functionID) {
|
|
177
|
+
switch (functionID.toUpperCase()) {
|
|
178
|
+
case functionId_1.FunctionID.FID_DES_AUTOMATIC_DOOR_OPENER_ACTUATOR:
|
|
154
179
|
case functionId_1.FunctionID.FID_SWITCH_ACTUATOR:
|
|
155
180
|
this.fahAccessories.set(`${serial}_${channelId}`, new switchActuatorAccessory_1.SwitchActuatorAccessory(this, accessory));
|
|
156
181
|
return;
|
|
@@ -177,13 +202,9 @@ class FreeAtHomeHomebridgePlatform {
|
|
|
177
202
|
this.log.debug(`Ignored datapoint ${datapoint}: Unexpected format`);
|
|
178
203
|
return;
|
|
179
204
|
}
|
|
180
|
-
// Ignore data
|
|
181
|
-
const identifier = `${match[1]}_${match[2]}`;
|
|
182
|
-
if (!this.fahAccessories.has(identifier))
|
|
183
|
-
return;
|
|
184
|
-
// Update the accessory data point
|
|
205
|
+
// Ignore the data point if we don't have an accessory for it or update the accessory
|
|
185
206
|
(_a = this.fahAccessories
|
|
186
|
-
.get(
|
|
207
|
+
.get(`${match[1]}_${match[2]}`)) === null || _a === void 0 ? void 0 : _a.updateDatapoint(match[3], message[util_1.EmptyGuid].datapoints[datapoint]);
|
|
187
208
|
});
|
|
188
209
|
}
|
|
189
210
|
}
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;AASA,yCAAwD;AACxD,6EAMqC;AACrC,uEAAoE;AACpE,2DAA+E;AAC/E,6CAA0C;AAE1C,uDAAoD;AAEpD,6FAA0F;AAC1F,iCAAmC;AAEnC,6CAA6C;AAC7C,MAAa,4BAA4B;
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,8 +12,6 @@ export declare class RoomTemperatureControllerAccessory extends FreeAtHomeAccess
|
|
|
12
12
|
private coolingOn;
|
|
13
13
|
private stateCurrentTemperature;
|
|
14
14
|
private stateTargetTemperature;
|
|
15
|
-
private readonly setTargetHeatingCoolingState;
|
|
16
|
-
private readonly setTargetTemperature;
|
|
17
15
|
private get stateCurrentHeatingCoolingState();
|
|
18
16
|
private get stateTargetHeatingCoolingState();
|
|
19
17
|
/**
|
|
@@ -22,8 +20,8 @@ export declare class RoomTemperatureControllerAccessory extends FreeAtHomeAccess
|
|
|
22
20
|
* @param accessory The platform accessory.
|
|
23
21
|
*/
|
|
24
22
|
constructor(platform: FreeAtHomeHomebridgePlatform, accessory: PlatformAccessory<FreeAtHomeContext>);
|
|
25
|
-
private
|
|
26
|
-
private
|
|
23
|
+
private setTargetTemperature;
|
|
24
|
+
private setTargetHeatingCoolingState;
|
|
27
25
|
updateDatapoint(datapoint: string, value: string): void;
|
|
28
26
|
}
|
|
29
27
|
//# sourceMappingURL=roomTemperatureControllerAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roomTemperatureControllerAccessory.d.ts","sourceRoot":"","sources":["../src/roomTemperatureControllerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"roomTemperatureControllerAccessory.d.ts","sourceRoot":"","sources":["../src/roomTemperatureControllerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAG1D,+CAA+C;AAC/C,qBAAa,kCAAmC,SAAQ,mBAAmB;IAmCvE,QAAQ,CAAC,QAAQ,EAAE,4BAA4B;IAC/C,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAnC1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,uBAAuB,CAAS;IACxC,OAAO,CAAC,sBAAsB,CAAS;IAEvC,OAAO,KAAK,+BAA+B,GAc1C;IACD,OAAO,KAAK,8BAA8B,GAIzC;IAED;;;;OAIG;gBAEQ,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;YA8D5C,oBAAoB;YA6BpB,4BAA4B;IA0B1B,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAyDxE"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RoomTemperatureControllerAccessory = void 0;
|
|
4
4
|
const freeAtHomeAccessory_1 = require("./freeAtHomeAccessory");
|
|
5
5
|
const util_1 = require("./util");
|
|
6
|
-
const debounce_1 = require("debounce");
|
|
7
6
|
/** A room temperature controller accessory. */
|
|
8
7
|
class RoomTemperatureControllerAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory {
|
|
9
8
|
/**
|
|
@@ -16,8 +15,6 @@ class RoomTemperatureControllerAccessory extends freeAtHomeAccessory_1.FreeAtHom
|
|
|
16
15
|
super(platform, accessory);
|
|
17
16
|
this.platform = platform;
|
|
18
17
|
this.accessory = accessory;
|
|
19
|
-
this.setTargetHeatingCoolingState = (0, debounce_1.debounce)((value) => this.setTargetHeatingCoolingStateDebounced(value), util_1.DefaultDebounce);
|
|
20
|
-
this.setTargetTemperature = (0, debounce_1.debounce)((value) => this.setTargetTemperatureDebounced(value), util_1.DefaultDebounce);
|
|
21
18
|
// set initial state
|
|
22
19
|
this.controllerOnOff = !!parseInt((_b = (_a = this.accessory.context.channel.outputs) === null || _a === void 0 ? void 0 : _a.odp0008.value) !== null && _b !== void 0 ? _b : "0");
|
|
23
20
|
this.heatingOn = !!parseInt((_d = (_c = this.accessory.context.channel.outputs) === null || _c === void 0 ? void 0 : _c.odp0000.value) !== null && _d !== void 0 ? _d : "0");
|
|
@@ -80,18 +77,25 @@ class RoomTemperatureControllerAccessory extends freeAtHomeAccessory_1.FreeAtHom
|
|
|
80
77
|
? this.platform.Characteristic.TargetHeatingCoolingState.AUTO
|
|
81
78
|
: this.platform.Characteristic.TargetHeatingCoolingState.OFF;
|
|
82
79
|
}
|
|
83
|
-
async
|
|
80
|
+
async setTargetTemperature(value) {
|
|
81
|
+
// avoid unncessary updates or update cache
|
|
82
|
+
if (value === this.stateTargetTemperature)
|
|
83
|
+
return;
|
|
84
|
+
else
|
|
85
|
+
this.stateTargetTemperature = value;
|
|
84
86
|
// log event
|
|
85
87
|
this.platform.log.info(`${this.accessory.displayName} (Room Temperature Controller ${this.serialNumber}) set characteristic TargetTemperature -> ${value.toString()}`);
|
|
86
88
|
// Heating Cooling State must not be OFF to set the target temperature
|
|
87
|
-
|
|
88
|
-
this.platform.Characteristic.CurrentHeatingCoolingState.OFF) {
|
|
89
|
-
await this.setTargetHeatingCoolingStateDebounced(this.platform.Characteristic.TargetHeatingCoolingState.AUTO);
|
|
90
|
-
}
|
|
89
|
+
await this.setTargetHeatingCoolingState(this.platform.Characteristic.TargetHeatingCoolingState.AUTO);
|
|
91
90
|
// set data point at SysAP
|
|
92
|
-
await this.platform.sysap.setDatapoint(util_1.EmptyGuid, this.accessory.context.deviceSerial, this.accessory.context.channelId, "idp0016",
|
|
91
|
+
await this.platform.sysap.setDatapoint(util_1.EmptyGuid, this.accessory.context.deviceSerial, this.accessory.context.channelId, "idp0016", this.stateTargetTemperature.toFixed(1));
|
|
93
92
|
}
|
|
94
|
-
async
|
|
93
|
+
async setTargetHeatingCoolingState(value) {
|
|
94
|
+
// avoid unncessary updates or update cache
|
|
95
|
+
if (value === this.stateTargetHeatingCoolingState)
|
|
96
|
+
return;
|
|
97
|
+
else
|
|
98
|
+
this.controllerOnOff = !!value;
|
|
95
99
|
// log event
|
|
96
100
|
this.platform.log.info(`${this.accessory.displayName} (Room Temperature Controller ${this.serialNumber}) set characteristic TargetHeatingCoolingState -> ${value.toString()}`);
|
|
97
101
|
// set data point at SysAP
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roomTemperatureControllerAccessory.js","sourceRoot":"","sources":["../src/roomTemperatureControllerAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"roomTemperatureControllerAccessory.js","sourceRoot":"","sources":["../src/roomTemperatureControllerAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,13 @@ export declare class SwitchActuatorAccessory extends FreeAtHomeAccessory {
|
|
|
14
14
|
readonly accessory: PlatformAccessory<FreeAtHomeContext>;
|
|
15
15
|
private readonly service;
|
|
16
16
|
private stateOn;
|
|
17
|
-
private readonly setOn;
|
|
18
17
|
/**
|
|
19
18
|
* Constructs a new switch actuator accessory instance.
|
|
20
19
|
* @param platform The free@home Homebridge platform controlling the accessory
|
|
21
20
|
* @param accessory The platform accessory.
|
|
22
21
|
*/
|
|
23
22
|
constructor(platform: FreeAtHomeHomebridgePlatform, accessory: PlatformAccessory<FreeAtHomeContext>);
|
|
24
|
-
private
|
|
23
|
+
private setOn;
|
|
25
24
|
updateDatapoint(datapoint: string, value: string): void;
|
|
26
25
|
}
|
|
27
26
|
//# sourceMappingURL=switchActuatorAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchActuatorAccessory.d.ts","sourceRoot":"","sources":["../src/switchActuatorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"switchActuatorAccessory.d.ts","sourceRoot":"","sources":["../src/switchActuatorAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAG1D;;;;;;GAMG;AACH,qBAAa,uBAAwB,SAAQ,mBAAmB;IAU5D,QAAQ,CAAC,QAAQ,EAAE,4BAA4B;IAC/C,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAV1D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;IAClC,OAAO,CAAC,OAAO,CAAU;IAEzB;;;;OAIG;gBAEQ,QAAQ,EAAE,4BAA4B,EACtC,SAAS,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;YAqB5C,KAAK;IAsBH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;CAaxE"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.SwitchActuatorAccessory = void 0;
|
|
4
4
|
const freeAtHomeAccessory_1 = require("./freeAtHomeAccessory");
|
|
5
5
|
const util_1 = require("./util");
|
|
6
|
-
const debounce_1 = require("debounce");
|
|
7
6
|
/**
|
|
8
7
|
* A switch actuator accessory.
|
|
9
8
|
* @description
|
|
@@ -22,7 +21,6 @@ class SwitchActuatorAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory
|
|
|
22
21
|
super(platform, accessory);
|
|
23
22
|
this.platform = platform;
|
|
24
23
|
this.accessory = accessory;
|
|
25
|
-
this.setOn = (0, debounce_1.debounce)((value) => this.setOnDebounced(value), util_1.DefaultDebounce);
|
|
26
24
|
// set initial state
|
|
27
25
|
this.stateOn = !!parseInt((_b = (_a = this.accessory.context.channel.outputs) === null || _a === void 0 ? void 0 : _a.odp0000.value) !== null && _b !== void 0 ? _b : "0");
|
|
28
26
|
// get the Switch service if it exists, otherwise create a new service instance
|
|
@@ -35,7 +33,12 @@ class SwitchActuatorAccessory extends freeAtHomeAccessory_1.FreeAtHomeAccessory
|
|
|
35
33
|
.onSet(this.setOn.bind(this))
|
|
36
34
|
.onGet(() => this.stateOn);
|
|
37
35
|
}
|
|
38
|
-
async
|
|
36
|
+
async setOn(value) {
|
|
37
|
+
// avoid unncessary updates or update cache
|
|
38
|
+
if (value === this.stateOn)
|
|
39
|
+
return;
|
|
40
|
+
else
|
|
41
|
+
this.stateOn = value;
|
|
39
42
|
// log event
|
|
40
43
|
this.platform.log.info(`${this.accessory.displayName} (Switch Actuator ${this.serialNumber}) set characteristic On -> ${value.toString()}`);
|
|
41
44
|
// set data point at SysAP
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchActuatorAccessory.js","sourceRoot":"","sources":["../src/switchActuatorAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"switchActuatorAccessory.js","sourceRoot":"","sources":["../src/switchActuatorAccessory.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,iCAAmC;AAEnC;;;;;;GAMG;AACH,MAAa,uBAAwB,SAAQ,yCAAmB;IAI9D;;;;OAIG;IACH,YACW,QAAsC,EACtC,SAA+C;;QAExD,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAHlB,aAAQ,GAAR,QAAQ,CAA8B;QACtC,cAAS,GAAT,SAAS,CAAsC;QAIxD,oBAAoB;QACpB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,QAAQ,CACvB,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,0CAAE,OAAO,CAAC,KAAK,mCAAI,GAAG,CAC7D,CAAC;QAEF,+EAA+E;QAC/E,IAAI,CAAC,OAAO;YACV,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;gBACvD,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE1D,kDAAkD;QAClD,IAAI,CAAC,OAAO;aACT,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAClD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,KAA0B;QAC5C,2CAA2C;QAC3C,IAAI,KAAK,KAAK,IAAI,CAAC,OAAO;YAAE,OAAO;;YAC9B,IAAI,CAAC,OAAO,GAAG,KAAgB,CAAC;QAErC,YAAY;QACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACpB,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,qBAC3B,IAAI,CAAC,YACP,8BAA8B,KAAK,CAAC,QAAQ,EAAE,EAAE,CACjD,CAAC;QAEF,0BAA0B;QAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CACpC,gBAAS,EACT,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EACnC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,EAChC,SAAS,EACT,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAClB,CAAC;IACJ,CAAC;IAEe,eAAe,CAAC,SAAiB,EAAE,KAAa;QAC9D,6BAA6B;QAC7B,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO;QAEpC,gBAAgB;QAChB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,iBAAiB,CACpB,iBAAiB,EACjB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAC/B,IAAI,CAAC,OAAO,CACb,CAAC;IACJ,CAAC;CACF;AAnED,0DAmEC"}
|
package/dist/util.d.ts
CHANGED
package/dist/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,SAAS,yCAAyC,CAAC
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,SAAS,yCAAyC,CAAC"}
|
package/dist/util.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.EmptyGuid = void 0;
|
|
4
4
|
// In the local API the system access point UUID is always an empty UUID. Could be extended later to also support the cloud API.
|
|
5
5
|
exports.EmptyGuid = "00000000-0000-0000-0000-000000000000";
|
|
6
|
-
/** The default debounce timer */
|
|
7
|
-
exports.DefaultDebounce = 250;
|
|
8
6
|
//# sourceMappingURL=util.js.map
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,gIAAgI;AACnH,QAAA,SAAS,GAAG,sCAAsC,CAAC
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,gIAAgI;AACnH,QAAA,SAAS,GAAG,sCAAsC,CAAC"}
|