@matterbridge/core 3.11.1 → 3.11.2-dev-20261031-1af0fda

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.
@@ -14,7 +14,7 @@ export declare class MatterbridgeOperationalStateServer extends MatterbridgeOper
14
14
  }
15
15
  export declare namespace MatterbridgeOperationalStateServer {
16
16
  class Internal extends MatterbridgeOperationalStateServerBase.Internal {
17
- operationalStateBeforePause: OperationalState.OperationalStateEnum;
17
+ operationalStateBeforePause: OperationalState.OperationalStateEnum | number;
18
18
  operationStartedAt: number | undefined;
19
19
  pausedAccumulatedMs: number;
20
20
  pausedSinceMs: number | undefined;
package/dist/chipTests.js CHANGED
@@ -510,8 +510,7 @@ async function handleEnergyEvseTestEventTrigger(eventTrigger) {
510
510
  }
511
511
  }
512
512
  async function applyEnergyEvseFault(endpoint, faultState, log) {
513
- const previousFaultStateAttribute = endpoint.getAttribute(EnergyEvse.id, 'faultState');
514
- const previousFaultState = typeof previousFaultStateAttribute === 'number' ? previousFaultStateAttribute : EnergyEvse.FaultState.NoError;
513
+ const previousFaultState = getEnergyEvseFaultState(endpoint.getAttribute(EnergyEvse.id, 'faultState'));
515
514
  const state = getEnergyEvseState(endpoint.getAttribute(EnergyEvse.id, 'state'));
516
515
  const supplyState = getEnergyEvseSupplyState(endpoint.getAttribute(EnergyEvse.id, 'supplyState'));
517
516
  const restoredSupplyState = getEnergyEvseRestoredSupplyState(faultState, supplyState);
@@ -571,6 +570,44 @@ function getEnergyEvseState(value) {
571
570
  return EnergyEvse.State.NotPluggedIn;
572
571
  }
573
572
  }
573
+ function getEnergyEvseFaultState(value) {
574
+ switch (value) {
575
+ case EnergyEvse.FaultState.MeterFailure:
576
+ return EnergyEvse.FaultState.MeterFailure;
577
+ case EnergyEvse.FaultState.OverVoltage:
578
+ return EnergyEvse.FaultState.OverVoltage;
579
+ case EnergyEvse.FaultState.UnderVoltage:
580
+ return EnergyEvse.FaultState.UnderVoltage;
581
+ case EnergyEvse.FaultState.OverCurrent:
582
+ return EnergyEvse.FaultState.OverCurrent;
583
+ case EnergyEvse.FaultState.ContactWetFailure:
584
+ return EnergyEvse.FaultState.ContactWetFailure;
585
+ case EnergyEvse.FaultState.ContactDryFailure:
586
+ return EnergyEvse.FaultState.ContactDryFailure;
587
+ case EnergyEvse.FaultState.GroundFault:
588
+ return EnergyEvse.FaultState.GroundFault;
589
+ case EnergyEvse.FaultState.PowerLoss:
590
+ return EnergyEvse.FaultState.PowerLoss;
591
+ case EnergyEvse.FaultState.PowerQuality:
592
+ return EnergyEvse.FaultState.PowerQuality;
593
+ case EnergyEvse.FaultState.PilotShortCircuit:
594
+ return EnergyEvse.FaultState.PilotShortCircuit;
595
+ case EnergyEvse.FaultState.EmergencyStop:
596
+ return EnergyEvse.FaultState.EmergencyStop;
597
+ case EnergyEvse.FaultState.EvDisconnected:
598
+ return EnergyEvse.FaultState.EvDisconnected;
599
+ case EnergyEvse.FaultState.WrongPowerSupply:
600
+ return EnergyEvse.FaultState.WrongPowerSupply;
601
+ case EnergyEvse.FaultState.LiveNeutralSwap:
602
+ return EnergyEvse.FaultState.LiveNeutralSwap;
603
+ case EnergyEvse.FaultState.OverTemperature:
604
+ return EnergyEvse.FaultState.OverTemperature;
605
+ case EnergyEvse.FaultState.Other:
606
+ return EnergyEvse.FaultState.Other;
607
+ default:
608
+ return EnergyEvse.FaultState.NoError;
609
+ }
610
+ }
574
611
  async function handleSmokeCoAlarmTestEventTrigger(eventTrigger) {
575
612
  if (!chipTestMatterbridge || chipTestActiveEndpointId === undefined)
576
613
  return false;
@@ -33,7 +33,7 @@ export class LaundryDryer extends MatterbridgeEndpoint {
33
33
  this.createDefaultPowerSourceWiredClusterServer();
34
34
  this.createDeadFrontOnOffClusterServer(true);
35
35
  this.createDefaultLaundryWasherModeClusterServer(options.currentMode, options.supportedModes);
36
- this.createDefaultLaundryDryerControlsClusterServer(1);
36
+ this.createDefaultLaundryDryerControlsClusterServer(LaundryDryerControls.DrynessLevel.Normal);
37
37
  if (options.temperatureSetpoint)
38
38
  createNumberTemperatureControlClusterServer(this, options.temperatureSetpoint, options.minTemperature, options.maxTemperature, options.step);
39
39
  else
@@ -57,7 +57,7 @@ export declare class MatterbridgeRvcOperationalStateServer extends MatterbridgeR
57
57
  }
58
58
  export declare namespace MatterbridgeRvcOperationalStateServer {
59
59
  class Internal extends MatterbridgeRvcOperationalStateServerBase.Internal {
60
- operationalStateBeforePause: RvcOperationalState.OperationalState | OperationalState.OperationalStateEnum;
60
+ operationalStateBeforePause: RvcOperationalState.OperationalState | OperationalState.OperationalStateEnum | number;
61
61
  operationStartedAt: number | undefined;
62
62
  pausedAccumulatedMs: number;
63
63
  pausedSinceMs: number | undefined;
package/dist/frontend.js CHANGED
@@ -17,6 +17,7 @@ import { isValidArray, isValidBoolean, isValidNumber, isValidObject, isValidStri
17
17
  import { fireAndForget, withTimeout } from '@matterbridge/utils/wait';
18
18
  import { AnsiLogger, bgHex, CYAN, db, debugStringify, er, GREEN, nf, nt, rs, UNDERLINE, UNDERLINEOFF, wr, YELLOW } from 'node-ansi-logger';
19
19
  import { generateHistoryPage } from './cliHistory.js';
20
+ import { matterToAnsiLogLevel } from './matterLogger.js';
20
21
  import { deleteAdvertisingNode, getBatteryLevel, getClusterTextFromDevice, getPowerSource, getReachability, getServerNodeData, setAdvertisingNode, toApiClusters, } from './matterNodeHelpers.js';
21
22
  logModuleLoaded('Frontend');
22
23
  function sendDownloadError(res, error, message) {
@@ -1630,7 +1631,7 @@ export class Frontend extends EventEmitter {
1630
1631
  else if (data.params.value === 'Fatal') {
1631
1632
  Logger.level = MatterLogLevel.FATAL;
1632
1633
  }
1633
- this.matterbridge.matterLogLevel = MatterLogLevel.names[Logger.level];
1634
+ this.matterbridge.matterLogLevel = matterToAnsiLogLevel(MatterLogLevel(Logger.level));
1634
1635
  let callbackLogLevel = "notice";
1635
1636
  if (this.matterbridge.getLogLevel() === "info" || Logger.level === MatterLogLevel.INFO)
1636
1637
  callbackLogLevel = "info";
@@ -205,6 +205,7 @@ export function getClusterTextFromDevice(device) {
205
205
  device.forEachAttribute((clusterName, clusterId, attributeName, attributeId, attributeValue) => {
206
206
  if (typeof attributeValue === 'undefined' || attributeValue === undefined)
207
207
  return;
208
+ const enumValue = typeof attributeValue === 'number' ? attributeValue : undefined;
208
209
  if (clusterName === 'descriptor' && attributeName === 'clientList' && isValidArray(attributeValue, 1))
209
210
  attributes += `Client cluster(s): [${attributeValue.map((id) => getClusterNameById(id)).join(', ')}] `;
210
211
  if (clusterName === 'binding' && attributeName === 'binding' && isValidArray(attributeValue)) {
@@ -262,13 +263,13 @@ export function getClusterTextFromDevice(device) {
262
263
  attributes += `Mode: ${supportedMode.label} `;
263
264
  }
264
265
  if (clusterName === 'operationalState' && attributeName === 'operationalState')
265
- attributes += `OpState: ${getEnumDescription(OperationalState.OperationalStateEnum, attributeValue)} `;
266
+ attributes += `OpState: ${getEnumDescription(OperationalState.OperationalStateEnum, enumValue)} `;
266
267
  if (clusterName === 'rvcOperationalState' && attributeName === 'operationalState')
267
- attributes += `OpState: ${getEnumDescription(RvcOperationalState.OperationalState, attributeValue)} `;
268
+ attributes += `OpState: ${getEnumDescription(RvcOperationalState.OperationalState, enumValue)} `;
268
269
  if (clusterName === 'pumpConfigurationAndControl' && attributeName === 'operationMode')
269
270
  attributes += `Mode: ${attributeValue} `;
270
271
  if (clusterName === 'valveConfigurationAndControl' && attributeName === 'currentState')
271
- attributes += `State: ${getEnumDescription(ValveConfigurationAndControl.ValveState, attributeValue, { fallback: 'unknown' })} `;
272
+ attributes += `State: ${getEnumDescription(ValveConfigurationAndControl.ValveState, enumValue, { fallback: 'unknown' })} `;
272
273
  if (clusterName === 'levelControl' && attributeName === 'currentLevel')
273
274
  attributes += `Level: ${attributeValue} `;
274
275
  if (clusterName === 'applicationBasic' && attributeName === 'applicationName')
@@ -290,11 +291,11 @@ export function getClusterTextFromDevice(device) {
290
291
  if (clusterName === 'booleanStateConfiguration' && attributeName === 'alarmsActive' && isValidObject(attributeValue))
291
292
  attributes += `Active alarms: ${stringify(attributeValue)} `;
292
293
  if (clusterName === 'smokeCoAlarm' && attributeName === 'smokeState')
293
- attributes += `Smoke: ${getEnumDescription(SmokeCoAlarm.AlarmState, attributeValue)} `;
294
+ attributes += `Smoke: ${getEnumDescription(SmokeCoAlarm.AlarmState, enumValue)} `;
294
295
  if (clusterName === 'smokeCoAlarm' && attributeName === 'coState')
295
- attributes += `Co: ${getEnumDescription(SmokeCoAlarm.AlarmState, attributeValue)} `;
296
+ attributes += `Co: ${getEnumDescription(SmokeCoAlarm.AlarmState, enumValue)} `;
296
297
  if (clusterName === 'fanControl' && attributeName === 'fanMode')
297
- attributes += `Mode: ${getEnumDescription(FanControl.FanMode, attributeValue)} `;
298
+ attributes += `Mode: ${getEnumDescription(FanControl.FanMode, enumValue)} `;
298
299
  if (clusterName === 'fanControl' && attributeName === 'percentCurrent')
299
300
  attributes += `Percent: ${attributeValue}% `;
300
301
  if (clusterName === 'fanControl' && attributeName === 'speedCurrent')
@@ -304,7 +305,7 @@ export function getClusterTextFromDevice(device) {
304
305
  if (clusterName === 'fanControl' && attributeName === 'windSetting' && isValidObject(attributeValue))
305
306
  attributes += `Wind: ${stringify(attributeValue)} `;
306
307
  if (clusterName === 'fanControl' && attributeName === 'airflowDirection')
307
- attributes += `Direction: ${getEnumDescription(FanControl.AirflowDirection, attributeValue)} `;
308
+ attributes += `Direction: ${getEnumDescription(FanControl.AirflowDirection, enumValue)} `;
308
309
  if (clusterName === 'hepaFilterMonitoring' && attributeName === 'condition')
309
310
  attributes += `Hepa filter: ${attributeValue}% `;
310
311
  if (clusterName === 'activatedCarbonFilterMonitoring' && attributeName === 'condition')
@@ -322,7 +323,7 @@ export function getClusterTextFromDevice(device) {
322
323
  attributes += `Illuminance: ${Math.round(Math.max(Math.pow(10, attributeValue / 10000), 0))} lx `;
323
324
  }
324
325
  if (clusterName === 'airQuality' && attributeName === 'airQuality')
325
- attributes += `Air quality: ${getEnumDescription(AirQuality.AirQualityEnum, attributeValue)} `;
326
+ attributes += `Air quality: ${getEnumDescription(AirQuality.AirQualityEnum, enumValue)} `;
326
327
  if (clusterName === 'totalVolatileOrganicCompoundsConcentrationMeasurement' && attributeName === 'measuredValue')
327
328
  appendMeasurement('Voc', getMeasurementText(attributeValue, 1, ''));
328
329
  if (clusterName === 'pm1ConcentrationMeasurement' && attributeName === 'measuredValue')
@@ -358,7 +359,7 @@ export function getClusterTextFromDevice(device) {
358
359
  if (clusterName === 'deviceEnergyManagement' && attributeName === 'esaCanGenerate')
359
360
  attributes += `ESA can generate: ${attributeValue} `;
360
361
  if (clusterName === 'deviceEnergyManagement' && attributeName === 'esaState')
361
- attributes += `ESA state: ${DeviceEnergyManagement.EsaState[attributeValue]} `;
362
+ attributes += `ESA state: ${getEnumDescription(DeviceEnergyManagement.EsaState, enumValue)} `;
362
363
  if (clusterName === 'fixedLabel' && attributeName === 'labelList')
363
364
  attributes += `${getFixedLabel(device)} `;
364
365
  if (clusterName === 'userLabel' && attributeName === 'labelList')
@@ -34,6 +34,7 @@ import { addVirtualDevice, addVirtualDevices, resolveRootDirectory } from './hel
34
34
  import { bridge } from './matterbridgeDeviceTypes.js';
35
35
  import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
36
36
  import { startController } from './matterController.js';
37
+ import { matterToAnsiLogLevel } from './matterLogger.js';
37
38
  import { clearAdvertisingNodes, deleteAdvertisingNode, getServerNodeData, setAdvertisingNode } from './matterNodeHelpers.js';
38
39
  import { PluginManager } from './pluginManager.js';
39
40
  logModuleLoaded('Matterbridge');
@@ -671,7 +672,7 @@ export class Matterbridge extends EventEmitter {
671
672
  Logger.level = (await this.nodeContext.get('matterLogLevel', MatterLogLevel.INFO));
672
673
  }
673
674
  Logger.format = hasParameter('no-ansi') || process.env.NO_COLOR === '1' ? MatterLogFormat.PLAIN : MatterLogFormat.ANSI;
674
- this.matterLogLevel = MatterLogLevel.names[Logger.level];
675
+ this.matterLogLevel = matterToAnsiLogLevel(Logger.level);
675
676
  if (hasParameter('matterfilelogger') || (await this.nodeContext.get('matterFileLog', false))) {
676
677
  this.matterFileLogger = true;
677
678
  }
@@ -1317,7 +1318,7 @@ export class Matterbridge extends EventEmitter {
1317
1318
  msg = text.split(message.facility)[1]?.trim();
1318
1319
  }
1319
1320
  this.matterLog.logName = message.facility;
1320
- this.matterLog.log(MatterLogLevel.names[message.level], msg);
1321
+ this.matterLog.log(matterToAnsiLogLevel(message.level), msg);
1321
1322
  }
1322
1323
  catch (_error) {
1323
1324
  this.log.debug(`Error parsing matter log message facility ${message.facility}`);
@@ -26,7 +26,7 @@ import { WindowCovering } from '@matter/types/clusters/window-covering';
26
26
  import { type ClusterId, type EndpointNumber } from '@matter/types/datatype';
27
27
  import type { MeasurementAccuracy, Semtag } from '@matter/types/globals';
28
28
  import { AnsiLogger, LogLevel } from 'node-ansi-logger';
29
- import type { DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
29
+ import { type DeviceTypeDefinition } from './matterbridgeDeviceTypes.js';
30
30
  import { CommandHandler, type CommandHandlerData, type CommandHandlerExecutionResult, type CommandHandlerFunction, type CommandHandlers } from './matterbridgeEndpointCommandHandler.js';
31
31
  import type { MatterbridgeEndpointOptions, SerializedMatterbridgeEndpoint, SubscribeCommandListener } from './matterbridgeEndpointTypes.js';
32
32
  type FirstCommandParam<Params extends unknown[]> = Params extends [] ? undefined : Params[0];
@@ -1,4 +1,5 @@
1
1
  import { Lifecycle, UINT16_MAX, UINT32_MAX } from '@matter/general';
2
+ import { DeviceClassification } from '@matter/model';
2
3
  import { Endpoint, MutableEndpoint, SupportedBehaviors } from '@matter/node';
3
4
  import { AirQualityServer } from '@matter/node/behaviors/air-quality';
4
5
  import { BooleanStateServer } from '@matter/node/behaviors/boolean-state';
@@ -83,9 +84,17 @@ import { MatterbridgeThermostatServer } from './behaviors/thermostatServer.js';
83
84
  import { MatterbridgeValveConfigurationAndControlServer } from './behaviors/valveConfigurationAndControlServer.js';
84
85
  import { MatterbridgeWaterTankLevelMonitoringServer } from './behaviors/waterTankLevelMonitoringServer.js';
85
86
  import { MatterbridgeWindowCoveringServer } from './behaviors/windowCoveringServer.js';
87
+ import { DeviceClasses } from './matterbridgeDeviceTypes.js';
86
88
  import { CommandHandler, } from './matterbridgeEndpointCommandHandler.js';
87
89
  import { addClusterClients, addClusterServers, addFixedLabel, addOptionalClusterClients, addOptionalClusterServers, addRequiredClusterClients, addRequiredClusterServers, addUserLabel, checkNotLatinCharacters, createUniqueId, defaultFor, emitCommand, 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, getExportedElectricalEnergyMeasurementClusterServer, getImportedElectricalEnergyMeasurementClusterServer, invokeBehaviorCommand, lowercaseFirstLetter, setAttribute, setCluster, subscribeAttribute, subscribeCommand, triggerEvent, updateAttribute, } from './matterbridgeEndpointHelpers.js';
88
90
  logModuleLoaded('MatterbridgeEndpoint');
91
+ const deviceClassifications = {
92
+ [DeviceClasses.Node]: DeviceClassification.Node,
93
+ [DeviceClasses.App]: DeviceClassification.Application,
94
+ [DeviceClasses.Utility]: DeviceClassification.Utility,
95
+ [DeviceClasses.Simple]: DeviceClassification.Simple,
96
+ [DeviceClasses.Dynamic]: DeviceClassification.Dynamic,
97
+ };
89
98
  const MATTERBRIDGE_ENDPOINT_BRAND = Symbol('MatterbridgeEndpoint.brand');
90
99
  export function isMatterbridgeEndpoint(value) {
91
100
  if (!value || typeof value !== 'object')
@@ -148,7 +157,7 @@ export class MatterbridgeEndpoint extends Endpoint {
148
157
  name: firstDefinition.name,
149
158
  deviceType: firstDefinition.code,
150
159
  deviceRevision: firstDefinition.revision,
151
- deviceClass: firstDefinition.deviceClass.toLowerCase(),
160
+ deviceClass: deviceClassifications[firstDefinition.deviceClass],
152
161
  requirements: {
153
162
  server: {
154
163
  mandatory: SupportedBehaviors(...getBehaviourTypesFromClusterServerIds(firstDefinition.requiredServerClusters)),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@matterbridge/core",
3
- "version": "3.11.1",
3
+ "version": "3.11.2-dev-20261031-1af0fda",
4
4
  "description": "Matterbridge core library",
5
5
  "author": "https://github.com/Luligu",
6
6
  "homepage": "https://matterbridge.io/",
@@ -136,13 +136,13 @@
136
136
  },
137
137
  "dependencies": {
138
138
  "@matter/main": "0.18.0",
139
- "@matterbridge/dgram": "3.11.1",
140
- "@matterbridge/thread": "3.11.1",
141
- "@matterbridge/types": "3.11.1",
142
- "@matterbridge/utils": "3.11.1",
139
+ "@matterbridge/dgram": "3.11.2-dev-20261031-1af0fda",
140
+ "@matterbridge/thread": "3.11.2-dev-20261031-1af0fda",
141
+ "@matterbridge/types": "3.11.2-dev-20261031-1af0fda",
142
+ "@matterbridge/utils": "3.11.2-dev-20261031-1af0fda",
143
143
  "escape-html": "1.0.3",
144
144
  "express": "5.3.0",
145
- "express-rate-limit": "8.7.1",
145
+ "express-rate-limit": "8.7.2",
146
146
  "multer": "2.5.0",
147
147
  "node-ansi-logger": "3.3.1",
148
148
  "node-persist-manager": "2.1.1",