matterbridge 3.3.2 → 3.3.3-dev-20251012-feda0f1
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 +21 -7
- package/dist/broadcastServer.js +1 -86
- package/dist/broadcastServerTypes.js +0 -24
- package/dist/cli.js +5 -135
- package/dist/cliEmitter.js +0 -37
- package/dist/cliHistory.js +0 -44
- package/dist/clusters/export.js +0 -2
- package/dist/defaultConfigSchema.js +0 -24
- package/dist/deviceManager.js +1 -124
- package/dist/devices/airConditioner.js +0 -57
- package/dist/devices/batteryStorage.js +1 -48
- package/dist/devices/cooktop.js +0 -55
- package/dist/devices/dishwasher.js +0 -57
- package/dist/devices/evse.js +10 -74
- package/dist/devices/export.js +0 -5
- package/dist/devices/extractorHood.js +0 -42
- package/dist/devices/heatPump.js +2 -50
- package/dist/devices/laundryDryer.js +3 -62
- package/dist/devices/laundryWasher.js +4 -70
- package/dist/devices/microwaveOven.js +5 -88
- package/dist/devices/oven.js +0 -85
- package/dist/devices/refrigerator.js +0 -102
- package/dist/devices/roboticVacuumCleaner.js +9 -100
- package/dist/devices/solarPower.js +0 -38
- package/dist/devices/speaker.js +0 -84
- package/dist/devices/temperatureControl.js +3 -25
- package/dist/devices/waterHeater.js +2 -82
- package/dist/dgram/coap.js +13 -126
- package/dist/dgram/dgram.js +2 -114
- package/dist/dgram/mb_coap.js +3 -41
- package/dist/dgram/mb_mdns.js +15 -80
- package/dist/dgram/mdns.js +137 -299
- package/dist/dgram/multicast.js +1 -62
- package/dist/dgram/unicast.js +0 -54
- package/dist/frontend.js +29 -402
- package/dist/frontendTypes.js +0 -45
- package/dist/helpers.js +0 -53
- package/dist/index.js +0 -25
- package/dist/logger/export.js +0 -1
- package/dist/matter/behaviors.js +0 -2
- package/dist/matter/clusters.js +0 -2
- package/dist/matter/devices.js +0 -2
- package/dist/matter/endpoints.js +0 -2
- package/dist/matter/export.js +0 -3
- package/dist/matter/types.js +0 -3
- package/dist/matterbridge.js +45 -795
- package/dist/matterbridgeAccessoryPlatform.js +0 -36
- package/dist/matterbridgeBehaviors.js +5 -65
- package/dist/matterbridgeDeviceTypes.js +17 -630
- package/dist/matterbridgeDynamicPlatform.js +0 -36
- package/dist/matterbridgeEndpoint.js +58 -1398
- package/dist/matterbridgeEndpointHelpers.js +12 -345
- package/dist/matterbridgePlatform.js +1 -341
- package/dist/matterbridgeTypes.js +0 -26
- package/dist/pluginManager.js +3 -325
- package/dist/shelly.js +7 -168
- package/dist/storage/export.js +0 -1
- package/dist/update.js +0 -69
- package/dist/utils/colorUtils.js +2 -97
- package/dist/utils/commandLine.js +0 -54
- package/dist/utils/copyDirectory.js +1 -38
- package/dist/utils/createDirectory.js +0 -33
- package/dist/utils/createZip.js +2 -47
- package/dist/utils/deepCopy.js +0 -39
- package/dist/utils/deepEqual.js +1 -72
- package/dist/utils/error.js +0 -41
- package/dist/utils/export.js +0 -1
- package/dist/utils/hex.js +0 -124
- package/dist/utils/isvalid.js +0 -101
- package/dist/utils/jestHelpers.js +3 -153
- package/dist/utils/network.js +5 -108
- package/dist/utils/spawn.js +0 -71
- package/dist/utils/wait.js +8 -60
- package/npm-shrinkwrap.json +2 -2
- package/package.json +1 -2
- package/dist/broadcastServer.d.ts +0 -105
- package/dist/broadcastServer.d.ts.map +0 -1
- package/dist/broadcastServer.js.map +0 -1
- package/dist/broadcastServerTypes.d.ts +0 -717
- package/dist/broadcastServerTypes.d.ts.map +0 -1
- package/dist/broadcastServerTypes.js.map +0 -1
- package/dist/cli.d.ts +0 -26
- package/dist/cli.d.ts.map +0 -1
- package/dist/cli.js.map +0 -1
- package/dist/cliEmitter.d.ts +0 -50
- package/dist/cliEmitter.d.ts.map +0 -1
- package/dist/cliEmitter.js.map +0 -1
- package/dist/cliHistory.d.ts +0 -70
- package/dist/cliHistory.d.ts.map +0 -1
- package/dist/cliHistory.js.map +0 -1
- package/dist/clusters/export.d.ts +0 -2
- package/dist/clusters/export.d.ts.map +0 -1
- package/dist/clusters/export.js.map +0 -1
- package/dist/defaultConfigSchema.d.ts +0 -28
- package/dist/defaultConfigSchema.d.ts.map +0 -1
- package/dist/defaultConfigSchema.js.map +0 -1
- package/dist/deviceManager.d.ts +0 -117
- package/dist/deviceManager.d.ts.map +0 -1
- package/dist/deviceManager.js.map +0 -1
- package/dist/devices/airConditioner.d.ts +0 -98
- package/dist/devices/airConditioner.d.ts.map +0 -1
- package/dist/devices/airConditioner.js.map +0 -1
- package/dist/devices/batteryStorage.d.ts +0 -48
- package/dist/devices/batteryStorage.d.ts.map +0 -1
- package/dist/devices/batteryStorage.js.map +0 -1
- package/dist/devices/cooktop.d.ts +0 -60
- package/dist/devices/cooktop.d.ts.map +0 -1
- package/dist/devices/cooktop.js.map +0 -1
- package/dist/devices/dishwasher.d.ts +0 -71
- package/dist/devices/dishwasher.d.ts.map +0 -1
- package/dist/devices/dishwasher.js.map +0 -1
- package/dist/devices/evse.d.ts +0 -75
- package/dist/devices/evse.d.ts.map +0 -1
- package/dist/devices/evse.js.map +0 -1
- package/dist/devices/export.d.ts +0 -17
- package/dist/devices/export.d.ts.map +0 -1
- package/dist/devices/export.js.map +0 -1
- package/dist/devices/extractorHood.d.ts +0 -46
- package/dist/devices/extractorHood.d.ts.map +0 -1
- package/dist/devices/extractorHood.js.map +0 -1
- package/dist/devices/heatPump.d.ts +0 -47
- package/dist/devices/heatPump.d.ts.map +0 -1
- package/dist/devices/heatPump.js.map +0 -1
- package/dist/devices/laundryDryer.d.ts +0 -67
- package/dist/devices/laundryDryer.d.ts.map +0 -1
- package/dist/devices/laundryDryer.js.map +0 -1
- package/dist/devices/laundryWasher.d.ts +0 -81
- package/dist/devices/laundryWasher.d.ts.map +0 -1
- package/dist/devices/laundryWasher.js.map +0 -1
- package/dist/devices/microwaveOven.d.ts +0 -168
- package/dist/devices/microwaveOven.d.ts.map +0 -1
- package/dist/devices/microwaveOven.js.map +0 -1
- package/dist/devices/oven.d.ts +0 -105
- package/dist/devices/oven.d.ts.map +0 -1
- package/dist/devices/oven.js.map +0 -1
- package/dist/devices/refrigerator.d.ts +0 -118
- package/dist/devices/refrigerator.d.ts.map +0 -1
- package/dist/devices/refrigerator.js.map +0 -1
- package/dist/devices/roboticVacuumCleaner.d.ts +0 -112
- package/dist/devices/roboticVacuumCleaner.d.ts.map +0 -1
- package/dist/devices/roboticVacuumCleaner.js.map +0 -1
- package/dist/devices/solarPower.d.ts +0 -40
- package/dist/devices/solarPower.d.ts.map +0 -1
- package/dist/devices/solarPower.js.map +0 -1
- package/dist/devices/speaker.d.ts +0 -87
- package/dist/devices/speaker.d.ts.map +0 -1
- package/dist/devices/speaker.js.map +0 -1
- package/dist/devices/temperatureControl.d.ts +0 -166
- package/dist/devices/temperatureControl.d.ts.map +0 -1
- package/dist/devices/temperatureControl.js.map +0 -1
- package/dist/devices/waterHeater.d.ts +0 -111
- package/dist/devices/waterHeater.d.ts.map +0 -1
- package/dist/devices/waterHeater.js.map +0 -1
- package/dist/dgram/coap.d.ts +0 -205
- package/dist/dgram/coap.d.ts.map +0 -1
- package/dist/dgram/coap.js.map +0 -1
- package/dist/dgram/dgram.d.ts +0 -141
- package/dist/dgram/dgram.d.ts.map +0 -1
- package/dist/dgram/dgram.js.map +0 -1
- package/dist/dgram/mb_coap.d.ts +0 -24
- package/dist/dgram/mb_coap.d.ts.map +0 -1
- package/dist/dgram/mb_coap.js.map +0 -1
- package/dist/dgram/mb_mdns.d.ts +0 -24
- package/dist/dgram/mb_mdns.d.ts.map +0 -1
- package/dist/dgram/mb_mdns.js.map +0 -1
- package/dist/dgram/mdns.d.ts +0 -290
- package/dist/dgram/mdns.d.ts.map +0 -1
- package/dist/dgram/mdns.js.map +0 -1
- package/dist/dgram/multicast.d.ts +0 -67
- package/dist/dgram/multicast.d.ts.map +0 -1
- package/dist/dgram/multicast.js.map +0 -1
- package/dist/dgram/unicast.d.ts +0 -56
- package/dist/dgram/unicast.d.ts.map +0 -1
- package/dist/dgram/unicast.js.map +0 -1
- package/dist/frontend.d.ts +0 -234
- package/dist/frontend.d.ts.map +0 -1
- package/dist/frontend.js.map +0 -1
- package/dist/frontendTypes.d.ts +0 -522
- package/dist/frontendTypes.d.ts.map +0 -1
- package/dist/frontendTypes.js.map +0 -1
- package/dist/helpers.d.ts +0 -48
- package/dist/helpers.d.ts.map +0 -1
- package/dist/helpers.js.map +0 -1
- package/dist/index.d.ts +0 -33
- package/dist/index.d.ts.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/logger/export.d.ts +0 -2
- package/dist/logger/export.d.ts.map +0 -1
- package/dist/logger/export.js.map +0 -1
- package/dist/matter/behaviors.d.ts +0 -2
- package/dist/matter/behaviors.d.ts.map +0 -1
- package/dist/matter/behaviors.js.map +0 -1
- package/dist/matter/clusters.d.ts +0 -2
- package/dist/matter/clusters.d.ts.map +0 -1
- package/dist/matter/clusters.js.map +0 -1
- package/dist/matter/devices.d.ts +0 -2
- package/dist/matter/devices.d.ts.map +0 -1
- package/dist/matter/devices.js.map +0 -1
- package/dist/matter/endpoints.d.ts +0 -2
- package/dist/matter/endpoints.d.ts.map +0 -1
- package/dist/matter/endpoints.js.map +0 -1
- package/dist/matter/export.d.ts +0 -5
- package/dist/matter/export.d.ts.map +0 -1
- package/dist/matter/export.js.map +0 -1
- package/dist/matter/types.d.ts +0 -3
- package/dist/matter/types.d.ts.map +0 -1
- package/dist/matter/types.js.map +0 -1
- package/dist/matterbridge.d.ts +0 -469
- package/dist/matterbridge.d.ts.map +0 -1
- package/dist/matterbridge.js.map +0 -1
- package/dist/matterbridgeAccessoryPlatform.d.ts +0 -42
- package/dist/matterbridgeAccessoryPlatform.d.ts.map +0 -1
- package/dist/matterbridgeAccessoryPlatform.js.map +0 -1
- package/dist/matterbridgeBehaviors.d.ts +0 -1747
- package/dist/matterbridgeBehaviors.d.ts.map +0 -1
- package/dist/matterbridgeBehaviors.js.map +0 -1
- package/dist/matterbridgeDeviceTypes.d.ts +0 -761
- package/dist/matterbridgeDeviceTypes.d.ts.map +0 -1
- package/dist/matterbridgeDeviceTypes.js.map +0 -1
- package/dist/matterbridgeDynamicPlatform.d.ts +0 -42
- package/dist/matterbridgeDynamicPlatform.d.ts.map +0 -1
- package/dist/matterbridgeDynamicPlatform.js.map +0 -1
- package/dist/matterbridgeEndpoint.d.ts +0 -1534
- package/dist/matterbridgeEndpoint.d.ts.map +0 -1
- package/dist/matterbridgeEndpoint.js.map +0 -1
- package/dist/matterbridgeEndpointHelpers.d.ts +0 -407
- package/dist/matterbridgeEndpointHelpers.d.ts.map +0 -1
- package/dist/matterbridgeEndpointHelpers.js.map +0 -1
- package/dist/matterbridgePlatform.d.ts +0 -402
- package/dist/matterbridgePlatform.d.ts.map +0 -1
- package/dist/matterbridgePlatform.js.map +0 -1
- package/dist/matterbridgeTypes.d.ts +0 -209
- package/dist/matterbridgeTypes.d.ts.map +0 -1
- package/dist/matterbridgeTypes.js.map +0 -1
- package/dist/pluginManager.d.ts +0 -353
- package/dist/pluginManager.d.ts.map +0 -1
- package/dist/pluginManager.js.map +0 -1
- package/dist/shelly.d.ts +0 -174
- package/dist/shelly.d.ts.map +0 -1
- package/dist/shelly.js.map +0 -1
- package/dist/storage/export.d.ts +0 -2
- package/dist/storage/export.d.ts.map +0 -1
- package/dist/storage/export.js.map +0 -1
- package/dist/update.d.ts +0 -75
- package/dist/update.d.ts.map +0 -1
- package/dist/update.js.map +0 -1
- package/dist/utils/colorUtils.d.ts +0 -99
- package/dist/utils/colorUtils.d.ts.map +0 -1
- package/dist/utils/colorUtils.js.map +0 -1
- package/dist/utils/commandLine.d.ts +0 -59
- package/dist/utils/commandLine.d.ts.map +0 -1
- package/dist/utils/commandLine.js.map +0 -1
- package/dist/utils/copyDirectory.d.ts +0 -33
- package/dist/utils/copyDirectory.d.ts.map +0 -1
- package/dist/utils/copyDirectory.js.map +0 -1
- package/dist/utils/createDirectory.d.ts +0 -34
- package/dist/utils/createDirectory.d.ts.map +0 -1
- package/dist/utils/createDirectory.js.map +0 -1
- package/dist/utils/createZip.d.ts +0 -39
- package/dist/utils/createZip.d.ts.map +0 -1
- package/dist/utils/createZip.js.map +0 -1
- package/dist/utils/deepCopy.d.ts +0 -32
- package/dist/utils/deepCopy.d.ts.map +0 -1
- package/dist/utils/deepCopy.js.map +0 -1
- package/dist/utils/deepEqual.d.ts +0 -54
- package/dist/utils/deepEqual.d.ts.map +0 -1
- package/dist/utils/deepEqual.js.map +0 -1
- package/dist/utils/error.d.ts +0 -44
- package/dist/utils/error.d.ts.map +0 -1
- package/dist/utils/error.js.map +0 -1
- package/dist/utils/export.d.ts +0 -13
- package/dist/utils/export.d.ts.map +0 -1
- package/dist/utils/export.js.map +0 -1
- package/dist/utils/hex.d.ts +0 -89
- package/dist/utils/hex.d.ts.map +0 -1
- package/dist/utils/hex.js.map +0 -1
- package/dist/utils/isvalid.d.ts +0 -103
- package/dist/utils/isvalid.d.ts.map +0 -1
- package/dist/utils/isvalid.js.map +0 -1
- package/dist/utils/jestHelpers.d.ts +0 -137
- package/dist/utils/jestHelpers.d.ts.map +0 -1
- package/dist/utils/jestHelpers.js.map +0 -1
- package/dist/utils/network.d.ts +0 -115
- package/dist/utils/network.d.ts.map +0 -1
- package/dist/utils/network.js.map +0 -1
- package/dist/utils/spawn.d.ts +0 -35
- package/dist/utils/spawn.d.ts.map +0 -1
- package/dist/utils/spawn.js.map +0 -1
- package/dist/utils/wait.d.ts +0 -54
- package/dist/utils/wait.d.ts.map +0 -1
- package/dist/utils/wait.js.map +0 -1
package/dist/utils/hex.js
CHANGED
|
@@ -1,114 +1,39 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This file contains the hex functions.
|
|
3
|
-
*
|
|
4
|
-
* @file hex.ts
|
|
5
|
-
* @author Luca Liguori
|
|
6
|
-
* @created 2025-05-06
|
|
7
|
-
* @version 1.0.0
|
|
8
|
-
* @license Apache-2.0
|
|
9
|
-
*
|
|
10
|
-
* Copyright 2025, 2026, 2027 Luca Liguori.
|
|
11
|
-
*
|
|
12
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
-
* you may not use this file except in compliance with the License.
|
|
14
|
-
* You may obtain a copy of the License at
|
|
15
|
-
*
|
|
16
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
-
*
|
|
18
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
-
* See the License for the specific language governing permissions and
|
|
22
|
-
* limitations under the License.
|
|
23
|
-
*/
|
|
24
1
|
import { createPublicKey, createPrivateKey, X509Certificate } from 'node:crypto';
|
|
25
|
-
/**
|
|
26
|
-
* Converts an ArrayBuffer or Uint8Array to a hexadecimal string.
|
|
27
|
-
*
|
|
28
|
-
* Accepts any {ArrayBufferLike} input: a raw ArrayBuffer (binary data storage) or
|
|
29
|
-
* a Uint8Array (TypedArray view over an ArrayBuffer). While an ArrayBuffer holds
|
|
30
|
-
* the raw memory, a Uint8Array is a typed view into that memory, letting you access
|
|
31
|
-
* its bytes directly. This function normalizes both by creating a Uint8Array view
|
|
32
|
-
* before conversion.
|
|
33
|
-
*
|
|
34
|
-
* @param {ArrayBufferLike} buffer - The buffer or typed-array view to convert.
|
|
35
|
-
* @returns {string} A lowercase hex string representation of the buffer's bytes.
|
|
36
|
-
*
|
|
37
|
-
* @throws {TypeError} If the input is not an ArrayBuffer or ArrayBufferView.
|
|
38
|
-
*/
|
|
39
2
|
export function bufferToHex(buffer) {
|
|
40
|
-
// Check if the input is an ArrayBuffer or ArrayBufferView
|
|
41
3
|
if (!(buffer instanceof ArrayBuffer || ArrayBuffer.isView(buffer))) {
|
|
42
4
|
throw new TypeError('Expected input to be an ArrayBuffer or ArrayBufferView');
|
|
43
5
|
}
|
|
44
|
-
// Create a Uint8Array view over the buffer
|
|
45
6
|
const bytes = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
|
|
46
|
-
// Convert each byte to 2-digit hex
|
|
47
7
|
return Array.from(bytes)
|
|
48
8
|
.map((byte) => byte.toString(16).padStart(2, '0'))
|
|
49
9
|
.join('');
|
|
50
10
|
}
|
|
51
|
-
/**
|
|
52
|
-
* Converts a hexadecimal string to a Uint8Array.
|
|
53
|
-
*
|
|
54
|
-
* @param {string} hex - The hex string to convert. Can include uppercase or lowercase characters.
|
|
55
|
-
* @returns {Uint8Array} A Uint8Array representing the corresponding binary data.
|
|
56
|
-
*
|
|
57
|
-
* @throws {TypeError} If the input is not a string.
|
|
58
|
-
* @throws {Error} If the input length is odd or contains non-hex characters.
|
|
59
|
-
*/
|
|
60
11
|
export function hexToBuffer(hex) {
|
|
61
|
-
// Ensure the input is a string
|
|
62
12
|
if (typeof hex !== 'string') {
|
|
63
13
|
throw new TypeError('Expected a string for hex input');
|
|
64
14
|
}
|
|
65
|
-
// Trim any whitespace from the input string
|
|
66
15
|
const cleaned = hex.trim();
|
|
67
|
-
// Check if the length of the hex string is even
|
|
68
16
|
if (cleaned.length % 2 !== 0) {
|
|
69
17
|
throw new Error('Invalid hex string length, must be even');
|
|
70
18
|
}
|
|
71
|
-
// Validate that the string contains only valid hex characters
|
|
72
19
|
if (!/^[0-9a-fA-F]*$/.test(cleaned)) {
|
|
73
20
|
throw new Error('Invalid hex string, contains non-hex characters');
|
|
74
21
|
}
|
|
75
|
-
// Calculate the length of the resulting Uint8Array
|
|
76
22
|
const length = cleaned.length / 2;
|
|
77
|
-
// Create a Uint8Array to hold the binary data
|
|
78
23
|
const result = new Uint8Array(length);
|
|
79
|
-
// Convert each pair of hex characters into a byte
|
|
80
24
|
for (let i = 0; i < length; i++) {
|
|
81
25
|
result[i] = parseInt(cleaned.substr(i * 2, 2), 16);
|
|
82
26
|
}
|
|
83
|
-
// Return the resulting Uint8Array
|
|
84
27
|
return result;
|
|
85
28
|
}
|
|
86
|
-
/**
|
|
87
|
-
* Converts a PEM (Privacy-Enhanced Mail) formatted string to a Uint8Array.
|
|
88
|
-
*
|
|
89
|
-
* PEM format is a base64-encoded format commonly used for cryptographic keys and certificates,
|
|
90
|
-
* wrapped with header and footer lines like "-----BEGIN CERTIFICATE-----" and "-----END CERTIFICATE-----".
|
|
91
|
-
* This function extracts the base64 content and converts it to binary data using Node.js Buffer API.
|
|
92
|
-
*
|
|
93
|
-
* @param {string} pem - The PEM formatted string to convert.
|
|
94
|
-
* @param {boolean} validate - Whether to validate the PEM content using Node.js crypto module. Default is false.
|
|
95
|
-
* @returns {Uint8Array} A Uint8Array representing the decoded binary data.
|
|
96
|
-
*
|
|
97
|
-
* @throws {TypeError} If the input is not a string.
|
|
98
|
-
* @throws {Error} If the PEM format is invalid, contains invalid base64 characters, or validation fails.
|
|
99
|
-
*/
|
|
100
29
|
export function pemToBuffer(pem, validate = false) {
|
|
101
|
-
// Ensure the input is a string
|
|
102
30
|
if (typeof pem !== 'string') {
|
|
103
31
|
throw new TypeError('Expected a string for PEM input');
|
|
104
32
|
}
|
|
105
|
-
// Trim whitespace from the input
|
|
106
33
|
const cleaned = pem.trim();
|
|
107
|
-
// Check if the string appears to be in PEM format
|
|
108
34
|
if (!cleaned.includes('-----BEGIN') || !cleaned.includes('-----END')) {
|
|
109
35
|
throw new Error('Invalid PEM format: missing BEGIN/END markers');
|
|
110
36
|
}
|
|
111
|
-
// Extract the base64 content between the header and footer
|
|
112
37
|
const lines = cleaned.split('\n');
|
|
113
38
|
const base64Lines = [];
|
|
114
39
|
let inContent = false;
|
|
@@ -129,114 +54,65 @@ export function pemToBuffer(pem, validate = false) {
|
|
|
129
54
|
if (base64Lines.length === 0) {
|
|
130
55
|
throw new Error('Invalid PEM format: no content found between BEGIN/END markers');
|
|
131
56
|
}
|
|
132
|
-
// Join all base64 lines together
|
|
133
57
|
const base64String = base64Lines.join('');
|
|
134
|
-
// Validate base64 string format
|
|
135
58
|
if (!/^[A-Za-z0-9+/]*={0,2}$/.test(base64String)) {
|
|
136
59
|
throw new Error('Invalid PEM format: contains invalid base64 characters');
|
|
137
60
|
}
|
|
138
61
|
try {
|
|
139
|
-
// Use Node.js Buffer API instead of legacy atob()
|
|
140
62
|
const buffer = Buffer.from(base64String, 'base64');
|
|
141
|
-
// Convert Buffer to Uint8Array
|
|
142
63
|
const result = new Uint8Array(buffer);
|
|
143
|
-
// Validate PEM content using Node.js crypto module if requested
|
|
144
64
|
if (validate) {
|
|
145
65
|
try {
|
|
146
|
-
// Determine PEM type from the header and validate accordingly
|
|
147
66
|
const pemType = cleaned.match(/-----BEGIN\s+([^-]+)-----/)?.[1]?.trim();
|
|
148
67
|
if (pemType?.includes('CERTIFICATE')) {
|
|
149
|
-
// Use X509Certificate for robust certificate validation
|
|
150
68
|
const cert = new X509Certificate(pem);
|
|
151
|
-
// Check validity period
|
|
152
69
|
if (cert.validFrom && cert.validTo) {
|
|
153
70
|
const now = Date.now();
|
|
154
71
|
const from = Date.parse(cert.validFrom);
|
|
155
72
|
const to = Date.parse(cert.validTo);
|
|
156
|
-
// istanbul ignore next if
|
|
157
73
|
if (now < from || now > to) {
|
|
158
74
|
throw new Error('Certificate is not currently valid');
|
|
159
75
|
}
|
|
160
76
|
}
|
|
161
|
-
// Check subject/issuer fields
|
|
162
|
-
// istanbul ignore next if
|
|
163
77
|
if (!cert.subject || !cert.issuer) {
|
|
164
78
|
throw new Error('Certificate missing subject or issuer');
|
|
165
79
|
}
|
|
166
|
-
// Optionally check signature (not possible without CA chain)
|
|
167
80
|
}
|
|
168
81
|
else if (pemType?.includes('PRIVATE KEY')) {
|
|
169
|
-
// For private keys, try to create a private key
|
|
170
82
|
createPrivateKey({ key: pem, format: 'pem' });
|
|
171
83
|
}
|
|
172
84
|
else if (pemType?.includes('PUBLIC KEY')) {
|
|
173
|
-
// For public keys, try to create a public key
|
|
174
85
|
createPublicKey({ key: pem, format: 'pem' });
|
|
175
86
|
}
|
|
176
|
-
// If no specific type is detected, skip validation
|
|
177
87
|
}
|
|
178
88
|
catch (validationError) {
|
|
179
|
-
// istanbul ignore next
|
|
180
89
|
throw new Error(`PEM validation failed: ${validationError instanceof Error ? validationError.message : String(validationError)}`);
|
|
181
90
|
}
|
|
182
91
|
}
|
|
183
92
|
return result;
|
|
184
93
|
}
|
|
185
94
|
catch (error) {
|
|
186
|
-
// istanbul ignore next
|
|
187
95
|
throw new Error(`Failed to decode base64 content: ${error instanceof Error ? error.message : String(error)}`);
|
|
188
96
|
}
|
|
189
97
|
}
|
|
190
|
-
/**
|
|
191
|
-
* Extracts the raw 32-byte private key scalar from an EC private key PEM.
|
|
192
|
-
*
|
|
193
|
-
* This function parses an EC private key in PEM format and extracts the raw
|
|
194
|
-
* 32-byte private scalar (the "d" value) used in elliptic curve cryptography.
|
|
195
|
-
* This is the actual secret key material.
|
|
196
|
-
*
|
|
197
|
-
* @param {string} pemPrivateKey - The EC private key in PEM format
|
|
198
|
-
* @returns {Uint8Array} The raw 32-byte private key scalar
|
|
199
|
-
* @throws {Error} If the input is not a valid EC private key PEM
|
|
200
|
-
*
|
|
201
|
-
* @example
|
|
202
|
-
* ```typescript
|
|
203
|
-
* const pemKey = `-----BEGIN EC PRIVATE KEY-----
|
|
204
|
-
* MHcCAQEEIFBxqFkUxMoN2JkUXLFeiZnLNUpftjLi0sKMbZ6uajHXoAoGCCqGSM49
|
|
205
|
-
* AwEHoUQDQgAEcJ3eH/rG3zf9WmqMjh5eBSkeXz3Cb4Fig1rTosfHmgyjx/WnLPEe
|
|
206
|
-
* BF4SHvLo0G2COJEHa/VDE5EiKWO9ZR6AOQ==
|
|
207
|
-
* -----END EC PRIVATE KEY-----`;
|
|
208
|
-
*
|
|
209
|
-
* const rawKey = extractPrivateKeyRaw(pemKey);
|
|
210
|
-
* console.log(rawKey.length); // 32
|
|
211
|
-
* console.log(bufferToHex(rawKey)); // hex representation of the private scalar
|
|
212
|
-
* ```
|
|
213
|
-
*/
|
|
214
98
|
export function extractPrivateKeyRaw(pemPrivateKey) {
|
|
215
99
|
if (typeof pemPrivateKey !== 'string') {
|
|
216
100
|
throw new TypeError('Expected a string for PEM private key input');
|
|
217
101
|
}
|
|
218
|
-
// Extract the private key block
|
|
219
102
|
const keyBlock = /-----BEGIN (?:EC )?PRIVATE KEY-----[^-]+-----END (?:EC )?PRIVATE KEY-----/s.exec(pemPrivateKey);
|
|
220
103
|
if (!keyBlock) {
|
|
221
104
|
throw new Error('No EC PRIVATE KEY block found in the supplied PEM');
|
|
222
105
|
}
|
|
223
106
|
try {
|
|
224
|
-
// Create a private key object
|
|
225
107
|
const privateKey = createPrivateKey(keyBlock[0]);
|
|
226
|
-
// Export as PKCS#8 DER format
|
|
227
108
|
const pkcs8Der = privateKey.export({ format: 'der', type: 'pkcs8' });
|
|
228
|
-
// For P-256 curves, the private scalar is the last 32 bytes of the PKCS#8 DER
|
|
229
|
-
// istanbul ignore next
|
|
230
109
|
if (pkcs8Der.length < 32) {
|
|
231
110
|
throw new Error('Invalid private key: DER data too short');
|
|
232
111
|
}
|
|
233
|
-
// Extract the last 32 bytes which contain the raw private scalar
|
|
234
112
|
const rawPrivateKey = pkcs8Der.subarray(pkcs8Der.length - 32);
|
|
235
113
|
return new Uint8Array(rawPrivateKey);
|
|
236
114
|
}
|
|
237
115
|
catch (error) {
|
|
238
|
-
// istanbul ignore next
|
|
239
116
|
throw new Error(`Failed to extract private key: ${error instanceof Error ? error.message : String(error)}`);
|
|
240
117
|
}
|
|
241
118
|
}
|
|
242
|
-
//# sourceMappingURL=hex.js.map
|
package/dist/utils/isvalid.js
CHANGED
|
@@ -1,45 +1,7 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This file contains the validation functions.
|
|
3
|
-
*
|
|
4
|
-
* @file isvalid.ts
|
|
5
|
-
* @author Luca Liguori
|
|
6
|
-
* @created 2025-02-16
|
|
7
|
-
* @version 1.0.0
|
|
8
|
-
* @license Apache-2.0
|
|
9
|
-
*
|
|
10
|
-
* Copyright 2025, 2026, 2027 Luca Liguori.
|
|
11
|
-
*
|
|
12
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
-
* you may not use this file except in compliance with the License.
|
|
14
|
-
* You may obtain a copy of the License at
|
|
15
|
-
*
|
|
16
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
-
*
|
|
18
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
-
* See the License for the specific language governing permissions and
|
|
22
|
-
* limitations under the License.
|
|
23
|
-
*/
|
|
24
|
-
/**
|
|
25
|
-
* Checks if a given string is a valid IPv4 address.
|
|
26
|
-
*
|
|
27
|
-
* @param {string} ipv4Address - The string to be checked.
|
|
28
|
-
* @returns {boolean} - Returns true if the string is a valid IPv4 address, otherwise returns false.
|
|
29
|
-
*/
|
|
30
1
|
export function isValidIpv4Address(ipv4Address) {
|
|
31
2
|
const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
|
|
32
3
|
return ipv4Regex.test(ipv4Address);
|
|
33
4
|
}
|
|
34
|
-
/**
|
|
35
|
-
* Checks if a value is a valid number within the specified range.
|
|
36
|
-
*
|
|
37
|
-
* @param {any} value - The value to be checked.
|
|
38
|
-
* @param {number} min - The minimum value allowed (optional).
|
|
39
|
-
* @param {number} max - The maximum value allowed (optional).
|
|
40
|
-
* @returns {value is number} Returns true if the value is a valid number within the specified range, otherwise false.
|
|
41
|
-
*/
|
|
42
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
43
5
|
export function isValidNumber(value, min, max) {
|
|
44
6
|
if (value === undefined || value === null || typeof value !== 'number' || Number.isNaN(value) || !Number.isFinite(value))
|
|
45
7
|
return false;
|
|
@@ -49,25 +11,9 @@ export function isValidNumber(value, min, max) {
|
|
|
49
11
|
return false;
|
|
50
12
|
return true;
|
|
51
13
|
}
|
|
52
|
-
/**
|
|
53
|
-
* Checks if a value is a valid boolean.
|
|
54
|
-
*
|
|
55
|
-
* @param {any} value - The value to be checked.
|
|
56
|
-
* @returns {value is boolean} `true` if the value is a valid boolean, `false` otherwise.
|
|
57
|
-
*/
|
|
58
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
59
14
|
export function isValidBoolean(value) {
|
|
60
15
|
return value !== undefined && value !== null && typeof value === 'boolean';
|
|
61
16
|
}
|
|
62
|
-
/**
|
|
63
|
-
* Checks if a value is a valid string.
|
|
64
|
-
*
|
|
65
|
-
* @param {any} value - The value to be checked.
|
|
66
|
-
* @param {number} minLength - The min string length (optional).
|
|
67
|
-
* @param {number} maxLength - The max string length (optional).
|
|
68
|
-
* @returns {value is string} A boolean indicating whether the value is a valid string.
|
|
69
|
-
*/
|
|
70
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
71
17
|
export function isValidString(value, minLength, maxLength) {
|
|
72
18
|
if (value === undefined || value === null || typeof value !== 'string')
|
|
73
19
|
return false;
|
|
@@ -77,25 +23,9 @@ export function isValidString(value, minLength, maxLength) {
|
|
|
77
23
|
return false;
|
|
78
24
|
return true;
|
|
79
25
|
}
|
|
80
|
-
/**
|
|
81
|
-
* Checks if a value is a valid RegExp.
|
|
82
|
-
*
|
|
83
|
-
* @param {any} value - The value to be checked.
|
|
84
|
-
* @returns {value is RegExp} A boolean indicating whether the value is a valid RegExp.
|
|
85
|
-
*/
|
|
86
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
87
26
|
export function isValidRegExp(value) {
|
|
88
27
|
return value !== undefined && value !== null && value instanceof RegExp;
|
|
89
28
|
}
|
|
90
|
-
/**
|
|
91
|
-
* Checks if a value is a valid object.
|
|
92
|
-
*
|
|
93
|
-
* @param {any} value - The value to be checked.
|
|
94
|
-
* @param {number} minLength - The min number of keys (optional).
|
|
95
|
-
* @param {number} maxLength - The max number of keys (optional).
|
|
96
|
-
* @returns {value is object} A boolean indicating whether the value is a valid object.
|
|
97
|
-
*/
|
|
98
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
99
29
|
export function isValidObject(value, minLength, maxLength) {
|
|
100
30
|
if (value === undefined || value === null || typeof value !== 'object' || Array.isArray(value))
|
|
101
31
|
return false;
|
|
@@ -106,15 +36,6 @@ export function isValidObject(value, minLength, maxLength) {
|
|
|
106
36
|
return false;
|
|
107
37
|
return true;
|
|
108
38
|
}
|
|
109
|
-
/**
|
|
110
|
-
* Checks if a value is a valid array.
|
|
111
|
-
*
|
|
112
|
-
* @param {any} value - The value to be checked.
|
|
113
|
-
* @param {number} minLength - The min number of elements (optional).
|
|
114
|
-
* @param {number} maxLength - The max number of elements (optional).
|
|
115
|
-
* @returns {value is unknown[]} A boolean indicating whether the value is a valid array.
|
|
116
|
-
*/
|
|
117
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
118
39
|
export function isValidArray(value, minLength, maxLength) {
|
|
119
40
|
if (value === undefined || value === null || !Array.isArray(value))
|
|
120
41
|
return false;
|
|
@@ -124,33 +45,12 @@ export function isValidArray(value, minLength, maxLength) {
|
|
|
124
45
|
return false;
|
|
125
46
|
return true;
|
|
126
47
|
}
|
|
127
|
-
/**
|
|
128
|
-
* Checks if the given value is null.
|
|
129
|
-
*
|
|
130
|
-
* @param {any} value - The value to check.
|
|
131
|
-
* @returns {value is null} `true` if the value is null, `false` otherwise.
|
|
132
|
-
*/
|
|
133
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
134
48
|
export function isValidNull(value) {
|
|
135
49
|
return value === null;
|
|
136
50
|
}
|
|
137
|
-
/**
|
|
138
|
-
* Checks if a value is undefined.
|
|
139
|
-
*
|
|
140
|
-
* @param {any} value - The value to check.
|
|
141
|
-
* @returns {value is undefined} `true` if the value is undefined, `false` otherwise.
|
|
142
|
-
*/
|
|
143
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
144
51
|
export function isValidUndefined(value) {
|
|
145
52
|
return value === undefined;
|
|
146
53
|
}
|
|
147
|
-
/**
|
|
148
|
-
* Converts a semantic version string like "6.11.0-1011-raspi" to a numeric version code like 61100.
|
|
149
|
-
* Format: major * 10000 + minor * 100 + patch
|
|
150
|
-
*
|
|
151
|
-
* @param {string} versionString The version string to parse
|
|
152
|
-
* @returns {number | undefined} A numeric version code or undefined if parsing fails
|
|
153
|
-
*/
|
|
154
54
|
export function parseVersionString(versionString) {
|
|
155
55
|
if (!isValidString(versionString))
|
|
156
56
|
return undefined;
|
|
@@ -167,4 +67,3 @@ export function parseVersionString(versionString) {
|
|
|
167
67
|
}
|
|
168
68
|
return major * 10000 + minor * 100 + patch;
|
|
169
69
|
}
|
|
170
|
-
//# sourceMappingURL=isvalid.js.map
|
|
@@ -1,68 +1,21 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @description This file contains the Jest helpers.
|
|
3
|
-
* @file src/helpers.test.ts
|
|
4
|
-
* @author Luca Liguori
|
|
5
|
-
* @created 2025-09-03
|
|
6
|
-
* @version 1.0.5
|
|
7
|
-
* @license Apache-2.0
|
|
8
|
-
*
|
|
9
|
-
* Copyright 2025, 2026, 2027 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 { rmSync } from 'node:fs';
|
|
24
2
|
import { inspect } from 'node:util';
|
|
25
3
|
import path from 'node:path';
|
|
26
|
-
// Imports from Matterbridge
|
|
27
4
|
import { jest } from '@jest/globals';
|
|
28
5
|
import { DeviceTypeId, Endpoint, Environment, ServerNode, ServerNodeStore, VendorId, LogFormat as MatterLogFormat, LogLevel as MatterLogLevel, Lifecycle } from '@matter/main';
|
|
29
6
|
import { AggregatorEndpoint, RootEndpoint } from '@matter/main/endpoints';
|
|
30
7
|
import { MdnsService } from '@matter/main/protocol';
|
|
31
8
|
import { AnsiLogger } from 'node-ansi-logger';
|
|
32
|
-
// Imports from a plugin
|
|
33
|
-
/*
|
|
34
|
-
import { jest } from '@jest/globals';
|
|
35
|
-
import { DeviceTypeId, Endpoint, Environment, MdnsService, ServerNode, ServerNodeStore, VendorId, LogFormat as MatterLogFormat, LogLevel as MatterLogLevel, Lifecycle } from 'matterbridge/matter';
|
|
36
|
-
import { RootEndpoint, AggregatorEndpoint } from 'matterbridge/matter/endpoints';
|
|
37
|
-
import { AnsiLogger } from 'matterbridge/logger';
|
|
38
|
-
*/
|
|
39
9
|
export let loggerLogSpy;
|
|
40
10
|
export let consoleLogSpy;
|
|
41
11
|
export let consoleDebugSpy;
|
|
42
12
|
export let consoleInfoSpy;
|
|
43
13
|
export let consoleWarnSpy;
|
|
44
14
|
export let consoleErrorSpy;
|
|
45
|
-
/**
|
|
46
|
-
* Setup the Jest environment:
|
|
47
|
-
* - it will remove any existing home directory
|
|
48
|
-
* - setup the spies for logging
|
|
49
|
-
*
|
|
50
|
-
* @param {string} name The name of the test suite.
|
|
51
|
-
* @param {boolean} debug If true, the logging is not mocked.
|
|
52
|
-
*
|
|
53
|
-
* ```typescript
|
|
54
|
-
* import { consoleDebugSpy, consoleErrorSpy, consoleInfoSpy, consoleLogSpy, consoleWarnSpy, loggerLogSpy, setDebug, setupTest } from './jestHelpers.js';
|
|
55
|
-
*
|
|
56
|
-
* // Setup the test environment
|
|
57
|
-
* setupTest(NAME, false);
|
|
58
|
-
*
|
|
59
|
-
* ```
|
|
60
|
-
*/
|
|
61
15
|
export function setupTest(name, debug = false) {
|
|
62
16
|
expect(name).toBeDefined();
|
|
63
17
|
expect(typeof name).toBe('string');
|
|
64
|
-
expect(name.length).toBeGreaterThanOrEqual(4);
|
|
65
|
-
// Cleanup any existing home directory
|
|
18
|
+
expect(name.length).toBeGreaterThanOrEqual(4);
|
|
66
19
|
rmSync(path.join('jest', name), { recursive: true, force: true });
|
|
67
20
|
if (debug) {
|
|
68
21
|
loggerLogSpy = jest.spyOn(AnsiLogger.prototype, 'log');
|
|
@@ -81,11 +34,6 @@ export function setupTest(name, debug = false) {
|
|
|
81
34
|
consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
|
|
82
35
|
}
|
|
83
36
|
}
|
|
84
|
-
/**
|
|
85
|
-
* Set or unset the debug mode.
|
|
86
|
-
*
|
|
87
|
-
* @param {boolean} debug If true, the logging is not mocked.
|
|
88
|
-
*/
|
|
89
37
|
export function setDebug(debug) {
|
|
90
38
|
if (debug) {
|
|
91
39
|
loggerLogSpy.mockRestore();
|
|
@@ -110,21 +58,11 @@ export function setDebug(debug) {
|
|
|
110
58
|
consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
|
|
111
59
|
}
|
|
112
60
|
}
|
|
113
|
-
/**
|
|
114
|
-
* Create a matter Environment for testing:
|
|
115
|
-
* - it will remove any existing home directory
|
|
116
|
-
* - setup the matter environment with homeDir, debug logging and ANSI format
|
|
117
|
-
*
|
|
118
|
-
* @param {string} homeDir Home directory for the environment.
|
|
119
|
-
* @returns {Environment} The default matter environment.
|
|
120
|
-
*/
|
|
121
61
|
export function createTestEnvironment(homeDir) {
|
|
122
62
|
expect(homeDir).toBeDefined();
|
|
123
63
|
expect(typeof homeDir).toBe('string');
|
|
124
|
-
expect(homeDir.length).toBeGreaterThanOrEqual(4);
|
|
125
|
-
// Cleanup any existing home directory
|
|
64
|
+
expect(homeDir.length).toBeGreaterThanOrEqual(4);
|
|
126
65
|
rmSync(homeDir, { recursive: true, force: true });
|
|
127
|
-
// Setup the matter environment
|
|
128
66
|
const environment = Environment.default;
|
|
129
67
|
environment.vars.set('log.level', MatterLogLevel.DEBUG);
|
|
130
68
|
environment.vars.set('log.format', MatterLogFormat.ANSI);
|
|
@@ -133,18 +71,6 @@ export function createTestEnvironment(homeDir) {
|
|
|
133
71
|
environment.vars.set('runtime.exitcode', false);
|
|
134
72
|
return environment;
|
|
135
73
|
}
|
|
136
|
-
/**
|
|
137
|
-
* Advance the Node.js event loop deterministically to allow chained asynchronous work (Promises scheduled in
|
|
138
|
-
* microtasks and follow‑up macrotasks) to complete inside tests without adding arbitrary long timeouts.
|
|
139
|
-
*
|
|
140
|
-
* NOTE: This does not guarantee OS level network IO completion—only JavaScript task queue progression inside the
|
|
141
|
-
* current process.
|
|
142
|
-
*
|
|
143
|
-
* @param {number} ticks Number of macrotask (setImmediate) turns to yield (default 3).
|
|
144
|
-
* @param {number} microTurns Number of microtask drains (Promise.resolve chains) after macrotask yielding (default 10).
|
|
145
|
-
* @param {number} pause Final timer delay in ms; set 0 to disable (default 100ms).
|
|
146
|
-
* @returns {Promise<void>} Resolves after the requested event loop advancement has completed.
|
|
147
|
-
*/
|
|
148
74
|
export async function flushAsync(ticks = 3, microTurns = 10, pause = 100) {
|
|
149
75
|
for (let i = 0; i < ticks; i++)
|
|
150
76
|
await new Promise((resolve) => setImmediate(resolve));
|
|
@@ -153,19 +79,6 @@ export async function flushAsync(ticks = 3, microTurns = 10, pause = 100) {
|
|
|
153
79
|
if (pause)
|
|
154
80
|
await new Promise((resolve) => setTimeout(resolve, pause));
|
|
155
81
|
}
|
|
156
|
-
/**
|
|
157
|
-
* Flush (await) the lazy endpoint number persistence mechanism used by matter.js.
|
|
158
|
-
*
|
|
159
|
-
* Background:
|
|
160
|
-
* assignNumber() batches persistence (store.saveNumber + updating __nextNumber__) via an internal promise (#numbersPersisted).
|
|
161
|
-
* Calling endpointStores.close() waits for the current batch only. If new endpoints were added in the same macrotask
|
|
162
|
-
* cycle additional micro/macro turns might be needed to ensure the batch started. We defensively yield macrotasks
|
|
163
|
-
* (setImmediate) and then await close() multiple rounds.
|
|
164
|
-
*
|
|
165
|
-
* @param {ServerNode} targetServer The server whose endpoint numbering persistence should be flushed.
|
|
166
|
-
* @param {number} rounds Number of macrotask + close cycles to run (2 is usually sufficient; 1 often works).
|
|
167
|
-
* @returns {Promise<void>} Resolves when pending number persistence batches have completed.
|
|
168
|
-
*/
|
|
169
82
|
export async function flushAllEndpointNumberPersistence(targetServer, rounds = 2) {
|
|
170
83
|
const nodeStore = targetServer.env.get(ServerNodeStore);
|
|
171
84
|
for (let i = 0; i < rounds; i++) {
|
|
@@ -173,12 +86,6 @@ export async function flushAllEndpointNumberPersistence(targetServer, rounds = 2
|
|
|
173
86
|
await nodeStore.endpointStores.close();
|
|
174
87
|
}
|
|
175
88
|
}
|
|
176
|
-
/**
|
|
177
|
-
* Collect all endpoints in the server endpoint tree (root -> descendants).
|
|
178
|
-
*
|
|
179
|
-
* @param {Endpoint} root Root endpoint (typically the ServerNode root endpoint cast as Endpoint).
|
|
180
|
-
* @returns {Endpoint[]} Flat array including the root and every descendant once.
|
|
181
|
-
*/
|
|
182
89
|
function collectAllEndpoints(root) {
|
|
183
90
|
const list = [];
|
|
184
91
|
const walk = (ep) => {
|
|
@@ -192,26 +99,14 @@ function collectAllEndpoints(root) {
|
|
|
192
99
|
walk(root);
|
|
193
100
|
return list;
|
|
194
101
|
}
|
|
195
|
-
/**
|
|
196
|
-
* Assert that every endpoint attached to the server has an assigned and (batch-)persisted endpoint number.
|
|
197
|
-
*
|
|
198
|
-
* This waits for any outstanding number persistence batch (endpointStores.close()), then traverses the endpoint
|
|
199
|
-
* graph and asserts:
|
|
200
|
-
* - Root endpoint: number is 0 (allowing undefined to coerce to 0 via nullish coalescing check).
|
|
201
|
-
* - All other endpoints: number > 0.
|
|
202
|
-
*
|
|
203
|
-
* @param {ServerNode} targetServer The server whose endpoint numbers are verified.
|
|
204
|
-
* @returns {Promise<void>} Resolves when assertions complete.
|
|
205
|
-
*/
|
|
206
102
|
export async function assertAllEndpointNumbersPersisted(targetServer) {
|
|
207
103
|
const nodeStore = targetServer.env.get(ServerNodeStore);
|
|
208
|
-
// Ensure any pending persistence finished (flush any in-flight batch promise)
|
|
209
104
|
await nodeStore.endpointStores.close();
|
|
210
105
|
const all = collectAllEndpoints(targetServer);
|
|
211
106
|
for (const ep of all) {
|
|
212
107
|
const store = nodeStore.storeForEndpoint(ep);
|
|
213
108
|
if (ep.maybeNumber === 0) {
|
|
214
|
-
expect(store.number ?? 0).toBe(0);
|
|
109
|
+
expect(store.number ?? 0).toBe(0);
|
|
215
110
|
}
|
|
216
111
|
else {
|
|
217
112
|
expect(store.number).toBeGreaterThan(0);
|
|
@@ -219,15 +114,7 @@ export async function assertAllEndpointNumbersPersisted(targetServer) {
|
|
|
219
114
|
}
|
|
220
115
|
return all.length;
|
|
221
116
|
}
|
|
222
|
-
/**
|
|
223
|
-
* Start a matter server node for testing.
|
|
224
|
-
*
|
|
225
|
-
* @param {string} name Name of the server (used for logging and product description).
|
|
226
|
-
* @param {number} port TCP port to listen on.
|
|
227
|
-
* @returns {Promise<[ServerNode<ServerNode.RootEndpoint>, Endpoint<AggregatorEndpoint>]>} Resolves to an array containing the created ServerNode and its AggregatorNode.
|
|
228
|
-
*/
|
|
229
117
|
export async function startServerNode(name, port) {
|
|
230
|
-
// Create the server node
|
|
231
118
|
const server = await ServerNode.create({
|
|
232
119
|
id: name + 'ServerNode',
|
|
233
120
|
productDescription: {
|
|
@@ -236,7 +123,6 @@ export async function startServerNode(name, port) {
|
|
|
236
123
|
vendorId: VendorId(0xfff1),
|
|
237
124
|
productId: 0x8000,
|
|
238
125
|
},
|
|
239
|
-
// Provide defaults for the BasicInformation cluster on the Root endpoint
|
|
240
126
|
basicInformation: {
|
|
241
127
|
vendorId: VendorId(0xfff1),
|
|
242
128
|
vendorName: 'Matterbridge',
|
|
@@ -253,26 +139,21 @@ export async function startServerNode(name, port) {
|
|
|
253
139
|
});
|
|
254
140
|
expect(server).toBeDefined();
|
|
255
141
|
expect(server.lifecycle.isReady).toBeTruthy();
|
|
256
|
-
// Create the aggregator node
|
|
257
142
|
const aggregator = new Endpoint(AggregatorEndpoint, {
|
|
258
143
|
id: name + 'AggregatorNode',
|
|
259
144
|
});
|
|
260
145
|
expect(aggregator).toBeDefined();
|
|
261
|
-
// Add the aggregator to the server
|
|
262
146
|
await server.add(aggregator);
|
|
263
147
|
expect(server.parts.has(aggregator.id)).toBeTruthy();
|
|
264
148
|
expect(server.parts.has(aggregator)).toBeTruthy();
|
|
265
149
|
expect(aggregator.lifecycle.isReady).toBeTruthy();
|
|
266
|
-
// Run the server
|
|
267
150
|
expect(server.lifecycle.isOnline).toBeFalsy();
|
|
268
|
-
// Wait for the server to be online
|
|
269
151
|
await new Promise((resolve) => {
|
|
270
152
|
server.lifecycle.online.on(async () => {
|
|
271
153
|
resolve();
|
|
272
154
|
});
|
|
273
155
|
server.start();
|
|
274
156
|
});
|
|
275
|
-
// Check if the server is online
|
|
276
157
|
expect(server.lifecycle.isReady).toBeTruthy();
|
|
277
158
|
expect(server.lifecycle.isOnline).toBeTruthy();
|
|
278
159
|
expect(server.lifecycle.isCommissioned).toBeFalsy();
|
|
@@ -284,41 +165,21 @@ export async function startServerNode(name, port) {
|
|
|
284
165
|
expect(aggregator.lifecycle.isPartsReady).toBeTruthy();
|
|
285
166
|
expect(aggregator.lifecycle.hasId).toBeTruthy();
|
|
286
167
|
expect(aggregator.lifecycle.hasNumber).toBeTruthy();
|
|
287
|
-
// Ensure the queue is empty and pause 100ms
|
|
288
168
|
await flushAsync();
|
|
289
169
|
return [server, aggregator];
|
|
290
170
|
}
|
|
291
|
-
/**
|
|
292
|
-
* Stop a matter server node.
|
|
293
|
-
*
|
|
294
|
-
* @param {ServerNode<ServerNode.RootEndpoint>} server The server to stop.
|
|
295
|
-
* @returns {Promise<void>} Resolves when the server has stopped.
|
|
296
|
-
*/
|
|
297
171
|
export async function stopServerNode(server) {
|
|
298
|
-
// Flush any pending endpoint number persistence
|
|
299
172
|
await flushAllEndpointNumberPersistence(server);
|
|
300
|
-
// Ensure all endpoint numbers are persisted
|
|
301
173
|
await assertAllEndpointNumbersPersisted(server);
|
|
302
|
-
// Stop the server
|
|
303
174
|
expect(server).toBeDefined();
|
|
304
175
|
expect(server.lifecycle.isReady).toBeTruthy();
|
|
305
176
|
expect(server.lifecycle.isOnline).toBeTruthy();
|
|
306
177
|
await server.close();
|
|
307
178
|
expect(server.lifecycle.isReady).toBeTruthy();
|
|
308
179
|
expect(server.lifecycle.isOnline).toBeFalsy();
|
|
309
|
-
// stop the mDNS service
|
|
310
180
|
await server.env.get(MdnsService)[Symbol.asyncDispose]();
|
|
311
|
-
// Ensure the queue is empty and pause 100ms
|
|
312
181
|
await flushAsync();
|
|
313
182
|
}
|
|
314
|
-
/**
|
|
315
|
-
* Add a device (endpoint) to a matter server node or an aggregator.
|
|
316
|
-
*
|
|
317
|
-
* @param {ServerNode<ServerNode.RootEndpoint> | Endpoint<AggregatorEndpoint>} owner The server or aggregator to add the device to.
|
|
318
|
-
* @param {Endpoint} device The device to add.
|
|
319
|
-
* @param {number} pause The pause time in milliseconds after addition (default 10ms).
|
|
320
|
-
* @returns {Promise<void>} Resolves when the device has been added and is ready.
|
|
321
|
-
*/
|
|
322
183
|
export async function addDevice(owner, device, pause = 10) {
|
|
323
184
|
expect(owner).toBeDefined();
|
|
324
185
|
expect(device).toBeDefined();
|
|
@@ -331,7 +192,6 @@ export async function addDevice(owner, device, pause = 10) {
|
|
|
331
192
|
catch (error) {
|
|
332
193
|
const errorMessage = error instanceof Error ? error.message : error;
|
|
333
194
|
const errorInspect = inspect(error, { depth: 10 });
|
|
334
|
-
// eslint-disable-next-line no-console
|
|
335
195
|
console.error(`Error adding device ${device.maybeId}.${device.maybeNumber}: ${errorMessage}\nstack: ${errorInspect}`);
|
|
336
196
|
return false;
|
|
337
197
|
}
|
|
@@ -345,14 +205,6 @@ export async function addDevice(owner, device, pause = 10) {
|
|
|
345
205
|
await flushAsync(1, 1, pause);
|
|
346
206
|
return true;
|
|
347
207
|
}
|
|
348
|
-
/**
|
|
349
|
-
* Delete a device (endpoint) from a matter server node or an aggregator.
|
|
350
|
-
*
|
|
351
|
-
* @param {ServerNode<ServerNode.RootEndpoint> | Endpoint<AggregatorEndpoint>} owner The server or aggregator to remove the device from.
|
|
352
|
-
* @param {Endpoint} device The device to remove.
|
|
353
|
-
* @param {number} pause The pause time in milliseconds after deletion (default 10ms).
|
|
354
|
-
* @returns {Promise<void>} Resolves when the device has been removed and is no longer ready.
|
|
355
|
-
*/
|
|
356
208
|
export async function deleteDevice(owner, device, pause = 10) {
|
|
357
209
|
expect(owner).toBeDefined();
|
|
358
210
|
expect(device).toBeDefined();
|
|
@@ -365,7 +217,6 @@ export async function deleteDevice(owner, device, pause = 10) {
|
|
|
365
217
|
catch (error) {
|
|
366
218
|
const errorMessage = error instanceof Error ? error.message : error;
|
|
367
219
|
const errorInspect = inspect(error, { depth: 10 });
|
|
368
|
-
// eslint-disable-next-line no-console
|
|
369
220
|
console.error(`Error deleting device ${device.maybeId}.${device.maybeNumber}: ${errorMessage}\nstack: ${errorInspect}`);
|
|
370
221
|
return false;
|
|
371
222
|
}
|
|
@@ -379,4 +230,3 @@ export async function deleteDevice(owner, device, pause = 10) {
|
|
|
379
230
|
await flushAsync(1, 1, pause);
|
|
380
231
|
return true;
|
|
381
232
|
}
|
|
382
|
-
//# sourceMappingURL=jestHelpers.js.map
|