@glasshome/sync-layer 0.2.2 → 0.3.1

package/README.md

@@ -2,7 +2,7 @@
 
 Type-safe, reactive state synchronization layer for Home Assistant.
 
-Provides connection management, entity querying, service calls, and reactive state via a SolidJS store — all with full TypeScript types powered by `@glasshome/ha-types`.
+Provides connection management, entity querying, service calls, and reactive state via a SolidJS store — all with full TypeScript types powered by `@glasshome/ha-types`. Part of [GlassHome](https://glasshome.app), the local-first dashboard for Home Assistant.
 
 ## Install
 

package/dist/connection/bridged.d.ts

@@ -7,7 +7,7 @@ import type { HaBridge } from "../worker/bridge-client";
  *
  * Call after bridge.connect() resolved. Returns when initial data is loaded.
  */
-export declare function attachBridgeToStore(bridge: HaBridge, hassUrl: string): Promise<void>;
+export declare function attachBridgeToStore(bridge: HaBridge, hassUrl: string, mediaProxyBase?: string): Promise<void>;
 /** Map worker connection-state messages onto the store. */
 export declare function applyBridgeConnState(state: "connected" | "disconnected" | "reconnecting"): void;
 /** Re-sync after the worker reports a completed reconnect. */

package/dist/core/store.d.ts

@@ -32,6 +32,9 @@ export interface GlassHomeState {
     connectionError: Error | null;
     /** Home Assistant base URL */
     hassUrl: string | null;
+    /** Same-origin prefix for the HA media proxy (e.g. "/ha-proxy/media"), or null
+     *  to resolve media directly against hassUrl. Set by the host at connect. */
+    mediaProxyBase: string | null;
     /** Home Assistant core config (unit system, locale, currency); null until loaded */
     config: import("@glasshome/ha-types").HassConfig | null;
     /** Live entity state (keyed by entity_id) */

package/dist/{demo-data-CavpxBw3.js → demo-data-DiGSP4EH.js}

@@ -6,6 +6,7 @@ const initialState = {
 	connectionState: "disconnected",
 	connectionError: null,
 	hassUrl: null,
+	mediaProxyBase: null,
 	config: null,
 	entities: {},
 	entityRegistry: {},

package/dist/entities/area-views.d.ts

@@ -1,8 +1,14 @@
 /**
  * Area View Builder
  *
- * Constructs unified AreaView objects by combining registry data
- * with computed entities and devices using the query engine.
+ * Constructs unified AreaView objects by combining registry data with computed
+ * entities and devices.
+ *
+ * Membership (which entities/devices belong to an area) is registry-driven and
+ * cheap; live entity *views* read entity state and are therefore exposed as a
+ * lazy `entities` getter. Callers that only need names, ids, or counts never
+ * touch entity state, so building the whole-area list does not recompute on
+ * every entity state tick.
  *
  * @packageDocumentation
  */
@@ -12,11 +18,12 @@ import type { AreaId, AreaView, DeviceRegistryEntry, DeviceView } from "../core/
  */
 export declare function buildDeviceView(device: DeviceRegistryEntry): DeviceView;
 /**
- * Build an AreaView from registry data using query engine
+ * Build an AreaView for a single area from registry data.
  */
 export declare function buildAreaView(areaId: AreaId): AreaView;
 /**
- * Get all area views
+ * Get all area views. Membership is resolved in a single registry pass; entity
+ * views stay lazy per area (see `assembleAreaView`).
  */
 export declare function getAreaViews(): AreaView[];
 /**

package/dist/index.d.ts

@@ -27,6 +27,7 @@ export type { CallServiceRequest, CoreEventType, Domain, EntityCategory, EntityR
 export { fetchStream, fetchStreamData } from "./camera/fetch";
 export { getStream, refreshStream } from "./camera/query";
 export { fetchEnergyPreferences } from "./energy/prefs";
+export { hassMediaUrl } from "./media/url";
 export type { EnergyDeviceConsumption, EnergyPreferences, EnergySource, } from "./energy/prefs";
 export type { CameraStream, CameraStreamData, CameraStreams, EntityStreamQueryOptions, StreamFormat, StreamQueryOptions, StreamResult, } from "./camera/types";
 export { getWebRtcClientConfig, sendWebRtcCandidate, startWebRtcSession, } from "./camera/webrtc";

package/dist/index.js

@@ -1,5 +1,5 @@
-import { ENERGY_ENTITY_IDS, createDemoFixtures, demoEnergyPreferences, energyEntityValue, formatEnergyState, isEnergyEntity, isSunUp, resetStore, setState, simulateEnergy, state, sunEvents, synthesizeEnergyHistory, synthesizeEnergyStatistics } from "./demo-data-CavpxBw3.js";
-import { runHaBridgeWorker } from "./worker-main-BYGgbA7k.js";
+import { ENERGY_ENTITY_IDS, createDemoFixtures, demoEnergyPreferences, energyEntityValue, formatEnergyState, isEnergyEntity, isSunUp, resetStore, setState, simulateEnergy, state, sunEvents, synthesizeEnergyHistory, synthesizeEnergyStatistics } from "./demo-data-DiGSP4EH.js";
+import { runHaBridgeWorker } from "./worker-main-DTbzEKor.js";
 import { createConnection, createLongLivedTokenAuth, getAuth } from "home-assistant-js-websocket";
 import { produce, reconcile } from "solid-js/store";
 
@@ -1568,16 +1568,46 @@ function entityViewEquals(a, b) {
 
 //#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;
+/** The area an entity belongs to: its own `area_id` wins; otherwise it inherits
+*  the area of its device. Null when neither resolves. */
+function entityAreaId(entry) {
+	if (entry.area_id) return entry.area_id;
+	if (entry.device_id) return state.devices[entry.device_id]?.area_id ?? null;
+	return null;
+}
+/** One pass over the device + entity registries → membership per area.
+*  O(devices + entities) for the whole home, vs the O(areas × (devices +
+*  entities)) of resolving each area independently. */
+function computeAreaMembership() {
+	const byArea = /* @__PURE__ */ new Map();
+	const ensure = (areaId) => {
+		let m = byArea.get(areaId);
+		if (!m) {
+			m = {
+				devices: [],
+				entityIds: []
+			};
+			byArea.set(areaId, m);
+		}
+		return m;
+	};
+	for (const device of Object.values(state.devices)) if (device.area_id) ensure(device.area_id).devices.push(device);
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) {
+		const areaId = entityAreaId(entry);
+		if (areaId) ensure(areaId).entityIds.push(entityId);
+	}
+	return byArea;
 }
-function getEntityIdsForArea(areaId, deviceIdsInArea) {
+/** Membership for a single area, without indexing every other area. */
+function membershipFor(areaId) {
+	const devices = [];
+	for (const device of Object.values(state.devices)) if (device.area_id === areaId) devices.push(device);
 	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;
+	for (const [entityId, entry] of Object.entries(state.entityRegistry)) if (entityAreaId(entry) === areaId) entityIds.push(entityId);
+	return {
+		devices,
+		entityIds
+	};
 }
 /**
 * Build a DeviceView from registry data
@@ -1597,17 +1627,16 @@ function buildDeviceView(device) {
 		disabledBy: device.disabled_by ?? null
 	};
 }
-/**
-* Build an AreaView from registry data using query engine
-*/
-function buildAreaView(areaId) {
+/** Assemble an AreaView from pre-resolved membership. `entities` is a lazy
+*  getter: materializing live EntityViews reads entity state, so deferring it
+*  keeps callers that only need names/ids/counts off the per-state-tick
+*  recompute path. The getter stays reactive — read inside a tracking scope it
+*  tracks those entities' state and updates like any other store read. */
+function assembleAreaView(areaId, membership) {
 	const area$1 = state.areas[areaId];
 	if (!area$1) throw new Error(`Area ${areaId} not found`);
-	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 devices = devicesInArea.map((device) => buildDeviceView(device));
+	const devices = membership.devices.map((device) => buildDeviceView(device));
+	const entityIds = membership.entityIds;
 	return {
 		id: areaId,
 		name: area$1.name,
@@ -1621,17 +1650,30 @@ function buildAreaView(areaId) {
 		humidityEntityId: area$1.humidity_entity_id ?? null,
 		createdAt: area$1.created_at ?? (/* @__PURE__ */ new Date()).toISOString(),
 		modifiedAt: area$1.modified_at ?? (/* @__PURE__ */ new Date()).toISOString(),
-		entities: areaEntities,
 		devices,
-		entityIds: allEntityIds,
-		deviceIds: devices.map((d) => d.id)
+		entityIds,
+		deviceIds: devices.map((d) => d.id),
+		get entities() {
+			return entityIds.length > 0 ? getEntityViews(entityIds) : [];
+		}
 	};
 }
 /**
-* Get all area views
+* Build an AreaView for a single area from registry data.
+*/
+function buildAreaView(areaId) {
+	return assembleAreaView(areaId, membershipFor(areaId));
+}
+/**
+* Get all area views. Membership is resolved in a single registry pass; entity
+* views stay lazy per area (see `assembleAreaView`).
 */
 function getAreaViews() {
-	return Object.keys(state.areas).map((areaId) => buildAreaView(areaId));
+	const membership = computeAreaMembership();
+	return Object.keys(state.areas).map((areaId) => assembleAreaView(areaId, membership.get(areaId) ?? {
+		devices: [],
+		entityIds: []
+	}));
 }
 /**
 * Get area view
@@ -2298,6 +2340,30 @@ async function fetchEnergyPreferences(connection) {
 	};
 }
 
+//#endregion
+//#region src/media/url.ts
+/**
+* Resolve an HA media reference (e.g. an entity's `entity_picture`, a camera
+* proxy path) to a URL the page can actually load.
+*
+* HA gives these as origin-relative paths (`/api/media_player_proxy/...?token=`)
+* carrying their own signed token. A bare `<img src>` would resolve them against
+* the dash origin and 404. When the host set `mediaProxyBase`, route through the
+* same-origin media proxy so the page CSP (`img-src 'self'`) covers it in every
+* mode, LAN and remote. Otherwise fall back to prefixing `hassUrl` directly
+* (the LAN-only path, used until a transport sets the proxy base).
+*
+* Absolute URLs and non-path values pass through untouched.
+*/
+function hassMediaUrl(path) {
+	if (!path) return void 0;
+	if (/^https?:\/\//i.test(path)) return path;
+	if (!path.startsWith("/")) return path;
+	const base = state.mediaProxyBase;
+	if (base) return `${base}?path=${encodeURIComponent(path)}`;
+	return state.hassUrl ? `${state.hassUrl}${path}` : path;
+}
+
 //#endregion
 //#region src/camera/webrtc.ts
 /**
@@ -2720,10 +2786,11 @@ async function refreshForecasts(entityId, types) {
 *
 * Call after bridge.connect() resolved. Returns when initial data is loaded.
 */
-async function attachBridgeToStore(bridge, hassUrl) {
+async function attachBridgeToStore(bridge, hassUrl, mediaProxyBase) {
 	setState(produce((s) => {
 		s.conn = bridge.conn;
 		s.hassUrl = hassUrl.replace(/\/$/, "");
+		s.mediaProxyBase = mediaProxyBase ?? null;
 		s.connectionState = "connected";
 		s.connectionError = null;
 	}));
@@ -2919,4 +2986,4 @@ function createHaBridge(worker, events = {}) {
 const VERSION = "0.2.1";
 
 //#endregion
-export { BridgeNeedsAuthError, DOMAINS_USE_LAST_UPDATED, LINE_ATTRIBUTES_TO_KEEP, MAX_HISTORY_POINTS, NEED_ATTRIBUTE_DOMAINS, VERSION, addDebugIncomingMessageListener, addDebugOutgoingMessageListener, appendHistoryPoint, applyBridgeConnState, applyDemoServiceCall, area, areas, attachBridgeToStore, authenticateWithOAuth, authenticateWithToken, batchEntityUpdates, batchServiceCalls, buildAreaView, buildDeviceView, buildEntityView, bulkAppendHistoryPoints, callService, createDemoFixtures, createHaBridge, detachBridgeFromStore, disconnect, entities, entitiesByAreaAndDomain, entitiesWhere, entity, entityIdHistoryNeedsAttributes, entityViewEquals, extractDomain, fetchEnergyPreferences, fetchEntityHistory, fetchForecast, fetchForecastData, fetchForecasts, fetchHistory, fetchStatisticsDuringPeriod, fetchStream, fetchStreamData, getAllEntityViews, getAreaView, getAreaViews, getConnection, getConnectionState, getEntityView, getEntityViews, getForecast, getForecasts, getStream, getWebRtcClientConfig, historyStateToTimeline, initConnection, isAuthValid, isConnected, isDemoMode, isHistoryTracked, loadDemoData, normalizeStatisticTime, refreshAuth, refreshForecast, refreshForecasts, refreshStream, registerEntity, reloadAfterBridgeReconnect, resetStore, runHaBridgeWorker, searchEntities, sendCommand, sendWebRtcCandidate, setState, startDemoEnergyTicker, startWebRtcSession, state, stopDemoEnergyTicker, toggle, trackEntityHistory, turnOff, turnOn, unloadDemoData, untrackEntityHistory, updateEntity };
+export { BridgeNeedsAuthError, DOMAINS_USE_LAST_UPDATED, LINE_ATTRIBUTES_TO_KEEP, MAX_HISTORY_POINTS, NEED_ATTRIBUTE_DOMAINS, VERSION, addDebugIncomingMessageListener, addDebugOutgoingMessageListener, appendHistoryPoint, applyBridgeConnState, applyDemoServiceCall, area, areas, attachBridgeToStore, authenticateWithOAuth, authenticateWithToken, batchEntityUpdates, batchServiceCalls, buildAreaView, buildDeviceView, buildEntityView, bulkAppendHistoryPoints, callService, createDemoFixtures, createHaBridge, detachBridgeFromStore, disconnect, entities, entitiesByAreaAndDomain, entitiesWhere, entity, entityIdHistoryNeedsAttributes, entityViewEquals, extractDomain, fetchEnergyPreferences, fetchEntityHistory, fetchForecast, fetchForecastData, fetchForecasts, fetchHistory, fetchStatisticsDuringPeriod, fetchStream, fetchStreamData, getAllEntityViews, getAreaView, getAreaViews, getConnection, getConnectionState, getEntityView, getEntityViews, getForecast, getForecasts, getStream, getWebRtcClientConfig, hassMediaUrl, historyStateToTimeline, initConnection, isAuthValid, isConnected, isDemoMode, isHistoryTracked, loadDemoData, normalizeStatisticTime, refreshAuth, refreshForecast, refreshForecasts, refreshStream, registerEntity, reloadAfterBridgeReconnect, resetStore, runHaBridgeWorker, searchEntities, sendCommand, sendWebRtcCandidate, setState, startDemoEnergyTicker, startWebRtcSession, state, stopDemoEnergyTicker, toggle, trackEntityHistory, turnOff, turnOn, unloadDemoData, untrackEntityHistory, updateEntity };

package/dist/media/url.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Resolve an HA media reference (e.g. an entity's `entity_picture`, a camera
+ * proxy path) to a URL the page can actually load.
+ *
+ * HA gives these as origin-relative paths (`/api/media_player_proxy/...?token=`)
+ * carrying their own signed token. A bare `<img src>` would resolve them against
+ * the dash origin and 404. When the host set `mediaProxyBase`, route through the
+ * same-origin media proxy so the page CSP (`img-src 'self'`) covers it in every
+ * mode, LAN and remote. Otherwise fall back to prefixing `hassUrl` directly
+ * (the LAN-only path, used until a transport sets the proxy base).
+ *
+ * Absolute URLs and non-path values pass through untouched.
+ */
+export declare function hassMediaUrl(path: string | null | undefined): string | undefined;

package/dist/solid/index.js

@@ -1,5 +1,5 @@
 import { createEffect, createMemo, createResource, onCleanup } from "solid-js";
-import { buildAreaView, callService, entityViewEquals, extractDomain, fetchStatisticsDuringPeriod, getEntityView, isDemoMode, registerEntity, state, toggle, turnOff, turnOn } from "@glasshome/sync-layer";
+import { buildAreaView, callService, entityViewEquals, extractDomain, fetchStatisticsDuringPeriod, getAreaViews, getEntityView, isDemoMode, registerEntity, state, toggle, turnOff, turnOn } from "@glasshome/sync-layer";
 
 //#region src/solid/hooks.ts
 /**
@@ -116,21 +116,13 @@ function useToggle() {
 * Get reactive list of all area views.
 */
 function useAreas() {
-	return createMemo(() => {
-		return Object.keys(state.areas).map((areaId) => {
-			try {
-				return buildAreaView(areaId);
-			} catch {
-				return void 0;
-			}
-		}).filter((v) => v !== void 0);
-	}, void 0, { equals: (a, b) => {
+	return createMemo(() => getAreaViews(), void 0, { equals: (a, b) => {
 		if (a.length !== b.length) return false;
 		for (let i = 0; i < a.length; i++) {
 			const aItem = a[i];
 			const bItem = b[i];
 			if (!aItem || !bItem) return false;
-			if (aItem.id !== bItem.id || aItem.modifiedAt !== bItem.modifiedAt || aItem.entities.length !== bItem.entities.length) return false;
+			if (aItem.id !== bItem.id || aItem.modifiedAt !== bItem.modifiedAt || aItem.entityIds.length !== bItem.entityIds.length) return false;
 		}
 		return true;
 	} });

package/dist/testing/index.js

@@ -1,4 +1,4 @@
-import { createDemoFixtures, state } from "../demo-data-CavpxBw3.js";
+import { createDemoFixtures, state } from "../demo-data-DiGSP4EH.js";
 
 //#region src/testing/mock-behaviors/base.ts
 /**

package/dist/worker/worker-main.js

@@ -1,3 +1,3 @@
-import { runHaBridgeWorker } from "../worker-main-BYGgbA7k.js";
+import { runHaBridgeWorker } from "../worker-main-DTbzEKor.js";
 
 export { runHaBridgeWorker };

package/dist/{worker-main-BYGgbA7k.js → worker-main-DTbzEKor.js}

@@ -128,6 +128,18 @@ const SUSPEND_DELAY_MS = 5 * 60 * 1e3;
 function isHaWireMessage(value) {
 	return typeof value === "object" && value !== null && typeof value.type === "string";
 }
+/** Extract a readable message from a thrown value. HA's websocket client rejects
+*  with a plain `{ code, message }` object, not an Error, so `String(err)` would
+*  yield "[object Object]" and hide the real reason. */
+function errText(err) {
+	if (err instanceof Error) return err.message;
+	if (typeof err === "string") return err;
+	if (err && typeof err === "object" && "message" in err) {
+		const m = err.message;
+		if (typeof m === "string") return m;
+	}
+	return String(err);
+}
 var BrokeredAuth = class extends Auth {
 	constructor(mintUrl, data, ticket) {
 		super(data);
@@ -243,7 +255,7 @@ function runHaBridgeWorker(scope) {
 					id: call.id,
 					ok: false,
 					code: "ERROR",
-					message: err instanceof Error ? err.message : String(err)
+					message: errText(err)
 				});
 			}
 		};
@@ -325,7 +337,7 @@ function runHaBridgeWorker(scope) {
 			post({
 				k: "connect_result",
 				ok: false,
-				error: err instanceof Error ? err.message : String(err)
+				error: errText(err)
 			});
 			return;
 		}
@@ -346,7 +358,7 @@ function runHaBridgeWorker(scope) {
 			post({
 				k: "connect_result",
 				ok: false,
-				error: err instanceof Error ? err.message : String(err)
+				error: errText(err)
 			});
 			return;
 		}
@@ -410,7 +422,7 @@ function runHaBridgeWorker(scope) {
 						k: "result",
 						id: msg.id,
 						ok: false,
-						error: err instanceof Error ? err.message : String(err)
+						error: errText(err)
 					});
 				}
 				break;
@@ -448,7 +460,7 @@ function runHaBridgeWorker(scope) {
 					post({
 						k: "sub_end",
 						id: msg.id,
-						error: err instanceof Error ? err.message : String(err)
+						error: errText(err)
 					});
 				}
 				break;

package/package.json

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