@glasshome/sync-layer 0.1.7 → 0.1.8

package/dist/connection/subscription-manager.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Entity Subscription Manager
+ *
+ * Ref-counted registry that tracks which entity IDs need live updates
+ * from Home Assistant. When the active set changes, resubscribes with
+ * the new entity_ids filter so HA only sends diffs for displayed entities.
+ *
+ * @packageDocumentation
+ */
+import type { EntityId } from "../core/types";
+import type { SyncLayerConnection } from "./types";
+type UnsubscribeFn = () => Promise<void> | void;
+/**
+ * Register an entity for live updates. Returns an unregister function.
+ * Call from useEntity/useEntities hooks via onCleanup.
+ */
+export declare function registerEntity(entityId: EntityId): () => void;
+/**
+ * Get the current set of actively subscribed entity IDs.
+ */
+export declare function getActiveEntityIds(): Set<EntityId>;
+/**
+ * Set the connection reference used for resubscribing.
+ */
+export declare function setManagerConnection(connection: SyncLayerConnection): void;
+/**
+ * Set the resubscribe callback. Called by subscriptions.ts to wire
+ * the manager into the actual WS subscription lifecycle.
+ */
+export declare function setResubscribeHandler(handler: (conn: SyncLayerConnection, entityIds: EntityId[]) => Promise<UnsubscribeFn>): void;
+/**
+ * Store the current entity subscription's unsub function.
+ * Called after initial subscribe_entities.
+ */
+export declare function setCurrentEntityUnsub(unsub: UnsubscribeFn): void;
+/**
+ * Force a resubscribe with the current active set.
+ * Used on reconnect.
+ */
+export declare function forceResubscribe(): Promise<void>;
+/**
+ * Reset manager state. Used on disconnect or for testing.
+ */
+export declare function resetManager(): void;
+export {};

package/dist/connection/subscriptions.d.ts

@@ -6,7 +6,13 @@
  *
  * @packageDocumentation
  */
+import type { EntityId } from "../core/types";
 import type { SyncLayerConnection } from "./types";
+/**
+ * Subscribe to entity state updates with an entity_ids filter.
+ * Called by the subscription manager on flush.
+ */
+export declare function subscribeEntities(connection: SyncLayerConnection, entityIds: EntityId[]): Promise<() => Promise<void>>;
 /**
  * Subscribe to all relevant events from Home Assistant
  */

package/dist/core/types.d.ts

@@ -177,9 +177,7 @@ export interface EntityView {
     state: string;
     /** Entity attributes */
     attributes: Record<string, any>;
-    /** Last state change timestamp */
     lastChanged: Date;
-    /** Last update timestamp */
     lastUpdated: Date;
     /** Event context */
     context: {

package/dist/entities/views.d.ts

@@ -28,3 +28,8 @@ export declare function getAllEntityViews(): EntityView[];
  * Rebuild entity view
  */
 export declare function rebuildEntityView(entityId: EntityId): EntityView | undefined;
+/**
+ * Shallow equality check for EntityView.
+ * Compares fields that affect rendering; skips lastUpdated (heartbeat noise).
+ */
+export declare function entityViewEquals(a: EntityView | undefined, b: EntityView | undefined): boolean;

package/dist/history/query.d.ts

@@ -1,5 +1,12 @@
 import type { EntityId } from "../core/types";
 import type { EntityHistoryData, EntityHistoryQueryOptions } from "./types";
+export interface HistoryPoint {
+    entityId: EntityId;
+    stateValue: string;
+    attributes: Record<string, unknown>;
+    lastUpdated: number;
+    lastChanged?: number;
+}
 /** Check if an entity has active history tracking. */
 export declare function isHistoryTracked(entityId: EntityId): boolean;
 /** Start tracking history for an entity. Fetches initial backfill. */
@@ -11,3 +18,8 @@ export declare function untrackEntityHistory(entityId: EntityId): void;
  * Called by the entity subscription handler when a tracked entity changes.
  */
 export declare function appendHistoryPoint(entityId: EntityId, stateValue: string, attributes: Record<string, unknown>, lastUpdated: number, lastChanged?: number): void;
+/**
+ * Append multiple history points in a single setState(produce(...)).
+ * Called by the rAF-batched subscription flush.
+ */
+export declare function bulkAppendHistoryPoints(points: HistoryPoint[]): void;

package/dist/index.d.ts

@@ -28,10 +28,11 @@ export { getStream, refreshStream } from "./camera/query";
 export type { CameraStream, CameraStreamData, CameraStreams, EntityStreamQueryOptions, StreamFormat, StreamQueryOptions, StreamResult, } from "./camera/types";
 export { getWebRtcClientConfig, sendWebRtcCandidate, startWebRtcSession, } from "./camera/webrtc";
 export { buildAreaView, buildDeviceView, getAreaView, getAreaViews, } from "./entities/area-views";
-export { buildEntityView, getAllEntityViews, getEntityView, getEntityViews, } from "./entities/views";
+export { buildEntityView, entityViewEquals, getAllEntityViews, getEntityView, getEntityViews, } from "./entities/views";
 export { DOMAINS_USE_LAST_UPDATED, entityIdHistoryNeedsAttributes, LINE_ATTRIBUTES_TO_KEEP, NEED_ATTRIBUTE_DOMAINS, } from "./history/constants";
 export { fetchEntityHistory, fetchHistory, historyStateToTimeline } from "./history/fetch";
-export { appendHistoryPoint, isHistoryTracked, trackEntityHistory, untrackEntityHistory, } from "./history/query";
+export { appendHistoryPoint, bulkAppendHistoryPoints, isHistoryTracked, trackEntityHistory, untrackEntityHistory, } from "./history/query";
+export type { HistoryPoint } from "./history/query";
 export type { EntityHistoryData, EntityHistoryQueryOptions, EntityHistoryResult, EntityHistoryState, HistoryData, HistoryQueryOptions, HistoryResult, HistoryStates, TimelineState, } from "./history/types";
 export { fetchForecast, fetchForecastData, fetchForecasts } from "./weather/fetch";
 export { getForecast, getForecasts, refreshForecast, refreshForecasts } from "./weather/query";

package/dist/index.js

@@ -1,4 +1,5 @@
 import { createDemoFixtures, resetStore, setState, state } from "./demo-data-gELwUOS_.js";
+import { forceResubscribe, setManagerConnection, setResubscribeHandler } from "./subscription-manager-gR0qpDYZ.js";
 import { callService as callService$1, createConnection, createLongLivedTokenAuth, getAuth } from "home-assistant-js-websocket";
 import { produce, reconcile } from "solid-js/store";
 
@@ -756,60 +757,120 @@ function appendHistoryPoint(entityId, stateValue, attributes, lastUpdated, lastC
 		});
 	}));
 }
