@switchbot/homebridge-switchbot 1.11.0 → 1.12.1
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 +31 -0
- package/config.schema.json +18 -3
- package/dist/device/bot.d.ts +8 -0
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +40 -21
- package/dist/device/bot.js.map +1 -1
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +22 -32
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +4 -10
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +13 -28
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +9 -30
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +4 -10
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +4 -10
- package/dist/device/meter.js.map +1 -1
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +4 -10
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +4 -10
- package/dist/device/plug.js.map +1 -1
- package/dist/irdevice/airconditioner.d.ts +22 -22
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +47 -50
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts +12 -9
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +23 -26
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts +10 -7
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +14 -17
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +12 -9
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +32 -35
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/light.d.ts +10 -7
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +16 -19
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts +12 -9
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +21 -24
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts +13 -10
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +28 -31
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts +10 -7
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +16 -19
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts +10 -7
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +19 -22
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +5 -5
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js.map +1 -1
- package/package.json +4 -4
- package/src/device/bot.ts +40 -20
- package/src/device/colorbulb.ts +22 -44
- package/src/device/contact.ts +4 -12
- package/src/device/curtain.ts +13 -28
- package/src/device/humidifier.ts +9 -30
- package/src/device/lock.ts +4 -10
- package/src/device/meter.ts +4 -10
- package/src/device/motion.ts +4 -12
- package/src/device/plug.ts +4 -10
- package/src/irdevice/airconditioner.ts +57 -60
- package/src/irdevice/airpurifier.ts +33 -36
- package/src/irdevice/camera.ts +22 -25
- package/src/irdevice/fan.ts +43 -46
- package/src/irdevice/light.ts +26 -29
- package/src/irdevice/other.ts +29 -32
- package/src/irdevice/tv.ts +45 -50
- package/src/irdevice/vacuumcleaner.ts +24 -27
- package/src/irdevice/waterheater.ts +27 -30
- package/src/platform.ts +9 -9
- package/src/settings.ts +1 -0
package/dist/irdevice/light.js
CHANGED
|
@@ -29,16 +29,16 @@ class Light {
|
|
|
29
29
|
.setCharacteristic(this.platform.Characteristic.SerialNumber, device.deviceId);
|
|
30
30
|
// get the Television service if it exists, otherwise create a new Television service
|
|
31
31
|
// you can create multiple services for each accessory
|
|
32
|
-
(this.
|
|
32
|
+
(this.lightBulbService = accessory.getService(this.platform.Service.Lightbulb) || accessory.addService(this.platform.Service.Lightbulb)),
|
|
33
33
|
`${accessory.displayName} Light Bulb`;
|
|
34
34
|
// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
|
|
35
35
|
// when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
|
|
36
36
|
// accessory.getService('NAME') ?? accessory.addService(this.platform.Service.Outlet, 'NAME', 'USER_DEFINED_SUBTYPE');
|
|
37
37
|
// set the service name, this is what is displayed as the default name on the Home app
|
|
38
38
|
// in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
|
|
39
|
-
this.
|
|
39
|
+
this.lightBulbService.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
40
40
|
// handle on / off events using the On characteristic
|
|
41
|
-
this.
|
|
41
|
+
this.lightBulbService.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
|
|
42
42
|
// handle Brightness events using the Brightness characteristic
|
|
43
43
|
/* this.service
|
|
44
44
|
.getCharacteristic(this.platform.Characteristic.Brightness)
|
|
@@ -54,22 +54,22 @@ class Light {
|
|
|
54
54
|
callback(null);
|
|
55
55
|
});*/
|
|
56
56
|
}
|
|
57
|
-
OnSet(value) {
|
|
57
|
+
async OnSet(value) {
|
|
58
58
|
this.debugLog(`Light: ${this.accessory.displayName} On: ${value}`);
|
|
59
59
|
this.On = value;
|
|
60
60
|
if (this.On) {
|
|
61
|
-
this.pushLightOnChanges();
|
|
61
|
+
await this.pushLightOnChanges();
|
|
62
62
|
}
|
|
63
63
|
else {
|
|
64
|
-
this.pushLightOffChanges();
|
|
64
|
+
await this.pushLightOffChanges();
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
-
updateHomeKitCharacteristics() {
|
|
67
|
+
async updateHomeKitCharacteristics() {
|
|
68
68
|
if (this.On === undefined) {
|
|
69
69
|
this.debugLog(`Light: ${this.accessory.displayName} On: ${this.On}`);
|
|
70
70
|
}
|
|
71
71
|
else {
|
|
72
|
-
this.
|
|
72
|
+
this.lightBulbService?.updateCharacteristic(this.platform.Characteristic.On, this.On);
|
|
73
73
|
this.debugLog(`Light: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
@@ -133,16 +133,13 @@ class Light {
|
|
|
133
133
|
}
|
|
134
134
|
catch (e) {
|
|
135
135
|
this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
136
|
-
if (this.deviceLogging
|
|
136
|
+
if (this.deviceLogging.includes('debug')) {
|
|
137
137
|
this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
138
138
|
}
|
|
139
|
-
if (this.platform.debugMode) {
|
|
140
|
-
this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
141
|
-
}
|
|
142
139
|
this.apiError(e);
|
|
143
140
|
}
|
|
144
141
|
}
|
|
145
|
-
statusCode(push) {
|
|
142
|
+
async statusCode(push) {
|
|
146
143
|
switch (push.data.statusCode) {
|
|
147
144
|
case 151:
|
|
148
145
|
this.errorLog(`Light: ${this.accessory.displayName} Command not supported by this device type.`);
|
|
@@ -170,11 +167,11 @@ class Light {
|
|
|
170
167
|
this.debugLog(`Light: ${this.accessory.displayName} Unknown statusCode.`);
|
|
171
168
|
}
|
|
172
169
|
}
|
|
173
|
-
apiError(e) {
|
|
174
|
-
this.
|
|
170
|
+
async apiError(e) {
|
|
171
|
+
this.lightBulbService.updateCharacteristic(this.platform.Characteristic.On, e);
|
|
175
172
|
//throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
|
|
176
173
|
}
|
|
177
|
-
config(device) {
|
|
174
|
+
async config(device) {
|
|
178
175
|
let config = {};
|
|
179
176
|
if (device.irlight) {
|
|
180
177
|
config = device.irlight;
|
|
@@ -183,10 +180,10 @@ class Light {
|
|
|
183
180
|
config['logging'] = device.logging;
|
|
184
181
|
}
|
|
185
182
|
if (Object.entries(config).length !== 0) {
|
|
186
|
-
this.
|
|
183
|
+
this.infoLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
187
184
|
}
|
|
188
185
|
}
|
|
189
|
-
logs(device) {
|
|
186
|
+
async logs(device) {
|
|
190
187
|
if (this.platform.debugMode) {
|
|
191
188
|
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
192
189
|
this.debugLog(`Light: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
@@ -233,7 +230,7 @@ class Light {
|
|
|
233
230
|
}
|
|
234
231
|
}
|
|
235
232
|
enablingDeviceLogging() {
|
|
236
|
-
return this.deviceLogging
|
|
233
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
237
234
|
}
|
|
238
235
|
}
|
|
239
236
|
exports.Light = Light;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/irdevice/light.ts"],"names":[],"mappings":";;;AAEA,0CAA4E;AAG5E;;;;GAIG;AACH,MAAa,KAAK;IAWhB,YAA6B,QAA2B,EAAU,SAA4B,EAAS,MAAkC;QAA5G,aAAQ,GAAR,QAAQ,CAAmB;QAAU,cAAS,GAAT,SAAS,CAAmB;QAAS,WAAM,GAAN,MAAM,CAA4B;QACvI,uBAAuB;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,EAAE;YACzB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;SACjB;aAAM;YACL,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;SACrC;QAED,4BAA4B;QAC5B,SAAS;aACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aACzE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;aACxE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,QAAS,CAAC,CAAC;QAElF,qFAAqF;QACrF,sDAAsD;QACtD,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"light.js","sourceRoot":"","sources":["../../src/irdevice/light.ts"],"names":[],"mappings":";;;AAEA,0CAA4E;AAG5E;;;;GAIG;AACH,MAAa,KAAK;IAWhB,YAA6B,QAA2B,EAAU,SAA4B,EAAS,MAAkC;QAA5G,aAAQ,GAAR,QAAQ,CAAmB;QAAU,cAAS,GAAT,SAAS,CAAmB;QAAS,WAAM,GAAN,MAAM,CAA4B;QACvI,uBAAuB;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,EAAE;YACzB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;SACjB;aAAM;YACL,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;SACrC;QAED,4BAA4B;QAC5B,SAAS;aACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aACzE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;aACxE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,QAAS,CAAC,CAAC;QAElF,qFAAqF;QACrF,sDAAsD;QACtD,CAAC,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YACxI,GAAG,SAAS,CAAC,WAAW,aAAa,CAAC;QAEtC,+HAA+H;QAC/H,2HAA2H;QAC3H,sHAAsH;QAEtH,sFAAsF;QACtF,8GAA8G;QAC9G,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAElG,qDAAqD;QACrD,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtG,+DAA+D;QAC/D;;;;;;;;;;;;eAYO;IACT,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAA0B;QACpC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC;QAChB,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;SACjC;aAAM;YACL,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAClC;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B;QAChC,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,EAAE;YACzB,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,QAAQ,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;SACtE;aAAM;YACL,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,6BAA6B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;SAC3F;IACH,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,kBAAkB;QACtB,IAAI,IAAI,CAAC,EAAE,EAAE;YACX,MAAM,OAAO,GAAG;gBACd,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,QAAQ;aACP,CAAC;YACb,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACjC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YACZ,MAAM,OAAO,GAAG;gBACd,WAAW,EAAE,SAAS;gBACtB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,SAAS;aACR,CAAC;YACb,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;SACjC;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B;QAChC,MAAM,OAAO,GAAG;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,cAAc;SACb,CAAC;QACb,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,8BAA8B;QAClC,MAAM,OAAO,GAAG;YACd,WAAW,EAAE,SAAS;YACtB,SAAS,EAAE,SAAS;YACpB,OAAO,EAAE,gBAAgB;SACf,CAAC;QACb,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAgB;QAChC,IAAI;YACF,IAAI,CAAC,OAAO,CACV,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,+CAA+C,OAAO,CAAC,OAAO,GAAG;gBACnG,eAAe,OAAO,CAAC,SAAS,kBAAkB,OAAO,CAAC,WAAW,EAAE,CAC1E,CAAC;YAEF,uBAAuB;YACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,oBAAS,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,WAAW,EAAE,OAAO,CAAC,CAAC;YACtG,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC1C,IAAI,CAAC,4BAA4B,EAAE,CAAC;SACrC;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,6CAA6C,CAAC,CAAC;YACjG,IAAI,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACxC,IAAI,CAAC,QAAQ,CACX,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,8CAA8C,GAAG,mBAAmB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CACpI,CAAC;aACH;YACD,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAA2C;QAC1D,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAC5B,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,6CAA6C,CAAC,CAAC;gBACjG,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,oBAAoB,CAAC,CAAC;gBACxE,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,4BAA4B,CAAC,CAAC;gBAChF,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,qBAAqB,CAAC,CAAC;gBACzE,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,gCAAgC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC7G,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CACX,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,8DAA8D;oBAChG,6BAA6B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAC7E,CAAC;gBACF,MAAM;YACR,KAAK,GAAG;gBACN,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,6BAA6B,CAAC,CAAC;gBACjF,MAAM;YACR;gBACE,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,sBAAsB,CAAC,CAAC;SAC7E;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,CAAM;QACnB,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC/E,0FAA0F;IAC5F,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAkC;QAC7C,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;SACzB;QACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;SACpC;QACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACvC,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SACxF;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAkC;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;YAC3B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,WAAW,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,8BAA8B,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACvG;aAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,iCAAiC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SAC1G;aAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE;YAChD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;YAC5F,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,mCAAmC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SAC5G;aAAM;YACL,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC;YACjE,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,4BAA4B,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;SACrG;IACH,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,GAAG,GAAU;QACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;SACxC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,GAAU;QACnB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;SACxC;IACH,CAAC;IAED,QAAQ,CAAC,GAAG,GAAU;QACpB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;SACzC;IACH,CAAC;IAED,QAAQ,CAAC,GAAG,GAAU;QACpB,IAAI,IAAI,CAAC,qBAAqB,EAAE,EAAE;YAChC,IAAI,IAAI,CAAC,aAAa,KAAK,OAAO,EAAE;gBAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;aACnD;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;aACzC;SACF;IACH,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,aAAa,KAAK,UAAU,CAAC;IACnF,CAAC;CACF;AA7PD,sBA6PC"}
|
package/dist/irdevice/other.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { AxiosResponse } from 'axios';
|
|
1
2
|
import { SwitchBotPlatform } from '../platform';
|
|
2
3
|
import { irDevicesConfig, irdevice, payload } from '../settings';
|
|
3
|
-
import { CharacteristicValue, PlatformAccessory } from 'homebridge';
|
|
4
|
+
import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
|
|
4
5
|
/**
|
|
5
6
|
* Platform Accessory
|
|
6
7
|
* An instance of this class is created for each accessory your platform registers
|
|
@@ -10,14 +11,14 @@ export declare class Others {
|
|
|
10
11
|
private readonly platform;
|
|
11
12
|
private accessory;
|
|
12
13
|
device: irdevice & irDevicesConfig;
|
|
13
|
-
|
|
14
|
+
fanService?: Service;
|
|
14
15
|
Active: CharacteristicValue;
|
|
15
16
|
ActiveCached: CharacteristicValue;
|
|
16
17
|
deviceLogging: string;
|
|
17
18
|
otherDeviceType?: string;
|
|
18
19
|
constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: irdevice & irDevicesConfig);
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
ActiveSet(value: CharacteristicValue): Promise<void>;
|
|
21
|
+
updateHomeKitCharacteristics(): Promise<void>;
|
|
21
22
|
/**
|
|
22
23
|
* Pushes the requested changes to the SwitchBot API
|
|
23
24
|
* deviceType commandType Command command parameter Description
|
|
@@ -31,11 +32,13 @@ export declare class Others {
|
|
|
31
32
|
pushOnChanges(): Promise<void>;
|
|
32
33
|
pushOffChanges(): Promise<void>;
|
|
33
34
|
pushChanges(payload: payload): Promise<void>;
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
statusCode(push: AxiosResponse<{
|
|
36
|
+
statusCode: number;
|
|
37
|
+
}>): Promise<void>;
|
|
38
|
+
apiError(e: any): Promise<void>;
|
|
39
|
+
deviceType(device: irdevice & irDevicesConfig): Promise<void>;
|
|
40
|
+
config(device: irdevice & irDevicesConfig): Promise<void>;
|
|
41
|
+
logs(device: irdevice & irDevicesConfig): Promise<void>;
|
|
39
42
|
/**
|
|
40
43
|
* Logging for Device
|
|
41
44
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"other.d.ts","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,eAAe,EAAa,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,MAAM;IAYL,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAqB,OAAO,CAAC,SAAS;IAA4B,MAAM,EAAE,QAAQ,GAAG,eAAe;IAVzI,UAAU,CAAC,EAAE,OAAO,CAAC;IAGrB,MAAM,EAAG,mBAAmB,CAAC;IAC7B,YAAY,EAAG,mBAAmB,CAAC;IAGnC,aAAa,EAAG,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;gBAEI,QAAQ,EAAE,iBAAiB,EAAU,SAAS,EAAE,iBAAiB,EAAS,MAAM,EAAE,QAAQ,GAAG,eAAe;IAyCnI,SAAS,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IASnD;;;;;;;;;OASG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB9B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB/B,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BtE,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/B,UAAU,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAW7D,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAazD,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7D;;OAEG;IACH,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAU7B,qBAAqB,IAAI,OAAO;CAGjC"}
|
package/dist/irdevice/other.js
CHANGED
|
@@ -35,38 +35,38 @@ class Others {
|
|
|
35
35
|
if (this.otherDeviceType === undefined) {
|
|
36
36
|
this.errorLog(`Other: ${this.accessory.displayName} No Device Type Set, deviceType: ${device.other?.deviceType}`);
|
|
37
37
|
}
|
|
38
|
-
this.
|
|
39
|
-
accessory.removeService(this.
|
|
38
|
+
this.fanService = this.accessory.getService(this.platform.Service.Fanv2);
|
|
39
|
+
accessory.removeService(this.fanService);
|
|
40
40
|
}
|
|
41
|
-
else if (!this.
|
|
41
|
+
else if (!this.fanService && this.otherDeviceType === 'Fan') {
|
|
42
42
|
this.debugLog(`Other: ${accessory.displayName} Add Fanv2 Service`);
|
|
43
|
-
(this.
|
|
43
|
+
(this.fanService = this.accessory.getService(this.platform.Service.Fanv2) || this.accessory.addService(this.platform.Service.Fanv2)),
|
|
44
44
|
`${accessory.displayName} Fan`;
|
|
45
|
-
this.
|
|
46
|
-
this.
|
|
45
|
+
this.fanService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Fan`);
|
|
46
|
+
this.fanService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
this.debugLog(`Other: ${accessory.displayName} Fanv2 Service Not Added, deviceType: ${device.other?.deviceType}`);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
-
ActiveSet(value) {
|
|
52
|
+
async ActiveSet(value) {
|
|
53
53
|
this.debugLog(`Other: ${this.accessory.displayName} On: ${value}`);
|
|
54
54
|
if (this.Active) {
|
|
55
|
-
this.pushOnChanges();
|
|
55
|
+
await this.pushOnChanges();
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
|
-
this.pushOffChanges();
|
|
58
|
+
await this.pushOffChanges();
|
|
59
59
|
}
|
|
60
60
|
this.Active = value;
|
|
61
61
|
this.ActiveCached = this.Active;
|
|
62
62
|
this.accessory.context.Active = this.ActiveCached;
|
|
63
63
|
}
|
|
64
|
-
updateHomeKitCharacteristics() {
|
|
64
|
+
async updateHomeKitCharacteristics() {
|
|
65
65
|
if (this.Active === undefined) {
|
|
66
66
|
this.debugLog(`Other: ${this.accessory.displayName} Active: ${this.Active}`);
|
|
67
67
|
}
|
|
68
68
|
else {
|
|
69
|
-
this.
|
|
69
|
+
this.fanService?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
|
|
70
70
|
this.debugLog(`Other: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
@@ -142,16 +142,13 @@ class Others {
|
|
|
142
142
|
}
|
|
143
143
|
catch (e) {
|
|
144
144
|
this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
145
|
-
if (this.deviceLogging
|
|
145
|
+
if (this.deviceLogging.includes('debug')) {
|
|
146
146
|
this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
147
147
|
}
|
|
148
|
-
if (this.platform.debugMode) {
|
|
149
|
-
this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
150
|
-
}
|
|
151
148
|
this.apiError(e);
|
|
152
149
|
}
|
|
153
150
|
}
|
|
154
|
-
statusCode(push) {
|
|
151
|
+
async statusCode(push) {
|
|
155
152
|
switch (push.data.statusCode) {
|
|
156
153
|
case 151:
|
|
157
154
|
this.errorLog(`Other: ${this.accessory.displayName} Command not supported by this device type.`);
|
|
@@ -179,14 +176,14 @@ class Others {
|
|
|
179
176
|
this.debugLog(`Other: ${this.accessory.displayName} Unknown statusCode.`);
|
|
180
177
|
}
|
|
181
178
|
}
|
|
182
|
-
apiError(e) {
|
|
183
|
-
this.
|
|
179
|
+
async apiError(e) {
|
|
180
|
+
this.fanService?.updateCharacteristic(this.platform.Characteristic.Active, e);
|
|
184
181
|
//throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
|
|
185
182
|
}
|
|
186
|
-
deviceType(device) {
|
|
183
|
+
async deviceType(device) {
|
|
187
184
|
if (device.other?.deviceType) {
|
|
188
185
|
this.otherDeviceType = this.accessory.context.deviceType = device.other.deviceType;
|
|
189
|
-
if (this.deviceLogging
|
|
186
|
+
if (this.deviceLogging.includes('debug') || this.deviceLogging === 'standard') {
|
|
190
187
|
this.warnLog(`Other: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
|
|
191
188
|
}
|
|
192
189
|
}
|
|
@@ -194,7 +191,7 @@ class Others {
|
|
|
194
191
|
this.errorLog(`Other: ${this.accessory.displayName} No Device Type Set, deviceType: ${this.device.other?.deviceType}`);
|
|
195
192
|
}
|
|
196
193
|
}
|
|
197
|
-
config(device) {
|
|
194
|
+
async config(device) {
|
|
198
195
|
let config = {};
|
|
199
196
|
if (device.other) {
|
|
200
197
|
config = device.other;
|
|
@@ -203,10 +200,10 @@ class Others {
|
|
|
203
200
|
config['logging'] = device.logging;
|
|
204
201
|
}
|
|
205
202
|
if (Object.entries(config).length !== 0) {
|
|
206
|
-
this.
|
|
203
|
+
this.infoLog(`Other: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
207
204
|
}
|
|
208
205
|
}
|
|
209
|
-
logs(device) {
|
|
206
|
+
async logs(device) {
|
|
210
207
|
if (this.platform.debugMode) {
|
|
211
208
|
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
212
209
|
this.debugLog(`Other: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
@@ -253,7 +250,7 @@ class Others {
|
|
|
253
250
|
}
|
|
254
251
|
}
|
|
255
252
|
enablingDeviceLogging() {
|
|
256
|
-
return this.deviceLogging
|
|
253
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
257
254
|
}
|
|
258
255
|
}
|
|
259
256
|
exports.Others = Others;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"other.js","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":";;;AAEA,0CAA4E;AAG5E;;;;GAIG;AACH,MAAa,MAAM;IAYjB,YAA6B,QAA2B,EAAU,SAA4B,EAAS,MAAkC;QAA5G,aAAQ,GAAR,QAAQ,CAAmB;QAAU,cAAS,GAAT,SAAS,CAAmB;QAAS,WAAM,GAAN,MAAM,CAA4B;QACvI,uBAAuB;QACvB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC;SAC5D;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC;SAC7C;QAED,4BAA4B;QAC5B,SAAS;aACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aACzE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;aACxE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,QAAS,CAAC,CAAC;QAElF,qFAAqF;QACrF,sDAAsD;QACtD,IAAI,IAAI,CAAC,eAAe,KAAK,KAAK,EAAE;YAClC,IAAI,CAAC,QAAQ,CAAC,UAAU,SAAS,CAAC,WAAW,yBAAyB,CAAC,CAAC;YAExE,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,EAAE;gBACtC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,WAAW,oCAAoC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;aACnH;YACD,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"other.js","sourceRoot":"","sources":["../../src/irdevice/other.ts"],"names":[],"mappings":"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"}
|
package/dist/irdevice/tv.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AxiosResponse } from 'axios';
|
|
1
2
|
import { SwitchBotPlatform } from '../platform';
|
|
2
3
|
import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
|
|
3
4
|
import { irdevice, deviceStatusResponse, irDevicesConfig, payload } from '../settings';
|
|
@@ -10,7 +11,7 @@ export declare class TV {
|
|
|
10
11
|
private readonly platform;
|
|
11
12
|
private accessory;
|
|
12
13
|
device: irdevice & irDevicesConfig;
|
|
13
|
-
|
|
14
|
+
tvService: Service;
|
|
14
15
|
speakerService: Service;
|
|
15
16
|
Active: CharacteristicValue;
|
|
16
17
|
ActiveCached: CharacteristicValue;
|
|
@@ -18,11 +19,11 @@ export declare class TV {
|
|
|
18
19
|
deviceStatus: deviceStatusResponse;
|
|
19
20
|
deviceLogging: string;
|
|
20
21
|
constructor(platform: SwitchBotPlatform, accessory: PlatformAccessory, device: irdevice & irDevicesConfig);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
VolumeSelectorSet(value: CharacteristicValue): Promise<void>;
|
|
23
|
+
RemoteKeySet(value: CharacteristicValue): Promise<void>;
|
|
24
|
+
ActiveIdentifierSet(value: CharacteristicValue): Promise<void>;
|
|
25
|
+
ActiveSet(value: CharacteristicValue): Promise<void>;
|
|
26
|
+
updateHomeKitCharacteristics(): Promise<void>;
|
|
26
27
|
/**
|
|
27
28
|
* Pushes the requested changes to the SwitchBot API
|
|
28
29
|
* deviceType commandType Command command parameter Description
|
|
@@ -45,10 +46,12 @@ export declare class TV {
|
|
|
45
46
|
pushVolumeUpChanges(): Promise<void>;
|
|
46
47
|
pushVolumeDownChanges(): Promise<void>;
|
|
47
48
|
pushTVChanges(payload: payload): Promise<void>;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
statusCode(push: AxiosResponse<{
|
|
50
|
+
statusCode: number;
|
|
51
|
+
}>): Promise<void>;
|
|
52
|
+
apiError(e: any): Promise<void>;
|
|
53
|
+
config(device: irdevice & irDevicesConfig): Promise<void>;
|
|
54
|
+
logs(device: irdevice & irDevicesConfig): Promise<void>;
|
|
52
55
|
/**
|
|
53
56
|
* Logging for Device
|
|
54
57
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tv.d.ts","sourceRoot":"","sources":["../../src/irdevice/tv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tv.d.ts","sourceRoot":"","sources":["../../src/irdevice/tv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAa,QAAQ,EAAE,oBAAoB,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAElG;;;;GAIG;AACH,qBAAa,EAAE;IAgBD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAAqB,OAAO,CAAC,SAAS;IAA4B,MAAM,EAAE,QAAQ,GAAG,eAAe;IAdzI,SAAS,EAAG,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;IAGxB,MAAM,EAAG,mBAAmB,CAAC;IAC7B,YAAY,EAAG,mBAAmB,CAAC;IACnC,gBAAgB,EAAG,mBAAmB,CAAC;IAGvC,YAAY,EAAG,oBAAoB,CAAC;IAGpC,aAAa,EAAG,MAAM,CAAC;gBAEM,QAAQ,EAAE,iBAAiB,EAAU,SAAS,EAAE,iBAAiB,EAAS,MAAM,EAAE,QAAQ,GAAG,eAAe;IA4FnI,iBAAiB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,YAAY,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgEvD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9D,SAAS,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpD,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAenD;;;;;;;;;OASG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAStC,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9C,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCtE,QAAQ,CAAC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/B,MAAM,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAazD,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB7D;;OAEG;IACH,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM5B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAM7B,QAAQ,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;IAU7B,qBAAqB,IAAI,OAAO;CAGjC"}
|
package/dist/irdevice/tv.js
CHANGED
|
@@ -33,13 +33,13 @@ class TV {
|
|
|
33
33
|
case 'Speaker':
|
|
34
34
|
case 'DIY Speaker':
|
|
35
35
|
accessory.category = 26 /* SPEAKER */;
|
|
36
|
-
(this.
|
|
36
|
+
(this.tvService = accessory.getService(this.platform.Service.Television) || accessory.addService(this.platform.Service.Television)),
|
|
37
37
|
`${accessory.displayName} Speaker`;
|
|
38
38
|
break;
|
|
39
39
|
case 'IPTV':
|
|
40
40
|
case 'DIY IPTV':
|
|
41
41
|
accessory.category = 36 /* TV_STREAMING_STICK */;
|
|
42
|
-
(this.
|
|
42
|
+
(this.tvService = accessory.getService(this.platform.Service.Television) || accessory.addService(this.platform.Service.Television)),
|
|
43
43
|
`${accessory.displayName} Streaming Stick`;
|
|
44
44
|
break;
|
|
45
45
|
case 'DVD':
|
|
@@ -47,14 +47,14 @@ class TV {
|
|
|
47
47
|
case 'Set Top Box':
|
|
48
48
|
case 'DIY Set Top Box':
|
|
49
49
|
accessory.category = 35 /* TV_SET_TOP_BOX */;
|
|
50
|
-
(this.
|
|
50
|
+
(this.tvService = accessory.getService(this.platform.Service.Television) || accessory.addService(this.platform.Service.Television)),
|
|
51
51
|
`${accessory.displayName} Set Top Box`;
|
|
52
52
|
break;
|
|
53
53
|
default:
|
|
54
54
|
accessory.category = 31 /* TELEVISION */;
|
|
55
55
|
// get the Television service if it exists, otherwise create a new Television service
|
|
56
56
|
// you can create multiple services for each accessory
|
|
57
|
-
(this.
|
|
57
|
+
(this.tvService = accessory.getService(this.platform.Service.Television) || accessory.addService(this.platform.Service.Television)),
|
|
58
58
|
`${accessory.displayName} TV`;
|
|
59
59
|
}
|
|
60
60
|
// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
|
|
@@ -62,16 +62,16 @@ class TV {
|
|
|
62
62
|
// accessory.getService('NAME') ?? accessory.addService(this.platform.Service.Outlet, 'NAME', 'USER_DEFINED_SUBTYPE');
|
|
63
63
|
// set the service name, this is what is displayed as the default name on the Home app
|
|
64
64
|
// in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
|
|
65
|
-
this.
|
|
65
|
+
this.tvService.getCharacteristic(this.platform.Characteristic.ConfiguredName);
|
|
66
66
|
// set sleep discovery characteristic
|
|
67
|
-
this.
|
|
67
|
+
this.tvService.setCharacteristic(this.platform.Characteristic.SleepDiscoveryMode, this.platform.Characteristic.SleepDiscoveryMode.ALWAYS_DISCOVERABLE);
|
|
68
68
|
// handle on / off events using the Active characteristic
|
|
69
|
-
this.
|
|
70
|
-
this.
|
|
69
|
+
this.tvService.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));
|
|
70
|
+
this.tvService.setCharacteristic(this.platform.Characteristic.ActiveIdentifier, 1);
|
|
71
71
|
// handle input source changes
|
|
72
|
-
this.
|
|
72
|
+
this.tvService.getCharacteristic(this.platform.Characteristic.ActiveIdentifier).onSet(this.ActiveIdentifierSet.bind(this));
|
|
73
73
|
// handle remote control input
|
|
74
|
-
this.
|
|
74
|
+
this.tvService.getCharacteristic(this.platform.Characteristic.RemoteKey).onSet(this.RemoteKeySet.bind(this));
|
|
75
75
|
/**
|
|
76
76
|
* Create a speaker service to allow volume control
|
|
77
77
|
*/
|
|
@@ -86,7 +86,7 @@ class TV {
|
|
|
86
86
|
// handle volume control
|
|
87
87
|
this.speakerService.getCharacteristic(this.platform.Characteristic.VolumeSelector).onSet(this.VolumeSelectorSet.bind(this));
|
|
88
88
|
}
|
|
89
|
-
VolumeSelectorSet(value) {
|
|
89
|
+
async VolumeSelectorSet(value) {
|
|
90
90
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} VolumeSelector: ${value}`);
|
|
91
91
|
if (value === this.platform.Characteristic.VolumeSelector.INCREMENT) {
|
|
92
92
|
this.pushVolumeUpChanges();
|
|
@@ -95,7 +95,7 @@ class TV {
|
|
|
95
95
|
this.pushVolumeDownChanges();
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
|
-
RemoteKeySet(value) {
|
|
98
|
+
async RemoteKeySet(value) {
|
|
99
99
|
switch (value) {
|
|
100
100
|
case this.platform.Characteristic.RemoteKey.REWIND: {
|
|
101
101
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Set Remote Key Pressed: REWIND`);
|
|
@@ -158,37 +158,37 @@ class TV {
|
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
-
ActiveIdentifierSet(value) {
|
|
161
|
+
async ActiveIdentifierSet(value) {
|
|
162
162
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} ActiveIdentifier: ${value}`);
|
|
163
163
|
this.ActiveIdentifier = value;
|
|
164
164
|
}
|
|
165
|
-
ActiveSet(value) {
|
|
165
|
+
async ActiveSet(value) {
|
|
166
166
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${value}`);
|
|
167
167
|
if (!this.device.irtv?.disable_power) {
|
|
168
168
|
if (value === this.platform.Characteristic.Active.INACTIVE) {
|
|
169
|
-
this.pushTvOffChanges();
|
|
169
|
+
await this.pushTvOffChanges();
|
|
170
170
|
}
|
|
171
171
|
else {
|
|
172
|
-
this.pushTvOnChanges();
|
|
172
|
+
await this.pushTvOnChanges();
|
|
173
173
|
}
|
|
174
174
|
this.Active = value;
|
|
175
175
|
this.ActiveCached = this.Active;
|
|
176
176
|
this.accessory.context.Active = this.ActiveCached;
|
|
177
177
|
}
|
|
178
178
|
}
|
|
179
|
-
updateHomeKitCharacteristics() {
|
|
179
|
+
async updateHomeKitCharacteristics() {
|
|
180
180
|
if (this.Active === undefined) {
|
|
181
181
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Active: ${this.Active}`);
|
|
182
182
|
}
|
|
183
183
|
else {
|
|
184
|
-
this.
|
|
184
|
+
this.tvService?.updateCharacteristic(this.platform.Characteristic.Active, this.Active);
|
|
185
185
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Active}`);
|
|
186
186
|
}
|
|
187
187
|
if (this.ActiveIdentifier === undefined) {
|
|
188
188
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} ActiveIdentifier: ${this.ActiveIdentifier}`);
|
|
189
189
|
}
|
|
190
190
|
else {
|
|
191
|
-
this.
|
|
191
|
+
this.tvService?.updateCharacteristic(this.platform.Characteristic.ActiveIdentifier, this.ActiveIdentifier);
|
|
192
192
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName}` + ` updateCharacteristic ActiveIdentifier: ${this.ActiveIdentifier}`);
|
|
193
193
|
}
|
|
194
194
|
}
|
|
@@ -304,17 +304,14 @@ class TV {
|
|
|
304
304
|
}
|
|
305
305
|
catch (e) {
|
|
306
306
|
this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
307
|
-
if (this.deviceLogging
|
|
307
|
+
if (this.deviceLogging.includes('debug')) {
|
|
308
308
|
this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
|
|
309
309
|
` Error Message: ${JSON.stringify(e.message)}`);
|
|
310
310
|
}
|
|
311
|
-
if (this.platform.debugMode) {
|
|
312
|
-
this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
313
|
-
}
|
|
314
311
|
this.apiError(e);
|
|
315
312
|
}
|
|
316
313
|
}
|
|
317
|
-
statusCode(push) {
|
|
314
|
+
async statusCode(push) {
|
|
318
315
|
switch (push.data.statusCode) {
|
|
319
316
|
case 151:
|
|
320
317
|
this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} Command not supported by this device type.`);
|
|
@@ -343,12 +340,12 @@ class TV {
|
|
|
343
340
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Unknown statusCode.`);
|
|
344
341
|
}
|
|
345
342
|
}
|
|
346
|
-
apiError(e) {
|
|
347
|
-
this.
|
|
348
|
-
this.
|
|
343
|
+
async apiError(e) {
|
|
344
|
+
this.tvService.updateCharacteristic(this.platform.Characteristic.Active, e);
|
|
345
|
+
this.tvService.updateCharacteristic(this.platform.Characteristic.ActiveIdentifier, e);
|
|
349
346
|
//throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
|
|
350
347
|
}
|
|
351
|
-
config(device) {
|
|
348
|
+
async config(device) {
|
|
352
349
|
let config = {};
|
|
353
350
|
if (device.irtv) {
|
|
354
351
|
config = device.irtv;
|
|
@@ -357,10 +354,10 @@ class TV {
|
|
|
357
354
|
config['logging'] = device.logging;
|
|
358
355
|
}
|
|
359
356
|
if (Object.entries(config).length !== 0) {
|
|
360
|
-
this.
|
|
357
|
+
this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
361
358
|
}
|
|
362
359
|
}
|
|
363
|
-
logs(device) {
|
|
360
|
+
async logs(device) {
|
|
364
361
|
if (this.platform.debugMode) {
|
|
365
362
|
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
366
363
|
this.debugLog(`${this.device.remoteType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
@@ -407,7 +404,7 @@ class TV {
|
|
|
407
404
|
}
|
|
408
405
|
}
|
|
409
406
|
enablingDeviceLogging() {
|
|
410
|
-
return this.deviceLogging
|
|
407
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
411
408
|
}
|
|
412
409
|
}
|
|
413
410
|
exports.TV = TV;
|