homebridge-tydom 0.32.0 → 0.32.2

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { n as PLUGIN_NAME, t as PLATFORM_NAME } from "./env-B2-Dw8C2.mjs";
 //#region src/index.ts
 process.setSourceMapsEnabled(true);
-const { default: TydomPlatform } = await import("./platform-DmVGk0po.mjs");
+const { default: TydomPlatform } = await import("./platform-CJBHeITb.mjs");
 var src_default = (homebridge) => {
 	homebridge.registerPlatform(PLUGIN_NAME, PLATFORM_NAME, TydomPlatform);
 };

package/dist/{platform-DmVGk0po.mjs → platform-CJBHeITb.mjs}

@@ -3875,6 +3875,12 @@ var GarageDoorAccessory = class extends BaseAccessory {
 	/** Some drivers expose only TOGGLE and cannot be commanded to a state. */
 	#toggleOnly;
 	#currentDoorState;
+	/**
+	* Where the door was last asked to go. TargetDoorState only admits OPEN and
+	* CLOSED, so it cannot mirror the current state through OPENING, CLOSING or
+	* STOPPED.
+	*/
+	#targetDoorState;
 	#lastUpdatedAt = 0;
 	#computedPosition = 0;
 	#transition;
@@ -3888,6 +3894,7 @@ var GarageDoorAccessory = class extends BaseAccessory {
 		const levelCmdValues = metadata.find((m) => m.name === "levelCmd")?.enum_values;
 		this.#toggleOnly = levelCmdValues?.length === 1 && levelCmdValues[0] === "TOGGLE";
 		this.#currentDoorState = CurrentDoorState.CLOSED;
+		this.#targetDoorState = TargetDoorState.CLOSED;
 		const legacy = this.accessory.getService(this.platform.Service.Switch);
 		if (legacy) this.accessory.removeService(legacy);
 		this.#service = this.service(this.platform.Service.GarageDoorOpener);
@@ -3905,8 +3912,8 @@ var GarageDoorAccessory = class extends BaseAccessory {
 		this.#service.getCharacteristic(TargetDoorState).onGet(async () => {
 			debugGet(TargetDoorState, this.#service);
 			if (this.#toggleOnly) {
-				debugGetResult(TargetDoorState, this.#service, this.#currentDoorState);
-				return this.#currentDoorState;
+				debugGetResult(TargetDoorState, this.#service, this.#targetDoorState);
+				return this.#targetDoorState;
 			}
 			const next = await this.#readDoorState();
 			this.#lastUpdatedAt = Date.now();
@@ -3955,6 +3962,7 @@ var GarageDoorAccessory = class extends BaseAccessory {
 		const { CurrentDoorState } = this.platform.Characteristic;
 		this.#lastUpdatedAt = Date.now();
 		this.#computedPosition = this.#positionNow();
+		this.#targetDoorState = targetDoorState;
 		let next = this.#nextDoorState(targetDoorState);
 		if (next === this.#currentDoorState) {
 			debug(`nextCurrentDoorState=${styleNumber(next)} === currentDoorState, nothing to do`);
@@ -4026,6 +4034,7 @@ var GarageDoorAccessory = class extends BaseAccessory {
 	#applyKnownState(doorState) {
 		const { CurrentDoorState } = this.platform.Characteristic;
 		this.#currentDoorState = doorState;
+		this.#settleTarget(doorState);
 		this.#lastUpdatedAt = Date.now();
 		this.#computedPosition = doorState === CurrentDoorState.OPEN ? 100 : 0;
 	}
@@ -4033,8 +4042,15 @@ var GarageDoorAccessory = class extends BaseAccessory {
 		const { CurrentDoorState } = this.platform.Characteristic;
 		debug(`assignCurrentDoorState=${styleString(this.#label(doorState))}`);
 		this.#currentDoorState = doorState;
+		this.#settleTarget(doorState);
 		this.#service.updateCharacteristic(CurrentDoorState, doorState);
 	}
+	/** A door at rest, open or closed, was headed exactly there. */
+	#settleTarget(doorState) {
+		const { CurrentDoorState, TargetDoorState } = this.platform.Characteristic;
+		if (doorState === CurrentDoorState.OPEN) this.#targetDoorState = TargetDoorState.OPEN;
+		else if (doorState === CurrentDoorState.CLOSED) this.#targetDoorState = TargetDoorState.CLOSED;
+	}
 	/** Where the door has got to, given how long it has been travelling. */
 	#positionNow() {
 		const { CurrentDoorState } = this.platform.Characteristic;
@@ -4365,19 +4381,28 @@ const isZoneArmed = (alarmData, zoneProp) => {
 	if (alarmMode === "ON") return true;
 	return alarmData.find((prop) => prop.name === zoneProp)?.value === "ON";
 };
+/**
+* The arming mode a data snapshot describes, ignoring whether the siren is on.
+*
+* This is what `SecuritySystemTargetState` asks for, and the reason it cannot
+* share `getStateForAlarmData`: the target has no `ALARM_TRIGGERED`, so the
+* return type excludes it and HAP can never be handed a value it would reject.
+*/
+const getTargetStateForAlarmData = (alarmData, aliases, settings) => {
+	const alarmMode = alarmData.find((prop) => prop.name === "alarmMode")?.value;
+	if (alarmMode === "ON") return ALARM_STATE.AWAY_ARM;
+	if (typeof alarmMode === "string" && ["ZONE", "PART"].includes(alarmMode)) return getStateForActiveZones(getActiveZones(alarmData, settings), aliases);
+	return ALARM_STATE.DISARMED;
+};
 /** The HomeKit state for a full alarm data snapshot. */
 const getStateForAlarmData = (alarmData, aliases, settings) => {
-	const find = (name) => alarmData.find((prop) => prop.name === name)?.value;
-	const alarmState = find("alarmState");
-	const alarmMode = find("alarmMode");
+	const alarmState = alarmData.find((prop) => prop.name === "alarmState")?.value;
 	if (typeof alarmState === "string" && [
 		"DELAYED",
 		"ON",
 		"QUIET"
 	].includes(alarmState)) return ALARM_STATE.ALARM_TRIGGERED;
-	if (alarmMode === "ON") return ALARM_STATE.AWAY_ARM;
-	if (typeof alarmMode === "string" && ["ZONE", "PART"].includes(alarmMode)) return getStateForActiveZones(getActiveZones(alarmData, settings), aliases);
-	return ALARM_STATE.DISARMED;
+	return getTargetStateForAlarmData(alarmData, aliases, settings);
 };
 //#endregion
 //#region src/accessories/security-system-accessory.ts
@@ -4433,7 +4458,7 @@ var SecuritySystemAccessory = class extends BaseAccessory {
 		});
 		service.getCharacteristic(SecuritySystemTargetState).onGet(async () => {
 			debugGet(SecuritySystemTargetState, service);
-			const nextValue = await this.#currentState();
+			const nextValue = await this.#targetState();
 			debugGetResult(SecuritySystemTargetState, service, nextValue);
 			return nextValue;
 		}).onSet(async (value) => {
@@ -4459,6 +4484,17 @@ var SecuritySystemAccessory = class extends BaseAccessory {
 		const data = await this.#read();
 		return getStateForAlarmData(data, this.#settings.aliases ?? {}, this.#settings);
 	}
+	/**
+	* The mode the panel is set to, which is what the target characteristic asks.
+	*
+	* Deliberately not `#currentState`: that one answers `ALARM_TRIGGERED` while
+	* the siren is going, and the target has no such value, so HAP rejected it.
+	* A ringing alarm says nothing about what the panel was armed to anyway.
+	*/
+	async #targetState() {
+		const data = await this.#read();
+		return getTargetStateForAlarmData(data, this.#settings.aliases ?? {}, this.#settings);
+	}
 	async #readZoneLabels() {
 		if (this.#legacy) {
 			this.platform.log.warn(`Setting up legacy zones`);
@@ -4546,11 +4582,15 @@ var SecuritySystemAccessory = class extends BaseAccessory {
 			return;
 		}
 		const aliases = this.#settings.aliases ?? {};
-		const targetZones = target === SecuritySystemTargetState.STAY_ARM ? aliases.stay : aliases.night;
-		if (Array.isArray(targetZones) && targetZones.length > 0) {
-			await this.#setZones(targetZones, "ON");
-			if (this.#service) debugSetResult(SecuritySystemTargetState, this.#service, target, "ON");
+		const isStay = target === SecuritySystemTargetState.STAY_ARM;
+		const alias = isStay ? "stay" : "night";
+		const targetZones = aliases[alias];
+		if (!Array.isArray(targetZones) || targetZones.length === 0) {
+			this.platform.log.warn(`Cannot arm ${this.name} to ${isStay ? "Home" : "Night"}: no zones are configured for that mode, so nothing was sent and the Home app will report the change as failed. Add {"settings": {"${this.deviceId}": {"aliases": {"${alias}": [1]}}}} listing the zones it should arm, numbered as they are on the panel's keypad.`);
+			return;
 		}
+		await this.#setZones(targetZones, "ON");
+		if (this.#service) debugSetResult(SecuritySystemTargetState, this.#service, target, "ON");
 	}
 	async #setZones(zoneIds, value) {
 		if (!this.#legacy) {
@@ -4567,15 +4607,12 @@ var SecuritySystemAccessory = class extends BaseAccessory {
 		});
 	}
 	#handleData(updates) {
-		const { SecuritySystemCurrentState, ContactSensorState, On } = this.platform.Characteristic;
+		const { ContactSensorState, On } = this.platform.Characteristic;
 		const aliases = this.#settings.aliases ?? {};
 		for (const { name, value } of updates) {
 			if (name === "alarmMode") {
 				const nextValue = value === "OFF" ? ALARM_STATE.DISARMED : value === "ON" ? ALARM_STATE.AWAY_ARM : value === "PART" || value === "ZONE" ? getStateForActiveZones(getActiveZones(updates, this.#settings), aliases) : void 0;
-				if (nextValue !== void 0 && this.#service) {
-					debugSetUpdate(SecuritySystemCurrentState, this.#service, nextValue);
-					this.#service.updateCharacteristic(SecuritySystemCurrentState, nextValue);
-				}
+				if (nextValue !== void 0) this.#setState(nextValue);
 				if (value === "OFF") this.#syncZoneSwitches([]);
 				else if (value === "ON") this.#syncZoneSwitches(null);
 				continue;
@@ -4653,11 +4690,22 @@ var SecuritySystemAccessory = class extends BaseAccessory {
 			service.updateCharacteristic(On, nextValue);
 		}
 	}
+	/**
+	* Settle both arming characteristics from an authoritative mode.
+	*
+	* The target moves with the current state, so that arming from the panel's
+	* own keypad does not leave HomeKit showing the old mode — a stale target is
+	* what makes "arm away" in the Home app look like it did nothing. The
+	* parameter type excludes `ALARM_TRIGGERED`, so the target can never be
+	* handed a value it would reject.
+	*/
 	#setState(state) {
 		if (!this.#service) return;
-		const { SecuritySystemCurrentState } = this.platform.Characteristic;
+		const { SecuritySystemCurrentState, SecuritySystemTargetState } = this.platform.Characteristic;
 		debugSetUpdate(SecuritySystemCurrentState, this.#service, state);
 		this.#service.updateCharacteristic(SecuritySystemCurrentState, state);
+		debugSetUpdate(SecuritySystemTargetState, this.#service, state);
+		this.#service.updateCharacteristic(SecuritySystemTargetState, state);
 	}
 };
 const createSecuritySystemAccessory = (deps) => {
@@ -5604,4 +5652,4 @@ var TydomPlatform = class {
 //#endregion
 export { TydomPlatform as default };
 
-//# sourceMappingURL=platform-DmVGk0po.mjs.map
+//# sourceMappingURL=platform-CJBHeITb.mjs.map