camstack 1.2.87 → 1.2.88

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runDiscover
-} from "./chunk-I6O2CHPR.js";
+} from "./chunk-BLJRLA7I.js";
 import "./chunk-LMMQX4CK.js";
 
 // src/cli.ts
@@ -38,7 +38,7 @@ async function runServe(args) {
     ...typeof values.data === "string" ? { data: values.data } : {}
   };
   Object.assign(process.env, buildServeEnv(opts));
-  await import("./launcher-3OHBVI43.js");
+  await import("./launcher-VABTDHRC.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-3OHBVI43.js");
+  await import("./launcher-VABTDHRC.js");
 }
 
 // src/commands/setup.ts
@@ -1130,7 +1130,7 @@ function isUnknown(_value) {
   return true;
 }
 async function resolveServerInteractive(presetNamespace) {
-  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-LZJPQBVA.js");
+  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-FHE2CTRJ.js");
   if (presetNamespace) {
     const spinner4 = clack.spinner();
     spinner4.start(`Discovering hub on LAN (namespace "${presetNamespace}")`);

package/dist/{discover-LZJPQBVA.js → discover-FHE2CTRJ.js}

@@ -5,7 +5,7 @@ import {
   filterHubNodes,
   resolveHubFromDiscovered,
   runDiscover
-} from "./chunk-I6O2CHPR.js";
+} from "./chunk-BLJRLA7I.js";
 import "./chunk-LMMQX4CK.js";
 export {
   DEFAULT_HUB_HTTPS_PORT,

package/dist/{launcher-3OHBVI43.js → launcher-VABTDHRC.js}

@@ -23633,9 +23633,9 @@ var require_zod = __commonJS({
   }
 });
 
-// ../system/dist/dist-D8VIyu_0.js
-var require_dist_D8VIyu_0 = __commonJS({
-  "../system/dist/dist-D8VIyu_0.js"(exports) {
+// ../system/dist/dist-DGrXE5nL.js
+var require_dist_DGrXE5nL = __commonJS({
+  "../system/dist/dist-DGrXE5nL.js"(exports) {
     "use strict";
     var zod = require_zod();
     var EventCategory = /* @__PURE__ */ (function(EventCategory2) {
@@ -50286,16 +50286,36 @@ var require_dist_D8VIyu_0 = __commonJS({
       "image",
       "sensor"
     ];
+    var CONTAINER_CHILD_ROLE_PRIORITY = [
+      "contact-sensor",
+      "motion-sensor",
+      "occupancy-sensor",
+      "smoke-sensor",
+      "co-sensor",
+      "gas-sensor",
+      "leak-sensor",
+      "vibration-sensor",
+      "tamper-sensor",
+      "sound-sensor",
+      "binary-sensor",
+      "binary-helper"
+    ];
+    function roleRank(role) {
+      if (role === void 0) return CONTAINER_CHILD_ROLE_PRIORITY.length;
+      const i = CONTAINER_CHILD_ROLE_PRIORITY.indexOf(role);
+      return i === -1 ? CONTAINER_CHILD_ROLE_PRIORITY.length : i;
+    }
     function rank(type) {
       const i = CONTAINER_CHILD_PRIORITY.indexOf(type);
       return i === -1 ? CONTAINER_CHILD_PRIORITY.length : i;
     }
-    function resolveContainerPrimaryChild(children, overrideEntityId) {
+    function resolveContainerPrimaryChild(children, overrideEntityId, containerName) {
       if (overrideEntityId !== void 0 && overrideEntityId !== null) {
         const picked = children.find((c) => c.stableId === overrideEntityId) ?? children.find((c) => c.entityId !== void 0 && c.entityId === overrideEntityId);
         if (picked !== void 0) return picked;
       }
-      return [...children].toSorted((a, b) => rank(a.type) - rank(b.type))[0] ?? null;
+      const namesake = (c) => containerName !== void 0 && containerName.length > 0 && c.name !== void 0 && c.name.toLowerCase() === containerName.toLowerCase() ? 0 : 1;
+      return [...children].toSorted((a, b) => roleRank(a.role) - roleRank(b.role) || namesake(a) - namesake(b) || rank(a.type) - rank(b.type))[0] ?? null;
     }
     var AccessoryKind = {
       Siren: DeviceRole.Siren,
@@ -60061,7 +60081,7 @@ var require_alerts_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     function selectExpired(alerts, cutoffMs) {
       return alerts.filter((a) => a.createdAt < cutoffMs).sort((a, b) => a.createdAt - b.createdAt).map((a) => a.id);
     }
@@ -60880,7 +60900,7 @@ var require_console_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var require_formatter = require_formatter_DqAKDlvN();
     var LEVEL_RANK = {
       debug: 0,
@@ -60974,7 +60994,7 @@ var require_core_blocks_addon = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var node_crypto = __require("crypto");
     var node_fs_promises = __require("fs/promises");
     node_fs_promises = require_chunk.__toESM(node_fs_promises);
@@ -61871,11 +61891,11 @@ var require_core_blocks = __commonJS({
   }
 });
 
-// ../system/dist/retired-settings-keys-wakiINPT.js
-var require_retired_settings_keys_wakiINPT = __commonJS({
-  "../system/dist/retired-settings-keys-wakiINPT.js"(exports) {
+// ../system/dist/retired-settings-keys-BxUjEt2b.js
+var require_retired_settings_keys_BxUjEt2b = __commonJS({
+  "../system/dist/retired-settings-keys-BxUjEt2b.js"(exports) {
     "use strict";
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     function settingsStoreIsAuthoritativeHere(env) {
       const raw = (env["CAMSTACK_ROLE"] ?? "").trim().toLowerCase();
       return raw === "" || raw === "hub";
@@ -64089,8 +64109,8 @@ var require_device_manager_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
-    var require_retired_settings_keys = require_retired_settings_keys_wakiINPT();
+    var require_dist10 = require_dist_DGrXE5nL();
+    var require_retired_settings_keys = require_retired_settings_keys_BxUjEt2b();
     var node_crypto = __require("crypto");
     var _camstack_types_node = require_node();
     var JOB_HISTORY = 20;
@@ -65736,8 +65756,10 @@ var require_device_manager_addon = __commonJS({
       const primary = require_dist10.resolveContainerPrimaryChild((byParent.get(id) ?? []).map((c) => ({
         id: c.id,
         stableId: c.stableId,
-        type: c.type
-      })), byId.get(id)?.primaryChildEntityId);
+        type: c.type,
+        ...c.role !== void 0 && c.role !== null ? { role: c.role } : {},
+        ...c.name !== void 0 ? { name: c.name } : {}
+      })), byId.get(id)?.primaryChildEntityId, byId.get(id)?.name);
       if (primary !== null) expandContainer(primary.id, byId, byParent, nextVisited, out);
     }
     function resolveLinkedDeviceIds(params) {
@@ -67243,6 +67265,16 @@ var require_device_manager_addon = __commonJS({
       const { deviceId, primaryChildEntityId } = input;
       await pctx.metaStore.withMetaWriteLock(async () => {
         if (!await pctx.metaStore.resolvePersistedById(deviceId)) throw new Error(`[device-manager] setPrimaryChildEntityId: unknown device id=${deviceId}`);
+        if (primaryChildEntityId !== null) {
+          const children = await pctx.metaStore.rows.listByParent(deviceId);
+          if (!children.some((child) => child.meta.stableId === primaryChildEntityId)) pctx.host.ctx.logger.warn("setPrimaryChildEntityId: pick matches no child \u2014 the container will keep its priority default", {
+            tags: { deviceId },
+            meta: {
+              primaryChildEntityId,
+              childStableIds: children.map((child) => child.meta.stableId).slice(0, 12)
+            }
+          });
+        }
         await pctx.metaStore.rows.patch(deviceId, { primaryChildEntityId });
       });
       pctx.host.ctx.eventBus.emit({
@@ -69362,7 +69394,7 @@ var require_hub_forwarder = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var require_formatter = require_formatter_DqAKDlvN();
     var DEFAULT_OUTBOUND_BUFFER_SIZE = 500;
     var HubForwarderDestination = class {
@@ -69499,7 +69531,7 @@ var require_liveness_monitor_addon = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var NO_DEVICES = "liveness:no-devices";
     var ALL_OFFLINE = "liveness:all-devices-offline";
     var NO_FOOTAGE_PREFIX = "liveness:no-footage:";
@@ -69689,7 +69721,7 @@ var require_local_auth_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var node_crypto = __require("crypto");
     node_crypto = require_chunk.__toESM(node_crypto);
     var crypto$1 = __require("crypto");
@@ -77502,7 +77534,7 @@ var require_loki_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     function sanitizeLabelName(raw) {
       const replaced = raw.replaceAll(/[^a-zA-Z0-9_]/g, "_");
       return /^[a-zA-Z_]/.test(replaced) ? replaced : `_${replaced}`;
@@ -78067,7 +78099,7 @@ var require_native_metrics_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var node_fs_promises = __require("fs/promises");
     var node_child_process = __require("child_process");
     var node_util = __require("util");
@@ -80651,7 +80683,7 @@ var require_filesystem_storage_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var node_crypto = __require("crypto");
     var node_fs_promises = __require("fs/promises");
     var node_path = __require("path");
@@ -81767,8 +81799,8 @@ var require_sqlite_settings_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
-    var require_retired_settings_keys = require_retired_settings_keys_wakiINPT();
+    var require_dist10 = require_dist_DGrXE5nL();
+    var require_retired_settings_keys = require_retired_settings_keys_BxUjEt2b();
     var node_crypto = __require("crypto");
     var node_fs = __require("fs");
     var node_module = __require("module");
@@ -84258,7 +84290,7 @@ var require_storage_orchestrator_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var require_hub_cap_forward = require_hub_cap_forward_DmHNjbB0();
     var zod = require_zod();
     var node_crypto = __require("crypto");
@@ -87209,7 +87241,7 @@ var require_system_config_addon = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var SECTION_TITLES = {
       server: "Server",
       auth: "Authentication"
@@ -105270,7 +105302,7 @@ var require_winston_logging = __commonJS({
       [Symbol.toStringTag]: { value: "Module" }
     });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var require_formatter = require_formatter_DqAKDlvN();
     var node_path = __require("path");
     node_path = require_chunk.__toESM(node_path);
@@ -117772,12 +117804,12 @@ var require_dist2 = __commonJS({
   }
 });
 
-// ../system/dist/manifest-system-deps-BbP419V1.js
-var require_manifest_system_deps_BbP419V1 = __commonJS({
-  "../system/dist/manifest-system-deps-BbP419V1.js"(exports) {
+// ../system/dist/manifest-system-deps-ezj0SKDM.js
+var require_manifest_system_deps_ezj0SKDM = __commonJS({
+  "../system/dist/manifest-system-deps-ezj0SKDM.js"(exports) {
     "use strict";
     var require_chunk = require_chunk_Cek0wNdY();
-    require_dist_D8VIyu_0();
+    require_dist_DGrXE5nL();
     require_hub_cap_forward_DmHNjbB0();
     var node_crypto = __require("crypto");
     node_crypto = require_chunk.__toESM(node_crypto);
@@ -129844,7 +129876,7 @@ var require_dist3 = __commonJS({
     "use strict";
     Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
     var require_chunk = require_chunk_Cek0wNdY();
-    var require_dist10 = require_dist_D8VIyu_0();
+    var require_dist10 = require_dist_DGrXE5nL();
     var require_builtins_alerts_alerts_addon = require_alerts_addon();
     require_alerts();
     var require_formatter = require_formatter_DqAKDlvN();
@@ -129871,7 +129903,7 @@ var require_dist3 = __commonJS({
     var require_builtins_winston_logging_index = require_winston_logging();
     var require_file_data_plane = require_file_data_plane_DO8KbxCe();
     var require_tls$1 = require_tls_BxQlomxd();
-    var require_manifest_system_deps = require_manifest_system_deps_BbP419V1();
+    var require_manifest_system_deps = require_manifest_system_deps_ezj0SKDM();
     var require_resource_monitor = require_resource_monitor_CdnzxBLP();
     var require_custom_action_registry = require_custom_action_registry_jY0NOZK8();
     var zod = require_zod();
@@ -238555,16 +238587,36 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
       "image",
       "sensor"
     ];
+    var CONTAINER_CHILD_ROLE_PRIORITY = [
+      "contact-sensor",
+      "motion-sensor",
+      "occupancy-sensor",
+      "smoke-sensor",
+      "co-sensor",
+      "gas-sensor",
+      "leak-sensor",
+      "vibration-sensor",
+      "tamper-sensor",
+      "sound-sensor",
+      "binary-sensor",
+      "binary-helper"
+    ];
+    function roleRank(role) {
+      if (role === void 0) return CONTAINER_CHILD_ROLE_PRIORITY.length;
+      const i = CONTAINER_CHILD_ROLE_PRIORITY.indexOf(role);
+      return i === -1 ? CONTAINER_CHILD_ROLE_PRIORITY.length : i;
+    }
     function rank(type) {
       const i = CONTAINER_CHILD_PRIORITY.indexOf(type);
       return i === -1 ? CONTAINER_CHILD_PRIORITY.length : i;
     }
-    function resolveContainerPrimaryChild(children, overrideEntityId) {
+    function resolveContainerPrimaryChild(children, overrideEntityId, containerName) {
       if (overrideEntityId !== void 0 && overrideEntityId !== null) {
         const picked = children.find((c) => c.stableId === overrideEntityId) ?? children.find((c) => c.entityId !== void 0 && c.entityId === overrideEntityId);
         if (picked !== void 0) return picked;
       }
-      return [...children].toSorted((a, b) => rank(a.type) - rank(b.type))[0] ?? null;
+      const namesake = (c) => containerName !== void 0 && containerName.length > 0 && c.name !== void 0 && c.name.toLowerCase() === containerName.toLowerCase() ? 0 : 1;
+      return [...children].toSorted((a, b) => roleRank(a.role) - roleRank(b.role) || namesake(a) - namesake(b) || rank(a.type) - rank(b.type))[0] ?? null;
     }
     var AccessoryKind = {
       Siren: require_sleep.DeviceRole.Siren,

package/package.json

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