@homebridge-plugins/homebridge-tuya 3.0.0-beta.21 → 3.0.0-beta.22
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/shared/accessory/FanAccessory.js +2 -2
- package/dist/shared/accessory/FanAccessory.js.map +1 -1
- package/dist/shared/accessory/HeaterAccessory.js +3 -0
- package/dist/shared/accessory/HeaterAccessory.js.map +1 -1
- package/dist/shared/accessory/characteristic/RotationSpeed.js +88 -15
- package/dist/shared/accessory/characteristic/RotationSpeed.js.map +1 -1
- package/dist/shared/util/util.js +1 -1
- package/dist/shared/util/util.js.map +1 -1
- package/package.json +1 -1
- package/test/rotationSpeed.test.ts +150 -0
|
@@ -50,10 +50,10 @@ class FanAccessory extends BaseAccessory_1.default {
|
|
|
50
50
|
(0, RotationSpeed_1.configureRotationSpeed)(this, this.fanService(), this.getFanSpeedSchema());
|
|
51
51
|
}
|
|
52
52
|
else if (this.getFanSpeedLevelSchema()) {
|
|
53
|
-
(0, RotationSpeed_1.
|
|
53
|
+
(0, RotationSpeed_1.configureRotationSpeed)(this, this.fanService(), this.getFanSpeedLevelSchema());
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
(0, RotationSpeed_1.
|
|
56
|
+
(0, RotationSpeed_1.configureRotationSpeed)(this, this.fanService(), this.getSchema(...SCHEMA_CODE.FAN_ON));
|
|
57
57
|
}
|
|
58
58
|
this.configureRotationDirection();
|
|
59
59
|
// Light
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FanAccessory.js","sourceRoot":"","sources":["../../../src/shared/accessory/FanAccessory.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqE;AACrE,oEAA4C;AAC5C,oDAA0D;AAC1D,kDAAwD;AACxD,gFAAsF;AACtF,4CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"FanAccessory.js","sourceRoot":"","sources":["../../../src/shared/accessory/FanAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
|
|
|
8
8
|
const Active_1 = require("./characteristic/Active");
|
|
9
9
|
const CurrentTemperature_1 = require("./characteristic/CurrentTemperature");
|
|
10
10
|
const LockPhysicalControls_1 = require("./characteristic/LockPhysicalControls");
|
|
11
|
+
const RotationSpeed_1 = require("./characteristic/RotationSpeed");
|
|
11
12
|
const SwingMode_1 = require("./characteristic/SwingMode");
|
|
12
13
|
const TemperatureDisplayUnits_1 = require("./characteristic/TemperatureDisplayUnits");
|
|
13
14
|
const SCHEMA_CODE = {
|
|
@@ -18,6 +19,7 @@ const SCHEMA_CODE = {
|
|
|
18
19
|
LOCK: ['lock'],
|
|
19
20
|
SWING: ['shake'],
|
|
20
21
|
TEMP_UNIT_CONVERT: ['temp_unit_convert', 'c_f'],
|
|
22
|
+
FAN_SPEED: ['level'],
|
|
21
23
|
};
|
|
22
24
|
const STATE_CODE = {
|
|
23
25
|
HEATING: ['heating', 'High'],
|
|
@@ -36,6 +38,7 @@ class HeaterAccessory extends BaseAccessory_1.default {
|
|
|
36
38
|
(0, SwingMode_1.configureSwingMode)(this, this.mainService(), this.getSchema(...SCHEMA_CODE.SWING));
|
|
37
39
|
this.configureHeatingThresholdTemp();
|
|
38
40
|
(0, TemperatureDisplayUnits_1.configureTempDisplayUnits)(this, this.mainService(), this.getSchema(...SCHEMA_CODE.TEMP_UNIT_CONVERT));
|
|
41
|
+
(0, RotationSpeed_1.configureRotationSpeed)(this, this.mainService(), this.getSchema(...SCHEMA_CODE.FAN_SPEED));
|
|
39
42
|
}
|
|
40
43
|
mainService() {
|
|
41
44
|
return this.accessory.getService(this.Service.HeaterCooler)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HeaterAccessory.js","sourceRoot":"","sources":["../../../src/shared/accessory/HeaterAccessory.ts"],"names":[],"mappings":";;;;;AAEA,uCAAoD;AACpD,oEAA4C;AAC5C,oDAA0D;AAC1D,4EAAkF;AAClF,gFAAsF;AACtF,0DAAgE;AAChE,sFAAqF;AAErF,MAAM,WAAW,GAAG;IAClB,MAAM,EAAE,CAAC,QAAQ,CAAC;IAClB,UAAU,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;IAClC,YAAY,EAAE,CAAC,cAAc,CAAC;IAC9B,WAAW,EAAE,CAAC,UAAU,CAAC;IACzB,IAAI,EAAE,CAAC,MAAM,CAAC;IACd,KAAK,EAAE,CAAC,OAAO,CAAC;IAChB,iBAAiB,EAAE,CAAC,mBAAmB,EAAE,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"HeaterAccessory.js","sourceRoot":"","sources":["../../../src/shared/accessory/HeaterAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,30 +2,88 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureRotationSpeed = configureRotationSpeed;
|
|
4
4
|
exports.configureRotationSpeedLevel = configureRotationSpeedLevel;
|
|
5
|
-
exports.
|
|
5
|
+
exports.integerToPercentageProperty = integerToPercentageProperty;
|
|
6
|
+
exports.enumToPercentageProperty = enumToPercentageProperty;
|
|
7
|
+
const TuyaDevice_1 = require("../../../cloud/device/TuyaDevice");
|
|
6
8
|
const util_1 = require("../../util/util");
|
|
7
9
|
function configureRotationSpeed(accessory, service, schema) {
|
|
8
10
|
if (!schema) {
|
|
9
11
|
return;
|
|
10
12
|
}
|
|
13
|
+
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
14
|
+
configureRotationSpeedEnum(accessory, service, schema, ['auto']);
|
|
15
|
+
}
|
|
16
|
+
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
17
|
+
configureRotationSpeedInteger(accessory, service, schema);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
configureRotationSpeedOn(accessory, service, schema);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
function configureRotationSpeedInteger(accessory, service, schema) {
|
|
24
|
+
accessory.log.debug('configureRotationSpeedInteger');
|
|
11
25
|
const property = schema.property;
|
|
26
|
+
const hapProperty = (0, util_1.toHapProperty)(property);
|
|
27
|
+
const rotationSpeedProperty = integerToPercentageProperty(property);
|
|
12
28
|
const multiple = Math.pow(10, property.scale);
|
|
13
|
-
const
|
|
14
|
-
minValue: property.min / multiple,
|
|
15
|
-
maxValue: property.max / multiple,
|
|
16
|
-
minStep: Math.max(1, property.step / multiple),
|
|
17
|
-
};
|
|
18
|
-
service.getCharacteristic(accessory.Characteristic.RotationSpeed)
|
|
19
|
-
.onGet(() => {
|
|
29
|
+
const onGetHandler = () => {
|
|
20
30
|
const status = accessory.getStatus(schema.code);
|
|
21
31
|
const value = status.value / multiple;
|
|
22
|
-
|
|
32
|
+
let level = ((value - hapProperty.minValue) / hapProperty.minStep);
|
|
33
|
+
if (hapProperty.minValue !== 0) {
|
|
34
|
+
level += 1;
|
|
35
|
+
}
|
|
36
|
+
const hapValue = level * rotationSpeedProperty.minStep;
|
|
37
|
+
return (0, util_1.limit)(hapValue, rotationSpeedProperty.minValue, rotationSpeedProperty.maxValue);
|
|
38
|
+
};
|
|
39
|
+
accessory.log.debug('Set props for RotationSpeed:', rotationSpeedProperty);
|
|
40
|
+
service.getCharacteristic(accessory.Characteristic.RotationSpeed)
|
|
41
|
+
.onGet(onGetHandler)
|
|
42
|
+
.onSet(async (value) => {
|
|
43
|
+
const percent = Number(value);
|
|
44
|
+
if (!Number.isFinite(percent) || percent <= 0) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const hapLevel = Math.floor(percent / rotationSpeedProperty.minStep);
|
|
48
|
+
const speed = hapLevel * hapProperty.minStep * multiple;
|
|
49
|
+
await accessory.sendCommands([{ code: schema.code, value: speed }], true);
|
|
23
50
|
})
|
|
51
|
+
.updateValue(onGetHandler())
|
|
52
|
+
.setProps(rotationSpeedProperty);
|
|
53
|
+
}
|
|
54
|
+
function configureRotationSpeedEnum(accessory, service, schema, ignoreValues) {
|
|
55
|
+
accessory.log.debug('configureRotationSpeedEnum');
|
|
56
|
+
const property = schema.property;
|
|
57
|
+
const cloneProperty = structuredClone(property);
|
|
58
|
+
const range = [];
|
|
59
|
+
for (const value of property.range) {
|
|
60
|
+
if (ignoreValues?.includes(value)) {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
range.push(value);
|
|
64
|
+
}
|
|
65
|
+
cloneProperty.range = range;
|
|
66
|
+
const rotationSpeedProperty = enumToPercentageProperty(cloneProperty);
|
|
67
|
+
const onGetHandler = () => {
|
|
68
|
+
const status = accessory.getStatus(schema.code);
|
|
69
|
+
const index = range.indexOf(status.value);
|
|
70
|
+
const level = index + 1;
|
|
71
|
+
const hapValue = level * rotationSpeedProperty.minStep;
|
|
72
|
+
return (0, util_1.limit)(hapValue, rotationSpeedProperty.minValue, rotationSpeedProperty.maxValue);
|
|
73
|
+
};
|
|
74
|
+
accessory.log.debug('Set props for RotationSpeed:', rotationSpeedProperty);
|
|
75
|
+
service.getCharacteristic(accessory.Characteristic.RotationSpeed)
|
|
76
|
+
.onGet(onGetHandler)
|
|
24
77
|
.onSet(async (value) => {
|
|
25
|
-
const
|
|
78
|
+
const percent = Number(value);
|
|
79
|
+
if (!Number.isFinite(percent) || percent <= 0) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const speed = String(Math.floor(percent / rotationSpeedProperty.minStep));
|
|
26
83
|
await accessory.sendCommands([{ code: schema.code, value: speed }], true);
|
|
27
84
|
})
|
|
28
|
-
.
|
|
85
|
+
.updateValue(onGetHandler())
|
|
86
|
+
.setProps(rotationSpeedProperty);
|
|
29
87
|
}
|
|
30
88
|
function configureRotationSpeedLevel(accessory, service, schema, ignoreValues) {
|
|
31
89
|
if (!schema) {
|
|
@@ -63,10 +121,8 @@ function configureRotationSpeedLevel(accessory, service, schema, ignoreValues) {
|
|
|
63
121
|
.setProps(props);
|
|
64
122
|
}
|
|
65
123
|
function configureRotationSpeedOn(accessory, service, schema) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
const props = { minValue: 0, maxValue: 100, minStep: 100 };
|
|
124
|
+
accessory.log.debug('configureRotationSpeedOn');
|
|
125
|
+
const props = { minValue: 0, maxValue: 100, minStep: 100, unit: '%' };
|
|
70
126
|
accessory.log.debug('Set props for RotationSpeed:', props);
|
|
71
127
|
service.getCharacteristic(accessory.Characteristic.RotationSpeed)
|
|
72
128
|
.onGet(() => {
|
|
@@ -75,4 +131,21 @@ function configureRotationSpeedOn(accessory, service, schema) {
|
|
|
75
131
|
})
|
|
76
132
|
.setProps(props);
|
|
77
133
|
}
|
|
134
|
+
function integerToPercentageProperty(property) {
|
|
135
|
+
const hapProperty = (0, util_1.toHapProperty)(property);
|
|
136
|
+
let stepCount;
|
|
137
|
+
if (hapProperty.minValue === 0) {
|
|
138
|
+
stepCount = Math.min(100, Math.ceil(hapProperty.maxValue / hapProperty.minStep));
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
stepCount = Math.min(100, Math.ceil((hapProperty.maxValue - hapProperty.minValue) / hapProperty.minStep) + 1);
|
|
142
|
+
}
|
|
143
|
+
return { minValue: 0, maxValue: 100, minStep: Math.floor(100 / stepCount), unit: '%' };
|
|
144
|
+
}
|
|
145
|
+
function enumToPercentageProperty(property) {
|
|
146
|
+
const min = 0;
|
|
147
|
+
const max = property.range.length;
|
|
148
|
+
const step = 1;
|
|
149
|
+
return integerToPercentageProperty({ min: min, max: max, step: step, scale: 0, unit: '%' });
|
|
150
|
+
}
|
|
78
151
|
//# sourceMappingURL=RotationSpeed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../../src/shared/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../../src/shared/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/util/util.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/shared/util/util.ts"],"names":[],"mappings":";;AAEA,sBAUC;AAED,sBASC;AAED,sCA+BC;AAED,oCAiBC;AAMD,8BAOC;AAED,8BAsBC;AAQD,4BAYC;AAgBD,sBAuCC;AAED,oCAGC;AAED,wCAgBC;AAED,sBA0BC;AA5OD,SAAgB,KAAK,CACnB,KAAa,EACb,QAAgB,EAChB,MAAc,EACd,QAAgB,EAChB,MAAc;IAEd,MAAM,OAAO,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,GAAG,QAAQ,CAAC;IACxD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,KAAK,CACnB,KAAa,EACb,KAAa,EACb,GAAW;IAEX,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,aAAa,CAC3B,QAAkC;IAElC,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC3D,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;gBACtD,MAAM;YACR,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,GAAG,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;gBAClD,MAAM;YACR,CAAC;YACD,KAAK,MAAM,CAAC,CAAC,CAAC;gBACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,GAAG,QAAQ,CAAC,CAAC;gBAClD,MAAM;YACR,CAAC;YACD,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,GAAG,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/shared/util/util.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": "3.0.0-beta.
|
|
4
|
+
"version": "3.0.0-beta.22",
|
|
5
5
|
"description": "Unified Homebridge Tuya plugin supporting both Tuya Cloud (REST/MQTT) and Tuya Local (direct LAN TCP) communication.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, jest, test } from '@jest/globals';
|
|
2
|
+
import BaseAccessory from '../src/shared/accessory/BaseAccessory';
|
|
3
|
+
import { configureRotationSpeed, enumToPercentageProperty, integerToPercentageProperty } from '../src/shared/accessory/characteristic/RotationSpeed';
|
|
4
|
+
import { TuyaDeviceSchemaMode, TuyaDeviceSchemaType, TuyaDeviceSchemaEnumProperty, TuyaDeviceSchemaIntegerProperty, TuyaDeviceStatus, TuyaDeviceSchema } from '../src/cloud/device/TuyaDevice';
|
|
5
|
+
import { CharacteristicProps, PartialAllowingNull, Service } from 'homebridge';
|
|
6
|
+
import { ExLogger, initLogger } from '../src/shared/util/Logger';
|
|
7
|
+
|
|
8
|
+
// モック用のダミーロガー
|
|
9
|
+
const mockDebug = jest.fn();
|
|
10
|
+
// Mock Logger
|
|
11
|
+
const mockLog: ExLogger = {
|
|
12
|
+
debug: mockDebug,
|
|
13
|
+
info: jest.fn(),
|
|
14
|
+
warn: jest.fn(),
|
|
15
|
+
error: jest.fn(),
|
|
16
|
+
log: jest.fn(),
|
|
17
|
+
success: jest.fn(),
|
|
18
|
+
} as unknown as ExLogger;
|
|
19
|
+
|
|
20
|
+
describe('configureRotationSpeed', () => {
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
jest.clearAllMocks();
|
|
23
|
+
initLogger(mockLog);
|
|
24
|
+
});
|
|
25
|
+
test('maps four-level fan_speed_percent values to HomeKit percentages', async () => {
|
|
26
|
+
let rawLevel = 1;
|
|
27
|
+
let getHandler: () => number = () => 0;
|
|
28
|
+
let setHandler: (value: number) => Promise<void> = async () => undefined;
|
|
29
|
+
const characteristic = {
|
|
30
|
+
onGet: jest.fn((handler: () => number) => {
|
|
31
|
+
getHandler = handler;
|
|
32
|
+
return characteristic;
|
|
33
|
+
}),
|
|
34
|
+
onSet: jest.fn((handler: (value: number) => Promise<void>) => {
|
|
35
|
+
setHandler = handler;
|
|
36
|
+
return characteristic;
|
|
37
|
+
}),
|
|
38
|
+
updateValue: jest.fn((value: number) => characteristic),
|
|
39
|
+
setProps: jest.fn((prop: PartialAllowingNull<CharacteristicProps>) => characteristic),
|
|
40
|
+
};
|
|
41
|
+
const service = {
|
|
42
|
+
getCharacteristic: jest.fn(() => characteristic),
|
|
43
|
+
};
|
|
44
|
+
const sendCommands = jest.fn(async (command: TuyaDeviceStatus[], debounce: boolean) => undefined);
|
|
45
|
+
const accessory = {
|
|
46
|
+
Characteristic: { RotationSpeed: 'RotationSpeed' },
|
|
47
|
+
getStatus: jest.fn(() => ({ code: 'fan_speed_percent', value: rawLevel })),
|
|
48
|
+
sendCommands,
|
|
49
|
+
log: { debug: jest.fn() }
|
|
50
|
+
} as unknown as BaseAccessory;
|
|
51
|
+
const schema = {
|
|
52
|
+
code: 'fan_speed_percent',
|
|
53
|
+
mode: TuyaDeviceSchemaMode.READ_WRITE,
|
|
54
|
+
type: TuyaDeviceSchemaType.Integer,
|
|
55
|
+
property: { min: 1, max: 4, scale: 0, step: 1, unit: '' },
|
|
56
|
+
};
|
|
57
|
+
|
|
58
|
+
configureRotationSpeed(accessory, service as never, schema);
|
|
59
|
+
|
|
60
|
+
expect(characteristic.setProps).toHaveBeenCalledWith({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
61
|
+
expect(characteristic.updateValue).toHaveBeenCalledWith(25);
|
|
62
|
+
expect([1, 2, 3, 4].map(level => {
|
|
63
|
+
rawLevel = level;
|
|
64
|
+
return getHandler();
|
|
65
|
+
})).toEqual([25, 50, 75, 100]);
|
|
66
|
+
|
|
67
|
+
for (const [percent, level] of [[25, 1], [50, 2], [75, 3], [100, 4]]) {
|
|
68
|
+
await setHandler(percent);
|
|
69
|
+
expect(sendCommands).toHaveBeenLastCalledWith(
|
|
70
|
+
[{ code: 'fan_speed_percent', value: level }],
|
|
71
|
+
true,
|
|
72
|
+
);
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
await setHandler(0);
|
|
76
|
+
expect(sendCommands).toHaveBeenCalledTimes(4);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
describe('switching configuration method', () => {
|
|
81
|
+
test('Test whether the appropriate configure method is being selected and invoked correctly.', () => {
|
|
82
|
+
let getHandler: () => number = () => 0;
|
|
83
|
+
let setHandler: (value: number) => Promise<void> = async () => undefined;
|
|
84
|
+
const characteristic = {
|
|
85
|
+
onGet: jest.fn((handler: () => number) => {
|
|
86
|
+
getHandler = handler;
|
|
87
|
+
return characteristic;
|
|
88
|
+
}),
|
|
89
|
+
onSet: jest.fn((handler: (value: number) => Promise<void>) => {
|
|
90
|
+
setHandler = handler;
|
|
91
|
+
return characteristic;
|
|
92
|
+
}),
|
|
93
|
+
updateValue: jest.fn((value: number) => characteristic),
|
|
94
|
+
setProps: jest.fn((prop: PartialAllowingNull<CharacteristicProps>) => characteristic),
|
|
95
|
+
};
|
|
96
|
+
const accessory = {
|
|
97
|
+
log: mockLog,
|
|
98
|
+
Characteristic: { RotationSpeed: 'RotationSpeed' },
|
|
99
|
+
getStatus: jest.fn(() => ({ code: 'fan_speed_percent', value: 0 })),
|
|
100
|
+
} as unknown as BaseAccessory;
|
|
101
|
+
const service = { getCharacteristic: jest.fn(() => characteristic) } as unknown as Service;
|
|
102
|
+
const schemaEnum = { type: TuyaDeviceSchemaType.Enum, property: {range: ["slow", "medium", "fast", "auto"]} } as TuyaDeviceSchema;
|
|
103
|
+
const schemaInteger = { type: TuyaDeviceSchemaType.Integer, property: { min: 0, max: 50, step: 2, scale: 0, unit: 'percent' } } as TuyaDeviceSchema;
|
|
104
|
+
const schemaOther = { type: 'other' } as unknown as TuyaDeviceSchema;
|
|
105
|
+
|
|
106
|
+
mockDebug.mockReset();
|
|
107
|
+
// Call the function with different schema types
|
|
108
|
+
configureRotationSpeed(accessory, service, schemaEnum);
|
|
109
|
+
configureRotationSpeed(accessory, service, schemaInteger);
|
|
110
|
+
configureRotationSpeed(accessory, service, schemaOther);
|
|
111
|
+
configureRotationSpeed(accessory, service, undefined);
|
|
112
|
+
|
|
113
|
+
// Check if the correct functions were called
|
|
114
|
+
expect(mockDebug).toHaveBeenNthCalledWith(1, 'configureRotationSpeedEnum');
|
|
115
|
+
expect(mockDebug).toHaveBeenNthCalledWith(2, 'Set props for RotationSpeed:', {"maxValue": 100, "minStep": 33, "minValue": 0, "unit": "%"});
|
|
116
|
+
expect(mockDebug).toHaveBeenNthCalledWith(3, 'configureRotationSpeedInteger');
|
|
117
|
+
expect(mockDebug).toHaveBeenNthCalledWith(4, 'Set props for RotationSpeed:', {"maxValue": 100, "minStep": 4, "minValue": 0, "unit": "%"});
|
|
118
|
+
expect(mockDebug).toHaveBeenNthCalledWith(5, 'configureRotationSpeedOn');
|
|
119
|
+
expect(mockDebug).toHaveBeenNthCalledWith(6, 'Set props for RotationSpeed:', {"maxValue": 100, "minStep": 100, "minValue": 0, "unit": "%"});
|
|
120
|
+
expect(mockDebug).toHaveBeenCalledTimes(6);
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
describe('convert property', () => {
|
|
125
|
+
test('integerToPercentageProperty no changes', () => {
|
|
126
|
+
const property = { min: 1, max: 100, step: 1, scale: 0, unit: '%' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
127
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 1, unit: '%' });
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
test('integerToPercentageProperty returns 25% steps for 1..4 levels', () => {
|
|
131
|
+
const property = { min: 1, max: 4, step: 1, scale: 0, unit: '' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
132
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
133
|
+
});
|
|
134
|
+
|
|
135
|
+
test('integerToPercentageProperty returns 33% steps for 0..3 levels', () => {
|
|
136
|
+
const property = { min: 0, max: 3, step: 1, scale: 0, unit: '' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
137
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 33, unit: '%' });
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
test('integerToPercentageProperty which step is not 1.', () => {
|
|
141
|
+
const property = { min: 0, max: 20, step: 2, scale: 0, unit: '' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
142
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 10, unit: '%' });
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
test('enumToPercentageProperty returns 25% steps for 4 enum values', () => {
|
|
146
|
+
const property = { range: ['low', 'medium', 'high', 'auto'] } as unknown as TuyaDeviceSchemaEnumProperty;
|
|
147
|
+
expect(enumToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
});
|