homebridge-carrier-infinity 1.6.11 → 1.6.13
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/dist/accessory_comfort_activity.d.ts.map +1 -1
- package/dist/accessory_comfort_activity.js +3 -2
- package/dist/accessory_comfort_activity.js.map +1 -1
- package/dist/api/constants.d.ts +6 -0
- package/dist/api/constants.d.ts.map +1 -1
- package/dist/api/constants.js +7 -1
- package/dist/api/constants.js.map +1 -1
- package/dist/api/models.d.ts +6 -1
- package/dist/api/models.d.ts.map +1 -1
- package/dist/api/models.js +29 -5
- package/dist/api/models.js.map +1 -1
- package/dist/characteristics_base.d.ts.map +1 -1
- package/dist/characteristics_base.js +15 -5
- package/dist/characteristics_base.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_comfort_activity.d.ts","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA4DjD,qBAAa,wBAAyB,SAAQ,aAAa;IAEzD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"accessory_comfort_activity.d.ts","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AA4DjD,qBAAa,wBAAyB,SAAQ,aAAa;IAEzD,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;gBAKnD,QAAQ,EAAE,iCAAiC,EAC3C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAkDlC"}
|
|
@@ -53,14 +53,15 @@ class ComfortActivityAccessory extends accessory_base_1.BaseAccessory {
|
|
|
53
53
|
constructor(platform, context) {
|
|
54
54
|
super(platform, context);
|
|
55
55
|
// Make this first to make it the primary service and show up first
|
|
56
|
-
new HoldActivity(this.platform, this.accessory.context).wrap(this.useService(this.platform.Service.Switch, 'Manual Hold', 'hold'));
|
|
56
|
+
new HoldActivity(this.platform, this.accessory.context).wrap(this.useService(this.platform.Service.Switch, 'Manual Hold', 'hold').setCharacteristic(this.platform.Characteristic.ConfiguredName, 'Manual Hold'));
|
|
57
57
|
[
|
|
58
58
|
constants_1.ACTIVITY.WAKE,
|
|
59
59
|
constants_1.ACTIVITY.AWAY,
|
|
60
60
|
constants_1.ACTIVITY.HOME,
|
|
61
61
|
constants_1.ACTIVITY.SLEEP,
|
|
62
62
|
].forEach((activity) => {
|
|
63
|
-
|
|
63
|
+
const switch_name = `${activity[0].toUpperCase()}${activity.slice(1)}`;
|
|
64
|
+
new Activity(this.platform, this.accessory.context, activity).wrap(this.useService(this.platform.Service.Switch, switch_name, activity).setCharacteristic(this.platform.Characteristic.ConfiguredName, switch_name));
|
|
64
65
|
});
|
|
65
66
|
new characteristics_base_1.AccessoryInformation(this.platform, this.accessory.context).wrap(this.accessory.getService(this.platform.Service.AccessoryInformation) ||
|
|
66
67
|
this.accessory.addService(this.platform.Service.AccessoryInformation));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accessory_comfort_activity.js","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"accessory_comfort_activity.js","sourceRoot":"","sources":["../src/accessory_comfort_activity.ts"],"names":[],"mappings":"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"}
|
package/dist/api/constants.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/api/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;CAMvB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;CAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAGlB,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/api/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;CAMvB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;;;CAOpB,CAAC;AAEF,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC;AAEF,eAAO,MAAM,MAAM;;;CAGlB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;CAKxB,CAAC"}
|
package/dist/api/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.STATUS = exports.FAN_MODE = exports.ACTIVITY = exports.SYSTEM_MODE = void 0;
|
|
3
|
+
exports.SUBSCRIPTION = exports.STATUS = exports.FAN_MODE = exports.ACTIVITY = exports.SYSTEM_MODE = void 0;
|
|
4
4
|
exports.SYSTEM_MODE = {
|
|
5
5
|
OFF: 'off',
|
|
6
6
|
COOL: 'cool',
|
|
@@ -26,4 +26,10 @@ exports.STATUS = {
|
|
|
26
26
|
ON: 'on',
|
|
27
27
|
OFF: 'off',
|
|
28
28
|
};
|
|
29
|
+
exports.SUBSCRIPTION = {
|
|
30
|
+
CONFIG: 'updated_config',
|
|
31
|
+
STATUS: 'updated_status',
|
|
32
|
+
PROFILE: 'updated_system_profile',
|
|
33
|
+
CONFIG_MUTATE: 'mutate_config',
|
|
34
|
+
};
|
|
29
35
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/api/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,SAAS;CACpB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,MAAM,GAAG;IACpB,EAAE,EAAE,IAAI;IACR,GAAG,EAAE,KAAK;CACX,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/api/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,SAAS;CACpB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;CACrB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;CACb,CAAC;AAEW,QAAA,MAAM,GAAG;IACpB,EAAE,EAAE,IAAI;IACR,GAAG,EAAE,KAAK;CACX,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,gBAAgB;IACxB,OAAO,EAAE,wBAAwB;IACjC,aAAa,EAAE,eAAe;CAC/B,CAAC"}
|
package/dist/api/models.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { Mutex } from 'async-mutex';
|
|
2
3
|
import { Logger } from 'homebridge';
|
|
3
4
|
import { InfinityRestClient } from './rest_client';
|
|
5
|
+
import EventEmitter from 'events';
|
|
4
6
|
import Config, { Zone as CZone, Activity3 as CActivity } from './interface_config';
|
|
5
7
|
import Location from './interface_locations';
|
|
6
8
|
import Profile from './interface_profile';
|
|
@@ -28,9 +30,10 @@ declare abstract class BaseSystemModel extends BaseModel {
|
|
|
28
30
|
protected readonly infinity_client: InfinityRestClient;
|
|
29
31
|
readonly serialNumber: string;
|
|
30
32
|
protected readonly log: Logger;
|
|
33
|
+
protected readonly events: EventEmitter;
|
|
31
34
|
private last_updated;
|
|
32
35
|
protected HASH_IGNORE_KEYS: Set<string>;
|
|
33
|
-
constructor(infinity_client: InfinityRestClient, serialNumber: string, log: Logger);
|
|
36
|
+
constructor(infinity_client: InfinityRestClient, serialNumber: string, log: Logger, events: EventEmitter);
|
|
34
37
|
protected forceFetch(): Promise<void>;
|
|
35
38
|
}
|
|
36
39
|
export declare class SystemProfileModel extends BaseSystemModel {
|
|
@@ -84,6 +87,7 @@ interface ConfigMutation {
|
|
|
84
87
|
}
|
|
85
88
|
export declare class SystemConfigModel extends SystemConfigModelReadOnly {
|
|
86
89
|
mutations: ConfigMutation[];
|
|
90
|
+
fetch(): Promise<void>;
|
|
87
91
|
private push;
|
|
88
92
|
private mutate;
|
|
89
93
|
private forcePush;
|
|
@@ -101,6 +105,7 @@ export declare class SystemModel {
|
|
|
101
105
|
config: SystemConfigModel;
|
|
102
106
|
profile: SystemProfileModel;
|
|
103
107
|
log: Logger;
|
|
108
|
+
events: EventEmitter;
|
|
104
109
|
constructor(infinity_client: InfinityRestClient, serialNumber: string);
|
|
105
110
|
}
|
|
106
111
|
export {};
|
package/dist/api/models.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAuD,MAAM,aAAa,CAAC;AAEzF,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"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"}
|
package/dist/api/models.js
CHANGED
|
@@ -40,6 +40,7 @@ const xml2js = __importStar(require("xml2js"));
|
|
|
40
40
|
const object_hash_1 = __importDefault(require("object-hash"));
|
|
41
41
|
const helper_logging_1 = require("../helper_logging");
|
|
42
42
|
const axios_1 = __importDefault(require("axios"));
|
|
43
|
+
const events_1 = __importDefault(require("events"));
|
|
43
44
|
const constants_1 = require("./constants");
|
|
44
45
|
class BaseModel {
|
|
45
46
|
constructor(infinity_client) {
|
|
@@ -113,20 +114,26 @@ class LocationsModel extends BaseModel {
|
|
|
113
114
|
}
|
|
114
115
|
exports.LocationsModel = LocationsModel;
|
|
115
116
|
class BaseSystemModel extends BaseModel {
|
|
116
|
-
constructor(infinity_client, serialNumber, log) {
|
|
117
|
+
constructor(infinity_client, serialNumber, log, events) {
|
|
117
118
|
super(infinity_client);
|
|
118
119
|
this.infinity_client = infinity_client;
|
|
119
120
|
this.serialNumber = serialNumber;
|
|
120
121
|
this.log = log;
|
|
122
|
+
this.events = events;
|
|
121
123
|
this.last_updated = 0; // TODO use this
|
|
122
124
|
this.HASH_IGNORE_KEYS = new Set(['timestamp', 'localTime']);
|
|
123
125
|
}
|
|
124
126
|
async forceFetch() {
|
|
127
|
+
const old_hash = this.data_object_hash;
|
|
125
128
|
await super.forceFetch();
|
|
129
|
+
const new_hash = this.data_object_hash;
|
|
126
130
|
const top_level_key = Object.keys(this.data_object)[0];
|
|
127
131
|
const ts = this.data_object[top_level_key].timestamp[0];
|
|
128
132
|
this.last_updated = Date.parse(ts);
|
|
129
133
|
this.log.debug(`TIMESTAMP ${this.getPath()} reports ${ts} (${this.last_updated})`);
|
|
134
|
+
if (old_hash !== new_hash) {
|
|
135
|
+
this.events.emit(`updated_${top_level_key}`);
|
|
136
|
+
}
|
|
130
137
|
}
|
|
131
138
|
}
|
|
132
139
|
class SystemProfileModel extends BaseSystemModel {
|
|
@@ -361,7 +368,16 @@ class SystemConfigModel extends SystemConfigModelReadOnly {
|
|
|
361
368
|
*/
|
|
362
369
|
this.mutations = [];
|
|
363
370
|
}
|
|
371
|
+
// Skip fetching new data when we have a dirty local state.
|
|
372
|
+
async fetch() {
|
|
373
|
+
if (this.mutations.length > 0) {
|
|
374
|
+
return;
|
|
375
|
+
}
|
|
376
|
+
await super.fetch();
|
|
377
|
+
}
|
|
364
378
|
async push() {
|
|
379
|
+
// While waiting to push to api, push locally to HK.
|
|
380
|
+
this.events.emit(constants_1.SUBSCRIPTION.CONFIG_MUTATE);
|
|
365
381
|
// Wait a bit so we can catch other mutations that came in around the
|
|
366
382
|
// same time.
|
|
367
383
|
await new Promise(r => setTimeout(r, 2000));
|
|
@@ -384,8 +400,15 @@ class SystemConfigModel extends SystemConfigModelReadOnly {
|
|
|
384
400
|
await this.forcePush(mutated_data_object);
|
|
385
401
|
this.log.info('... pushing changes complete.');
|
|
386
402
|
// 3. Confirm
|
|
387
|
-
// TODO Try this a few times in a loop
|
|
388
403
|
await new Promise(r => setTimeout(r, 5000));
|
|
404
|
+
if (this.mutations.length > 0) {
|
|
405
|
+
// If local state is dirty (from new mutations queued during push)
|
|
406
|
+
// don't do a forceFetch or it will cause apparent bouncing, let the
|
|
407
|
+
// next push refresh from remote api state.
|
|
408
|
+
// This is safe because mutations are always done on a fresh fetched
|
|
409
|
+
// config, even if local config is dirty or stale.
|
|
410
|
+
return;
|
|
411
|
+
}
|
|
389
412
|
await this.forceFetch();
|
|
390
413
|
if (mutated_hash === this.data_object_hash) {
|
|
391
414
|
this.log.debug('Successful propagation to carrier api is confirmed.');
|
|
@@ -520,10 +543,11 @@ class SystemModel {
|
|
|
520
543
|
this.infinity_client = infinity_client;
|
|
521
544
|
this.serialNumber = serialNumber;
|
|
522
545
|
this.log = new helper_logging_1.PrefixLogger(this.infinity_client.log, this.serialNumber);
|
|
546
|
+
this.events = new events_1.default().setMaxListeners(100);
|
|
523
547
|
const api_logger = new helper_logging_1.PrefixLogger(this.log, 'API');
|
|
524
|
-
this.status = new SystemStatusModel(infinity_client, serialNumber, api_logger);
|
|
525
|
-
this.config = new SystemConfigModel(infinity_client, serialNumber, api_logger);
|
|
526
|
-
this.profile = new SystemProfileModel(infinity_client, serialNumber, api_logger);
|
|
548
|
+
this.status = new SystemStatusModel(infinity_client, serialNumber, api_logger, this.events);
|
|
549
|
+
this.config = new SystemConfigModel(infinity_client, serialNumber, api_logger, this.events);
|
|
550
|
+
this.profile = new SystemProfileModel(infinity_client, serialNumber, api_logger, this.events);
|
|
527
551
|
}
|
|
528
552
|
}
|
|
529
553
|
exports.SystemModel = SystemModel;
|
package/dist/api/models.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/api/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_base.d.ts","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAO/D,cAAM,OAAO;aAOO,QAAQ,EAAE,iCAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAP5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAiC;IACxE,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAwC;IAC7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAoD;IAC1F,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAwD;gBAGpE,QAAQ,EAAE,iCAAiC,EACxC,OAAO,EAAE,cAAc;IAI5C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAG7B;AAED,8BAAsB,YAAa,SAAQ,OAAO;IAChD,SAAS,CAAC,QAAQ,EAAE,OAAO,OAAO,EAAE,CAAM;IAE1C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B;AAED,8BAAsB,qBAAsB,SAAQ,OAAO;IACzD,SAAgB,KAAK,EAAE,QAAQ,CAAC,UAAU,cAAc,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,KAAM;IACrB,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,SAAS,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAE3D,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"characteristics_base.d.ts","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3E,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAO/D,cAAM,OAAO;aAOO,QAAQ,EAAE,iCAAiC;IAC3D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc;IAP5C,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAiC;IACxE,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAwC;IAC7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAoD;IAC1F,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAwD;gBAGpE,QAAQ,EAAE,iCAAiC,EACxC,OAAO,EAAE,cAAc;IAI5C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAG7B;AAED,8BAAsB,YAAa,SAAQ,OAAO;IAChD,SAAS,CAAC,QAAQ,EAAE,OAAO,OAAO,EAAE,CAAM;IAE1C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B;AAED,8BAAsB,qBAAsB,SAAQ,OAAO;IACzD,SAAgB,KAAK,EAAE,QAAQ,CAAC,UAAU,cAAc,CAAC,CAAC;IAC1D,SAAS,CAAC,KAAK,KAAM;IACrB,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC;IAE3E,SAAS,CAAC,aAAa,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAE3D,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAiC7B;AAED,8BAAsB,+BAAgC,SAAQ,qBAAqB;IAG3E,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;CAqBrC;AAED,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAQ7B"}
|
|
@@ -45,17 +45,27 @@ class CharacteristicWrapper extends Wrapper {
|
|
|
45
45
|
characteristic.setProps(this.props);
|
|
46
46
|
}
|
|
47
47
|
if (this.get) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
// This magic callback schedules another async callback to actually fetch
|
|
49
|
+
// and update the characteristic. This lets us convert a sync callback to
|
|
50
|
+
// an async callback.
|
|
51
|
+
const callback = () => {
|
|
52
|
+
// Schedule async update to HK characteristic.
|
|
53
|
+
process.nextTick(async () => {
|
|
51
54
|
if (this.get) {
|
|
52
55
|
characteristic.updateValue(await this.get());
|
|
53
56
|
}
|
|
54
57
|
});
|
|
55
|
-
//
|
|
58
|
+
// Return immediately with the current, stale value. This is needed for
|
|
59
|
+
// this to be a valid callback to onGet.
|
|
56
60
|
// try 1) existing value, if falsy, 2) default value, if null, 3) keep existing value
|
|
57
61
|
return characteristic.value || this.default_value || characteristic.value;
|
|
58
|
-
}
|
|
62
|
+
};
|
|
63
|
+
// Listen for HK 'get' requests. Schedule async update push to HK.
|
|
64
|
+
characteristic.onGet(callback);
|
|
65
|
+
// Listen for api updates. Schedule async update push to HK.
|
|
66
|
+
this.system.events.on(constants_1.SUBSCRIPTION.CONFIG, callback);
|
|
67
|
+
this.system.events.on(constants_1.SUBSCRIPTION.CONFIG_MUTATE, callback);
|
|
68
|
+
this.system.events.on(constants_1.SUBSCRIPTION.STATUS, callback);
|
|
59
69
|
}
|
|
60
70
|
if (this.set) {
|
|
61
71
|
characteristic.onSet(this.set.bind(this));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"characteristics_base.js","sourceRoot":"","sources":["../src/characteristics_base.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Carrier Infinity",
|
|
3
3
|
"name": "homebridge-carrier-infinity",
|
|
4
|
-
"version": "1.6.
|
|
4
|
+
"version": "1.6.13",
|
|
5
5
|
"description": "Standalone homebridge plugin for Carrier Infinity / Bryant Evolution / ICP Brands Ion thermostats.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|