homebridge 2.5.1-beta.2 → 2.5.1-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api.d.ts +253 -35
- package/dist/api.js +93 -5
- package/dist/api.js.map +1 -1
- package/dist/bridgeService.d.ts +63 -6
- package/dist/bridgeService.js +401 -99
- package/dist/bridgeService.js.map +1 -1
- package/dist/childBridgeFork.d.ts +12 -9
- package/dist/childBridgeFork.js +126 -40
- package/dist/childBridgeFork.js.map +1 -1
- package/dist/childBridgeService.d.ts +107 -28
- package/dist/childBridgeService.js +225 -28
- package/dist/childBridgeService.js.map +1 -1
- package/dist/cli.d.ts +0 -1
- package/dist/cli.js +28 -7
- package/dist/cli.js.map +1 -1
- package/dist/externalPortService.d.ts +4 -1
- package/dist/externalPortService.js +16 -4
- package/dist/externalPortService.js.map +1 -1
- package/dist/index.d.ts +36 -10
- package/dist/index.js +20 -4
- package/dist/index.js.map +1 -1
- package/dist/ipcService.d.ts +27 -12
- package/dist/ipcService.js +19 -6
- package/dist/ipcService.js.map +1 -1
- package/dist/logger.d.ts +10 -4
- package/dist/logger.js +27 -14
- package/dist/logger.js.map +1 -1
- package/dist/matter/BaseMatterManager.d.ts +36 -1
- package/dist/matter/BaseMatterManager.js +96 -39
- package/dist/matter/BaseMatterManager.js.map +1 -1
- package/dist/matter/ChildBridgeMatterManager.d.ts +27 -14
- package/dist/matter/ChildBridgeMatterManager.js +220 -62
- package/dist/matter/ChildBridgeMatterManager.js.map +1 -1
- package/dist/matter/ChildBridgeMatterMessageHandler.d.ts +3 -9
- package/dist/matter/ChildBridgeMatterMessageHandler.js +21 -7
- package/dist/matter/ChildBridgeMatterMessageHandler.js.map +1 -1
- package/dist/matter/ClusterCommandMapper.d.ts +21 -14
- package/dist/matter/ClusterCommandMapper.js +143 -84
- package/dist/matter/ClusterCommandMapper.js.map +1 -1
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts +2 -1
- package/dist/matter/ExternalMatterAccessoryPublisher.js +29 -18
- package/dist/matter/ExternalMatterAccessoryPublisher.js.map +1 -1
- package/dist/matter/MatterAPIImpl.d.ts +62 -41
- package/dist/matter/MatterAPIImpl.js +62 -47
- package/dist/matter/MatterAPIImpl.js.map +1 -1
- package/dist/matter/MatterBridgeManager.d.ts +2 -1
- package/dist/matter/MatterBridgeManager.js +58 -35
- package/dist/matter/MatterBridgeManager.js.map +1 -1
- package/dist/matter/MatterError.d.ts +15 -1
- package/dist/matter/MatterError.js +53 -1
- package/dist/matter/MatterError.js.map +1 -1
- package/dist/matter/MatterPortAllocator.d.ts +6 -1
- package/dist/matter/MatterPortAllocator.js +8 -0
- package/dist/matter/MatterPortAllocator.js.map +1 -1
- package/dist/matter/SwitchAPI.d.ts +0 -1
- package/dist/matter/accessoryCache.d.ts +49 -2
- package/dist/matter/accessoryCache.js +106 -3
- package/dist/matter/accessoryCache.js.map +1 -1
- package/dist/matter/behaviors/BehaviorRegistry.d.ts +39 -12
- package/dist/matter/behaviors/BehaviorRegistry.js +102 -63
- package/dist/matter/behaviors/BehaviorRegistry.js.map +1 -1
- package/dist/matter/behaviors/ClosureControlBehavior.d.ts +0 -19
- package/dist/matter/behaviors/ClosureControlBehavior.js +102 -68
- package/dist/matter/behaviors/ClosureControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/ColorControlBehavior.d.ts +30 -10
- package/dist/matter/behaviors/ColorControlBehavior.js +130 -175
- package/dist/matter/behaviors/ColorControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.d.ts +3 -6
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.js +35 -91
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.js.map +1 -1
- package/dist/matter/behaviors/DoorLockBehavior.d.ts +9 -10
- package/dist/matter/behaviors/DoorLockBehavior.js +41 -62
- package/dist/matter/behaviors/DoorLockBehavior.js.map +1 -1
- package/dist/matter/behaviors/EndpointContext.d.ts +7 -1
- package/dist/matter/behaviors/EndpointContext.js +8 -0
- package/dist/matter/behaviors/EndpointContext.js.map +1 -1
- package/dist/matter/behaviors/EnergyEvseBehavior.d.ts +6 -4
- package/dist/matter/behaviors/EnergyEvseBehavior.js +52 -76
- package/dist/matter/behaviors/EnergyEvseBehavior.js.map +1 -1
- package/dist/matter/behaviors/FanControlBehavior.d.ts +1 -6
- package/dist/matter/behaviors/FanControlBehavior.js +34 -56
- package/dist/matter/behaviors/FanControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/IdentifyBehavior.d.ts +2 -5
- package/dist/matter/behaviors/IdentifyBehavior.js +26 -25
- package/dist/matter/behaviors/IdentifyBehavior.js.map +1 -1
- package/dist/matter/behaviors/KeypadInputBehavior.d.ts +0 -5
- package/dist/matter/behaviors/KeypadInputBehavior.js +18 -13
- package/dist/matter/behaviors/KeypadInputBehavior.js.map +1 -1
- package/dist/matter/behaviors/LevelControlBehavior.d.ts +41 -10
- package/dist/matter/behaviors/LevelControlBehavior.js +173 -191
- package/dist/matter/behaviors/LevelControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/MediaPlaybackBehavior.d.ts +0 -5
- package/dist/matter/behaviors/MediaPlaybackBehavior.js +14 -10
- package/dist/matter/behaviors/MediaPlaybackBehavior.js.map +1 -1
- package/dist/matter/behaviors/OnOffBehavior.d.ts +1 -6
- package/dist/matter/behaviors/OnOffBehavior.js +41 -76
- package/dist/matter/behaviors/OnOffBehavior.js.map +1 -1
- package/dist/matter/behaviors/RegistryManager.d.ts +0 -1
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts +0 -5
- package/dist/matter/behaviors/RvcCleanModeBehavior.js +9 -47
- package/dist/matter/behaviors/RvcCleanModeBehavior.js.map +1 -1
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts +5 -8
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js +41 -38
- package/dist/matter/behaviors/RvcOperationalStateBehavior.js.map +1 -1
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts +3 -14
- package/dist/matter/behaviors/RvcRunModeBehavior.js +4 -50
- package/dist/matter/behaviors/RvcRunModeBehavior.js.map +1 -1
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts +1 -6
- package/dist/matter/behaviors/ServiceAreaBehavior.js +42 -51
- package/dist/matter/behaviors/ServiceAreaBehavior.js.map +1 -1
- package/dist/matter/behaviors/ThermostatBehavior.d.ts +6 -6
- package/dist/matter/behaviors/ThermostatBehavior.js +83 -106
- package/dist/matter/behaviors/ThermostatBehavior.js.map +1 -1
- package/dist/matter/behaviors/ValveConfigurationAndControlBehavior.d.ts +0 -5
- package/dist/matter/behaviors/ValveConfigurationAndControlBehavior.js +34 -57
- package/dist/matter/behaviors/ValveConfigurationAndControlBehavior.js.map +1 -1
- package/dist/matter/behaviors/WaterHeaterBehavior.d.ts +1 -4
- package/dist/matter/behaviors/WaterHeaterBehavior.js +14 -62
- package/dist/matter/behaviors/WaterHeaterBehavior.js.map +1 -1
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts +19 -10
- package/dist/matter/behaviors/WindowCoveringBehavior.js +94 -141
- package/dist/matter/behaviors/WindowCoveringBehavior.js.map +1 -1
- package/dist/matter/behaviors/handlerResponse.d.ts +47 -0
- package/dist/matter/behaviors/handlerResponse.js +79 -0
- package/dist/matter/behaviors/handlerResponse.js.map +1 -0
- package/dist/matter/behaviors/handlerScope.d.ts +16 -0
- package/dist/matter/behaviors/handlerScope.js +23 -0
- package/dist/matter/behaviors/handlerScope.js.map +1 -0
- package/dist/matter/behaviors/index.d.ts +0 -3
- package/dist/matter/behaviors/index.js +0 -7
- package/dist/matter/behaviors/index.js.map +1 -1
- package/dist/matter/behaviors/pluginUpdates.d.ts +35 -0
- package/dist/matter/behaviors/pluginUpdates.js +74 -0
- package/dist/matter/behaviors/pluginUpdates.js.map +1 -0
- package/dist/matter/behaviors/revertFailedChange.d.ts +28 -0
- package/dist/matter/behaviors/revertFailedChange.js +40 -0
- package/dist/matter/behaviors/revertFailedChange.js.map +1 -0
- package/dist/matter/behaviors/stateLock.d.ts +20 -0
- package/dist/matter/behaviors/stateLock.js +36 -0
- package/dist/matter/behaviors/stateLock.js.map +1 -0
- package/dist/matter/clusterFeatures.d.ts +0 -1
- package/dist/matter/clusterFeatures.js.map +1 -1
- package/dist/matter/clusterHandlerMap.d.ts +116 -25
- package/dist/matter/clusterHandlerMap.js +8 -0
- package/dist/matter/clusterHandlerMap.js.map +1 -1
- package/dist/matter/clusterStateMap.d.ts +9 -3
- package/dist/matter/clusterTypes.d.ts +66 -7
- package/dist/matter/clusterTypes.js +5 -3
- package/dist/matter/clusterTypes.js.map +1 -1
- package/dist/matter/config.d.ts +2 -3
- package/dist/matter/config.js +30 -31
- package/dist/matter/config.js.map +1 -1
- package/dist/matter/configValidator.d.ts +11 -1
- package/dist/matter/configValidator.js +36 -14
- package/dist/matter/configValidator.js.map +1 -1
- package/dist/matter/errorHandler.d.ts +22 -5
- package/dist/matter/errorHandler.js +62 -17
- package/dist/matter/errorHandler.js.map +1 -1
- package/dist/matter/errors.d.ts +0 -1
- package/dist/matter/index.d.ts +0 -1
- package/dist/matter/ipc-types.d.ts +40 -2
- package/dist/matter/logFormatter.d.ts +17 -1
- package/dist/matter/logFormatter.js +32 -32
- package/dist/matter/logFormatter.js.map +1 -1
- package/dist/matter/managerTypes.d.ts +10 -45
- package/dist/matter/processConfig.d.ts +15 -0
- package/dist/matter/processConfig.js +60 -0
- package/dist/matter/processConfig.js.map +1 -0
- package/dist/matter/server/AccessoryManager.d.ts +83 -19
- package/dist/matter/server/AccessoryManager.js +447 -226
- package/dist/matter/server/AccessoryManager.js.map +1 -1
- package/dist/matter/server/AccessoryQuery.d.ts +3 -3
- package/dist/matter/server/AccessoryQuery.js +40 -12
- package/dist/matter/server/AccessoryQuery.js.map +1 -1
- package/dist/matter/server/BehaviorMap.d.ts +4 -20
- package/dist/matter/server/BehaviorMap.js +4 -28
- package/dist/matter/server/BehaviorMap.js.map +1 -1
- package/dist/matter/server/CommissioningManager.d.ts +3 -16
- package/dist/matter/server/CommissioningManager.js +109 -137
- package/dist/matter/server/CommissioningManager.js.map +1 -1
- package/dist/matter/server/FabricManager.d.ts +9 -22
- package/dist/matter/server/FabricManager.js +32 -170
- package/dist/matter/server/FabricManager.js.map +1 -1
- package/dist/matter/server/ServerConfig.d.ts +0 -5
- package/dist/matter/server/ServerConfig.js +1 -4
- package/dist/matter/server/ServerConfig.js.map +1 -1
- package/dist/matter/server/ServerLifecycle.d.ts +64 -19
- package/dist/matter/server/ServerLifecycle.js +268 -174
- package/dist/matter/server/ServerLifecycle.js.map +1 -1
- package/dist/matter/server/StateManager.d.ts +17 -2
- package/dist/matter/server/StateManager.js +104 -52
- package/dist/matter/server/StateManager.js.map +1 -1
- package/dist/matter/server/index.d.ts +2 -3
- package/dist/matter/server/index.js +2 -2
- package/dist/matter/server/index.js.map +1 -1
- package/dist/matter/server/storageLock.d.ts +35 -0
- package/dist/matter/server/storageLock.js +121 -0
- package/dist/matter/server/storageLock.js.map +1 -0
- package/dist/matter/server.d.ts +20 -22
- package/dist/matter/server.js +129 -66
- package/dist/matter/server.js.map +1 -1
- package/dist/matter/serverHelpers.d.ts +17 -71
- package/dist/matter/serverHelpers.js +88 -207
- package/dist/matter/serverHelpers.js.map +1 -1
- package/dist/matter/sharedTypes.d.ts +7 -2
- package/dist/matter/sharedTypes.js.map +1 -1
- package/dist/matter/types.d.ts +121 -88
- package/dist/matter/types.js +62 -22
- package/dist/matter/types.js.map +1 -1
- package/dist/matter/utils.d.ts +32 -5
- package/dist/matter/utils.js +63 -14
- package/dist/matter/utils.js.map +1 -1
- package/dist/matterExports.d.ts +30 -0
- package/dist/matterExports.js +23 -0
- package/dist/matterExports.js.map +1 -0
- package/dist/platformAccessory.d.ts +54 -9
- package/dist/platformAccessory.js +38 -5
- package/dist/platformAccessory.js.map +1 -1
- package/dist/plugin.d.ts +0 -4
- package/dist/plugin.js +65 -33
- package/dist/plugin.js.map +1 -1
- package/dist/pluginManager.d.ts +38 -4
- package/dist/pluginManager.js +123 -66
- package/dist/pluginManager.js.map +1 -1
- package/dist/server.d.ts +38 -11
- package/dist/server.js +286 -118
- package/dist/server.js.map +1 -1
- package/dist/storageService.d.ts +12 -6
- package/dist/storageService.js +39 -16
- package/dist/storageService.js.map +1 -1
- package/dist/user.d.ts +0 -1
- package/dist/util/errorMessage.d.ts +6 -0
- package/dist/util/errorMessage.js +15 -0
- package/dist/util/errorMessage.js.map +1 -0
- package/dist/util/ipc.d.ts +12 -0
- package/dist/util/ipc.js +25 -0
- package/dist/util/ipc.js.map +1 -0
- package/dist/util/mac.d.ts +1 -2
- package/dist/util/mac.js.map +1 -1
- package/dist/util/pin.d.ts +19 -0
- package/dist/util/pin.js +43 -0
- package/dist/util/pin.js.map +1 -0
- package/dist/util/port.d.ts +11 -0
- package/dist/util/port.js +24 -0
- package/dist/util/port.js.map +1 -0
- package/dist/version.d.ts +0 -1
- package/package.json +28 -17
- package/dist/api.d.ts.map +0 -1
- package/dist/bridgeService.d.ts.map +0 -1
- package/dist/childBridgeFork.d.ts.map +0 -1
- package/dist/childBridgeService.d.ts.map +0 -1
- package/dist/cli.d.ts.map +0 -1
- package/dist/externalPortService.d.ts.map +0 -1
- package/dist/index.d.ts.map +0 -1
- package/dist/ipcService.d.ts.map +0 -1
- package/dist/logger.d.ts.map +0 -1
- package/dist/matter/BaseMatterManager.d.ts.map +0 -1
- package/dist/matter/ChildBridgeMatterManager.d.ts.map +0 -1
- package/dist/matter/ChildBridgeMatterMessageHandler.d.ts.map +0 -1
- package/dist/matter/ClusterCommandMapper.d.ts.map +0 -1
- package/dist/matter/ExternalMatterAccessoryPublisher.d.ts.map +0 -1
- package/dist/matter/MatterAPIImpl.d.ts.map +0 -1
- package/dist/matter/MatterBridgeManager.d.ts.map +0 -1
- package/dist/matter/MatterError.d.ts.map +0 -1
- package/dist/matter/MatterPortAllocator.d.ts.map +0 -1
- package/dist/matter/SwitchAPI.d.ts.map +0 -1
- package/dist/matter/accessoryCache.d.ts.map +0 -1
- package/dist/matter/behaviors/AirQualityBehavior.d.ts +0 -44
- package/dist/matter/behaviors/AirQualityBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/AirQualityBehavior.js +0 -48
- package/dist/matter/behaviors/AirQualityBehavior.js.map +0 -1
- package/dist/matter/behaviors/BehaviorRegistry.d.ts.map +0 -1
- package/dist/matter/behaviors/ClosureControlBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ColorControlBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts +0 -117
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js +0 -132
- package/dist/matter/behaviors/ConcentrationMeasurementBehavior.js.map +0 -1
- package/dist/matter/behaviors/DeviceEnergyManagementBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/DoorLockBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/EndpointContext.d.ts.map +0 -1
- package/dist/matter/behaviors/EnergyEvseBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/FanControlBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/IdentifyBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/KeypadInputBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/LevelControlBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/MediaPlaybackBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/OnOffBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/RegistryManager.d.ts.map +0 -1
- package/dist/matter/behaviors/RvcCleanModeBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/RvcOperationalStateBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/RvcRunModeBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ServiceAreaBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ThermostatBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/ValveConfigurationAndControlBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/WaterHeaterBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/WindowCoveringBehavior.d.ts.map +0 -1
- package/dist/matter/behaviors/index.d.ts.map +0 -1
- package/dist/matter/clusterFeatures.d.ts.map +0 -1
- package/dist/matter/clusterHandlerMap.d.ts.map +0 -1
- package/dist/matter/clusterStateMap.d.ts.map +0 -1
- package/dist/matter/clusterTypes.d.ts.map +0 -1
- package/dist/matter/config.d.ts.map +0 -1
- package/dist/matter/configValidator.d.ts.map +0 -1
- package/dist/matter/errorHandler.d.ts.map +0 -1
- package/dist/matter/errors.d.ts.map +0 -1
- package/dist/matter/index.d.ts.map +0 -1
- package/dist/matter/ipc-types.d.ts.map +0 -1
- package/dist/matter/logFormatter.d.ts.map +0 -1
- package/dist/matter/managerTypes.d.ts.map +0 -1
- package/dist/matter/server/AccessoryManager.d.ts.map +0 -1
- package/dist/matter/server/AccessoryQuery.d.ts.map +0 -1
- package/dist/matter/server/BehaviorMap.d.ts.map +0 -1
- package/dist/matter/server/CommissioningManager.d.ts.map +0 -1
- package/dist/matter/server/FabricManager.d.ts.map +0 -1
- package/dist/matter/server/ServerConfig.d.ts.map +0 -1
- package/dist/matter/server/ServerLifecycle.d.ts.map +0 -1
- package/dist/matter/server/StateManager.d.ts.map +0 -1
- package/dist/matter/server/index.d.ts.map +0 -1
- package/dist/matter/server.d.ts.map +0 -1
- package/dist/matter/serverHelpers.d.ts.map +0 -1
- package/dist/matter/sharedTypes.d.ts.map +0 -1
- package/dist/matter/types.d.ts.map +0 -1
- package/dist/matter/utils.d.ts.map +0 -1
- package/dist/platformAccessory.d.ts.map +0 -1
- package/dist/plugin.d.ts.map +0 -1
- package/dist/pluginManager.d.ts.map +0 -1
- package/dist/server.d.ts.map +0 -1
- package/dist/storageService.d.ts.map +0 -1
- package/dist/user.d.ts.map +0 -1
- package/dist/util/mac.d.ts.map +0 -1
- package/dist/version.d.ts.map +0 -1
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Handlers that answer a command themselves.
|
|
3
|
+
*
|
|
4
|
+
* Some Matter commands answer with a status of their own: a mode change says
|
|
5
|
+
* why the mode can not be used right now, a vacuum says what is stopping it, a
|
|
6
|
+
* key press says the key is not supported. A plugin handler for one of these
|
|
7
|
+
* commands may return that answer. A handler that returns nothing means "done".
|
|
8
|
+
*/
|
|
9
|
+
import { ModeUtils } from '@matter/main/behaviors/mode-base';
|
|
10
|
+
import { ModeBase } from '@matter/main/clusters';
|
|
11
|
+
import { registryOf } from './EndpointContext.js';
|
|
12
|
+
import { lockStateForWrite } from './stateLock.js';
|
|
13
|
+
/**
|
|
14
|
+
* The highest status a cluster-level answer has: 0x00 to 0x3F general, 0x40 to
|
|
15
|
+
* 0x7F for the cluster, 0x80 to 0xBF for the maker.
|
|
16
|
+
*/
|
|
17
|
+
const HIGHEST_ANSWER_STATUS = 0xBF;
|
|
18
|
+
/**
|
|
19
|
+
* What a handler returned, when it is an answer with a status. Anything else a
|
|
20
|
+
* handler returns is ignored, so an existing handler that happens to return a
|
|
21
|
+
* value changes nothing.
|
|
22
|
+
*
|
|
23
|
+
* An answer is a plain object with a whole-number status in the range above.
|
|
24
|
+
* A handler that ends with `return fetch(url)` or an axios call returns a
|
|
25
|
+
* response with an HTTP status (200 and up): that is not an answer, and before
|
|
26
|
+
* it refused every mode change.
|
|
27
|
+
*/
|
|
28
|
+
export function statusResponse(response) {
|
|
29
|
+
if (typeof response !== 'object' || response === null) {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
const prototype = Object.getPrototypeOf(response);
|
|
33
|
+
if (prototype !== Object.prototype && prototype !== null) {
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
const status = response.status;
|
|
37
|
+
return typeof status === 'number' && Number.isInteger(status) && status >= 0 && status <= HIGHEST_ANSWER_STATUS
|
|
38
|
+
? response
|
|
39
|
+
: undefined;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* The ChangeToMode command of every mode cluster, with the plugin told first.
|
|
43
|
+
*
|
|
44
|
+
* matter.js validates the mode and records it, but only once the plugin has
|
|
45
|
+
* been told - so the mode is checked here first, and the plugin only hears
|
|
46
|
+
* about a mode the device lists. The handler may refuse the change by
|
|
47
|
+
* returning an answer with a status other than Success (for a vacuum: stuck,
|
|
48
|
+
* battery low, and so on); the mode then stays as it was.
|
|
49
|
+
*
|
|
50
|
+
* @param behavior the mode behavior the command arrived on
|
|
51
|
+
* @param clusterName the cluster name, as used in the plugin API (`rvcRunMode`)
|
|
52
|
+
* @param request the command's request
|
|
53
|
+
* @param applyChange records the new mode in Matter (the matter.js command)
|
|
54
|
+
* @param refuse an extra check before the plugin is told; returns the answer to refuse with
|
|
55
|
+
*/
|
|
56
|
+
export async function changeToModeWithHandler(behavior, clusterName, request, applyChange, refuse) {
|
|
57
|
+
const endpointId = behavior.endpoint.id;
|
|
58
|
+
const registry = registryOf(behavior.endpoint);
|
|
59
|
+
// matter.js only checks the mode in its own changeToMode, after the handler has run
|
|
60
|
+
const modeCheck = ModeUtils.assertModeChange(behavior.state.supportedModes, behavior.state.currentMode, request.newMode);
|
|
61
|
+
if (modeCheck.status !== ModeBase.ModeChangeStatus.Success) {
|
|
62
|
+
return modeCheck;
|
|
63
|
+
}
|
|
64
|
+
const refused = refuse?.();
|
|
65
|
+
if (refused) {
|
|
66
|
+
return refused;
|
|
67
|
+
}
|
|
68
|
+
const { response } = await registry.runHandler(endpointId, clusterName, 'changeToMode', request);
|
|
69
|
+
const answer = statusResponse(response);
|
|
70
|
+
if (answer && answer.status !== ModeBase.ModeChangeStatus.Success) {
|
|
71
|
+
return answer;
|
|
72
|
+
}
|
|
73
|
+
await lockStateForWrite(behavior);
|
|
74
|
+
// Only reached if the handler succeeded
|
|
75
|
+
const result = await applyChange();
|
|
76
|
+
registry.syncStateToCache(endpointId, clusterName, { currentMode: request.newMode });
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
//# sourceMappingURL=handlerResponse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handlerResponse.js","sourceRoot":"","sources":["../../../src/matter/behaviors/handlerResponse.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAElD;;;GAGG;AACH,MAAM,qBAAqB,GAAG,IAAI,CAAA;AAElC;;;;;;;;;GASG;AACH,MAAM,UAAU,cAAc,CAA+B,QAAiB;IAC5E,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IACjD,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACzD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,MAAM,GAAI,QAAiC,CAAC,MAAM,CAAA;IACxD,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,qBAAqB;QAC7G,CAAC,CAAC,QAAa;QACf,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAOD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,QAAsB,EACtB,WAAmB,EACnB,OAAqC,EACrC,WAA6F,EAC7F,MAAwD;IAExD,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;IACvC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAE9C,oFAAoF;IACpF,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;IACxH,IAAI,SAAS,CAAC,MAAM,KAAK,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3D,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,EAAE,EAAE,CAAA;IAC1B,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,OAAO,CAAC,CAAA;IAChG,MAAM,MAAM,GAAG,cAAc,CAAgC,QAAQ,CAAC,CAAA;IACtE,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAClE,OAAO,MAAM,CAAA;IACf,CAAC;IACD,MAAM,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAEjC,wCAAwC;IACxC,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAA;IAClC,QAAQ,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IACpF,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Knowing whether code runs inside a plugin's command handler.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Run a plugin's command handler, marked as such for everything it awaits.
|
|
6
|
+
*/
|
|
7
|
+
export declare function runInHandlerScope<T>(handler: () => T): T;
|
|
8
|
+
/**
|
|
9
|
+
* Whether the caller is (awaited from) a plugin's command handler.
|
|
10
|
+
*
|
|
11
|
+
* matter.js may lock a cluster's state for a command before it calls the
|
|
12
|
+
* handler (a colour command sets the colour mode first). An update of that
|
|
13
|
+
* cluster which the handler waits for then waits for the command, and the
|
|
14
|
+
* command waits for the handler: neither ever ends.
|
|
15
|
+
*/
|
|
16
|
+
export declare function isInHandlerScope(): boolean;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Knowing whether code runs inside a plugin's command handler.
|
|
3
|
+
*/
|
|
4
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
5
|
+
const scope = new AsyncLocalStorage();
|
|
6
|
+
/**
|
|
7
|
+
* Run a plugin's command handler, marked as such for everything it awaits.
|
|
8
|
+
*/
|
|
9
|
+
export function runInHandlerScope(handler) {
|
|
10
|
+
return scope.run(true, handler);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Whether the caller is (awaited from) a plugin's command handler.
|
|
14
|
+
*
|
|
15
|
+
* matter.js may lock a cluster's state for a command before it calls the
|
|
16
|
+
* handler (a colour command sets the colour mode first). An update of that
|
|
17
|
+
* cluster which the handler waits for then waits for the command, and the
|
|
18
|
+
* command waits for the handler: neither ever ends.
|
|
19
|
+
*/
|
|
20
|
+
export function isInHandlerScope() {
|
|
21
|
+
return scope.getStore() === true;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=handlerScope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handlerScope.js","sourceRoot":"","sources":["../../../src/matter/behaviors/handlerScope.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,MAAM,KAAK,GAAG,IAAI,iBAAiB,EAAQ,CAAA;AAE3C;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAI,OAAgB;IACnD,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;AACjC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAA;AAClC,CAAC"}
|
|
@@ -3,12 +3,10 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Exports all behavior classes and the registry
|
|
5
5
|
*/
|
|
6
|
-
export { HomebridgeAirQualityServer } from './AirQualityBehavior.js';
|
|
7
6
|
export type { MatterAccessoryMap, MatterCommandHandler } from './BehaviorRegistry.js';
|
|
8
7
|
export { BehaviorRegistry } from './BehaviorRegistry.js';
|
|
9
8
|
export { DefaultClosureControlServer, HomebridgeClosureControlServer } from './ClosureControlBehavior.js';
|
|
10
9
|
export { HomebridgeColorControlServer } from './ColorControlBehavior.js';
|
|
11
|
-
export { HomebridgeCarbonMonoxideConcentrationMeasurementServer, HomebridgeNitrogenDioxideConcentrationMeasurementServer, HomebridgeOzoneConcentrationMeasurementServer, HomebridgePm10ConcentrationMeasurementServer, HomebridgePm25ConcentrationMeasurementServer, } from './ConcentrationMeasurementBehavior.js';
|
|
12
10
|
export { DefaultDeviceEnergyManagementServer, HomebridgeDeviceEnergyManagementModeServer, HomebridgeDeviceEnergyManagementServer } from './DeviceEnergyManagementBehavior.js';
|
|
13
11
|
export { HomebridgeDoorLockServer } from './DoorLockBehavior.js';
|
|
14
12
|
export { DefaultEnergyEvseServer, HomebridgeEnergyEvseModeServer, HomebridgeEnergyEvseServer } from './EnergyEvseBehavior.js';
|
|
@@ -27,4 +25,3 @@ export { HomebridgeThermostatServer } from './ThermostatBehavior.js';
|
|
|
27
25
|
export { DefaultValveConfigurationAndControlServer, HomebridgeValveConfigurationAndControlServer } from './ValveConfigurationAndControlBehavior.js';
|
|
28
26
|
export { DefaultWaterHeaterManagementServer, HomebridgeWaterHeaterManagementServer, HomebridgeWaterHeaterModeServer } from './WaterHeaterBehavior.js';
|
|
29
27
|
export { HomebridgeWindowCoveringServer } from './WindowCoveringBehavior.js';
|
|
30
|
-
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1,13 +1,6 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Matter Behaviors Index
|
|
3
|
-
*
|
|
4
|
-
* Exports all behavior classes and the registry
|
|
5
|
-
*/
|
|
6
|
-
export { HomebridgeAirQualityServer } from './AirQualityBehavior.js';
|
|
7
1
|
export { BehaviorRegistry } from './BehaviorRegistry.js';
|
|
8
2
|
export { DefaultClosureControlServer, HomebridgeClosureControlServer } from './ClosureControlBehavior.js';
|
|
9
3
|
export { HomebridgeColorControlServer } from './ColorControlBehavior.js';
|
|
10
|
-
export { HomebridgeCarbonMonoxideConcentrationMeasurementServer, HomebridgeNitrogenDioxideConcentrationMeasurementServer, HomebridgeOzoneConcentrationMeasurementServer, HomebridgePm10ConcentrationMeasurementServer, HomebridgePm25ConcentrationMeasurementServer, } from './ConcentrationMeasurementBehavior.js';
|
|
11
4
|
export { DefaultDeviceEnergyManagementServer, HomebridgeDeviceEnergyManagementModeServer, HomebridgeDeviceEnergyManagementServer } from './DeviceEnergyManagementBehavior.js';
|
|
12
5
|
export { HomebridgeDoorLockServer } from './DoorLockBehavior.js';
|
|
13
6
|
export { DefaultEnergyEvseServer, HomebridgeEnergyEvseModeServer, HomebridgeEnergyEvseServer } from './EnergyEvseBehavior.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/matter/behaviors/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/matter/behaviors/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,2BAA2B,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AACzG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,mCAAmC,EAAE,0CAA0C,EAAE,sCAAsC,EAAE,MAAM,qCAAqC,CAAA;AAC7K,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AAC7H,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAA;AAChG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,MAAM,4BAA4B,CAAA;AACtG,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AACxE,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAA;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EAAE,yCAAyC,EAAE,4CAA4C,EAAE,MAAM,2CAA2C,CAAA;AACnJ,OAAO,EAAE,kCAAkC,EAAE,qCAAqC,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAA;AACrJ,OAAO,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tells a change a plugin reported apart from a change somebody asked for.
|
|
3
|
+
*
|
|
4
|
+
* Fan control and the thermostat have no command for "set the fan mode" or
|
|
5
|
+
* "set the setpoint": a controller writes the attribute, and the Homebridge
|
|
6
|
+
* behavior reacts to the change by calling the plugin's handler. A plugin
|
|
7
|
+
* reporting what its device already did (updateAccessoryState) writes the same
|
|
8
|
+
* attribute, and matter.js raises the same change event. Calling the handler
|
|
9
|
+
* then would tell the plugin to set its device to the value the device just
|
|
10
|
+
* reported.
|
|
11
|
+
*
|
|
12
|
+
* So StateManager notes the values a plugin is writing, and the behaviors ask
|
|
13
|
+
* here before they call a handler. A note is used once, by the change event it
|
|
14
|
+
* was made for; that event may arrive late (a reaction waits for an earlier
|
|
15
|
+
* one to finish), so a note is not dropped on a timer.
|
|
16
|
+
*
|
|
17
|
+
* A light module on purpose: it imports nothing from matter.js.
|
|
18
|
+
*/
|
|
19
|
+
/** The attributes whose change calls a plugin handler, per cluster. */
|
|
20
|
+
export declare const HANDLED_ATTRIBUTES: Readonly<Record<string, readonly string[]>>;
|
|
21
|
+
/**
|
|
22
|
+
* Note the values a plugin is about to write to an endpoint. Only attributes
|
|
23
|
+
* that call a handler and whose value really changes are noted, as no change
|
|
24
|
+
* event follows for the others.
|
|
25
|
+
*
|
|
26
|
+
* @returns the noted attribute names, for forgetPluginUpdate()
|
|
27
|
+
*/
|
|
28
|
+
export declare function notePluginUpdate(endpoint: object, cluster: string, attributes: Record<string, unknown>, current: Record<string, unknown> | undefined): string[];
|
|
29
|
+
/** Drop notes again, for a write that failed (no change event will come). */
|
|
30
|
+
export declare function forgetPluginUpdate(endpoint: object, cluster: string, attributeNames: string[]): void;
|
|
31
|
+
/**
|
|
32
|
+
* Whether this change is one a plugin reported. Uses up the note, so the next
|
|
33
|
+
* change to the same value counts as asked for again.
|
|
34
|
+
*/
|
|
35
|
+
export declare function isPluginUpdate(endpoint: object, cluster: string, attribute: string, value: unknown): boolean;
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tells a change a plugin reported apart from a change somebody asked for.
|
|
3
|
+
*
|
|
4
|
+
* Fan control and the thermostat have no command for "set the fan mode" or
|
|
5
|
+
* "set the setpoint": a controller writes the attribute, and the Homebridge
|
|
6
|
+
* behavior reacts to the change by calling the plugin's handler. A plugin
|
|
7
|
+
* reporting what its device already did (updateAccessoryState) writes the same
|
|
8
|
+
* attribute, and matter.js raises the same change event. Calling the handler
|
|
9
|
+
* then would tell the plugin to set its device to the value the device just
|
|
10
|
+
* reported.
|
|
11
|
+
*
|
|
12
|
+
* So StateManager notes the values a plugin is writing, and the behaviors ask
|
|
13
|
+
* here before they call a handler. A note is used once, by the change event it
|
|
14
|
+
* was made for; that event may arrive late (a reaction waits for an earlier
|
|
15
|
+
* one to finish), so a note is not dropped on a timer.
|
|
16
|
+
*
|
|
17
|
+
* A light module on purpose: it imports nothing from matter.js.
|
|
18
|
+
*/
|
|
19
|
+
/** The attributes whose change calls a plugin handler, per cluster. */
|
|
20
|
+
export const HANDLED_ATTRIBUTES = {
|
|
21
|
+
fanControl: ['fanMode', 'percentSetting'],
|
|
22
|
+
thermostat: [
|
|
23
|
+
'systemMode',
|
|
24
|
+
'occupiedHeatingSetpoint',
|
|
25
|
+
'occupiedCoolingSetpoint',
|
|
26
|
+
'unoccupiedHeatingSetpoint',
|
|
27
|
+
'unoccupiedCoolingSetpoint',
|
|
28
|
+
],
|
|
29
|
+
};
|
|
30
|
+
const pluginUpdates = new WeakMap();
|
|
31
|
+
/**
|
|
32
|
+
* Note the values a plugin is about to write to an endpoint. Only attributes
|
|
33
|
+
* that call a handler and whose value really changes are noted, as no change
|
|
34
|
+
* event follows for the others.
|
|
35
|
+
*
|
|
36
|
+
* @returns the noted attribute names, for forgetPluginUpdate()
|
|
37
|
+
*/
|
|
38
|
+
export function notePluginUpdate(endpoint, cluster, attributes, current) {
|
|
39
|
+
const noted = [];
|
|
40
|
+
for (const attribute of HANDLED_ATTRIBUTES[cluster] ?? []) {
|
|
41
|
+
if (!(attribute in attributes) || Object.is(attributes[attribute], current?.[attribute])) {
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
let updates = pluginUpdates.get(endpoint);
|
|
45
|
+
if (!updates) {
|
|
46
|
+
updates = new Map();
|
|
47
|
+
pluginUpdates.set(endpoint, updates);
|
|
48
|
+
}
|
|
49
|
+
updates.set(`${cluster}.${attribute}`, attributes[attribute]);
|
|
50
|
+
noted.push(attribute);
|
|
51
|
+
}
|
|
52
|
+
return noted;
|
|
53
|
+
}
|
|
54
|
+
/** Drop notes again, for a write that failed (no change event will come). */
|
|
55
|
+
export function forgetPluginUpdate(endpoint, cluster, attributeNames) {
|
|
56
|
+
const updates = pluginUpdates.get(endpoint);
|
|
57
|
+
for (const attribute of attributeNames) {
|
|
58
|
+
updates?.delete(`${cluster}.${attribute}`);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Whether this change is one a plugin reported. Uses up the note, so the next
|
|
63
|
+
* change to the same value counts as asked for again.
|
|
64
|
+
*/
|
|
65
|
+
export function isPluginUpdate(endpoint, cluster, attribute, value) {
|
|
66
|
+
const updates = pluginUpdates.get(endpoint);
|
|
67
|
+
const key = `${cluster}.${attribute}`;
|
|
68
|
+
if (!updates?.has(key) || !Object.is(updates.get(key), value)) {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
updates.delete(key);
|
|
72
|
+
return true;
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=pluginUpdates.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pluginUpdates.js","sourceRoot":"","sources":["../../../src/matter/behaviors/pluginUpdates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,uEAAuE;AACvE,MAAM,CAAC,MAAM,kBAAkB,GAAgD;IAC7E,UAAU,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACzC,UAAU,EAAE;QACV,YAAY;QACZ,yBAAyB;QACzB,yBAAyB;QACzB,2BAA2B;QAC3B,2BAA2B;KAC5B;CACF,CAAA;AAED,MAAM,aAAa,GAAG,IAAI,OAAO,EAAgC,CAAA;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,OAAe,EAAE,UAAmC,EAAE,OAA4C;IACnJ,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,SAAS,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QAC1D,IAAI,CAAC,CAAC,SAAS,IAAI,UAAU,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YACzF,SAAQ;QACV,CAAC;QACD,IAAI,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,GAAG,EAAE,CAAA;YACnB,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,IAAI,SAAS,EAAE,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;QAC7D,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,OAAe,EAAE,cAAwB;IAC5F,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC3C,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACvC,OAAO,EAAE,MAAM,CAAC,GAAG,OAAO,IAAI,SAAS,EAAE,CAAC,CAAA;IAC5C,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB,EAAE,OAAe,EAAE,SAAiB,EAAE,KAAc;IACjG,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAC3C,MAAM,GAAG,GAAG,GAAG,OAAO,IAAI,SAAS,EAAE,CAAA;IACrC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;QAC9D,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACnB,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What the fan and thermostat behaviors do when a plugin's attribute-change
|
|
3
|
+
* handler fails.
|
|
4
|
+
*
|
|
5
|
+
* These handlers run as a reaction to a write that matter.js has already
|
|
6
|
+
* accepted: there is no command to fail, and an error thrown from the reaction
|
|
7
|
+
* never reaches the controller. Left alone, the new value stays on the
|
|
8
|
+
* endpoint and every controller shows a state the device never took. So the
|
|
9
|
+
* old value is written back, which controllers see as the attribute changing
|
|
10
|
+
* back, and the failure is logged.
|
|
11
|
+
*/
|
|
12
|
+
/** The part of an endpoint this needs. */
|
|
13
|
+
interface RevertableEndpoint {
|
|
14
|
+
id: string;
|
|
15
|
+
setStateOf: (type: string, values: Record<string, unknown>) => Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Log a failed attribute-change handler and put the old value back.
|
|
19
|
+
*
|
|
20
|
+
* @param endpoint the endpoint the attribute is on
|
|
21
|
+
* @param cluster the cluster name, as used in the plugin API (`fanControl`)
|
|
22
|
+
* @param attribute the attribute that was changed
|
|
23
|
+
* @param failedValue the value the handler could not apply
|
|
24
|
+
* @param oldValue the value to put back
|
|
25
|
+
* @param error what the handler threw
|
|
26
|
+
*/
|
|
27
|
+
export declare function revertFailedChange(endpoint: RevertableEndpoint, cluster: string, attribute: string, failedValue: unknown, oldValue: unknown, error: unknown): Promise<void>;
|
|
28
|
+
export {};
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What the fan and thermostat behaviors do when a plugin's attribute-change
|
|
3
|
+
* handler fails.
|
|
4
|
+
*
|
|
5
|
+
* These handlers run as a reaction to a write that matter.js has already
|
|
6
|
+
* accepted: there is no command to fail, and an error thrown from the reaction
|
|
7
|
+
* never reaches the controller. Left alone, the new value stays on the
|
|
8
|
+
* endpoint and every controller shows a state the device never took. So the
|
|
9
|
+
* old value is written back, which controllers see as the attribute changing
|
|
10
|
+
* back, and the failure is logged.
|
|
11
|
+
*/
|
|
12
|
+
import { Logger } from '../../logger.js';
|
|
13
|
+
import { notePluginUpdate } from './pluginUpdates.js';
|
|
14
|
+
const log = Logger.withPrefix('Matter/Behaviors');
|
|
15
|
+
/**
|
|
16
|
+
* Log a failed attribute-change handler and put the old value back.
|
|
17
|
+
*
|
|
18
|
+
* @param endpoint the endpoint the attribute is on
|
|
19
|
+
* @param cluster the cluster name, as used in the plugin API (`fanControl`)
|
|
20
|
+
* @param attribute the attribute that was changed
|
|
21
|
+
* @param failedValue the value the handler could not apply
|
|
22
|
+
* @param oldValue the value to put back
|
|
23
|
+
* @param error what the handler threw
|
|
24
|
+
*/
|
|
25
|
+
export async function revertFailedChange(endpoint, cluster, attribute, failedValue, oldValue, error) {
|
|
26
|
+
const message = error instanceof Error
|
|
27
|
+
? error.message
|
|
28
|
+
: String(error);
|
|
29
|
+
log.error(`[${endpoint.id}] The ${cluster} handler for a change of ${attribute} to ${String(failedValue)} failed, putting ${String(oldValue)} back: ${message}`);
|
|
30
|
+
// The write back raises the change event again. It is not a request, so
|
|
31
|
+
// note it like a state report: the handler is not called for it.
|
|
32
|
+
notePluginUpdate(endpoint, cluster, { [attribute]: oldValue }, { [attribute]: failedValue });
|
|
33
|
+
try {
|
|
34
|
+
await endpoint.setStateOf(cluster, { [attribute]: oldValue });
|
|
35
|
+
}
|
|
36
|
+
catch (revertError) {
|
|
37
|
+
log.error(`[${endpoint.id}] Could not put ${cluster}.${attribute} back to ${String(oldValue)}:`, revertError);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=revertFailedChange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"revertFailedChange.js","sourceRoot":"","sources":["../../../src/matter/behaviors/revertFailedChange.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAErD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAA;AAQjD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,QAA4B,EAAE,OAAe,EAAE,SAAiB,EAAE,WAAoB,EAAE,QAAiB,EAAE,KAAc;IAChK,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK;QACpC,CAAC,CAAC,KAAK,CAAC,OAAO;QACf,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjB,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,EAAE,SAAS,OAAO,4BAA4B,SAAS,OAAO,MAAM,CAAC,WAAW,CAAC,oBAAoB,MAAM,CAAC,QAAQ,CAAC,UAAU,OAAO,EAAE,CAAC,CAAA;IAEhK,wEAAwE;IACxE,iEAAiE;IACjE,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,CAAA;IAC5F,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC/D,CAAC;IAAC,OAAO,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,EAAE,mBAAmB,OAAO,IAAI,SAAS,YAAY,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAC/G,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Taking a cluster's state lock after waiting for a plugin handler.
|
|
3
|
+
*/
|
|
4
|
+
import type { Behavior } from '@matter/main';
|
|
5
|
+
/**
|
|
6
|
+
* Wait until this command may write the cluster's state.
|
|
7
|
+
*
|
|
8
|
+
* A command first awaits the plugin's handler and then writes the state. When
|
|
9
|
+
* two commands for one accessory arrive together (a controller sends "set
|
|
10
|
+
* level" and "on" as a pair), the second one resumed while the first was
|
|
11
|
+
* still saving, and its write failed with "Cannot lock ... synchronously"
|
|
12
|
+
* after the plugin had already acted. matter.js takes a lock without waiting
|
|
13
|
+
* unless it is asked for up front, so ask: the second command then waits for
|
|
14
|
+
* the first to finish saving.
|
|
15
|
+
*
|
|
16
|
+
* It is taken after the handler, not before, on purpose: a plugin may update
|
|
17
|
+
* the same cluster from inside its handler, and that update must not wait for
|
|
18
|
+
* a command that is waiting for the handler.
|
|
19
|
+
*/
|
|
20
|
+
export declare function lockStateForWrite(behavior: Behavior): Promise<void>;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Taking a cluster's state lock after waiting for a plugin handler.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Wait until this command may write the cluster's state.
|
|
6
|
+
*
|
|
7
|
+
* A command first awaits the plugin's handler and then writes the state. When
|
|
8
|
+
* two commands for one accessory arrive together (a controller sends "set
|
|
9
|
+
* level" and "on" as a pair), the second one resumed while the first was
|
|
10
|
+
* still saving, and its write failed with "Cannot lock ... synchronously"
|
|
11
|
+
* after the plugin had already acted. matter.js takes a lock without waiting
|
|
12
|
+
* unless it is asked for up front, so ask: the second command then waits for
|
|
13
|
+
* the first to finish saving.
|
|
14
|
+
*
|
|
15
|
+
* It is taken after the handler, not before, on purpose: a plugin may update
|
|
16
|
+
* the same cluster from inside its handler, and that update must not wait for
|
|
17
|
+
* a command that is waiting for the handler.
|
|
18
|
+
*/
|
|
19
|
+
export async function lockStateForWrite(behavior) {
|
|
20
|
+
let transaction;
|
|
21
|
+
try {
|
|
22
|
+
transaction = behavior.context.transaction;
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
// Not inside a matter.js action, so nothing else can be writing through a
|
|
26
|
+
// transaction. Only the unit tests get here: they call the command methods
|
|
27
|
+
// on a bare object that matter.js never set up.
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
if (!transaction) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
await transaction.addResources(behavior);
|
|
34
|
+
await transaction.begin();
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=stateLock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stateLock.js","sourceRoot":"","sources":["../../../src/matter/behaviors/stateLock.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAkB;IACxD,IAAI,WAA2D,CAAA;IAC/D,IAAI,CAAC;QACH,WAAW,GAAI,QAAQ,CAAC,OAAwC,CAAC,WAAW,CAAA;IAC9E,CAAC;IAAC,MAAM,CAAC;QACP,0EAA0E;QAC1E,2EAA2E;QAC3E,gDAAgD;QAChD,OAAM;IACR,CAAC;IACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAM;IACR,CAAC;IACD,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;IACxC,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;AAC3B,CAAC"}
|
|
@@ -46,4 +46,3 @@ export declare function declaredClusterFeatures(deviceType: unknown): Record<str
|
|
|
46
46
|
* starts afresh if they differ.
|
|
47
47
|
*/
|
|
48
48
|
export declare function applyDeclaredClusterFeatures(deviceType: EndpointType, clusterFeatures: Record<string, string[]> | undefined): EndpointType;
|
|
49
|
-
//# sourceMappingURL=clusterFeatures.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterFeatures.js","sourceRoot":"","sources":["../../src/matter/clusterFeatures.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clusterFeatures.js","sourceRoot":"","sources":["../../src/matter/clusterFeatures.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAErC,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAA;AAO9C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uBAAuB,CAAC,iBAA0C;IAChF,OAAO,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;SACrC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC;SAChC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAClE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,UAAmB;IACzD,MAAM,SAAS,GAAI,UAA2E,EAAE,SAAS,CAAA;IACzG,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAChD,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,MAAM,GAA6B,EAAE,CAAA;IAC3C,KAAK,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACvD,MAAM,iBAAiB,GAAG,QAAQ,EAAE,OAAO,EAAE,iBAAiB,IAAI,QAAQ,EAAE,QAAQ,CAAA;QACpF,IAAI,CAAC,iBAAiB,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE,CAAC;YAChE,SAAQ;QACV,CAAC;QACD,MAAM,KAAK,GAAG,uBAAuB,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,CAAA;QAC/D,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,CAAC,EAAE,CAAC,GAAG,KAAK,CAAA;QACpB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;QACnC,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,SAAS,CAAA;AACf,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,4BAA4B,CAAC,UAAwB,EAAE,eAAqD;IAC1H,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,UAAU,CAAA;IACnB,CAAC;IACD,IAAI,MAAM,GAAG,UAGZ,CAAA;IACD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;QAChC,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;QAC3D,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,SAAQ;QACV,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAA;QACtE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,CAAA;QAC5E,IAAI,OAAO,QAAQ,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;YACzC,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,cAAc,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAS,UAAgC,CAAC,IAAI,0BAA0B,CAAC,CAAA;YAC1I,SAAQ;QACV,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAI,MAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAA;QACzD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,cAAc,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAS,UAAgC,CAAC,IAAI,GAAG,EAAE,KAAK,CAAC,CAAA;QAC5H,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|