@homebridge-plugins/homebridge-tuya 2.3.0-beta.6 → 2.3.0
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/ADVANCED_OPTIONS.md +17 -0
- package/CHANGELOG.md +31 -0
- package/README.md +2 -0
- package/config.schema.json +5 -85
- package/dist/accessory/AccessoryFactory.js +0 -1
- package/dist/accessory/AccessoryFactory.js.map +1 -1
- package/dist/accessory/BaseAccessory.js +1 -29
- package/dist/accessory/BaseAccessory.js.map +1 -1
- package/dist/accessory/GarageDoorAccessory.js +19 -2
- package/dist/accessory/GarageDoorAccessory.js.map +1 -1
- package/dist/accessory/SwitchAccessory.js +6 -3
- package/dist/accessory/SwitchAccessory.js.map +1 -1
- package/dist/accessory/characteristic/EnergyUsage.js.map +1 -1
- package/dist/accessory/characteristic/Name.js +10 -2
- package/dist/accessory/characteristic/Name.js.map +1 -1
- package/dist/accessory/characteristic/On.js +1 -1
- package/dist/accessory/characteristic/On.js.map +1 -1
- package/dist/config.js.map +1 -1
- package/dist/core/TuyaOpenAPI.js +2 -3
- package/dist/core/TuyaOpenAPI.js.map +1 -1
- package/dist/core/TuyaOpenMQ.js +2 -3
- package/dist/core/TuyaOpenMQ.js.map +1 -1
- package/dist/device/TuyaDeviceManager.js +2 -3
- package/dist/device/TuyaDeviceManager.js.map +1 -1
- package/dist/platform.js +4 -2
- package/dist/platform.js.map +1 -1
- package/dist/util/Logger.js +69 -9
- package/dist/util/Logger.js.map +1 -1
- package/dist/util/util.js +3 -32
- package/dist/util/util.js.map +1 -1
- package/package.json +5 -3
- package/dist/accessory/characteristic/EnumOn.js +0 -48
- package/dist/accessory/characteristic/EnumOn.js.map +0 -1
- package/dist/accessory/characteristic/ExtraCharacteristicAdapter.js +0 -197
- package/dist/accessory/characteristic/ExtraCharacteristicAdapter.js.map +0 -1
- package/dist/accessory/characteristic/RawOn.js +0 -93
- package/dist/accessory/characteristic/RawOn.js.map +0 -1
package/ADVANCED_OPTIONS.md
CHANGED
|
@@ -20,6 +20,7 @@ Before configuring, you may need to:
|
|
|
20
20
|
- `category` - **optional**: Device category code. See [SUPPORTED_DEVICES.md](./SUPPORTED_DEVICES.md). Also you can use `hidden` to hide the device, product, or scene. **⚠️Overriding this property may lead to unexpected behaviors and exceptions, so please remove the accessory cache after making changes.**
|
|
21
21
|
- `unbridged` - **optional**: Unbridge accessories. Defaults to `false`.
|
|
22
22
|
- `adaptiveLighting` - **optional**: Adaptive Lighting. Defaults to `false`. Not all light device support this feature, please use it on demand.
|
|
23
|
+
- `garageDoorUseContactSensorForState` - **optional**: For garage door controllers. When `true`, `CurrentDoorState` and `TargetDoorState` reads use `doorcontact_state` only, while set commands still use `switch_1`. Defaults to `false`.
|
|
23
24
|
- `schema` - **optional**: An array of schema overriding config objects, used for describing datapoint (DP). When your device has non-standard DP, you need to transform them manually with configuration. Each element in the schema array is described as follows:
|
|
24
25
|
- `code` - **required**: DP code.
|
|
25
26
|
- `newCode` - **optional**: New DP code.
|
|
@@ -94,6 +95,22 @@ An example of hide camera's floodlight (`floodlight_switch`):
|
|
|
94
95
|
}
|
|
95
96
|
```
|
|
96
97
|
|
|
98
|
+
### Use garage door contact sensor for state
|
|
99
|
+
|
|
100
|
+
Some `ckmkzq` garage door controllers keep `switch_1` as `true`, which can make HomeKit show the door as stuck Opening or Closing. Enable this per-device option to read the door state from `doorcontact_state`, while commands are still sent to `switch_1`.
|
|
101
|
+
|
|
102
|
+
```js
|
|
103
|
+
{
|
|
104
|
+
"options": {
|
|
105
|
+
// ...
|
|
106
|
+
"deviceOverrides": [{
|
|
107
|
+
"id": "{device_id}",
|
|
108
|
+
"garageDoorUseContactSensorForState": true
|
|
109
|
+
}]
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
```
|
|
113
|
+
|
|
97
114
|
|
|
98
115
|
### Offline as off
|
|
99
116
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [2.3.0] - (2026.6.12)
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
- Added an option to force communication over IPv4.
|
|
7
|
+
- Added contact sensor state option for garage doors
|
|
8
|
+
|
|
9
|
+
### Changed
|
|
10
|
+
- Updated the behavior so that sensitive data is not logged unless debugMode is enabled.
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
## [2.2.3] - (2026.5.8)
|
|
14
|
+
|
|
15
|
+
### Changed
|
|
16
|
+
- Updated so that switch names are not sanitized when the plugin restarts.
|
|
17
|
+
This prevents the plugin from unnecessarily updating the name set by the user in the Home app.
|
|
18
|
+
Since information from the Home app is not sent to the plugin, I recommend changing device names through the plugin settings to avoid unintended name updates.
|
|
19
|
+
- Fixed an issue where switch names were not being sanitized for devices that contain multiple switches.
|
|
20
|
+
This will suppress the Homebridge warning logs.
|
|
21
|
+
|
|
22
|
+
## [2.2.2] - (2026.4.8)
|
|
23
|
+
|
|
24
|
+
### Fixed
|
|
25
|
+
- Fix an issue where the Configured Name was sometimes not applied
|
|
26
|
+
|
|
27
|
+
## [2.2.1] - (2026.3.9)
|
|
28
|
+
|
|
29
|
+
### Fixed
|
|
30
|
+
- Homebridge V2: supported.
|
|
31
|
+
- Accessory names containing invalid characters are now automatically sanitized to be HomeKit-compliant. This prevents the "invalid 'ConfiguredName'" warning and reduces the risk of accessories failing to be added or becoming unresponsive in the Home app.
|
|
32
|
+
- Logging added to show when names are corrected.
|
|
33
|
+
|
|
3
34
|
## [2.2.0] - (2026.2.23)
|
|
4
35
|
|
|
5
36
|
### Fixed
|
package/README.md
CHANGED
|
@@ -107,6 +107,8 @@ Before you can configure, you must go to the [Tuya IoT Platform](https://iot.tuy
|
|
|
107
107
|
#### Advanced options
|
|
108
108
|
See [ADVANCED_OPTIONS.md](./ADVANCED_OPTIONS.md)
|
|
109
109
|
|
|
110
|
+
Garage door controllers that keep `switch_1=true` can opt in to contact-sensor-only state reads with `garageDoorUseContactSensorForState` in `options.deviceOverrides`. This keeps commands on `switch_1`, but reads HomeKit state from `doorcontact_state`.
|
|
111
|
+
|
|
110
112
|
|
|
111
113
|
## Limitations
|
|
112
114
|
- **⚠️Don't forget to extend the API trial period every 6 months. Maybe you can set up a reminder in calendar.**
|
package/config.schema.json
CHANGED
|
@@ -140,12 +140,12 @@
|
|
|
140
140
|
"functionBody": "return (model.options && model.options.deviceOverrides);"
|
|
141
141
|
}
|
|
142
142
|
},
|
|
143
|
-
"
|
|
144
|
-
"title": "
|
|
145
|
-
"description": "
|
|
143
|
+
"garageDoorUseContactSensorForState": {
|
|
144
|
+
"title": "Use Contact Sensor For Garage Door State",
|
|
145
|
+
"description": "For garage door controllers only. Derive CurrentDoorState and TargetDoorState reads from doorcontact_state instead of switch_1.",
|
|
146
146
|
"type": "boolean",
|
|
147
147
|
"condition": {
|
|
148
|
-
"functionBody": "return (model.options && model.options.deviceOverrides);"
|
|
148
|
+
"functionBody": "return (model.options && model.options.deviceOverrides && model.options.deviceOverrides[arrayIndices[0]].category === 'ckmkzq');"
|
|
149
149
|
}
|
|
150
150
|
},
|
|
151
151
|
"schema": {
|
|
@@ -269,63 +269,6 @@
|
|
|
269
269
|
"condition": {
|
|
270
270
|
"functionBody": "return (model.options && model.options.deviceOverrides);"
|
|
271
271
|
}
|
|
272
|
-
},
|
|
273
|
-
"extra": {
|
|
274
|
-
"title": "Extra",
|
|
275
|
-
"type": "boolean",
|
|
276
|
-
"description": "Treat as Extra Feature",
|
|
277
|
-
"condition": {
|
|
278
|
-
"functionBody": "return (model.options && model.options.deviceOverrides && model.options.deviceOverrides[arrayIndices[0]].schema);"
|
|
279
|
-
}
|
|
280
|
-
},
|
|
281
|
-
"extraRawSwitch": {
|
|
282
|
-
"title": "RawDataSwitches",
|
|
283
|
-
"type": "array",
|
|
284
|
-
"description": "Add switches for updating the byte‑code data.",
|
|
285
|
-
"condition": {
|
|
286
|
-
"functionBody": "return (model.options && model.options.deviceOverrides && model.options.deviceOverrides[arrayIndices[0]].schema && model.options.deviceOverrides[arrayIndices[0]].schema[arrayIndices[1]].type === 'Raw' && !model.options.deviceOverrides[arrayIndices[0]].schema[arrayIndices[1]].hidden && model.options.deviceOverrides[arrayIndices[0]].schema[arrayIndices[1]].extra);"
|
|
287
|
-
},
|
|
288
|
-
"items": {
|
|
289
|
-
"type": "object",
|
|
290
|
-
"required": ["configuredName", "notation", "value", "byteIndex"],
|
|
291
|
-
"properties": {
|
|
292
|
-
"configuredName": {
|
|
293
|
-
"title": "Name",
|
|
294
|
-
"type": "string"
|
|
295
|
-
},
|
|
296
|
-
"notation": {
|
|
297
|
-
"title": "Notation",
|
|
298
|
-
"type": "string",
|
|
299
|
-
"default": "base64",
|
|
300
|
-
"oneOf": [
|
|
301
|
-
{
|
|
302
|
-
"title": "Base64",
|
|
303
|
-
"enum": [
|
|
304
|
-
"base64"
|
|
305
|
-
]
|
|
306
|
-
},
|
|
307
|
-
{
|
|
308
|
-
"title": "Hexadecimal",
|
|
309
|
-
"enum": [
|
|
310
|
-
"hex"
|
|
311
|
-
]
|
|
312
|
-
}
|
|
313
|
-
]
|
|
314
|
-
},
|
|
315
|
-
"value": {
|
|
316
|
-
"title": "Value",
|
|
317
|
-
"type": "string",
|
|
318
|
-
"placeholder": "0x01",
|
|
319
|
-
"pattern": "^0x([0-9a-fA-F]{2})+$"
|
|
320
|
-
},
|
|
321
|
-
"byteIndex": {
|
|
322
|
-
"title": "ByteIndex",
|
|
323
|
-
"type": "integer",
|
|
324
|
-
"default": 0,
|
|
325
|
-
"minimum": 0
|
|
326
|
-
}
|
|
327
|
-
}
|
|
328
|
-
}
|
|
329
272
|
}
|
|
330
273
|
}
|
|
331
274
|
},
|
|
@@ -496,7 +439,7 @@
|
|
|
496
439
|
"key": "options.deviceOverrides[].unbridged"
|
|
497
440
|
},
|
|
498
441
|
{
|
|
499
|
-
"key": "options.deviceOverrides[].
|
|
442
|
+
"key": "options.deviceOverrides[].garageDoorUseContactSensorForState"
|
|
500
443
|
},
|
|
501
444
|
{
|
|
502
445
|
"key": "options.deviceOverrides[].schema",
|
|
@@ -521,9 +464,6 @@
|
|
|
521
464
|
{
|
|
522
465
|
"key": "options.deviceOverrides[].schema[].hidden"
|
|
523
466
|
},
|
|
524
|
-
{
|
|
525
|
-
"key": "options.deviceOverrides[].schema[].extra"
|
|
526
|
-
},
|
|
527
467
|
{
|
|
528
468
|
"key": "options.deviceOverrides[].schema[].type"
|
|
529
469
|
},
|
|
@@ -558,26 +498,6 @@
|
|
|
558
498
|
]
|
|
559
499
|
}
|
|
560
500
|
]
|
|
561
|
-
},
|
|
562
|
-
{
|
|
563
|
-
"key": "options.deviceOverrides[].schema[].extraRawSwitch",
|
|
564
|
-
"type": "array",
|
|
565
|
-
"items": [
|
|
566
|
-
{
|
|
567
|
-
"type": "fieldset",
|
|
568
|
-
"items": [
|
|
569
|
-
{ "key": "options.deviceOverrides[].schema[].extraRawSwitch[].configuredName" },
|
|
570
|
-
{
|
|
571
|
-
"type": "flex",
|
|
572
|
-
"flex-flow": "row wrap",
|
|
573
|
-
"items": [
|
|
574
|
-
{ "key": "options.deviceOverrides[].schema[].extraRawSwitch[].byteIndex", "flex-basis": "min-content" },
|
|
575
|
-
{ "key": "options.deviceOverrides[].schema[].extraRawSwitch[].value" }
|
|
576
|
-
]
|
|
577
|
-
}
|
|
578
|
-
]
|
|
579
|
-
}
|
|
580
|
-
]
|
|
581
501
|
}
|
|
582
502
|
]
|
|
583
503
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccessoryFactory.js","sourceRoot":"","sources":["../../src/accessory/AccessoryFactory.ts"],"names":[],"mappings":";;;;;AAIA,oEAA4C;AAC5C,uCAA4C;AAC5C,sEAA8C;AAC9C,wEAAgD;AAChD,wEAAgD;AAChD,wEAAgD;AAChD,wFAAgE;AAChE,kFAA0D;AAC1D,kEAA0C;AAC1C,gFAAwD;AACxD,wEAAgD;AAChD,wFAAgE;AAChE,oEAA4C;AAC5C,gFAAwD;AACxD,wEAAgD;AAChD,gFAAwD;AACxD,sEAA8C;AAC9C,sFAA8D;AAC9D,gFAAwD;AACxD,oGAA4E;AAC5E,kGAA0E;AAC1E,kFAA0D;AAC1D,8GAAsF;AACtF,kFAA0D;AAC1D,oFAA4D;AAC5D,4FAAoE;AACpE,kGAA0E;AAC1E,gFAAwD;AACxD,oFAA4D;AAC5D,4EAAoD;AACpD,kFAA0D;AAC1D,wFAAgE;AAChE,wEAAgD;AAChD,sEAA8C;AAC9C,wFAAgE;AAChE,oFAA4D;AAC5D,8EAAsD;AACtD,4FAAoE;AACpE,wFAAgE;AAChE,0FAAkE;AAClE,wFAAgE;AAChE,4EAAoD;AACpD,8EAAsD;AACtD,0FAAkE;AAClE,0GAAkF;AAClF,0FAAkE;AAClE,0FAAkE;AAClE,8EAAsD;AAGtD,MAAqB,gBAAgB;IACnC,MAAM,CAAC,eAAe,CACpB,QAAsB,EACtB,SAA4B,EAC5B,MAAkB;QAGlB,IAAI,OAAkC,CAAC;QAEvC,OAAO,GAAG,2BAA2B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC;eACxE,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEtE,0DAA0D;QAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,oBAAoB;YACpB,IAAI,MAAM,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBAC/B,QAAQ,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC;oBACxC,KAAK,CAAC,EAAE,KAAK;wBACX,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBACpD,OAAO,GAAG,IAAI,mCAAyB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;wBAC7D,MAAM;oBACR;wBACE,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;wBAC7C,OAAO,GAAG,IAAI,4BAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;wBACtD,MAAM;gBACV,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC;YAC5C,OAAO,GAAG,SAAS,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;YACzD,OAAO,GAAG,IAAI,uBAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAC5B,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAChC,OAAO,CAAC
|
|
1
|
+
{"version":3,"file":"AccessoryFactory.js","sourceRoot":"","sources":["../../src/accessory/AccessoryFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
|
|
|
8
8
|
const TuyaDevice_1 = require("../device/TuyaDevice");
|
|
9
9
|
const util_1 = require("../util/util");
|
|
10
10
|
const Logger_1 = require("../util/Logger");
|
|
11
|
-
const ExtraCharacteristicAdapter_1 = require("./characteristic/ExtraCharacteristicAdapter");
|
|
12
11
|
const MANUFACTURER = 'Tuya Inc.';
|
|
13
12
|
const SCHEMA_CODE = {
|
|
14
13
|
BATTERY_STATE: ['battery_state'],
|
|
@@ -29,11 +28,10 @@ class BaseAccessory {
|
|
|
29
28
|
this.Characteristic = this.platform.api.hap.Characteristic;
|
|
30
29
|
this.deviceManager = this.platform.deviceManager;
|
|
31
30
|
this.device = this.deviceManager.getDevice(this.accessory.context.deviceID);
|
|
32
|
-
this.log = new Logger_1.PrefixLogger(
|
|
31
|
+
this.log = new Logger_1.PrefixLogger((0, Logger_1.logger)(), this.device.name.length > 0 ? this.device.name : this.device.id, this.platform.options.debug && ((this.platform.options.debugLevel ?? '').length > 0
|
|
33
32
|
? this.platform.options.debugLevel?.includes(this.device.id)
|
|
34
33
|
: true));
|
|
35
34
|
this.intialized = false;
|
|
36
|
-
this.supportedDPs = new Set();
|
|
37
35
|
this.sendQueue = new Map();
|
|
38
36
|
this.debounceSendCommands = (0, debounce_1.debounce)(async () => {
|
|
39
37
|
const commands = [...this.sendQueue.values()];
|
|
@@ -150,7 +148,6 @@ class BaseAccessory {
|
|
|
150
148
|
this.log.warn('no status');
|
|
151
149
|
continue;
|
|
152
150
|
}
|
|
153
|
-
this.supportedDPs.add(schema.code);
|
|
154
151
|
return schema;
|
|
155
152
|
}
|
|
156
153
|
return undefined;
|
|
@@ -210,9 +207,6 @@ class BaseAccessory {
|
|
|
210
207
|
configureServices() {
|
|
211
208
|
//
|
|
212
209
|
}
|
|
213
|
-
configureDeviceSpecificFeatures() {
|
|
214
|
-
//
|
|
215
|
-
}
|
|
216
210
|
async onDeviceInfoUpdate(info) {
|
|
217
211
|
this.updateAllValues();
|
|
218
212
|
}
|
|
@@ -248,7 +242,6 @@ class OverridedBaseAccessory extends BaseAccessory {
|
|
|
248
242
|
if (!(0, lodash_isequal_1.default)(oldSchema, schema)) {
|
|
249
243
|
this.log.debug('Override schema %o => %o', oldSchema, schema);
|
|
250
244
|
}
|
|
251
|
-
this.supportedDPs.add(schema.code);
|
|
252
245
|
return schema;
|
|
253
246
|
}
|
|
254
247
|
getSchema(...codes) {
|
|
@@ -304,27 +297,6 @@ class OverridedBaseAccessory extends BaseAccessory {
|
|
|
304
297
|
}
|
|
305
298
|
await super.sendCommands(commands, debounce);
|
|
306
299
|
}
|
|
307
|
-
configureDeviceSpecificFeatures() {
|
|
308
|
-
const config = this.platform.getDeviceConfig(this.device);
|
|
309
|
-
this.supportedDPs.forEach(item => this.log.info(`supported dp:${item}`));
|
|
310
|
-
const includeExtraFeatures = new Array;
|
|
311
|
-
const isAuto = config && config.addExtraFeaturesAutomatically;
|
|
312
|
-
// Add a standard DP that needs to be treated as an Extra Feature
|
|
313
|
-
this.platform.getDeviceConfig(this.device)?.schema?.filter(item => item.extra).forEach(item => includeExtraFeatures.push(item.code));
|
|
314
|
-
for (const schema of this.device.schema) {
|
|
315
|
-
if (isAuto) {
|
|
316
|
-
(0, ExtraCharacteristicAdapter_1.configureExtraCharactersitcs)(this, schema);
|
|
317
|
-
includeExtraFeatures.splice(includeExtraFeatures.indexOf(schema.code), 1);
|
|
318
|
-
}
|
|
319
|
-
else {
|
|
320
|
-
if (includeExtraFeatures.includes(schema.code)) {
|
|
321
|
-
(0, ExtraCharacteristicAdapter_1.configureExtraCharactersitcs)(this, schema);
|
|
322
|
-
includeExtraFeatures.splice(includeExtraFeatures.indexOf(schema.code), 1);
|
|
323
|
-
}
|
|
324
|
-
}
|
|
325
|
-
}
|
|
326
|
-
includeExtraFeatures.forEach(item => this.log.warn(`Extra DP Code:${item} not found.`));
|
|
327
|
-
}
|
|
328
300
|
}
|
|
329
301
|
exports.default = OverridedBaseAccessory;
|
|
330
302
|
//# sourceMappingURL=BaseAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseAccessory.js","sourceRoot":"","sources":["../../src/accessory/BaseAccessory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BaseAccessory.js","sourceRoot":"","sources":["../../src/accessory/BaseAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,16 +20,25 @@ class GarageDoorAccessory extends BaseAccessory_1.default {
|
|
|
20
20
|
return this.accessory.getService(this.Service.GarageDoorOpener)
|
|
21
21
|
|| this.accessory.addService(this.Service.GarageDoorOpener);
|
|
22
22
|
}
|
|
23
|
+
useContactSensorForState() {
|
|
24
|
+
return this.platform.getDeviceConfig(this.device)?.garageDoorUseContactSensorForState === true;
|
|
25
|
+
}
|
|
23
26
|
configureCurrentDoorState() {
|
|
24
27
|
const { OPEN, CLOSED, OPENING, CLOSING, STOPPED } = this.Characteristic.CurrentDoorState;
|
|
25
28
|
this.mainService().getCharacteristic(this.Characteristic.CurrentDoorState)
|
|
26
29
|
.onGet(() => {
|
|
27
30
|
const currentSchema = this.getSchema(...SCHEMA_CODE.CURRENT_DOOR_STATE);
|
|
28
|
-
|
|
29
|
-
if (!currentSchema || !targetSchema) {
|
|
31
|
+
if (!currentSchema) {
|
|
30
32
|
return STOPPED;
|
|
31
33
|
}
|
|
32
34
|
const currentStatus = this.getStatus(currentSchema.code);
|
|
35
|
+
if (this.useContactSensorForState()) {
|
|
36
|
+
return currentStatus.value === false ? CLOSED : OPEN;
|
|
37
|
+
}
|
|
38
|
+
const targetSchema = this.getSchema(...SCHEMA_CODE.TARGET_DOOR_STATE);
|
|
39
|
+
if (!targetSchema) {
|
|
40
|
+
return STOPPED;
|
|
41
|
+
}
|
|
33
42
|
const targetStatus = this.getStatus(targetSchema.code);
|
|
34
43
|
if (currentStatus.value === true && targetStatus.value === true) {
|
|
35
44
|
return OPEN;
|
|
@@ -54,6 +63,14 @@ class GarageDoorAccessory extends BaseAccessory_1.default {
|
|
|
54
63
|
const { OPEN, CLOSED } = this.Characteristic.TargetDoorState;
|
|
55
64
|
this.mainService().getCharacteristic(this.Characteristic.TargetDoorState)
|
|
56
65
|
.onGet(() => {
|
|
66
|
+
if (this.useContactSensorForState()) {
|
|
67
|
+
const currentSchema = this.getSchema(...SCHEMA_CODE.CURRENT_DOOR_STATE);
|
|
68
|
+
if (!currentSchema) {
|
|
69
|
+
return CLOSED;
|
|
70
|
+
}
|
|
71
|
+
const currentStatus = this.getStatus(currentSchema.code);
|
|
72
|
+
return currentStatus.value === false ? CLOSED : OPEN;
|
|
73
|
+
}
|
|
57
74
|
const status = this.getStatus(schema.code);
|
|
58
75
|
return status.value ? OPEN : CLOSED;
|
|
59
76
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GarageDoorAccessory.js","sourceRoot":"","sources":["../../src/accessory/GarageDoorAccessory.ts"],"names":[],"mappings":";;;;;AAAA,oEAA4C;AAE5C,MAAM,WAAW,GAAG;IAClB,kBAAkB,EAAE,CAAC,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,CAAC,UAAU,CAAC;CAChC,CAAC;AAEF,MAAqB,mBAAoB,SAAQ,uBAAa;IAE5D,cAAc;QACZ,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB;
|
|
1
|
+
{"version":3,"file":"GarageDoorAccessory.js","sourceRoot":"","sources":["../../src/accessory/GarageDoorAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const On_1 = require("./characteristic/On");
|
|
|
10
10
|
const EnergyUsage_1 = require("./characteristic/EnergyUsage");
|
|
11
11
|
const CurrentTemperature_1 = require("./characteristic/CurrentTemperature");
|
|
12
12
|
const CurrentRelativeHumidity_1 = require("./characteristic/CurrentRelativeHumidity");
|
|
13
|
+
const util_1 = require("../util/util");
|
|
13
14
|
const SCHEMA_CODE = {
|
|
14
15
|
ON: ['switch', 'switch_1'], // switch_2, switch_3, switch_4, ..., switch_usb1, switch_usb2, switch_usb3, ..., switch_backlight
|
|
15
16
|
CURRENT: ['cur_current'],
|
|
@@ -44,9 +45,11 @@ class SwitchAccessory extends BaseAccessory_1.default {
|
|
|
44
45
|
return this.Service.Switch;
|
|
45
46
|
}
|
|
46
47
|
configureSwitch(schema, name) {
|
|
48
|
+
// Since switches exceptionally accept a name as a parameter, the value needs to be sanitized.
|
|
49
|
+
const sanitizedName = (0, util_1.sanitizeName)(name) ?? name;
|
|
47
50
|
const service = this.accessory.getService(schema.code)
|
|
48
|
-
|| this.accessory.addService(this.mainService(),
|
|
49
|
-
(0, Name_1.configureName)(this, service,
|
|
51
|
+
|| this.accessory.addService(this.mainService(), sanitizedName, schema.code);
|
|
52
|
+
(0, Name_1.configureName)(this, service, sanitizedName);
|
|
50
53
|
(0, On_1.configureOn)(this, service, schema);
|
|
51
54
|
if (schema.code === this.getSchema(...SCHEMA_CODE.ON)?.code) {
|
|
52
55
|
(0, EnergyUsage_1.configureEnergyUsage)(this.platform.api, this, service, this.getSchema(...SCHEMA_CODE.CURRENT), this.getSchema(...SCHEMA_CODE.POWER), this.getSchema(...SCHEMA_CODE.VOLTAGE), this.getSchema(...SCHEMA_CODE.TOTAL_POWER));
|
|
@@ -57,7 +60,7 @@ class SwitchAccessory extends BaseAccessory_1.default {
|
|
|
57
60
|
if (!schema || schema.type !== TuyaDevice_1.TuyaDeviceSchemaType.String) {
|
|
58
61
|
return;
|
|
59
62
|
}
|
|
60
|
-
const service = this.accessory.
|
|
63
|
+
const service = this.accessory.getService(schema.code)
|
|
61
64
|
|| this.accessory.addService(this.Service.Switch, schema.code, schema.code);
|
|
62
65
|
(0, Name_1.configureName)(this, service, schema.code);
|
|
63
66
|
service.getCharacteristic(this.Characteristic.On)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchAccessory.js","sourceRoot":"","sources":["../../src/accessory/SwitchAccessory.ts"],"names":[],"mappings":";;;;;AAAA,qDAA8E;AAC9E,oEAA4C;AAC5C,gDAAsD;AACtD,4CAAkD;AAClD,8DAAoE;AACpE,4EAAkF;AAClF,sFAA4F;
|
|
1
|
+
{"version":3,"file":"SwitchAccessory.js","sourceRoot":"","sources":["../../src/accessory/SwitchAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnergyUsage.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/EnergyUsage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"EnergyUsage.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/EnergyUsage.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,16 @@ function configureName(accessory, service, name) {
|
|
|
8
8
|
service.setCharacteristic(accessory.Characteristic.Name, safeName);
|
|
9
9
|
if (!service.testCharacteristic(accessory.Characteristic.ConfiguredName)) {
|
|
10
10
|
service.addOptionalCharacteristic(accessory.Characteristic.ConfiguredName); // silence warning
|
|
11
|
+
// update every time so cached invalid names get corrected on restart
|
|
12
|
+
service.setCharacteristic(accessory.Characteristic.ConfiguredName, safeName);
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
// cached Name
|
|
16
|
+
const currentName = service.getCharacteristic(accessory.Characteristic.ConfiguredName).value;
|
|
17
|
+
// Since unnecessary value updates were overwriting the name set in the Home app, it will now be updated only once—the first time.
|
|
18
|
+
if (!currentName) {
|
|
19
|
+
service.setCharacteristic(accessory.Characteristic.ConfiguredName, safeName);
|
|
20
|
+
}
|
|
11
21
|
}
|
|
12
|
-
// update every time so cached invalid names get corrected on restart
|
|
13
|
-
service.setCharacteristic(accessory.Characteristic.ConfiguredName, safeName);
|
|
14
22
|
}
|
|
15
23
|
//# sourceMappingURL=Name.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Name.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/Name.ts"],"names":[],"mappings":";;AAIA,
|
|
1
|
+
{"version":3,"file":"Name.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/Name.ts"],"names":[],"mappings":";;AAIA,sCAiBC;AAnBD,0CAA+C;AAE/C,SAAgB,aAAa,CAAC,SAAwB,EAAE,OAAgB,EAAE,IAAY;IACpF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACxF,MAAM,QAAQ,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,CAAC;IAExE,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACnE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,CAAC;QACzE,OAAO,CAAC,yBAAyB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB;QAC9F,qEAAqE;QACrE,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC;SAAM,CAAC;QACN,cAAc;QACd,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;QAC7F,kIAAkI;QAClI,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ function configureOn(accessory, service, schema) {
|
|
|
6
6
|
return;
|
|
7
7
|
}
|
|
8
8
|
if (!service) {
|
|
9
|
-
service = accessory.accessory.
|
|
9
|
+
service = accessory.accessory.getService(schema.code)
|
|
10
10
|
|| accessory.accessory.addService(accessory.Service.Switch, schema.code, schema.code);
|
|
11
11
|
}
|
|
12
12
|
service.getCharacteristic(accessory.Characteristic.On)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"On.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/On.ts"],"names":[],"mappings":";;AAIA,kCAsBC;AAtBD,SAAgB,WAAW,CAAC,SAAwB,EAAE,OAAiB,EAAE,MAAyB;IAChG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"On.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/On.ts"],"names":[],"mappings":";;AAIA,kCAsBC;AAtBD,SAAgB,WAAW,CAAC,SAAwB,EAAE,OAAiB,EAAE,MAAyB;IAChG,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;eAChD,SAAS,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;SACnD,KAAK,CAAC,GAAG,EAAE;QACV,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,OAAO,MAAM,CAAC,KAAgB,CAAC;IACjC,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;gBAC5B,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,KAAK,EAAE,KAAgB;aACxB,CAAC,EAAE,IAAI,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;AAwEa,QAAA,mBAAmB,GAAG;IACjC,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC3D,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QACpC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KACjC;CACF,CAAC;AAEW,QAAA,iBAAiB,GAAG;IAC/B,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC7C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE;QAC3C,WAAW,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;QAChE,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC5C,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;QAC/C,aAAa,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QAClC,eAAe,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QACpC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;KACjC;CACF,CAAC"}
|
package/dist/core/TuyaOpenAPI.js
CHANGED
|
@@ -61,18 +61,17 @@ const ipv4Agent = new https_1.default.Agent({
|
|
|
61
61
|
});
|
|
62
62
|
class TuyaOpenAPI {
|
|
63
63
|
static { this.Endpoints = Endpoints; }
|
|
64
|
-
constructor(endpoint, accessId, accessKey,
|
|
64
|
+
constructor(endpoint, accessId, accessKey, lang = 'en', debug = false, forceIPv4 = false) {
|
|
65
65
|
this.endpoint = endpoint;
|
|
66
66
|
this.accessId = accessId;
|
|
67
67
|
this.accessKey = accessKey;
|
|
68
|
-
this.log = log;
|
|
69
68
|
this.lang = lang;
|
|
70
69
|
this.debug = debug;
|
|
71
70
|
this.forceIPv4 = forceIPv4;
|
|
72
71
|
this.assetIDArr = [];
|
|
73
72
|
this.deviceArr = [];
|
|
74
73
|
this.tokenInfo = { access_token: '', refresh_token: '', uid: '', expire: 0 };
|
|
75
|
-
this.log = new Logger_1.PrefixLogger(
|
|
74
|
+
this.log = new Logger_1.PrefixLogger((0, Logger_1.logger)(), TuyaOpenAPI.name, debug);
|
|
76
75
|
}
|
|
77
76
|
static getDefaultEndpoint(countryCode) {
|
|
78
77
|
for (const endpoint of Object.keys(DEFAULT_ENDPOINTS)) {
|