@switchbot/homebridge-switchbot 5.0.0-beta.2 → 5.0.0-beta.20
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 +7 -0
- package/config.schema.json +17 -2
- package/dist/devices-hap/device.d.ts +1 -0
- package/dist/devices-hap/device.d.ts.map +1 -1
- package/dist/devices-hap/device.js +70 -30
- package/dist/devices-hap/device.js.map +1 -1
- package/dist/devices-matter/BaseMatterAccessory.d.ts +23 -0
- package/dist/devices-matter/BaseMatterAccessory.d.ts.map +1 -1
- package/dist/devices-matter/BaseMatterAccessory.js +167 -5
- package/dist/devices-matter/BaseMatterAccessory.js.map +1 -1
- package/dist/devices-matter/ColorLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ColorLightAccessory.js +12 -12
- package/dist/devices-matter/ColorLightAccessory.js.map +1 -1
- package/dist/devices-matter/ColorTemperatureLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ColorTemperatureLightAccessory.js +5 -7
- package/dist/devices-matter/ColorTemperatureLightAccessory.js.map +1 -1
- package/dist/devices-matter/DimmableLightAccessory.js +9 -9
- package/dist/devices-matter/DimmableLightAccessory.js.map +1 -1
- package/dist/devices-matter/ExtendedColorLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/ExtendedColorLightAccessory.js +14 -15
- package/dist/devices-matter/ExtendedColorLightAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffLightAccessory.d.ts.map +1 -1
- package/dist/devices-matter/OnOffLightAccessory.js +8 -16
- package/dist/devices-matter/OnOffLightAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffOutletAccessory.d.ts +2 -0
- package/dist/devices-matter/OnOffOutletAccessory.d.ts.map +1 -1
- package/dist/devices-matter/OnOffOutletAccessory.js +10 -7
- package/dist/devices-matter/OnOffOutletAccessory.js.map +1 -1
- package/dist/devices-matter/OnOffSwitchAccessory.js +2 -2
- package/dist/devices-matter/OnOffSwitchAccessory.js.map +1 -1
- package/dist/devices-matter/baseMatterAccessory.test.d.ts +2 -0
- package/dist/devices-matter/baseMatterAccessory.test.d.ts.map +1 -0
- package/dist/devices-matter/baseMatterAccessory.test.js +71 -0
- package/dist/devices-matter/baseMatterAccessory.test.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -5
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +7 -2
- package/dist/index.test.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +11 -10
- package/dist/irdevice/irdevice.d.ts.map +1 -1
- package/dist/irdevice/irdevice.js +76 -35
- package/dist/irdevice/irdevice.js.map +1 -1
- package/dist/platform-hap.d.ts +10 -14
- package/dist/platform-hap.d.ts.map +1 -1
- package/dist/platform-hap.js +38 -64
- package/dist/platform-hap.js.map +1 -1
- package/dist/platform-matter.d.ts +68 -6
- package/dist/platform-matter.d.ts.map +1 -1
- package/dist/platform-matter.js +1213 -70
- package/dist/platform-matter.js.map +1 -1
- package/dist/platform-matter.test.d.ts +2 -0
- package/dist/platform-matter.test.d.ts.map +1 -0
- package/dist/platform-matter.test.js +127 -0
- package/dist/platform-matter.test.js.map +1 -0
- package/dist/settings.d.ts +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js.map +1 -1
- package/dist/utils.d.ts +87 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +254 -0
- package/dist/utils.js.map +1 -1
- package/dist/utils.test.d.ts +2 -0
- package/dist/utils.test.d.ts.map +1 -0
- package/dist/utils.test.js +95 -0
- package/dist/utils.test.js.map +1 -0
- package/dist/verifyconfig.test.js +2 -2
- package/dist/verifyconfig.test.js.map +1 -1
- package/docs/assets/main.js +2 -2
- package/docs/index.html +2 -2
- package/docs/variables/default.html +1 -1
- package/package.json +14 -14
- package/src/devices-hap/device.ts +68 -30
- package/src/devices-matter/BaseMatterAccessory.ts +168 -5
- package/src/devices-matter/ColorLightAccessory.ts +12 -12
- package/src/devices-matter/ColorTemperatureLightAccessory.ts +5 -7
- package/src/devices-matter/DimmableLightAccessory.ts +9 -9
- package/src/devices-matter/ExtendedColorLightAccessory.ts +14 -15
- package/src/devices-matter/OnOffLightAccessory.ts +8 -16
- package/src/devices-matter/OnOffOutletAccessory.ts +12 -7
- package/src/devices-matter/OnOffSwitchAccessory.ts +2 -2
- package/src/devices-matter/baseMatterAccessory.test.ts +88 -0
- package/src/index.test.ts +7 -2
- package/src/index.ts +4 -5
- package/src/irdevice/irdevice.ts +74 -35
- package/src/platform-hap.ts +39 -73
- package/src/platform-matter.test.ts +155 -0
- package/src/platform-matter.ts +1254 -73
- package/src/settings.ts +4 -0
- package/src/utils.test.ts +96 -0
- package/src/utils.ts +255 -0
- package/src/verifyconfig.test.ts +11 -10
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Color Light Accessory Class (HS only)
|
|
3
3
|
* Hue and Saturation color control
|
|
4
4
|
*/
|
|
5
|
+
import { hs2rgb } from '../utils.js';
|
|
5
6
|
import { BaseMatterAccessory } from './BaseMatterAccessory.js';
|
|
6
7
|
export class ColorLightAccessory extends BaseMatterAccessory {
|
|
7
8
|
constructor(api, log, opts) {
|
|
@@ -47,34 +48,33 @@ export class ColorLightAccessory extends BaseMatterAccessory {
|
|
|
47
48
|
}
|
|
48
49
|
async handleOn() {
|
|
49
50
|
this.logInfo('turning on.');
|
|
50
|
-
|
|
51
|
+
await this.sendOnCommand();
|
|
51
52
|
}
|
|
52
53
|
async handleOff() {
|
|
53
54
|
this.logInfo('turning off.');
|
|
54
|
-
|
|
55
|
+
await this.sendOffCommand();
|
|
55
56
|
}
|
|
56
57
|
async handleSetLevel(request) {
|
|
57
58
|
this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`);
|
|
58
59
|
const { level } = request;
|
|
59
60
|
const brightnessPercent = Math.round((level / 254) * 100);
|
|
60
|
-
this.
|
|
61
|
-
// TODO: await myLightAPI.setBrightness(brightnessPercent)
|
|
61
|
+
await this.sendSetBrightness(brightnessPercent);
|
|
62
62
|
}
|
|
63
63
|
async handleSetColor(request) {
|
|
64
64
|
this.logInfo(`MoveToColor request: ${JSON.stringify(request)}`);
|
|
65
|
-
const { colorX, colorY
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
const { colorX, colorY } = request;
|
|
66
|
+
const hueApprox = Math.round((colorX / 65535) * 360);
|
|
67
|
+
const satApprox = Math.round((colorY / 65535) * 100);
|
|
68
|
+
const [r, g, b] = hs2rgb(hueApprox, satApprox);
|
|
69
|
+
await this.sendSetColor(r, g, b);
|
|
70
70
|
}
|
|
71
71
|
async handleSetHueSaturation(request) {
|
|
72
72
|
this.logInfo(`MoveToHueAndSaturation request: ${JSON.stringify(request)}`);
|
|
73
|
-
const { hue, saturation
|
|
73
|
+
const { hue, saturation } = request;
|
|
74
74
|
const hueDegrees = Math.round((hue / 254) * 360);
|
|
75
75
|
const saturationPercent = Math.round((saturation / 254) * 100);
|
|
76
|
-
|
|
77
|
-
|
|
76
|
+
const [r, g, b] = hs2rgb(hueDegrees, saturationPercent);
|
|
77
|
+
await this.sendSetColor(r, g, b);
|
|
78
78
|
}
|
|
79
79
|
updateOnOffState(isOn) {
|
|
80
80
|
this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ColorLightAccessory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,mBAAmB,CAAA;QAC5D,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,2BAA2B,CAAA;QACxD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;YAC/D,YAAY,EAAE;gBACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,8BAA8B;gBACjF,UAAU,EAAE,CAAC;gBACb,iBAAiB,EAAE,GAAG;gBACtB,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,KAAK;aAChB;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAC7E,YAAY,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACnH,YAAY,EAAE;gBACZ,gBAAgB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC7F,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;aAC5H;SACF,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAkB;YACrD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,
|
|
1
|
+
{"version":3,"file":"ColorLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ColorLightAccessory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,mBAAmB,CAAA;QAC5D,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,2BAA2B,CAAA;QACxD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;YAC/D,YAAY,EAAE;gBACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,8BAA8B;gBACjF,UAAU,EAAE,CAAC;gBACb,iBAAiB,EAAE,GAAG;gBACtB,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,KAAK;aAChB;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAC7E,YAAY,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACnH,YAAY,EAAE;gBACZ,gBAAgB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC7F,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;aAC5H;SACF,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAkB;YACrD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAmC;QAC9D,IAAI,CAAC,OAAO,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC/D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;QACzB,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;IACjD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAmC;QAC9D,IAAI,CAAC,OAAO,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC/D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;QACpD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;QACpD,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;QAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAClC,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,OAA8C;QACjF,IAAI,CAAC,OAAO,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC1E,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;QACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QAC9D,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;QACvD,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IAClC,CAAC;IAEM,gBAAgB,CAAC,IAAa;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;IAEM,gBAAgB,CAAC,OAAe;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QAClE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5F,CAAC;IAEM,mBAAmB,CAAC,GAAW,EAAE,UAAkB;QACxD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE;YAC1D,UAAU,EAAE,SAAS;YACrB,iBAAiB,EAAE,SAAS;SAC7B,CAAC,CAAA;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorTemperatureLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/ColorTemperatureLightAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAkB,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,qBAAa,8BAA+B,SAAQ,mBAAmB;gBACzD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;YA2CtH,QAAQ;YAKR,SAAS;YAKT,cAAc;
|
|
1
|
+
{"version":3,"file":"ColorTemperatureLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/ColorTemperatureLightAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAkB,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,qBAAa,8BAA+B,SAAQ,mBAAmB;gBACzD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;YA2CtH,QAAQ;YAKR,SAAS;YAKT,cAAc;YAOd,yBAAyB;IAOhC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAIrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKvC,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAIpD"}
|
|
@@ -43,25 +43,23 @@ export class ColorTemperatureLightAccessory extends BaseMatterAccessory {
|
|
|
43
43
|
}
|
|
44
44
|
async handleOn() {
|
|
45
45
|
this.logInfo('turning on.');
|
|
46
|
-
|
|
46
|
+
await this.sendOnCommand();
|
|
47
47
|
}
|
|
48
48
|
async handleOff() {
|
|
49
49
|
this.logInfo('turning off.');
|
|
50
|
-
|
|
50
|
+
await this.sendOffCommand();
|
|
51
51
|
}
|
|
52
52
|
async handleSetLevel(request) {
|
|
53
53
|
this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`);
|
|
54
54
|
const { level } = request;
|
|
55
55
|
const brightnessPercent = Math.round((level / 254) * 100);
|
|
56
|
-
this.
|
|
57
|
-
// TODO: await myLightAPI.setBrightness(brightnessPercent)
|
|
56
|
+
await this.sendSetBrightness(brightnessPercent);
|
|
58
57
|
}
|
|
59
58
|
async handleSetColorTemperature(request) {
|
|
60
59
|
this.logInfo(`MoveToColorTemperature request: ${JSON.stringify(request)}`);
|
|
61
|
-
const { colorTemperatureMireds
|
|
60
|
+
const { colorTemperatureMireds } = request;
|
|
62
61
|
const kelvin = Math.round(1000000 / colorTemperatureMireds);
|
|
63
|
-
this.
|
|
64
|
-
// TODO: await myLightAPI.setColorTemperature(kelvin, transitionTime)
|
|
62
|
+
await this.sendSetColorTemperature(kelvin);
|
|
65
63
|
}
|
|
66
64
|
updateOnOffState(isOn) {
|
|
67
65
|
this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorTemperatureLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ColorTemperatureLightAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,8BAA+B,SAAQ,mBAAmB;IACrE,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,0BAA0B,CAAA;QACnE,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,6BAA6B,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;YAC/D,YAAY,EAAE;gBACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,sBAAsB;gBACzE,sBAAsB,EAAE,GAAG;gBAC3B,0BAA0B,EAAE,GAAG;gBAC/B,0BAA0B,EAAE,GAAG;gBAC/B,+BAA+B,EAAE,GAAG;aACrC;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAC7E,YAAY,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACnH,YAAY,EAAE,EAAE,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE;SACjJ,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB;YACxD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,
|
|
1
|
+
{"version":3,"file":"ColorTemperatureLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ColorTemperatureLightAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,8BAA+B,SAAQ,mBAAmB;IACrE,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,0BAA0B,CAAA;QACnE,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,6BAA6B,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;YAC/D,YAAY,EAAE;gBACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,sBAAsB;gBACzE,sBAAsB,EAAE,GAAG;gBAC3B,0BAA0B,EAAE,GAAG;gBAC/B,0BAA0B,EAAE,GAAG;gBAC/B,+BAA+B,EAAE,GAAG;aACrC;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAC7E,YAAY,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACnH,YAAY,EAAE,EAAE,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE;SACjJ,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB;YACxD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,OAAmC;QAC9D,IAAI,CAAC,OAAO,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC/D,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;QACzB,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAA;QACzD,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;IACjD,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,OAA8C;QACpF,IAAI,CAAC,OAAO,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAC1E,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAA;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,sBAAsB,CAAC,CAAA;QAC3D,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAEM,gBAAgB,CAAC,IAAa;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;IAEM,gBAAgB,CAAC,OAAe;QACrC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;QAClE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5F,CAAC;IAEM,sBAAsB,CAAC,MAAc;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,CAAA;QAC3C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,sBAAsB,EAAE,MAAM,EAAE,CAAC,CAAA;IACjG,CAAC;CACF"}
|
|
@@ -58,9 +58,9 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
|
|
|
58
58
|
async handleOn() {
|
|
59
59
|
this.logInfo('turning on.');
|
|
60
60
|
try {
|
|
61
|
-
//
|
|
62
|
-
|
|
63
|
-
this.logInfo('physical device turned on.');
|
|
61
|
+
// Use platform helper (OpenAPI/BLE) when available
|
|
62
|
+
await this.sendOnCommand();
|
|
63
|
+
this.logInfo('physical device turned on (via platform helper).');
|
|
64
64
|
}
|
|
65
65
|
catch (error) {
|
|
66
66
|
this.logError('failed to turn on:', error);
|
|
@@ -73,9 +73,9 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
|
|
|
73
73
|
async handleOff() {
|
|
74
74
|
this.logInfo('turning off.');
|
|
75
75
|
try {
|
|
76
|
-
//
|
|
77
|
-
|
|
78
|
-
this.logInfo('physical device turned off.');
|
|
76
|
+
// Use platform helper (OpenAPI/BLE) when available
|
|
77
|
+
await this.sendOffCommand();
|
|
78
|
+
this.logInfo('physical device turned off (via platform helper).');
|
|
79
79
|
}
|
|
80
80
|
catch (error) {
|
|
81
81
|
this.logError('failed to turn off:', error);
|
|
@@ -93,9 +93,9 @@ export class DimmableLightAccessory extends BaseMatterAccessory {
|
|
|
93
93
|
this.currentLevel = level;
|
|
94
94
|
this.logInfo(`setting brightness to ${brightnessPercent}% (level: ${level}), transitionTime: ${transitionTime}.`);
|
|
95
95
|
try {
|
|
96
|
-
//
|
|
97
|
-
|
|
98
|
-
this.logInfo(`physical device brightness set to ${brightnessPercent}
|
|
96
|
+
// Use platform helper (OpenAPI/BLE) when available
|
|
97
|
+
await this.sendSetBrightness(brightnessPercent);
|
|
98
|
+
this.logInfo(`physical device brightness set to ${brightnessPercent}% (via platform helper).`);
|
|
99
99
|
}
|
|
100
100
|
catch (error) {
|
|
101
101
|
this.logError('Failed to set brightness:', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DimmableLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/DimmableLightAccessory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D;;;;;;;;GAQG;AACH,MAAM,OAAO,sBAAuB,SAAQ,mBAAmB;IAC7D,sBAAsB;IACd,YAAY,GAAW,GAAG,CAAA,CAAC,iBAAiB;IAEpD,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,gBAAgB,CAAA;QACzD,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,0BAA0B,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;SAChE,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC/B,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE;aAClC;YACD,YAAY,EAAE;gBACZ,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;aAClG;SACF,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa;YAChD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAE3B,IAAI,CAAC;YACH,
|
|
1
|
+
{"version":3,"file":"DimmableLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/DimmableLightAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtendedColorLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/ExtendedColorLightAccessory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAkB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"ExtendedColorLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/ExtendedColorLightAccessory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAkB,MAAM,YAAY,CAAA;AAG7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,qBAAa,2BAA4B,SAAQ,mBAAmB;gBACtD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;YAmDtH,QAAQ;YAKR,SAAS;YAKT,cAAc;YAOd,cAAc;YASd,sBAAsB;YAStB,yBAAyB;IAOhC,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAIrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAKvC,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAQlE"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Extended Color Light Accessory Class (HS+CCT)
|
|
3
3
|
* Hue, Saturation, and Color Temperature control
|
|
4
4
|
*/
|
|
5
|
+
import { hs2rgb } from '../utils.js';
|
|
5
6
|
import { BaseMatterAccessory } from './BaseMatterAccessory.js';
|
|
6
7
|
export class ExtendedColorLightAccessory extends BaseMatterAccessory {
|
|
7
8
|
constructor(api, log, opts) {
|
|
@@ -52,41 +53,39 @@ export class ExtendedColorLightAccessory extends BaseMatterAccessory {
|
|
|
52
53
|
}
|
|
53
54
|
async handleOn() {
|
|
54
55
|
this.logInfo('turning on.');
|
|
55
|
-
|
|
56
|
+
await this.sendOnCommand();
|
|
56
57
|
}
|
|
57
58
|
async handleOff() {
|
|
58
59
|
this.logInfo('turning off.');
|
|
59
|
-
|
|
60
|
+
await this.sendOffCommand();
|
|
60
61
|
}
|
|
61
62
|
async handleSetLevel(request) {
|
|
62
63
|
this.logInfo(`MoveToLevel request: ${JSON.stringify(request)}`);
|
|
63
64
|
const { level } = request;
|
|
64
65
|
const brightnessPercent = Math.round((level / 254) * 100);
|
|
65
|
-
this.
|
|
66
|
-
// TODO: await myLightAPI.setBrightness(brightnessPercent)
|
|
66
|
+
await this.sendSetBrightness(brightnessPercent);
|
|
67
67
|
}
|
|
68
68
|
async handleSetColor(request) {
|
|
69
69
|
this.logInfo(`MoveToColor request: ${JSON.stringify(request)}`);
|
|
70
|
-
const { colorX, colorY
|
|
71
|
-
const
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
70
|
+
const { colorX, colorY } = request;
|
|
71
|
+
const hueApprox = Math.round((colorX / 65535) * 360);
|
|
72
|
+
const satApprox = Math.round((colorY / 65535) * 100);
|
|
73
|
+
const [r, g, b] = hs2rgb(hueApprox, satApprox);
|
|
74
|
+
await this.sendSetColor(r, g, b);
|
|
75
75
|
}
|
|
76
76
|
async handleSetHueSaturation(request) {
|
|
77
77
|
this.logInfo(`MoveToHueAndSaturation request: ${JSON.stringify(request)}`);
|
|
78
|
-
const { hue, saturation
|
|
78
|
+
const { hue, saturation } = request;
|
|
79
79
|
const hueDegrees = Math.round((hue / 254) * 360);
|
|
80
80
|
const saturationPercent = Math.round((saturation / 254) * 100);
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
const [r, g, b] = hs2rgb(hueDegrees, saturationPercent);
|
|
82
|
+
await this.sendSetColor(r, g, b);
|
|
83
83
|
}
|
|
84
84
|
async handleSetColorTemperature(request) {
|
|
85
85
|
this.logInfo(`MoveToColorTemperature request: ${JSON.stringify(request)}`);
|
|
86
|
-
const { colorTemperatureMireds
|
|
86
|
+
const { colorTemperatureMireds } = request;
|
|
87
87
|
const kelvin = Math.round(1000000 / colorTemperatureMireds);
|
|
88
|
-
this.
|
|
89
|
-
// TODO: await myLightAPI.setColorTemperature(kelvin, transitionTime)
|
|
88
|
+
await this.sendSetColorTemperature(kelvin);
|
|
90
89
|
}
|
|
91
90
|
updateOnOffState(isOn) {
|
|
92
91
|
this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExtendedColorLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ExtendedColorLightAccessory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,2BAA4B,SAAQ,mBAAmB;IAClE,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,gCAAgC,CAAA;QACzE,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,iCAAiC,CAAA;QAC9D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;YACvB,YAAY,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE;YAC/D,YAAY,EAAE;gBACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,8BAA8B;gBACjF,UAAU,EAAE,CAAC;gBACb,iBAAiB,EAAE,GAAG;gBACtB,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,KAAK;gBACf,sBAAsB,EAAE,GAAG;gBAC3B,0BAA0B,EAAE,GAAG;gBAC/B,0BAA0B,EAAE,GAAG;gBAC/B,+BAA+B,EAAE,GAAG;aACrC;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;YAC7E,YAAY,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YACnH,YAAY,EAAE;gBACZ,gBAAgB,EAAE,KAAK,EAAE,OAAmC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC7F,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;gBAC3H,2BAA2B,EAAE,KAAK,EAAE,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;aAC/H;SACF,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,kBAAkB;YACrD,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,
|
|
1
|
+
{"version":3,"file":"ExtendedColorLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/ExtendedColorLightAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnOffLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/OnOffLightAccessory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;gBAC9C,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"OnOffLightAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/OnOffLightAccessory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D;;;;;GAKG;AACH,qBAAa,mBAAoB,SAAQ,mBAAmB;gBAC9C,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAkCpI;;OAEG;YACW,eAAe;IAgB7B;;OAEG;YACW,gBAAgB;IAgB9B;;;OAGG;IACI,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAK5C;;;OAGG;IACI,eAAe,IAAI,IAAI;CAqB/B"}
|
|
@@ -22,12 +22,8 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
|
|
|
22
22
|
const clusters = opts?.clusters ?? { onOff: { onOff: true } };
|
|
23
23
|
const handlers = opts?.handlers ?? {
|
|
24
24
|
onOff: {
|
|
25
|
-
on: async () =>
|
|
26
|
-
|
|
27
|
-
},
|
|
28
|
-
off: async () => {
|
|
29
|
-
log.debug(`${displayName} off handler invoked (default no-op).`);
|
|
30
|
-
},
|
|
25
|
+
on: async () => this.handleOnCommand(),
|
|
26
|
+
off: async () => this.handleOffCommand(),
|
|
31
27
|
},
|
|
32
28
|
};
|
|
33
29
|
// Call parent constructor with device configuration
|
|
@@ -52,13 +48,9 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
|
|
|
52
48
|
async handleOnCommand() {
|
|
53
49
|
this.logInfo('turning on.');
|
|
54
50
|
try {
|
|
55
|
-
//
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
// await fetch('http://192.168.1.50/api/light/on')
|
|
59
|
-
// mqttClient.publish('home/light/command', JSON.stringify({ state: 'ON' }))
|
|
60
|
-
// await myLightAPI.turnOn(this.context.deviceId)
|
|
61
|
-
this.logInfo('physical device turned on.');
|
|
51
|
+
// Delegate to the platform-provided helper (OpenAPI/BLE) when available
|
|
52
|
+
await this.sendOnCommand();
|
|
53
|
+
this.logInfo('physical device turned on (via platform helper).');
|
|
62
54
|
// State automatically updated by Homebridge after handler completes
|
|
63
55
|
}
|
|
64
56
|
catch (error) {
|
|
@@ -72,9 +64,9 @@ export class OnOffLightAccessory extends BaseMatterAccessory {
|
|
|
72
64
|
async handleOffCommand() {
|
|
73
65
|
this.logInfo('turning off.');
|
|
74
66
|
try {
|
|
75
|
-
//
|
|
76
|
-
|
|
77
|
-
this.logInfo('physical device turned off.');
|
|
67
|
+
// Delegate to the platform-provided helper (OpenAPI/BLE) when available
|
|
68
|
+
await this.sendOffCommand();
|
|
69
|
+
this.logInfo('physical device turned off (via platform helper).');
|
|
78
70
|
// State automatically updated by Homebridge after handler completes
|
|
79
71
|
}
|
|
80
72
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnOffLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffLightAccessory.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D;;;;;GAKG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,WAAW,CAAA;QACtD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,cAAc,CAAA;QACvD,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,wBAAwB,CAAA;QACrD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAA;QAC7D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"OnOffLightAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffLightAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnOffOutletAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/OnOffOutletAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,qBAAa,oBAAqB,SAAQ,mBAAmB;gBAC/C,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"OnOffOutletAccessory.d.ts","sourceRoot":"","sources":["../../src/devices-matter/OnOffOutletAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,qBAAa,oBAAqB,SAAQ,mBAAmB;gBAC/C,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,uBAAuB,EAAE,yBAAyB,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IA4B7H,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;YAI9B,QAAQ;YAKR,SAAS;CAIxB"}
|
|
@@ -9,13 +9,8 @@ export class OnOffOutletAccessory extends BaseMatterAccessory {
|
|
|
9
9
|
const clusters = opts?.clusters ?? { onOff: { onOff: false } };
|
|
10
10
|
const handlers = opts?.handlers ?? {
|
|
11
11
|
onOff: {
|
|
12
|
-
on: async () =>
|
|
13
|
-
|
|
14
|
-
log.debug(`${displayName} on handler invoked (default no-op).`);
|
|
15
|
-
},
|
|
16
|
-
off: async () => {
|
|
17
|
-
log.debug(`${displayName} off handler invoked (default no-op).`);
|
|
18
|
-
},
|
|
12
|
+
on: async () => this.handleOn(),
|
|
13
|
+
off: async () => this.handleOff(),
|
|
19
14
|
},
|
|
20
15
|
};
|
|
21
16
|
super(api, log, {
|
|
@@ -36,5 +31,13 @@ export class OnOffOutletAccessory extends BaseMatterAccessory {
|
|
|
36
31
|
updateOnOffState(isOn) {
|
|
37
32
|
this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn });
|
|
38
33
|
}
|
|
34
|
+
async handleOn() {
|
|
35
|
+
this.logInfo('turning on.');
|
|
36
|
+
await this.sendOnCommand();
|
|
37
|
+
}
|
|
38
|
+
async handleOff() {
|
|
39
|
+
this.logInfo('turning off.');
|
|
40
|
+
await this.sendOffCommand();
|
|
41
|
+
}
|
|
39
42
|
}
|
|
40
43
|
//# sourceMappingURL=OnOffOutletAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnOffOutletAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffOutletAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;IAC3D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,YAAY,CAAA;QACvD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,eAAe,CAAA;QACxD,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAA;QAC9D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"OnOffOutletAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffOutletAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;IAC3D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,YAAY,CAAA;QACvD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,eAAe,CAAA;QACxD,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAA;QAC9D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI;YACjC,KAAK,EAAE;gBACL,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC/B,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE;aAClC;SACF,CAAA;QAED,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW;YAC9C,YAAY;YACZ,YAAY,EAAE,IAAI,EAAE,YAAY,IAAI,mBAAmB;YACvD,KAAK,EAAE,IAAI,EAAE,KAAK,IAAI,yBAAyB;YAC/C,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,IAAI,OAAO;YACnD,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,IAAI,OAAO;YACnD,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEM,gBAAgB,CAAC,IAAa;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;CACF"}
|
|
@@ -29,11 +29,11 @@ export class OnOffSwitchAccessory extends BaseMatterAccessory {
|
|
|
29
29
|
}
|
|
30
30
|
async handleOn() {
|
|
31
31
|
this.logInfo('turning on.');
|
|
32
|
-
|
|
32
|
+
await this.sendOnCommand();
|
|
33
33
|
}
|
|
34
34
|
async handleOff() {
|
|
35
35
|
this.logInfo('turning off.');
|
|
36
|
-
|
|
36
|
+
await this.sendOffCommand();
|
|
37
37
|
}
|
|
38
38
|
updateOnOffState(isOn) {
|
|
39
39
|
this.updateState(this.api.matter.clusterNames.OnOff, { onOff: isOn });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnOffSwitchAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffSwitchAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;IAC3D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,YAAY,CAAA;QACvD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,eAAe,CAAA;QACxD,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,yBAAyB,CAAA;QACtD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAA;QAC9D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAA;QAEpH,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW;YAC9C,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,
|
|
1
|
+
{"version":3,"file":"OnOffSwitchAccessory.js","sourceRoot":"","sources":["../../src/devices-matter/OnOffSwitchAccessory.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,OAAO,oBAAqB,SAAQ,mBAAmB;IAC3D,YAAY,GAAQ,EAAE,GAAW,EAAE,IAAiG;QAClI,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,YAAY,CAAA;QACvD,MAAM,WAAW,GAAG,IAAI,EAAE,WAAW,IAAI,eAAe,CAAA;QACxD,MAAM,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAA;QAC9D,MAAM,KAAK,GAAG,IAAI,EAAE,KAAK,IAAI,yBAAyB,CAAA;QACtD,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAA;QAE1D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAA;QAC9D,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,CAAA;QAEpH,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE;YACd,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC1D,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW;YAC9C,YAAY;YACZ,YAAY;YACZ,KAAK;YACL,gBAAgB;YAChB,gBAAgB;YAChB,QAAQ;YACR,QAAQ;YACR,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE;SAChE,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;IAC9B,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;IAC5B,CAAC;IAEO,KAAK,CAAC,SAAS;QACrB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC5B,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;IAC7B,CAAC;IAEM,gBAAgB,CAAC,IAAa;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACvE,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"baseMatterAccessory.test.d.ts","sourceRoot":"","sources":["../../src/devices-matter/baseMatterAccessory.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
+
import { BaseMatterAccessory } from './BaseMatterAccessory.js';
|
|
3
|
+
// Minimal concrete subclass for testing
|
|
4
|
+
class TestAccessory extends BaseMatterAccessory {
|
|
5
|
+
constructor(api, log, opts) {
|
|
6
|
+
super(api, log, {
|
|
7
|
+
uuid: opts?.uuid ?? api.matter.uuid.generate('test'),
|
|
8
|
+
displayName: opts?.displayName ?? 'Test',
|
|
9
|
+
deviceType: opts?.deviceType ?? 'OnOffLight',
|
|
10
|
+
serialNumber: opts?.serialNumber ?? 'TEST-1',
|
|
11
|
+
manufacturer: opts?.manufacturer ?? 'TestCo',
|
|
12
|
+
model: opts?.model ?? 'T-1',
|
|
13
|
+
firmwareRevision: opts?.firmwareRevision ?? '1.0',
|
|
14
|
+
hardwareRevision: opts?.hardwareRevision ?? '1.0',
|
|
15
|
+
context: opts?.context ?? {},
|
|
16
|
+
clusters: opts?.clusters,
|
|
17
|
+
handlers: opts?.handlers,
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
describe('baseMatterAccessory helpers', () => {
|
|
22
|
+
it('sendOnCommand uses OpenAPI helper and updates state', async () => {
|
|
23
|
+
const update = vi.fn();
|
|
24
|
+
const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }));
|
|
25
|
+
const api = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-1' }, updateAccessoryState: update } };
|
|
26
|
+
const log = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() };
|
|
27
|
+
const ctx = { deviceId: 'DEV-1', sendOpenAPI, connectionType: 'OpenAPI' };
|
|
28
|
+
const acc = new TestAccessory(api, log, { context: ctx });
|
|
29
|
+
await acc.sendOnCommand();
|
|
30
|
+
expect(sendOpenAPI).toHaveBeenCalledWith('turnOn', 'default');
|
|
31
|
+
expect(update).toHaveBeenCalledWith(acc.uuid, 'onOff', { onOff: true });
|
|
32
|
+
});
|
|
33
|
+
it('sendOnCommand uses BLE helper when connectionType is BLE', async () => {
|
|
34
|
+
const update = vi.fn();
|
|
35
|
+
const sendBLE = vi.fn(async () => true);
|
|
36
|
+
const api = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-2' }, updateAccessoryState: update } };
|
|
37
|
+
const log = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() };
|
|
38
|
+
const ctx = { deviceId: 'DEV-2', sendBLE, connectionType: 'BLE' };
|
|
39
|
+
const acc = new TestAccessory(api, log, { context: ctx });
|
|
40
|
+
await acc.sendOnCommand();
|
|
41
|
+
expect(sendBLE).toHaveBeenCalledWith('turnOn');
|
|
42
|
+
expect(update).toHaveBeenCalledWith(acc.uuid, 'onOff', { onOff: true });
|
|
43
|
+
});
|
|
44
|
+
it('sendSetBrightness sends percent and updates LevelControl', async () => {
|
|
45
|
+
const update = vi.fn();
|
|
46
|
+
const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }));
|
|
47
|
+
const api = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-3' }, updateAccessoryState: update } };
|
|
48
|
+
const log = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() };
|
|
49
|
+
const ctx = { deviceId: 'DEV-3', sendOpenAPI, connectionType: 'OpenAPI' };
|
|
50
|
+
const acc = new TestAccessory(api, log, { context: ctx });
|
|
51
|
+
await acc.sendSetBrightness(50);
|
|
52
|
+
expect(sendOpenAPI).toHaveBeenCalledWith('setBrightness', '50');
|
|
53
|
+
const expectedLevel = Math.round((50 / 100) * 254);
|
|
54
|
+
expect(update).toHaveBeenCalledWith(acc.uuid, 'level', { currentLevel: expectedLevel });
|
|
55
|
+
});
|
|
56
|
+
it('sendSetColor sends RGB and updates ColorControl', async () => {
|
|
57
|
+
const update = vi.fn();
|
|
58
|
+
const sendOpenAPI = vi.fn(async () => ({ response: {}, statusCode: 200 }));
|
|
59
|
+
const api = { matter: { clusterNames: { OnOff: 'onOff', LevelControl: 'level', ColorControl: 'color' }, uuid: { generate: () => 'uuid-4' }, updateAccessoryState: update } };
|
|
60
|
+
const log = { info: vi.fn(), debug: vi.fn(), error: vi.fn(), warn: vi.fn() };
|
|
61
|
+
const ctx = { deviceId: 'DEV-4', sendOpenAPI, connectionType: 'OpenAPI' };
|
|
62
|
+
const acc = new TestAccessory(api, log, { context: ctx });
|
|
63
|
+
await acc.sendSetColor(255, 128, 0);
|
|
64
|
+
expect(sendOpenAPI).toHaveBeenCalledWith('setColor', '255:128:0');
|
|
65
|
+
expect(update).toHaveBeenCalled();
|
|
66
|
+
// Ensure we updated ColorControl cluster with numeric attributes
|
|
67
|
+
const calledWith = (update.mock.calls[0] || update.mock.calls[1]);
|
|
68
|
+
expect(calledWith[1] === 'color' || calledWith[1] === api.matter.clusterNames.ColorControl).toBeTruthy();
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
//# sourceMappingURL=baseMatterAccessory.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"baseMatterAccessory.test.js","sourceRoot":"","sources":["../../src/devices-matter/baseMatterAccessory.test.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;yBAQrB,KAAK,GAAG,KAAG,IAAI;AAA/B,wBAIC"}
|
package/dist/index.js
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { SwitchBotHAPPlatform } from './platform-hap.js';
|
|
2
2
|
import { SwitchBotMatterPlatform } from './platform-matter.js';
|
|
3
3
|
import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
|
|
4
|
+
import { createPlatformProxy } from './utils.js';
|
|
4
5
|
// Register our platform with homebridge.
|
|
5
6
|
export default (api) => {
|
|
6
|
-
//
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
// If Matter is enabled register the Matter platform, otherwise use HAP platform.
|
|
10
|
-
api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, isMatter ? SwitchBotMatterPlatform : SwitchBotHAPPlatform);
|
|
7
|
+
// Create and register a small proxy that selects the correct platform (HAP or Matter) at runtime.
|
|
8
|
+
const ProxyCtor = createPlatformProxy(SwitchBotHAPPlatform, SwitchBotMatterPlatform);
|
|
9
|
+
api.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, ProxyCtor);
|
|
11
10
|
};
|
|
12
11
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,yCAAyC;AACzC,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,kGAAkG;IAClG,MAAM,SAAS,GAAG,mBAAmB,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,CAAA;IACpF,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,SAAgB,CAAC,CAAA;AACpE,CAAC,CAAA"}
|
package/dist/index.test.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from 'vitest';
|
|
2
2
|
import registerPlatform from './index.js';
|
|
3
|
-
import { SwitchBotHAPPlatform } from './platform-hap.js';
|
|
4
3
|
import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
|
|
5
4
|
describe('index.ts', () => {
|
|
6
5
|
it('should register the platform with homebridge', () => {
|
|
@@ -8,7 +7,13 @@ describe('index.ts', () => {
|
|
|
8
7
|
registerPlatform: vi.fn(),
|
|
9
8
|
};
|
|
10
9
|
registerPlatform(api);
|
|
11
|
-
|
|
10
|
+
// The platform registration now uses a runtime proxy/delegate constructor so
|
|
11
|
+
// assert the call happened and the third argument is a constructor function.
|
|
12
|
+
expect(api.registerPlatform).toHaveBeenCalled();
|
|
13
|
+
const callArgs = api.registerPlatform.mock.calls[0];
|
|
14
|
+
expect(callArgs[0]).toBe(PLUGIN_NAME);
|
|
15
|
+
expect(callArgs[1]).toBe(PLATFORM_NAME);
|
|
16
|
+
expect(typeof callArgs[2]).toBe('function');
|
|
12
17
|
});
|
|
13
18
|
});
|
|
14
19
|
//# sourceMappingURL=index.test.js.map
|
package/dist/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,OAAO,gBAAgB,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,OAAO,gBAAgB,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE1D,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,GAAG,GAAG;YACV,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;SACR,CAAA;QAEnB,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAErB,6EAA6E;QAC7E,6EAA6E;QAC7E,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,EAAE,CAAA;QAC/C,MAAM,QAAQ,GAAI,GAAG,CAAC,gBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5D,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACrC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACvC,MAAM,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
|