@victronenergy/mfd-modules 9.11.0 → 10.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.d.ts +6 -3
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.d.ts.map +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.js +28 -27
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.js.map +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.d.ts +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.d.ts.map +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.js +12 -8
- package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.js.map +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.d.ts +2 -2
- package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.d.ts.map +1 -1
- package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.js +6 -6
- package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.js.map +1 -1
- package/dist/src/utils/hsvw.d.ts.map +1 -1
- package/dist/src/utils/hsvw.js +1 -6
- package/dist/src/utils/hsvw.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,9 +2,12 @@ import { PortalId, Topics } from "../Mqtt";
|
|
|
2
2
|
import { SwitchingDeviceInstanceId } from "./SwitchingDevice.provider";
|
|
3
3
|
import { SwitchableOutputStatus, SwitchableOutputType } from "../../utils/constants";
|
|
4
4
|
import { HSVWColorArray } from "../../utils/hsvw";
|
|
5
|
+
export declare const SWITCHABLE_OUTPUT_TREES: readonly ["system", "switch"];
|
|
6
|
+
export type SwitchableOutputTree = (typeof SWITCHABLE_OUTPUT_TREES)[number];
|
|
5
7
|
export type SwitchableOutputId = string;
|
|
6
8
|
export type SwitchableOutputUnit = string | "/Speed" | "/Temperature" | "/Volume";
|
|
7
9
|
export interface SwitchableOutputState {
|
|
10
|
+
tree: SwitchableOutputTree;
|
|
8
11
|
deviceId: SwitchingDeviceInstanceId;
|
|
9
12
|
outputId: SwitchableOutputId;
|
|
10
13
|
type: SwitchableOutputType;
|
|
@@ -50,7 +53,7 @@ export interface SwitchableOutputTopics extends Topics {
|
|
|
50
53
|
labels?: string[];
|
|
51
54
|
}
|
|
52
55
|
export declare const getSwitchableOutputNameForDisplay: (state: SwitchableOutputState, switchingDeviceName: string) => string;
|
|
53
|
-
export declare const getSwitchableOutputStateTopics: (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => {
|
|
56
|
+
export declare const getSwitchableOutputStateTopics: (portalId: PortalId, tree: SwitchableOutputTree, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => {
|
|
54
57
|
type: string;
|
|
55
58
|
status: string;
|
|
56
59
|
name: string;
|
|
@@ -69,11 +72,11 @@ export declare const getSwitchableOutputStateTopics: (portalId: PortalId, device
|
|
|
69
72
|
labels: string;
|
|
70
73
|
lightControls: string;
|
|
71
74
|
};
|
|
72
|
-
export declare const getSwitchableOutputWriteTopics: (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => {
|
|
75
|
+
export declare const getSwitchableOutputWriteTopics: (portalId: PortalId, tree: SwitchableOutputTree, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => {
|
|
73
76
|
auto: string;
|
|
74
77
|
state: string;
|
|
75
78
|
dimming: string;
|
|
76
79
|
lightControls: string;
|
|
77
80
|
};
|
|
78
|
-
export declare function useSwitchableOutput(deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId): SwitchableOutputProvider;
|
|
81
|
+
export declare function useSwitchableOutput(tree: SwitchableOutputTree, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId): SwitchableOutputProvider;
|
|
79
82
|
//# sourceMappingURL=SwitchableOutput.provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchableOutput.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SwitchableOutput.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ var __assign = (this && this.__assign) || function () {
|
|
|
12
12
|
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
13
13
|
import { useMemo } from "react";
|
|
14
14
|
import { hsvwArrayToJSON } from "../../utils/hsvw";
|
|
15
|
+
export var SWITCHABLE_OUTPUT_TREES = ["system", "switch"];
|
|
15
16
|
export var getSwitchableOutputNameForDisplay = function (state, switchingDeviceName) {
|
|
16
17
|
// when custom name defined, or group not overriden
|
|
17
18
|
if (state.customName || state.group === "") {
|
|
@@ -20,41 +21,41 @@ export var getSwitchableOutputNameForDisplay = function (state, switchingDeviceN
|
|
|
20
21
|
// otherwise prepend switching device name
|
|
21
22
|
return "".concat(switchingDeviceName, " | ").concat(state.name);
|
|
22
23
|
};
|
|
23
|
-
export var getSwitchableOutputStateTopics = function (portalId, deviceId, outputId) { return ({
|
|
24
|
-
type: "N/".concat(portalId, "/
|
|
25
|
-
status: "N/".concat(portalId, "/
|
|
26
|
-
name: "N/".concat(portalId, "/
|
|
27
|
-
customName: "N/".concat(portalId, "/
|
|
28
|
-
group: "N/".concat(portalId, "/
|
|
29
|
-
showUIControl: "N/".concat(portalId, "/
|
|
30
|
-
auto: "N/".concat(portalId, "/
|
|
31
|
-
state: "N/".concat(portalId, "/
|
|
32
|
-
dimming: "N/".concat(portalId, "/
|
|
33
|
-
dimmingMin: "N/".concat(portalId, "/
|
|
34
|
-
dimmingMax: "N/".concat(portalId, "/
|
|
35
|
-
stepSize: "N/".concat(portalId, "/
|
|
36
|
-
measurement: "N/".concat(portalId, "/
|
|
37
|
-
unit: "N/".concat(portalId, "/
|
|
38
|
-
decimals: "N/".concat(portalId, "/
|
|
39
|
-
labels: "N/".concat(portalId, "/
|
|
40
|
-
lightControls: "N/".concat(portalId, "/
|
|
24
|
+
export var getSwitchableOutputStateTopics = function (portalId, tree, deviceId, outputId) { return ({
|
|
25
|
+
type: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Type"),
|
|
26
|
+
status: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Status"),
|
|
27
|
+
name: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Name"),
|
|
28
|
+
customName: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/CustomName"),
|
|
29
|
+
group: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Group"),
|
|
30
|
+
showUIControl: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/ShowUIControl"),
|
|
31
|
+
auto: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Auto"),
|
|
32
|
+
state: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/State"),
|
|
33
|
+
dimming: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Dimming"),
|
|
34
|
+
dimmingMin: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/DimmingMin"),
|
|
35
|
+
dimmingMax: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/DimmingMax"),
|
|
36
|
+
stepSize: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/StepSize"),
|
|
37
|
+
measurement: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Measurement"),
|
|
38
|
+
unit: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Unit"),
|
|
39
|
+
decimals: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Decimals"),
|
|
40
|
+
labels: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Labels"),
|
|
41
|
+
lightControls: "N/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/LightControls"),
|
|
41
42
|
}); };
|
|
42
|
-
export var getSwitchableOutputWriteTopics = function (portalId, deviceId, outputId) { return ({
|
|
43
|
-
auto: "W/".concat(portalId, "/
|
|
44
|
-
state: "W/".concat(portalId, "/
|
|
45
|
-
dimming: "W/".concat(portalId, "/
|
|
46
|
-
lightControls: "W/".concat(portalId, "/
|
|
43
|
+
export var getSwitchableOutputWriteTopics = function (portalId, tree, deviceId, outputId) { return ({
|
|
44
|
+
auto: "W/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Auto"),
|
|
45
|
+
state: "W/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/State"),
|
|
46
|
+
dimming: "W/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Dimming"),
|
|
47
|
+
lightControls: "W/".concat(portalId, "/").concat(tree, "/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/LightControls"),
|
|
47
48
|
}); };
|
|
48
|
-
export function useSwitchableOutput(deviceId, outputId) {
|
|
49
|
+
export function useSwitchableOutput(tree, deviceId, outputId) {
|
|
49
50
|
var mqtt = useMqtt();
|
|
50
|
-
var topics = useMemo(function () { return getSwitchableOutputStateTopics(mqtt.portalId, deviceId, outputId); }, [mqtt.portalId, deviceId, outputId]);
|
|
51
|
-
var writeTopics = useMemo(function () { return getSwitchableOutputWriteTopics(mqtt.portalId, deviceId, outputId); }, [mqtt.portalId, deviceId, outputId]);
|
|
51
|
+
var topics = useMemo(function () { return getSwitchableOutputStateTopics(mqtt.portalId, tree, deviceId, outputId); }, [mqtt.portalId, deviceId, outputId]);
|
|
52
|
+
var writeTopics = useMemo(function () { return getSwitchableOutputWriteTopics(mqtt.portalId, tree, deviceId, outputId); }, [mqtt.portalId, deviceId, outputId]);
|
|
52
53
|
var updateAuto = function (auto) { return mqtt.publish(writeTopics.auto, auto); };
|
|
53
54
|
var updateState = function (state) { return mqtt.publish(writeTopics.state, state); };
|
|
54
55
|
var updateDimming = function (dimming) { return mqtt.publish(writeTopics.dimming, dimming); };
|
|
55
56
|
var updateLightControls = function (hsvwa) {
|
|
56
57
|
return mqtt.publish(writeTopics.lightControls, { raw: hsvwArrayToJSON(hsvwa) });
|
|
57
58
|
};
|
|
58
|
-
return __assign(__assign({}, useTopicsState(topics)), { updateAuto: updateAuto, updateState: updateState, updateDimming: updateDimming, updateLightControls: updateLightControls });
|
|
59
|
+
return __assign(__assign({}, useTopicsState(topics)), { tree: tree, updateAuto: updateAuto, updateState: updateState, updateDimming: updateDimming, updateLightControls: updateLightControls });
|
|
59
60
|
}
|
|
60
61
|
//# sourceMappingURL=SwitchableOutput.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchableOutput.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,OAAO,EAAE,eAAe,EAAkB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"SwitchableOutput.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,OAAO,EAAE,eAAe,EAAkB,MAAM,kBAAkB,CAAA;AAElE,MAAM,CAAC,IAAM,uBAAuB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAU,CAAA;AAwDpE,MAAM,CAAC,IAAM,iCAAiC,GAAG,UAAC,KAA4B,EAAE,mBAA2B;IACzG,mDAAmD;IACnD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,KAAK,KAAK,EAAE,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,CAAA;IACvC,CAAC;IACD,0CAA0C;IAC1C,OAAO,UAAG,mBAAmB,gBAAM,KAAK,CAAC,IAAI,CAAE,CAAA;AACjD,CAAC,CAAA;AAED,MAAM,CAAC,IAAM,8BAA8B,GAAG,UAC5C,QAAkB,EAClB,IAA0B,EAC1B,QAAmC,EACnC,QAA4B,IACzB,OAAA,CAAC;IACJ,IAAI,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,mBAAgB;IACpF,MAAM,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,YAAS;IAC/E,IAAI,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,UAAO;IAC3E,UAAU,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,yBAAsB;IAChG,KAAK,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,oBAAiB;IACtF,aAAa,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,4BAAyB;IACtG,IAAI,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,UAAO;IAC3E,KAAK,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,WAAQ;IAC7E,OAAO,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,aAAU;IACjF,UAAU,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,yBAAsB;IAChG,UAAU,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,yBAAsB;IAChG,QAAQ,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,uBAAoB;IAC5F,WAAW,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,iBAAc;IACzF,IAAI,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,mBAAgB;IACpF,QAAQ,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,uBAAoB;IAC5F,MAAM,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,qBAAkB;IACxF,aAAa,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,mBAAgB;CAC9F,CAAC,EAlBG,CAkBH,CAAA;AAEF,MAAM,CAAC,IAAM,8BAA8B,GAAG,UAC5C,QAAkB,EAClB,IAA0B,EAC1B,QAAmC,EACnC,QAA4B,IACzB,OAAA,CAAC;IACJ,IAAI,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,UAAO;IAC3E,KAAK,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,WAAQ;IAC7E,OAAO,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,aAAU;IACjF,aAAa,EAAE,YAAK,QAAQ,cAAI,IAAI,cAAI,QAAQ,+BAAqB,QAAQ,mBAAgB;CAC9F,CAAC,EALG,CAKH,CAAA;AAEF,MAAM,UAAU,mBAAmB,CACjC,IAA0B,EAC1B,QAAmC,EACnC,QAA4B;IAE5B,IAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IACtB,IAAM,MAAM,GAAG,OAAO,CACpB,cAAM,OAAA,8BAA8B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAvE,CAAuE,EAC7E,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CACpC,CAAA;IACD,IAAM,WAAW,GAAG,OAAO,CACzB,cAAM,OAAA,8BAA8B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAvE,CAAuE,EAC7E,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CACpC,CAAA;IAED,IAAM,UAAU,GAAG,UAAC,IAAW,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,IAAI,EAAE,IAAI,CAAC,EAArC,CAAqC,CAAA;IACzE,IAAM,WAAW,GAAG,UAAC,KAAY,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAvC,CAAuC,CAAA;IAC7E,IAAM,aAAa,GAAG,UAAC,OAAe,IAAK,OAAA,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,OAAO,EAAE,OAAO,CAAC,EAA3C,CAA2C,CAAA;IACtF,IAAM,mBAAmB,GAAG,UAAC,KAAqB;QAChD,OAAA,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;IAAzE,CAAyE,CAAA;IAE3E,6BACK,cAAc,CAAwB,MAAM,CAAC,KAChD,IAAI,EAAE,IAAI,EACV,UAAU,YAAA,EACV,WAAW,aAAA,EACX,aAAa,eAAA,EACb,mBAAmB,qBAAA,IACpB;AACH,CAAC","sourcesContent":["import { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport { useMemo } from \"react\"\nimport { SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport { SwitchableOutputStatus, SwitchableOutputType } from \"../../utils/constants\"\nimport { hsvwArrayToJSON, HSVWColorArray } from \"../../utils/hsvw\"\n\nexport const SWITCHABLE_OUTPUT_TREES = [\"system\", \"switch\"] as const\nexport type SwitchableOutputTree = (typeof SWITCHABLE_OUTPUT_TREES)[number]\nexport type SwitchableOutputId = string\nexport type SwitchableOutputUnit = string | \"/Speed\" | \"/Temperature\" | \"/Volume\"\n\nexport interface SwitchableOutputState {\n tree: SwitchableOutputTree\n deviceId: SwitchingDeviceInstanceId\n outputId: SwitchableOutputId\n type: SwitchableOutputType\n status: SwitchableOutputStatus\n name: string\n customName: string\n group: string\n parentDeviceName: string\n showUIControl: 0 | 1\n auto: 0 | 1\n state: 0 | 1\n dimming?: number\n dimmingMin?: number\n dimmingMax?: number\n // NOTE: stepSize can be of any precision, respect the precision in the UI\n stepSize?: number\n measurement?: number\n unit: SwitchableOutputUnit\n decimals?: number\n // NOTE: JSON encoded string array\n labels: string\n lightControls: HSVWColorArray\n}\n\nexport interface SwitchableOutputProvider extends SwitchableOutputState {\n updateAuto: (auto: 0 | 1) => void\n updateState: (state: 0 | 1) => void\n updateDimming: (dimming: number) => void\n updateLightControls: (hsvwa: HSVWColorArray) => void\n}\n\nexport interface SwitchableOutputTopics extends Topics {\n type?: string\n status?: string\n name?: string\n customName?: string\n group?: string\n showUIControl?: string\n auto?: string\n state?: string\n dimming?: string\n dimmingMin?: string\n dimmingMax?: string\n stepSize?: string\n measurement?: string\n unit?: string\n labels?: string[]\n}\n\nexport const getSwitchableOutputNameForDisplay = (state: SwitchableOutputState, switchingDeviceName: string) => {\n // when custom name defined, or group not overriden\n if (state.customName || state.group === \"\") {\n return state.customName || state.name\n }\n // otherwise prepend switching device name\n return `${switchingDeviceName} | ${state.name}`\n}\n\nexport const getSwitchableOutputStateTopics = (\n portalId: PortalId,\n tree: SwitchableOutputTree,\n deviceId: SwitchingDeviceInstanceId,\n outputId: SwitchableOutputId\n) => ({\n type: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/Type`,\n status: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Status`,\n name: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Name`,\n customName: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/CustomName`,\n group: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/Group`,\n showUIControl: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/ShowUIControl`,\n auto: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n state: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/State`,\n dimming: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n dimmingMin: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/DimmingMin`,\n dimmingMax: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/DimmingMax`,\n stepSize: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/StepSize`,\n measurement: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Measurement`,\n unit: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/Unit`,\n decimals: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/Decimals`,\n labels: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Settings/Labels`,\n lightControls: `N/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/LightControls`,\n})\n\nexport const getSwitchableOutputWriteTopics = (\n portalId: PortalId,\n tree: SwitchableOutputTree,\n deviceId: SwitchingDeviceInstanceId,\n outputId: SwitchableOutputId\n) => ({\n auto: `W/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n state: `W/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/State`,\n dimming: `W/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n lightControls: `W/${portalId}/${tree}/${deviceId}/SwitchableOutput/${outputId}/LightControls`,\n})\n\nexport function useSwitchableOutput(\n tree: SwitchableOutputTree,\n deviceId: SwitchingDeviceInstanceId,\n outputId: SwitchableOutputId\n): SwitchableOutputProvider {\n const mqtt = useMqtt()\n const topics = useMemo(\n () => getSwitchableOutputStateTopics(mqtt.portalId, tree, deviceId, outputId),\n [mqtt.portalId, deviceId, outputId]\n )\n const writeTopics = useMemo(\n () => getSwitchableOutputWriteTopics(mqtt.portalId, tree, deviceId, outputId),\n [mqtt.portalId, deviceId, outputId]\n )\n\n const updateAuto = (auto: 0 | 1) => mqtt.publish(writeTopics!.auto, auto)\n const updateState = (state: 0 | 1) => mqtt.publish(writeTopics!.state, state)\n const updateDimming = (dimming: number) => mqtt.publish(writeTopics!.dimming, dimming)\n const updateLightControls = (hsvwa: HSVWColorArray) =>\n mqtt.publish(writeTopics!.lightControls, { raw: hsvwArrayToJSON(hsvwa) })\n\n return {\n ...useTopicsState<SwitchableOutputState>(topics),\n tree: tree,\n updateAuto,\n updateState,\n updateDimming,\n updateLightControls,\n }\n}\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const useSwitchableOutputs: () => import("./SwitchableOutputs.store").SwitchableOutputsStore;
|
|
1
|
+
export declare const useSwitchableOutputs: (gxDeviceRelaysGroupName: string) => import("./SwitchableOutputs.store").SwitchableOutputsStore;
|
|
2
2
|
//# sourceMappingURL=SwitchableOutputs.provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchableOutputs.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"SwitchableOutputs.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB,GAAI,yBAAyB,MAAM,+DAiKnE,CAAA"}
|
|
@@ -15,11 +15,11 @@ import { useMqtt } from "../Mqtt";
|
|
|
15
15
|
import { useMemo, useEffect } from "react";
|
|
16
16
|
import { useSwitchableOutputsStore } from "./SwitchableOutputs.store";
|
|
17
17
|
import { getSwitchingDeviceStateTopics } from "./SwitchingDevice.provider";
|
|
18
|
-
import { getSwitchableOutputNameForDisplay, getSwitchableOutputStateTopics, } from "./SwitchableOutput.provider";
|
|
19
|
-
export var useSwitchableOutputs = function () {
|
|
18
|
+
import { getSwitchableOutputNameForDisplay, getSwitchableOutputStateTopics, SWITCHABLE_OUTPUT_TREES, } from "./SwitchableOutput.provider";
|
|
19
|
+
export var useSwitchableOutputs = function (gxDeviceRelaysGroupName) {
|
|
20
20
|
var switchableOutputsStore = useSwitchableOutputsStore();
|
|
21
21
|
var getTopics = function (portalId) { return ({
|
|
22
|
-
switchableOutputs: "N/".concat(portalId, "/
|
|
22
|
+
switchableOutputs: "N/".concat(portalId, "/(").concat(SWITCHABLE_OUTPUT_TREES.join("|"), ")/+/SwitchableOutput/+/Settings/+"),
|
|
23
23
|
switchingDevices: "N/".concat(portalId, "/switch/+"),
|
|
24
24
|
}); };
|
|
25
25
|
var mqtt = useMqtt();
|
|
@@ -117,17 +117,17 @@ export var useSwitchableOutputs = function () {
|
|
|
117
117
|
// and populate its initial state
|
|
118
118
|
availableSwitchableOutputs_1.forEach(function (output, index) {
|
|
119
119
|
var swo = extractSwitchableOutputInfo(output);
|
|
120
|
-
var switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId));
|
|
120
|
+
var switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.tree, swo.deviceId));
|
|
121
121
|
var customGroupAssignment = customGroupAssigments_1[index].trim();
|
|
122
|
-
var deviceName = switchingDevice.customName || switchingDevice.productName;
|
|
122
|
+
var deviceName = switchingDevice.customName || switchingDevice.productName || gxDeviceRelaysGroupName;
|
|
123
123
|
var groupName = customGroupAssignment === "" ? deviceName : customGroupAssignment;
|
|
124
|
-
var switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId));
|
|
124
|
+
var switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.tree, swo.deviceId, swo.outputId));
|
|
125
125
|
// Ignore hidden controls
|
|
126
126
|
if (switchableOutput.showUIControl === 0) {
|
|
127
127
|
return;
|
|
128
128
|
}
|
|
129
129
|
newGroups_1[groupName] || (newGroups_1[groupName] = []);
|
|
130
|
-
newGroups_1[groupName].push(__assign(__assign({}, switchableOutput), { deviceId: swo.deviceId, outputId: swo.outputId, parentDeviceName: deviceName }));
|
|
130
|
+
newGroups_1[groupName].push(__assign(__assign({}, switchableOutput), { tree: swo.tree, deviceId: swo.deviceId, outputId: swo.outputId, parentDeviceName: deviceName }));
|
|
131
131
|
});
|
|
132
132
|
Logger.log("New switchable output groups: ".concat(JSON.stringify(Object.keys(newGroups_1))));
|
|
133
133
|
// Sort switches in a group by name
|
|
@@ -147,9 +147,13 @@ export var useSwitchableOutputs = function () {
|
|
|
147
147
|
return switchableOutputsStore;
|
|
148
148
|
};
|
|
149
149
|
function extractSwitchableOutputInfo(topic) {
|
|
150
|
-
var
|
|
150
|
+
var _a;
|
|
151
|
+
var pattern = new RegExp("/(".concat(SWITCHABLE_OUTPUT_TREES.join("|"), ")/"));
|
|
152
|
+
var match = topic.match(pattern);
|
|
153
|
+
var switchStart = match ? match.index + match[0].length : -1; // length of `/system/`, or `/switch/`, or ...
|
|
151
154
|
var outputStart = topic.indexOf("/SwitchableOutput/") + 18; // length of `/SwitchableOutput/`
|
|
152
155
|
return {
|
|
156
|
+
tree: (_a = match === null || match === void 0 ? void 0 : match[1]) !== null && _a !== void 0 ? _a : null, // "switch", "system", ...
|
|
153
157
|
deviceId: topic.substring(switchStart, topic.indexOf("/", switchStart)),
|
|
154
158
|
outputId: topic.substring(outputStart, topic.indexOf("/", outputStart)),
|
|
155
159
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchableOutputs.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { autorun } from \"mobx\"\nimport Logger from \"../../utils/logger\"\nimport { PortalId, useMqtt } from \"../Mqtt\"\nimport { useMemo, useEffect } from \"react\"\nimport { useSwitchableOutputsStore } from \"./SwitchableOutputs.store\"\nimport { getSwitchingDeviceStateTopics, SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport {\n getSwitchableOutputNameForDisplay,\n getSwitchableOutputStateTopics,\n SwitchableOutputId,\n SwitchableOutputState,\n} from \"./SwitchableOutput.provider\"\n\nexport const useSwitchableOutputs = () => {\n const switchableOutputsStore = useSwitchableOutputsStore()\n\n const getTopics = (portalId: PortalId) => ({\n switchableOutputs: `N/${portalId}/switch/+/SwitchableOutput/+/Settings/+`,\n switchingDevices: `N/${portalId}/switch/+`,\n })\n\n const mqtt = useMqtt()\n const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n const messagesForSwitchableOutputs = mqtt.messagesByWildcard(topics.switchableOutputs)\n const messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.switchingDevices)\n\n // Examine MQTT to find all available switchable outputs and their group assignments\n useEffect(() => {\n if (!messagesForSwitchableOutputs || Object.entries(messagesForSwitchableOutputs).length === 0) {\n Logger.log(\"Waiting for switchable outputs...\")\n } else {\n // All switchable outputs in array sorted by topic\n const availableSwitchableOutputs = Object.keys(messagesForSwitchableOutputs)\n .filter((key) => key.endsWith(\"/Settings/Group\"))\n .sort() as string[]\n\n // All switchable outputs group assignments in array sorted by topic\n const customGroupAssigments = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[topic]\n })\n // All switchable outputs types in array sorted by topic\n const availableSwitchableOutputTypes = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/Type`]\n })\n // All switchable outputs names in array sorted by topic\n const availableSwitchableOutputNames = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/CustomName`]\n })\n // All switchable outputs visibility in array sorted by topic\n const availableSwitchableOutputVisibilityFlags = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/ShowUIControl`]\n })\n\n // All switching devices in array sorted by instance number\n const availableSwitchingDevices = Object.keys(messagesForSwitchingDevices)\n .filter((key) => key.endsWith(\"/DeviceInstance\"))\n .sort() as string[]\n // All switching device names in array sorted by instance number\n const availableSwitchingDeviceNames = availableSwitchingDevices.map((topic) => {\n const topicPrefix = topic.slice(0, -\"/DeviceInstance\".length)\n return (\n messagesForSwitchingDevices[`${topicPrefix}/CustomName`] ||\n messagesForSwitchingDevices[`${topicPrefix}/ProductName`]\n )\n })\n\n const dispose = autorun(() => {\n const oldAssignments = switchableOutputsStore.customGroupAssignments\n const newAssignments = customGroupAssigments\n const groupAssignmentsChanged = !arraysEqual(oldAssignments, newAssignments)\n if (groupAssignmentsChanged) {\n switchableOutputsStore.setCustomGroupAssignments(newAssignments)\n Logger.log(`Switchable outputs group assignments changed, recomputing...`)\n }\n\n const oldOutputTypes = switchableOutputsStore.outputTypes\n const newOutputTypes = availableSwitchableOutputTypes\n const outputTypesChanged = !arraysEqual(oldOutputTypes, newOutputTypes)\n if (outputTypesChanged) {\n switchableOutputsStore.setOutputTypes(newOutputTypes)\n Logger.log(`Switchable outputs types changed, recomputing...`)\n }\n\n const oldOutputNames = switchableOutputsStore.outputNames\n const newOutputNames = availableSwitchableOutputNames\n const outputNamesChanged = !arraysEqual(oldOutputNames, newOutputNames)\n if (outputNamesChanged) {\n switchableOutputsStore.setOutputNames(newOutputNames)\n Logger.log(`Switchable outputs names changed, recomputing...`)\n }\n\n const oldOutputVisibilityFlags = switchableOutputsStore.outputVisibilityFlags\n const newOutputVisibilityFlags = availableSwitchableOutputVisibilityFlags\n const outputVisibilityFlagsChanged = !arraysEqual(oldOutputVisibilityFlags, newOutputVisibilityFlags)\n if (outputVisibilityFlagsChanged) {\n switchableOutputsStore.setOutputVisibilityFlags(newOutputVisibilityFlags)\n Logger.log(`Switchable outputs visibility flags changed, recomputing...`)\n }\n\n const oldSwitchingDevices = switchableOutputsStore.switchingDevices\n const newSwitchingDevices = availableSwitchingDevices\n const switchingDevicesChanged = !arraysEqual(oldSwitchingDevices, newSwitchingDevices)\n if (switchingDevicesChanged) {\n switchableOutputsStore.setSwitchingDevices(newSwitchingDevices)\n Logger.log(`Switching devices changed, recomputing...`)\n }\n\n const oldSwitchingDeviceNames = switchableOutputsStore.switchingDeviceNames\n const newSwitchingDeviceNames = availableSwitchingDeviceNames\n const switchingDeviceNamesChanged = !arraysEqual(oldSwitchingDeviceNames, newSwitchingDeviceNames)\n if (switchingDeviceNamesChanged) {\n switchableOutputsStore.setSwitchingDeviceNames(newSwitchingDeviceNames)\n Logger.log(`Switching device names changed, recomputing...`)\n }\n\n if (\n groupAssignmentsChanged ||\n outputTypesChanged ||\n outputNamesChanged ||\n outputVisibilityFlagsChanged ||\n switchingDevicesChanged ||\n switchingDeviceNamesChanged\n ) {\n // New groups mapping array of switches to group name key\n const newGroups: { [key: string]: SwitchableOutputState[] } = {}\n\n // Walk the array of all switchable outputs, determine to which group it belongs\n // and populate its initial state\n availableSwitchableOutputs.forEach((output, index) => {\n const swo = extractSwitchableOutputInfo(output)\n const switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId))\n const customGroupAssignment = customGroupAssigments[index].trim()\n const deviceName = switchingDevice.customName || switchingDevice.productName\n const groupName = customGroupAssignment === \"\" ? deviceName : customGroupAssignment\n const switchableOutput = mqtt.messagesByTopics(\n getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId)\n ) as unknown as SwitchableOutputState\n\n // Ignore hidden controls\n if (switchableOutput.showUIControl === 0) {\n return\n }\n\n newGroups[groupName] ||= []\n newGroups[groupName].push({\n ...switchableOutput,\n deviceId: swo.deviceId,\n outputId: swo.outputId,\n parentDeviceName: deviceName as unknown as string,\n })\n })\n\n Logger.log(`New switchable output groups: ${JSON.stringify(Object.keys(newGroups))}`)\n // Sort switches in a group by name\n Object.values(newGroups).forEach((array) => {\n array.sort((a, b) => {\n const aName = getSwitchableOutputNameForDisplay(a, a.parentDeviceName)\n const bName = getSwitchableOutputNameForDisplay(b, b.parentDeviceName)\n return aName.localeCompare(bName)\n })\n })\n switchableOutputsStore.setGroups(newGroups)\n }\n })\n return () => dispose()\n }\n }, [messagesForSwitchableOutputs, messagesForSwitchingDevices])\n\n return switchableOutputsStore\n}\n\nfunction extractSwitchableOutputInfo(topic: string) {\n const switchStart = topic.indexOf(\"/switch/\") + 8 // length of `/switch/`\n const outputStart = topic.indexOf(\"/SwitchableOutput/\") + 18 // length of `/SwitchableOutput/`\n\n return {\n deviceId: topic.substring(switchStart, topic.indexOf(\"/\", switchStart)) as unknown as SwitchingDeviceInstanceId,\n outputId: topic.substring(outputStart, topic.indexOf(\"/\", outputStart)) as unknown as SwitchableOutputId,\n }\n}\n\nfunction arraysEqual<T>(a: T[], b: T[]): boolean {\n if (a.length !== b.length) return false\n return a.every((element, index) => b[index] === element)\n}\n"]}
|
|
1
|
+
{"version":3,"file":"SwitchableOutputs.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { autorun } from \"mobx\"\nimport Logger from \"../../utils/logger\"\nimport { PortalId, useMqtt } from \"../Mqtt\"\nimport { useMemo, useEffect } from \"react\"\nimport { useSwitchableOutputsStore } from \"./SwitchableOutputs.store\"\nimport { getSwitchingDeviceStateTopics, SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport {\n getSwitchableOutputNameForDisplay,\n getSwitchableOutputStateTopics,\n SWITCHABLE_OUTPUT_TREES,\n SwitchableOutputId,\n SwitchableOutputState,\n SwitchableOutputTree,\n} from \"./SwitchableOutput.provider\"\n\nexport const useSwitchableOutputs = (gxDeviceRelaysGroupName: string) => {\n const switchableOutputsStore = useSwitchableOutputsStore()\n\n const getTopics = (portalId: PortalId) => ({\n switchableOutputs: `N/${portalId}/(${SWITCHABLE_OUTPUT_TREES.join(\"|\")})/+/SwitchableOutput/+/Settings/+`,\n switchingDevices: `N/${portalId}/switch/+`,\n })\n\n const mqtt = useMqtt()\n const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n const messagesForSwitchableOutputs = mqtt.messagesByWildcard(topics.switchableOutputs)\n const messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.switchingDevices)\n\n // Examine MQTT to find all available switchable outputs and their group assignments\n useEffect(() => {\n if (!messagesForSwitchableOutputs || Object.entries(messagesForSwitchableOutputs).length === 0) {\n Logger.log(\"Waiting for switchable outputs...\")\n } else {\n // All switchable outputs in array sorted by topic\n const availableSwitchableOutputs = Object.keys(messagesForSwitchableOutputs)\n .filter((key) => key.endsWith(\"/Settings/Group\"))\n .sort() as string[]\n\n // All switchable outputs group assignments in array sorted by topic\n const customGroupAssigments = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[topic]\n })\n // All switchable outputs types in array sorted by topic\n const availableSwitchableOutputTypes = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/Type`]\n })\n // All switchable outputs names in array sorted by topic\n const availableSwitchableOutputNames = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/CustomName`]\n })\n // All switchable outputs visibility in array sorted by topic\n const availableSwitchableOutputVisibilityFlags = availableSwitchableOutputs.map((topic) => {\n return messagesForSwitchableOutputs[`${topic.slice(0, -\"/Group\".length)}/ShowUIControl`]\n })\n\n // All switching devices in array sorted by instance number\n const availableSwitchingDevices = Object.keys(messagesForSwitchingDevices)\n .filter((key) => key.endsWith(\"/DeviceInstance\"))\n .sort() as string[]\n\n // All switching device names in array sorted by instance number\n const availableSwitchingDeviceNames = availableSwitchingDevices.map((topic) => {\n const topicPrefix = topic.slice(0, -\"/DeviceInstance\".length)\n return (\n messagesForSwitchingDevices[`${topicPrefix}/CustomName`] ||\n messagesForSwitchingDevices[`${topicPrefix}/ProductName`]\n )\n })\n\n const dispose = autorun(() => {\n const oldAssignments = switchableOutputsStore.customGroupAssignments\n const newAssignments = customGroupAssigments\n const groupAssignmentsChanged = !arraysEqual(oldAssignments, newAssignments)\n if (groupAssignmentsChanged) {\n switchableOutputsStore.setCustomGroupAssignments(newAssignments)\n Logger.log(`Switchable outputs group assignments changed, recomputing...`)\n }\n\n const oldOutputTypes = switchableOutputsStore.outputTypes\n const newOutputTypes = availableSwitchableOutputTypes\n const outputTypesChanged = !arraysEqual(oldOutputTypes, newOutputTypes)\n if (outputTypesChanged) {\n switchableOutputsStore.setOutputTypes(newOutputTypes)\n Logger.log(`Switchable outputs types changed, recomputing...`)\n }\n\n const oldOutputNames = switchableOutputsStore.outputNames\n const newOutputNames = availableSwitchableOutputNames\n const outputNamesChanged = !arraysEqual(oldOutputNames, newOutputNames)\n if (outputNamesChanged) {\n switchableOutputsStore.setOutputNames(newOutputNames)\n Logger.log(`Switchable outputs names changed, recomputing...`)\n }\n\n const oldOutputVisibilityFlags = switchableOutputsStore.outputVisibilityFlags\n const newOutputVisibilityFlags = availableSwitchableOutputVisibilityFlags\n const outputVisibilityFlagsChanged = !arraysEqual(oldOutputVisibilityFlags, newOutputVisibilityFlags)\n if (outputVisibilityFlagsChanged) {\n switchableOutputsStore.setOutputVisibilityFlags(newOutputVisibilityFlags)\n Logger.log(`Switchable outputs visibility flags changed, recomputing...`)\n }\n\n const oldSwitchingDevices = switchableOutputsStore.switchingDevices\n const newSwitchingDevices = availableSwitchingDevices\n const switchingDevicesChanged = !arraysEqual(oldSwitchingDevices, newSwitchingDevices)\n if (switchingDevicesChanged) {\n switchableOutputsStore.setSwitchingDevices(newSwitchingDevices)\n Logger.log(`Switching devices changed, recomputing...`)\n }\n\n const oldSwitchingDeviceNames = switchableOutputsStore.switchingDeviceNames\n const newSwitchingDeviceNames = availableSwitchingDeviceNames\n const switchingDeviceNamesChanged = !arraysEqual(oldSwitchingDeviceNames, newSwitchingDeviceNames)\n if (switchingDeviceNamesChanged) {\n switchableOutputsStore.setSwitchingDeviceNames(newSwitchingDeviceNames)\n Logger.log(`Switching device names changed, recomputing...`)\n }\n\n if (\n groupAssignmentsChanged ||\n outputTypesChanged ||\n outputNamesChanged ||\n outputVisibilityFlagsChanged ||\n switchingDevicesChanged ||\n switchingDeviceNamesChanged\n ) {\n // New groups mapping array of switches to group name key\n const newGroups: { [key: string]: SwitchableOutputState[] } = {}\n\n // Walk the array of all switchable outputs, determine to which group it belongs\n // and populate its initial state\n availableSwitchableOutputs.forEach((output, index) => {\n const swo = extractSwitchableOutputInfo(output)\n const switchingDevice = mqtt.messagesByTopics(\n getSwitchingDeviceStateTopics(mqtt.portalId, swo.tree, swo.deviceId)\n )\n const customGroupAssignment = customGroupAssigments[index].trim()\n const deviceName = switchingDevice.customName || switchingDevice.productName || gxDeviceRelaysGroupName\n const groupName = customGroupAssignment === \"\" ? deviceName : customGroupAssignment\n const switchableOutput = mqtt.messagesByTopics(\n getSwitchableOutputStateTopics(mqtt.portalId, swo.tree, swo.deviceId, swo.outputId)\n ) as unknown as SwitchableOutputState\n\n // Ignore hidden controls\n if (switchableOutput.showUIControl === 0) {\n return\n }\n\n newGroups[groupName] ||= []\n newGroups[groupName].push({\n ...switchableOutput,\n tree: swo.tree,\n deviceId: swo.deviceId,\n outputId: swo.outputId,\n parentDeviceName: deviceName as unknown as string,\n })\n })\n\n Logger.log(`New switchable output groups: ${JSON.stringify(Object.keys(newGroups))}`)\n // Sort switches in a group by name\n Object.values(newGroups).forEach((array) => {\n array.sort((a, b) => {\n const aName = getSwitchableOutputNameForDisplay(a, a.parentDeviceName)\n const bName = getSwitchableOutputNameForDisplay(b, b.parentDeviceName)\n return aName.localeCompare(bName)\n })\n })\n switchableOutputsStore.setGroups(newGroups)\n }\n })\n return () => dispose()\n }\n }, [messagesForSwitchableOutputs, messagesForSwitchingDevices])\n\n return switchableOutputsStore\n}\n\nfunction extractSwitchableOutputInfo(topic: string) {\n const pattern = new RegExp(`/(${SWITCHABLE_OUTPUT_TREES.join(\"|\")})/`)\n const match = topic.match(pattern)\n const switchStart = match ? match.index! + match[0].length : -1 // length of `/system/`, or `/switch/`, or ...\n const outputStart = topic.indexOf(\"/SwitchableOutput/\") + 18 // length of `/SwitchableOutput/`\n\n return {\n tree: (match?.[1] as SwitchableOutputTree) ?? null, // \"switch\", \"system\", ...\n deviceId: topic.substring(switchStart, topic.indexOf(\"/\", switchStart)) as unknown as SwitchingDeviceInstanceId,\n outputId: topic.substring(outputStart, topic.indexOf(\"/\", outputStart)) as unknown as SwitchableOutputId,\n }\n}\n\nfunction arraysEqual<T>(a: T[], b: T[]): boolean {\n if (a.length !== b.length) return false\n return a.every((element, index) => b[index] === element)\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { PortalId, Topics } from "../Mqtt";
|
|
2
|
-
import { SwitchableOutputState } from "./SwitchableOutput.provider";
|
|
2
|
+
import { SwitchableOutputState, SwitchableOutputTree } from "./SwitchableOutput.provider";
|
|
3
3
|
export type SwitchingDeviceInstanceId = number;
|
|
4
4
|
export interface SwitchingDeviceState {
|
|
5
5
|
productName: string;
|
|
@@ -12,7 +12,7 @@ export interface SwitchingDeviceTopics extends Topics {
|
|
|
12
12
|
customName?: string;
|
|
13
13
|
instance?: string;
|
|
14
14
|
}
|
|
15
|
-
export declare const getSwitchingDeviceStateTopics: (portalId: PortalId, instanceId: SwitchingDeviceInstanceId) => {
|
|
15
|
+
export declare const getSwitchingDeviceStateTopics: (portalId: PortalId, tree: SwitchableOutputTree, instanceId: SwitchingDeviceInstanceId) => {
|
|
16
16
|
productName: string;
|
|
17
17
|
customName: string;
|
|
18
18
|
instance: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchingDevice.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"SwitchingDevice.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAIzF,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAA;AAE9C,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,MAAM;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,6BAA6B,GACxC,UAAU,QAAQ,EAClB,MAAM,oBAAoB,EAC1B,YAAY,yBAAyB;;;;CAKrC,CAAA;AAEF,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,yBAAyB,GAAG,oBAAoB,CAK9F;AAED,wBAAgB,mBAAmB,6DAuClC"}
|
|
@@ -3,14 +3,14 @@ import { useMqtt, useTopicsState } from "../Mqtt";
|
|
|
3
3
|
import Logger from "../../utils/logger";
|
|
4
4
|
import { useSwitchingDevicesStore } from "./SwitchingDevices.store";
|
|
5
5
|
import { autorun } from "mobx";
|
|
6
|
-
export var getSwitchingDeviceStateTopics = function (portalId, instanceId) { return ({
|
|
7
|
-
productName: "N/".concat(portalId, "/
|
|
8
|
-
customName: "N/".concat(portalId, "/
|
|
9
|
-
instance: "N/".concat(portalId, "/
|
|
6
|
+
export var getSwitchingDeviceStateTopics = function (portalId, tree, instanceId) { return ({
|
|
7
|
+
productName: "N/".concat(portalId, "/").concat(tree, "/").concat(instanceId, "/ProductName"),
|
|
8
|
+
customName: "N/".concat(portalId, "/").concat(tree, "/").concat(instanceId, "/CustomName"),
|
|
9
|
+
instance: "N/".concat(portalId, "/").concat(tree, "/").concat(instanceId, "/DeviceInstance"),
|
|
10
10
|
}); };
|
|
11
11
|
export function useSwitchingDevice(instanceId) {
|
|
12
12
|
var portalId = useMqtt().portalId;
|
|
13
|
-
var topics = useMemo(function () { return getSwitchingDeviceStateTopics(portalId, instanceId); }, [portalId, instanceId]);
|
|
13
|
+
var topics = useMemo(function () { return getSwitchingDeviceStateTopics(portalId, "switch", instanceId); }, [portalId, instanceId]);
|
|
14
14
|
return useTopicsState(topics);
|
|
15
15
|
}
|
|
16
16
|
export function useSwitchingDevices() {
|
|
@@ -31,7 +31,7 @@ export function useSwitchingDevices() {
|
|
|
31
31
|
var dispose_1 = autorun(function () {
|
|
32
32
|
var oldDevices = switchingDevicesStore.devices;
|
|
33
33
|
var newDevices = deviceInstances_1.map(function (deviceId) {
|
|
34
|
-
return mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, deviceId));
|
|
34
|
+
return mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, "switch", deviceId));
|
|
35
35
|
});
|
|
36
36
|
// TODO: check unordered structural identify of old and new state
|
|
37
37
|
// TODO: to avoid unnecessary re-rendering: O(n^2) baby
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwitchingDevice.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,MAAM,MAAM,oBAAoB,CAAA;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAiB9B,MAAM,CAAC,IAAM,6BAA6B,GAAG,
|
|
1
|
+
{"version":3,"file":"SwitchingDevice.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useMemo } from \"react\"\nimport { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport Logger from \"../../utils/logger\"\nimport { SwitchableOutputState, SwitchableOutputTree } from \"./SwitchableOutput.provider\"\nimport { useSwitchingDevicesStore } from \"./SwitchingDevices.store\"\nimport { autorun } from \"mobx\"\n\nexport type SwitchingDeviceInstanceId = number\n\nexport interface SwitchingDeviceState {\n productName: string\n customName: string\n instance: number\n switchableOutputs: SwitchableOutputState[]\n}\n\nexport interface SwitchingDeviceTopics extends Topics {\n productName?: string\n customName?: string\n instance?: string\n}\n\nexport const getSwitchingDeviceStateTopics = (\n portalId: PortalId,\n tree: SwitchableOutputTree,\n instanceId: SwitchingDeviceInstanceId\n) => ({\n productName: `N/${portalId}/${tree}/${instanceId}/ProductName`,\n customName: `N/${portalId}/${tree}/${instanceId}/CustomName`,\n instance: `N/${portalId}/${tree}/${instanceId}/DeviceInstance`,\n})\n\nexport function useSwitchingDevice(instanceId: SwitchingDeviceInstanceId): SwitchingDeviceState {\n const { portalId } = useMqtt()\n const topics = useMemo(() => getSwitchingDeviceStateTopics(portalId, \"switch\", instanceId), [portalId, instanceId])\n\n return useTopicsState<SwitchingDeviceState>(topics)\n}\n\nexport function useSwitchingDevices() {\n const switchingDevicesStore = useSwitchingDevicesStore()\n\n const getTopics = (portalId: PortalId) => ({\n devices: `N/${portalId}/switch/+/DeviceInstance`,\n })\n\n const mqtt = useMqtt()\n const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n const messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.devices)\n\n // Examine MQTT to find all available switching devices\n useEffect(() => {\n if (!messagesForSwitchingDevices || Object.entries(messagesForSwitchingDevices).length === 0) {\n Logger.log(\"Waiting for switching devices...\")\n } else {\n const deviceInstances = Object.values(messagesForSwitchingDevices) as SwitchingDeviceInstanceId[]\n const dispose = autorun(() => {\n const oldDevices = switchingDevicesStore.devices\n const newDevices = deviceInstances.map((deviceId) =>\n mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, \"switch\", deviceId))\n ) as unknown as SwitchingDeviceInstanceId[]\n // TODO: check unordered structural identify of old and new state\n // TODO: to avoid unnecessary re-rendering: O(n^2) baby\n if (\n oldDevices.length === 0 ||\n oldDevices.length != newDevices.length ||\n !newDevices.every((id) => deviceInstances.includes(id))\n ) {\n Logger.log(`New switching devices instances: ${JSON.stringify(deviceInstances)}`)\n switchingDevicesStore.setDevices(newDevices)\n }\n })\n return () => dispose()\n }\n }, [messagesForSwitchingDevices])\n\n return switchingDevicesStore\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hsvw.d.ts","sourceRoot":"/","sources":["src/utils/hsvw.ts"],"names":[],"mappings":"AAAA,KAAK,GAAG,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAA;AACtC,KAAK,UAAU,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAA;AACpD,KAAK,gBAAgB,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAAA;AAEhE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,UAAU,CAAA;IACjB,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAErE,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAG5C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAG1D;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAGtE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,CAS1D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc,CAE5D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"hsvw.d.ts","sourceRoot":"/","sources":["src/utils/hsvw.ts"],"names":[],"mappings":"AAAA,KAAK,GAAG,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAA;AACtC,KAAK,UAAU,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAA;AACpD,KAAK,gBAAgB,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,kBAAkB,CAAA;CAAE,CAAA;AAEhE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,GAAG,CAAA;IACR,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,UAAU,CAAA;IACjB,gBAAgB,EAAE,gBAAgB,CAAA;CACnC;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;AAErE,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAG5C;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAG1D;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAGtE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,CAS1D;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc,CAE5D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAG3D;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,SAAS,CAQX"}
|
package/dist/src/utils/hsvw.js
CHANGED
|
@@ -24,12 +24,7 @@ export function hsvwToArray(color) {
|
|
|
24
24
|
return [color.hue, color.saturation, color.brightness, color.white, color.colorTemperature];
|
|
25
25
|
}
|
|
26
26
|
export function hsvwArrayToJSON(arr) {
|
|
27
|
-
var formattedNumbers = arr
|
|
28
|
-
.map(function (n) {
|
|
29
|
-
// If integer, add .0, otherwise keep as is
|
|
30
|
-
return Number.isInteger(n) ? "".concat(n, ".0") : String(n);
|
|
31
|
-
})
|
|
32
|
-
.join(",");
|
|
27
|
+
var formattedNumbers = arr.map(function (n) { return n.toFixed(0); }).join(",");
|
|
33
28
|
return "{\"value\":[".concat(formattedNumbers, "]}");
|
|
34
29
|
}
|
|
35
30
|
export function createHSVWColor(hue, saturation, brightness, white, colorTemp) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hsvw.js","sourceRoot":"/","sources":["src/utils/hsvw.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACjD,OAAO,OAAc,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACjD,OAAO,OAAqB,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IAClD,OAAO,OAA2B,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAmB;IACtC,IAAA,GAAG,GAA8C,GAAG,GAAjD,EAAE,UAAU,GAAkC,GAAG,GAArC,EAAE,UAAU,GAAsB,GAAG,GAAzB,EAAE,KAAK,GAAe,GAAG,GAAlB,EAAE,SAAS,GAAI,GAAG,GAAP,CAAO;IAC3D,OAAO;QACL,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC9B,gBAAgB,EAAE,sBAAsB,CAAC,SAAS,CAAC;KACpD,CAAA;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAgB;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAA;AAC7F,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAmB;IACjD,IAAM,gBAAgB,GAAG,GAAG
|
|
1
|
+
{"version":3,"file":"hsvw.js","sourceRoot":"/","sources":["src/utils/hsvw.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,SAAS,CAAC,KAAa;IACrC,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACjD,OAAO,OAAc,CAAA;AACvB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACjD,OAAO,OAAqB,CAAA;AAC9B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAa;IAClD,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;IAClD,OAAO,OAA2B,CAAA;AACpC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAmB;IACtC,IAAA,GAAG,GAA8C,GAAG,GAAjD,EAAE,UAAU,GAAkC,GAAG,GAArC,EAAE,UAAU,GAAsB,GAAG,GAAzB,EAAE,KAAK,GAAe,GAAG,GAAlB,EAAE,SAAS,GAAI,GAAG,GAAP,CAAO;IAC3D,OAAO;QACL,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC9B,gBAAgB,EAAE,sBAAsB,CAAC,SAAS,CAAC;KACpD,CAAA;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAgB;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAA;AAC7F,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAmB;IACjD,IAAM,gBAAgB,GAAG,GAAG,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAZ,CAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC/D,OAAO,sBAAa,gBAAgB,OAAI,CAAA;AAC1C,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,UAAkB,EAClB,UAAkB,EAClB,KAAa,EACb,SAAiB;IAEjB,OAAO;QACL,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;QACnB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACxC,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC;QAC9B,gBAAgB,EAAE,sBAAsB,CAAC,SAAS,CAAC;KACpD,CAAA;AACH,CAAC","sourcesContent":["type Hue = number & { __brand: \"Hue\" } // 0-360 degrees\ntype Percentage = number & { __brand: \"Percentage\" } // 0-100\ntype ColorTemperature = number & { __brand: \"ColorTemperature\" } // 0-6500 K\n\nexport interface HSVWColor {\n hue: Hue\n saturation: Percentage\n brightness: Percentage\n white: Percentage\n colorTemperature: ColorTemperature\n}\n\nexport type HSVWColorArray = [number, number, number, number, number]\n\nexport function createHue(value: number): Hue {\n const clamped = Math.max(0, Math.min(360, value))\n return clamped as Hue\n}\n\nexport function createPercentage(value: number): Percentage {\n const clamped = Math.max(0, Math.min(100, value))\n return clamped as Percentage\n}\n\nexport function createColorTemperature(value: number): ColorTemperature {\n const clamped = Math.max(0, Math.min(6500, value))\n return clamped as ColorTemperature\n}\n\nexport function arrayToHSVW(arr: HSVWColorArray): HSVWColor {\n const [hue, saturation, brightness, white, colorTemp] = arr\n return {\n hue: createHue(hue),\n saturation: createPercentage(saturation),\n brightness: createPercentage(brightness),\n white: createPercentage(white),\n colorTemperature: createColorTemperature(colorTemp),\n }\n}\n\nexport function hsvwToArray(color: HSVWColor): HSVWColorArray {\n return [color.hue, color.saturation, color.brightness, color.white, color.colorTemperature]\n}\n\nexport function hsvwArrayToJSON(arr: HSVWColorArray): string {\n const formattedNumbers = arr.map((n) => n.toFixed(0)).join(\",\")\n return `{\"value\":[${formattedNumbers}]}`\n}\n\nexport function createHSVWColor(\n hue: number,\n saturation: number,\n brightness: number,\n white: number,\n colorTemp: number\n): HSVWColor {\n return {\n hue: createHue(hue),\n saturation: createPercentage(saturation),\n brightness: createPercentage(brightness),\n white: createPercentage(white),\n colorTemperature: createColorTemperature(colorTemp),\n }\n}\n"]}
|