@camstack/addon-provider-homeassistant 1.2.30 → 1.2.32

package/dist/ha-export/ha-export.addon.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 //#endregion
-const require_dist = require("../dist-XWveotlj.js");
+const require_dist = require("../dist-BxZFHIBC.js");
 let node_crypto = require("node:crypto");
 //#region src/ha-export/topics.ts
 /**
@@ -5517,7 +5517,7 @@ var HaExportAddon = class extends require_dist.BaseAddon {
 		const plateText = readString(data, "plateText");
 		const lastSeen = readNumber(data, "lastSeen") ?? Date.now();
 		const zonesVisited = readStringArray(data, "zonesVisited");
-		const mediaUrl = this.mintTrackMediaUrl(trackId);
+		const mediaUrl = this.mintTrackMediaUrl(trackId, deviceId);
 		const values = projectTrackLifecycle(deviceKey, {
 			deviceId,
 			trackId,
@@ -6580,10 +6580,10 @@ var HaExportAddon = class extends require_dist.BaseAddon {
 			res.end();
 			return;
 		}
-		const trackId = decodeURIComponent(id);
+		const compositeId = decodeURIComponent(id);
 		if (!verifyMediaSignature({
 			secret: this.mediaSecret,
-			id: trackId,
+			id: compositeId,
 			exp: url.searchParams.get("exp") ?? void 0,
 			sig: url.searchParams.get("sig") ?? void 0,
 			nowMs: Date.now()
@@ -6592,9 +6592,18 @@ var HaExportAddon = class extends require_dist.BaseAddon {
 			res.end();
 			return;
 		}
+		const sep = compositeId.indexOf(":");
+		const deviceId = sep > 0 ? Number(compositeId.slice(0, sep)) : NaN;
+		const trackId = sep > 0 ? compositeId.slice(sep + 1) : "";
+		if (!Number.isInteger(deviceId) || deviceId <= 0 || trackId.length === 0) {
+			res.statusCode = 400;
+			res.end();
+			return;
+		}
 		try {
 			const first = (await this.ctx.api.pipelineAnalytics.getTrackMedia.query({
 				trackId,
+				deviceId,
 				kinds: [
 					"thumbnailSmall",
 					"thumbnail",
@@ -6627,12 +6636,12 @@ var HaExportAddon = class extends require_dist.BaseAddon {
 	* cannot open is worse than no image, because it renders as a broken
 	* entity rather than an empty one.
 	*/
-	mintTrackMediaUrl(trackId) {
+	mintTrackMediaUrl(trackId, deviceId) {
 		if (this.mediaBaseUrl === null || this.mediaSecret.length === 0) return null;
 		return buildMediaUrl({
 			baseUrl: this.mediaBaseUrl,
 			routePrefix: MEDIA_ROUTE_PREFIX,
-			id: trackId,
+			id: `${String(deviceId)}:${trackId}`,
 			secret: this.mediaSecret,
 			expMs: Date.now() + MEDIA_URL_TTL_MS
 		});

package/dist/ha-export/ha-export.addon.mjs

@@ -1,4 +1,4 @@
-import { M as deviceExportCapability, Ot as EventCategory, S as buildAddonRouteProvider, Y as oauthIntegrationCapability, a as CameraSwitchIdSchema, c as HvacModeSchema, f as addonRoutesCapability, ft as BaseAddon, i as COCO_TO_MACRO, l as MediaPlayerRepeatSchema, s as FanDirectionSchema, t as AlarmArmModeSchema, wt as string } from "../dist-CzZXxFrl.mjs";
+import { M as deviceExportCapability, Ot as EventCategory, S as buildAddonRouteProvider, Y as oauthIntegrationCapability, a as CameraSwitchIdSchema, c as HvacModeSchema, f as addonRoutesCapability, ft as BaseAddon, i as COCO_TO_MACRO, l as MediaPlayerRepeatSchema, s as FanDirectionSchema, t as AlarmArmModeSchema, wt as string } from "../dist-BMrkrIHs.mjs";
 import { createHmac, timingSafeEqual } from "node:crypto";
 //#region src/ha-export/topics.ts
 /**
@@ -5512,7 +5512,7 @@ var HaExportAddon = class extends BaseAddon {
 		const plateText = readString(data, "plateText");
 		const lastSeen = readNumber(data, "lastSeen") ?? Date.now();
 		const zonesVisited = readStringArray(data, "zonesVisited");
-		const mediaUrl = this.mintTrackMediaUrl(trackId);
+		const mediaUrl = this.mintTrackMediaUrl(trackId, deviceId);
 		const values = projectTrackLifecycle(deviceKey, {
 			deviceId,
 			trackId,
@@ -6575,10 +6575,10 @@ var HaExportAddon = class extends BaseAddon {
 			res.end();
 			return;
 		}
-		const trackId = decodeURIComponent(id);
+		const compositeId = decodeURIComponent(id);
 		if (!verifyMediaSignature({
 			secret: this.mediaSecret,
-			id: trackId,
+			id: compositeId,
 			exp: url.searchParams.get("exp") ?? void 0,
 			sig: url.searchParams.get("sig") ?? void 0,
 			nowMs: Date.now()
@@ -6587,9 +6587,18 @@ var HaExportAddon = class extends BaseAddon {
 			res.end();
 			return;
 		}
+		const sep = compositeId.indexOf(":");
+		const deviceId = sep > 0 ? Number(compositeId.slice(0, sep)) : NaN;
+		const trackId = sep > 0 ? compositeId.slice(sep + 1) : "";
+		if (!Number.isInteger(deviceId) || deviceId <= 0 || trackId.length === 0) {
+			res.statusCode = 400;
+			res.end();
+			return;
+		}
 		try {
 			const first = (await this.ctx.api.pipelineAnalytics.getTrackMedia.query({
 				trackId,
+				deviceId,
 				kinds: [
 					"thumbnailSmall",
 					"thumbnail",
@@ -6622,12 +6631,12 @@ var HaExportAddon = class extends BaseAddon {
 	* cannot open is worse than no image, because it renders as a broken
 	* entity rather than an empty one.
 	*/
-	mintTrackMediaUrl(trackId) {
+	mintTrackMediaUrl(trackId, deviceId) {
 		if (this.mediaBaseUrl === null || this.mediaSecret.length === 0) return null;
 		return buildMediaUrl({
 			baseUrl: this.mediaBaseUrl,
 			routePrefix: MEDIA_ROUTE_PREFIX,
-			id: trackId,
+			id: `${String(deviceId)}:${trackId}`,
 			secret: this.mediaSecret,
 			expMs: Date.now() + MEDIA_URL_TTL_MS
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.2.30",
+  "version": "1.2.32",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",