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
package/dist/cli.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/* global NodeJS */
|
|
2
1
|
import process from 'node:process';
|
|
2
|
+
import { inspect } from 'node:util';
|
|
3
3
|
import { HAPStorage } from '@homebridge/hap-nodejs';
|
|
4
|
-
import { Command } from 'commander';
|
|
4
|
+
import { Command, InvalidArgumentError } from 'commander';
|
|
5
5
|
import { satisfies } from 'semver';
|
|
6
6
|
import { Logger } from './logger.js';
|
|
7
7
|
import { Server } from './server.js';
|
|
@@ -14,6 +14,18 @@ if (requiredNodeVersion && !satisfies(process.version, requiredNodeVersion)) {
|
|
|
14
14
|
log.warn(`Homebridge requires a Node.js version of ${requiredNodeVersion} which does \
|
|
15
15
|
not satisfy the current Node.js version of ${process.version}. You may need to upgrade your installation of Node.js - see https://homebridge.io/w/JTKEF`);
|
|
16
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Read the value of `-P` or `-U`. commander takes the next word as the value
|
|
19
|
+
* even when it is the next option: with an empty variable, `-U $HB_DIR -I`
|
|
20
|
+
* stored everything in a folder called "-I" and dropped `-I`. A path that
|
|
21
|
+
* really starts with a dash can be written as `./-name`.
|
|
22
|
+
*/
|
|
23
|
+
function pathArgument(path) {
|
|
24
|
+
if (path.startsWith('-')) {
|
|
25
|
+
throw new InvalidArgumentError('This looks like the next option, not a path. Give the path, or write a path that starts with a dash as ./-name.');
|
|
26
|
+
}
|
|
27
|
+
return path;
|
|
28
|
+
}
|
|
17
29
|
export default function cli() {
|
|
18
30
|
let insecureAccess = false;
|
|
19
31
|
let hideQRCode = false;
|
|
@@ -25,6 +37,9 @@ export default function cli() {
|
|
|
25
37
|
let forceColourLogging = false;
|
|
26
38
|
let customStoragePath;
|
|
27
39
|
let shuttingDown = false;
|
|
40
|
+
// `-P` and `-U` need a value (`<path>`). With an optional value (`[path]`) a start script that ran
|
|
41
|
+
// `homebridge -U $HB_DIR` with an empty variable was not stopped: Homebridge started with the default
|
|
42
|
+
// storage folder, which may be the wrong one.
|
|
28
43
|
const program = new Command();
|
|
29
44
|
program
|
|
30
45
|
.version(getVersion())
|
|
@@ -32,11 +47,11 @@ export default function cli() {
|
|
|
32
47
|
.option('-C, --color', 'force color in logging', () => forceColourLogging = true)
|
|
33
48
|
.option('-D, --debug', 'turn on debug level logging', () => debugModeEnabled = true)
|
|
34
49
|
.option('-I, --insecure', 'allow unauthenticated requests (for easier hacking)', () => insecureAccess = true)
|
|
35
|
-
.option('-P, --plugin-path
|
|
50
|
+
.option('-P, --plugin-path <path>', 'look for plugins installed at <path> as well as the default locations (<path> can also point to a single plugin)', path => customPluginPath = pathArgument(path))
|
|
36
51
|
.option('-Q, --no-qrcode', 'do not issue QRcode in logging', () => hideQRCode = true)
|
|
37
52
|
.option('-K, --keep-orphans', 'keep cached accessories for which the associated plugin is not loaded', () => keepOrphans = true)
|
|
38
53
|
.option('-T, --no-timestamp', 'do not issue timestamps in logging', () => noLogTimestamps = true)
|
|
39
|
-
.option('-U, --user-storage-path
|
|
54
|
+
.option('-U, --user-storage-path <path>', 'look for homebridge user files at <path> instead of the default location (~/.homebridge)', path => customStoragePath = pathArgument(path))
|
|
40
55
|
.option('--strict-plugin-resolution', 'only load plugins from the --plugin-path if set, otherwise from the primary global node_modules', () => strictPluginResolution = true)
|
|
41
56
|
.parse(process.argv);
|
|
42
57
|
if (noLogTimestamps) {
|
|
@@ -79,10 +94,16 @@ export default function cli() {
|
|
|
79
94
|
};
|
|
80
95
|
process.on('SIGINT', signalHandler.bind(undefined, 'SIGINT', 2));
|
|
81
96
|
process.on('SIGTERM', signalHandler.bind(undefined, 'SIGTERM', 15));
|
|
97
|
+
// Anything can be thrown or rejected with, not only an Error: a text, null,
|
|
98
|
+
// a plain object. Whatever it is, say what stopped Homebridge.
|
|
82
99
|
const errorHandler = (error) => {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
100
|
+
log.error(error instanceof Error
|
|
101
|
+
? (error.stack ?? error.message)
|
|
102
|
+
: `Homebridge is stopping on a thrown value that is not an Error: ${inspect(error)}`);
|
|
103
|
+
// A fatal error is not a clean stop. Without this the process ended with
|
|
104
|
+
// exit code 0 whenever the teardown finished before the force-exit timer,
|
|
105
|
+
// and a supervisor set to restart on failure (docker, systemd) did not.
|
|
106
|
+
process.exitCode = 1;
|
|
86
107
|
if (!shuttingDown) {
|
|
87
108
|
process.kill(process.pid, 'SIGTERM');
|
|
88
109
|
}
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,10 @@ export declare class ExternalPortService {
|
|
|
38
38
|
* @param uuid - Unique identifier for the Matter accessory (can be accessory UUID or other unique string)
|
|
39
39
|
*/
|
|
40
40
|
requestMatterPort(uuid: string): Promise<number | undefined>;
|
|
41
|
+
/**
|
|
42
|
+
* Mark a Matter port as in use, so {@link requestMatterPort} never hands it out.
|
|
43
|
+
*/
|
|
44
|
+
reserveMatterPort(port: number): void;
|
|
41
45
|
/**
|
|
42
46
|
* Release a Matter port previously obtained via {@link requestMatterPort}.
|
|
43
47
|
* Call when an external Matter accessory is unregistered or fails to
|
|
@@ -58,4 +62,3 @@ export declare class ChildBridgeExternalPortService extends ExternalPortService
|
|
|
58
62
|
requestMatterPort(uniqueId: string): Promise<number | undefined>;
|
|
59
63
|
releaseMatterPort(uniqueId: string): boolean;
|
|
60
64
|
}
|
|
61
|
-
//# sourceMappingURL=externalPortService.d.ts.map
|
|
@@ -38,10 +38,11 @@ export class ExternalPortService {
|
|
|
38
38
|
* If the port range has been exhausted it will return undefined.
|
|
39
39
|
*/
|
|
40
40
|
async requestPort(username) {
|
|
41
|
-
// check to see if this device has already requested an external port
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
41
|
+
// check to see if this device has already requested an external port.
|
|
42
|
+
// An answer of "no port" (the pool was used up) is kept too: asking again
|
|
43
|
+
// must not run through the pool, and warn, once more.
|
|
44
|
+
if (this.allocatedPorts.has(username)) {
|
|
45
|
+
return this.allocatedPorts.get(username);
|
|
45
46
|
}
|
|
46
47
|
// get the next unused port
|
|
47
48
|
const port = this.getNextFreePort();
|
|
@@ -57,6 +58,12 @@ export class ExternalPortService {
|
|
|
57
58
|
async requestMatterPort(uuid) {
|
|
58
59
|
return await this.matterPortAllocator.requestPort(uuid);
|
|
59
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Mark a Matter port as in use, so {@link requestMatterPort} never hands it out.
|
|
63
|
+
*/
|
|
64
|
+
reserveMatterPort(port) {
|
|
65
|
+
this.matterPortAllocator.reservePort(port);
|
|
66
|
+
}
|
|
60
67
|
/**
|
|
61
68
|
* Release a Matter port previously obtained via {@link requestMatterPort}.
|
|
62
69
|
* Call when an external Matter accessory is unregistered or fails to
|
|
@@ -70,6 +77,11 @@ export class ExternalPortService {
|
|
|
70
77
|
if (!this.externalPorts) {
|
|
71
78
|
return undefined;
|
|
72
79
|
}
|
|
80
|
+
// Nothing is left once the pool has been walked to its end
|
|
81
|
+
if (this.nextExternalPort !== undefined && this.nextExternalPort > this.externalPorts.end) {
|
|
82
|
+
Logger.internal.warn('External HAP port pool ran out of ports. Falling back to random port assignment.');
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
73
85
|
// Step past any port a bridge is configured to use
|
|
74
86
|
do {
|
|
75
87
|
this.nextExternalPort = this.nextExternalPort === undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"externalPortService.js","sourceRoot":"","sources":["../src/externalPortService.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAA;AAOrE;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,MAAwB;IAChE,OAAO;QACL,MAAM,CAAC,MAAM,CAAC,IAAI;QAClB,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;QAC3D,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC;KAChE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAA;AAC9D,CAAC;AAED;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IAOpB;IANF,gBAAgB,CAAS;IACzB,cAAc,GAAwC,IAAI,GAAG,EAAE,CAAA;IACtD,mBAAmB,CAAqB;IACxC,kBAAkB,CAAa;IAEhD,YACU,aAA0C,EAClD,WAAwC,EACxC,qBAAgC,EAChC,kBAA6B;QAHrB,kBAAa,GAAb,aAAa,CAA6B;QAKlD,6EAA6E;QAC7E,IAAI,CAAC,kBAAkB,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAA;QAErD,2DAA2D;QAC3D,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAA;IACxF,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,WAAW,CAAC,QAAoB;QAC3C,
|
|
1
|
+
{"version":3,"file":"externalPortService.js","sourceRoot":"","sources":["../src/externalPortService.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import type { API } from './api.js';
|
|
1
2
|
/**
|
|
2
|
-
*
|
|
3
|
+
* The type of `api.hap`: everything HAP-NodeJS exports.
|
|
3
4
|
*/
|
|
4
|
-
import type { API } from './api.js';
|
|
5
5
|
export type HAP = API['hap'];
|
|
6
6
|
/**
|
|
7
7
|
* Export types for basically everything but the actual API implementation
|
|
@@ -31,6 +31,13 @@ export type { Logger, Logging } from './logger.js';
|
|
|
31
31
|
* ═══════════════════════════════════════════════════════════════════════
|
|
32
32
|
* Matter Protocol - Plugin API Exports
|
|
33
33
|
* ═══════════════════════════════════════════════════════════════════════
|
|
34
|
+
*
|
|
35
|
+
* ⚠️ The Matter VALUES exported below (`MatterStatus`, `clusters`, `devices`,
|
|
36
|
+
* `deviceTypes`, `clusterNames`, the Matter error classes and enums) are
|
|
37
|
+
* deprecated on this entry. Because of them, importing any value from
|
|
38
|
+
* `'homebridge'` loads all of matter.js. Take them from `'homebridge/matter'`
|
|
39
|
+
* (see `src/matterExports.ts`) or, better, from `api.matter`. They will be
|
|
40
|
+
* removed from this entry in a later release; the types stay.
|
|
34
41
|
*/
|
|
35
42
|
/**
|
|
36
43
|
* Matter cache types
|
|
@@ -39,7 +46,7 @@ export type { SerializedMatterAccessory } from './matter/accessoryCache.js';
|
|
|
39
46
|
/**
|
|
40
47
|
* Matter cluster handler types for type-safe handler definitions
|
|
41
48
|
*/
|
|
42
|
-
export type { ClusterHandlerMap, ColorControlHandlers, DoorLockHandlers, FanControlHandlers, IdentifyHandlers, LevelControlHandlers, OnOffHandlers, RvcCleanModeHandlers, RvcOperationalStateHandlers, RvcRunModeHandlers, ServiceAreaHandlers, ThermostatHandlers, WindowCoveringHandlers, } from './matter/clusterHandlerMap.js';
|
|
49
|
+
export type { ClosureControlHandlers, ClusterHandlerMap, ColorControlHandlers, DeviceEnergyManagementHandlers, DeviceEnergyManagementModeHandlers, DoorLockHandlers, EnergyEvseHandlers, EnergyEvseModeHandlers, FanControlHandlers, IdentifyHandlers, KeypadInputHandlers, LevelControlHandlers, MatterModeChangeHandler, MatterPlaybackHandler, MatterResponseHandler, MediaPlaybackHandlers, OnOffHandlers, RvcCleanModeHandlers, RvcOperationalStateHandlers, RvcRunModeHandlers, ServiceAreaHandlers, ThermostatHandlers, ValveConfigurationAndControlHandlers, WaterHeaterManagementHandlers, WaterHeaterModeHandlers, WindowCoveringHandlers, } from './matter/clusterHandlerMap.js';
|
|
43
50
|
/**
|
|
44
51
|
* Matter cluster state map for type-safe state access
|
|
45
52
|
*/
|
|
@@ -47,7 +54,7 @@ export type { ClusterStateMap } from './matter/clusterStateMap.js';
|
|
|
47
54
|
/**
|
|
48
55
|
* Matter cluster state types (per-cluster attribute interfaces)
|
|
49
56
|
*/
|
|
50
|
-
export type { ColorControlState, DoorLockState, FanControlState, LevelControlState, OnOffState, RvcCleanModeState, RvcOperationalState, RvcRunModeState, ServiceAreaState, ThermostatState, WindowCoveringState, } from './matter/clusterTypes.js';
|
|
57
|
+
export type { ClosureControlState, ColorControlState, DeviceEnergyManagementState, DoorLockState, ElectricalEnergyMeasurementState, ElectricalPowerMeasurementState, EnergyEvseState, EnergyMeasurementStruct, EnergyModeState, FanControlState, LevelControlState, MeasurementAccuracyRangeStruct, MeasurementAccuracyStruct, MediaPlaybackState, MeterIdentificationState, OnOffState, PowerSourceState, PumpConfigurationAndControlState, RvcCleanModeState, RvcOperationalState, RvcOperationalStateState, RvcRunModeState, ServiceAreaState, SmokeCoAlarmState, ThermostatState, ValveConfigurationAndControlState, WaterHeaterManagementState, WaterHeaterModeState, WindowCoveringState, } from './matter/clusterTypes.js';
|
|
51
58
|
/**
|
|
52
59
|
* Matter cluster command request types namespace for type-safe handlers
|
|
53
60
|
* @example
|
|
@@ -99,10 +106,10 @@ export type { SwitchAPI } from './matter/SwitchAPI.js';
|
|
|
99
106
|
/**
|
|
100
107
|
* Matter accessory and configuration types
|
|
101
108
|
*/
|
|
102
|
-
export type { MatterAccessory, MatterClusterHandlers, MatterClusterName, MatterCommandHandler, MatterConfig, } from './matter/types.js';
|
|
109
|
+
export type { MatterAccessory, MatterAccessoryEventEmitter, MatterAccessoryFeatures, MatterAccessoryPart, MatterClusterHandlers, MatterClusterName, MatterCommandHandler, MatterConfig, MatterHandlerContext, } from './matter/types.js';
|
|
103
110
|
/**
|
|
104
111
|
* ═══════════════════════════════════════════════════════════════════════
|
|
105
|
-
* Matter Protocol -
|
|
112
|
+
* Matter Protocol - device types, clusters and errors (values)
|
|
106
113
|
* ═══════════════════════════════════════════════════════════════════════
|
|
107
114
|
*/
|
|
108
115
|
/**
|
|
@@ -132,9 +139,21 @@ export type { HomebridgeOptions } from './server.js';
|
|
|
132
139
|
*/
|
|
133
140
|
export type { User } from './user.js';
|
|
134
141
|
/**
|
|
135
|
-
* Export the
|
|
136
|
-
*
|
|
137
|
-
*
|
|
142
|
+
* Export the enums from hap-nodejs.
|
|
143
|
+
*
|
|
144
|
+
* These are value exports. What a plugin's build does with `import { Categories } from 'homebridge'`
|
|
145
|
+
* depends on the HAP-NodeJS version Homebridge is built against and on the plugin's compiler set-up:
|
|
146
|
+
*
|
|
147
|
+
* - While HAP-NodeJS declares them as `const enum`, plain `tsc` replaces `Categories.LIGHTBULB` with
|
|
148
|
+
* its value at compile time and drops the import, so the plugin does not load `homebridge` at run time.
|
|
149
|
+
* - Once HAP-NodeJS declares them as normal enums (its next release does), and already today with
|
|
150
|
+
* `isolatedModules` or `verbatimModuleSyntax` or in plain JavaScript, the import stays in the
|
|
151
|
+
* plugin's code. The plugin then loads the `homebridge` package at run time. That needs `homebridge`
|
|
152
|
+
* to be found from the plugin's folder (it is not on every install), and it loads everything this
|
|
153
|
+
* entry exports, including matter.js.
|
|
154
|
+
*
|
|
155
|
+
* To stay clear of both, read the enums from the API object, which needs no import:
|
|
156
|
+
* `api.hap.Categories.LIGHTBULB`, `api.hap.HAPStatus`, `api.hap.Perms` and so on.
|
|
138
157
|
*/
|
|
139
158
|
export { Access, AccessControlEvent, AccessLevel, AccessoryEventTypes, AdaptiveLightingControllerEvents, AdaptiveLightingControllerMode, AudioBitrate, AudioCodecTypes, AudioRecordingCodecType, AudioRecordingSamplerate, AudioSamplerate, AudioStreamingCodecType, AudioStreamingSamplerate, ButtonState, ButtonType, CameraControllerEvents, Categories, ChangeReason, CharacteristicEventTypes, DataFormatTags, DataStreamConnectionEvent, DataStreamServerEvent, DataStreamStatus, DefaultControllerType, EventTriggerOption, Formats, H264Level, H264Profile, HAPServerEventTypes, HAPStatus, HDSProtocolSpecificErrorReason, HDSStatus, MediaContainerType, PacketDataType, Perms, Protocols, RemoteControllerEvents, ResourceRequestReason, ServiceEventTypes, SiriAudioSessionEvents, SRTPCryptoSuites, StreamRequestTypes, TargetCategory, TargetUpdates, Topics, Units, } from '@homebridge/hap-nodejs';
|
|
140
159
|
/**
|
|
@@ -161,4 +180,11 @@ export type { LegacyTypes, uuid } from '@homebridge/hap-nodejs';
|
|
|
161
180
|
* Export HAP-NodeJS functions as type only
|
|
162
181
|
*/
|
|
163
182
|
export type { clone, decode, decodeList, decodeWithLists, encode, epochMillisFromMillisSince2001_01_01, epochMillisFromMillisSince2001_01_01Buffer, once, } from '@homebridge/hap-nodejs';
|
|
164
|
-
|
|
183
|
+
/**
|
|
184
|
+
* More enums from HAP-NodeJS (value exports, like the list above: prefer `api.hap.<name>` at run time)
|
|
185
|
+
*/
|
|
186
|
+
export { CharacteristicWarningType, EventedHTTPServerEvent, HAPConnectionEvent, HAPConnectionState, HAPHTTPCode, HAPPairingHTTPCode, HDSConnectionErrorType, MDNSAdvertiser, MessageType, PermissionTypes, ResourceRequestType, TLVErrorCode, VideoCodecPacketizationMode, VideoCodecType, } from '@homebridge/hap-nodejs';
|
|
187
|
+
/**
|
|
188
|
+
* More HAP-NodeJS classes, interfaces and type aliases, as type only
|
|
189
|
+
*/
|
|
190
|
+
export type { Accessory, AdaptiveLightingControllerUpdate, Bridge, CameraControllerServiceMap, CameraControllerState, CameraStreamingOptionsBase, CharacteristicContext, CharacteristicWarning, ControllerIdentifier, DataStreamMessage, HAPConnection, HAPUsername, HDSConnectionError, HDSFrame, PrepareSessionCallback, RemoteControllerServiceMap, SerializedControllerState, UUID, } from '@homebridge/hap-nodejs';
|
package/dist/index.js
CHANGED
|
@@ -35,7 +35,7 @@ export { MatterStatus } from './matter/index.js';
|
|
|
35
35
|
export { ChildMatterMessageType, MatterBridgeStatus } from './matter/sharedTypes.js';
|
|
36
36
|
/**
|
|
37
37
|
* ═══════════════════════════════════════════════════════════════════════
|
|
38
|
-
* Matter Protocol -
|
|
38
|
+
* Matter Protocol - device types, clusters and errors (values)
|
|
39
39
|
* ═══════════════════════════════════════════════════════════════════════
|
|
40
40
|
*/
|
|
41
41
|
/**
|
|
@@ -52,9 +52,25 @@ export { MatterCommissioningError, MatterDeviceError, MatterError, MatterErrorTy
|
|
|
52
52
|
*/
|
|
53
53
|
export { PlatformAccessoryEvent } from './platformAccessory.js';
|
|
54
54
|
/**
|
|
55
|
-
* Export the
|
|
56
|
-
*
|
|
57
|
-
*
|
|
55
|
+
* Export the enums from hap-nodejs.
|
|
56
|
+
*
|
|
57
|
+
* These are value exports. What a plugin's build does with `import { Categories } from 'homebridge'`
|
|
58
|
+
* depends on the HAP-NodeJS version Homebridge is built against and on the plugin's compiler set-up:
|
|
59
|
+
*
|
|
60
|
+
* - While HAP-NodeJS declares them as `const enum`, plain `tsc` replaces `Categories.LIGHTBULB` with
|
|
61
|
+
* its value at compile time and drops the import, so the plugin does not load `homebridge` at run time.
|
|
62
|
+
* - Once HAP-NodeJS declares them as normal enums (its next release does), and already today with
|
|
63
|
+
* `isolatedModules` or `verbatimModuleSyntax` or in plain JavaScript, the import stays in the
|
|
64
|
+
* plugin's code. The plugin then loads the `homebridge` package at run time. That needs `homebridge`
|
|
65
|
+
* to be found from the plugin's folder (it is not on every install), and it loads everything this
|
|
66
|
+
* entry exports, including matter.js.
|
|
67
|
+
*
|
|
68
|
+
* To stay clear of both, read the enums from the API object, which needs no import:
|
|
69
|
+
* `api.hap.Categories.LIGHTBULB`, `api.hap.HAPStatus`, `api.hap.Perms` and so on.
|
|
58
70
|
*/
|
|
59
71
|
export { Access, AccessControlEvent, AccessLevel, AccessoryEventTypes, AdaptiveLightingControllerEvents, AdaptiveLightingControllerMode, AudioBitrate, AudioCodecTypes, AudioRecordingCodecType, AudioRecordingSamplerate, AudioSamplerate, AudioStreamingCodecType, AudioStreamingSamplerate, ButtonState, ButtonType, CameraControllerEvents, Categories, ChangeReason, CharacteristicEventTypes, DataFormatTags, DataStreamConnectionEvent, DataStreamServerEvent, DataStreamStatus, DefaultControllerType, EventTriggerOption, Formats, H264Level, H264Profile, HAPServerEventTypes, HAPStatus, HDSProtocolSpecificErrorReason, HDSStatus, MediaContainerType, PacketDataType, Perms, Protocols, RemoteControllerEvents, ResourceRequestReason, ServiceEventTypes, SiriAudioSessionEvents, SRTPCryptoSuites, StreamRequestTypes, TargetCategory, TargetUpdates, Topics, Units, } from '@homebridge/hap-nodejs';
|
|
72
|
+
/**
|
|
73
|
+
* More enums from HAP-NodeJS (value exports, like the list above: prefer `api.hap.<name>` at run time)
|
|
74
|
+
*/
|
|
75
|
+
export { CharacteristicWarningType, EventedHTTPServerEvent, HAPConnectionEvent, HAPConnectionState, HAPHTTPCode, HAPPairingHTTPCode, HDSConnectionErrorType, MDNSAdvertiser, MessageType, PermissionTypes, ResourceRequestType, TLVErrorCode, VideoCodecPacketizationMode, VideoCodecType, } from '@homebridge/hap-nodejs';
|
|
60
76
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA8BA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAiB/C;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA8BA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAiB/C;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAkHtC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAUhD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAsBpF;;;;GAIG;AAEH;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAE3G;;GAEG;AACH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,mBAAmB,CAAA;AAI1B;;GAEG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAiB/D;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EACL,MAAM,EACN,kBAAkB,EAClB,WAAW,EACX,mBAAmB,EACnB,gCAAgC,EAChC,8BAA8B,EAC9B,YAAY,EACZ,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,eAAe,EACf,uBAAuB,EACvB,wBAAwB,EACxB,WAAW,EACX,UAAU,EACV,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,wBAAwB,EACxB,cAAc,EACd,yBAAyB,EACzB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,OAAO,EACP,SAAS,EACT,WAAW,EACX,mBAAmB,EACnB,SAAS,EACT,8BAA8B,EAC9B,SAAS,EACT,kBAAkB,EAClB,cAAc,EACd,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,MAAM,EACN,KAAK,GACN,MAAM,wBAAwB,CAAA;AA8K/B;;GAEG;AACH,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,2BAA2B,EAC3B,cAAc,GACf,MAAM,wBAAwB,CAAA"}
|
package/dist/ipcService.d.ts
CHANGED
|
@@ -17,23 +17,39 @@ export declare const enum IpcOutgoingEvent {
|
|
|
17
17
|
CHILD_BRIDGE_STATUS_UPDATE = "childBridgeStatusUpdate",
|
|
18
18
|
MATTER_EVENT = "matterEvent"
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
interface MatterControlRequest {
|
|
21
|
+
uuid: string;
|
|
22
|
+
cluster: string;
|
|
23
|
+
attributes: Record<string, unknown>;
|
|
24
|
+
partId?: string;
|
|
25
|
+
correlationId?: string;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* The requests the parent process can send, each with the listener it takes.
|
|
29
|
+
*/
|
|
30
|
+
interface IpcIncomingListeners {
|
|
31
|
+
[IpcIncomingEvent.RESTART_CHILD_BRIDGE]: (childBridgeUsername: string) => void;
|
|
32
|
+
[IpcIncomingEvent.STOP_CHILD_BRIDGE]: (childBridgeUsername: string) => void;
|
|
33
|
+
[IpcIncomingEvent.START_CHILD_BRIDGE]: (childBridgeUsername: string) => void;
|
|
34
|
+
[IpcIncomingEvent.CHILD_BRIDGE_METADATA_REQUEST]: () => void;
|
|
35
|
+
[IpcIncomingEvent.START_MATTER_MONITORING]: (data?: {
|
|
22
36
|
correlationId?: string;
|
|
23
|
-
}) => void
|
|
37
|
+
}) => void;
|
|
38
|
+
[IpcIncomingEvent.STOP_MATTER_MONITORING]: (data?: {
|
|
24
39
|
correlationId?: string;
|
|
25
|
-
}) => void
|
|
40
|
+
}) => void;
|
|
41
|
+
[IpcIncomingEvent.GET_MATTER_ACCESSORIES]: (data: {
|
|
26
42
|
bridgeUsername?: string;
|
|
27
43
|
correlationId?: string;
|
|
28
|
-
}) => void
|
|
29
|
-
|
|
30
|
-
}) => void) => this) & ((event: IpcIncomingEvent.MATTER_ACCESSORY_CONTROL, listener: (data: {
|
|
44
|
+
}) => void;
|
|
45
|
+
[IpcIncomingEvent.GET_MATTER_ACCESSORY_INFO]: (data: {
|
|
31
46
|
uuid: string;
|
|
32
|
-
cluster: string;
|
|
33
|
-
attributes: Record<string, unknown>;
|
|
34
|
-
partId?: string;
|
|
35
47
|
correlationId?: string;
|
|
36
|
-
}) => void
|
|
48
|
+
}) => void;
|
|
49
|
+
[IpcIncomingEvent.MATTER_ACCESSORY_CONTROL]: (data: MatterControlRequest) => void;
|
|
50
|
+
}
|
|
51
|
+
export declare interface IpcService {
|
|
52
|
+
on: <E extends keyof IpcIncomingListeners>(event: E, listener: IpcIncomingListeners[E]) => this;
|
|
37
53
|
}
|
|
38
54
|
export declare class IpcService extends EventEmitter {
|
|
39
55
|
private readonly messageHandler;
|
|
@@ -54,4 +70,3 @@ export declare class IpcService extends EventEmitter {
|
|
|
54
70
|
*/
|
|
55
71
|
sendMessage(id: IpcOutgoingEvent, data: unknown): void;
|
|
56
72
|
}
|
|
57
|
-
//# sourceMappingURL=ipcService.d.ts.map
|
package/dist/ipcService.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
2
|
import process from 'node:process';
|
|
3
|
+
import { sendToParent } from './util/ipc.js';
|
|
3
4
|
// eslint-disable-next-line no-restricted-syntax
|
|
4
5
|
export var IpcIncomingEvent;
|
|
5
6
|
(function (IpcIncomingEvent) {
|
|
@@ -21,12 +22,29 @@ export var IpcOutgoingEvent;
|
|
|
21
22
|
IpcOutgoingEvent["CHILD_BRIDGE_STATUS_UPDATE"] = "childBridgeStatusUpdate";
|
|
22
23
|
IpcOutgoingEvent["MATTER_EVENT"] = "matterEvent";
|
|
23
24
|
})(IpcOutgoingEvent || (IpcOutgoingEvent = {}));
|
|
25
|
+
const INCOMING_EVENTS = new Set([
|
|
26
|
+
"restartChildBridge" /* IpcIncomingEvent.RESTART_CHILD_BRIDGE */,
|
|
27
|
+
"stopChildBridge" /* IpcIncomingEvent.STOP_CHILD_BRIDGE */,
|
|
28
|
+
"startChildBridge" /* IpcIncomingEvent.START_CHILD_BRIDGE */,
|
|
29
|
+
"childBridgeMetadataRequest" /* IpcIncomingEvent.CHILD_BRIDGE_METADATA_REQUEST */,
|
|
30
|
+
"startMatterMonitoring" /* IpcIncomingEvent.START_MATTER_MONITORING */,
|
|
31
|
+
"stopMatterMonitoring" /* IpcIncomingEvent.STOP_MATTER_MONITORING */,
|
|
32
|
+
"getMatterAccessories" /* IpcIncomingEvent.GET_MATTER_ACCESSORIES */,
|
|
33
|
+
"getMatterAccessoryInfo" /* IpcIncomingEvent.GET_MATTER_ACCESSORY_INFO */,
|
|
34
|
+
"matterAccessoryControl" /* IpcIncomingEvent.MATTER_ACCESSORY_CONTROL */,
|
|
35
|
+
]);
|
|
24
36
|
// eslint-disable-next-line ts/no-unsafe-declaration-merging
|
|
25
37
|
export class IpcService extends EventEmitter {
|
|
26
38
|
messageHandler = (message) => {
|
|
27
39
|
if (!message || typeof message !== 'object' || !message.id) {
|
|
28
40
|
return;
|
|
29
41
|
}
|
|
42
|
+
// Only the requests above are passed on. The id used to be emitted as it
|
|
43
|
+
// came: a message with the id `error` is an `error` event with no
|
|
44
|
+
// listener, which throws and takes Homebridge down.
|
|
45
|
+
if (!INCOMING_EVENTS.has(message.id)) {
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
30
48
|
this.emit(message.id, message.data);
|
|
31
49
|
};
|
|
32
50
|
constructor() {
|
|
@@ -55,12 +73,7 @@ export class IpcService extends EventEmitter {
|
|
|
55
73
|
* from another Node.js process (such as hb-service).
|
|
56
74
|
*/
|
|
57
75
|
sendMessage(id, data) {
|
|
58
|
-
|
|
59
|
-
process.send({
|
|
60
|
-
id,
|
|
61
|
-
data,
|
|
62
|
-
});
|
|
63
|
-
}
|
|
76
|
+
sendToParent({ id, data });
|
|
64
77
|
}
|
|
65
78
|
}
|
|
66
79
|
//# sourceMappingURL=ipcService.js.map
|
package/dist/ipcService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipcService.js","sourceRoot":"","sources":["../src/ipcService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,OAAO,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"ipcService.js","sourceRoot":"","sources":["../src/ipcService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,OAAO,MAAM,cAAc,CAAA;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAK5C,gDAAgD;AAChD,MAAM,CAAN,IAAkB,gBAUjB;AAVD,WAAkB,gBAAgB;IAChC,+DAA2C,CAAA;IAC3C,yDAAqC,CAAA;IACrC,2DAAuC,CAAA;IACvC,gFAA4D,CAAA;IAC5D,qEAAiD,CAAA;IACjD,mEAA+C,CAAA;IAC/C,mEAA+C,CAAA;IAC/C,wEAAoD,CAAA;IACpD,uEAAmD,CAAA;AACrD,CAAC,EAViB,gBAAgB,KAAhB,gBAAgB,QAUjC;AAED,gDAAgD;AAChD,MAAM,CAAN,IAAkB,gBAKjB;AALD,WAAkB,gBAAgB;IAChC,+DAA2C,CAAA;IAC3C,kFAA8D,CAAA;IAC9D,0EAAsD,CAAA;IACtD,gDAA4B,CAAA;AAC9B,CAAC,EALiB,gBAAgB,KAAhB,gBAAgB,QAKjC;AAyBD,MAAM,eAAe,GAAwB,IAAI,GAAG,CAA6B;;;;;;;;;;CAUhF,CAAC,CAAA;AAOF,4DAA4D;AAC5D,MAAM,OAAO,UAAW,SAAQ,YAAY;IACzB,cAAc,GAAG,CAAC,OAAsC,EAAE,EAAE;QAC3E,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAC3D,OAAM;QACR,CAAC;QACD,yEAAyE;QACzE,kEAAkE;QAClE,oDAAoD;QACpD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;YACrC,OAAM;QACR,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC,CAAA;IAED;QACE,KAAK,EAAE,CAAA;IACT,CAAC;IAED;;;OAGG;IACI,KAAK;QACV,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC5C,CAAC;IAED;;OAEG;IACI,IAAI;QACT,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;QACtD,yEAAyE;QACzE,0EAA0E;QAC1E,oEAAoE;QACpE,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC3B,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,EAAoB,EAAE,IAAa;QACpD,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5B,CAAC;CACF"}
|
package/dist/logger.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Log levels to indicate importance of the logged message.
|
|
3
|
-
* Every level
|
|
3
|
+
* Every level gives the message a certain color (the timestamp is always white and the prefix cyan).
|
|
4
4
|
*
|
|
5
5
|
* - INFO: no color
|
|
6
6
|
* - SUCCESS: green
|
|
@@ -9,6 +9,13 @@
|
|
|
9
9
|
* - DEBUG: gray
|
|
10
10
|
*
|
|
11
11
|
* Messages with DEBUG level are only displayed if explicitly enabled.
|
|
12
|
+
*
|
|
13
|
+
* This is a `const enum`. A plugin built with plain `tsc` gets the value written into its code at
|
|
14
|
+
* compile time. A plugin built with `isolatedModules` or `verbatimModuleSyntax` (esbuild, tsx, swc,
|
|
15
|
+
* Vite) can not use it: TypeScript reports TS2748 ("Cannot access ambient const enums"). Call the
|
|
16
|
+
* method of the level instead: `log.info(...)`, `log.warn(...)`, `log.error(...)`, `log.debug(...)`.
|
|
17
|
+
* It stays a `const enum` for now: as a normal enum, every plugin built with plain `tsc` would start
|
|
18
|
+
* to import the `homebridge` package at run time.
|
|
12
19
|
*/
|
|
13
20
|
export declare const enum LogLevel {
|
|
14
21
|
INFO = "info",
|
|
@@ -77,8 +84,7 @@ export declare class Logger {
|
|
|
77
84
|
log(level: LogLevel, message: string, ...parameters: any[]): void;
|
|
78
85
|
}
|
|
79
86
|
/**
|
|
80
|
-
*
|
|
81
|
-
* @param prefix
|
|
87
|
+
* The prefix as it is written in front of a log message: in square brackets, in cyan.
|
|
88
|
+
* @param prefix - the name of the plugin, accessory or Homebridge part that logs
|
|
82
89
|
*/
|
|
83
90
|
export declare function getLogPrefix(prefix: string): string;
|
|
84
|
-
//# sourceMappingURL=logger.d.ts.map
|
package/dist/logger.js
CHANGED
|
@@ -2,7 +2,7 @@ import util from 'node:util';
|
|
|
2
2
|
import chalk from 'chalk';
|
|
3
3
|
/**
|
|
4
4
|
* Log levels to indicate importance of the logged message.
|
|
5
|
-
* Every level
|
|
5
|
+
* Every level gives the message a certain color (the timestamp is always white and the prefix cyan).
|
|
6
6
|
*
|
|
7
7
|
* - INFO: no color
|
|
8
8
|
* - SUCCESS: green
|
|
@@ -11,6 +11,13 @@ import chalk from 'chalk';
|
|
|
11
11
|
* - DEBUG: gray
|
|
12
12
|
*
|
|
13
13
|
* Messages with DEBUG level are only displayed if explicitly enabled.
|
|
14
|
+
*
|
|
15
|
+
* This is a `const enum`. A plugin built with plain `tsc` gets the value written into its code at
|
|
16
|
+
* compile time. A plugin built with `isolatedModules` or `verbatimModuleSyntax` (esbuild, tsx, swc,
|
|
17
|
+
* Vite) can not use it: TypeScript reports TS2748 ("Cannot access ambient const enums"). Call the
|
|
18
|
+
* method of the level instead: `log.info(...)`, `log.warn(...)`, `log.error(...)`, `log.debug(...)`.
|
|
19
|
+
* It stays a `const enum` for now: as a normal enum, every plugin built with plain `tsc` would start
|
|
20
|
+
* to import the `homebridge` package at run time.
|
|
14
21
|
*/
|
|
15
22
|
// eslint-disable-next-line no-restricted-syntax
|
|
16
23
|
export var LogLevel;
|
|
@@ -45,16 +52,20 @@ export class Logger {
|
|
|
45
52
|
}
|
|
46
53
|
else {
|
|
47
54
|
const logger = new Logger(prefix);
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
log.
|
|
51
|
-
log.
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
55
|
+
// The device is a function (INFO logging) that also carries a method for each level.
|
|
56
|
+
// Every method is bound to the device, so it still works when a plugin passes it around
|
|
57
|
+
// on its own (`promise.catch(log.error)`, `emitter.on('error', log.warn)`, `const { debug } = log`).
|
|
58
|
+
// The device itself is the `this`, as it is for `log.info('x')`, so `log.prefix` stays the prefix in use.
|
|
59
|
+
const device = logger.info.bind(logger);
|
|
60
|
+
const logging = Object.assign(device, {
|
|
61
|
+
prefix,
|
|
62
|
+
info: logger.info.bind(device),
|
|
63
|
+
success: logger.success.bind(device),
|
|
64
|
+
warn: logger.warn.bind(device),
|
|
65
|
+
error: logger.error.bind(device),
|
|
66
|
+
debug: logger.debug.bind(device),
|
|
67
|
+
log: logger.log.bind(device),
|
|
68
|
+
});
|
|
58
69
|
Logger.loggerCache.set(prefix, logging);
|
|
59
70
|
return logging;
|
|
60
71
|
}
|
|
@@ -87,7 +98,9 @@ export class Logger {
|
|
|
87
98
|
* Forces color in logging output, even if it seems like color is unsupported.
|
|
88
99
|
*/
|
|
89
100
|
static forceColor() {
|
|
90
|
-
|
|
101
|
+
// `1` is basic 16 colour support, which is all Homebridge uses. Never lower a level that is
|
|
102
|
+
// already higher: on a terminal with 256 or true colour, a plugin that uses chalk keeps it.
|
|
103
|
+
chalk.level = Math.max(chalk.level, 1);
|
|
91
104
|
}
|
|
92
105
|
info(message, ...parameters) {
|
|
93
106
|
this.log("info" /* LogLevel.INFO */, message, ...parameters);
|
|
@@ -137,8 +150,8 @@ export class Logger {
|
|
|
137
150
|
}
|
|
138
151
|
}
|
|
139
152
|
/**
|
|
140
|
-
*
|
|
141
|
-
* @param prefix
|
|
153
|
+
* The prefix as it is written in front of a log message: in square brackets, in cyan.
|
|
154
|
+
* @param prefix - the name of the plugin, accessory or Homebridge part that logs
|
|
142
155
|
*/
|
|
143
156
|
export function getLogPrefix(prefix) {
|
|
144
157
|
return chalk.cyan(`[${prefix}]`);
|
package/dist/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"}
|