@glasshome/sync-layer 0.1.11 → 0.1.13

package/dist/connection/manager.d.ts

@@ -36,6 +36,13 @@ export declare function getConnection(): Connection | null;
  * Check if currently connected
  */
 export declare function isConnected(): boolean;
+/**
+ * Get the underlying socket's connected flag.
+ *
+ * Exposed so apps can render a connection indicator in the UI. Distinct from
+ * `isConnected()` which reflects the manager's internal lifecycle state.
+ */
+export declare function getConnectionState(): boolean;
 /**
  * Refresh all data
  */

package/dist/core/types.d.ts

@@ -175,8 +175,13 @@ export interface EntityView {
     domain: EntityDomain;
     /** Current state value */
     state: string;
-    /** Entity attributes */
-    attributes: Record<string, any>;
+    /**
+     * Entity attributes from Home Assistant, excluding keys that are
+     * surfaced as canonical resolved fields elsewhere on EntityView
+     * (`deviceClass`, `unitOfMeasurement`, `friendlyName`, `icon`).
+     * Use those fields instead of reaching into `attributes`.
+     */
+    attributes: Omit<Record<string, any>, "device_class" | "unit_of_measurement" | "friendly_name" | "icon">;
     lastChanged: Date;
     lastUpdated: Date;
     /** Event context */

package/dist/index.d.ts

@@ -8,7 +8,7 @@
  */
 export { addDebugIncomingMessageListener, addDebugOutgoingMessageListener, } from "./connection/adapter";
 export type { ConnectionOptions } from "./connection/manager";
-export { disconnect, getConnection, initConnection, isConnected } from "./connection/manager";
+export { disconnect, getConnection, getConnectionState, initConnection, isConnected, } from "./connection/manager";
 export { registerEntity } from "./connection/subscription-manager";
 export type { SyncLayerConnection } from "./connection/types";
 export type { OAuthOptions } from "./connection/auth";

package/dist/index.js

@@ -1154,6 +1154,85 @@ function applyStateDiff(s, entityId, diff) {
 
 //#endregion
 //#region src/connection/manager.ts
+const HEARTBEAT_INTERVAL_MS = 3e4;
+const HEARTBEAT_TIMEOUT_MS = 15e3;
+const SUSPEND_DELAY_MS = 5 * 60 * 1e3;
+let heartbeatInterval = null;
+let suspendTimeout = null;
+let visiblePromiseResolve = null;
+let visibilityHandler = null;
+let pageshowHandler = null;
+function promiseTimeout(ms, promise) {
+	return new Promise((resolve, reject) => {
+		const timer = setTimeout(() => reject(new Error("Promise timeout")), ms);
+		promise.then((value) => {
+			clearTimeout(timer);
+			resolve(value);
+		}, (err) => {
+			clearTimeout(timer);
+			reject(err);
+		});
+	});
+}
+function clearSuspendTimeout() {
+	if (suspendTimeout !== null) {
+		clearTimeout(suspendTimeout);
+		suspendTimeout = null;
+	}
+}
+function resolveVisiblePromise() {
+	if (visiblePromiseResolve) {
+		visiblePromiseResolve();
+		visiblePromiseResolve = null;
+	}
+}
+function startHeartbeat(conn$1) {
+	stopHeartbeat();
+	heartbeatInterval = setInterval(() => {
+		promiseTimeout(HEARTBEAT_TIMEOUT_MS, conn$1.ping()).catch(() => {
+			conn$1.reconnect();
+		});
+	}, HEARTBEAT_INTERVAL_MS);
+}
+function stopHeartbeat() {
+	if (heartbeatInterval !== null) {
+		clearInterval(heartbeatInterval);
+		heartbeatInterval = null;
+	}
+}
+function setupLifecycleListeners(conn$1) {
+	if (typeof document === "undefined" || typeof window === "undefined") return;
+	teardownLifecycleListeners();
+	visibilityHandler = () => {
+		if (document.visibilityState === "hidden") {
+			const pending = new Promise((resolve) => {
+				visiblePromiseResolve = resolve;
+			});
+			conn$1.suspendReconnectUntil(pending);
+			clearSuspendTimeout();
+			suspendTimeout = setTimeout(() => {
+				conn$1.suspend();
+				suspendTimeout = null;
+			}, SUSPEND_DELAY_MS);
+		} else {
+			clearSuspendTimeout();
+			resolveVisiblePromise();
+		}
+	};
+	pageshowHandler = (event) => {
+		if (event.persisted) conn$1.reconnect();
+	};
+	document.addEventListener("visibilitychange", visibilityHandler);
+	window.addEventListener("pageshow", pageshowHandler);
+}
+function teardownLifecycleListeners() {
+	if (typeof document !== "undefined" && visibilityHandler) document.removeEventListener("visibilitychange", visibilityHandler);
+	if (typeof window !== "undefined" && pageshowHandler) window.removeEventListener("pageshow", pageshowHandler);
+	visibilityHandler = null;
+	pageshowHandler = null;
+	clearSuspendTimeout();
+	resolveVisiblePromise();
+}
 /**
 * Initialize connection to Home Assistant
 */
@@ -1180,6 +1259,8 @@ async function initConnection(options) {
 		setupEventHandlers(conn$1, options);
 		await loadInitialData(conn$1);
 		await subscribeToUpdates(wrappedConn);
+		setupLifecycleListeners(conn$1);
+		startHeartbeat(conn$1);
 		options.onConnect?.();
 		return conn$1;
 	} catch (error) {
@@ -1197,6 +1278,8 @@ async function initConnection(options) {
 */
 function disconnect() {
 	const conn$1 = state.conn;
+	stopHeartbeat();
+	teardownLifecycleListeners();
 	if (conn$1) conn$1.close();
 	setState(produce((s) => {
 		s.conn = null;
@@ -1215,6 +1298,16 @@ function getConnection() {
 function isConnected() {
 	return state.connectionState === "connected";
 }
+/**
+* Get the underlying socket's connected flag.
+*
+* Exposed so apps can render a connection indicator in the UI. Distinct from
+* `isConnected()` which reflects the manager's internal lifecycle state.
+*/
+function getConnectionState() {
+	const conn$1 = state.conn;
+	return conn$1 ? conn$1.connected : false;
+}
 function setupEventHandlers(conn$1, options) {
 	conn$1.addEventListener("disconnected", () => {
 		setState(produce((s) => {
@@ -1304,6 +1397,7 @@ function buildEntityView(entity$1, registry) {
 	const friendlyName = entity$1.attributes.friendly_name ?? registry?.name ?? entity$1.entity_id;
 	const name = registry?.name ?? friendlyName;
 	const iconResolution = resolveIcon(entity$1, registry);
+	const { device_class: _dc, unit_of_measurement: _uom, friendly_name: _fn, icon: _icon,...restAttributes } = entity$1.attributes;
 	let areaId = registry?.area_id ?? null;
 	if (areaId === null && registry?.device_id) {
 		const device = state.devices[registry.device_id];
@@ -1313,7 +1407,7 @@ function buildEntityView(entity$1, registry) {
 		id: entity$1.entity_id,
 		domain,
 		state: entity$1.state,
-		attributes: entity$1.attributes,
+		attributes: restAttributes,
 		lastChanged: new Date(entity$1.last_changed),
 		lastUpdated: new Date(entity$1.last_updated),
 		context: {
@@ -2416,4 +2510,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, 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, registerEntity, 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, getConnectionState, getEntityView, getEntityViews, getForecast, getForecasts, getStream, getWebRtcClientConfig, historyStateToTimeline, initConnection, isAuthValid, isConnected, isDemoMode, isHistoryTracked, loadDemoData, refreshAuth, refreshForecast, refreshForecasts, refreshStream, registerEntity, resetStore, searchEntities, sendCommand, sendWebRtcCandidate, setState, startWebRtcSession, state, toggle, trackEntityHistory, turnOff, turnOn, unloadDemoData, untrackEntityHistory, updateEntity };

package/dist/solid/index.js

@@ -179,9 +179,6 @@ function useStore(selector) {
 
 //#endregion
 //#region src/solid/indices.ts
-/**
-* Group items by a key function
-*/
 function groupBy(items, keyFn) {
 	const result = {};
 	for (const item of items) {
@@ -190,26 +187,14 @@ function groupBy(items, keyFn) {
 	}
 	return result;
 }
-/**
-* Create a lazily-initialized memo. The actual createMemo runs on first
-* access, inside whichever Solid root is current at that point.
-* This avoids top-level createMemo calls that execute outside any root.
-*/
-function lazyMemo(fn) {
-	let memo;
-	return () => {
-		if (!memo) memo = createMemo(fn);
-		return memo();
-	};
-}
 /** Entity IDs grouped by domain (e.g., "light" -> ["light.living_room", ...]) */
-const byDomain = lazyMemo(() => groupBy(Object.keys(state.entities), (id) => extractDomain(id)));
+const byDomain = () => groupBy(Object.keys(state.entities), (id) => extractDomain(id));
 /** Entity IDs grouped by area (via entity registry area_id) */
-const byArea = lazyMemo(() => groupBy(Object.keys(state.entityRegistry), (id) => state.entityRegistry[id]?.area_id ?? null));
+const byArea = () => groupBy(Object.keys(state.entityRegistry), (id) => state.entityRegistry[id]?.area_id ?? null);
 /** Entity IDs grouped by device (via entity registry device_id) */
-const byDevice = lazyMemo(() => groupBy(Object.keys(state.entityRegistry), (id) => state.entityRegistry[id]?.device_id ?? null));
+const byDevice = () => groupBy(Object.keys(state.entityRegistry), (id) => state.entityRegistry[id]?.device_id ?? null);
 /** Entity IDs grouped by floor (device -> area -> floor chain) */
-const byFloor = lazyMemo(() => {
+const byFloor = () => {
 	const result = {};
 	for (const [entityId, reg] of Object.entries(state.entityRegistry)) if (reg.device_id) {
 		const device = state.devices[reg.device_id];
@@ -219,15 +204,15 @@ const byFloor = lazyMemo(() => {
 		}
 	}
 	return result;
-});
+};
 /** Entity IDs grouped by label */
-const byLabel = lazyMemo(() => {
+const byLabel = () => {
 	const result = {};
 	for (const [entityId, reg] of Object.entries(state.entityRegistry)) for (const label of reg.labels ?? []) (result[label] ??= []).push(entityId);
 	return result;
-});
+};
 /** All entity IDs currently in the store */
-const allEntityIds = lazyMemo(() => Object.keys(state.entities));
+const allEntityIds = () => Object.keys(state.entities);
 
 //#endregion
 export { allEntityIds, byArea, byDevice, byDomain, byFloor, byLabel, useArea, useAreas, useCamera, useConnection, useEntities, useEntity, useEntityHistory, useEntityState, useForecast, useService, useStore, useToggle, useTurnOff, useTurnOn };

package/dist/solid/indices.d.ts

@@ -1,4 +1,5 @@
-/** Reactive derived entity indices — lazily created inside the caller's root. */
+/** Reactive derived entity indices. Each call reads from the SolidJS store directly,
+ * so consumers wrap in createMemo within their own reactive root for memoization. */
 import type { Accessor } from "solid-js";
 /** Entity IDs grouped by domain (e.g., "light" -> ["light.living_room", ...]) */
 export declare const byDomain: Accessor<Record<string, string[]>>;

package/package.json

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