@glasshome/sync-layer 0.2.2 → 0.3.0

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/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,4 +1,4 @@
-import { ENERGY_ENTITY_IDS, createDemoFixtures, demoEnergyPreferences, energyEntityValue, formatEnergyState, isEnergyEntity, isSunUp, resetStore, setState, simulateEnergy, state, sunEvents, synthesizeEnergyHistory, synthesizeEnergyStatistics } from "./demo-data-CavpxBw3.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-BYGgbA7k.js";
 import { createConnection, createLongLivedTokenAuth, getAuth } from "home-assistant-js-websocket";
 import { produce, reconcile } from "solid-js/store";
@@ -2298,6 +2298,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 +2744,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 +2944,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/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/package.json

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