homebridge-cync-app 0.1.8 → 0.1.9

package/src/cync/cync-client.ts

@@ -28,15 +28,48 @@ export class CyncClient {
 	private readonly log: CyncLogger;
 	private readonly configClient: ConfigClient;
 	private readonly tcpClient: TcpClient;
-
+	private readonly unsupportedPropertiesProductIds = new Set<string>();
 	private readonly tokenStore: CyncTokenStore;
 	private tokenData: CyncTokenData | null = null;
+	private isDevicePropertyNotExistsError(err: unknown): boolean {
+		if (!err) {
+			return false;
+		}
+
+		type ErrorWithShape = {
+			status?: number;
+			error?: {
+				code?: number;
+				msg?: string;
+			};
+			message?: string;
+		};
+
+		const e = err as ErrorWithShape;
+
+		// Observed cloud response:
+		// HTTP 404 Not Found { error: { msg: 'device property not exists', code: 4041009 } }
+		if (e.status === 404 && e.error?.code === 4041009) {
+			return true;
+		}
+
+		// Fallback (if shape changes or gets wrapped)
+		if (e.message && e.message.includes('device property not exists')) {
+			return true;
+		}
 
+		return false;
+	}
+
+	private formatMeshLabel(mesh: { name?: string | null; id: string | number }): string {
+		const rawName = typeof mesh.name === 'string' ? mesh.name.trim() : '';
+		return rawName.length > 0 ? rawName : `No Name (id=${String(mesh.id)})`;
+	}
 	// Populated after successful login.
 	private session: CyncLoginSession | null = null;
 	private cloudConfig: CyncCloudConfig | null = null;
 
-	// ### 🧩 LAN Topology Cache: mirrors HA's home_devices / home_controllers / switchID_to_homeID
+	// LAN Topology Cache: mirrors HA's home_devices / home_controllers / switchID_to_homeID
 	private homeDevices: Record<string, string[]> = {};
 	private homeControllers: Record<string, number[]> = {};
 	private switchIdToHomeId: Record<number, string> = {};
@@ -52,7 +85,7 @@ export class CyncClient {
 	// Optional LAN update hook for the platform
 	private lanUpdateHandler: ((update: unknown) => void) | null = null;
 
-	// ### 🧩 Password Login Helper: background username/password login for new tokens
+	// Password Login Helper: background username/password login for new tokens
 	private async loginWithPasswordForToken(): Promise<CyncTokenData | null> {
 		const { username, password } = this.loginConfig;
 
@@ -139,12 +172,12 @@ export class CyncClient {
 		}
 	}
 
-	// ### 🧩 LAN Update Bridge: allow platform to handle device updates
+	// LAN Update Bridge: allow platform to handle device updates
 	public onLanDeviceUpdate(handler: (update: unknown) => void): void {
 		this.lanUpdateHandler = handler;
 	}
 
-	// ### 🧩 LAN Auth Blob Getter: Returns the LAN login code if available
+	// LAN Auth Blob Getter: Returns the LAN login code if available
 	public getLanLoginCode(): Uint8Array {
 		if (!this.tokenData?.lanLoginCode) {
 			this.log.debug('CyncClient: getLanLoginCode() → no LAN blob in token store.');
@@ -184,7 +217,7 @@ export class CyncClient {
 		);
 	}
 
-	// ### 🧩 LAN Login Code Builder
+	// LAN Login Code Builder
 	private buildLanLoginCode(authorize: string, userId: number): Uint8Array {
 		const authorizeBytes = Buffer.from(authorize, 'ascii');
 
@@ -408,7 +441,7 @@ export class CyncClient {
 	 *   // user reads email, gets code…
 	 *   await client.submitTwoFactor(username, password, code); // completes login
 	 */
-	// ### 🧩 Refresh Error Detector: identifies "Access-Token Expired" responses
+	// Refresh Error Detector: identifies "Access-Token Expired" responses
 	private isAccessTokenExpiredError(err: unknown): boolean {
 		if (!err) {
 			return false;
@@ -456,7 +489,7 @@ export class CyncClient {
 		return false;
 	}
 
-	// ### 🧩 Token Refresh Helper: exchanges refreshToken for a new accessToken, or falls back to password login
+	// Token Refresh Helper: exchanges refreshToken for a new accessToken, or falls back to password login
 	private async refreshAccessToken(
 		stored: CyncTokenData,
 	): Promise<CyncTokenData | null> {
@@ -510,7 +543,7 @@ export class CyncClient {
 		return viaPassword;
 	}
 
-	// ### 🧩 Cloud Config Wrapper: auto-refreshes access token
+	// Cloud Config Wrapper: auto-refreshes access token
 	private async getCloudConfigWithRefresh(): Promise<CyncCloudConfig> {
 		try {
 			return await this.configClient.getCloudConfig();
@@ -530,18 +563,33 @@ export class CyncClient {
 		}
 	}
 
-	// ### 🧩 Device Properties Wrapper: auto-refresh on Access-Token Expired for mesh calls
+	// Device Properties Wrapper: auto-refresh on Access-Token Expired for mesh calls
 	private async getDevicePropertiesWithRefresh(
 		productId: string | number,
 		meshId: string | number,
 	): Promise<Record<string, unknown>> {
-		// Normalise to strings for ConfigClient
 		const productIdStr = String(productId);
 		const meshIdStr = String(meshId);
 
+		// If we've already learned this product_id never supports the endpoint, skip.
+		if (this.unsupportedPropertiesProductIds.has(productIdStr)) {
+			return {};
+		}
+
 		try {
 			return await this.configClient.getDeviceProperties(productIdStr, meshIdStr);
 		} catch (err) {
+			// Expected case for some product lines: endpoint not implemented.
+			if (this.isDevicePropertyNotExistsError(err)) {
+				this.unsupportedPropertiesProductIds.add(productIdStr);
+				this.log.debug(
+					'CyncClient: properties unsupported for product_id=%s (mesh id=%s); caching and skipping.',
+					productIdStr,
+					meshIdStr,
+				);
+				return {};
+			}
+
 			if (this.isAccessTokenExpiredError(err) && this.tokenData) {
 				this.log.warn(
 					'CyncClient: access token expired when calling getDeviceProperties(); refreshing and retrying once.',
@@ -626,7 +674,7 @@ export class CyncClient {
 
 		// Debug: inspect per-mesh properties so we can find the real devices.
 		for (const mesh of cfg.meshes) {
-			const meshName = mesh.name ?? mesh.id;
+			const meshName = this.formatMeshLabel({ name: mesh.name, id: mesh.id });
 			const homeId = String(mesh.id);
 
 			this.log.debug(
@@ -639,7 +687,15 @@ export class CyncClient {
 			// Per-home maps, mirroring HA's CyncUserData.get_cync_config()
 			const homeDevices: string[] = [];
 			const homeControllers: number[] = [];
-
+			const productIdStr = String(mesh.product_id);
+			if (this.unsupportedPropertiesProductIds.has(productIdStr)) {
+				this.log.debug(
+					'CyncClient: skipping properties probe for mesh %s (product_id=%s) — previously marked unsupported.',
+					meshName,
+					productIdStr,
+				);
+				continue;
+			}
 			try {
 				const props = await this.getDevicePropertiesWithRefresh(
 					mesh.product_id,
@@ -663,7 +719,7 @@ export class CyncClient {
 						bulbsArray[0] ? Object.keys(bulbsArray[0] as Record<string, unknown>) : [],
 					);
 
-					// ### 🧩 Bulb Capability Debug: log each bulb so we can classify plugs vs lights
+					// Bulb Capability Debug: log each bulb so we can classify plugs vs lights
 					bulbsArray.forEach((bulb, index) => {
 						const record = bulb as Record<string, unknown>;
 
@@ -791,6 +847,15 @@ export class CyncClient {
 					);
 				}
 			} catch (err) {
+				if (this.isDevicePropertyNotExistsError(err)) {
+					this.log.debug(
+						'CyncClient: getDeviceProperties not supported for mesh %s (%s).',
+						meshName,
+						String(mesh.id),
+					);
+					continue;
+				}
+
 				this.log.warn(
 					'CyncClient: getDeviceProperties failed for mesh %s (%s): %s',
 					meshName,

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

@@ -55,19 +55,25 @@ export function configureCyncLightAccessory(
 	service
 		.getCharacteristic(Characteristic.On)
 		.onGet(() => {
+			const currentOn = !!ctx.cync?.on;
+
 			if (env.isDeviceProbablyOffline(deviceId)) {
-				throw new env.api.hap.HapStatusError(
-					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				env.log.debug(
+					'Cync: Light On.get offline-heuristic hit; returning cached=%s for %s (deviceId=%s)',
+					String(currentOn),
+					deviceName,
+					deviceId,
 				);
+				return currentOn;
 			}
 
-			const currentOn = !!ctx.cync?.on;
 			env.log.info(
 				'Cync: Light On.get -> %s for %s (deviceId=%s)',
 				String(currentOn),
 				deviceName,
 				deviceId,
 			);
+
 			return currentOn;
 		})
 		.onSet(async (value) => {
@@ -114,21 +120,24 @@ export function configureCyncLightAccessory(
 	service
 		.getCharacteristic(Characteristic.Brightness)
 		.onGet(() => {
-			if (env.isDeviceProbablyOffline(deviceId)) {
-				throw new env.api.hap.HapStatusError(
-					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
-				);
-			}
-
 			const current = ctx.cync?.brightness;
 
-			// If we have a cached LAN level, use it; otherwise infer from On.
-			if (typeof current === 'number') {
-				return current;
+			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;
 			}
 
-			const on = ctx.cync?.on ?? false;
-			return on ? 100 : 0;
+			return cachedBrightness;
 		})
 		.onSet(async (value) => {
 			const cyncMeta = ctx.cync;
@@ -196,18 +205,18 @@ export function configureCyncLightAccessory(
 	service
 		.getCharacteristic(Characteristic.Hue)
 		.onGet(() => {
+			const hue = typeof ctx.cync?.hue === 'number' ? ctx.cync.hue : 0;
+
 			if (env.isDeviceProbablyOffline(deviceId)) {
-				throw new env.api.hap.HapStatusError(
-					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				env.log.debug(
+					'Cync: Light Hue.get offline-heuristic hit; returning cached=%d for %s (deviceId=%s)',
+					hue,
+					deviceName,
+					deviceId,
 				);
 			}
 
-			const hue = ctx.cync?.hue;
-			if (typeof hue === 'number') {
-				return hue;
-			}
-			// Default to 0° (red) if we have no color history
-			return 0;
+			return hue;
 		})
 		.onSet(async (value) => {
 			const cyncMeta = ctx.cync;
@@ -280,17 +289,18 @@ export function configureCyncLightAccessory(
 	service
 		.getCharacteristic(Characteristic.Saturation)
 		.onGet(() => {
+			const sat = typeof ctx.cync?.saturation === 'number' ? ctx.cync.saturation : 100;
+
 			if (env.isDeviceProbablyOffline(deviceId)) {
-				throw new env.api.hap.HapStatusError(
-					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				env.log.debug(
+					'Cync: Light Saturation.get offline-heuristic hit; returning cached=%d for %s (deviceId=%s)',
+					sat,
+					deviceName,
+					deviceId,
 				);
 			}
 
-			const sat = ctx.cync?.saturation;
-			if (typeof sat === 'number') {
-				return sat;
-			}
-			return 100;
+			return sat;
 		})
 		.onSet(async (value) => {
 			const cyncMeta = ctx.cync;

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

@@ -45,19 +45,25 @@ export function configureCyncSwitchAccessory(
 	service
 		.getCharacteristic(env.api.hap.Characteristic.On)
 		.onGet(() => {
+			const currentOn = !!ctx.cync?.on;
+
 			if (env.isDeviceProbablyOffline(deviceId)) {
-				throw new env.api.hap.HapStatusError(
-					env.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE,
+				env.log.debug(
+					'Cync: Switch On.get offline-heuristic hit; returning cached=%s for %s (deviceId=%s)',
+					String(currentOn),
+					deviceName,
+					deviceId,
 				);
+				return currentOn;
 			}
 
-			const currentOn = !!ctx.cync?.on;
 			env.log.info(
 				'Cync: On.get -> %s for %s (deviceId=%s)',
 				String(currentOn),
 				deviceName,
 				deviceId,
 			);
+
 			return currentOn;
 		})
 		.onSet(async (value) => {
@@ -65,7 +71,7 @@ export function configureCyncSwitchAccessory(
 
 			if (!cyncMeta?.deviceId) {
 				env.log.warn(
-					'Cync: Light On.set called for %s but no cync.deviceId in context',
+					'Cync: Switch On.set called for %s but no cync.deviceId in context',
 					deviceName,
 				);
 				return;
@@ -74,27 +80,40 @@ export function configureCyncSwitchAccessory(
 			const on = value === true || value === 1;
 
 			env.log.info(
-				'Cync: Light On.set -> %s for %s (deviceId=%s)',
+				'Cync: Switch On.set -> %s for %s (deviceId=%s)',
 				String(on),
 				deviceName,
 				cyncMeta.deviceId,
 			);
 
+			// Optimistic cache
 			cyncMeta.on = on;
 
-			if (!on) {
-				// Off is always a plain power packet
-				await env.tcpClient.setSwitchState(cyncMeta.deviceId, { on: false });
-				return;
-			}
+			try {
+				if (!on) {
+					await env.tcpClient.setSwitchState(cyncMeta.deviceId, { on: false });
+					env.markDeviceSeen(cyncMeta.deviceId);
+					return;
+				}
 
-			// Turning on:
-			// - If we were in color mode with a known RGB + brightness, restore color.
-			// - Otherwise, just send a basic power-on packet.
-			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 });
+				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,
 	},
 };