homebridge-cync-app 0.1.7 → 0.1.9

package/src/cync/cync-light-accessory.ts

@@ -0,0 +1,369 @@
+// src/cync/cync-light-accessory.ts
+import type { PlatformAccessory } from 'homebridge';
+import type { CyncDevice, CyncDeviceMesh } from './config-client.js';
+import type { CyncAccessoryContext, CyncAccessoryEnv } from './cync-accessory-helpers.js';
+import { applyAccessoryInformationFromCyncDevice, hsvToRgb } from './cync-accessory-helpers.js';
+
+export function configureCyncLightAccessory(
+	env: CyncAccessoryEnv,
+	mesh: CyncDeviceMesh,
+	device: CyncDevice,
+	accessory: PlatformAccessory,
+	deviceName: string,
+	deviceId: string,
+): void {
+	// If this accessory used to be a switch, remove that service
+	const existingSwitch = accessory.getService(env.api.hap.Service.Switch);
+	if (existingSwitch) {
+		env.log.info(
+			'Cync: removing stale Switch service from %s (deviceId=%s) before configuring as Lightbulb',
+			deviceName,
+			deviceId,
+		);
+		accessory.removeService(existingSwitch);
+	}
+
+	const service =
+    accessory.getService(env.api.hap.Service.Lightbulb) ||
+    accessory.addService(env.api.hap.Service.Lightbulb, deviceName);
+
+	// Optionally update accessory category so UIs treat it as a light
+	if (accessory.category !== env.api.hap.Categories.LIGHTBULB) {
+		accessory.category = env.api.hap.Categories.LIGHTBULB;
+	}
+
+	// Populate Accessory Information from Cync metadata
+	applyAccessoryInformationFromCyncDevice(env.api, accessory, device, deviceName, deviceId);
+
+	// Ensure context is initialized
+	const ctx = accessory.context as CyncAccessoryContext;
+	ctx.cync = ctx.cync ?? {
+		meshId: mesh.id,
+		deviceId,
+		productId: device.product_id,
+		on: false,
+	};
+
+	// Remember mapping for LAN updates
+	env.registerAccessoryForDevice(deviceId, accessory);
+	env.markDeviceSeen(deviceId);
+	env.startPollingDevice(deviceId);
+
+	const Characteristic = env.api.hap.Characteristic;
+
+	// ----- On/Off -----
+	service
+		.getCharacteristic(Characteristic.On)
+		.onGet(() => {
+			const currentOn = !!ctx.cync?.on;
+
+			if (env.isDeviceProbablyOffline(deviceId)) {
+				env.log.debug(
+					'Cync: Light On.get offline-heuristic hit; returning cached=%s for %s (deviceId=%s)',
+					String(currentOn),
+					deviceName,
+					deviceId,
+				);
+				return currentOn;
+			}
+
+			env.log.info(
+				'Cync: Light On.get -> %s for %s (deviceId=%s)',
+				String(currentOn),
+				deviceName,
+				deviceId,
+			);
+
+			return currentOn;
+		})
+		.onSet(async (value) => {
+			const cyncMeta = ctx.cync;
+
+			if (!cyncMeta?.deviceId) {
+				env.log.warn(
+					'Cync: Light On.set called for %s but no cync.deviceId in context',
+					deviceName,
+				);
+				return;
+			}
+
+			const on = value === true || value === 1;
+
+			env.log.info(
+				'Cync: Light On.set -> %s for %s (deviceId=%s)',
+				String(on),
+				deviceName,
+				cyncMeta.deviceId,
+			);
+
+			// Optimistic local cache; LAN update will confirm
+			cyncMeta.on = on;
+
+			try {
+				await env.tcpClient.setSwitchState(cyncMeta.deviceId, { on });
+				env.markDeviceSeen(cyncMeta.deviceId);
+			} catch (err) {
+				env.log.warn(
+					'Cync: Light On.set failed for %s (deviceId=%s): %s',
+					deviceName,
+					cyncMeta.deviceId,
+					(err as Error).message ?? String(err),
+				);
+
+				throw new env.api.hap.HapStatusError(
+					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				);
+			}
+		});
+
+	// ----- Brightness (dimming via LAN combo_control) -----
+	service
+		.getCharacteristic(Characteristic.Brightness)
+		.onGet(() => {
+			const current = ctx.cync?.brightness;
+
+			const cachedBrightness =
+				typeof current === 'number'
+					? current
+					: (ctx.cync?.on ?? false) ? 100 : 0;
+
+			if (env.isDeviceProbablyOffline(deviceId)) {
+				env.log.debug(
+					'Cync: Light Brightness.get offline-heuristic hit; returning cached=%d for %s (deviceId=%s)',
+					cachedBrightness,
+					deviceName,
+					deviceId,
+				);
+				return cachedBrightness;
+			}
+
+			return cachedBrightness;
+		})
+		.onSet(async (value) => {
+			const cyncMeta = ctx.cync;
+
+			if (!cyncMeta?.deviceId) {
+				env.log.warn(
+					'Cync: Light Brightness.set called for %s but no cync.deviceId in context',
+					deviceName,
+				);
+				return;
+			}
+
+			const brightness = Math.max(0, Math.min(100, Number(value)));
+
+			if (!Number.isFinite(brightness)) {
+				env.log.warn(
+					'Cync: Light Brightness.set received invalid value=%o for %s (deviceId=%s)',
+					value,
+					deviceName,
+					cyncMeta.deviceId,
+				);
+				return;
+			}
+
+			// Optimistic cache
+			cyncMeta.brightness = brightness;
+			cyncMeta.on = brightness > 0;
+
+			env.log.info(
+				'Cync: Light Brightness.set -> %d for %s (deviceId=%s)',
+				brightness,
+				deviceName,
+				cyncMeta.deviceId,
+			);
+
+			try {
+				// If we're in "color mode", keep the existing RGB and scale brightness via setColor();
+				// otherwise treat this as a white-brightness change.
+				if (cyncMeta.colorActive && cyncMeta.rgb) {
+					await env.tcpClient.setColor(
+						cyncMeta.deviceId,
+						cyncMeta.rgb,
+						brightness,
+					);
+				} else {
+					await env.tcpClient.setBrightness(cyncMeta.deviceId, brightness);
+				}
+
+				env.markDeviceSeen(cyncMeta.deviceId);
+			} catch (err) {
+				env.log.warn(
+					'Cync: Light Brightness.set failed for %s (deviceId=%s): %s',
+					deviceName,
+					cyncMeta.deviceId,
+					(err as Error).message ?? String(err),
+				);
+
+				throw new env.api.hap.HapStatusError(
+					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				);
+			}
+		});
+
+	// ----- Hue -----
+	service
+		.getCharacteristic(Characteristic.Hue)
+		.onGet(() => {
+			const hue = typeof ctx.cync?.hue === 'number' ? ctx.cync.hue : 0;
+
+			if (env.isDeviceProbablyOffline(deviceId)) {
+				env.log.debug(
+					'Cync: Light Hue.get offline-heuristic hit; returning cached=%d for %s (deviceId=%s)',
+					hue,
+					deviceName,
+					deviceId,
+				);
+			}
+
+			return hue;
+		})
+		.onSet(async (value) => {
+			const cyncMeta = ctx.cync;
+
+			if (!cyncMeta?.deviceId) {
+				env.log.warn(
+					'Cync: Light Hue.set called for %s but no cync.deviceId in context',
+					deviceName,
+				);
+				return;
+			}
+
+			const hue = Math.max(0, Math.min(360, Number(value)));
+			if (!Number.isFinite(hue)) {
+				env.log.warn(
+					'Cync: Light Hue.set received invalid value=%o for %s (deviceId=%s)',
+					value,
+					deviceName,
+					cyncMeta.deviceId,
+				);
+				return;
+			}
+
+			// Use cached saturation/brightness if available, otherwise sane defaults
+			const saturation =
+        typeof cyncMeta.saturation === 'number' ? cyncMeta.saturation : 100;
+
+			const brightness =
+        typeof cyncMeta.brightness === 'number' ? cyncMeta.brightness : 100;
+
+			const rgb = hsvToRgb(hue, saturation, brightness);
+
+			// Optimistic cache
+			cyncMeta.hue = hue;
+			cyncMeta.saturation = saturation;
+			cyncMeta.rgb = rgb;
+			cyncMeta.colorActive = true;
+			cyncMeta.on = brightness > 0;
+			cyncMeta.brightness = brightness;
+
+			env.log.info(
+				'Cync: Light Hue.set -> %d for %s (deviceId=%s) -> rgb=(%d,%d,%d) brightness=%d',
+				hue,
+				deviceName,
+				cyncMeta.deviceId,
+				rgb.r,
+				rgb.g,
+				rgb.b,
+				brightness,
+			);
+
+			try {
+				await env.tcpClient.setColor(cyncMeta.deviceId, rgb, brightness);
+				env.markDeviceSeen(cyncMeta.deviceId);
+			} catch (err) {
+				env.log.warn(
+					'Cync: Light Hue.set failed for %s (deviceId=%s): %s',
+					deviceName,
+					cyncMeta.deviceId,
+					(err as Error).message ?? String(err),
+				);
+
+				throw new env.api.hap.HapStatusError(
+					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				);
+			}
+		});
+
+	// ----- Saturation -----
+	service
+		.getCharacteristic(Characteristic.Saturation)
+		.onGet(() => {
+			const sat = typeof ctx.cync?.saturation === 'number' ? ctx.cync.saturation : 100;
+
+			if (env.isDeviceProbablyOffline(deviceId)) {
+				env.log.debug(
+					'Cync: Light Saturation.get offline-heuristic hit; returning cached=%d for %s (deviceId=%s)',
+					sat,
+					deviceName,
+					deviceId,
+				);
+			}
+
+			return sat;
+		})
+		.onSet(async (value) => {
+			const cyncMeta = ctx.cync;
+
+			if (!cyncMeta?.deviceId) {
+				env.log.warn(
+					'Cync: Light Saturation.set called for %s but no cync.deviceId in context',
+					deviceName,
+				);
+				return;
+			}
+
+			const saturation = Math.max(0, Math.min(100, Number(value)));
+			if (!Number.isFinite(saturation)) {
+				env.log.warn(
+					'Cync: Light Saturation.set received invalid value=%o for %s (deviceId=%s)',
+					value,
+					deviceName,
+					cyncMeta.deviceId,
+				);
+				return;
+			}
+
+			const hue = typeof cyncMeta.hue === 'number' ? cyncMeta.hue : 0;
+
+			const brightness =
+        typeof cyncMeta.brightness === 'number' ? cyncMeta.brightness : 100;
+
+			const rgb = hsvToRgb(hue, saturation, brightness);
+
+			// Optimistic cache
+			cyncMeta.hue = hue;
+			cyncMeta.saturation = saturation;
+			cyncMeta.rgb = rgb;
+			cyncMeta.colorActive = true;
+			cyncMeta.on = brightness > 0;
+			cyncMeta.brightness = brightness;
+
+			env.log.info(
+				'Cync: Light Saturation.set -> %d for %s (deviceId=%s) -> rgb=(%d,%d,%d) brightness=%d',
+				saturation,
+				deviceName,
+				cyncMeta.deviceId,
+				rgb.r,
+				rgb.g,
+				rgb.b,
+				brightness,
+			);
+
+			try {
+				await env.tcpClient.setColor(cyncMeta.deviceId, rgb, brightness);
+				env.markDeviceSeen(cyncMeta.deviceId);
+			} catch (err) {
+				env.log.warn(
+					'Cync: Light Saturation.set failed for %s (deviceId=%s): %s',
+					deviceName,
+					cyncMeta.deviceId,
+					(err as Error).message ?? String(err),
+				);
+
+				throw new env.api.hap.HapStatusError(
+					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				);
+			}
+		});
+}

