camstack 1.2.89 → 1.2.90

package/dist/cli.js

@@ -38,7 +38,7 @@ async function runServe(args) {
     ...typeof values.data === "string" ? { data: values.data } : {}
   };
   Object.assign(process.env, buildServeEnv(opts));
-  await import("./launcher-POOJGOAQ.js");
+  await import("./launcher-7KH64TCV.js");
 }
 
 // src/commands/agent.ts
@@ -83,7 +83,7 @@ async function runAgent(args) {
     ...typeof values.port === "string" ? { port: values.port } : {}
   };
   Object.assign(process.env, buildAgentEnv(opts));
-  await import("./launcher-POOJGOAQ.js");
+  await import("./launcher-7KH64TCV.js");
 }
 
 // src/commands/setup.ts

package/dist/{launcher-POOJGOAQ.js → launcher-7KH64TCV.js}

@@ -65799,6 +65799,68 @@ var require_device_manager_addon = __commonJS({
       return linkedIds.filter((id) => picked.has(id));
     }
     var LINK_CANDIDATE_PROJECTION = { projection: "slim" };
+    function findLocationInvisibleContainers(params) {
+      const { selfId, selfLocation, resolvedIds, candidates } = params;
+      if (selfLocation === null || selfLocation.length === 0) return [];
+      const byParent = /* @__PURE__ */ new Map();
+      for (const c of candidates) {
+        if (c.parentDeviceId === null) continue;
+        const bucket = byParent.get(c.parentDeviceId);
+        if (bucket) bucket.push(c);
+        else byParent.set(c.parentDeviceId, [c]);
+      }
+      const out = [];
+      for (const c of candidates) {
+        if (c.type !== require_dist10.DeviceType.Container) continue;
+        if (c.id === selfId) continue;
+        if (c.location !== selfLocation) continue;
+        let anyResolved = false;
+        let anyNullLocation = false;
+        let descendantCount = 0;
+        const visited = /* @__PURE__ */ new Set([c.id]);
+        let frontier = [c.id];
+        while (frontier.length > 0) {
+          const next = [];
+          for (const parentId of frontier) for (const child of byParent.get(parentId) ?? []) {
+            if (visited.has(child.id)) continue;
+            visited.add(child.id);
+            descendantCount += 1;
+            if (resolvedIds.has(child.id)) anyResolved = true;
+            if (child.location === null) anyNullLocation = true;
+            next.push(child.id);
+          }
+          frontier = next;
+        }
+        if (descendantCount > 0 && !anyResolved && anyNullLocation) out.push(c.id);
+      }
+      return out;
+    }
+    var INVISIBLE_CONTAINER_WARN_CAP = 4096;
+    var warnedInvisibleContainers = /* @__PURE__ */ new Set();
+    function warnLocationInvisibleContainers(pctx, cameraId, byId, all, resolved) {
+      if (resolved.mode !== "auto") return;
+      const selfLocation = byId.get(cameraId)?.location ?? null;
+      if (selfLocation === null || selfLocation.length === 0) return;
+      const invisible = findLocationInvisibleContainers({
+        selfId: cameraId,
+        selfLocation,
+        resolvedIds: new Set(resolved.devices.map((d) => d.deviceId)),
+        candidates: all
+      });
+      for (const containerId of invisible) {
+        const key = `${cameraId}:${containerId}`;
+        if (warnedInvisibleContainers.has(key)) continue;
+        if (warnedInvisibleContainers.size >= INVISIBLE_CONTAINER_WARN_CAP) return;
+        warnedInvisibleContainers.add(key);
+        pctx.host.ctx.logger.warn("getLinkedDevices: container matches the camera location but is invisible to auto-link \u2014 its children carry no location; re-save the container location to realign", {
+          tags: { deviceId: containerId },
+          meta: {
+            cameraId,
+            location: selfLocation
+          }
+        });
+      }
+    }
     function resolveFor(deviceId, all, byId, blob) {
       const config = parseLinkedDevicesConfig(blob);
       const ids = resolveLinkedDeviceIds({
@@ -65828,7 +65890,10 @@ var require_device_manager_addon = __commonJS({
     async function getLinkedDevices(pctx, input) {
       const { deviceId } = input;
       const [all, blob] = await Promise.all([listAll(pctx, LINK_CANDIDATE_PROJECTION), pctx.settings.readDeviceStore(deviceId)]);
-      return resolveFor(deviceId, all, new Map(all.map((d) => [d.id, d])), blob);
+      const byId = new Map(all.map((d) => [d.id, d]));
+      const resolved = resolveFor(deviceId, all, byId, blob);
+      warnLocationInvisibleContainers(pctx, deviceId, byId, all, resolved);
+      return resolved;
     }
     async function getLinkedDevicesBatch(pctx, input) {
       const deviceIds = [...new Set(input.deviceIds)];
@@ -65841,10 +65906,14 @@ var require_device_manager_addon = __commonJS({
         return {};
       })))]);
       const byId = new Map(all.map((d) => [d.id, d]));
-      return deviceIds.map((deviceId, index) => ({
-        deviceId,
-        ...resolveFor(deviceId, all, byId, blobs[index] ?? {})
-      }));
+      return deviceIds.map((deviceId, index) => {
+        const resolved = resolveFor(deviceId, all, byId, blobs[index] ?? {});
+        warnLocationInvisibleContainers(pctx, deviceId, byId, all, resolved);
+        return {
+          deviceId,
+          ...resolved
+        };
+      });
     }
     async function buildLinkedDevicesContribution(pctx, deviceId) {
       const persisted = await pctx.metaStore.resolvePersistedById(deviceId);
@@ -66773,6 +66842,121 @@ var require_device_manager_addon = __commonJS({
         roleKeysKeptAtTarget: Object.keys(target.role).toSorted()
       };
     }
+    var LOCATION_BACKFILL_MARKER_KEY = "locationBackfillVersion";
+    function nearestLocatedAncestor(byId, startParentId) {
+      const visited = /* @__PURE__ */ new Set();
+      let cursor = startParentId;
+      while (cursor !== null && !visited.has(cursor)) {
+        visited.add(cursor);
+        const ancestor = byId.get(cursor);
+        if (!ancestor) return null;
+        if (ancestor.location !== null) return ancestor;
+        cursor = ancestor.parentDeviceId;
+      }
+      return null;
+    }
+    function planNullLocationFills(rows) {
+      const byId = new Map(rows.map((r) => [r.id, r]));
+      const plan = [];
+      for (const row of rows) {
+        if (row.location !== null) continue;
+        if (row.parentDeviceId === null) continue;
+        const hit = nearestLocatedAncestor(byId, row.parentDeviceId);
+        if (hit === null) continue;
+        if (hit.type !== require_dist10.DeviceType.Container) continue;
+        if (hit.location === null) continue;
+        plan.push({
+          id: row.id,
+          location: hit.location,
+          ancestorId: hit.id
+        });
+      }
+      return plan;
+    }
+    async function resolveInheritedLocation(rows, parentDeviceId) {
+      const visited = /* @__PURE__ */ new Set();
+      let cursor = parentDeviceId;
+      while (cursor !== null && !visited.has(cursor)) {
+        visited.add(cursor);
+        const ancestor = await rows.get(cursor);
+        if (ancestor === null) return null;
+        if (ancestor.meta.location !== null) return ancestor.meta.type === require_dist10.DeviceType.Container ? ancestor.meta.location : null;
+        cursor = ancestor.meta.parentDeviceId;
+      }
+      return null;
+    }
+    function groupByAncestor(fills) {
+      const grouped = /* @__PURE__ */ new Map();
+      for (const fill of fills) {
+        const bucket = grouped.get(fill.ancestorId);
+        if (bucket) bucket.push(fill);
+        else grouped.set(fill.ancestorId, [fill]);
+      }
+      return grouped;
+    }
+    async function runLocationBackfillAtBoot(pctx, bootRows) {
+      const logger = pctx.host.ctx.logger;
+      const markerRaw = (await pctx.settings.readAddonStore())[LOCATION_BACKFILL_MARKER_KEY];
+      const completedVersion = typeof markerRaw === "number" ? markerRaw : 0;
+      let repaired = false;
+      if (completedVersion < 1) {
+        const patched = [];
+        const failed = [];
+        await pctx.metaStore.withMetaWriteLock(async () => {
+          const plan = planNullLocationFills((await pctx.metaStore.rows.listAll()).map((r) => r.meta));
+          for (const fill of plan) try {
+            const current = await pctx.metaStore.rows.get(fill.id);
+            if (current === null || current.meta.location !== null) continue;
+            await pctx.metaStore.rows.patch(fill.id, { location: fill.location });
+            patched.push(fill);
+          } catch (err) {
+            failed.push({
+              id: fill.id,
+              error: err
+            });
+          }
+        });
+        repaired = true;
+        for (const [ancestorId, fills] of groupByAncestor(patched)) {
+          pctx.host.ctx.eventBus.emit({
+            id: (0, node_crypto.randomUUID)(),
+            timestamp: /* @__PURE__ */ new Date(),
+            source: {
+              type: "device",
+              id: ancestorId
+            },
+            category: require_dist10.EventCategory.DeviceMetaChanged,
+            data: {
+              deviceId: ancestorId,
+              field: "location",
+              value: fills[0]?.location ?? null
+            }
+          });
+          logger.info("location backfill: aligned location-less descendants to their ancestor", {
+            tags: { deviceId: ancestorId },
+            meta: {
+              location: fills[0]?.location,
+              updatedIds: fills.map((f) => f.id)
+            }
+          });
+        }
+        if (failed.length > 0) logger.error("location backfill partially failed \u2014 retrying on the next boot", { meta: {
+          failedIds: failed.map((f) => f.id),
+          errors: failed.map((f) => f.error instanceof Error ? f.error.message : String(f.error))
+        } });
+        else await pctx.metaStore.withAddonStoreWriteLock(async () => {
+          await pctx.settings.writeAddonStore({ [LOCATION_BACKFILL_MARKER_KEY]: 1 });
+        });
+      }
+      const residual = planNullLocationFills((!repaired && bootRows !== void 0 ? bootRows : await pctx.metaStore.rows.listAll()).map((r) => r.meta));
+      for (const [ancestorId, fills] of groupByAncestor(residual)) logger.warn("location cascade misaligned \u2014 location-less descendants under a located ancestor never match location auto-link; re-save the ancestor location to realign", {
+        tags: { deviceId: ancestorId },
+        meta: {
+          location: fills[0]?.location,
+          misalignedDescendantIds: fills.map((f) => f.id)
+        }
+      });
+    }
     async function stampIntegrationId(metaStore, ctx, deviceId, integrationId) {
       await metaStore.withMetaWriteLock(async () => {
         if (!await metaStore.resolvePersistedById(deviceId)) throw new Error(`[device-manager] stampIntegrationId: unknown device id=${deviceId}`);
@@ -66926,7 +67110,7 @@ var require_device_manager_addon = __commonJS({
     async function registerDevice(pctx, input) {
       const { addonId, stableId, id, type, name, parentDeviceId, features, config } = input;
       const featuresArr = Array.isArray(features) ? [...features] : [];
-      const { isFirstRegistration, exportFingerprint, fingerprintChanged } = await pctx.metaStore.withMetaWriteLock(async () => {
+      const { isFirstRegistration, exportFingerprint, fingerprintChanged, inheritedLocation, inheritedDescendantIds, inheritFailed } = await pctx.metaStore.withMetaWriteLock(async () => {
         const existingRow = await pctx.metaStore.rows.get(id);
         const existingMeta = existingRow?.meta;
         const wasRegistered = existingRow?.registered ?? false;
@@ -66938,6 +67122,10 @@ var require_device_manager_addon = __commonJS({
           deviceType: type,
           features: featuresArr
         });
+        const priorLocation = existingMeta?.location ?? null;
+        const resolvedParentId = parentDeviceId ?? null;
+        const parentChanged = existingMeta !== void 0 && (existingMeta.parentDeviceId ?? null) !== resolvedParentId;
+        const inherited = priorLocation === null && resolvedParentId !== null && (isFirst || parentChanged) ? await resolveInheritedLocation(pctx.metaStore.rows, resolvedParentId) : null;
         await pctx.metaStore.rows.upsertRegistration({
           deviceId: id,
           addonId,
@@ -66945,21 +67133,69 @@ var require_device_manager_addon = __commonJS({
           type,
           name: resolvedName,
           userNamed: wasUserNamed,
-          location: existingMeta?.location ?? null,
+          location: priorLocation ?? inherited,
           disabled: existingMeta?.disabled ?? false,
-          parentDeviceId: parentDeviceId ?? null,
+          parentDeviceId: resolvedParentId,
           registered: true,
           features: featuresArr,
           exportFingerprint: fingerprint
         });
+        const descendantsFilled = [];
+        const descendantsFailed = [];
+        if (inherited !== null) for (const descendant of await collectDescendants(pctx.metaStore, id)) {
+          if (descendant.location !== null) continue;
+          try {
+            await pctx.metaStore.rows.patch(descendant.id, { location: inherited });
+            descendantsFilled.push(descendant.id);
+          } catch (err) {
+            descendantsFailed.push({
+              id: descendant.id,
+              error: err
+            });
+          }
+        }
         return {
           isFirstRegistration: isFirst,
           exportFingerprint: fingerprint,
-          fingerprintChanged: existingMeta?.exportFingerprint !== fingerprint
+          fingerprintChanged: existingMeta?.exportFingerprint !== fingerprint,
+          inheritedLocation: inherited,
+          inheritedDescendantIds: descendantsFilled,
+          inheritFailed: descendantsFailed
         };
       });
       if (Object.keys(config).length > 0) await pctx.settings.writeDeviceStore(id, config);
       pctx.metaStore.idToAddonId.set(id, addonId);
+      if (inheritedLocation !== null) {
+        for (const changedId of [id, ...inheritedDescendantIds]) pctx.host.ctx.eventBus.emit({
+          id: (0, node_crypto.randomUUID)(),
+          timestamp: /* @__PURE__ */ new Date(),
+          source: {
+            type: "device",
+            id: changedId
+          },
+          category: require_dist10.EventCategory.DeviceMetaChanged,
+          data: {
+            deviceId: changedId,
+            field: "location",
+            value: inheritedLocation
+          }
+        });
+        pctx.host.ctx.logger.info("registerDevice: inherited located-ancestor location", {
+          tags: { deviceId: id },
+          meta: {
+            location: inheritedLocation,
+            descendantsFilled: inheritedDescendantIds.length
+          }
+        });
+        if (inheritFailed.length > 0) pctx.host.ctx.logger.error("registerDevice: inherited-location fill partially failed \u2014 some descendants NOT aligned", {
+          tags: { deviceId: id },
+          meta: {
+            location: inheritedLocation,
+            failedIds: inheritFailed.map((f) => f.id),
+            errors: inheritFailed.map((f) => f.error instanceof Error ? f.error.message : String(f.error))
+          }
+        });
+      }
       if (isFirstRegistration) pctx.host.ctx.eventBus.emit({
         id: (0, node_crypto.randomUUID)(),
         timestamp: /* @__PURE__ */ new Date(),
@@ -69142,7 +69378,8 @@ var require_device_manager_addon = __commonJS({
         const stateMirror = this.stateMirrorImpl;
         const resolvePersistedById = metaStore.resolvePersistedById;
         const idToAddonId = metaStore.idToAddonId;
-        for (const row of await deviceRows.listAll()) idToAddonId.set(row.meta.id, row.meta.addonId);
+        const bootRows = await deviceRows.listAll();
+        for (const row of bootRows) idToAddonId.set(row.meta.id, row.meta.addonId);
         const stampIntegrationId$1 = (deviceId, integrationId) => stampIntegrationId(metaStore, this.ctx, deviceId, integrationId);
         const pctx = {
           host: this.providerHost,
@@ -69157,6 +69394,11 @@ var require_device_manager_addon = __commonJS({
             return provider;
           }
         };
+        try {
+          await runLocationBackfillAtBoot(pctx, bootRows);
+        } catch (err) {
+          this.ctx.logger.warn("location backfill failed \u2014 fleet boots without it", { meta: { error: require_dist10.errMsg(err) } });
+        }
         const provider = {
           resolveDeviceOwnerSync: (deviceId) => resolveDeviceOwnerSync(pctx, deviceId),
           resolveNativeCapOwnerSync: (capName, deviceId) => resolveNativeCapOwnerSync(pctx, capName, deviceId),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstack",
-  "version": "1.2.89",
+  "version": "1.2.90",
   "description": "CLI tool for managing and running CamStack server",
   "keywords": [
     "camstack",