homebridge 2.0.0-beta.6 → 2.0.0-beta.61
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 +16 -17
- package/bin/homebridge.js +22 -0
- package/config-sample.json +3 -3
- package/dist/api.d.ts +136 -0
- package/dist/api.d.ts.map +1 -0
- package/dist/api.js +151 -0
- package/dist/api.js.map +1 -0
- package/{lib → dist}/bridgeService.d.ts +16 -32
- package/dist/bridgeService.d.ts.map +1 -0
- package/dist/bridgeService.js +341 -0
- package/dist/bridgeService.js.map +1 -0
- package/dist/childBridgeFork.d.ts +40 -0
- package/dist/childBridgeFork.d.ts.map +1 -0
- package/dist/childBridgeFork.js +361 -0
- package/dist/childBridgeFork.js.map +1 -0
- package/dist/childBridgeService.d.ts +146 -0
- package/dist/childBridgeService.d.ts.map +1 -0
- package/dist/childBridgeService.js +416 -0
- package/dist/childBridgeService.js.map +1 -0
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +88 -0
- package/dist/cli.js.map +1 -0
- package/dist/externalPortService.d.ts +26 -0
- package/dist/externalPortService.d.ts.map +1 -0
- package/dist/externalPortService.js +77 -0
- package/dist/externalPortService.js.map +1 -0
- package/dist/index.d.ts +29 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +9 -0
- package/dist/index.js.map +1 -0
- package/dist/ipcService.d.ts +58 -0
- package/dist/ipcService.d.ts.map +1 -0
- package/dist/ipcService.js +43 -0
- package/dist/ipcService.js.map +1 -0
- package/dist/logger.d.ts +38 -0
- package/dist/logger.d.ts.map +1 -0
- package/dist/logger.js +102 -0
- package/dist/logger.js.map +1 -0
- package/dist/matter/BaseMatterManager.d.ts +21 -0
- package/dist/matter/BaseMatterManager.d.ts.map +1 -0
- package/dist/matter/BaseMatterManager.js +197 -0
- package/dist/matter/BaseMatterManager.js.map +1 -0
- package/dist/matter/ChildBridgeMatterManager.d.ts +35 -0
- package/dist/matter/ChildBridgeMatterManager.d.ts.map +1 -0
- package/dist/matter/ChildBridgeMatterManager.js +222 -0
- package/dist/matter/ChildBridgeMatterManager.js.map +1 -0
- package/dist/matter/ClusterCommandMapper.d.ts +5 -0
- package/dist/matter/ClusterCommandMapper.d.ts.map +1 -0
- package/dist/matter/ClusterCommandMapper.js +222 -0
- package/dist/matter/ClusterCommandMapper.js.map +1 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts +22 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts.map +1 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.js +49 -0
- package/dist/matter/ExternalMatterAccessoryPublisher.js.map +1 -0
- package/dist/matter/MatterAPIImpl.d.ts +473 -0
- package/dist/matter/MatterAPIImpl.d.ts.map +1 -0
- package/dist/matter/MatterAPIImpl.js +210 -0
- package/dist/matter/MatterAPIImpl.js.map +1 -0
- package/dist/matter/MatterBridgeManager.d.ts +39 -0
- package/dist/matter/MatterBridgeManager.d.ts.map +1 -0
- package/dist/matter/MatterBridgeManager.js +323 -0
- package/dist/matter/MatterBridgeManager.js.map +1 -0
- package/dist/matter/accessoryCache.d.ts +57 -0
- package/dist/matter/accessoryCache.d.ts.map +1 -0
- package/dist/matter/accessoryCache.js +155 -0
- package/dist/matter/accessoryCache.js.map +1 -0
- package/dist/matter/behaviors/AirQualityBehavior.d.ts +8 -0
- package/dist/matter/behaviors/AirQualityBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/AirQualityBehavior.js +11 -0
- package/dist/matter/behaviors/AirQualityBehavior.js.map +1 -0
- package/dist/matter/behaviors/BehaviorRegistry.d.ts +27 -0
- package/dist/matter/behaviors/BehaviorRegistry.d.ts.map +1 -0
- package/dist/matter/behaviors/BehaviorRegistry.js +110 -0
- package/dist/matter/behaviors/BehaviorRegistry.js.map +1 -0
- package/dist/matter/behaviors/ColorControlBehavior.d.ts +12 -0
- package/dist/matter/behaviors/ColorControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ColorControlBehavior.js +139 -0
- package/dist/matter/behaviors/ColorControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts +32 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js +51 -0
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js.map +1 -0
- package/dist/matter/behaviors/DoorLockBehavior.d.ts +7 -0
- package/dist/matter/behaviors/DoorLockBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/DoorLockBehavior.js +48 -0
- package/dist/matter/behaviors/DoorLockBehavior.js.map +1 -0
- package/dist/matter/behaviors/FanControlBehavior.d.ts +7 -0
- package/dist/matter/behaviors/FanControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/FanControlBehavior.js +57 -0
- package/dist/matter/behaviors/FanControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/IdentifyBehavior.d.ts +7 -0
- package/dist/matter/behaviors/IdentifyBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/IdentifyBehavior.js +25 -0
- package/dist/matter/behaviors/IdentifyBehavior.js.map +1 -0
- package/dist/matter/behaviors/LevelControlBehavior.d.ts +11 -0
- package/dist/matter/behaviors/LevelControlBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/LevelControlBehavior.js +100 -0
- package/dist/matter/behaviors/LevelControlBehavior.js.map +1 -0
- package/dist/matter/behaviors/OnOffBehavior.d.ts +8 -0
- package/dist/matter/behaviors/OnOffBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/OnOffBehavior.js +60 -0
- package/dist/matter/behaviors/OnOffBehavior.js.map +1 -0
- package/dist/matter/behaviors/RegistryManager.d.ts +15 -0
- package/dist/matter/behaviors/RegistryManager.d.ts.map +1 -0
- package/dist/matter/behaviors/RegistryManager.js +31 -0
- package/dist/matter/behaviors/RegistryManager.js.map +1 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts +14 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.js +29 -0
- package/dist/matter/behaviors/RvcCleanModeBehavior.js.map +1 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts +10 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js +81 -0
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js.map +1 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts +14 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.js +29 -0
- package/dist/matter/behaviors/RvcRunModeBehavior.js.map +1 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts +9 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.js +62 -0
- package/dist/matter/behaviors/ServiceAreaBehavior.js.map +1 -0
- package/dist/matter/behaviors/ThermostatBehavior.d.ts +9 -0
- package/dist/matter/behaviors/ThermostatBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/ThermostatBehavior.js +92 -0
- package/dist/matter/behaviors/ThermostatBehavior.js.map +1 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts +12 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts.map +1 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.js +108 -0
- package/dist/matter/behaviors/WindowCoveringBehavior.js.map +1 -0
- package/dist/matter/behaviors/index.d.ts +18 -0
- package/dist/matter/behaviors/index.d.ts.map +1 -0
- package/dist/matter/behaviors/index.js +17 -0
- package/dist/matter/behaviors/index.js.map +1 -0
- package/dist/matter/clusterTypes.d.ts +182 -0
- package/dist/matter/clusterTypes.d.ts.map +1 -0
- package/dist/matter/clusterTypes.js +2 -0
- package/dist/matter/clusterTypes.js.map +1 -0
- package/dist/matter/config.d.ts +9 -0
- package/dist/matter/config.d.ts.map +1 -0
- package/dist/matter/config.js +84 -0
- package/dist/matter/config.js.map +1 -0
- package/dist/matter/configValidator.d.ts +26 -0
- package/dist/matter/configValidator.d.ts.map +1 -0
- package/dist/matter/configValidator.js +173 -0
- package/dist/matter/configValidator.js.map +1 -0
- package/dist/matter/errorHandler.d.ts +11 -0
- package/dist/matter/errorHandler.d.ts.map +1 -0
- package/dist/matter/errorHandler.js +81 -0
- package/dist/matter/errorHandler.js.map +1 -0
- package/dist/matter/errors.d.ts +46 -0
- package/dist/matter/errors.d.ts.map +1 -0
- package/dist/matter/errors.js +68 -0
- package/dist/matter/errors.js.map +1 -0
- package/dist/matter/index.d.ts +97 -0
- package/dist/matter/index.d.ts.map +1 -0
- package/dist/matter/index.js +10 -0
- package/dist/matter/index.js.map +1 -0
- package/dist/matter/logFormatter.d.ts +2 -0
- package/dist/matter/logFormatter.d.ts.map +1 -0
- package/dist/matter/logFormatter.js +100 -0
- package/dist/matter/logFormatter.js.map +1 -0
- package/dist/matter/managerTypes.d.ts +57 -0
- package/dist/matter/managerTypes.d.ts.map +1 -0
- package/dist/matter/managerTypes.js +2 -0
- package/dist/matter/managerTypes.js.map +1 -0
- package/dist/matter/server.d.ts +112 -0
- package/dist/matter/server.d.ts.map +1 -0
- package/dist/matter/server.js +1508 -0
- package/dist/matter/server.js.map +1 -0
- package/dist/matter/serverHelpers.d.ts +31 -0
- package/dist/matter/serverHelpers.d.ts.map +1 -0
- package/dist/matter/serverHelpers.js +273 -0
- package/dist/matter/serverHelpers.js.map +1 -0
- package/dist/matter/sharedTypes.d.ts +93 -0
- package/dist/matter/sharedTypes.d.ts.map +1 -0
- package/dist/matter/sharedTypes.js +20 -0
- package/dist/matter/sharedTypes.js.map +1 -0
- package/dist/matter/storage.d.ts +45 -0
- package/dist/matter/storage.d.ts.map +1 -0
- package/dist/matter/storage.js +325 -0
- package/dist/matter/storage.js.map +1 -0
- package/dist/matter/typeHelpers.d.ts +15 -0
- package/dist/matter/typeHelpers.d.ts.map +1 -0
- package/dist/matter/typeHelpers.js +33 -0
- package/dist/matter/typeHelpers.js.map +1 -0
- package/dist/matter/types.d.ts +642 -0
- package/dist/matter/types.d.ts.map +1 -0
- package/dist/matter/types.js +208 -0
- package/dist/matter/types.js.map +1 -0
- package/dist/matter/utils.d.ts +13 -0
- package/dist/matter/utils.d.ts.map +1 -0
- package/dist/matter/utils.js +21 -0
- package/dist/matter/utils.js.map +1 -0
- package/{lib → dist}/platformAccessory.d.ts +8 -21
- package/dist/platformAccessory.d.ts.map +1 -0
- package/dist/platformAccessory.js +79 -0
- package/dist/platformAccessory.js.map +1 -0
- package/{lib → dist}/plugin.d.ts +2 -6
- package/dist/plugin.d.ts.map +1 -0
- package/dist/plugin.js +159 -0
- package/dist/plugin.js.map +1 -0
- package/{lib → dist}/pluginManager.d.ts +3 -25
- package/dist/pluginManager.d.ts.map +1 -0
- package/{lib → dist}/pluginManager.js +87 -115
- package/dist/pluginManager.js.map +1 -0
- package/{lib → dist}/server.d.ts +15 -20
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +727 -0
- package/dist/server.js.map +1 -0
- package/{lib → dist}/storageService.d.ts.map +1 -1
- package/dist/storageService.js +41 -0
- package/dist/storageService.js.map +1 -0
- package/{lib → dist}/user.d.ts +1 -3
- package/dist/user.d.ts.map +1 -0
- package/dist/user.js +29 -0
- package/dist/user.js.map +1 -0
- package/{lib → dist}/util/mac.d.ts +1 -0
- package/dist/util/mac.d.ts.map +1 -0
- package/dist/util/mac.js +13 -0
- package/dist/util/mac.js.map +1 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +16 -0
- package/dist/version.js.map +1 -0
- package/package.json +49 -50
- package/bin/homebridge +0 -17
- package/lib/api.d.ts +0 -210
- package/lib/api.d.ts.map +0 -1
- package/lib/api.js +0 -155
- package/lib/api.js.map +0 -1
- package/lib/bridgeService.d.ts.map +0 -1
- package/lib/bridgeService.js +0 -426
- package/lib/bridgeService.js.map +0 -1
- package/lib/childBridgeFork.d.ts +0 -37
- package/lib/childBridgeFork.d.ts.map +0 -1
- package/lib/childBridgeFork.js +0 -244
- package/lib/childBridgeFork.js.map +0 -1
- package/lib/childBridgeService.d.ts +0 -199
- package/lib/childBridgeService.d.ts.map +0 -1
- package/lib/childBridgeService.js +0 -428
- package/lib/childBridgeService.js.map +0 -1
- package/lib/cli.d.ts +0 -4
- package/lib/cli.d.ts.map +0 -1
- package/lib/cli.js +0 -111
- package/lib/cli.js.map +0 -1
- package/lib/externalPortService.d.ts +0 -33
- package/lib/externalPortService.d.ts.map +0 -1
- package/lib/externalPortService.js +0 -64
- package/lib/externalPortService.js.map +0 -1
- package/lib/index.d.ts +0 -76
- package/lib/index.d.ts.map +0 -1
- package/lib/index.js +0 -72
- package/lib/index.js.map +0 -1
- package/lib/ipcService.d.ts +0 -33
- package/lib/ipcService.d.ts.map +0 -1
- package/lib/ipcService.js +0 -49
- package/lib/ipcService.js.map +0 -1
- package/lib/logger.d.ts +0 -78
- package/lib/logger.d.ts.map +0 -1
- package/lib/logger.js +0 -147
- package/lib/logger.js.map +0 -1
- package/lib/platformAccessory.d.ts.map +0 -1
- package/lib/platformAccessory.js +0 -102
- package/lib/platformAccessory.js.map +0 -1
- package/lib/plugin.d.ts.map +0 -1
- package/lib/plugin.js +0 -194
- package/lib/plugin.js.map +0 -1
- package/lib/pluginManager.d.ts.map +0 -1
- package/lib/pluginManager.js.map +0 -1
- package/lib/server.d.ts.map +0 -1
- package/lib/server.js +0 -457
- package/lib/server.js.map +0 -1
- package/lib/storageService.js +0 -70
- package/lib/storageService.js.map +0 -1
- package/lib/user.d.ts.map +0 -1
- package/lib/user.js +0 -36
- package/lib/user.js.map +0 -1
- package/lib/util/mac.d.ts.map +0 -1
- package/lib/util/mac.js +0 -20
- package/lib/util/mac.js.map +0 -1
- package/lib/version.d.ts.map +0 -1
- package/lib/version.js +0 -21
- package/lib/version.js.map +0 -1
- /package/{lib → dist}/storageService.d.ts +0 -0
- /package/{lib → dist}/version.d.ts +0 -0
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import type { WindowCovering } from '@matter/main/clusters';
|
|
2
|
+
export interface ClusterState {
|
|
3
|
+
[key: string]: unknown;
|
|
4
|
+
}
|
|
5
|
+
export interface OnOffState {
|
|
6
|
+
onOff?: boolean;
|
|
7
|
+
}
|
|
8
|
+
export interface LevelControlState {
|
|
9
|
+
currentLevel?: number;
|
|
10
|
+
minLevel?: number;
|
|
11
|
+
maxLevel?: number;
|
|
12
|
+
remainingTime?: number;
|
|
13
|
+
onLevel?: number | null;
|
|
14
|
+
options?: number;
|
|
15
|
+
}
|
|
16
|
+
export interface ColorControlState {
|
|
17
|
+
colorTemperatureMireds?: number;
|
|
18
|
+
colorTempPhysicalMinMireds?: number;
|
|
19
|
+
colorTempPhysicalMaxMireds?: number;
|
|
20
|
+
currentHue?: number;
|
|
21
|
+
currentSaturation?: number;
|
|
22
|
+
enhancedCurrentHue?: number;
|
|
23
|
+
currentX?: number;
|
|
24
|
+
currentY?: number;
|
|
25
|
+
colorX?: number;
|
|
26
|
+
colorY?: number;
|
|
27
|
+
colorMode?: number;
|
|
28
|
+
enhancedColorMode?: number;
|
|
29
|
+
options?: number;
|
|
30
|
+
transitionTime?: number;
|
|
31
|
+
}
|
|
32
|
+
export interface ColorTemperatureState {
|
|
33
|
+
colorTemperatureMireds?: number;
|
|
34
|
+
}
|
|
35
|
+
export interface HueSaturationState {
|
|
36
|
+
currentHue?: number;
|
|
37
|
+
currentSaturation?: number;
|
|
38
|
+
}
|
|
39
|
+
export interface XYColorState {
|
|
40
|
+
currentX?: number;
|
|
41
|
+
currentY?: number;
|
|
42
|
+
}
|
|
43
|
+
export interface HueState {
|
|
44
|
+
currentHue?: number;
|
|
45
|
+
enhancedCurrentHue?: number;
|
|
46
|
+
}
|
|
47
|
+
export interface SaturationState {
|
|
48
|
+
currentSaturation?: number;
|
|
49
|
+
}
|
|
50
|
+
export interface WindowCoveringState {
|
|
51
|
+
type?: WindowCovering.WindowCoveringType;
|
|
52
|
+
configStatus?: {
|
|
53
|
+
operational?: boolean;
|
|
54
|
+
online?: boolean;
|
|
55
|
+
liftMovementReversed?: boolean;
|
|
56
|
+
liftPositionAware?: boolean;
|
|
57
|
+
tiltPositionAware?: boolean;
|
|
58
|
+
liftEncoderControlled?: boolean;
|
|
59
|
+
tiltEncoderControlled?: boolean;
|
|
60
|
+
};
|
|
61
|
+
targetPositionLiftPercent100ths?: number | null;
|
|
62
|
+
currentPositionLiftPercent100ths?: number | null;
|
|
63
|
+
targetPositionTiltPercent100ths?: number | null;
|
|
64
|
+
currentPositionTiltPercent100ths?: number | null;
|
|
65
|
+
operationalStatus?: number;
|
|
66
|
+
safetyStatus?: number;
|
|
67
|
+
mode?: number;
|
|
68
|
+
}
|
|
69
|
+
export interface FanControlState {
|
|
70
|
+
fanMode?: number;
|
|
71
|
+
fanModeSequence?: number;
|
|
72
|
+
percentSetting?: number | null;
|
|
73
|
+
percentCurrent?: number;
|
|
74
|
+
speedMax?: number;
|
|
75
|
+
speedSetting?: number | null;
|
|
76
|
+
speedCurrent?: number;
|
|
77
|
+
rockSupport?: number;
|
|
78
|
+
rockSetting?: number;
|
|
79
|
+
windSupport?: number;
|
|
80
|
+
windSetting?: number;
|
|
81
|
+
}
|
|
82
|
+
export interface ThermostatState {
|
|
83
|
+
localTemperature?: number | null;
|
|
84
|
+
externalMeasuredIndoorTemperature?: number | null;
|
|
85
|
+
outdoorTemperature?: number | null;
|
|
86
|
+
occupancy?: {
|
|
87
|
+
occupied?: boolean;
|
|
88
|
+
};
|
|
89
|
+
externallyMeasuredOccupancy?: boolean;
|
|
90
|
+
absMinHeatSetpointLimit?: number;
|
|
91
|
+
absMaxHeatSetpointLimit?: number;
|
|
92
|
+
absMinCoolSetpointLimit?: number;
|
|
93
|
+
absMaxCoolSetpointLimit?: number;
|
|
94
|
+
occupiedCoolingSetpoint?: number;
|
|
95
|
+
occupiedHeatingSetpoint?: number;
|
|
96
|
+
unoccupiedCoolingSetpoint?: number;
|
|
97
|
+
unoccupiedHeatingSetpoint?: number;
|
|
98
|
+
minHeatSetpointLimit?: number;
|
|
99
|
+
maxHeatSetpointLimit?: number;
|
|
100
|
+
minCoolSetpointLimit?: number;
|
|
101
|
+
maxCoolSetpointLimit?: number;
|
|
102
|
+
minSetpointDeadBand?: number;
|
|
103
|
+
remoteSensing?: number;
|
|
104
|
+
controlSequenceOfOperation?: number;
|
|
105
|
+
systemMode?: number;
|
|
106
|
+
thermostatRunningMode?: number;
|
|
107
|
+
startOfWeek?: number;
|
|
108
|
+
numberOfWeeklyTransitions?: number;
|
|
109
|
+
numberOfDailyTransitions?: number;
|
|
110
|
+
}
|
|
111
|
+
export interface DoorLockState {
|
|
112
|
+
lockState?: number | null;
|
|
113
|
+
lockType?: number;
|
|
114
|
+
actuatorEnabled?: boolean;
|
|
115
|
+
doorState?: number | null;
|
|
116
|
+
doorOpenEvents?: number;
|
|
117
|
+
doorClosedEvents?: number;
|
|
118
|
+
openPeriod?: number;
|
|
119
|
+
}
|
|
120
|
+
export interface RvcOperationalState {
|
|
121
|
+
phaseList?: string[] | null;
|
|
122
|
+
currentPhase?: number | null;
|
|
123
|
+
countdownTime?: number | null;
|
|
124
|
+
operationalStateList?: Array<{
|
|
125
|
+
operationalStateId: number;
|
|
126
|
+
operationalStateLabel?: string;
|
|
127
|
+
}>;
|
|
128
|
+
operationalState?: number;
|
|
129
|
+
operationalError?: {
|
|
130
|
+
errorStateId: number;
|
|
131
|
+
errorStateLabel?: string;
|
|
132
|
+
errorStateDetails?: string;
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
export interface RvcRunModeState {
|
|
136
|
+
supportedModes?: Array<{
|
|
137
|
+
label: string;
|
|
138
|
+
mode: number;
|
|
139
|
+
modeTags?: Array<{
|
|
140
|
+
value: number;
|
|
141
|
+
}>;
|
|
142
|
+
}>;
|
|
143
|
+
currentMode?: number;
|
|
144
|
+
startUpMode?: number | null;
|
|
145
|
+
onMode?: number | null;
|
|
146
|
+
}
|
|
147
|
+
export interface RvcCleanModeState {
|
|
148
|
+
supportedModes?: Array<{
|
|
149
|
+
label: string;
|
|
150
|
+
mode: number;
|
|
151
|
+
modeTags?: Array<{
|
|
152
|
+
value: number;
|
|
153
|
+
}>;
|
|
154
|
+
}>;
|
|
155
|
+
currentMode?: number;
|
|
156
|
+
startUpMode?: number | null;
|
|
157
|
+
onMode?: number | null;
|
|
158
|
+
}
|
|
159
|
+
export interface ServiceAreaState {
|
|
160
|
+
supportedAreas?: Array<{
|
|
161
|
+
areaId: number;
|
|
162
|
+
mapId: number | null;
|
|
163
|
+
areaInfo: {
|
|
164
|
+
locationName?: string;
|
|
165
|
+
floorNumber?: number | null;
|
|
166
|
+
areaType?: number | null;
|
|
167
|
+
};
|
|
168
|
+
}>;
|
|
169
|
+
supportedMaps?: Array<{
|
|
170
|
+
mapId: number;
|
|
171
|
+
name: string;
|
|
172
|
+
}>;
|
|
173
|
+
selectedAreas?: number[];
|
|
174
|
+
currentArea?: number | null;
|
|
175
|
+
estimatedEndTime?: number | null;
|
|
176
|
+
progress?: Array<{
|
|
177
|
+
areaId: number;
|
|
178
|
+
status: number;
|
|
179
|
+
totalOperationalTime?: number | null;
|
|
180
|
+
}>;
|
|
181
|
+
}
|
|
182
|
+
//# sourceMappingURL=clusterTypes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clusterTypes.d.ts","sourceRoot":"","sources":["../../src/matter/clusterTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clusterTypes.js","sourceRoot":"","sources":["../../src/matter/clusterTypes.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { HomebridgeConfig } from '../bridgeService.js';
|
|
2
|
+
export declare class MatterConfigCollector {
|
|
3
|
+
static hasMatterConfig(config: HomebridgeConfig): boolean;
|
|
4
|
+
static collectConfiguredMatterPorts(config: HomebridgeConfig): number[];
|
|
5
|
+
static validateMatterPortsPool(config: HomebridgeConfig): void;
|
|
6
|
+
static validateMatterConfig(config: HomebridgeConfig): Promise<void>;
|
|
7
|
+
private static checkPortConflicts;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/matter/config.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAmB,gBAAgB,EAAkB,MAAM,qBAAqB,CAAA;AAS5F,qBAAa,qBAAqB;IAIhC,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO;IAWzD,MAAM,CAAC,4BAA4B,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE;IA4BvE,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;WAmBjD,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC1E,OAAO,CAAC,MAAM,CAAC,kBAAkB;CA+BlC"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { Logger } from '../logger.js';
|
|
2
|
+
const log = Logger.withPrefix('Matter/Config');
|
|
3
|
+
export class MatterConfigCollector {
|
|
4
|
+
static hasMatterConfig(config) {
|
|
5
|
+
return !!(config.bridge.matter
|
|
6
|
+
|| config.platforms.some((p) => p._bridge?.matter)
|
|
7
|
+
|| config.accessories.some((a) => a._bridge?.matter));
|
|
8
|
+
}
|
|
9
|
+
static collectConfiguredMatterPorts(config) {
|
|
10
|
+
const configuredMatterPorts = [];
|
|
11
|
+
if (config.bridge.matter?.port) {
|
|
12
|
+
configuredMatterPorts.push(config.bridge.matter.port);
|
|
13
|
+
}
|
|
14
|
+
for (const platform of config.platforms) {
|
|
15
|
+
if (platform._bridge?.matter?.port) {
|
|
16
|
+
configuredMatterPorts.push(platform._bridge.matter.port);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
for (const accessory of config.accessories) {
|
|
20
|
+
if (accessory._bridge?.matter?.port) {
|
|
21
|
+
configuredMatterPorts.push(accessory._bridge.matter.port);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
return configuredMatterPorts;
|
|
25
|
+
}
|
|
26
|
+
static validateMatterPortsPool(config) {
|
|
27
|
+
if (config.matterPorts !== undefined) {
|
|
28
|
+
if (config.matterPorts.start && config.matterPorts.end) {
|
|
29
|
+
if (config.matterPorts.start > config.matterPorts.end) {
|
|
30
|
+
log.error('Invalid Matter port pool configuration. End should be greater than or equal to start.');
|
|
31
|
+
config.matterPorts = undefined;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
log.error('Invalid configuration for \'matterPorts\'. Missing \'start\' and \'end\' properties! Ignoring it!');
|
|
36
|
+
config.matterPorts = undefined;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
static async validateMatterConfig(config) {
|
|
41
|
+
if (!this.hasMatterConfig(config)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const { MatterConfigValidator } = await import('./configValidator.js');
|
|
45
|
+
if (config.bridge.matter) {
|
|
46
|
+
const validation = MatterConfigValidator.validate(config.bridge.matter);
|
|
47
|
+
if (!validation.isValid) {
|
|
48
|
+
log.error('Main bridge Matter configuration is invalid. Matter will not be enabled for the main bridge.');
|
|
49
|
+
delete config.bridge.matter;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const childMatterValidation = MatterConfigValidator.validateAllChildMatterConfigs(config.platforms, config.accessories);
|
|
53
|
+
if (!childMatterValidation.isValid) {
|
|
54
|
+
log.error('Some child bridge Matter configurations are invalid. Check the errors above.');
|
|
55
|
+
}
|
|
56
|
+
if (config.bridge.matter?.port) {
|
|
57
|
+
this.checkPortConflicts(config);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
static checkPortConflicts(config) {
|
|
61
|
+
const mainMatterPort = config.bridge.matter?.port;
|
|
62
|
+
if (!mainMatterPort) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const childMatterPorts = [];
|
|
66
|
+
for (const platform of config.platforms) {
|
|
67
|
+
if (platform._bridge?.matter?.port) {
|
|
68
|
+
childMatterPorts.push(platform._bridge.matter.port);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
for (const accessory of config.accessories) {
|
|
72
|
+
if (accessory._bridge?.matter?.port) {
|
|
73
|
+
childMatterPorts.push(accessory._bridge.matter.port);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
if (childMatterPorts.includes(mainMatterPort)) {
|
|
77
|
+
log.error(`Main bridge Matter port ${mainMatterPort} conflicts with a child bridge Matter port. Please use unique ports.`);
|
|
78
|
+
}
|
|
79
|
+
if (config.bridge.port && Math.abs(config.bridge.port - mainMatterPort) < 10) {
|
|
80
|
+
log.warn(`Main bridge HAP port ${config.bridge.port} and Matter port ${mainMatterPort} are very close. Consider spacing them further apart.`);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/matter/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { AccessoryConfig, PlatformConfig } from '../bridgeService.js';
|
|
2
|
+
export interface PortValidationResult {
|
|
3
|
+
valid: boolean;
|
|
4
|
+
error?: string;
|
|
5
|
+
warning?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface SanitizationResult<T> {
|
|
8
|
+
value: T;
|
|
9
|
+
warnings: string[];
|
|
10
|
+
}
|
|
11
|
+
export interface MatterConfigValidationResult {
|
|
12
|
+
isValid: boolean;
|
|
13
|
+
errors: string[];
|
|
14
|
+
warnings: string[];
|
|
15
|
+
}
|
|
16
|
+
export declare function validatePort(port: number, checkConflicts?: boolean): PortValidationResult;
|
|
17
|
+
export declare function sanitizeUniqueId(uniqueId: string): SanitizationResult<string>;
|
|
18
|
+
export declare function truncateString(value: string, maxLength: number, fieldName: string): SanitizationResult<string>;
|
|
19
|
+
export declare function checkPortProximity(hapPort: number, matterPort: number): string | undefined;
|
|
20
|
+
export declare class MatterConfigValidator {
|
|
21
|
+
static validate(config: Record<string, unknown>): MatterConfigValidationResult;
|
|
22
|
+
private static validatePort;
|
|
23
|
+
static validateChildMatterConfig(config: PlatformConfig | AccessoryConfig, configType: 'platform' | 'accessory', identifier: string): MatterConfigValidationResult;
|
|
24
|
+
static validateAllChildMatterConfigs(platforms: PlatformConfig[], accessories: AccessoryConfig[]): MatterConfigValidationResult;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=configValidator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configValidator.d.ts","sourceRoot":"","sources":["../../src/matter/configValidator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAS1E,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,OAAO,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAKD,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC,CAAA;IACR,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,UAAQ,GAAG,oBAAoB,CAqBvF;AAWD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAuB7E;AAUD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,kBAAkB,CAAC,MAAM,CAAC,CAa5B;AASD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQ1F;AASD,qBAAa,qBAAqB;IAIhC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,4BAA4B;IAyB9E,OAAO,CAAC,MAAM,CAAC,YAAY;IAoB3B,MAAM,CAAC,yBAAyB,CAC9B,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,UAAU,EAAE,UAAU,GAAG,WAAW,EACpC,UAAU,EAAE,MAAM,GACjB,4BAA4B;IAsD/B,MAAM,CAAC,6BAA6B,CAClC,SAAS,EAAE,cAAc,EAAE,EAC3B,WAAW,EAAE,eAAe,EAAE,GAC7B,4BAA4B;CA2DhC"}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { Logger } from '../logger.js';
|
|
2
|
+
const log = Logger.withPrefix('Matter/Config');
|
|
3
|
+
export function validatePort(port, checkConflicts = false) {
|
|
4
|
+
if (!Number.isInteger(port)) {
|
|
5
|
+
return { valid: false, error: `Port must be an integer (got: ${port})` };
|
|
6
|
+
}
|
|
7
|
+
if (port < 1025 || port > 65534) {
|
|
8
|
+
return { valid: false, error: `Port must be between 1025 and 65534 (got: ${port})` };
|
|
9
|
+
}
|
|
10
|
+
if (checkConflicts) {
|
|
11
|
+
const conflictPorts = [5353, 8080, 8443];
|
|
12
|
+
if (conflictPorts.includes(port)) {
|
|
13
|
+
return {
|
|
14
|
+
valid: true,
|
|
15
|
+
warning: `Port ${port} may conflict with other services. Consider using a different port.`,
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return { valid: true };
|
|
20
|
+
}
|
|
21
|
+
export function sanitizeUniqueId(uniqueId) {
|
|
22
|
+
const warnings = [];
|
|
23
|
+
const original = uniqueId;
|
|
24
|
+
if (uniqueId.trim().length === 0) {
|
|
25
|
+
return {
|
|
26
|
+
value: '',
|
|
27
|
+
warnings: ['uniqueId is empty after trimming'],
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
const sanitized = uniqueId.replace(/:/g, '').toUpperCase();
|
|
31
|
+
if (sanitized !== original) {
|
|
32
|
+
warnings.push(`uniqueId was sanitized from "${original}" to "${sanitized}"`);
|
|
33
|
+
}
|
|
34
|
+
if (sanitized.length === 0) {
|
|
35
|
+
warnings.push('uniqueId resulted in empty string after sanitization');
|
|
36
|
+
}
|
|
37
|
+
return { value: sanitized, warnings };
|
|
38
|
+
}
|
|
39
|
+
export function truncateString(value, maxLength, fieldName) {
|
|
40
|
+
const warnings = [];
|
|
41
|
+
if (value.length > maxLength) {
|
|
42
|
+
warnings.push(`${fieldName} exceeds ${maxLength} characters, truncating: ${value}`);
|
|
43
|
+
log.warn(`${fieldName} exceeds ${maxLength} characters, truncating: ${value}`);
|
|
44
|
+
return {
|
|
45
|
+
value: value.slice(0, maxLength),
|
|
46
|
+
warnings,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
return { value, warnings };
|
|
50
|
+
}
|
|
51
|
+
export function checkPortProximity(hapPort, matterPort) {
|
|
52
|
+
const MIN_PORT_SEPARATION = 10;
|
|
53
|
+
if (Math.abs(hapPort - matterPort) < MIN_PORT_SEPARATION) {
|
|
54
|
+
return `HAP port ${hapPort} and Matter port ${matterPort} are very close. Consider spacing them further apart.`;
|
|
55
|
+
}
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
export class MatterConfigValidator {
|
|
59
|
+
static validate(config) {
|
|
60
|
+
const result = {
|
|
61
|
+
isValid: true,
|
|
62
|
+
errors: [],
|
|
63
|
+
warnings: [],
|
|
64
|
+
};
|
|
65
|
+
this.validatePort(config, result);
|
|
66
|
+
result.isValid = result.errors.length === 0;
|
|
67
|
+
if (result.warnings.length > 0) {
|
|
68
|
+
log.warn('Matter configuration warnings:');
|
|
69
|
+
result.warnings.forEach(warning => log.warn(` - ${warning}`));
|
|
70
|
+
}
|
|
71
|
+
if (result.errors.length > 0) {
|
|
72
|
+
log.error('Matter configuration errors:');
|
|
73
|
+
result.errors.forEach(error => log.error(` - ${error}`));
|
|
74
|
+
}
|
|
75
|
+
return result;
|
|
76
|
+
}
|
|
77
|
+
static validatePort(config, result) {
|
|
78
|
+
const port = config.port;
|
|
79
|
+
if (port !== undefined && port !== null) {
|
|
80
|
+
if (typeof port === 'number') {
|
|
81
|
+
const validation = validatePort(port, true);
|
|
82
|
+
if (!validation.valid) {
|
|
83
|
+
result.errors.push(validation.error);
|
|
84
|
+
}
|
|
85
|
+
else if (validation.warning) {
|
|
86
|
+
result.warnings.push(validation.warning);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
result.errors.push(`Port must be a number, got ${typeof port}.`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
static validateChildMatterConfig(config, configType, identifier) {
|
|
95
|
+
const result = {
|
|
96
|
+
isValid: true,
|
|
97
|
+
errors: [],
|
|
98
|
+
warnings: [],
|
|
99
|
+
};
|
|
100
|
+
if (!config._bridge?.matter) {
|
|
101
|
+
return result;
|
|
102
|
+
}
|
|
103
|
+
const matterConfig = config._bridge.matter;
|
|
104
|
+
const prefix = `Child Matter bridge for ${configType} "${identifier}"`;
|
|
105
|
+
if (matterConfig.port !== undefined) {
|
|
106
|
+
const validation = validatePort(matterConfig.port, false);
|
|
107
|
+
if (!validation.valid) {
|
|
108
|
+
result.errors.push(`${prefix}: ${validation.error}`);
|
|
109
|
+
result.isValid = false;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
result.warnings.push(`${prefix}: No port specified. Port will be auto-allocated.`);
|
|
114
|
+
}
|
|
115
|
+
if (config._bridge && config._bridge.matter) {
|
|
116
|
+
if (config._bridge.port && matterConfig.port) {
|
|
117
|
+
const proximityWarning = checkPortProximity(config._bridge.port, matterConfig.port);
|
|
118
|
+
if (proximityWarning) {
|
|
119
|
+
result.warnings.push(`${prefix}: ${proximityWarning}`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
if (result.errors.length > 0) {
|
|
124
|
+
log.error(`${prefix} validation errors:`);
|
|
125
|
+
result.errors.forEach(error => log.error(` - ${error}`));
|
|
126
|
+
}
|
|
127
|
+
if (result.warnings.length > 0) {
|
|
128
|
+
log.warn(`${prefix} validation warnings:`);
|
|
129
|
+
result.warnings.forEach(warning => log.warn(` - ${warning}`));
|
|
130
|
+
}
|
|
131
|
+
return result;
|
|
132
|
+
}
|
|
133
|
+
static validateAllChildMatterConfigs(platforms, accessories) {
|
|
134
|
+
const result = {
|
|
135
|
+
isValid: true,
|
|
136
|
+
errors: [],
|
|
137
|
+
warnings: [],
|
|
138
|
+
};
|
|
139
|
+
const usedPorts = new Set();
|
|
140
|
+
for (const platform of platforms) {
|
|
141
|
+
if (platform._bridge?.matter) {
|
|
142
|
+
const validation = this.validateChildMatterConfig(platform, 'platform', platform.platform || 'unknown');
|
|
143
|
+
result.errors.push(...validation.errors);
|
|
144
|
+
result.warnings.push(...validation.warnings);
|
|
145
|
+
result.isValid = result.isValid && validation.isValid;
|
|
146
|
+
if (platform._bridge.matter.port) {
|
|
147
|
+
if (usedPorts.has(platform._bridge.matter.port)) {
|
|
148
|
+
result.errors.push(`Duplicate Matter port ${platform._bridge.matter.port} detected. Each Matter bridge must use a unique port.`);
|
|
149
|
+
result.isValid = false;
|
|
150
|
+
}
|
|
151
|
+
usedPorts.add(platform._bridge.matter.port);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
for (const accessory of accessories) {
|
|
156
|
+
if (accessory._bridge?.matter) {
|
|
157
|
+
const validation = this.validateChildMatterConfig(accessory, 'accessory', accessory.accessory || 'unknown');
|
|
158
|
+
result.errors.push(...validation.errors);
|
|
159
|
+
result.warnings.push(...validation.warnings);
|
|
160
|
+
result.isValid = result.isValid && validation.isValid;
|
|
161
|
+
if (accessory._bridge.matter.port) {
|
|
162
|
+
if (usedPorts.has(accessory._bridge.matter.port)) {
|
|
163
|
+
result.errors.push(`Duplicate Matter port ${accessory._bridge.matter.port} detected. Each Matter bridge must use a unique port.`);
|
|
164
|
+
result.isValid = false;
|
|
165
|
+
}
|
|
166
|
+
usedPorts.add(accessory._bridge.matter.port);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return result;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
//# sourceMappingURL=configValidator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configValidator.js","sourceRoot":"","sources":["../../src/matter/configValidator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { MatterError } from './types.js';
|
|
2
|
+
export declare class MatterErrorHandler {
|
|
3
|
+
private static instance;
|
|
4
|
+
private constructor();
|
|
5
|
+
static getInstance(): MatterErrorHandler;
|
|
6
|
+
handleError(error: Error | MatterError, context?: string): Promise<void>;
|
|
7
|
+
private categorizeError;
|
|
8
|
+
private logError;
|
|
9
|
+
}
|
|
10
|
+
export declare const errorHandler: MatterErrorHandler;
|
|
11
|
+
//# sourceMappingURL=errorHandler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorHandler.d.ts","sourceRoot":"","sources":["../../src/matter/errorHandler.ts"],"names":[],"mappings":"AAWA,OAAO,EAGL,WAAW,EAIZ,MAAM,YAAY,CAAA;AAQnB,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAoB;IAE3C,OAAO;IAEP,MAAM,CAAC,WAAW,IAAI,kBAAkB;IAUlC,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9E,OAAO,CAAC,eAAe;IA4EvB,OAAO,CAAC,QAAQ;CA6BjB;AAGD,eAAO,MAAM,YAAY,oBAAmC,CAAA"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { Logger } from '../logger.js';
|
|
2
|
+
import { MatterCommissioningError, MatterDeviceError, MatterError, MatterErrorType, MatterNetworkError, MatterStorageError, } from './types.js';
|
|
3
|
+
const log = Logger.withPrefix('Matter/Errors');
|
|
4
|
+
export class MatterErrorHandler {
|
|
5
|
+
static instance;
|
|
6
|
+
constructor() { }
|
|
7
|
+
static getInstance() {
|
|
8
|
+
if (!MatterErrorHandler.instance) {
|
|
9
|
+
MatterErrorHandler.instance = new MatterErrorHandler();
|
|
10
|
+
}
|
|
11
|
+
return MatterErrorHandler.instance;
|
|
12
|
+
}
|
|
13
|
+
async handleError(error, context) {
|
|
14
|
+
const matterError = this.categorizeError(error, context);
|
|
15
|
+
this.logError(matterError);
|
|
16
|
+
}
|
|
17
|
+
categorizeError(error, context) {
|
|
18
|
+
if (error instanceof MatterError) {
|
|
19
|
+
return error;
|
|
20
|
+
}
|
|
21
|
+
const errorMessage = error.message.toLowerCase();
|
|
22
|
+
if (errorMessage.includes('eaddrinuse')) {
|
|
23
|
+
return new MatterNetworkError(`Port is already in use: ${error.message}`, { code: 'PORT_IN_USE', recoverable: false });
|
|
24
|
+
}
|
|
25
|
+
if (errorMessage.includes('econnrefused') || errorMessage.includes('etimedout')) {
|
|
26
|
+
return new MatterNetworkError(`Connection failed: ${error.message}`, { code: 'CONNECTION_FAILED', recoverable: true });
|
|
27
|
+
}
|
|
28
|
+
if (errorMessage.includes('commissioning') || errorMessage.includes('pairing')) {
|
|
29
|
+
return new MatterCommissioningError(`Commissioning error: ${error.message}`, { recoverable: false });
|
|
30
|
+
}
|
|
31
|
+
if (errorMessage.includes('storage') || errorMessage.includes('enoent') || errorMessage.includes('corrupted')) {
|
|
32
|
+
return new MatterStorageError(`Storage error: ${error.message}`, { recoverable: true });
|
|
33
|
+
}
|
|
34
|
+
if (errorMessage.includes('config') || errorMessage.includes('invalid')) {
|
|
35
|
+
return new MatterError(`Configuration error: ${error.message}`, 'CONFIGURATION_ERROR', { recoverable: false, type: MatterErrorType.CONFIGURATION });
|
|
36
|
+
}
|
|
37
|
+
if (context?.includes('sync') || context?.includes('device')) {
|
|
38
|
+
return new MatterDeviceError(`Device sync error: ${error.message}`, { recoverable: true, context });
|
|
39
|
+
}
|
|
40
|
+
if (context?.includes('server')) {
|
|
41
|
+
return new MatterError(`Server error: ${error.message}`, 'SERVER_ERROR', { recoverable: true, type: MatterErrorType.SERVER, context });
|
|
42
|
+
}
|
|
43
|
+
return new MatterError(error.message || 'Unknown Matter error', 'UNKNOWN_ERROR', { recoverable: false, type: MatterErrorType.UNKNOWN, originalError: error });
|
|
44
|
+
}
|
|
45
|
+
logError(error) {
|
|
46
|
+
if (error instanceof MatterNetworkError) {
|
|
47
|
+
if (error.details?.code === 'PORT_IN_USE') {
|
|
48
|
+
log.error('Matter port is already in use. Please configure a different port in your config.json.');
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
log.warn(`Matter network error: ${error.message}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else if (error instanceof MatterCommissioningError) {
|
|
55
|
+
log.info(`Matter commissioning issue: ${error.message}`);
|
|
56
|
+
}
|
|
57
|
+
else if (error instanceof MatterDeviceError) {
|
|
58
|
+
log.debug(`Device sync error: ${error.message}`);
|
|
59
|
+
}
|
|
60
|
+
else if (error instanceof MatterStorageError) {
|
|
61
|
+
log.warn(`Matter storage error: ${error.message}`);
|
|
62
|
+
if (error.message.includes('corrupted')) {
|
|
63
|
+
log.warn('If this persists, you may need to delete the Matter storage directory and re-pair your devices.');
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
else if (error.code === 'CONFIGURATION_ERROR') {
|
|
67
|
+
log.error(`Matter configuration error: ${error.message}`);
|
|
68
|
+
}
|
|
69
|
+
else if (error.code === 'SERVER_ERROR') {
|
|
70
|
+
log.error(`Matter server error: ${error.message}`);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
log.error(`Matter error: ${error.message}`);
|
|
74
|
+
}
|
|
75
|
+
if (!error.recoverable && error.stack) {
|
|
76
|
+
log.debug('Stack trace:', error.stack);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
export const errorHandler = MatterErrorHandler.getInstance();
|
|
81
|
+
//# sourceMappingURL=errorHandler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errorHandler.js","sourceRoot":"","sources":["../../src/matter/errorHandler.ts"],"names":[],"mappings":"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"}
|