package/src/cync/cync-switch-accessory.ts

@@ -0,0 +1,119 @@
+// src/cync/cync-switch-accessory.ts
+import type { PlatformAccessory } from 'homebridge';
+import type { CyncDevice, CyncDeviceMesh } from './config-client.js';
+import type { CyncAccessoryContext, CyncAccessoryEnv } from './cync-accessory-helpers.js';
+import { applyAccessoryInformationFromCyncDevice } from './cync-accessory-helpers.js';
+
+export function configureCyncSwitchAccessory(
+	env: CyncAccessoryEnv,
+	mesh: CyncDeviceMesh,
+	device: CyncDevice,
+	accessory: PlatformAccessory,
+	deviceName: string,
+	deviceId: string,
+): void {
+	const service =
+    accessory.getService(env.api.hap.Service.Switch) ||
+    accessory.addService(env.api.hap.Service.Switch, deviceName);
+
+	const existingLight = accessory.getService(env.api.hap.Service.Lightbulb);
+	if (existingLight) {
+		env.log.info(
+			'Cync: removing stale Lightbulb service from %s (deviceId=%s) before configuring as Switch',
+			deviceName,
+			deviceId,
+		);
+		accessory.removeService(existingLight);
+	}
+
+	applyAccessoryInformationFromCyncDevice(env.api, accessory, device, deviceName, deviceId);
+
+	// Ensure context is initialized
+	const ctx = accessory.context as CyncAccessoryContext;
+	ctx.cync = ctx.cync ?? {
+		meshId: mesh.id,
+		deviceId,
+		productId: device.product_id,
+		on: false,
+	};
+
+	// Remember mapping for LAN updates
+	env.registerAccessoryForDevice(deviceId, accessory);
+	env.markDeviceSeen(deviceId);
+	env.startPollingDevice(deviceId);
+
+	service
+		.getCharacteristic(env.api.hap.Characteristic.On)
+		.onGet(() => {
+			const currentOn = !!ctx.cync?.on;
+
+			if (env.isDeviceProbablyOffline(deviceId)) {
+				env.log.debug(
+					'Cync: Switch On.get offline-heuristic hit; returning cached=%s for %s (deviceId=%s)',
+					String(currentOn),
+					deviceName,
+					deviceId,
+				);
+				return currentOn;
+			}
+
+			env.log.info(
+				'Cync: On.get -> %s for %s (deviceId=%s)',
+				String(currentOn),
+				deviceName,
+				deviceId,
+			);
+
+			return currentOn;
+		})
+		.onSet(async (value) => {
+			const cyncMeta = ctx.cync;
+
+			if (!cyncMeta?.deviceId) {
+				env.log.warn(
+					'Cync: Switch On.set called for %s but no cync.deviceId in context',
+					deviceName,
+				);
+				return;
+			}
+
+			const on = value === true || value === 1;
+
+			env.log.info(
+				'Cync: Switch On.set -> %s for %s (deviceId=%s)',
+				String(on),
+				deviceName,
+				cyncMeta.deviceId,
+			);
+
+			// Optimistic cache
+			cyncMeta.on = on;
+
+			try {
+				if (!on) {
+					await env.tcpClient.setSwitchState(cyncMeta.deviceId, { on: false });
+					env.markDeviceSeen(cyncMeta.deviceId);
+					return;
+				}
+
+				if (cyncMeta.colorActive && cyncMeta.rgb && typeof cyncMeta.brightness === 'number') {
+					await env.tcpClient.setColor(cyncMeta.deviceId, cyncMeta.rgb, cyncMeta.brightness);
+				} else {
+					await env.tcpClient.setSwitchState(cyncMeta.deviceId, { on: true });
+				}
+
+				env.markDeviceSeen(cyncMeta.deviceId);
+			} catch (err) {
+				env.log.warn(
+					'Cync: Switch On.set failed for %s (deviceId=%s): %s',
+					deviceName,
+					cyncMeta.deviceId,
+					(err as Error).message ?? String(err),
+				);
+
+				throw new env.api.hap.HapStatusError(
+					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				);
+			}
+		});
+}