+/**
+* Append multiple history points in a single setState(produce(...)).
+* Called by the rAF-batched subscription flush.
+*/
+function bulkAppendHistoryPoints(points) {
+	if (points.length === 0) return;
+	setState(produce((s) => {
+		for (const { entityId, stateValue, attributes, lastUpdated, lastChanged } of points) {
+			const history = s.history[entityId];
+			if (!history) continue;
+			history.entityHistory.push({
+				s: stateValue,
+				a: attributes,
+				lu: lastUpdated,
+				lc: lastChanged
+			});
+			history.timeline.push({
+				timestamp: lastUpdated,
+				state: stateValue,
+				attributes,
+				lastChanged,
+				lastUpdated
+			});
+		}
+	}));
+}
 
 //#endregion
 //#region src/connection/subscriptions.ts
-/** Active subscription cleanup functions (managed externally from store) */
-let activeSubscriptions = [];
+/** Registry subscription cleanup functions (entity sub managed by subscription-manager) */
+let registrySubscriptions = [];
+/** Buffered messages waiting for next animation frame */
+let messageBuffer = [];
+let rafScheduled = false;
+function bufferMessage(message) {
+	messageBuffer.push(message);
+	if (!rafScheduled) {
+		rafScheduled = true;
+		const schedule = typeof requestAnimationFrame === "function" ? requestAnimationFrame : queueMicrotask;
+		schedule(flushMessageBuffer);
+	}
+}
+function flushMessageBuffer() {
+	rafScheduled = false;
+	const messages = messageBuffer;
+	messageBuffer = [];
+	if (messages.length === 0) return;
+	setState(produce((s) => {
+		for (const message of messages) {
+			if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) applyCompressedState(s, entityId, compressedState);
+			if (message.c) for (const [entityId, diff] of Object.entries(message.c)) applyStateDiff(s, entityId, diff);
+			if (message.r) for (const entityId of message.r) delete s.entities[entityId];
+		}
+	}));
+	const historyPoints = [];
+	for (const message of messages) {
+		if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) collectHistoryFromCompressed(historyPoints, entityId, compressedState);
+		if (message.c) {
+			for (const [entityId, diff] of Object.entries(message.c)) if (diff["+"]) collectHistoryFromDiff(historyPoints, entityId, diff["+"]);
+		}
+	}
+	if (historyPoints.length > 0) bulkAppendHistoryPoints(historyPoints);
+}
+/**
+* Subscribe to entity state updates with an entity_ids filter.
+* Called by the subscription manager on flush.
+*/
+async function subscribeEntities(connection, entityIds) {
+	const subscribeMsg = { type: "subscribe_entities" };
+	if (entityIds.length > 0) subscribeMsg.entity_ids = entityIds;
+	const unsub = await connection.subscribeMessage((message) => {
+		bufferMessage(message);
+	}, subscribeMsg);
+	return unsub;
+}
 /**
 * Subscribe to all relevant events from Home Assistant
 */
 async function subscribeToUpdates(conn) {
 	await cleanupSubscriptions();
+	setManagerConnection(conn);
+	setResubscribeHandler(subscribeEntities);
 	const registryUpdatedSub = await conn.subscribeEvents((event) => {
 		handleRegistryUpdate(event);
 	}, "entity_registry_updated");
-	activeSubscriptions.push(() => registryUpdatedSub());
+	registrySubscriptions.push(() => registryUpdatedSub());
 	const deviceRegistrySub = await conn.subscribeEvents((event) => {
 		handleDeviceRegistryUpdate(event);
 	}, "device_registry_updated");
-	activeSubscriptions.push(() => deviceRegistrySub());
+	registrySubscriptions.push(() => deviceRegistrySub());
 	const areaRegistrySub = await conn.subscribeEvents((event) => {
 		handleAreaRegistryUpdate(event);
 	}, "area_registry_updated");
-	activeSubscriptions.push(() => areaRegistrySub());
+	registrySubscriptions.push(() => areaRegistrySub());
 	const floorRegistrySub = await conn.subscribeEvents((event) => {
 		handleFloorRegistryUpdate(event);
 	}, "floor_registry_updated");
-	activeSubscriptions.push(() => floorRegistrySub());
+	registrySubscriptions.push(() => floorRegistrySub());
 	const labelRegistrySub = await conn.subscribeEvents((event) => {
 		handleLabelRegistryUpdate(event);
 	}, "label_registry_updated");
-	activeSubscriptions.push(() => labelRegistrySub());
+	registrySubscriptions.push(() => labelRegistrySub());
 	const statisticsSub = await conn.subscribeEvents((event) => {
 		handleStatisticsUpdate(event);
 	}, "recorder_5min_statistics_generated");
-	activeSubscriptions.push(() => statisticsSub());
-	const entityUpdatesSub = await conn.subscribeMessage((message) => {
-		setState(produce((s) => {
-			if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) applyCompressedState(s, entityId, compressedState);
-			if (message.c) for (const [entityId, diff] of Object.entries(message.c)) applyStateDiff(s, entityId, diff);
-			if (message.r) for (const entityId of message.r) delete s.entities[entityId];
-		}));
-		if (message.a) for (const [entityId, compressedState] of Object.entries(message.a)) maybeAppendHistory(entityId, compressedState);
-		if (message.c) {
-			for (const [entityId, diff] of Object.entries(message.c)) if (diff["+"]) maybeAppendHistoryFromDiff(entityId, diff["+"]);
-		}
-	}, { type: "subscribe_entities" });
-	activeSubscriptions.push(() => entityUpdatesSub());
+	registrySubscriptions.push(() => statisticsSub());
 }
 /**
 * Clean up all active subscriptions
 */
 async function cleanupSubscriptions() {
-	const subscriptions = [...activeSubscriptions];
+	const subscriptions = [...registrySubscriptions];
 	for (const unsub of subscriptions) await unsub();
-	activeSubscriptions = [];
+	registrySubscriptions = [];
 }
 async function handleRegistryUpdate(event) {
 	const { action, entity_id } = event.data;
@@ -848,24 +909,8 @@ async function handleAreaRegistryUpdate(event) {
 		if (!conn) return;
 		try {
 			const areas$1 = await conn.sendMessagePromise({ type: "config/area_registry/list" });
-			const areaApi = areas$1.find((a) => a.area_id === area_id || a.id === area_id);
-			if (areaApi) {
-				const area$1 = {
-					id: areaApi.area_id || areaApi.id,
-					name: areaApi.name,
-					normalized_name: areaApi.normalized_name || areaApi.name.toLowerCase().replace(/\s+/g, "_"),
-					aliases: Array.isArray(areaApi.aliases) ? areaApi.aliases : [],
-					floor_id: areaApi.floor_id ?? null,
-					humidity_entity_id: areaApi.humidity_entity_id ?? null,
-					icon: areaApi.icon ?? null,
-					labels: Array.isArray(areaApi.labels) ? areaApi.labels : [],
-					picture: areaApi.picture ?? null,
-					temperature_entity_id: areaApi.temperature_entity_id ?? null,
-					created_at: typeof areaApi.created_at === "number" ? new Date(areaApi.created_at * 1e3).toISOString() : areaApi.created_at,
-					modified_at: typeof areaApi.modified_at === "number" ? new Date(areaApi.modified_at * 1e3).toISOString() : areaApi.modified_at
-				};
-				updateArea(area$1);
-			}
+			const area$1 = areas$1.find((a) => a.id === area_id);
+			if (area$1) updateArea(area$1);
 		} catch (error) {
 			console.error("Error fetching area:", error);
 		}
@@ -919,21 +964,39 @@ function timestampToIso(timestamp) {
 	if (typeof timestamp === "string") return timestamp;
 	return new Date(timestamp * 1e3).toISOString();
 }
-function maybeAppendHistory(entityId, compressed) {
+function collectHistoryFromCompressed(points, entityId, compressed) {
 	if (!isHistoryTracked(entityId)) return;
 	const stateVal = compressed.s ?? compressed.state ?? "unknown";
 	const attributes = compressed.a ?? compressed.attributes ?? {};
 	const lu = compressed.lu ?? (compressed.last_updated ? new Date(compressed.last_updated).getTime() / 1e3 : Date.now() / 1e3);
 	const lc = compressed.lc ?? (compressed.last_changed ? new Date(compressed.last_changed).getTime() / 1e3 : void 0);
-	appendHistoryPoint(entityId, stateVal, attributes, lu, lc);
+	points.push({
+		entityId,
+		stateValue: stateVal,
+		attributes,
+		lastUpdated: lu,
+		lastChanged: lc
+	});
 }
-function maybeAppendHistoryFromDiff(entityId, additions) {
+function collectHistoryFromDiff(points, entityId, additions) {
 	if (!isHistoryTracked(entityId)) return;
-	const entity$1 = state.entities[entityId];
-	if (!entity$1) return;
+	const stateVal = additions.s ?? additions.state;
+	if (stateVal === void 0) return;
 	const lu = additions.lu ?? Date.now() / 1e3;
 	const lc = additions.lc;
-	appendHistoryPoint(entityId, entity$1.state, entity$1.attributes, lu, lc);
+	const attributes = additions.a ?? additions.attributes ?? {};
+	points.push({
+		entityId,
+		stateValue: stateVal,
+		attributes,
+		lastUpdated: lu,
+		lastChanged: lc
+	});
+}
+function shallowEqualAttributes(existing, incoming) {
+	const incomingKeys = Object.keys(incoming);
+	for (const key of incomingKeys) if (existing[key] !== incoming[key]) return false;
+	return true;
 }
 function applyCompressedState(s, entityId, compressed) {
 	const stateVal = compressed.s ?? compressed.state ?? "unknown";
@@ -945,7 +1008,16 @@ function applyCompressedState(s, entityId, compressed) {
 	};
 	const lastChanged = timestampToIso(compressed.lc ?? compressed.last_changed);
 	const lastUpdated = timestampToIso(compressed.lu ?? compressed.last_updated);
-	const entity$1 = {
+	const existing = s.entities[entityId];
+	if (existing) {
+		const stateChanged = existing.state !== stateVal;
+		const changedAt = existing.last_changed !== lastChanged;
+		if (stateChanged) existing.state = stateVal;
+		if (changedAt) existing.last_changed = lastChanged;
+		if (stateChanged || changedAt) existing.last_updated = lastUpdated;
+		if (!shallowEqualAttributes(existing.attributes, attributes)) Object.assign(existing.attributes, attributes);
+		if (existing.context.id !== context.id) existing.context = context;
+	} else s.entities[entityId] = {
 		entity_id: entityId,
 		state: stateVal,
 		attributes,
@@ -953,18 +1025,32 @@ function applyCompressedState(s, entityId, compressed) {
 		last_updated: lastUpdated,
 		context
 	};
-	s.entities[entityId] = entity$1;
 }
 function applyStateDiff(s, entityId, diff) {
 	const existing = s.entities[entityId];
 	if (!existing) return;
 	const additions = diff["+"];
 	if (additions) {
-		if (additions.s !== void 0) existing.state = additions.s;
-		if (additions.a) Object.assign(existing.attributes, additions.a);
-		if (additions.lc !== void 0) existing.last_changed = timestampToIso(additions.lc);
-		if (additions.lu !== void 0) existing.last_updated = timestampToIso(additions.lu);
-		if (additions.c) existing.context = additions.c;
+		let stateChanged = false;
+		if (additions.s !== void 0 && existing.state !== additions.s) {
+			existing.state = additions.s;
+			stateChanged = true;
+		}
+		if (additions.a) {
+			for (const [key, value] of Object.entries(additions.a)) if (existing.attributes[key] !== value) {
+				existing.attributes[key] = value;
+				stateChanged = true;
+			}
+		}
+		if (additions.lc !== void 0) {
+			const lcIso = timestampToIso(additions.lc);
+			if (existing.last_changed !== lcIso) {
+				existing.last_changed = lcIso;
+				stateChanged = true;
+			}
+		}
+		if (additions.lu !== void 0 && stateChanged) existing.last_updated = timestampToIso(additions.lu);
+		if (additions.c && existing.context.id !== additions.c.id) existing.context = additions.c;
 	}
 	const removals = diff["-"];
 	if (removals?.a) for (const key of removals.a) delete existing.attributes[key];
@@ -1053,6 +1139,7 @@ function setupEventHandlers(conn, options) {
 		}));
 		if (wasReconnecting) {
 			await loadInitialData(conn);
+			await forceResubscribe();
 			options.onReconnect?.();
 		}
 	});
@@ -1097,77 +1184,6 @@ async function loadInitialData(conn) {
 	}
 }
 
-//#endregion
-//#region src/entities/index.ts
-/**
-* Get all entity IDs
-*/
-function getAllEntityIds() {
-	return Object.keys(state.entities);
-}
-/**
-* Get entities by domain
-*/
-function getEntitiesByDomain(domain) {
-	return Object.keys(state.entities).filter((id) => extractDomain(id) === domain);
-}
-/**
-* Get entities via devices in area
-*
-* Only includes entities that inherit area from device (entity.area_id is null).
-*/
-function getEntitiesViaDevices(areaId) {
-	const devicesInArea = Object.values(state.devices).filter((device) => device.area_id === areaId);
-	const entityIds = [];
-	for (const device of devicesInArea) {
-		const deviceEntities = getEntitiesByDevice(device.id);
-		for (const entityId of deviceEntities) {
-			const registry = state.entityRegistry[entityId];
-			if (!registry?.area_id) entityIds.push(entityId);
-		}
-	}
-	return entityIds;
-}
-/**
-* Get entities by area
-*
-* Returns entities with direct area_id assignments and entities that inherit their area from devices.
-*/
-function getEntitiesByArea(areaId) {
-	const directEntityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) directEntityIds.push(entityId);
-	const deviceEntityIds = getEntitiesViaDevices(areaId);
-	return Array.from(new Set([...directEntityIds, ...deviceEntityIds]));
-}
-/**
-* Get entities by device
-*/
-function getEntitiesByDevice(deviceId) {
-	const entityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.device_id === deviceId) entityIds.push(entityId);
-	return entityIds;
-}
-/**
-* Get entities by floor
-*/
-function getEntitiesByFloor(floorId) {
-	const entityIds = [];
-	const areasOnFloor = Object.values(state.areas).filter((area$1) => area$1.floor_id === floorId);
-	for (const area$1 of areasOnFloor) {
-		const areaEntities = getEntitiesByArea(area$1.id);
-		entityIds.push(...areaEntities);
-	}
-	return entityIds;
-}
-/**
-* Get entities by label
-*/
-function getEntitiesByLabel(labelId) {
-	const entityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.labels?.includes(labelId)) entityIds.push(entityId);
-	return entityIds;
-}
-
 //#endregion
 //#region src/entities/views.ts
 /**
@@ -1253,9 +1269,29 @@ function getEntityViews(entityIds) {
 function getAllEntityViews() {
 	return getEntityViews(Object.keys(state.entities));
 }
+/**
+* Shallow equality check for EntityView.
+* Compares fields that affect rendering; skips lastUpdated (heartbeat noise).
+*/
+function entityViewEquals(a, b) {
+	if (a === b) return true;
+	if (!a || !b) return false;
+	return a.id === b.id && a.state === b.state && a.lastChanged.getTime() === b.lastChanged.getTime() && a.name === b.name && a.friendlyName === b.friendlyName && a.areaId === b.areaId && a.deviceId === b.deviceId && a.icon === b.icon && a.isDisabled === b.isDisabled && a.isHidden === b.isHidden && a.attributes === b.attributes;
+}
 
 //#endregion
 //#region src/entities/area-views.ts
