@homebridge-plugins/homebridge-tuya 2.7.1-beta.0 → 2.7.1-beta.10
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/SmokeSensorAccessory.js +90 -10
- package/dist/accessory/SmokeSensorAccessory.js.map +1 -1
- package/dist/accessory/WindowCoveringAccessory.js +149 -3
- package/dist/accessory/WindowCoveringAccessory.js.map +1 -1
- package/dist/accessory/characteristic/CurrentPosition.js +19 -14
- package/dist/accessory/characteristic/CurrentPosition.js.map +1 -1
- package/dist/accessory/characteristic/Light.js +4 -25
- package/dist/accessory/characteristic/Light.js.map +1 -1
- package/dist/accessory/characteristic/ObstructionDetected.js +17 -0
- package/dist/accessory/characteristic/ObstructionDetected.js.map +1 -0
- package/dist/accessory/characteristic/PositionState.js +4 -3
- package/dist/accessory/characteristic/PositionState.js.map +1 -1
- package/dist/accessory/characteristic/RotationSpeed.js +12 -7
- package/dist/accessory/characteristic/RotationSpeed.js.map +1 -1
- package/dist/accessory/characteristic/TargetPosition.js +9 -6
- package/dist/accessory/characteristic/TargetPosition.js.map +1 -1
- package/package.json +1 -1
- package/test/accessory/rotationSpeed.test.ts +8 -3
- package/test/accessory/smokeSensorAccessory.test.ts +215 -0
- package/test/Light.test.ts +0 -186
|
@@ -4,9 +4,9 @@ exports.ControlRange = void 0;
|
|
|
4
4
|
exports.configurePositionState = configurePositionState;
|
|
5
5
|
exports.configurePositionStateByPosition = configurePositionStateByPosition;
|
|
6
6
|
exports.ControlRange = {
|
|
7
|
-
Open: ['open', 'ZZ'],
|
|
7
|
+
Open: ['opening', 'open', 'ZZ'],
|
|
8
8
|
Stop: ['stop', 'STOP'],
|
|
9
|
-
Close: ['close', 'FZ'],
|
|
9
|
+
Close: ['closing', 'close', 'FZ'],
|
|
10
10
|
Continue: ['continue'],
|
|
11
11
|
};
|
|
12
12
|
function configurePositionState(accessory, service, stateSchema) {
|
|
@@ -33,10 +33,11 @@ function configurePositionState(accessory, service, stateSchema) {
|
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
|
-
function configurePositionStateByPosition(accessory, service, currentPositionSchema, targetPositionSchema
|
|
36
|
+
function configurePositionStateByPosition(accessory, service, currentPositionSchema, targetPositionSchema) {
|
|
37
37
|
const { DECREASING, INCREASING, STOPPED } = accessory.Characteristic.PositionState;
|
|
38
38
|
service.getCharacteristic(accessory.Characteristic.PositionState)
|
|
39
39
|
.onGet(() => {
|
|
40
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
40
41
|
if (!currentPositionSchema || !targetPositionSchema) {
|
|
41
42
|
return STOPPED;
|
|
42
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":";;;AAWA,
|
|
1
|
+
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,14 @@ exports.integerToPercentageProperty = integerToPercentageProperty;
|
|
|
6
6
|
exports.enumToPercentageProperty = enumToPercentageProperty;
|
|
7
7
|
const TuyaDevice_1 = require("../../device/TuyaDevice");
|
|
8
8
|
const util_1 = require("../../util/util");
|
|
9
|
+
// Used to determine whether a STOPPED status code is included.
|
|
10
|
+
const StopCodes = ['stop', '0', 'closed', 'level_0'];
|
|
9
11
|
function configureRotationSpeed(accessory, service, schema) {
|
|
10
12
|
if (!schema) {
|
|
11
13
|
return;
|
|
12
14
|
}
|
|
13
15
|
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
14
|
-
configureRotationSpeedEnum(accessory, service, schema, ['auto']);
|
|
16
|
+
configureRotationSpeedEnum(accessory, service, schema, ['auto', 'smart']);
|
|
15
17
|
}
|
|
16
18
|
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
17
19
|
configureRotationSpeedInteger(accessory, service, schema);
|
|
@@ -67,11 +69,12 @@ function configureRotationSpeedEnum(accessory, service, schema, ignoreValues) {
|
|
|
67
69
|
range.push(value);
|
|
68
70
|
}
|
|
69
71
|
cloneProperty.range = range;
|
|
70
|
-
const
|
|
72
|
+
const includesStopCode = StopCodes.some(value => range.includes(value));
|
|
73
|
+
const rotationSpeedProperty = enumToPercentageProperty(cloneProperty, includesStopCode);
|
|
71
74
|
const onGetHandler = () => {
|
|
72
75
|
const status = accessory.getStatus(schema.code);
|
|
73
76
|
const index = range.indexOf(status.value);
|
|
74
|
-
const level = index + 1;
|
|
77
|
+
const level = includesStopCode ? index : index + 1;
|
|
75
78
|
const hapValue = level * rotationSpeedProperty.minStep;
|
|
76
79
|
accessory.log.debug(`(get) value from device: ${status.value} (${typeof status.value})`);
|
|
77
80
|
accessory.log.debug(`to home app: ${hapValue} (${typeof hapValue})`);
|
|
@@ -85,7 +88,9 @@ function configureRotationSpeedEnum(accessory, service, schema, ignoreValues) {
|
|
|
85
88
|
if (!Number.isFinite(percent) || percent <= 0) {
|
|
86
89
|
return;
|
|
87
90
|
}
|
|
88
|
-
const
|
|
91
|
+
const level = Math.floor(percent / rotationSpeedProperty.minStep);
|
|
92
|
+
const index = includesStopCode ? level : level - 1;
|
|
93
|
+
const speed = cloneProperty.range[index];
|
|
89
94
|
accessory.log.debug(`(set) value from Home app: ${value} (${typeof value})`);
|
|
90
95
|
accessory.log.debug(`to device: ${speed} (${typeof speed})`);
|
|
91
96
|
await accessory.sendCommands([{ code: schema.code, value: speed }], true);
|
|
@@ -150,11 +155,11 @@ function integerToPercentageProperty(property) {
|
|
|
150
155
|
else {
|
|
151
156
|
stepCount = Math.min(100, Math.ceil((hapProperty.maxValue - hapProperty.minValue) / hapProperty.minStep) + 1);
|
|
152
157
|
}
|
|
153
|
-
return { minValue: 0, maxValue: 100, minStep:
|
|
158
|
+
return { minValue: 0, maxValue: 100, minStep: Number((100 / stepCount).toFixed(1)), unit: '%' };
|
|
154
159
|
}
|
|
155
|
-
function enumToPercentageProperty(property) {
|
|
160
|
+
function enumToPercentageProperty(property, includesStopCode) {
|
|
156
161
|
const min = 0;
|
|
157
|
-
const max = property.range.length;
|
|
162
|
+
const max = includesStopCode ? property.range.length - 1 : property.range.length;
|
|
158
163
|
const step = 1;
|
|
159
164
|
return integerToPercentageProperty({ min: min, max: max, step: step, scale: 0, unit: '%' });
|
|
160
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":";;AAaA,wDAiBC;AAgGD,kEA4CC;AAuBD,kEASC;AAED,4DAKC;AAhND,wDAKiC;AACjC,0CAAuD;AAGvD,+DAA+D;AAC/D,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAU,CAAC;AAE9D,SAAgB,sBAAsB,CACpC,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAGzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,IAAI,EAAE,CAAC;QAC9C,0BAA0B,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,OAAO,EAAE,CAAC;QACxD,6BAA6B,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,wBAAwB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CACpC,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAEzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA2C,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,oBAAa,EAAC,QAAQ,CAA6C,CAAC;IACxF,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAEpE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAe,GAAG,QAAQ,CAAC;QAChD,IAAI,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC,OAAQ,CAAC,CAAC;QACrE,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,GAAG,qBAAqB,CAAC,OAAQ,CAAC;QACxD,OAAO,IAAA,YAAK,EAAC,QAAQ,EAAE,qBAAqB,CAAC,QAAS,EAAE,qBAAqB,CAAC,QAAS,CAAC,CAAC;IAC3F,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;IAC3E,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAQ,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAC,OAAQ,GAAG,QAAQ,CAAC;QACzD,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC;SAC3B,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,0BAA0B,CACjC,SAAwB,EACxB,OAAgB,EAChB,MAAyB,EACzB,YAAuB;IAEvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAwC,CAAC;IACjE,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IACD,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5B,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAExF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,KAAK,GAAG,qBAAqB,CAAC,OAAQ,CAAC;QACxD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,MAAM,CAAC,KAAK,KAAK,OAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACzF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,QAAQ,KAAK,OAAO,QAAQ,GAAG,CAAC,CAAC;QACrE,OAAO,IAAA,YAAK,EAAC,QAAQ,EAAE,qBAAqB,CAAC,QAAS,EAAE,qBAAqB,CAAC,QAAS,CAAC,CAAC;IAC3F,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;IAC3E,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAQ,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,KAAK,KAAK,OAAO,KAAK,GAAG,CAAC,CAAC;QAC7E,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,KAAK,KAAK,OAAO,KAAK,GAAG,CAAC,CAAC;QAC7D,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC;SAC3B,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,2BAA2B,CACzC,SAAwB,EACxB,OAAgB,EAChB,MAAyB,EACzB,YAAuB;IAGvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAwC,CAAC;IACjE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC;QACpD,OAAO,IAAA,YAAK,EAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAe,GAAG,CAAC,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACvC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3C,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,+CAA+C;SAC3E,QAAQ,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,wBAAwB,CAC/B,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAGzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACtE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAE3D,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,OAAQ,MAAM,CAAC,KAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC;SACD,QAAQ,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,2BAA2B,CAAC,QAAyC;IACnF,MAAM,WAAW,GAAG,IAAA,oBAAa,EAAC,QAAQ,CAA6C,CAAC;IACxF,IAAI,SAAgB,CAAC;IACrB,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC/B,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAS,GAAG,WAAW,CAAC,OAAQ,CAAC,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,QAAS,GAAG,WAAW,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AAClG,CAAC;AAED,SAAgB,wBAAwB,CAAC,QAAsC,EAAE,gBAAyB;IACxG,MAAM,GAAG,GAAG,CAAC,CAAC;IACd,MAAM,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;IACjF,MAAM,IAAI,GAAG,CAAC,CAAC;IACf,OAAO,2BAA2B,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;AAC9F,CAAC"}
|
|
@@ -5,31 +5,32 @@ const TuyaDevice_1 = require("../../device/TuyaDevice");
|
|
|
5
5
|
const PositionState_1 = require("./PositionState");
|
|
6
6
|
const CurrentPosition_1 = require("./CurrentPosition");
|
|
7
7
|
const util_1 = require("../../util/util");
|
|
8
|
-
function configureTargetPosition(accessory, service, schema
|
|
8
|
+
function configureTargetPosition(accessory, service, schema) {
|
|
9
9
|
if (!schema) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
13
|
-
return _configureTargetPosition(accessory, service, schema
|
|
13
|
+
return _configureTargetPosition(accessory, service, schema);
|
|
14
14
|
}
|
|
15
15
|
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
16
16
|
accessory.log.warn('_configureTargetPositionByPositionState');
|
|
17
|
-
return _configureTargetPositionByPositionState(accessory, service, schema
|
|
17
|
+
return _configureTargetPositionByPositionState(accessory, service, schema);
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
20
|
// nop
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
function _configureTargetPosition(accessory, service, percentSchema
|
|
24
|
+
function _configureTargetPosition(accessory, service, percentSchema) {
|
|
25
25
|
if (!percentSchema) {
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
const hapProps = (0, util_1.toHapProperty)(percentSchema.property);
|
|
29
|
-
const onGet = (0, CurrentPosition_1.onGetPositionHandler)(accessory, percentSchema
|
|
29
|
+
const onGet = (0, CurrentPosition_1.onGetPositionHandler)(accessory, percentSchema);
|
|
30
30
|
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
31
31
|
.onGet(onGet)
|
|
32
32
|
.onSet(async (value) => {
|
|
33
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
33
34
|
if (invert) {
|
|
34
35
|
await accessory.sendCommands([{ code: percentSchema.code, value: (100 - value) }], true);
|
|
35
36
|
}
|
|
@@ -39,7 +40,7 @@ function _configureTargetPosition(accessory, service, percentSchema, invert) {
|
|
|
39
40
|
})
|
|
40
41
|
.setProps(hapProps);
|
|
41
42
|
}
|
|
42
|
-
function _configureTargetPositionByPositionState(accessory, service, controlSchema
|
|
43
|
+
function _configureTargetPositionByPositionState(accessory, service, controlSchema) {
|
|
43
44
|
if (!controlSchema) {
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
@@ -51,6 +52,7 @@ function _configureTargetPositionByPositionState(accessory, service, controlSche
|
|
|
51
52
|
}
|
|
52
53
|
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
53
54
|
.onGet(() => {
|
|
55
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
54
56
|
const status = accessory.getStatus(controlSchema.code);
|
|
55
57
|
if (PositionState_1.ControlRange.Close.includes(status.value)) {
|
|
56
58
|
return invert ? 100 : 0;
|
|
@@ -68,6 +70,7 @@ function _configureTargetPositionByPositionState(accessory, service, controlSche
|
|
|
68
70
|
return 50;
|
|
69
71
|
})
|
|
70
72
|
.onSet(async (value) => {
|
|
73
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
71
74
|
let control;
|
|
72
75
|
const index = isOldSchema ? 1 : 0;
|
|
73
76
|
const normalizedValue = invert ? 100 - value : value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TargetPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/TargetPosition.ts"],"names":[],"mappings":";;AAOA,0DAmBC;AAzBD,wDAA+G;AAE/G,mDAA+C;AAC/C,uDAAyD;AACzD,0CAAgD;AAEhD,SAAgB,uBAAuB,CACrC,SAAwB,EACxB,OAAgB,EAChB,MAAyB
|
|
1
|
+
{"version":3,"file":"TargetPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/TargetPosition.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@homebridge-plugins/homebridge-tuya",
|
|
3
3
|
"displayName": "Homebridge Tuya",
|
|
4
|
-
"version": "2.7.1-beta.
|
|
4
|
+
"version": "2.7.1-beta.10",
|
|
5
5
|
"description": "Forked from 0x5e/homebridge-tuya-platform, with a focus on fixing bugs and adding new device support.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|
|
@@ -70,14 +70,19 @@ describe('convert property', () => {
|
|
|
70
70
|
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
71
71
|
});
|
|
72
72
|
|
|
73
|
-
test('integerToPercentageProperty returns 33% steps for 0..3 levels', () => {
|
|
73
|
+
test('integerToPercentageProperty returns 33.3% steps for 0..3 levels', () => {
|
|
74
74
|
const property = { min: 0, max: 3, step: 1, scale: 0, unit: '' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
75
|
-
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 33, unit: '%' });
|
|
75
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 33.3, unit: '%' });
|
|
76
76
|
});
|
|
77
77
|
|
|
78
78
|
test('enumToPercentageProperty returns 25% steps for 4 enum values', () => {
|
|
79
79
|
const property = { range: ['low', 'medium', 'high', 'auto'] } as unknown as TuyaDeviceSchemaEnumProperty;
|
|
80
|
-
expect(enumToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
80
|
+
expect(enumToPercentageProperty(property, false)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
test('enumToPercentageProperty returns 25% steps for 5 enum values(including stop code)', () => {
|
|
84
|
+
const property = { range: ['stop', 'low', 'medium', 'high', 'auto'] } as unknown as TuyaDeviceSchemaEnumProperty;
|
|
85
|
+
expect(enumToPercentageProperty(property, true)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
81
86
|
});
|
|
82
87
|
|
|
83
88
|
});
|
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
+
import { describe, expect, test, beforeEach, jest } from '@jest/globals';
|
|
3
|
+
|
|
4
|
+
import SmokeSensorAccessory from '../../src/accessory/SmokeSensorAccessory';
|
|
5
|
+
import TuyaDevice, { TuyaDeviceSchemaMode, TuyaDeviceSchemaType } from '../../src/device/TuyaDevice';
|
|
6
|
+
import { initLogger } from '../../src/util/Logger';
|
|
7
|
+
|
|
8
|
+
// HAP constants, mirroring the real values.
|
|
9
|
+
const SmokeDetected = { SMOKE_NOT_DETECTED: 0, SMOKE_DETECTED: 1 };
|
|
10
|
+
const CarbonMonoxideDetected = { CO_LEVELS_NORMAL: 0, CO_LEVELS_ABNORMAL: 1 };
|
|
11
|
+
const StatusLowBattery = { BATTERY_LEVEL_NORMAL: 0, BATTERY_LEVEL_LOW: 1 };
|
|
12
|
+
const StatusFault = { NO_FAULT: 0, GENERAL_FAULT: 1 };
|
|
13
|
+
|
|
14
|
+
const enumSchema = (code: string, range: string[]) => ({
|
|
15
|
+
code,
|
|
16
|
+
mode: TuyaDeviceSchemaMode.READ_ONLY,
|
|
17
|
+
type: TuyaDeviceSchemaType.Enum,
|
|
18
|
+
property: { range },
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
// Schema of a combo smoke + CO detector reported as category `ywbj`.
|
|
22
|
+
const COMBO_SCHEMA = [
|
|
23
|
+
enumSchema('smoke_sensor_state', ['alarm', 'normal']),
|
|
24
|
+
enumSchema('checking_result', ['checking', 'check_success', 'check_failure']),
|
|
25
|
+
{ code: 'fault', mode: TuyaDeviceSchemaMode.READ_ONLY, type: 'Bitmap' as any, property: { label: ['fault'] } },
|
|
26
|
+
enumSchema('battery_state', ['low', 'middle', 'high']),
|
|
27
|
+
enumSchema('co_state', ['alarm', 'normal']),
|
|
28
|
+
{ code: 'mute', mode: TuyaDeviceSchemaMode.READ_WRITE, type: TuyaDeviceSchemaType.Boolean, property: {} },
|
|
29
|
+
];
|
|
30
|
+
|
|
31
|
+
const NORMAL_STATUS = [
|
|
32
|
+
{ code: 'smoke_sensor_state', value: 'normal' },
|
|
33
|
+
{ code: 'checking_result', value: 'check_success' },
|
|
34
|
+
{ code: 'fault', value: 0 },
|
|
35
|
+
{ code: 'battery_state', value: 'high' },
|
|
36
|
+
{ code: 'co_state', value: 'normal' },
|
|
37
|
+
{ code: 'mute', value: false },
|
|
38
|
+
];
|
|
39
|
+
|
|
40
|
+
describe('SmokeSensorAccessory', () => {
|
|
41
|
+
|
|
42
|
+
let services: any[];
|
|
43
|
+
let mockAccessory: any;
|
|
44
|
+
let mockPlatform: any;
|
|
45
|
+
let device: TuyaDevice;
|
|
46
|
+
|
|
47
|
+
const makeService = (type: any) => {
|
|
48
|
+
const characteristics = new Map<any, any>();
|
|
49
|
+
return {
|
|
50
|
+
UUID: type,
|
|
51
|
+
displayName: `${type}`,
|
|
52
|
+
subtype: undefined,
|
|
53
|
+
characteristics: [] as any[],
|
|
54
|
+
getCharacteristic: jest.fn(function(this: any, characteristicType: any) {
|
|
55
|
+
let characteristic = characteristics.get(characteristicType);
|
|
56
|
+
if (!characteristic) {
|
|
57
|
+
characteristic = {
|
|
58
|
+
type: characteristicType,
|
|
59
|
+
value: null,
|
|
60
|
+
getHandler: undefined,
|
|
61
|
+
onGet: jest.fn((handler: any) => (characteristic.getHandler = handler, characteristic)),
|
|
62
|
+
onSet: jest.fn(() => characteristic),
|
|
63
|
+
setProps: jest.fn(() => characteristic),
|
|
64
|
+
updateValue: jest.fn((value: any) => (characteristic.value = value, characteristic)),
|
|
65
|
+
};
|
|
66
|
+
characteristics.set(characteristicType, characteristic);
|
|
67
|
+
this.characteristics.push(characteristic);
|
|
68
|
+
}
|
|
69
|
+
return characteristic;
|
|
70
|
+
}),
|
|
71
|
+
setCharacteristic: jest.fn(function(this: any) {
|
|
72
|
+
return this;
|
|
73
|
+
}),
|
|
74
|
+
addOptionalCharacteristic: jest.fn(),
|
|
75
|
+
testCharacteristic: jest.fn(() => true),
|
|
76
|
+
};
|
|
77
|
+
};
|
|
78
|
+
|
|
79
|
+
const createDevice = (schema: any[], status: any[]) => new TuyaDevice({
|
|
80
|
+
id: 'smoke-device-id',
|
|
81
|
+
uuid: 'smoke-uuid',
|
|
82
|
+
name: 'Smoke and CO alarm',
|
|
83
|
+
online: true,
|
|
84
|
+
owner_id: 'owner-1',
|
|
85
|
+
product_id: 'smoke-co-product',
|
|
86
|
+
product_name: 'Smoke and CO alarm',
|
|
87
|
+
category: 'ywbj',
|
|
88
|
+
sub: false,
|
|
89
|
+
schema,
|
|
90
|
+
status,
|
|
91
|
+
} as any);
|
|
92
|
+
|
|
93
|
+
beforeEach(() => {
|
|
94
|
+
services = [];
|
|
95
|
+
|
|
96
|
+
const hap = {
|
|
97
|
+
Service: {
|
|
98
|
+
SmokeSensor: 'SmokeSensor',
|
|
99
|
+
CarbonMonoxideSensor: 'CarbonMonoxideSensor',
|
|
100
|
+
AccessoryInformation: 'AccessoryInformation',
|
|
101
|
+
Battery: 'Battery',
|
|
102
|
+
},
|
|
103
|
+
Characteristic: {
|
|
104
|
+
SmokeDetected,
|
|
105
|
+
CarbonMonoxideDetected,
|
|
106
|
+
CarbonMonoxideLevel: 'CarbonMonoxideLevel',
|
|
107
|
+
StatusLowBattery,
|
|
108
|
+
StatusFault,
|
|
109
|
+
ChargingState: { NOT_CHARGING: 0, CHARGING: 1 },
|
|
110
|
+
BatteryLevel: 'BatteryLevel',
|
|
111
|
+
StatusActive: 'StatusActive',
|
|
112
|
+
Manufacturer: 'Manufacturer',
|
|
113
|
+
Model: 'Model',
|
|
114
|
+
Name: 'Name',
|
|
115
|
+
ConfiguredName: 'ConfiguredName',
|
|
116
|
+
SerialNumber: 'SerialNumber',
|
|
117
|
+
ProgrammableSwitchEvent: { UUID: 'ProgrammableSwitchEvent' },
|
|
118
|
+
},
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
const noop = () => undefined;
|
|
122
|
+
mockPlatform = {
|
|
123
|
+
api: { hap },
|
|
124
|
+
options: { debug: false },
|
|
125
|
+
deviceManager: { getDevice: jest.fn(() => device), sendCommands: jest.fn() },
|
|
126
|
+
getDeviceConfig: jest.fn(() => undefined),
|
|
127
|
+
getDeviceSchemaConfig: jest.fn(() => undefined),
|
|
128
|
+
log: { info: noop, warn: noop, error: noop, debug: noop },
|
|
129
|
+
};
|
|
130
|
+
initLogger(mockPlatform.log);
|
|
131
|
+
|
|
132
|
+
mockAccessory = {
|
|
133
|
+
UUID: 'smoke-uuid',
|
|
134
|
+
displayName: 'Smoke and CO alarm',
|
|
135
|
+
context: { deviceID: 'smoke-device-id' },
|
|
136
|
+
services,
|
|
137
|
+
getService: jest.fn((type: any) => services.find(s => s.UUID === type)),
|
|
138
|
+
addService: jest.fn((type: any) => {
|
|
139
|
+
const service = makeService(type);
|
|
140
|
+
services.push(service);
|
|
141
|
+
return service;
|
|
142
|
+
}),
|
|
143
|
+
removeService: jest.fn(),
|
|
144
|
+
};
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
const setup = (schema: any[], status: any[]) => {
|
|
148
|
+
device = createDevice(schema, status);
|
|
149
|
+
const accessory = new SmokeSensorAccessory(mockPlatform as any, mockAccessory as any);
|
|
150
|
+
accessory.configureServices();
|
|
151
|
+
return accessory;
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
const service = (type: string) => services.find(s => s.UUID === type);
|
|
155
|
+
const read = (serviceType: string, characteristicType: any) =>
|
|
156
|
+
service(serviceType)?.getCharacteristic(characteristicType).getHandler();
|
|
157
|
+
const setStatus = (code: string, value: any) => {
|
|
158
|
+
device.status.find(s => s.code === code)!.value = value;
|
|
159
|
+
};
|
|
160
|
+
|
|
161
|
+
test('smoke-only detector keeps a single SmokeSensor service', () => {
|
|
162
|
+
setup([enumSchema('smoke_sensor_state', ['alarm', 'normal'])], [{ code: 'smoke_sensor_state', value: 'normal' }]);
|
|
163
|
+
|
|
164
|
+
expect(service('SmokeSensor')).toBeDefined();
|
|
165
|
+
expect(service('CarbonMonoxideSensor')).toBeUndefined();
|
|
166
|
+
expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
|
|
167
|
+
|
|
168
|
+
setStatus('smoke_sensor_state', 'alarm');
|
|
169
|
+
expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_DETECTED);
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
test('combo detector exposes both SmokeSensor and CarbonMonoxideSensor', () => {
|
|
173
|
+
setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
|
|
174
|
+
|
|
175
|
+
expect(service('SmokeSensor')).toBeDefined();
|
|
176
|
+
expect(service('CarbonMonoxideSensor')).toBeDefined();
|
|
177
|
+
expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
|
|
178
|
+
expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_NORMAL);
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
test('smoke and CO alarms are reported independently', () => {
|
|
182
|
+
setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
|
|
183
|
+
|
|
184
|
+
setStatus('co_state', 'alarm');
|
|
185
|
+
expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_ABNORMAL);
|
|
186
|
+
expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
|
|
187
|
+
|
|
188
|
+
setStatus('co_state', 'normal');
|
|
189
|
+
setStatus('smoke_sensor_state', 'alarm');
|
|
190
|
+
expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_NORMAL);
|
|
191
|
+
expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_DETECTED);
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
test('battery_state without a percentage DP maps to StatusLowBattery on the sensors', () => {
|
|
195
|
+
setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
|
|
196
|
+
|
|
197
|
+
expect(service('Battery')).toBeUndefined();
|
|
198
|
+
expect(read('SmokeSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_NORMAL);
|
|
199
|
+
|
|
200
|
+
setStatus('battery_state', 'low');
|
|
201
|
+
expect(read('SmokeSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_LOW);
|
|
202
|
+
expect(read('CarbonMonoxideSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_LOW);
|
|
203
|
+
});
|
|
204
|
+
|
|
205
|
+
test('a non-zero fault bitmap maps to StatusFault', () => {
|
|
206
|
+
setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
|
|
207
|
+
|
|
208
|
+
expect(read('SmokeSensor', StatusFault)).toBe(StatusFault.NO_FAULT);
|
|
209
|
+
|
|
210
|
+
setStatus('fault', 4);
|
|
211
|
+
expect(read('SmokeSensor', StatusFault)).toBe(StatusFault.GENERAL_FAULT);
|
|
212
|
+
expect(read('CarbonMonoxideSensor', StatusFault)).toBe(StatusFault.GENERAL_FAULT);
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
});
|
package/test/Light.test.ts
DELETED
|
@@ -1,186 +0,0 @@
|
|
|
1
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
-
import { describe, expect, test, jest, beforeEach } from '@jest/globals';
|
|
3
|
-
import { configureLight } from '../src/accessory/characteristic/Light';
|
|
4
|
-
|
|
5
|
-
describe('configureLight - ON handler bundles brightness', () => {
|
|
6
|
-
let mockAccessory: any;
|
|
7
|
-
let mockService: any;
|
|
8
|
-
let handlers: Record<string, { onGet?: Function; onSet?: Function }>;
|
|
9
|
-
|
|
10
|
-
beforeEach(() => {
|
|
11
|
-
handlers = {};
|
|
12
|
-
|
|
13
|
-
const makeCharChain = (name: string) => ({
|
|
14
|
-
onGet: jest.fn(function (this: any, handler: Function) {
|
|
15
|
-
handlers[name] = handlers[name] || {};
|
|
16
|
-
handlers[name].onGet = handler;
|
|
17
|
-
return this;
|
|
18
|
-
}),
|
|
19
|
-
onSet: jest.fn(function (this: any, handler: Function) {
|
|
20
|
-
handlers[name] = handlers[name] || {};
|
|
21
|
-
handlers[name].onSet = handler;
|
|
22
|
-
return this;
|
|
23
|
-
}),
|
|
24
|
-
setProps: jest.fn().mockReturnThis(),
|
|
25
|
-
updateValue: jest.fn().mockReturnThis(),
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
const onChar = makeCharChain('On');
|
|
29
|
-
const brightChar = makeCharChain('Brightness');
|
|
30
|
-
|
|
31
|
-
mockService = {
|
|
32
|
-
getCharacteristic: jest.fn((charType: any) => {
|
|
33
|
-
if (charType === 'MockOn') {
|
|
34
|
-
return onChar;
|
|
35
|
-
}
|
|
36
|
-
if (charType === 'MockBrightness') {
|
|
37
|
-
return brightChar;
|
|
38
|
-
}
|
|
39
|
-
return makeCharChain('other');
|
|
40
|
-
}),
|
|
41
|
-
};
|
|
42
|
-
|
|
43
|
-
mockAccessory = {
|
|
44
|
-
Characteristic: { On: 'MockOn', Brightness: 'MockBrightness' },
|
|
45
|
-
Service: { Lightbulb: 'MockLightbulb' },
|
|
46
|
-
accessory: {
|
|
47
|
-
displayName: 'Test Light',
|
|
48
|
-
getService: jest.fn(() => null),
|
|
49
|
-
addService: jest.fn(() => mockService),
|
|
50
|
-
},
|
|
51
|
-
log: { info: jest.fn(), debug: jest.fn(), warn: jest.fn() },
|
|
52
|
-
platform: { getDeviceConfig: jest.fn(() => undefined) },
|
|
53
|
-
checkOnlineStatus: jest.fn(),
|
|
54
|
-
getStatus: jest.fn((code: string) => {
|
|
55
|
-
if (code === 'light') {
|
|
56
|
-
return { code: 'light', value: true };
|
|
57
|
-
}
|
|
58
|
-
if (code === 'bright_value') {
|
|
59
|
-
return { code: 'bright_value', value: 420 };
|
|
60
|
-
}
|
|
61
|
-
if (code === 'switch_led') {
|
|
62
|
-
return { code: 'switch_led', value: false };
|
|
63
|
-
}
|
|
64
|
-
if (code === 'bright_value_1') {
|
|
65
|
-
return { code: 'bright_value_1', value: 100 };
|
|
66
|
-
}
|
|
67
|
-
return undefined;
|
|
68
|
-
}),
|
|
69
|
-
sendCommands: jest.fn(),
|
|
70
|
-
};
|
|
71
|
-
});
|
|
72
|
-
|
|
73
|
-
function makeSchema(code: string, type = 'Boolean', property: any = {}) {
|
|
74
|
-
return { code, mode: 'rw', type, property };
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
function brightSchema(code = 'bright_value') {
|
|
78
|
-
return makeSchema(code, 'Integer', { min: 10, max: 1000, scale: 0, step: 1 });
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
test('LightType.C: ON sends both on + cached brightness', async () => {
|
|
82
|
-
configureLight(
|
|
83
|
-
mockAccessory,
|
|
84
|
-
mockService,
|
|
85
|
-
makeSchema('light') as any,
|
|
86
|
-
brightSchema() as any,
|
|
87
|
-
);
|
|
88
|
-
|
|
89
|
-
expect(handlers['On']?.onSet).toBeDefined();
|
|
90
|
-
await handlers['On'].onSet!(true);
|
|
91
|
-
|
|
92
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
93
|
-
[
|
|
94
|
-
{ code: 'light', value: true },
|
|
95
|
-
{ code: 'bright_value', value: 420 },
|
|
96
|
-
],
|
|
97
|
-
true,
|
|
98
|
-
);
|
|
99
|
-
});
|
|
100
|
-
|
|
101
|
-
test('LightType.C: OFF sends only the on command (no brightness)', async () => {
|
|
102
|
-
configureLight(
|
|
103
|
-
mockAccessory,
|
|
104
|
-
mockService,
|
|
105
|
-
makeSchema('light') as any,
|
|
106
|
-
brightSchema() as any,
|
|
107
|
-
);
|
|
108
|
-
|
|
109
|
-
await handlers['On'].onSet!(false);
|
|
110
|
-
|
|
111
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
112
|
-
[{ code: 'light', value: false }],
|
|
113
|
-
true,
|
|
114
|
-
);
|
|
115
|
-
});
|
|
116
|
-
|
|
117
|
-
test('dual-light warm channel: ON bundles warm brightness', async () => {
|
|
118
|
-
configureLight(
|
|
119
|
-
mockAccessory,
|
|
120
|
-
mockService,
|
|
121
|
-
makeSchema('light') as any,
|
|
122
|
-
brightSchema('bright_value') as any,
|
|
123
|
-
);
|
|
124
|
-
|
|
125
|
-
await handlers['On'].onSet!(true);
|
|
126
|
-
|
|
127
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
128
|
-
[
|
|
129
|
-
{ code: 'light', value: true },
|
|
130
|
-
{ code: 'bright_value', value: 420 },
|
|
131
|
-
],
|
|
132
|
-
true,
|
|
133
|
-
);
|
|
134
|
-
});
|
|
135
|
-
|
|
136
|
-
test('dual-light white channel: ON bundles white brightness', async () => {
|
|
137
|
-
configureLight(
|
|
138
|
-
mockAccessory,
|
|
139
|
-
mockService,
|
|
140
|
-
makeSchema('switch_led') as any,
|
|
141
|
-
brightSchema('bright_value_1') as any,
|
|
142
|
-
);
|
|
143
|
-
|
|
144
|
-
await handlers['On'].onSet!(true);
|
|
145
|
-
|
|
146
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
147
|
-
[
|
|
148
|
-
{ code: 'switch_led', value: true },
|
|
149
|
-
{ code: 'bright_value_1', value: 100 },
|
|
150
|
-
],
|
|
151
|
-
true,
|
|
152
|
-
);
|
|
153
|
-
});
|
|
154
|
-
|
|
155
|
-
test('brightness-only set does not include on command', async () => {
|
|
156
|
-
configureLight(
|
|
157
|
-
mockAccessory,
|
|
158
|
-
mockService,
|
|
159
|
-
makeSchema('light') as any,
|
|
160
|
-
brightSchema() as any,
|
|
161
|
-
);
|
|
162
|
-
|
|
163
|
-
await handlers['Brightness'].onSet!(42);
|
|
164
|
-
|
|
165
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
166
|
-
[{ code: 'bright_value', value: 420 }],
|
|
167
|
-
true,
|
|
168
|
-
);
|
|
169
|
-
});
|
|
170
|
-
|
|
171
|
-
test('ON without brightness schema does not crash', async () => {
|
|
172
|
-
configureLight(
|
|
173
|
-
mockAccessory,
|
|
174
|
-
mockService,
|
|
175
|
-
makeSchema('light') as any,
|
|
176
|
-
);
|
|
177
|
-
|
|
178
|
-
expect(handlers['On']?.onSet).toBeDefined();
|
|
179
|
-
await handlers['On'].onSet!(true);
|
|
180
|
-
|
|
181
|
-
expect(mockAccessory.sendCommands).toHaveBeenCalledWith(
|
|
182
|
-
[{ code: 'light', value: true }],
|
|
183
|
-
true,
|
|
184
|
-
);
|
|
185
|
-
});
|
|
186
|
-
});
|