@matterbridge/core 3.9.1-dev-20260614-89d7aeb → 3.9.1-dev-20260617-b1e1b99
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/README.md +5 -3
- package/dist/backend.js +17 -6
- package/dist/backendExpress.d.ts +1 -1
- package/dist/backendExpress.js +12 -12
- package/dist/backendWsServer.d.ts +1 -1
- package/dist/backendWsServer.js +3 -3
- package/dist/behaviors/activatedCarbonFilterMonitoringServer.d.ts +2 -2
- package/dist/behaviors/bindingServer.d.ts +4 -4
- package/dist/behaviors/bindingServer.js +2 -2
- package/dist/behaviors/booleanStateConfigurationServer.d.ts +2 -2
- package/dist/behaviors/booleanStateConfigurationServer.js +2 -1
- package/dist/behaviors/colorControlServer.d.ts +9 -9
- package/dist/behaviors/deviceEnergyManagementServer.d.ts +4 -4
- package/dist/behaviors/doorLockServer.d.ts +18 -18
- package/dist/behaviors/doorLockServer.js +2 -2
- package/dist/behaviors/fanControlServer.d.ts +2 -2
- package/dist/behaviors/hepaFilterMonitoringServer.d.ts +2 -2
- package/dist/behaviors/identifyServer.d.ts +1 -1
- package/dist/behaviors/levelControlServer.d.ts +1 -1
- package/dist/behaviors/matterbridgeServer.d.ts +2 -2
- package/dist/behaviors/modeSelectServer.d.ts +1 -1
- package/dist/behaviors/operationalStateServer.d.ts +1 -1
- package/dist/behaviors/serviceAreaServer.d.ts +1 -1
- package/dist/behaviors/smokeCoAlarmServer.d.ts +1 -1
- package/dist/behaviors/thermostatServer.d.ts +10 -10
- package/dist/behaviors/valveConfigurationAndControlServer.d.ts +1 -1
- package/dist/behaviors/windowCoveringServer.d.ts +7 -7
- package/dist/behaviors/windowCoveringServer.js +3 -3
- package/dist/cli.js +9 -9
- package/dist/cliEmitter.js +2 -2
- package/dist/cliHistory.js +2 -2
- package/dist/clusters/closure-control.d.ts +1 -1
- package/dist/clusters/closure-dimension.d.ts +1 -1
- package/dist/clusters/export.d.ts +1 -1
- package/dist/clusters/export.js +1 -1
- package/dist/clusters/soil-measurement.d.ts +1 -1
- package/dist/deviceManager.d.ts +1 -1
- package/dist/deviceManager.js +3 -4
- package/dist/devices/batteryStorage.js +2 -1
- package/dist/devices/closure.d.ts +6 -6
- package/dist/devices/closurePanel.d.ts +6 -6
- package/dist/devices/cooktop.d.ts +1 -1
- package/dist/devices/cooktop.js +2 -1
- package/dist/devices/dishwasher.d.ts +1 -1
- package/dist/devices/evse.d.ts +3 -3
- package/dist/devices/evse.js +4 -2
- package/dist/devices/extractorHood.js +2 -1
- package/dist/devices/heatPump.js +7 -8
- package/dist/devices/irrigationSystem.d.ts +1 -1
- package/dist/devices/laundryDryer.d.ts +1 -1
- package/dist/devices/laundryWasher.d.ts +1 -1
- package/dist/devices/oven.d.ts +2 -2
- package/dist/devices/oven.js +4 -3
- package/dist/devices/refrigerator.d.ts +2 -2
- package/dist/devices/refrigerator.js +2 -1
- package/dist/devices/solarPower.d.ts +1 -1
- package/dist/devices/solarPower.js +2 -1
- package/dist/devices/temperatureControl.d.ts +3 -3
- package/dist/devices/waterHeater.js +2 -1
- package/dist/export.js +2 -2
- package/dist/frontend.js +39 -39
- package/dist/helpers.d.ts +1 -1
- package/dist/helpers.js +6 -14
- package/dist/jestutils/jestBroadcastServerSpy.d.ts +13 -12
- package/dist/jestutils/jestBroadcastServerSpy.js +1 -1
- package/dist/jestutils/jestDeviceManagerSpy.d.ts +14 -13
- package/dist/jestutils/jestDeviceManagerSpy.js +1 -1
- package/dist/jestutils/jestFrontendSpy.d.ts +7 -9
- package/dist/jestutils/jestFrontendSpy.js +1 -1
- package/dist/jestutils/jestMatterTest.js +1 -1
- package/dist/jestutils/jestMatterbridgeEndpointSpy.d.ts +6 -54
- package/dist/jestutils/jestMatterbridgeEndpointSpy.js +1 -1
- package/dist/jestutils/jestMatterbridgePlatformSpy.d.ts +43 -60
- package/dist/jestutils/jestMatterbridgePlatformSpy.js +1 -1
- package/dist/jestutils/jestMatterbridgeSpy.d.ts +5 -4
- package/dist/jestutils/jestMatterbridgeSpy.js +1 -1
- package/dist/jestutils/jestMatterbridgeTest.d.ts +2 -2
- package/dist/jestutils/jestMatterbridgeTest.js +1 -1
- package/dist/jestutils/jestPluginManagerSpy.d.ts +40 -47
- package/dist/jestutils/jestPluginManagerSpy.js +1 -1
- package/dist/jestutils/jestSetupTest.d.ts +0 -1
- package/dist/jestutils/jestSetupTest.js +13 -12
- package/dist/jestutils/matterRequest.d.ts +1 -1
- package/dist/matterNode.js +8 -6
- package/dist/matterbridge.js +11 -21
- package/dist/matterbridgeAccessoryPlatform.d.ts +1 -1
- package/dist/matterbridgeAccessoryPlatform.js +2 -2
- package/dist/matterbridgeDeviceTypes.js +2 -2
- package/dist/matterbridgeDynamicPlatform.d.ts +1 -1
- package/dist/matterbridgeDynamicPlatform.js +2 -2
- package/dist/matterbridgeEndpoint.d.ts +9 -9
- package/dist/matterbridgeEndpoint.js +9 -8
- package/dist/matterbridgeEndpointCommandHandler.d.ts +40 -40
- package/dist/matterbridgeEndpointCommandHandler.js +2 -2
- package/dist/matterbridgeEndpointHelpers.d.ts +23 -23
- package/dist/matterbridgeEndpointHelpers.js +3 -4
- package/dist/matterbridgeEndpointTypes.js +2 -3
- package/dist/matterbridgeFactory.d.ts +1 -1
- package/dist/matterbridgeFactory.js +2 -2
- package/dist/matterbridgePlatform.d.ts +1 -1
- package/dist/matterbridgePlatform.js +2 -2
- package/dist/mb_coap.js +3 -1
- package/dist/mb_health.js +3 -1
- package/dist/mb_mdns.js +10 -7
- package/dist/pluginManager.d.ts +1 -1
- package/dist/pluginManager.js +11 -6
- package/package.json +7 -7
|
@@ -5,11 +5,11 @@ import { AirQuality } from '@matter/types/clusters/air-quality';
|
|
|
5
5
|
import { ColorControl } from '@matter/types/clusters/color-control';
|
|
6
6
|
import { ConcentrationMeasurement } from '@matter/types/clusters/concentration-measurement';
|
|
7
7
|
import { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
|
|
8
|
-
import {
|
|
8
|
+
import type { DeviceEnergyManagementMode } from '@matter/types/clusters/device-energy-management-mode';
|
|
9
9
|
import { DoorLock } from '@matter/types/clusters/door-lock';
|
|
10
10
|
import { FanControl } from '@matter/types/clusters/fan-control';
|
|
11
11
|
import { Identify } from '@matter/types/clusters/identify';
|
|
12
|
-
import {
|
|
12
|
+
import type { ModeSelect } from '@matter/types/clusters/mode-select';
|
|
13
13
|
import { OnOff } from '@matter/types/clusters/on-off';
|
|
14
14
|
import { OperationalState } from '@matter/types/clusters/operational-state';
|
|
15
15
|
import { PowerSource } from '@matter/types/clusters/power-source';
|
|
@@ -21,11 +21,11 @@ import { ThermostatUserInterfaceConfiguration } from '@matter/types/clusters/the
|
|
|
21
21
|
import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
|
|
22
22
|
import { WindowCovering } from '@matter/types/clusters/window-covering';
|
|
23
23
|
import { type ClusterId, type EndpointNumber } from '@matter/types/datatype';
|
|
24
|
-
import {
|
|
24
|
+
import type { MeasurementAccuracy, Semtag } from '@matter/types/globals';
|
|
25
25
|
import { AnsiLogger, LogLevel } from 'node-ansi-logger';
|
|
26
|
-
import {
|
|
26
|
+
import type { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
|
|
27
27
|
import { CommandHandler, type CommandHandlerData, type CommandHandlerExecutionResult, type CommandHandlerFunction, type CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
|
|
28
|
-
import {
|
|
28
|
+
import type { MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint } from './matterbridgeEndpointTypes.js';
|
|
29
29
|
type FirstCommandParam<Params extends unknown[]> = Params extends [] ? undefined : Params[0];
|
|
30
30
|
type BehaviorCluster<T extends Behavior.Type> = T extends {
|
|
31
31
|
cluster: infer C extends ClusterType;
|
|
@@ -171,10 +171,10 @@ export declare class MatterbridgeEndpoint extends Endpoint {
|
|
|
171
171
|
setWindowCoveringStatus(status: WindowCovering.MovementStatus): Promise<void>;
|
|
172
172
|
getWindowCoveringStatus(): WindowCovering.MovementStatus | undefined;
|
|
173
173
|
setWindowCoveringTargetAndCurrentPosition(liftPosition: number, tiltPosition?: number): Promise<void>;
|
|
174
|
-
createDefaultThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number
|
|
175
|
-
createDefaultHeatingThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, unoccupiedHeatingSetpoint?: number
|
|
176
|
-
createDefaultPresetsThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number
|
|
177
|
-
createDefaultCoolingThermostatClusterServer(localTemperature?: number, occupiedCoolingSetpoint?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedCoolingSetpoint?: number
|
|
174
|
+
createDefaultThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number, unoccupiedCoolingSetpoint?: number, occupied?: boolean, outdoorTemperature?: number | null): this;
|
|
175
|
+
createDefaultHeatingThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, unoccupiedHeatingSetpoint?: number, occupied?: boolean, outdoorTemperature?: number | null): this;
|
|
176
|
+
createDefaultPresetsThermostatClusterServer(localTemperature?: number, occupiedHeatingSetpoint?: number, occupiedCoolingSetpoint?: number, minSetpointDeadBand?: number, minHeatSetpointLimit?: number, maxHeatSetpointLimit?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedHeatingSetpoint?: number, unoccupiedCoolingSetpoint?: number, occupied?: boolean, outdoorTemperature?: number | null, activePresetHandle?: Uint8Array | null, presets?: Thermostat.Preset[], presetTypes?: Thermostat.PresetType[]): this;
|
|
177
|
+
createDefaultCoolingThermostatClusterServer(localTemperature?: number, occupiedCoolingSetpoint?: number, minCoolSetpointLimit?: number, maxCoolSetpointLimit?: number, unoccupiedCoolingSetpoint?: number, occupied?: boolean, outdoorTemperature?: number | null): this;
|
|
178
178
|
createDefaultThermostatUserInterfaceConfigurationClusterServer(temperatureDisplayMode?: ThermostatUserInterfaceConfiguration.TemperatureDisplayMode, keypadLockout?: ThermostatUserInterfaceConfiguration.KeypadLockout, scheduleProgrammingVisibility?: ThermostatUserInterfaceConfiguration.ScheduleProgrammingVisibility): this;
|
|
179
179
|
createDefaultFanControlClusterServer(fanMode?: FanControl.FanMode, fanModeSequence?: FanControl.FanModeSequence, percentSetting?: number, percentCurrent?: number): this;
|
|
180
180
|
createOnOffFanControlClusterServer(fanMode?: FanControl.FanMode): this;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] MatterbridgeEndpoint loaded.\u001B[40;0m');
|
|
3
1
|
import { Lifecycle, UINT16_MAX, UINT32_MAX } from '@matter/general';
|
|
4
2
|
import { Endpoint, MutableEndpoint, SupportedBehaviors } from '@matter/node';
|
|
5
3
|
import { AirQualityServer } from '@matter/node/behaviors/air-quality';
|
|
@@ -61,6 +59,7 @@ import { ValveConfigurationAndControl } from '@matter/types/clusters/valve-confi
|
|
|
61
59
|
import { WindowCovering } from '@matter/types/clusters/window-covering';
|
|
62
60
|
import { VendorId } from '@matter/types/datatype';
|
|
63
61
|
import { inspectError } from '@matterbridge/utils/error';
|
|
62
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
64
63
|
import { isValidNumber, isValidObject, isValidString } from '@matterbridge/utils/validate';
|
|
65
64
|
import { AnsiLogger, CYAN, db, debugStringify, hk, or, YELLOW, zb } from 'node-ansi-logger';
|
|
66
65
|
import { MatterbridgeActivatedCarbonFilterMonitoringServer } from './behaviors/activatedCarbonFilterMonitoringServer.js';
|
|
@@ -85,6 +84,7 @@ import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valv
|
|
|
85
84
|
import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
|
|
86
85
|
import { CommandHandler, } from './matterbridgeEndpointCommandHandler.js';
|
|
87
86
|
import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, featuresFor, generateUniqueId, getApparentElectricalPowerMeasurementClusterServer, getAttribute, getAttributeId, getBehavior, getBehaviourTypesFromClusterClientIds, getBehaviourTypesFromClusterServerIds, getCluster, getClusterId, getDefaultDeviceEnergyManagementClusterServer, getDefaultDeviceEnergyManagementModeClusterServer, getDefaultElectricalEnergyMeasurementClusterServer, getDefaultElectricalPowerMeasurementClusterServer, getDefaultFlowMeasurementClusterServer, getDefaultIlluminanceMeasurementClusterServer, getDefaultOccupancySensingClusterServer, getDefaultOperationalStateClusterServer, getDefaultPowerSourceBatteryClusterServer, getDefaultPowerSourceRechargeableBatteryClusterServer, getDefaultPowerSourceReplaceableBatteryClusterServer, getDefaultPowerSourceWiredClusterServer, getDefaultPressureMeasurementClusterServer, getDefaultRelativeHumidityMeasurementClusterServer, getDefaultSoilMeasurementClusterServer, getDefaultTemperatureMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
|
|
87
|
+
logModuleLoaded('MatterbridgeEndpoint');
|
|
88
88
|
const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
|
|
89
89
|
export function isMatterbridgeEndpoint(value) {
|
|
90
90
|
if (!value || typeof value !== 'object')
|
|
@@ -314,7 +314,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
314
314
|
if (!this.lifecycle.isReady || this.construction.status !== Lifecycle.Status.Active)
|
|
315
315
|
return;
|
|
316
316
|
for (const [clusterName, clusterAttributes] of Object.entries(this.state)) {
|
|
317
|
-
if (!isNaN(Number(clusterName)))
|
|
317
|
+
if (!Number.isNaN(Number(clusterName)))
|
|
318
318
|
continue;
|
|
319
319
|
for (const [attributeName, attributeValue] of Object.entries(clusterAttributes)) {
|
|
320
320
|
const clusterId = getClusterId(this, clusterName);
|
|
@@ -460,7 +460,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
460
460
|
}
|
|
461
461
|
static serialize(device) {
|
|
462
462
|
if (!device.serialNumber || !device.deviceName || !device.uniqueId || !device.maybeId || !device.maybeNumber)
|
|
463
|
-
return;
|
|
463
|
+
return undefined;
|
|
464
464
|
const serialized = {
|
|
465
465
|
pluginName: device.plugin ?? '',
|
|
466
466
|
deviceName: device.deviceName,
|
|
@@ -864,6 +864,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
864
864
|
this.log.debug(`Get WindowCovering operationalStatus: ${status.global}`);
|
|
865
865
|
return status.global;
|
|
866
866
|
}
|
|
867
|
+
return undefined;
|
|
867
868
|
}
|
|
868
869
|
async setWindowCoveringTargetAndCurrentPosition(liftPosition, tiltPosition) {
|
|
869
870
|
await this.setAttribute(WindowCovering, 'currentPositionLiftPercent100ths', liftPosition, this.log);
|
|
@@ -875,7 +876,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
875
876
|
this.log.debug(`Set WindowCovering currentPositionTiltPercent100ths: ${tiltPosition} and targetPositionTiltPercent100ths: ${tiltPosition}.`);
|
|
876
877
|
}
|
|
877
878
|
}
|
|
878
|
-
createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint
|
|
879
|
+
createDefaultThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint, unoccupiedCoolingSetpoint, occupied, outdoorTemperature) {
|
|
879
880
|
this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating, Thermostat.Feature.Cooling, Thermostat.Feature.AutoMode, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : [])), {
|
|
880
881
|
localTemperature: localTemperature * 100,
|
|
881
882
|
externalMeasuredIndoorTemperature: localTemperature * 100,
|
|
@@ -910,7 +911,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
910
911
|
});
|
|
911
912
|
return this;
|
|
912
913
|
}
|
|
913
|
-
createDefaultHeatingThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, unoccupiedHeatingSetpoint
|
|
914
|
+
createDefaultHeatingThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, unoccupiedHeatingSetpoint, occupied, outdoorTemperature) {
|
|
914
915
|
this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Heating, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : [])), {
|
|
915
916
|
localTemperature: localTemperature * 100,
|
|
916
917
|
externalMeasuredIndoorTemperature: localTemperature * 100,
|
|
@@ -937,7 +938,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
937
938
|
});
|
|
938
939
|
return this;
|
|
939
940
|
}
|
|
940
|
-
createDefaultPresetsThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint
|
|
941
|
+
createDefaultPresetsThermostatClusterServer(localTemperature = 23, occupiedHeatingSetpoint = 21, occupiedCoolingSetpoint = 25, minSetpointDeadBand = 0, minHeatSetpointLimit = 0, maxHeatSetpointLimit = 50, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedHeatingSetpoint, unoccupiedCoolingSetpoint, occupied, outdoorTemperature, activePresetHandle = null, presets = [], presetTypes = [
|
|
941
942
|
{ presetScenario: Thermostat.PresetScenario.Occupied, numberOfPresets: 2, presetTypeFeatures: { automatic: false, supportsNames: true } },
|
|
942
943
|
{ presetScenario: Thermostat.PresetScenario.Unoccupied, numberOfPresets: 2, presetTypeFeatures: { automatic: false, supportsNames: true } },
|
|
943
944
|
]) {
|
|
@@ -981,7 +982,7 @@ export class MatterbridgeEndpoint extends Endpoint {
|
|
|
981
982
|
});
|
|
982
983
|
return this;
|
|
983
984
|
}
|
|
984
|
-
createDefaultCoolingThermostatClusterServer(localTemperature = 23, occupiedCoolingSetpoint = 25, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedCoolingSetpoint
|
|
985
|
+
createDefaultCoolingThermostatClusterServer(localTemperature = 23, occupiedCoolingSetpoint = 25, minCoolSetpointLimit = 0, maxCoolSetpointLimit = 50, unoccupiedCoolingSetpoint, occupied, outdoorTemperature) {
|
|
985
986
|
this.behaviors.require(MatterbridgeThermostatServer.with(Thermostat.Feature.Cooling, ...(occupied !== undefined ? [Thermostat.Feature.Occupancy] : [])), {
|
|
986
987
|
localTemperature: localTemperature * 100,
|
|
987
988
|
externalMeasuredIndoorTemperature: localTemperature * 100,
|
|
@@ -1,43 +1,43 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import type { HandlerFunction } from '@matter/general';
|
|
2
|
+
import type { ActionContext } from '@matter/main';
|
|
3
3
|
import type { ClusterType } from '@matter/types/cluster';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
25
|
-
import {
|
|
26
|
-
import {
|
|
27
|
-
import {
|
|
28
|
-
import {
|
|
29
|
-
import {
|
|
30
|
-
import {
|
|
31
|
-
import {
|
|
32
|
-
import {
|
|
33
|
-
import {
|
|
34
|
-
import {
|
|
35
|
-
import {
|
|
36
|
-
import {
|
|
37
|
-
import {
|
|
38
|
-
import {
|
|
39
|
-
import {
|
|
40
|
-
import {
|
|
4
|
+
import type { ActivatedCarbonFilterMonitoring } from '@matter/types/clusters/activated-carbon-filter-monitoring';
|
|
5
|
+
import type { BooleanStateConfiguration } from '@matter/types/clusters/boolean-state-configuration';
|
|
6
|
+
import type { ColorControl } from '@matter/types/clusters/color-control';
|
|
7
|
+
import type { DeviceEnergyManagement } from '@matter/types/clusters/device-energy-management';
|
|
8
|
+
import type { DeviceEnergyManagementMode } from '@matter/types/clusters/device-energy-management-mode';
|
|
9
|
+
import type { DishwasherMode } from '@matter/types/clusters/dishwasher-mode';
|
|
10
|
+
import type { DoorLock } from '@matter/types/clusters/door-lock';
|
|
11
|
+
import type { EnergyEvse } from '@matter/types/clusters/energy-evse';
|
|
12
|
+
import type { EnergyEvseMode } from '@matter/types/clusters/energy-evse-mode';
|
|
13
|
+
import type { FanControl } from '@matter/types/clusters/fan-control';
|
|
14
|
+
import type { HepaFilterMonitoring } from '@matter/types/clusters/hepa-filter-monitoring';
|
|
15
|
+
import type { Identify } from '@matter/types/clusters/identify';
|
|
16
|
+
import type { KeypadInput } from '@matter/types/clusters/keypad-input';
|
|
17
|
+
import type { LaundryWasherMode } from '@matter/types/clusters/laundry-washer-mode';
|
|
18
|
+
import type { LevelControl } from '@matter/types/clusters/level-control';
|
|
19
|
+
import type { MediaPlayback } from '@matter/types/clusters/media-playback';
|
|
20
|
+
import type { MicrowaveOvenControl } from '@matter/types/clusters/microwave-oven-control';
|
|
21
|
+
import type { ModeBase } from '@matter/types/clusters/mode-base';
|
|
22
|
+
import type { ModeSelect } from '@matter/types/clusters/mode-select';
|
|
23
|
+
import type { OnOff } from '@matter/types/clusters/on-off';
|
|
24
|
+
import type { OperationalState } from '@matter/types/clusters/operational-state';
|
|
25
|
+
import type { ResourceMonitoring } from '@matter/types/clusters/resource-monitoring';
|
|
26
|
+
import type { RvcCleanMode } from '@matter/types/clusters/rvc-clean-mode';
|
|
27
|
+
import type { RvcOperationalState } from '@matter/types/clusters/rvc-operational-state';
|
|
28
|
+
import type { RvcRunMode } from '@matter/types/clusters/rvc-run-mode';
|
|
29
|
+
import type { ServiceArea } from '@matter/types/clusters/service-area';
|
|
30
|
+
import type { SmokeCoAlarm } from '@matter/types/clusters/smoke-co-alarm';
|
|
31
|
+
import type { TemperatureControl } from '@matter/types/clusters/temperature-control';
|
|
32
|
+
import type { Thermostat } from '@matter/types/clusters/thermostat';
|
|
33
|
+
import type { ThreadNetworkDiagnostics } from '@matter/types/clusters/thread-network-diagnostics';
|
|
34
|
+
import type { TimeSynchronization } from '@matter/types/clusters/time-synchronization';
|
|
35
|
+
import type { ValveConfigurationAndControl } from '@matter/types/clusters/valve-configuration-and-control';
|
|
36
|
+
import type { WaterHeaterManagement } from '@matter/types/clusters/water-heater-management';
|
|
37
|
+
import type { WaterHeaterMode } from '@matter/types/clusters/water-heater-mode';
|
|
38
|
+
import type { WindowCovering } from '@matter/types/clusters/window-covering';
|
|
39
|
+
import type { ClosureControl } from './clusters/closure-control.js';
|
|
40
|
+
import type { ClosureDimension } from './clusters/closure-dimension.js';
|
|
41
41
|
import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
42
42
|
export interface MatterbridgeEndpointCommands {
|
|
43
43
|
identify: HandlerFunction;
|
|
@@ -870,7 +870,7 @@ export type CommandHandlerResponseMap = {
|
|
|
870
870
|
};
|
|
871
871
|
export declare class CommandHandler {
|
|
872
872
|
private handler;
|
|
873
|
-
hasHandler
|
|
873
|
+
hasHandler(command: CommandHandlers): boolean;
|
|
874
874
|
addHandler<K extends CommandHandlers>(command: K, handler: CommandHandlerFunction<K>): void;
|
|
875
875
|
executeHandler<K extends CommandHandlers>(command: K, ...args: Parameters<CommandHandlerFunction<K>>): Promise<CommandHandlerExecutionResult<K>>;
|
|
876
876
|
removeHandler<K extends CommandHandlers>(command: K, handler: CommandHandlerFunction<K>): void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
2
|
+
logModuleLoaded('MatterbridgeEndpointCommandHandler');
|
|
3
3
|
export class CommandHandler {
|
|
4
4
|
handler = [];
|
|
5
5
|
hasHandler(command) {
|
|
@@ -23,8 +23,8 @@ import { MatterbridgeDeviceEnergyManagementModeServer } from './behaviors/device
|
|
|
23
23
|
import { MatterbridgeDeviceEnergyManagementServer } from './behaviors/deviceEnergyManagementServer.js';
|
|
24
24
|
import { MatterbridgeOperationalStateServer } from './behaviors/operationalStateServer.js';
|
|
25
25
|
import { MatterbridgePowerSourceServer } from './behaviors/powerSourceServer.js';
|
|
26
|
-
import {
|
|
27
|
-
import {
|
|
26
|
+
import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
27
|
+
import type { CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
|
|
28
28
|
export declare function capitalizeFirstLetter(name: string): string;
|
|
29
29
|
export declare function lowercaseFirstLetter(name: string): string;
|
|
30
30
|
export declare function getSnapshot<T>(value: T): T;
|
|
@@ -62,67 +62,67 @@ export declare function setCluster(endpoint: MatterbridgeEndpoint, cluster: Beha
|
|
|
62
62
|
export declare function getCluster(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, log?: AnsiLogger): Record<string, boolean | number | bigint | string | object | undefined | null> | undefined;
|
|
63
63
|
export declare function triggerEvent(endpoint: MatterbridgeEndpoint, cluster: Behavior.Type | ClusterType | ClusterId | string, event: string, payload: Record<string, boolean | number | bigint | string | object | undefined | null>, log?: AnsiLogger): Promise<boolean>;
|
|
64
64
|
export declare function getDefaultPowerSourceWiredClusterServer(wiredCurrentType?: PowerSource.WiredCurrentType): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
|
|
65
|
+
wired: true;
|
|
65
66
|
battery: false;
|
|
66
67
|
rechargeable: false;
|
|
67
68
|
replaceable: false;
|
|
68
|
-
wired: true;
|
|
69
69
|
}>, typeof MatterbridgePowerSourceServer>>;
|
|
70
70
|
export declare function getDefaultPowerSourceBatteryClusterServer(batPercentRemaining?: null | number, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: null | number, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
|
|
71
|
+
wired: false;
|
|
71
72
|
battery: true;
|
|
72
73
|
rechargeable: false;
|
|
73
74
|
replaceable: false;
|
|
74
|
-
wired: false;
|
|
75
75
|
}>, typeof MatterbridgePowerSourceServer>>;
|
|
76
76
|
export declare function getDefaultPowerSourceReplaceableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplacementDescription?: string, batQuantity?: number, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
|
|
77
|
+
wired: false;
|
|
77
78
|
battery: true;
|
|
78
79
|
rechargeable: false;
|
|
79
80
|
replaceable: true;
|
|
80
|
-
wired: false;
|
|
81
81
|
}>, typeof MatterbridgePowerSourceServer>>;
|
|
82
82
|
export declare function getDefaultPowerSourceRechargeableBatteryClusterServer(batPercentRemaining?: number | null, batChargeLevel?: PowerSource.BatChargeLevel, batVoltage?: number | null, batReplaceability?: PowerSource.BatReplaceability): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<PowerSource, {
|
|
83
|
+
wired: false;
|
|
83
84
|
battery: true;
|
|
84
85
|
rechargeable: true;
|
|
85
86
|
replaceable: false;
|
|
86
|
-
wired: false;
|
|
87
87
|
}>, typeof MatterbridgePowerSourceServer>>;
|
|
88
88
|
export declare function getDefaultElectricalEnergyMeasurementClusterServer(energyImported?: number | bigint | null, energyExported?: number | bigint | null): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<ElectricalEnergyMeasurement, {
|
|
89
|
-
apparentEnergy: false;
|
|
90
|
-
cumulativeEnergy: true;
|
|
91
|
-
exportedEnergy: true;
|
|
92
89
|
importedEnergy: true;
|
|
90
|
+
exportedEnergy: true;
|
|
91
|
+
cumulativeEnergy: true;
|
|
93
92
|
periodicEnergy: false;
|
|
93
|
+
apparentEnergy: false;
|
|
94
94
|
reactiveEnergy: false;
|
|
95
95
|
}>, typeof ElectricalEnergyMeasurementServer>>;
|
|
96
96
|
export declare function getDefaultElectricalPowerMeasurementClusterServer(voltage?: number | bigint | null, current?: number | bigint | null, power?: number | bigint | null, frequency?: number | bigint | null): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<ElectricalPowerMeasurement, {
|
|
97
|
-
alternatingCurrent: true;
|
|
98
97
|
directCurrent: false;
|
|
99
|
-
|
|
98
|
+
alternatingCurrent: true;
|
|
100
99
|
polyphasePower: false;
|
|
100
|
+
harmonics: false;
|
|
101
101
|
powerQuality: false;
|
|
102
102
|
}>, typeof ElectricalPowerMeasurementServer>>;
|
|
103
103
|
export declare function getApparentElectricalPowerMeasurementClusterServer(voltage?: number | bigint | null, apparentCurrent?: number | bigint | null, apparentPower?: number | bigint | null, frequency?: number | bigint | null): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<ElectricalPowerMeasurement, {
|
|
104
|
-
alternatingCurrent: true;
|
|
105
104
|
directCurrent: false;
|
|
106
|
-
|
|
105
|
+
alternatingCurrent: true;
|
|
107
106
|
polyphasePower: false;
|
|
107
|
+
harmonics: false;
|
|
108
108
|
powerQuality: false;
|
|
109
109
|
}>, typeof ElectricalPowerMeasurementServer>>;
|
|
110
110
|
export declare function getDefaultDeviceEnergyManagementClusterServer(esaType?: DeviceEnergyManagement.EsaType, esaCanGenerate?: boolean, esaState?: DeviceEnergyManagement.EsaState, absMinPower?: number, absMaxPower?: number): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<ClusterType.WithSupportedFeatures<DeviceEnergyManagement, {
|
|
111
|
-
constraintBasedAdjustment: false;
|
|
112
|
-
forecastAdjustment: false;
|
|
113
|
-
pausable: false;
|
|
114
111
|
powerAdjustment: true;
|
|
115
112
|
powerForecastReporting: true;
|
|
116
|
-
startTimeAdjustment: false;
|
|
117
113
|
stateForecastReporting: false;
|
|
118
|
-
|
|
119
|
-
constraintBasedAdjustment: false;
|
|
120
|
-
forecastAdjustment: false;
|
|
114
|
+
startTimeAdjustment: false;
|
|
121
115
|
pausable: false;
|
|
116
|
+
forecastAdjustment: false;
|
|
117
|
+
constraintBasedAdjustment: false;
|
|
118
|
+
}>, {
|
|
122
119
|
powerAdjustment: true;
|
|
123
120
|
powerForecastReporting: true;
|
|
124
|
-
startTimeAdjustment: false;
|
|
125
121
|
stateForecastReporting: false;
|
|
122
|
+
startTimeAdjustment: false;
|
|
123
|
+
pausable: false;
|
|
124
|
+
forecastAdjustment: false;
|
|
125
|
+
constraintBasedAdjustment: false;
|
|
126
126
|
}>, typeof MatterbridgeDeviceEnergyManagementServer>>;
|
|
127
127
|
export declare function getDefaultDeviceEnergyManagementModeClusterServer(currentMode?: number, supportedModes?: DeviceEnergyManagementMode.ModeOption[]): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<DeviceEnergyManagementMode, {
|
|
128
128
|
onOff: false;
|
|
@@ -134,13 +134,13 @@ export declare function getDefaultPressureMeasurementClusterServer(measuredValue
|
|
|
134
134
|
export declare function getDefaultIlluminanceMeasurementClusterServer(measuredValue?: number | null, minMeasuredValue?: number | null, maxMeasuredValue?: number | null): Partial<import("@matter/node").ClusterState.Type<IlluminanceMeasurement, typeof ClusterBehavior>>;
|
|
135
135
|
export declare function getDefaultFlowMeasurementClusterServer(measuredValue?: number | null, minMeasuredValue?: number | null, maxMeasuredValue?: number | null): Partial<import("@matter/node").ClusterState.Type<FlowMeasurement, typeof ClusterBehavior>>;
|
|
136
136
|
export declare function getDefaultOccupancySensingClusterServer(occupied?: boolean, holdTime?: number, holdTimeMin?: number, holdTimeMax?: number): Partial<import("@matter/node").ClusterState.Type<ClusterType.WithSupportedFeatures<OccupancySensing, {
|
|
137
|
-
activeInfrared: false;
|
|
138
137
|
other: false;
|
|
139
138
|
passiveInfrared: true;
|
|
139
|
+
ultrasonic: false;
|
|
140
140
|
physicalContact: false;
|
|
141
|
+
activeInfrared: false;
|
|
141
142
|
radar: false;
|
|
142
143
|
rfSensing: false;
|
|
143
|
-
ultrasonic: false;
|
|
144
144
|
vision: false;
|
|
145
145
|
}>, typeof OccupancySensingServer>>;
|
|
146
146
|
export declare function getDefaultSoilMeasurementClusterServer(soilMoistureMeasuredValue?: number | null, soilMoistureMeasurementLimits?: MeasurementAccuracy): Partial<import("@matter/node").ClusterState.Type<SoilMeasurement, typeof ClusterBehavior>>;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] MatterbridgeEndpointHelpers loaded.\u001B[40;0m');
|
|
3
1
|
import { createHash } from 'node:crypto';
|
|
4
2
|
import { Lifecycle } from '@matter/general';
|
|
5
3
|
import { ClusterBehavior } from '@matter/node';
|
|
@@ -98,6 +96,7 @@ import { WindowCovering } from '@matter/types/clusters/window-covering';
|
|
|
98
96
|
import { NodeId } from '@matter/types/datatype';
|
|
99
97
|
import { MeasurementType } from '@matter/types/globals';
|
|
100
98
|
import { deepEqual } from '@matterbridge/utils/deep-equal';
|
|
99
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
101
100
|
import { isValidArray } from '@matterbridge/utils/validate';
|
|
102
101
|
import { BLUE, CYAN, db, debugStringify, er, hk, nf, or, wr, YELLOW, zb } from 'node-ansi-logger';
|
|
103
102
|
import { MatterbridgeBindingServer } from './behaviors/bindingServer.js';
|
|
@@ -117,6 +116,7 @@ import { MatterbridgeSmokeCoAlarmServer } from './behaviors/smokeCoAlarmServer.j
|
|
|
117
116
|
import { MatterbridgeThermostatServer } from './behaviors/thermostatServer.js';
|
|
118
117
|
import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valveConfigurationAndControlServer.js';
|
|
119
118
|
import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
|
|
119
|
+
logModuleLoaded('MatterbridgeEndpointHelpers');
|
|
120
120
|
export function capitalizeFirstLetter(name) {
|
|
121
121
|
if (!name)
|
|
122
122
|
return name;
|
|
@@ -203,9 +203,8 @@ export async function internalFor(endpoint, cluster) {
|
|
|
203
203
|
return undefined;
|
|
204
204
|
}
|
|
205
205
|
const supportedBehavior = endpoint.behaviors.supported[lowercaseFirstLetter(behaviorId)];
|
|
206
|
-
if (!supportedBehavior)
|
|
206
|
+
if (!supportedBehavior)
|
|
207
207
|
return undefined;
|
|
208
|
-
}
|
|
209
208
|
return endpoint.act(() => endpoint.behaviors.internalsOf(supportedBehavior));
|
|
210
209
|
}
|
|
211
210
|
export function optionsFor(type, options) {
|
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
export {};
|
|
1
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
2
|
+
logModuleLoaded('MatterbridgeEndpointTypes');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Behavior } from '@matter/node';
|
|
2
|
-
import {
|
|
2
|
+
import type { ClusterId } from '@matter/types/datatype';
|
|
3
3
|
import type { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
4
4
|
export interface CreateClusterServerOptions {
|
|
5
5
|
features?: Record<string, boolean> | string[];
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] MatterbridgeFactory loaded.\u001B[40;0m');
|
|
3
1
|
import { ClusterBehavior } from '@matter/node';
|
|
4
2
|
import { getClusterNameById } from '@matter/types/cluster';
|
|
3
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
5
4
|
import { db, hk } from 'node-ansi-logger';
|
|
5
|
+
logModuleLoaded('MatterbridgeFactory');
|
|
6
6
|
export function snakeCase(name) {
|
|
7
7
|
let result = '';
|
|
8
8
|
let needSeparator = false;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { EndpointNumber } from '@matter/types/datatype';
|
|
2
2
|
import type { ApiSelectDevice, ApiSelectEntity, PlatformConfig, PlatformMatterbridge, PlatformSchema } from '@matterbridge/types';
|
|
3
3
|
import { type AnsiLogger, type LogLevel } from 'node-ansi-logger';
|
|
4
4
|
import { type NodeStorage } from 'node-persist-manager';
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
if (process.argv.includes('--loader'))
|
|
2
|
-
console.log('\u001B[32m[' + new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit', second: '2-digit', fractionalSecondDigits: 3 }) + '] MatterbridgePlatform loaded.\u001B[40;0m');
|
|
3
1
|
import path from 'node:path';
|
|
4
2
|
import { BridgedDeviceBasicInformation } from '@matter/types/clusters/bridged-device-basic-information';
|
|
5
3
|
import { Descriptor } from '@matter/types/clusters/descriptor';
|
|
6
4
|
import { BroadcastServer } from '@matterbridge/thread/server';
|
|
7
5
|
import { hasParameter } from '@matterbridge/utils/cli';
|
|
6
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
8
7
|
import { isValidArray, isValidObject, isValidString } from '@matterbridge/utils/validate';
|
|
9
8
|
import { fireAndForget } from '@matterbridge/utils/wait';
|
|
10
9
|
import { CYAN, db, er, nf, wr } from 'node-ansi-logger';
|
|
@@ -12,6 +11,7 @@ import { NodeStorageManager } from 'node-persist-manager';
|
|
|
12
11
|
import { bridgedNode } from './matterbridgeDeviceTypes.js';
|
|
13
12
|
import { assertMatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
14
13
|
import { checkNotLatinCharacters } from './matterbridgeEndpointHelpers.js';
|
|
14
|
+
logModuleLoaded('MatterbridgePlatform');
|
|
15
15
|
const MATTERBRIDGE_PLATFORM_BRAND = Symbol('MatterbridgePlatform.brand');
|
|
16
16
|
export function isMatterbridgePlatform(value) {
|
|
17
17
|
if (!value || typeof value !== 'object')
|
package/dist/mb_coap.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Coap, COAP_MULTICAST_IPV4_ADDRESS, COAP_MULTICAST_IPV6_ADDRESS, COAP_MULTICAST_PORT, COAP_OPTION_URI_PATH } from '@matterbridge/dgram';
|
|
2
2
|
import { getIntParameter, getParameter, hasParameter } from '@matterbridge/utils/cli';
|
|
3
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
|
+
logModuleLoaded('mb-coap');
|
|
3
5
|
export const MB_COAP_DEFAULT_REQUEST_INTERVAL_MS = 10000;
|
|
4
6
|
export const MB_COAP_DEFAULT_TIMEOUT_MS = 600000;
|
|
5
7
|
function defaultConsoleLog(message) {
|
|
@@ -147,7 +149,7 @@ export function mbCoapMain(exitFn = process.exit, log = defaultConsoleLog) {
|
|
|
147
149
|
if (options.showHelp) {
|
|
148
150
|
printMbCoapHelp(log);
|
|
149
151
|
exitFn(0);
|
|
150
|
-
return;
|
|
152
|
+
return undefined;
|
|
151
153
|
}
|
|
152
154
|
return startMbCoap(options, exitFn);
|
|
153
155
|
}
|
package/dist/mb_health.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import http from 'node:http';
|
|
2
2
|
import https from 'node:https';
|
|
3
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
|
+
logModuleLoaded('mb-health');
|
|
3
5
|
const DEFAULT_MB_HEALTH_URL = 'http://localhost:8283/health';
|
|
4
6
|
export async function checkHealth(url, timeoutMs) {
|
|
5
7
|
try {
|
|
@@ -10,7 +12,7 @@ export async function checkHealth(url, timeoutMs) {
|
|
|
10
12
|
return false;
|
|
11
13
|
}
|
|
12
14
|
}
|
|
13
|
-
export function fetchHealth(url, timeoutMs) {
|
|
15
|
+
export async function fetchHealth(url, timeoutMs) {
|
|
14
16
|
return new Promise((resolve) => {
|
|
15
17
|
const parsedUrl = new URL(url);
|
|
16
18
|
const requestImpl = parsedUrl.protocol === 'https:' ? https : http;
|
package/dist/mb_mdns.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import os from 'node:os';
|
|
2
2
|
import { DnsClass, DnsClassFlag, DnsRecordType, Mdns, MDNS_MULTICAST_IPV4_ADDRESS, MDNS_MULTICAST_IPV6_ADDRESS, MDNS_MULTICAST_PORT } from '@matterbridge/dgram';
|
|
3
3
|
import { getIntParameter, getParameter, getStringArrayParameter, hasParameter } from '@matterbridge/utils/cli';
|
|
4
|
+
import { getErrorMessage } from '@matterbridge/utils/error';
|
|
5
|
+
import { logModuleLoaded } from '@matterbridge/utils/loader';
|
|
4
6
|
import { excludedInterfaceNamePattern } from '@matterbridge/utils/network';
|
|
5
7
|
import pkg from '../package.json' with { type: 'json' };
|
|
8
|
+
logModuleLoaded('mb-mdns');
|
|
6
9
|
export const MB_MDNS_DEFAULT_INTERVAL_MS = 10000;
|
|
7
10
|
export const MB_MDNS_DEFAULT_TIMEOUT_MS = 600000;
|
|
8
11
|
export const MB_MDNS_CLEANUP_DELAY_MS = 250;
|
|
@@ -112,7 +115,7 @@ export function sendMdnsQuery(mdns, unicast = false) {
|
|
|
112
115
|
]);
|
|
113
116
|
}
|
|
114
117
|
catch (error) {
|
|
115
|
-
mdns.log.error(`Error sending mDNS query: ${error
|
|
118
|
+
mdns.log.error(`Error sending mDNS query: ${getErrorMessage(error)}`);
|
|
116
119
|
}
|
|
117
120
|
}
|
|
118
121
|
export function advertiseMatterbridgeService(mdns, ttl = 120) {
|
|
@@ -164,7 +167,7 @@ export function advertiseMatterbridgeService(mdns, ttl = 120) {
|
|
|
164
167
|
mdns.sendResponse(answers);
|
|
165
168
|
}
|
|
166
169
|
catch (error) {
|
|
167
|
-
mdns.log.error(`Error sending mDNS advertisement: ${error
|
|
170
|
+
mdns.log.error(`Error sending mDNS advertisement: ${getErrorMessage(error)}`);
|
|
168
171
|
}
|
|
169
172
|
}
|
|
170
173
|
export function startMbMdns(options, registerSignalHandlers = true) {
|
|
@@ -210,11 +213,11 @@ export function startMbMdns(options, registerSignalHandlers = true) {
|
|
|
210
213
|
mdnsIpv4?.log.info('Multicast loopback disabled for mdnsIpv4');
|
|
211
214
|
}
|
|
212
215
|
mdnsIpv4?.log.info(`mdnsIpv4 server ready on ${address.family} ${address.address}:${address.port}`);
|
|
213
|
-
if (options.advertiseIntervalMs !== undefined) {
|
|
216
|
+
if (options.advertiseIntervalMs !== undefined && mdnsIpv4) {
|
|
214
217
|
advertiseMatterbridgeService(mdnsIpv4);
|
|
215
218
|
mdnsIpv4AdvertiseInterval = setInterval(() => advertiseMatterbridgeService(mdnsIpv4), options.advertiseIntervalMs).unref();
|
|
216
219
|
}
|
|
217
|
-
if (options.queryIntervalMs !== undefined) {
|
|
220
|
+
if (options.queryIntervalMs !== undefined && mdnsIpv4) {
|
|
218
221
|
sendMdnsQuery(mdnsIpv4, options.unicast);
|
|
219
222
|
mdnsIpv4QueryInterval = setInterval(() => sendMdnsQuery(mdnsIpv4, options.unicast), options.queryIntervalMs).unref();
|
|
220
223
|
}
|
|
@@ -238,11 +241,11 @@ export function startMbMdns(options, registerSignalHandlers = true) {
|
|
|
238
241
|
mdnsIpv6?.log.info('Multicast loopback disabled for mdnsIpv6');
|
|
239
242
|
}
|
|
240
243
|
mdnsIpv6?.log.info(`mdnsIpv6 server ready on ${address.family} ${address.address}:${address.port}`);
|
|
241
|
-
if (options.advertiseIntervalMs !== undefined) {
|
|
244
|
+
if (options.advertiseIntervalMs !== undefined && mdnsIpv6) {
|
|
242
245
|
advertiseMatterbridgeService(mdnsIpv6);
|
|
243
246
|
mdnsIpv6AdvertiseInterval = setInterval(() => advertiseMatterbridgeService(mdnsIpv6), options.advertiseIntervalMs).unref();
|
|
244
247
|
}
|
|
245
|
-
if (options.queryIntervalMs !== undefined) {
|
|
248
|
+
if (options.queryIntervalMs !== undefined && mdnsIpv6) {
|
|
246
249
|
sendMdnsQuery(mdnsIpv6, options.unicast);
|
|
247
250
|
mdnsIpv6QueryInterval = setInterval(() => sendMdnsQuery(mdnsIpv6, options.unicast), options.queryIntervalMs).unref();
|
|
248
251
|
}
|
|
@@ -272,7 +275,7 @@ export function mbMdnsMain(exitFn = process.exit, log = defaultConsoleLog) {
|
|
|
272
275
|
if (options.showHelp) {
|
|
273
276
|
printMbMdnsHelp(log);
|
|
274
277
|
exitFn(0);
|
|
275
|
-
return;
|
|
278
|
+
return undefined;
|
|
276
279
|
}
|
|
277
280
|
return startMbMdns(options);
|
|
278
281
|
}
|
package/dist/pluginManager.d.ts
CHANGED
|
@@ -65,7 +65,7 @@ export declare class PluginManager extends EventEmitter<PluginManagerEvents> {
|
|
|
65
65
|
array(): Plugin[];
|
|
66
66
|
storagePluginArray(): StoragePlugin[];
|
|
67
67
|
apiPluginArray(): ApiPlugin[];
|
|
68
|
-
[Symbol.iterator]():
|
|
68
|
+
[Symbol.iterator](): IterableIterator<Plugin>;
|
|
69
69
|
forEach(callback: (plugin: Plugin) => Promise<void>): Promise<void>;
|
|
70
70
|
set logLevel(logLevel: LogLevel);
|
|
71
71
|
loadFromStorage(): Promise<StoragePlugin[]>;
|