matterbridge 1.6.5-dev.2 → 1.6.5-dev.3
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 +1 -0
- package/dist/cli.js +0 -26
- package/dist/cluster/export.js +0 -2
- package/dist/defaultConfigSchema.js +0 -23
- package/dist/deviceManager.js +1 -26
- package/dist/index.js +0 -30
- package/dist/logger/export.js +0 -1
- package/dist/matter/export.js +0 -1
- package/dist/matterbridge.js +62 -702
- package/dist/matterbridgeAccessoryPlatform.js +0 -33
- package/dist/matterbridgeBehaviors.js +1 -29
- package/dist/matterbridgeDevice.js +117 -884
- package/dist/matterbridgeDeviceTypes.js +12 -40
- package/dist/matterbridgeDynamicPlatform.js +0 -33
- package/dist/matterbridgeEdge.js +0 -525
- package/dist/matterbridgeEndpoint.js +100 -943
- package/dist/matterbridgePlatform.js +3 -74
- package/dist/matterbridgeTypes.js +0 -24
- package/dist/matterbridgeWebsocket.js +0 -45
- package/dist/pluginManager.js +3 -231
- package/dist/storage/export.js +0 -1
- package/dist/utils/colorUtils.js +2 -78
- package/dist/utils/export.js +0 -1
- package/dist/utils/utils.js +7 -252
- package/frontend/build/asset-manifest.json +3 -3
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/js/{main.a14c87e7.js → main.0ab89802.js} +3 -3
- package/frontend/build/static/js/{main.a14c87e7.js.map → main.0ab89802.js.map} +1 -1
- package/npm-shrinkwrap.json +5 -5
- package/package.json +4 -4
- package/tsconfig.production.json +19 -0
- package/dist/cli.d.ts.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/cluster/export.d.ts.map +0 -1
- package/dist/cluster/export.js.map +0 -1
- package/dist/defaultConfigSchema.d.ts.map +0 -1
- package/dist/defaultConfigSchema.js.map +0 -1
- package/dist/deviceManager.d.ts +0 -46
- package/dist/deviceManager.d.ts.map +0 -1
- package/dist/deviceManager.js.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/logger/export.d.ts.map +0 -1
- package/dist/logger/export.js.map +0 -1
- package/dist/matter/export.d.ts.map +0 -1
- package/dist/matter/export.js.map +0 -1
- package/dist/matterbridge.d.ts +0 -466
- package/dist/matterbridge.d.ts.map +0 -1
- package/dist/matterbridge.js.map +0 -1
- package/dist/matterbridgeAccessoryPlatform.d.ts.map +0 -1
- package/dist/matterbridgeAccessoryPlatform.js.map +0 -1
- package/dist/matterbridgeBehaviors.d.ts +0 -934
- package/dist/matterbridgeBehaviors.d.ts.map +0 -1
- package/dist/matterbridgeBehaviors.js.map +0 -1
- package/dist/matterbridgeDevice.d.ts +0 -5307
- package/dist/matterbridgeDevice.d.ts.map +0 -1
- package/dist/matterbridgeDevice.js.map +0 -1
- package/dist/matterbridgeDeviceTypes.d.ts +0 -65
- package/dist/matterbridgeDeviceTypes.d.ts.map +0 -1
- package/dist/matterbridgeDeviceTypes.js.map +0 -1
- package/dist/matterbridgeDynamicPlatform.d.ts.map +0 -1
- package/dist/matterbridgeDynamicPlatform.js.map +0 -1
- package/dist/matterbridgeEdge.d.ts +0 -89
- package/dist/matterbridgeEdge.d.ts.map +0 -1
- package/dist/matterbridgeEdge.js.map +0 -1
- package/dist/matterbridgeEndpoint.d.ts +0 -7368
- package/dist/matterbridgeEndpoint.d.ts.map +0 -1
- package/dist/matterbridgeEndpoint.js.map +0 -1
- package/dist/matterbridgePlatform.d.ts +0 -96
- package/dist/matterbridgePlatform.d.ts.map +0 -1
- package/dist/matterbridgePlatform.js.map +0 -1
- package/dist/matterbridgeTypes.d.ts.map +0 -1
- package/dist/matterbridgeTypes.js.map +0 -1
- package/dist/matterbridgeWebsocket.d.ts.map +0 -1
- package/dist/matterbridgeWebsocket.js.map +0 -1
- package/dist/pluginManager.d.ts +0 -238
- package/dist/pluginManager.d.ts.map +0 -1
- package/dist/pluginManager.js.map +0 -1
- package/dist/storage/export.d.ts.map +0 -1
- package/dist/storage/export.js.map +0 -1
- package/dist/utils/colorUtils.d.ts.map +0 -1
- package/dist/utils/colorUtils.js.map +0 -1
- package/dist/utils/export.d.ts.map +0 -1
- package/dist/utils/export.js.map +0 -1
- package/dist/utils/utils.d.ts +0 -221
- package/dist/utils/utils.d.ts.map +0 -1
- package/dist/utils/utils.js.map +0 -1
- /package/frontend/build/static/js/{main.a14c87e7.js.LICENSE.txt → main.0ab89802.js.LICENSE.txt} +0 -0
package/dist/utils/colorUtils.js
CHANGED
|
@@ -1,25 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This file contains the color utilities.
|
|
3
|
-
*
|
|
4
|
-
* @file colorUtils.ts
|
|
5
|
-
* @author Luca Liguori
|
|
6
|
-
* @date 2023-10-05
|
|
7
|
-
* @version 1.2.6
|
|
8
|
-
*
|
|
9
|
-
* Copyright 2023, 2024, 2025 Luca Liguori.
|
|
10
|
-
*
|
|
11
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
12
|
-
* you may not use this file except in compliance with the License.
|
|
13
|
-
* You may obtain a copy of the License at
|
|
14
|
-
*
|
|
15
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
16
|
-
*
|
|
17
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
18
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
19
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
20
|
-
* See the License for the specific language governing permissions and
|
|
21
|
-
* limitations under the License. *
|
|
22
|
-
*/
|
|
23
1
|
import { assert } from 'console';
|
|
24
2
|
export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
25
3
|
if (hue === 360) {
|
|
@@ -32,7 +10,7 @@ export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
|
32
10
|
luminance /= 100;
|
|
33
11
|
let r, g, b;
|
|
34
12
|
if (saturation === 0) {
|
|
35
|
-
r = g = b = luminance;
|
|
13
|
+
r = g = b = luminance;
|
|
36
14
|
}
|
|
37
15
|
else {
|
|
38
16
|
const hue2rgb = (p, q, t) => {
|
|
@@ -65,27 +43,21 @@ export function hslColorToRgbColor(hue, saturation, luminance) {
|
|
|
65
43
|
b: Math.ceil(b * 255),
|
|
66
44
|
};
|
|
67
45
|
}
|
|
68
|
-
// Converts from RGB to the XY color (CIE 1931 color space)
|
|
69
46
|
export function rgbColorToXYColor(rgb) {
|
|
70
47
|
let r = rgb.r / 255;
|
|
71
48
|
let g = rgb.g / 255;
|
|
72
49
|
let b = rgb.b / 255;
|
|
73
|
-
// Apply gamma correction
|
|
74
50
|
r = r > 0.04045 ? Math.pow((r + 0.055) / 1.055, 2.4) : r / 12.92;
|
|
75
51
|
g = g > 0.04045 ? Math.pow((g + 0.055) / 1.055, 2.4) : g / 12.92;
|
|
76
52
|
b = b > 0.04045 ? Math.pow((b + 0.055) / 1.055, 2.4) : b / 12.92;
|
|
77
|
-
// Scale the values to the D65 illuminant
|
|
78
53
|
r = r * 100;
|
|
79
54
|
g = g * 100;
|
|
80
55
|
b = b * 100;
|
|
81
|
-
// Convert RGB to XYZ
|
|
82
56
|
const X = r * 0.664511 + g * 0.154324 + b * 0.162028;
|
|
83
57
|
const Y = r * 0.283881 + g * 0.668433 + b * 0.047685;
|
|
84
58
|
const Z = r * 0.000088 + g * 0.07231 + b * 0.986039;
|
|
85
|
-
// Normalization
|
|
86
59
|
let x = X / (X + Y + Z);
|
|
87
60
|
let y = Y / (X + Y + Z);
|
|
88
|
-
// Round to 4 digits
|
|
89
61
|
x = Math.round(x * 10000) / 10000;
|
|
90
62
|
y = Math.round(y * 10000) / 10000;
|
|
91
63
|
return { x, y };
|
|
@@ -95,11 +67,9 @@ export function xyColorToRgbColor(x, y, brightness = 254) {
|
|
|
95
67
|
const Y = (brightness / 254).toFixed(2);
|
|
96
68
|
const X = (Number(Y) / y) * x;
|
|
97
69
|
const Z = (Number(Y) / y) * z;
|
|
98
|
-
// Convert to RGB using Wide RGB D65 conversion
|
|
99
70
|
let red = X * 1.656492 - Number(Y) * 0.354851 - Z * 0.255038;
|
|
100
71
|
let green = -X * 0.707196 + Number(Y) * 1.655397 + Z * 0.036152;
|
|
101
72
|
let blue = X * 0.051713 - Number(Y) * 0.121364 + Z * 1.01153;
|
|
102
|
-
// If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
|
|
103
73
|
if (red > blue && red > green && red > 1.0) {
|
|
104
74
|
green = green / red;
|
|
105
75
|
blue = blue / red;
|
|
@@ -115,15 +85,12 @@ export function xyColorToRgbColor(x, y, brightness = 254) {
|
|
|
115
85
|
green = green / blue;
|
|
116
86
|
blue = 1.0;
|
|
117
87
|
}
|
|
118
|
-
// Reverse gamma correction
|
|
119
88
|
red = red <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, 1.0 / 2.4) - 0.055;
|
|
120
89
|
green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, 1.0 / 2.4) - 0.055;
|
|
121
90
|
blue = blue <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, 1.0 / 2.4) - 0.055;
|
|
122
|
-
// Convert normalized decimal to decimal
|
|
123
91
|
red = Math.round(red * 255);
|
|
124
92
|
green = Math.round(green * 255);
|
|
125
93
|
blue = Math.round(blue * 255);
|
|
126
|
-
// Normalize
|
|
127
94
|
if (isNaN(red) || red < 0) {
|
|
128
95
|
red = 0;
|
|
129
96
|
}
|
|
@@ -144,7 +111,7 @@ export function rgbColorToHslColor(rgb) {
|
|
|
144
111
|
let h = 0, s = 0;
|
|
145
112
|
const l = (max + min) / 2;
|
|
146
113
|
if (max === min) {
|
|
147
|
-
h = s = 0;
|
|
114
|
+
h = s = 0;
|
|
148
115
|
}
|
|
149
116
|
else {
|
|
150
117
|
const d = max - min;
|
|
@@ -173,7 +140,6 @@ export function xyToHsl(x, y) {
|
|
|
173
140
|
return rgbColorToHslColor(rgb);
|
|
174
141
|
}
|
|
175
142
|
export function testColors() {
|
|
176
|
-
// this table has been checked with different apps and sites and is correct 100%
|
|
177
143
|
const colors = [
|
|
178
144
|
{ name: 'Pure Red 0', hsl: { h: 0, s: 100, l: 50 }, rgb: { r: 255, g: 0, b: 0 }, xy: { x: 0.7006, y: 0.2993 } },
|
|
179
145
|
{ name: 'Bright Orange 30', hsl: { h: 30, s: 100, l: 50 }, rgb: { r: 255, g: 128, b: 0 }, xy: { x: 0.6112, y: 0.375 } },
|
|
@@ -201,7 +167,6 @@ export function testColors() {
|
|
|
201
167
|
{ name: 'Deep Pink 50% 330', hsl: { h: 330, s: 50, l: 50 }, rgb: { r: 192, g: 64, b: 128 }, xy: { x: 0.489, y: 0.2416 } },
|
|
202
168
|
];
|
|
203
169
|
colors.forEach((color) => {
|
|
204
|
-
// eslint-disable-next-line no-console
|
|
205
170
|
console.log(`\x1b[48;2;${color.rgb.r};${color.rgb.g};${color.rgb.b}mColor: ${color.name}\x1b[0m, hsl: { h: ${color.hsl.h}, s: ${color.hsl.s}, l: ${color.hsl.l} }, rgb: { r: ${color.rgb.r}, g: ${color.rgb.g}, b: ${color.rgb.b} }, xy: { x: ${color.xy.x}, y: ${color.xy.y} }`);
|
|
206
171
|
const rgb = hslColorToRgbColor(color.hsl.h, color.hsl.s, color.hsl.l);
|
|
207
172
|
assert(rgb.r === color.rgb.r && rgb.g === color.rgb.g && rgb.b === color.rgb.b, `\x1b[48;2;${rgb.r};${rgb.g};${rgb.b}mColor: ${color.name}\x1b[0m hslColorToRgbColor { r: ${rgb.r}, g: ${rgb.g}, b: ${rgb.b} } conversion error`);
|
|
@@ -213,25 +178,14 @@ export function testColors() {
|
|
|
213
178
|
assert(rgb2.r === color.rgb.r && rgb2.g === color.rgb.g && rgb2.b === color.rgb.b, `\x1b[48;2;${rgb2.r};${rgb2.g};${rgb2.b}mColor: ${color.name}\x1b[0m xyColorToRgbColor(${color.xy.x}, ${color.xy.y}) conversion error -> r: ${rgb2.r} g: ${rgb2.g} b: ${rgb2.g}`);
|
|
214
179
|
});
|
|
215
180
|
}
|
|
216
|
-
/**
|
|
217
|
-
* Converts CIE color space to RGB color space
|
|
218
|
-
* @param {Number} x
|
|
219
|
-
* @param {Number} y
|
|
220
|
-
* @param {Number} brightness - Ranges from 1 to 254
|
|
221
|
-
* @return {Array} Array that contains the color values for red, green and blue
|
|
222
|
-
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
223
|
-
*/
|
|
224
181
|
export function cie_to_rgb(x, y, brightness = 254) {
|
|
225
|
-
// Set to maximum brightness if no custom value was given (Not the slick ECMAScript 6 way for compatibility reasons)
|
|
226
182
|
const z = 1.0 - x - y;
|
|
227
183
|
const Y = (brightness / 254).toFixed(2);
|
|
228
184
|
const X = (Number(Y) / y) * x;
|
|
229
185
|
const Z = (Number(Y) / y) * z;
|
|
230
|
-
// Convert to RGB using Wide RGB D65 conversion
|
|
231
186
|
let red = X * 1.656492 - Number(Y) * 0.354851 - Z * 0.255038;
|
|
232
187
|
let green = -X * 0.707196 + Number(Y) * 1.655397 + Z * 0.036152;
|
|
233
188
|
let blue = X * 0.051713 - Number(Y) * 0.121364 + Z * 1.01153;
|
|
234
|
-
// If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
|
|
235
189
|
if (red > blue && red > green && red > 1.0) {
|
|
236
190
|
green = green / red;
|
|
237
191
|
blue = blue / red;
|
|
@@ -247,15 +201,12 @@ export function cie_to_rgb(x, y, brightness = 254) {
|
|
|
247
201
|
green = green / blue;
|
|
248
202
|
blue = 1.0;
|
|
249
203
|
}
|
|
250
|
-
// Reverse gamma correction
|
|
251
204
|
red = red <= 0.0031308 ? 12.92 * red : (1.0 + 0.055) * Math.pow(red, 1.0 / 2.4) - 0.055;
|
|
252
205
|
green = green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, 1.0 / 2.4) - 0.055;
|
|
253
206
|
blue = blue <= 0.0031308 ? 12.92 * blue : (1.0 + 0.055) * Math.pow(blue, 1.0 / 2.4) - 0.055;
|
|
254
|
-
// Convert normalized decimal to decimal
|
|
255
207
|
red = Math.round(red * 255);
|
|
256
208
|
green = Math.round(green * 255);
|
|
257
209
|
blue = Math.round(blue * 255);
|
|
258
|
-
// Normalize
|
|
259
210
|
if (isNaN(red) || red < 0) {
|
|
260
211
|
red = 0;
|
|
261
212
|
}
|
|
@@ -267,24 +218,13 @@ export function cie_to_rgb(x, y, brightness = 254) {
|
|
|
267
218
|
}
|
|
268
219
|
return { r: red, g: green, b: blue };
|
|
269
220
|
}
|
|
270
|
-
/**
|
|
271
|
-
* Converts RGB color space to CIE color space
|
|
272
|
-
* @param {Number} red
|
|
273
|
-
* @param {Number} green
|
|
274
|
-
* @param {Number} blue
|
|
275
|
-
* @return {Array} Array that contains the CIE color values for x and y
|
|
276
|
-
* From: https://github.com/usolved/cie-rgb-converter/blob/master/cie_rgb_converter.js
|
|
277
|
-
*/
|
|
278
221
|
export function rgb_to_cie(red, green, blue) {
|
|
279
|
-
// Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
|
|
280
222
|
red = red > 0.04045 ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : red / 12.92;
|
|
281
223
|
green = green > 0.04045 ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : green / 12.92;
|
|
282
224
|
blue = blue > 0.04045 ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : blue / 12.92;
|
|
283
|
-
// RGB values to XYZ using the Wide RGB D65 conversion formula
|
|
284
225
|
const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
|
|
285
226
|
const Y = red * 0.283881 + green * 0.668433 + blue * 0.047685;
|
|
286
227
|
const Z = red * 0.000088 + green * 0.07231 + blue * 0.986039;
|
|
287
|
-
// Calculate the xy values from the XYZ values
|
|
288
228
|
let x = (X / (X + Y + Z)).toFixed(4);
|
|
289
229
|
let y = (Y / (X + Y + Z)).toFixed(4);
|
|
290
230
|
if (isNaN(Number(x))) {
|
|
@@ -295,19 +235,3 @@ export function rgb_to_cie(red, green, blue) {
|
|
|
295
235
|
}
|
|
296
236
|
return { x: Number(x), y: Number(y) };
|
|
297
237
|
}
|
|
298
|
-
/*
|
|
299
|
-
testColors();
|
|
300
|
-
console.log('rgb_to_cie(0, 128, 255)', rgb_to_cie(0, 128, 255));
|
|
301
|
-
console.log('cie_to_rgb(0.1401, 0.1284, 254)', cie_to_rgb(0.1401, 0.1284, 254));
|
|
302
|
-
console.log('cie_to_rgb(0.1406, 0.1382, 254)', cie_to_rgb(0.1406, 0.1382, 254));
|
|
303
|
-
for (let h = 0; h < 360; h++) {
|
|
304
|
-
const rgb = hslColorToRgbColor(h, 100, 50);
|
|
305
|
-
const xy = rgbColorToXYColor({ r: rgb.r, g: rgb.g, b: rgb.b });
|
|
306
|
-
const rgb2 = cie_to_rgb(xy.x, xy.y, 254);
|
|
307
|
-
const hsl = rgbColorToHslColor({ r: rgb2.r, g: rgb2.g, b: rgb2.b });
|
|
308
|
-
assert(rgb.r === rgb2.r && rgb.g === rgb2.g && rgb.b === rgb2.b, 'Color rgb conversion error');
|
|
309
|
-
assert(h === hsl.h, 'Color hsl conversion error');
|
|
310
|
-
console.log(`\x1b[48;2;${rgb.r};${rgb.g};${rgb.b}mColor: r:${rgb.r} g:${rgb.g} b:${rgb.b}\x1b[0m => x:${xy.x} y:${xy.y} => \x1b[48;2;${rgb2.r};${rgb2.g};${rgb2.b}mColor: r:${rgb2.r} g:${rgb2.g} b:${rgb2.b} h:${hsl.h} s:${hsl.s}\x1b[0m\x1b[K`);
|
|
311
|
-
}
|
|
312
|
-
*/
|
|
313
|
-
//# sourceMappingURL=colorUtils.js.map
|
package/dist/utils/export.js
CHANGED