package/src/cync/device-catalog.ts

@@ -30,22 +30,27 @@ export const DEVICE_CATALOG: Record<number, CyncDeviceModel> = {
 		marketingName: 'Cync reveal HD+',
 		// defaultCategory: Categories.LIGHTBULB,
 	},
+	// Legacy C by GE On/Off Smart Plug — original hardware
 	64: {
 		deviceType: 64,
-		modelName: 'Indoor Smart Plug',
-		marketingName: 'On/Off Smart Plug',
+		modelName: 'Indoor Smart Plug (CPLGSTDBLW1)',
+		marketingName: 'On/Off Smart Plug (CPLGSTDBLW1)',
+		notes: 'Legacy C by GE plug. FCC ID PUU-CPLGSTDBLW1. Original hardware revision. Final firmware 1.x.',
 		// defaultCategory: Categories.OUTLET,
 	},
+	// Legacy C by GE On/Off Smart Plug — revised hardware ("T" revision)
 	65: {
 		deviceType: 65,
-		modelName: 'Indoor Smart Plug',
-		marketingName: 'Cync Indoor Plug',
+		modelName: 'Indoor Smart Plug (CPLGSTDBLW1-T)',
+		marketingName: 'On/Off Smart Plug (CPLGSTDBLW1-T)',
+		notes: 'Legacy C by GE plug. FCC ID PUU-CPLGSTDBLW1T / HVIN CPLGSTDBLW1T. Revised hardware. Final firmware 2.x.',
 		// defaultCategory: Categories.OUTLET,
 	},
 	172: {
 		deviceType: 172,
 		modelName: 'Indoor Smart Plug (3in1)',
 		marketingName: 'Cync Indoor Smart Plug',
+		notes: 'Matter-capable hardware. Replaces legacy C by GE On/Off Smart Plug.',
 		// defaultCategory: Categories.OUTLET,
 	},
 };