homebridge-securitysystem 0.0.1-matter
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/.gitattributes +1 -0
- package/.github/ISSUE_TEMPLATE/bug_report.yml +46 -0
- package/.github/ISSUE_TEMPLATE/feature-request.yml +17 -0
- package/.github/ISSUE_TEMPLATE/questions-answers.yml +40 -0
- package/.github/demo.jpg +0 -0
- package/.github/dependabot.yml +19 -0
- package/.github/release.yml +36 -0
- package/.github/workflows/build-package.yml +49 -0
- package/.github/workflows/bump-version.yml +59 -0
- package/.github/workflows/dependency-review.yml +26 -0
- package/.github/workflows/publish.yml +155 -0
- package/.github/workflows/stale-activity.yml +27 -0
- package/AGENTS.md +247 -0
- package/CHANGELOG.md +572 -0
- package/CODE_OF_CONDUCT.md +128 -0
- package/CONTRIBUTING.md +5 -0
- package/LICENSE +21 -0
- package/README.md +47 -0
- package/SECURITY.md +12 -0
- package/config.schema.json +934 -0
- package/dist/conditions/already-triggered-condition.d.ts +10 -0
- package/dist/conditions/already-triggered-condition.js +22 -0
- package/dist/conditions/already-triggered-condition.js.map +1 -0
- package/dist/conditions/arming-in-progress-condition.d.ts +10 -0
- package/dist/conditions/arming-in-progress-condition.js +21 -0
- package/dist/conditions/arming-in-progress-condition.js.map +1 -0
- package/dist/conditions/arming-lock-condition.d.ts +10 -0
- package/dist/conditions/arming-lock-condition.js +43 -0
- package/dist/conditions/arming-lock-condition.js.map +1 -0
- package/dist/conditions/condition.d.ts +22 -0
- package/dist/conditions/condition.js +19 -0
- package/dist/conditions/condition.js.map +1 -0
- package/dist/conditions/double-knock-condition.d.ts +24 -0
- package/dist/conditions/double-knock-condition.js +73 -0
- package/dist/conditions/double-knock-condition.js.map +1 -0
- package/dist/conditions/not-armed-condition.d.ts +10 -0
- package/dist/conditions/not-armed-condition.js +26 -0
- package/dist/conditions/not-armed-condition.js.map +1 -0
- package/dist/conditions/trigger-already-running-condition.d.ts +10 -0
- package/dist/conditions/trigger-already-running-condition.js +21 -0
- package/dist/conditions/trigger-already-running-condition.js.map +1 -0
- package/dist/constants/default-constant.d.ts +24 -0
- package/dist/constants/default-constant.js +27 -0
- package/dist/constants/default-constant.js.map +1 -0
- package/dist/constants/homekit-constant.d.ts +2 -0
- package/dist/constants/homekit-constant.js +3 -0
- package/dist/constants/homekit-constant.js.map +1 -0
- package/dist/constants/matter-constant.d.ts +21 -0
- package/dist/constants/matter-constant.js +61 -0
- package/dist/constants/matter-constant.js.map +1 -0
- package/dist/handlers/sensor-handler.d.ts +24 -0
- package/dist/handlers/sensor-handler.js +63 -0
- package/dist/handlers/sensor-handler.js.map +1 -0
- package/dist/handlers/state-handler.d.ts +49 -0
- package/dist/handlers/state-handler.js +204 -0
- package/dist/handlers/state-handler.js.map +1 -0
- package/dist/handlers/switch-handler.d.ts +28 -0
- package/dist/handlers/switch-handler.js +95 -0
- package/dist/handlers/switch-handler.js.map +1 -0
- package/dist/handlers/trip-handler.d.ts +44 -0
- package/dist/handlers/trip-handler.js +156 -0
- package/dist/handlers/trip-handler.js.map +1 -0
- package/dist/homekit/homekit-registrar.d.ts +12 -0
- package/dist/homekit/homekit-registrar.js +23 -0
- package/dist/homekit/homekit-registrar.js.map +1 -0
- package/dist/homekit/service-factory.d.ts +12 -0
- package/dist/homekit/service-factory.js +24 -0
- package/dist/homekit/service-factory.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.js +7 -0
- package/dist/index.js.map +1 -0
- package/dist/interfaces/condition-context-interface.d.ts +14 -0
- package/dist/interfaces/condition-context-interface.js +2 -0
- package/dist/interfaces/condition-context-interface.js.map +1 -0
- package/dist/interfaces/hap-types-interface.d.ts +9 -0
- package/dist/interfaces/hap-types-interface.js +2 -0
- package/dist/interfaces/hap-types-interface.js.map +1 -0
- package/dist/interfaces/mqtt-status-payload-interface.d.ts +6 -0
- package/dist/interfaces/mqtt-status-payload-interface.js +2 -0
- package/dist/interfaces/mqtt-status-payload-interface.js.map +1 -0
- package/dist/interfaces/options-interface.d.ts +87 -0
- package/dist/interfaces/options-interface.js +2 -0
- package/dist/interfaces/options-interface.js.map +1 -0
- package/dist/interfaces/persisted-state-interface.d.ts +6 -0
- package/dist/interfaces/persisted-state-interface.js +2 -0
- package/dist/interfaces/persisted-state-interface.js.map +1 -0
- package/dist/interfaces/service-registry-interface.d.ts +10 -0
- package/dist/interfaces/service-registry-interface.js +2 -0
- package/dist/interfaces/service-registry-interface.js.map +1 -0
- package/dist/interfaces/system-state-interface.d.ts +22 -0
- package/dist/interfaces/system-state-interface.js +2 -0
- package/dist/interfaces/system-state-interface.js.map +1 -0
- package/dist/schemas/arming-lock-schema.d.ts +10 -0
- package/dist/schemas/arming-lock-schema.js +12 -0
- package/dist/schemas/arming-lock-schema.js.map +1 -0
- package/dist/schemas/error-schema.d.ts +4 -0
- package/dist/schemas/error-schema.js +7 -0
- package/dist/schemas/error-schema.js.map +1 -0
- package/dist/schemas/mode-request-schema.d.ts +10 -0
- package/dist/schemas/mode-request-schema.js +18 -0
- package/dist/schemas/mode-request-schema.js.map +1 -0
- package/dist/schemas/status-response-schema.d.ts +7 -0
- package/dist/schemas/status-response-schema.js +10 -0
- package/dist/schemas/status-response-schema.js.map +1 -0
- package/dist/schemas/trip-mode-request-schema.d.ts +9 -0
- package/dist/schemas/trip-mode-request-schema.js +24 -0
- package/dist/schemas/trip-mode-request-schema.js.map +1 -0
- package/dist/security-system-platform.d.ts +19 -0
- package/dist/security-system-platform.js +56 -0
- package/dist/security-system-platform.js.map +1 -0
- package/dist/security-system.d.ts +28 -0
- package/dist/security-system.js +169 -0
- package/dist/security-system.js.map +1 -0
- package/dist/services/command-service.d.ts +16 -0
- package/dist/services/command-service.js +65 -0
- package/dist/services/command-service.js.map +1 -0
- package/dist/services/configuration-service.d.ts +24 -0
- package/dist/services/configuration-service.js +189 -0
- package/dist/services/configuration-service.js.map +1 -0
- package/dist/services/event-bus-service.d.ts +12 -0
- package/dist/services/event-bus-service.js +17 -0
- package/dist/services/event-bus-service.js.map +1 -0
- package/dist/services/matter-service.d.ts +69 -0
- package/dist/services/matter-service.js +363 -0
- package/dist/services/matter-service.js.map +1 -0
- package/dist/services/mqtt-service.d.ts +16 -0
- package/dist/services/mqtt-service.js +97 -0
- package/dist/services/mqtt-service.js.map +1 -0
- package/dist/services/server-service.d.ts +28 -0
- package/dist/services/server-service.js +275 -0
- package/dist/services/server-service.js.map +1 -0
- package/dist/services/storage-service.d.ts +14 -0
- package/dist/services/storage-service.js +70 -0
- package/dist/services/storage-service.js.map +1 -0
- package/dist/services/webhook-service.d.ts +16 -0
- package/dist/services/webhook-service.js +68 -0
- package/dist/services/webhook-service.js.map +1 -0
- package/dist/tests/conditions.test.d.ts +1 -0
- package/dist/tests/conditions.test.js +175 -0
- package/dist/tests/conditions.test.js.map +1 -0
- package/dist/tests/matter-service.test.d.ts +1 -0
- package/dist/tests/matter-service.test.js +475 -0
- package/dist/tests/matter-service.test.js.map +1 -0
- package/dist/tests/mqtt-service.test.d.ts +1 -0
- package/dist/tests/mqtt-service.test.js +168 -0
- package/dist/tests/mqtt-service.test.js.map +1 -0
- package/dist/tests/sensor-handler.test.d.ts +1 -0
- package/dist/tests/sensor-handler.test.js +87 -0
- package/dist/tests/sensor-handler.test.js.map +1 -0
- package/dist/tests/server-service.test.d.ts +1 -0
- package/dist/tests/server-service.test.js +188 -0
- package/dist/tests/server-service.test.js.map +1 -0
- package/dist/tests/state-handler.test.d.ts +1 -0
- package/dist/tests/state-handler.test.js +276 -0
- package/dist/tests/state-handler.test.js.map +1 -0
- package/dist/tests/switch-handler.test.d.ts +1 -0
- package/dist/tests/switch-handler.test.js +186 -0
- package/dist/tests/switch-handler.test.js.map +1 -0
- package/dist/tests/trip-handler.test.d.ts +1 -0
- package/dist/tests/trip-handler.test.js +179 -0
- package/dist/tests/trip-handler.test.js.map +1 -0
- package/dist/timers/timer-manager.d.ts +31 -0
- package/dist/timers/timer-manager.js +118 -0
- package/dist/timers/timer-manager.js.map +1 -0
- package/dist/types/event-payload-map-type.d.ts +15 -0
- package/dist/types/event-payload-map-type.js +2 -0
- package/dist/types/event-payload-map-type.js.map +1 -0
- package/dist/types/event-type.d.ts +44 -0
- package/dist/types/event-type.js +20 -0
- package/dist/types/event-type.js.map +1 -0
- package/dist/types/matter-accessory-key-type.d.ts +7 -0
- package/dist/types/matter-accessory-key-type.js +2 -0
- package/dist/types/matter-accessory-key-type.js.map +1 -0
- package/dist/types/mode-type.d.ts +4 -0
- package/dist/types/mode-type.js +2 -0
- package/dist/types/mode-type.js.map +1 -0
- package/dist/types/origin-type.d.ts +9 -0
- package/dist/types/origin-type.js +11 -0
- package/dist/types/origin-type.js.map +1 -0
- package/dist/types/security-state-type.d.ts +11 -0
- package/dist/types/security-state-type.js +13 -0
- package/dist/types/security-state-type.js.map +1 -0
- package/dist/types/sensor-kind-type.d.ts +2 -0
- package/dist/types/sensor-kind-type.js +2 -0
- package/dist/types/sensor-kind-type.js.map +1 -0
- package/dist/types/service-result-type.d.ts +4 -0
- package/dist/types/service-result-type.js +2 -0
- package/dist/types/service-result-type.js.map +1 -0
- package/dist/utils/arming-util.d.ts +19 -0
- package/dist/utils/arming-util.js +24 -0
- package/dist/utils/arming-util.js.map +1 -0
- package/dist/utils/state-util.d.ts +8 -0
- package/dist/utils/state-util.js +29 -0
- package/dist/utils/state-util.js.map +1 -0
- package/docs/MQTT.md +50 -0
- package/package.json +64 -0
- package/src/@types/homebridge-lib.d.ts +11 -0
- package/src/conditions/already-triggered-condition.ts +24 -0
- package/src/conditions/arming-in-progress-condition.ts +23 -0
- package/src/conditions/arming-lock-condition.ts +50 -0
- package/src/conditions/condition.ts +31 -0
- package/src/conditions/double-knock-condition.ts +84 -0
- package/src/conditions/not-armed-condition.ts +30 -0
- package/src/conditions/trigger-already-running-condition.ts +23 -0
- package/src/constants/default-constant.ts +28 -0
- package/src/constants/homekit-constant.ts +2 -0
- package/src/constants/matter-constant.ts +69 -0
- package/src/handlers/sensor-handler.ts +78 -0
- package/src/handlers/state-handler.ts +257 -0
- package/src/handlers/switch-handler.ts +111 -0
- package/src/handlers/trip-handler.ts +193 -0
- package/src/homekit/homekit-registrar.ts +28 -0
- package/src/homekit/service-factory.ts +35 -0
- package/src/index.ts +9 -0
- package/src/interfaces/condition-context-interface.ts +15 -0
- package/src/interfaces/hap-types-interface.ts +11 -0
- package/src/interfaces/mqtt-status-payload-interface.ts +6 -0
- package/src/interfaces/options-interface.ts +116 -0
- package/src/interfaces/persisted-state-interface.ts +7 -0
- package/src/interfaces/service-registry-interface.ts +11 -0
- package/src/interfaces/system-state-interface.ts +25 -0
- package/src/schemas/arming-lock-schema.ts +12 -0
- package/src/schemas/error-schema.ts +7 -0
- package/src/schemas/mode-request-schema.ts +18 -0
- package/src/schemas/status-response-schema.ts +10 -0
- package/src/schemas/trip-mode-request-schema.ts +24 -0
- package/src/security-system-platform.ts +68 -0
- package/src/security-system.ts +199 -0
- package/src/services/command-service.ts +76 -0
- package/src/services/configuration-service.ts +224 -0
- package/src/services/event-bus-service.ts +21 -0
- package/src/services/matter-service.ts +446 -0
- package/src/services/mqtt-service.ts +123 -0
- package/src/services/server-service.ts +327 -0
- package/src/services/storage-service.ts +80 -0
- package/src/services/webhook-service.ts +77 -0
- package/src/tests/conditions.test.ts +212 -0
- package/src/tests/matter-service.test.ts +610 -0
- package/src/tests/mqtt-service.test.ts +231 -0
- package/src/tests/sensor-handler.test.ts +116 -0
- package/src/tests/server-service.test.ts +238 -0
- package/src/tests/state-handler.test.ts +371 -0
- package/src/tests/switch-handler.test.ts +234 -0
- package/src/tests/trip-handler.test.ts +244 -0
- package/src/timers/timer-manager.ts +141 -0
- package/src/types/event-payload-map-type.ts +25 -0
- package/src/types/event-type.ts +61 -0
- package/src/types/matter-accessory-key-type.ts +33 -0
- package/src/types/mode-type.ts +4 -0
- package/src/types/origin-type.ts +9 -0
- package/src/types/security-state-type.ts +11 -0
- package/src/types/sensor-kind-type.ts +2 -0
- package/src/types/service-result-type.ts +4 -0
- package/src/utils/arming-util.ts +44 -0
- package/src/utils/state-util.ts +32 -0
- package/tsconfig.json +26 -0
- package/vitest.config.ts +8 -0
|
@@ -0,0 +1,363 @@
|
|
|
1
|
+
import { MATTER_ARMING_LOCK_SWITCH_KEYS, MATTER_CUSTOM_TRIP_START_INDEX, MATTER_MANUFACTURER, MATTER_MODEL, MATTER_MODE_SWITCH_KEYS, MATTER_SENSOR_IDENTITIES, MATTER_SWITCH_IDENTITIES, MATTER_TRIP_SWITCH_KEYS, } from '../constants/matter-constant.js';
|
|
2
|
+
import { EventType } from '../types/event-type.js';
|
|
3
|
+
import { OriginType } from '../types/origin-type.js';
|
|
4
|
+
import { SecurityState } from '../types/security-state-type.js';
|
|
5
|
+
import { capitalise, modeToState } from '../utils/state-util.js';
|
|
6
|
+
const PLUGIN_NAME = 'homebridge-securitysystem';
|
|
7
|
+
const PLATFORM_NAME = 'security-system';
|
|
8
|
+
/** Maps each Matter arming-lock switch key to its SystemState lock field. */
|
|
9
|
+
const LOCK_FIELD_BY_SWITCH_KEY = {
|
|
10
|
+
'arming-lock': 'global',
|
|
11
|
+
'arming-lock-home': 'home',
|
|
12
|
+
'arming-lock-away': 'away',
|
|
13
|
+
'arming-lock-night': 'night',
|
|
14
|
+
};
|
|
15
|
+
/**
|
|
16
|
+
* Publishes the optional switch and sensor accessories over Matter (HAP keeps
|
|
17
|
+
* the main SecuritySystem service and the motion sensors). Switches are
|
|
18
|
+
* Matter-only. The security system has no Matter device type, so every control
|
|
19
|
+
* is exposed as an OnOffSwitch and every sensor as a MotionSensor.
|
|
20
|
+
*
|
|
21
|
+
* Identities follow the `<device-type>-<index>` convention (`switch-1`,
|
|
22
|
+
* `motion-sensor-2`, …) and are fed through `api.matter.uuid.generate()` to
|
|
23
|
+
* produce stable UUIDs. Commands from the Matter controller call straight into
|
|
24
|
+
* the existing handlers; state changes reach it through bus events and
|
|
25
|
+
* `updateAccessoryState()`, mirroring the HAP characteristic updates.
|
|
26
|
+
*/
|
|
27
|
+
export class MatterService {
|
|
28
|
+
log;
|
|
29
|
+
options;
|
|
30
|
+
api;
|
|
31
|
+
state;
|
|
32
|
+
switchHandler;
|
|
33
|
+
tripHandler;
|
|
34
|
+
sensorHandler;
|
|
35
|
+
accessoryUuidByKey = new Map();
|
|
36
|
+
sensorUuidByKind = new Map();
|
|
37
|
+
// Last value pushed per accessory, so redundant updates are skipped
|
|
38
|
+
// (best practice: compare before updating).
|
|
39
|
+
pushedSwitchStateByKey = new Map();
|
|
40
|
+
pushedSensorStateByKind = new Map();
|
|
41
|
+
matter;
|
|
42
|
+
constructor(log, options, api, state, switchHandler, tripHandler, sensorHandler) {
|
|
43
|
+
this.log = log;
|
|
44
|
+
this.options = options;
|
|
45
|
+
this.api = api;
|
|
46
|
+
this.state = state;
|
|
47
|
+
this.switchHandler = switchHandler;
|
|
48
|
+
this.tripHandler = tripHandler;
|
|
49
|
+
this.sensorHandler = sensorHandler;
|
|
50
|
+
}
|
|
51
|
+
attachToBus(bus) {
|
|
52
|
+
bus.on(EventType.RESET_MODE_SWITCHES, () => this.pushModeSwitchesOff());
|
|
53
|
+
bus.on(EventType.UPDATE_MODE_SWITCHES, () => this.pushModeSwitchForTargetState());
|
|
54
|
+
bus.on(EventType.RESET_TRIP_SWITCHES, () => this.pushTripSwitchesOff());
|
|
55
|
+
bus.on(EventType.SENSOR_STATE_CHANGED, ({ sensor, value }) => this.pushSensorState(sensor, value));
|
|
56
|
+
// Trips started by the server/webhooks used to light the HAP trip switch;
|
|
57
|
+
// mirror that to the Matter trip switch so the cause stays visible.
|
|
58
|
+
bus.on(EventType.TRIGGER_FIRED, ({ origin }) => {
|
|
59
|
+
if (origin === OriginType.INTERNAL || origin === OriginType.EXTERNAL) {
|
|
60
|
+
this.pushSwitch('trip', true);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
/**
|
|
65
|
+
* Registers every configured Matter accessory and removes cached ones that are
|
|
66
|
+
* no longer configured. Accessories restored from Homebridge's cache are
|
|
67
|
+
* matched by UUID and adopted by the Matter server, so they are not
|
|
68
|
+
* re-registered. No-op when Matter is disabled on the bridge.
|
|
69
|
+
*/
|
|
70
|
+
async registerAccessories(cachedAccessories) {
|
|
71
|
+
// The documented guard: past this point api.matter is guaranteed to be
|
|
72
|
+
// present (see "Checking Matter is available" in the plugin docs).
|
|
73
|
+
if (!this.api.isMatterEnabled()) {
|
|
74
|
+
this.log.info('Matter is not enabled on this bridge; skipping Matter accessories.');
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
const matter = this.api.matter;
|
|
78
|
+
this.matter = matter;
|
|
79
|
+
const desired = new Map();
|
|
80
|
+
this.addModeSwitches(desired, matter);
|
|
81
|
+
this.addTripSwitches(desired, matter);
|
|
82
|
+
this.addArmingLockSwitches(desired, matter);
|
|
83
|
+
this.addMotionSensors(desired, matter);
|
|
84
|
+
const accessoriesToRegister = Array.from(desired.values())
|
|
85
|
+
.filter(accessory => !cachedAccessories.has(accessory.UUID));
|
|
86
|
+
if (accessoriesToRegister.length > 0) {
|
|
87
|
+
await matter.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, accessoriesToRegister);
|
|
88
|
+
this.log.info(`Matter accessories registered: ${accessoriesToRegister.map(a => a.displayName).join(', ')}`);
|
|
89
|
+
}
|
|
90
|
+
const staleAccessories = Array.from(cachedAccessories.values())
|
|
91
|
+
.filter(accessory => !desired.has(accessory.UUID));
|
|
92
|
+
if (staleAccessories.length > 0) {
|
|
93
|
+
await matter.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, staleAccessories);
|
|
94
|
+
this.log.info(`Matter accessories removed: ${staleAccessories.map(a => a.displayName).join(', ')}`);
|
|
95
|
+
}
|
|
96
|
+
// Declared cluster values are only first-run defaults. Force the controller's
|
|
97
|
+
// view to match the real system state: mode switches follow the target state,
|
|
98
|
+
// trip switches come up off.
|
|
99
|
+
this.syncInitialState();
|
|
100
|
+
}
|
|
101
|
+
// ── Accessory building ─────────────────────────────────────────────────────
|
|
102
|
+
addModeSwitches(desired, matter) {
|
|
103
|
+
const available = this.state.availableTargetStates;
|
|
104
|
+
if (this.options.modeSwitches) {
|
|
105
|
+
if (available.includes(SecurityState.HOME)) {
|
|
106
|
+
this.addOnOffSwitch(desired, matter, 'mode-home', this.options.modeHomeSwitchName, value => this.switchHandler.setModeSwitch(SecurityState.HOME, value));
|
|
107
|
+
}
|
|
108
|
+
if (available.includes(SecurityState.AWAY)) {
|
|
109
|
+
this.addOnOffSwitch(desired, matter, 'mode-away', this.options.modeAwaySwitchName, value => this.switchHandler.setModeSwitch(SecurityState.AWAY, value));
|
|
110
|
+
}
|
|
111
|
+
if (available.includes(SecurityState.NIGHT)) {
|
|
112
|
+
this.addOnOffSwitch(desired, matter, 'mode-night', this.options.modeNightSwitchName, value => this.switchHandler.setModeSwitch(SecurityState.NIGHT, value));
|
|
113
|
+
}
|
|
114
|
+
if (this.options.modeOffSwitch) {
|
|
115
|
+
this.addOnOffSwitch(desired, matter, 'mode-off', this.options.modeOffSwitchName, value => this.switchHandler.setModeOffSwitch(value));
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
if (this.options.modeAwayExtendedSwitch) {
|
|
119
|
+
this.addOnOffSwitch(desired, matter, 'mode-away-extended', this.options.modeAwayExtendedSwitchName, value => this.switchHandler.setModeAwayExtendedSwitch(value));
|
|
120
|
+
}
|
|
121
|
+
if (this.options.modePauseSwitch) {
|
|
122
|
+
this.addOnOffSwitch(desired, matter, 'mode-pause', this.options.modePauseSwitchName, value => this.switchHandler.setModePauseSwitch(value));
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
addTripSwitches(desired, matter) {
|
|
126
|
+
if (this.options.tripSwitch) {
|
|
127
|
+
this.addOnOffSwitch(desired, matter, 'trip', this.options.tripSwitchName, value => this.tripHandler.updateTripSwitch(value, OriginType.REGULAR_SWITCH, false));
|
|
128
|
+
}
|
|
129
|
+
if (this.options.tripOverrideSwitch) {
|
|
130
|
+
this.addOnOffSwitch(desired, matter, 'trip-override', this.options.tripOverrideSwitchName, value => this.tripHandler.updateTripSwitch(value, OriginType.OVERRIDE_SWITCH, false));
|
|
131
|
+
}
|
|
132
|
+
if (this.options.tripModeSwitches) {
|
|
133
|
+
const modeTrips = [
|
|
134
|
+
['trip-home', SecurityState.HOME, this.options.tripHomeSwitchName],
|
|
135
|
+
['trip-away', SecurityState.AWAY, this.options.tripAwaySwitchName],
|
|
136
|
+
['trip-night', SecurityState.NIGHT, this.options.tripNightSwitchName],
|
|
137
|
+
];
|
|
138
|
+
for (const [key, mode, displayName] of modeTrips) {
|
|
139
|
+
if (this.state.availableTargetStates.includes(mode)) {
|
|
140
|
+
this.addOnOffSwitch(desired, matter, key, displayName, value => this.tripHandler.triggerIfModeSet(mode, value));
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
const customGroups = [
|
|
145
|
+
['home', this.options.tripHomeSwitches],
|
|
146
|
+
['away', this.options.tripAwaySwitches],
|
|
147
|
+
['night', this.options.tripNightSwitches],
|
|
148
|
+
];
|
|
149
|
+
let customSwitchIndex = MATTER_CUSTOM_TRIP_START_INDEX;
|
|
150
|
+
for (const [modeLabel, tripSwitches] of customGroups) {
|
|
151
|
+
const mode = modeToState(modeLabel);
|
|
152
|
+
if (!this.state.availableTargetStates.includes(mode)) {
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
tripSwitches.forEach((tripSwitch, index) => {
|
|
156
|
+
const key = `trip-custom-${modeLabel}-${index}`;
|
|
157
|
+
this.addOnOffSwitch(desired, matter, key, `Trip ${capitalise(modeLabel)} ${tripSwitch.label}`, value => this.tripHandler.triggerIfModeSet(mode, value), `switch-${customSwitchIndex++}`);
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
addArmingLockSwitches(desired, matter) {
|
|
162
|
+
if (this.options.armingLockSwitch) {
|
|
163
|
+
this.addOnOffSwitch(desired, matter, 'arming-lock', 'Arming Lock', value => this.switchHandler.updateArmingLock('global', value));
|
|
164
|
+
}
|
|
165
|
+
if (this.options.armingLockSwitches) {
|
|
166
|
+
const modeLocks = [
|
|
167
|
+
['arming-lock-home', 'home', 'Arming Lock Home'],
|
|
168
|
+
['arming-lock-away', 'away', 'Arming Lock Away'],
|
|
169
|
+
['arming-lock-night', 'night', 'Arming Lock Night'],
|
|
170
|
+
];
|
|
171
|
+
for (const [key, mode, displayName] of modeLocks) {
|
|
172
|
+
this.addOnOffSwitch(desired, matter, key, displayName, value => this.switchHandler.updateArmingLock(mode, value));
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
addMotionSensors(desired, matter) {
|
|
177
|
+
if (this.options.armingMotionSensor) {
|
|
178
|
+
this.addMotionSensor(desired, matter, 'arming', 'Arming');
|
|
179
|
+
}
|
|
180
|
+
if (this.options.trippedMotionSensor) {
|
|
181
|
+
this.addMotionSensor(desired, matter, 'tripped', 'Tripped');
|
|
182
|
+
}
|
|
183
|
+
if (this.options.resetSensor) {
|
|
184
|
+
this.addMotionSensor(desired, matter, 'reset', 'Triggered Reset');
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
addOnOffSwitch(desired, matter, key, displayName, command, identity = MATTER_SWITCH_IDENTITIES[key]) {
|
|
188
|
+
const uuid = this.uuidFor(matter, identity);
|
|
189
|
+
this.accessoryUuidByKey.set(key, uuid);
|
|
190
|
+
desired.set(uuid, {
|
|
191
|
+
UUID: uuid,
|
|
192
|
+
displayName,
|
|
193
|
+
deviceType: matter.deviceTypes.OnOffSwitch,
|
|
194
|
+
serialNumber: identity,
|
|
195
|
+
manufacturer: MATTER_MANUFACTURER,
|
|
196
|
+
model: MATTER_MODEL,
|
|
197
|
+
context: { key, identity },
|
|
198
|
+
clusters: { onOff: { onOff: false } },
|
|
199
|
+
handlers: {
|
|
200
|
+
onOff: {
|
|
201
|
+
on: () => this.runCommand(matter, key, command, true),
|
|
202
|
+
off: () => this.runCommand(matter, key, command, false),
|
|
203
|
+
},
|
|
204
|
+
},
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
/** Sensors declare no handlers — they only push readings with updateAccessoryState. */
|
|
208
|
+
addMotionSensor(desired, matter, kind, displayName) {
|
|
209
|
+
const identity = MATTER_SENSOR_IDENTITIES[kind];
|
|
210
|
+
const uuid = this.uuidFor(matter, identity);
|
|
211
|
+
this.sensorUuidByKind.set(kind, uuid);
|
|
212
|
+
desired.set(uuid, {
|
|
213
|
+
UUID: uuid,
|
|
214
|
+
displayName,
|
|
215
|
+
deviceType: matter.deviceTypes.MotionSensor,
|
|
216
|
+
serialNumber: identity,
|
|
217
|
+
manufacturer: MATTER_MANUFACTURER,
|
|
218
|
+
model: MATTER_MODEL,
|
|
219
|
+
context: { key: `sensor-${kind}`, identity },
|
|
220
|
+
clusters: {
|
|
221
|
+
occupancySensing: {
|
|
222
|
+
occupancy: { occupied: false },
|
|
223
|
+
occupancySensorTypeBitmap: { pir: true },
|
|
224
|
+
},
|
|
225
|
+
},
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
// ── Command handling ───────────────────────────────────────────────────────
|
|
229
|
+
/**
|
|
230
|
+
* Runs a controller command, translating failures into Matter status errors:
|
|
231
|
+
* a blocked action throws a specific status class, and any unexpected error
|
|
232
|
+
* from the underlying handler becomes a generic Failure instead of escaping
|
|
233
|
+
* as an untyped error (matter-errors best practice).
|
|
234
|
+
*/
|
|
235
|
+
runCommand(matter, key, command, value) {
|
|
236
|
+
try {
|
|
237
|
+
this.throwIfBlocked(matter, command(value));
|
|
238
|
+
// Homebridge auto-updates the onOff attribute after a successful command.
|
|
239
|
+
// Record that so a later reset event sees the change and pushes it back.
|
|
240
|
+
this.pushedSwitchStateByKey.set(key, value);
|
|
241
|
+
}
|
|
242
|
+
catch (error) {
|
|
243
|
+
this.log.debug(`Matter command failed (${key}): ${String(error)}`);
|
|
244
|
+
this.rethrowAsMatterError(matter, error);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
throwIfBlocked(matter, result) {
|
|
248
|
+
if (result === null) {
|
|
249
|
+
return;
|
|
250
|
+
}
|
|
251
|
+
if (!result.success) {
|
|
252
|
+
const reason = result.reason ?? 'Action not allowed in the current state';
|
|
253
|
+
if (reason === 'target mode is disabled') {
|
|
254
|
+
throw new matter.status.ConstraintError(reason);
|
|
255
|
+
}
|
|
256
|
+
throw new matter.status.InvalidInState(reason);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
rethrowAsMatterError(matter, error) {
|
|
260
|
+
if (matter.status.isMatterProtocolError(error)) {
|
|
261
|
+
throw error;
|
|
262
|
+
}
|
|
263
|
+
throw new matter.status.Failure(error instanceof Error ? error.message : String(error));
|
|
264
|
+
}
|
|
265
|
+
// ── State pushing ──────────────────────────────────────────────────────────
|
|
266
|
+
pushModeSwitchesOff() {
|
|
267
|
+
for (const key of MATTER_MODE_SWITCH_KEYS) {
|
|
268
|
+
this.pushSwitch(key, false);
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
pushModeSwitchForTargetState() {
|
|
272
|
+
const key = this.modeSwitchKeyForTarget();
|
|
273
|
+
if (key) {
|
|
274
|
+
this.pushSwitch(key, true);
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
modeSwitchKeyForTarget() {
|
|
278
|
+
const modeMap = {
|
|
279
|
+
[SecurityState.HOME]: 'mode-home',
|
|
280
|
+
[SecurityState.AWAY]: 'mode-away',
|
|
281
|
+
[SecurityState.NIGHT]: 'mode-night',
|
|
282
|
+
[SecurityState.OFF]: 'mode-off',
|
|
283
|
+
};
|
|
284
|
+
return modeMap[this.state.targetState] ?? null;
|
|
285
|
+
}
|
|
286
|
+
pushTripSwitchesOff() {
|
|
287
|
+
for (const key of MATTER_TRIP_SWITCH_KEYS) {
|
|
288
|
+
this.pushSwitch(key, false);
|
|
289
|
+
}
|
|
290
|
+
for (const key of this.accessoryUuidByKey.keys()) {
|
|
291
|
+
if (key.startsWith('trip-custom-')) {
|
|
292
|
+
this.pushSwitch(key, false);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
pushLockSwitches() {
|
|
297
|
+
for (const key of MATTER_ARMING_LOCK_SWITCH_KEYS) {
|
|
298
|
+
this.pushSwitch(key, this.state.armingLocks[LOCK_FIELD_BY_SWITCH_KEY[key]]);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
pushSwitch(key, value) {
|
|
302
|
+
const uuid = this.accessoryUuidByKey.get(key);
|
|
303
|
+
if (!uuid || !this.matter) {
|
|
304
|
+
return;
|
|
305
|
+
}
|
|
306
|
+
if (this.pushedSwitchStateByKey.get(key) === value) {
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
this.pushedSwitchStateByKey.set(key, value);
|
|
310
|
+
this.pushAccessoryState(uuid, this.matter.clusterNames.OnOff, { onOff: value });
|
|
311
|
+
}
|
|
312
|
+
pushSensorState(sensor, value) {
|
|
313
|
+
const uuid = this.sensorUuidByKind.get(sensor);
|
|
314
|
+
if (!uuid || !this.matter) {
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
317
|
+
if (this.pushedSensorStateByKind.get(sensor) === value) {
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
this.pushedSensorStateByKind.set(sensor, value);
|
|
321
|
+
this.pushAccessoryState(uuid, this.matter.clusterNames.OccupancySensing, { occupancy: { occupied: value } });
|
|
322
|
+
}
|
|
323
|
+
/** Syncs every registered switch/sensor to its real state after registration. */
|
|
324
|
+
syncInitialState() {
|
|
325
|
+
if (!this.matter) {
|
|
326
|
+
return;
|
|
327
|
+
}
|
|
328
|
+
const targetKey = this.modeSwitchKeyForTarget();
|
|
329
|
+
for (const key of MATTER_MODE_SWITCH_KEYS) {
|
|
330
|
+
if (this.accessoryUuidByKey.has(key)) {
|
|
331
|
+
this.pushSwitch(key, key === targetKey);
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
for (const key of MATTER_TRIP_SWITCH_KEYS) {
|
|
335
|
+
if (this.accessoryUuidByKey.has(key)) {
|
|
336
|
+
this.pushSwitch(key, false);
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
for (const key of this.accessoryUuidByKey.keys()) {
|
|
340
|
+
if (key.startsWith('trip-custom-')) {
|
|
341
|
+
this.pushSwitch(key, false);
|
|
342
|
+
}
|
|
343
|
+
}
|
|
344
|
+
this.pushLockSwitches();
|
|
345
|
+
// Sensors: push their current reading so a mid-pulse state at startup is
|
|
346
|
+
// not lost (declared cluster values are only first-run defaults).
|
|
347
|
+
for (const kind of ['arming', 'tripped', 'reset']) {
|
|
348
|
+
if (this.sensorUuidByKind.has(kind)) {
|
|
349
|
+
this.pushSensorState(kind, this.sensorHandler.getMotionState(kind));
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
pushAccessoryState(uuid, clusterName, attributes) {
|
|
354
|
+
this.matter?.updateAccessoryState(uuid, clusterName, attributes).catch((error) => {
|
|
355
|
+
this.log.debug(`Matter state update failed (${uuid}): ${String(error)}`);
|
|
356
|
+
});
|
|
357
|
+
}
|
|
358
|
+
// ── Helpers ────────────────────────────────────────────────────────────────
|
|
359
|
+
uuidFor(matter, identity) {
|
|
360
|
+
return matter.uuid.generate(identity);
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
//# sourceMappingURL=matter-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"matter-service.js","sourceRoot":"","sources":["../../src/services/matter-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { Logging } from 'homebridge';
|
|
2
|
+
import type { SecuritySystemOptions } from '../interfaces/options-interface.js';
|
|
3
|
+
import type { SystemState } from '../interfaces/system-state-interface.js';
|
|
4
|
+
import type { EventBusService } from './event-bus-service.js';
|
|
5
|
+
export declare class MqttService {
|
|
6
|
+
private readonly log;
|
|
7
|
+
private readonly options;
|
|
8
|
+
private readonly state;
|
|
9
|
+
private client;
|
|
10
|
+
constructor(log: Logging, options: SecuritySystemOptions, state: SystemState);
|
|
11
|
+
attachToBus(bus: EventBusService): void;
|
|
12
|
+
disconnect(): void;
|
|
13
|
+
private connect;
|
|
14
|
+
private publishStatus;
|
|
15
|
+
private sanitiseBrokerUrl;
|
|
16
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { connect } from 'mqtt';
|
|
2
|
+
import { stateToMode } from '../utils/state-util.js';
|
|
3
|
+
import { OriginType } from '../types/origin-type.js';
|
|
4
|
+
import { EventType } from '../types/event-type.js';
|
|
5
|
+
export class MqttService {
|
|
6
|
+
log;
|
|
7
|
+
options;
|
|
8
|
+
state;
|
|
9
|
+
client = null;
|
|
10
|
+
constructor(log, options, state) {
|
|
11
|
+
this.log = log;
|
|
12
|
+
this.options = options;
|
|
13
|
+
this.state = state;
|
|
14
|
+
}
|
|
15
|
+
attachToBus(bus) {
|
|
16
|
+
if (!this.options.mqttBroker) {
|
|
17
|
+
this.log.debug('MQTT broker not configured.');
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
this.connect();
|
|
21
|
+
bus.on(EventType.TARGET_CHANGED, (payload) => {
|
|
22
|
+
this.publishStatus(payload.origin);
|
|
23
|
+
});
|
|
24
|
+
bus.on(EventType.CURRENT_CHANGED, (payload) => {
|
|
25
|
+
this.publishStatus(payload.origin);
|
|
26
|
+
});
|
|
27
|
+
bus.on(EventType.ARMING, () => {
|
|
28
|
+
this.publishStatus(OriginType.INTERNAL);
|
|
29
|
+
});
|
|
30
|
+
bus.on(EventType.WARNING, (payload) => {
|
|
31
|
+
this.publishStatus(payload.origin);
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
disconnect() {
|
|
35
|
+
if (this.client) {
|
|
36
|
+
this.client.end(true);
|
|
37
|
+
this.client = null;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
connect() {
|
|
41
|
+
const connectionOptions = {};
|
|
42
|
+
if (this.options.mqttClientId) {
|
|
43
|
+
connectionOptions.clientId = this.options.mqttClientId;
|
|
44
|
+
}
|
|
45
|
+
if (this.options.mqttUsername) {
|
|
46
|
+
connectionOptions.username = this.options.mqttUsername;
|
|
47
|
+
}
|
|
48
|
+
if (this.options.mqttPassword) {
|
|
49
|
+
connectionOptions.password = this.options.mqttPassword;
|
|
50
|
+
}
|
|
51
|
+
this.client = connect(this.options.mqttBroker, connectionOptions);
|
|
52
|
+
this.client.on('connect', () => {
|
|
53
|
+
this.log.info(`MQTT (${this.sanitiseBrokerUrl()})`);
|
|
54
|
+
});
|
|
55
|
+
this.client.on('error', (error) => {
|
|
56
|
+
this.log.error('MQTT error.');
|
|
57
|
+
this.log.error(String(error));
|
|
58
|
+
});
|
|
59
|
+
this.client.on('close', () => {
|
|
60
|
+
this.log.debug('MQTT connection closed.');
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
publishStatus(origin) {
|
|
64
|
+
if (!this.client?.connected) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
if (this.options.proxyMode && origin === OriginType.EXTERNAL) {
|
|
68
|
+
this.log.debug('MQTT publish bypassed (proxy mode).');
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
const payload = {
|
|
72
|
+
arming: this.state.isArming,
|
|
73
|
+
current_mode: stateToMode(this.state.currentState),
|
|
74
|
+
target_mode: stateToMode(this.state.targetState),
|
|
75
|
+
tripped: this.state.isTripping,
|
|
76
|
+
};
|
|
77
|
+
this.client.publish(this.options.mqttTopic, JSON.stringify(payload), { qos: 0, retain: true }, (error) => {
|
|
78
|
+
if (error) {
|
|
79
|
+
this.log.error(`MQTT publish failed (${this.options.mqttTopic})`);
|
|
80
|
+
this.log.error(String(error));
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
sanitiseBrokerUrl() {
|
|
85
|
+
try {
|
|
86
|
+
const url = new URL(this.options.mqttBroker);
|
|
87
|
+
if (url.password) {
|
|
88
|
+
url.password = '****';
|
|
89
|
+
}
|
|
90
|
+
return url.toString();
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
return this.options.mqttBroker;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=mqtt-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mqtt-service.js","sourceRoot":"","sources":["../../src/services/mqtt-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { OpenAPIHono } from '@hono/zod-openapi';
|
|
2
|
+
import type { Logging } from 'homebridge';
|
|
3
|
+
import type { SecuritySystemOptions } from '../interfaces/options-interface.js';
|
|
4
|
+
import type { SystemState } from '../interfaces/system-state-interface.js';
|
|
5
|
+
import type { StateHandler } from '../handlers/state-handler.js';
|
|
6
|
+
import type { TripHandler } from '../handlers/trip-handler.js';
|
|
7
|
+
import type { SwitchHandler } from '../handlers/switch-handler.js';
|
|
8
|
+
/** Hono HTTP server providing remote control of the security system. */
|
|
9
|
+
export declare class ServerService {
|
|
10
|
+
private readonly log;
|
|
11
|
+
private readonly options;
|
|
12
|
+
private readonly state;
|
|
13
|
+
private readonly stateHandler;
|
|
14
|
+
private readonly tripHandler;
|
|
15
|
+
private readonly switchHandler;
|
|
16
|
+
private readonly application;
|
|
17
|
+
constructor(log: Logging, options: SecuritySystemOptions, state: SystemState, stateHandler: StateHandler, tripHandler: TripHandler, switchHandler: SwitchHandler);
|
|
18
|
+
/** Exposed for testing — returns the underlying Hono app. */
|
|
19
|
+
get app(): OpenAPIHono;
|
|
20
|
+
start(): void;
|
|
21
|
+
private createAuthMiddleware;
|
|
22
|
+
private registerRoutes;
|
|
23
|
+
/**
|
|
24
|
+
* Validates the Authorization: Bearer <key> header when serverApiKey is configured.
|
|
25
|
+
* Returns an error Response on failure, or null to allow the request through.
|
|
26
|
+
*/
|
|
27
|
+
private authenticate;
|
|
28
|
+
}
|