+function getDevicesForArea(areaId) {
+	const result = [];
+	for (const device of Object.values(state.devices)) if (device.area_id === areaId) result.push(device);
+	return result;
+}
+function getEntityIdsForArea(areaId, deviceIdsInArea) {
+	const entityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) entityIds.push(entityId);
+	else if (!entry.area_id && entry.device_id && deviceIdsInArea.has(entry.device_id)) entityIds.push(entityId);
+	return entityIds;
+}
 /**
 * Build a DeviceView from registry data
 */
@@ -1280,12 +1316,10 @@ function buildDeviceView(device) {
 function buildAreaView(areaId) {
 	const area$1 = state.areas[areaId];
 	if (!area$1) throw new Error(`Area ${areaId} not found`);
-	const directEntityIds = [];
-	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) directEntityIds.push(entityId);
-	const deviceEntityIds = getEntitiesViaDevices(areaId);
-	const allEntityIds = Array.from(new Set([...directEntityIds, ...deviceEntityIds]));
+	const devicesInArea = getDevicesForArea(areaId);
+	const deviceIdsInArea = new Set(devicesInArea.map((d) => d.id));
+	const allEntityIds = getEntityIdsForArea(areaId, deviceIdsInArea);
 	const areaEntities = allEntityIds.length > 0 ? getEntityViews(allEntityIds) : [];
-	const devicesInArea = Object.values(state.devices).filter((device) => device.area_id === areaId);
 	const devices = devicesInArea.map((device) => buildDeviceView(device));
 	return {
 		id: areaId,
@@ -1416,6 +1450,77 @@ function area(areaId) {
 	return getAreaView(areaId);
 }
 
+//#endregion
+//#region src/entities/index.ts
+/**
+* Get all entity IDs
+*/
+function getAllEntityIds() {
+	return Object.keys(state.entities);
+}
+/**
+* Get entities by domain
+*/
+function getEntitiesByDomain(domain) {
+	return Object.keys(state.entities).filter((id) => extractDomain(id) === domain);
+}
+/**
+* Get entities via devices in area
+*
+* Only includes entities that inherit area from device (entity.area_id is null).
+*/
+function getEntitiesViaDevices(areaId) {
+	const devicesInArea = Object.values(state.devices).filter((device) => device.area_id === areaId);
+	const entityIds = [];
+	for (const device of devicesInArea) {
+		const deviceEntities = getEntitiesByDevice(device.id);
+		for (const entityId of deviceEntities) {
+			const registry = state.entityRegistry[entityId];
+			if (!registry?.area_id) entityIds.push(entityId);
+		}
+	}
+	return entityIds;
+}
+/**
+* Get entities by area
+*
+* Returns entities with direct area_id assignments and entities that inherit their area from devices.
+*/
+function getEntitiesByArea(areaId) {
+	const directEntityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.area_id === areaId) directEntityIds.push(entityId);
+	const deviceEntityIds = getEntitiesViaDevices(areaId);
+	return Array.from(new Set([...directEntityIds, ...deviceEntityIds]));
+}
+/**
+* Get entities by device
+*/
+function getEntitiesByDevice(deviceId) {
+	const entityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.device_id === deviceId) entityIds.push(entityId);
+	return entityIds;
+}
+/**
+* Get entities by floor
+*/
+function getEntitiesByFloor(floorId) {
+	const entityIds = [];
+	const areasOnFloor = Object.values(state.areas).filter((area$1) => area$1.floor_id === floorId);
+	for (const area$1 of areasOnFloor) {
+		const areaEntities = getEntitiesByArea(area$1.id);
+		entityIds.push(...areaEntities);
+	}
+	return entityIds;
+}
+/**
+* Get entities by label
+*/
+function getEntitiesByLabel(labelId) {
+	const entityIds = [];
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entry.labels?.includes(labelId)) entityIds.push(entityId);
+	return entityIds;
+}
+
 //#endregion
 //#region src/query/memoization.ts
 /**
@@ -2174,4 +2279,4 @@ async function refreshForecasts(entityId, types) {
 const VERSION = "0.1.0";
 
 //#endregion
-export { DOMAINS_USE_LAST_UPDATED, LINE_ATTRIBUTES_TO_KEEP, NEED_ATTRIBUTE_DOMAINS, VERSION, addDebugIncomingMessageListener, addDebugOutgoingMessageListener, appendHistoryPoint, applyDemoServiceCall, area, areas, authenticateWithOAuth, authenticateWithToken, batchEntityUpdates, batchServiceCalls, buildAreaView, buildDeviceView, buildEntityView, callService, createDemoFixtures, disconnect, entities, entitiesByAreaAndDomain, entitiesWhere, entity, entityIdHistoryNeedsAttributes, extractDomain, fetchEntityHistory, fetchForecast, fetchForecastData, fetchForecasts, fetchHistory, fetchStream, fetchStreamData, getAllEntityViews, getAreaView, getAreaViews, getConnection, getEntityView, getEntityViews, getForecast, getForecasts, getStream, getWebRtcClientConfig, historyStateToTimeline, initConnection, isAuthValid, isConnected, isDemoMode, isHistoryTracked, loadDemoData, refreshAuth, refreshForecast, refreshForecasts, refreshStream, resetStore, searchEntities, sendCommand, sendWebRtcCandidate, setState, startWebRtcSession, state, toggle, trackEntityHistory, turnOff, turnOn, unloadDemoData, untrackEntityHistory, updateEntity };
+export { DOMAINS_USE_LAST_UPDATED, LINE_ATTRIBUTES_TO_KEEP, NEED_ATTRIBUTE_DOMAINS, VERSION, addDebugIncomingMessageListener, addDebugOutgoingMessageListener, appendHistoryPoint, applyDemoServiceCall, area, areas, authenticateWithOAuth, authenticateWithToken, batchEntityUpdates, batchServiceCalls, buildAreaView, buildDeviceView, buildEntityView, bulkAppendHistoryPoints, callService, createDemoFixtures, disconnect, entities, entitiesByAreaAndDomain, entitiesWhere, entity, entityIdHistoryNeedsAttributes, entityViewEquals, extractDomain, fetchEntityHistory, fetchForecast, fetchForecastData, fetchForecasts, fetchHistory, fetchStream, fetchStreamData, getAllEntityViews, getAreaView, getAreaViews, getConnection, getEntityView, getEntityViews, getForecast, getForecasts, getStream, getWebRtcClientConfig, historyStateToTimeline, initConnection, isAuthValid, isConnected, isDemoMode, isHistoryTracked, loadDemoData, refreshAuth, refreshForecast, refreshForecasts, refreshStream, resetStore, searchEntities, sendCommand, sendWebRtcCandidate, setState, startWebRtcSession, state, toggle, trackEntityHistory, turnOff, turnOn, unloadDemoData, untrackEntityHistory, updateEntity };

package/dist/solid/hooks.d.ts

@@ -16,16 +16,20 @@ import { callService, toggle, turnOff, turnOn } from "@glasshome/sync-layer";
 /**
  * Get a reactive EntityView for an entity ID.
  *
- * Direct createMemo over store -- zero overhead, fine-grained reactivity.
+ * Registers the entity for live updates via the subscription manager.
  * Only re-runs when the specific entity's data changes.
  */
 export declare function useEntity(entityId: Accessor<string> | string): Accessor<EntityView | undefined>;
 /**
  * Get reactive EntityViews for multiple entity IDs.
+ *
+ * Registers all entity IDs for live updates via the subscription manager.
  */
 export declare function useEntities(entityIds: Accessor<string[]>): Accessor<EntityView[]>;
 /**
  * Get raw HassEntity state (without EntityView transformation).
+ *
+ * Registers the entity for live updates via the subscription manager.
  */
 export declare function useEntityState(entityId: Accessor<string> | string): Accessor<HassEntity | undefined>;
 /**
@@ -56,6 +60,8 @@ export declare function useToggle(): typeof toggle;
 export declare function useAreas(): Accessor<AreaView[]>;
 /**
  * Get a reactive AreaView for a specific area.
+ *
+ * Registers all entities in the area for live updates.
  */
 export declare function useArea(areaId: Accessor<string> | string): Accessor<AreaView | undefined>;
 /**

package/dist/solid/index.js

@@ -1,34 +1,62 @@
-import { createMemo } from "solid-js";
-import { buildAreaView, callService, extractDomain, getEntityView, state, toggle, turnOff, turnOn } from "@glasshome/sync-layer";
+import { registerEntity } from "../subscription-manager-gR0qpDYZ.js";
+import { createEffect, createMemo, onCleanup } from "solid-js";
+import { buildAreaView, callService, entityViewEquals, extractDomain, getEntityView, state, toggle, turnOff, turnOn } from "@glasshome/sync-layer";
 
 //#region src/solid/hooks.ts
 /**
 * Get a reactive EntityView for an entity ID.
 *
-* Direct createMemo over store -- zero overhead, fine-grained reactivity.
+* Registers the entity for live updates via the subscription manager.
 * Only re-runs when the specific entity's data changes.
 */
 function useEntity(entityId) {
 	const getId = typeof entityId === "function" ? entityId : () => entityId;
+	createEffect(() => {
+		const id = getId();
+		if (!id) return;
+		const unregister = registerEntity(id);
+		onCleanup(unregister);
+	});
 	return createMemo(() => {
 		const id = getId();
 		if (!id) return void 0;
 		return getEntityView(id);
-	});
+	}, void 0, { equals: entityViewEquals });
 }
 /**
 * Get reactive EntityViews for multiple entity IDs.
+*
+* Registers all entity IDs for live updates via the subscription manager.
 */
 function useEntities(entityIds) {
+	createEffect(() => {
+		const ids = entityIds();
+		const unregisters = ids.map((id) => registerEntity(id));
+		onCleanup(() => {
+			for (const unreg of unregisters) unreg();
+		});
+	});
 	return createMemo(() => {
 		return entityIds().map((id) => getEntityView(id)).filter((v) => v !== void 0);
-	});
+	}, void 0, { equals: (a, b) => {
+		if (a.length !== b.length) return false;
+		for (let i = 0; i < a.length; i++) if (!entityViewEquals(a[i], b[i])) return false;
+		return true;
+	} });
 }
 /**
 * Get raw HassEntity state (without EntityView transformation).
+*
+* Registers the entity for live updates via the subscription manager.
 */
 function useEntityState(entityId) {
 	const getId = typeof entityId === "function" ? entityId : () => entityId;
+	createEffect(() => {
+		const id = getId();
+		if (!id) return;
+		const unregister = registerEntity(id);
+		onCleanup(unregister);
+	});
 	return createMemo(() => state.entities[getId()]);
 }
 /**
@@ -77,14 +105,20 @@ function useAreas() {
 				return void 0;
 			}
 		}).filter((v) => v !== void 0);
-	});
+	}, void 0, { equals: (a, b) => {
+		if (a.length !== b.length) return false;
+		for (let i = 0; i < a.length; i++) if (a[i].id !== b[i].id || a[i].modifiedAt !== b[i].modifiedAt || a[i].entities.length !== b[i].entities.length) return false;
+		return true;
+	} });
 }
 /**
 * Get a reactive AreaView for a specific area.
+*
+* Registers all entities in the area for live updates.
 */
 function useArea(areaId) {
 	const getId = typeof areaId === "function" ? areaId : () => areaId;
-	return createMemo(() => {
+	const view = createMemo(() => {
 		const id = getId();
 		if (!id || !state.areas[id]) return void 0;
 		try {
@@ -93,6 +127,15 @@ function useArea(areaId) {
 			return void 0;
 		}
 	});
+	createEffect(() => {
+		const v = view();
+		if (!v) return;
+		const unregisters = v.entityIds.map((id) => registerEntity(id));
+		onCleanup(() => {
+			for (const unreg of unregisters) unreg();
+		});
+	});
+	return view;
 }
 /**
 * Get reactive entity history data.

package/dist/subscription-manager-gR0qpDYZ.js

@@ -0,0 +1,96 @@
+//#region src/connection/subscription-manager.ts
+/** Ref counts — how many consumers need each entity */
+const refCounts = /* @__PURE__ */ new Map();
+/** Current HA subscription unsub function */
+let currentEntityUnsub = null;
+/** Snapshot of entity IDs in the current HA subscription */
+let subscribedIds = /* @__PURE__ */ new Set();
+/** Connection reference for resubscribing */
+let conn = null;
+/** Pending flush timer (microtask for register, timeout for unregister) */
+let flushScheduled = false;
+/** Delayed unregister timeout */
+let unregisterTimeout = null;
+/** Callback invoked on resubscribe — set by subscriptions.ts */
+let onResubscribe = null;
+/** Delay before unregistered entities are actually removed from subscription */
+const UNREGISTER_DELAY_MS = 5e3;
+/** Guard against concurrent flush() calls */
+let flushInFlight = false;
+/**
+* Register an entity for live updates. Returns an unregister function.
+* Call from useEntity/useEntities hooks via onCleanup.
+*/
+function registerEntity(entityId) {
+	refCounts.set(entityId, (refCounts.get(entityId) ?? 0) + 1);
+	scheduleFlush();
+	return () => unregisterEntity(entityId);
+}
+/**
+* Set the connection reference used for resubscribing.
+*/
+function setManagerConnection(connection) {
+	conn = connection;
+	if (refCounts.size > 0) scheduleFlush();
+}
+/**
+* Set the resubscribe callback. Called by subscriptions.ts to wire
+* the manager into the actual WS subscription lifecycle.
+*/
+function setResubscribeHandler(handler) {
+	onResubscribe = handler;
+}
+/**
+* Force a resubscribe with the current active set.
+* Used on reconnect.
+*/
+async function forceResubscribe() {
+	await flush();
+}
+function unregisterEntity(entityId) {
+	const count = (refCounts.get(entityId) ?? 1) - 1;
+	if (count <= 0) refCounts.delete(entityId);
+	else refCounts.set(entityId, count);
+	scheduleDelayedFlush();
+}
+function scheduleFlush() {
+	if (flushScheduled) return;
+	flushScheduled = true;
+	queueMicrotask(() => {
+		flushScheduled = false;
+		flush();
+	});
+}
+function scheduleDelayedFlush() {
+	if (unregisterTimeout) return;
+	unregisterTimeout = setTimeout(() => {
+		unregisterTimeout = null;
+		flush();
+	}, UNREGISTER_DELAY_MS);
+}
+async function flush() {
+	if (!conn || !onResubscribe) return;
+	if (flushInFlight) return;
+	flushInFlight = true;
+	try {
+		const newIds = new Set(refCounts.keys());
+		if (setsEqual(newIds, subscribedIds)) return;
+		const oldUnsub = currentEntityUnsub;
+		const entityIds = [...newIds];
+		currentEntityUnsub = await onResubscribe(conn, entityIds);
+		subscribedIds = newIds;
+		if (oldUnsub) try {
+			await oldUnsub();
+		} catch {}
+	} finally {
+		flushInFlight = false;
+	}
+}
+function setsEqual(a, b) {
+	if (a.size !== b.size) return false;
+	for (const id of a) if (!b.has(id)) return false;
+	return true;
+}
+
+//#endregion
+export { forceResubscribe, registerEntity, setManagerConnection, setResubscribeHandler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glasshome/sync-layer",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Type-safe, reactive state synchronization layer for Home Assistant",
   "repository": {
     "type": "git",