camstack 1.2.105 → 1.2.107

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-P5VZSWZR.js");
+  await import("./launcher-HX7B54EQ.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-P5VZSWZR.js");
+  await import("./launcher-HX7B54EQ.js");
 }
 
 // src/commands/setup.ts

package/dist/{launcher-P5VZSWZR.js → launcher-HX7B54EQ.js}

@@ -65727,21 +65727,46 @@ var require_device_manager_addon = __commonJS({
         device
       };
     }
+    function persistedOnlineFallback(input) {
+      if (!input.registryPresent) return false;
+      if (input.parentDeviceId !== null) return true;
+      return Object.keys(input.config ?? {}).length > 0;
+    }
     function extractCallerAddonId(input) {
       const raw = Reflect.get(input, "callerAddonId");
       return typeof raw === "string" && raw.length > 0 ? raw : void 0;
     }
     async function listPersistedByAddon(pctx, input) {
       const { addonId } = input;
-      return (await pctx.metaStore.rows.listByAddon(addonId)).map(({ meta: m }) => ({
-        id: m.id,
-        stableId: m.stableId,
-        type: m.type,
-        name: m.name,
-        location: m.location ?? null,
-        disabled: m.disabled ?? false,
-        parentDeviceId: m.parentDeviceId
-      }));
+      const rows = await pctx.metaStore.rows.listByAddon(addonId);
+      const saved = [];
+      for (const row of rows) {
+        const m = row.meta;
+        if (!row.registered) {
+          const reserved = await pctx.settings.readDeviceStore(m.id);
+          if (Object.keys(reserved ?? {}).length === 0) {
+            pctx.host.ctx.logger.warn("Skipping an unregistered device reservation with no configuration \u2014 not a device, not restored", {
+              tags: { deviceId: m.id },
+              meta: {
+                addonId,
+                stableId: m.stableId,
+                type: m.type
+              }
+            });
+            continue;
+          }
+        }
+        saved.push({
+          id: m.id,
+          stableId: m.stableId,
+          type: m.type,
+          name: m.name,
+          location: m.location ?? null,
+          disabled: m.disabled ?? false,
+          parentDeviceId: m.parentDeviceId
+        });
+      }
+      return saved;
     }
     async function readDeviceConfigs(pctx, deviceIds) {
       if (deviceIds.length === 0) return /* @__PURE__ */ new Map();
@@ -65811,7 +65836,11 @@ var require_device_manager_addon = __commonJS({
           disabled: m.disabled ?? false,
           parentDeviceId: m.parentDeviceId ?? null,
           role: toDeviceRole(m.role),
-          online: pctx.host.resolveDeviceOnline(m.id, pctx.registry !== null),
+          online: pctx.host.resolveDeviceOnline(m.id, persistedOnlineFallback({
+            registryPresent: pctx.registry !== null,
+            parentDeviceId: m.parentDeviceId ?? null,
+            config: persistedConfig
+          })),
           probed: pctx.host.resolveDeviceProbed(m.id),
           features: persistedFeatures(m.features),
           isCamera: persistedIsCamera(persistedType),
@@ -65856,7 +65885,11 @@ var require_device_manager_addon = __commonJS({
         disabled: m.disabled ?? false,
         parentDeviceId: m.parentDeviceId,
         role: toDeviceRole(m.role),
-        online: pctx.host.resolveDeviceOnline(deviceId, true),
+        online: pctx.host.resolveDeviceOnline(deviceId, persistedOnlineFallback({
+          registryPresent: true,
+          parentDeviceId: m.parentDeviceId ?? null,
+          config: persistedConfig
+        })),
         probed: pctx.host.resolveDeviceProbed(deviceId),
         features: persistedFeatures(m.features),
         isCamera: persistedIsCamera(m.type),
@@ -66172,7 +66205,7 @@ var require_device_manager_addon = __commonJS({
     async function adoptDevice(pctx, input) {
       const dp = await pctx.host.requireDeviceProvider(input.addonId);
       if (!await dp.supportsDiscovery({})) throw new Error(`Addon "${input.addonId}" does not support device adoption`);
-      const summary = await dp.adoptDiscoveredDevice({ candidate: input.candidate });
+      const summary = await pctx.removalFence.runUnfenced(() => dp.adoptDiscoveredDevice({ candidate: input.candidate }));
       if (input.integrationId !== void 0) try {
         await pctx.stampIntegrationId(summary.id, input.integrationId);
       } catch (err) {
@@ -66194,10 +66227,10 @@ var require_device_manager_addon = __commonJS({
     async function createDevice(pctx, input) {
       const dp = await pctx.host.requireDeviceProvider(input.addonId);
       if (!await dp.supportsManualCreation({})) throw new Error(`Addon "${input.addonId}" does not support manual device creation`);
-      const summary = await dp.createDevice({
+      const summary = await pctx.removalFence.runUnfenced(() => dp.createDevice({
         type: input.type,
         config: input.config
-      });
+      }));
       if (input.integrationId !== void 0) try {
         await pctx.stampIntegrationId(summary.id, input.integrationId);
       } catch (err) {
@@ -67487,6 +67520,17 @@ var require_device_manager_addon = __commonJS({
       return await pctx.metaStore.withMetaWriteLock(async () => {
         const existing = await pctx.metaStore.rows.findByStableId(addonId, stableId);
         if (existing) return { id: existing.meta.id };
+        const fenced = pctx.removalFence.isPairFenced(addonId, stableId);
+        if (fenced) {
+          pctx.host.ctx.logger.warn("allocateDeviceId refused \u2014 this device was just removed, NOT re-created", {
+            tags: { deviceId: fenced.deviceId },
+            meta: {
+              addonId,
+              stableId
+            }
+          });
+          throw new Error(`[device-manager] allocateDeviceId: device ${fenced.deviceId} (${addonId}/${stableId}) was removed \u2014 refusing to re-create it`);
+        }
         const id = await pctx.metaStore.allocateNextDeviceId();
         await pctx.metaStore.rows.upsert({
           addonId,
@@ -67615,6 +67659,16 @@ 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] : [];
+      if (pctx.removalFence.isIdFenced(id) ?? pctx.removalFence.isPairFenced(addonId, stableId)) {
+        pctx.host.ctx.logger.warn("registerDevice refused \u2014 this device was removed, NOT resurrected", {
+          tags: { deviceId: id },
+          meta: {
+            addonId,
+            stableId
+          }
+        });
+        throw new Error(`[device-manager] registerDevice: device ${id} (${addonId}/${stableId}) was removed \u2014 refusing to resurrect it`);
+      }
       const { isFirstRegistration, exportFingerprint, fingerprintChanged, inheritedLocation, inheritedDescendantIds, inheritFailed } = await pctx.metaStore.withMetaWriteLock(async () => {
         const existingRow = await pctx.metaStore.rows.get(id);
         const existingMeta = existingRow?.meta;
@@ -67755,6 +67809,11 @@ var require_device_manager_addon = __commonJS({
       const deviceName = persistedMeta.name;
       await pctx.metaStore.withMetaWriteLock(async () => {
         await pctx.metaStore.rows.remove(deviceId);
+        pctx.removalFence.record({
+          deviceId,
+          addonId,
+          stableId
+        });
       });
       await pctx.settings.clearDeviceStore(deviceId);
       await pctx.settings.clearDeviceRuntimeState(deviceId);
@@ -69681,7 +69740,7 @@ var require_device_manager_addon = __commonJS({
     function createMigrationGuard(now = Date.now) {
       const inFlight = /* @__PURE__ */ new Set();
       const completed = /* @__PURE__ */ new Map();
-      const pairKey = (sourceId, targetId) => `${sourceId}->${targetId}`;
+      const pairKey2 = (sourceId, targetId) => `${sourceId}->${targetId}`;
       return {
         begin(sourceId, targetId) {
           for (const id of [sourceId, targetId]) if (inFlight.has(id)) throw new Error(`[device-manager] migrateDevice: a migration involving device ${id} is already in flight \u2014 this call was refused, not queued. The running migration's report stands; re-read the device rows before retrying.`);
@@ -69693,13 +69752,13 @@ var require_device_manager_addon = __commonJS({
           inFlight.delete(targetId);
         },
         recordCompleted(record) {
-          completed.set(pairKey(record.sourceId, record.targetId), {
+          completed.set(pairKey2(record.sourceId, record.targetId), {
             ...record,
             completedAt: now()
           });
         },
         matchReplay(sourceId, targetId, atSource, atTarget) {
-          const key = pairKey(sourceId, targetId);
+          const key = pairKey2(sourceId, targetId);
           const record = completed.get(key);
           if (record === void 0) return null;
           if (now() - record.completedAt > 9e5) {
@@ -69711,6 +69770,56 @@ var require_device_manager_addon = __commonJS({
         }
       };
     }
+    function pairKey(addonId, stableId) {
+      return `${addonId}\0${stableId}`;
+    }
+    function createRemovalFence(options = {}) {
+      const ttlMs = options.ttlMs ?? 3e5;
+      const now = options.now ?? (() => Date.now());
+      const byId = /* @__PURE__ */ new Map();
+      const byPair = /* @__PURE__ */ new Map();
+      let suspensions = 0;
+      const fresh = (entry) => {
+        if (entry === void 0) return null;
+        if (suspensions > 0) return null;
+        if (now() - entry.removedAt >= ttlMs) {
+          byId.delete(entry.deviceId);
+          byPair.delete(pairKey(entry.addonId, entry.stableId));
+          return null;
+        }
+        return entry;
+      };
+      return {
+        record(entry) {
+          const full = {
+            ...entry,
+            removedAt: now()
+          };
+          byId.set(full.deviceId, full);
+          byPair.set(pairKey(full.addonId, full.stableId), full);
+        },
+        isIdFenced(deviceId) {
+          return fresh(byId.get(deviceId));
+        },
+        isPairFenced(addonId, stableId) {
+          return fresh(byPair.get(pairKey(addonId, stableId)));
+        },
+        lift(addonId, stableId) {
+          const entry = byPair.get(pairKey(addonId, stableId));
+          if (entry === void 0) return;
+          byPair.delete(pairKey(addonId, stableId));
+          byId.delete(entry.deviceId);
+        },
+        async runUnfenced(fn) {
+          suspensions += 1;
+          try {
+            return await fn();
+          } finally {
+            suspensions -= 1;
+          }
+        }
+      };
+    }
     var DeviceManagerAddon = class extends require_dist10.BaseAddon {
       constructor() {
         super({});
@@ -69951,6 +70060,7 @@ var require_device_manager_addon = __commonJS({
           registry,
           bindingsDeps: this.bindingsDeps,
           migrationGuard: createMigrationGuard(),
+          removalFence: createRemovalFence(),
           requireDeviceOps,
           stampIntegrationId: stampIntegrationId$1,
           get provider() {
@@ -241146,6 +241256,53 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
         const ids = [...this._permanentRestoreFailures.keys()].join(", ");
         return `${this._permanentRestoreFailures.size} device(s) permanently failed restore (deviceIds: ${ids}) \u2014 restart the ${this.providerName} provider to retry`;
       }
+      /**
+      * A top-level persisted row with NO configuration is a leftover, not a
+      * device — quarantine it instead of dialling it.
+      *
+      * Device 614 was deleted, resurrected as a config-less shell by a write
+      * already in flight (D376), and then dialled at every single boot: eight
+      * `Failed to restore device — bounded retry scheduled` lines in one day,
+      * each one the same Zod refusal on `host` and `password`. The bound was
+      * real, but it is a bound PER PROCESS, and the runner restarts — so nothing
+      * about the row ever stopped costing attempts and log lines.
+      *
+      * No retry can add a configuration that is not there. The row is reported
+      * once, with its `deviceId`, and set aside.
+      *
+      * Top-level only: an accessory child legitimately carries an empty blob (it
+      * lives off its parent), and a hub-adopted child with an emptied blob is
+      * repaired by `healSavedConfig` from its parent instead. Providers that
+      * genuinely create configuration-free top-level devices turn this off.
+      */
+      quarantineConfiglessTopLevelRestores = true;
+      isUnrestorableShell(saved) {
+        if (!this.quarantineConfiglessTopLevelRestores) return false;
+        if (saved.parentDeviceId !== null) return false;
+        const config = saved.config;
+        if (config === void 0) return false;
+        return Object.keys(config).length === 0;
+      }
+      quarantineShell(saved) {
+        this._permanentRestoreFailures.set(saved.id, {
+          deviceId: saved.id,
+          stableId: saved.stableId,
+          type: saved.type,
+          attempts: 0,
+          lastError: "persisted row has no configuration",
+          failedAt: Date.now()
+        });
+        this.ctx.logger.error("Persisted device row has NO configuration \u2014 quarantined: not restored, not retried. Remove it (deviceManager.removeDevice) or re-add the device.", {
+          tags: {
+            deviceId: saved.id,
+            stableId: saved.stableId
+          },
+          meta: {
+            type: saved.type,
+            provider: this.providerName
+          }
+        });
+      }
       cancelRestoreRetries() {
         this._restoreRetryScheduler?.cancel();
         this._restoreRetryScheduler = null;
@@ -241331,6 +241488,10 @@ ${recipe.triggers.map((t, i) => emitTrigger(t, i)).join("\n\n")}
             });
             return;
           }
+          if (this.isUnrestorableShell(saved)) {
+            this.quarantineShell(saved);
+            return;
+          }
           try {
             await attemptRestore(saved);
           } catch (err) {
@@ -412781,8 +412942,8 @@ var require_session_cookie = __commonJS({
     function shouldRedirectToLogin(method, accept) {
       return method === "GET" && typeof accept === "string" && accept.includes("text/html");
     }
-    function loginRedirectUrl(originalUrl) {
-      return `/login?next=${encodeURIComponent(originalUrl)}`;
+    function loginRedirectUrl(originalUrl, mountPrefix = null) {
+      return `${mountPrefix ?? ""}/login?next=${encodeURIComponent(originalUrl)}`;
     }
     function isEmbedRedirectTarget(next) {
       if (!next.startsWith("/addon/stream-broker/embed/"))
@@ -413959,6 +414120,97 @@ var require_spa_static = __commonJS({
   }
 });
 
+// ../../server/backend/dist/api/static/spa-mount.js
+var require_spa_mount = __commonJS({
+  "../../server/backend/dist/api/static/spa-mount.js"(exports) {
+    "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    })();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.FORWARDED_PREFIX_HEADER = void 0;
+    exports.parseForwardedPrefix = parseForwardedPrefix;
+    exports.injectSpaMount = injectSpaMount;
+    exports.sendSpaShell = sendSpaShell;
+    var fs = __importStar(__require("fs/promises"));
+    var spa_static_1 = require_spa_static();
+    exports.FORWARDED_PREFIX_HEADER = "x-forwarded-prefix";
+    var FORWARDED_PREFIX_VARY = "X-Forwarded-Prefix";
+    var MOUNT_META_NAME = "camstack-mount";
+    var PREFIX_RE = /^\/[A-Za-z0-9_\-.]+(?:\/[A-Za-z0-9_\-.]+)*$/;
+    var MAX_PREFIX_LENGTH = 512;
+    function parseForwardedPrefix(value) {
+      if (typeof value !== "string")
+        return null;
+      if (value.length === 0 || value.length > MAX_PREFIX_LENGTH)
+        return null;
+      const trimmed = value.endsWith("/") ? value.slice(0, -1) : value;
+      if (trimmed === "")
+        return null;
+      if (!PREFIX_RE.test(trimmed))
+        return null;
+      if (trimmed.split("/").some((segment) => segment === ".." || segment === "."))
+        return null;
+      return trimmed;
+    }
+    function injectSpaMount(html, prefix) {
+      const match = /<head(?:\s[^>]*)?>/i.exec(html);
+      if (match === null)
+        return html;
+      const mount = `${prefix}/`;
+      const injected = `<base href="${mount}"><meta name="${MOUNT_META_NAME}" content="${mount}">`;
+      const at = match.index + match[0].length;
+      return `${html.slice(0, at)}${injected}${html.slice(at)}`;
+    }
+    async function sendSpaShell(reply, indexPath, headers) {
+      reply.header("cache-control", (0, spa_static_1.spaShellCacheControl)());
+      reply.header("vary", FORWARDED_PREFIX_VARY);
+      let html;
+      try {
+        html = await fs.readFile(indexPath, "utf8");
+      } catch {
+        return reply.status(503).send({ error: "Admin UI shell unavailable" });
+      }
+      const prefix = parseForwardedPrefix(headers[exports.FORWARDED_PREFIX_HEADER]);
+      return reply.type("text/html").send(prefix === null ? html : injectSpaMount(html, prefix));
+    }
+  }
+});
+
 // ../../server/backend/dist/boot/integration-id-backfill.js
 var require_integration_id_backfill = __commonJS({
   "../../server/backend/dist/boot/integration-id-backfill.js"(exports) {
@@ -429580,6 +429832,7 @@ var require_main4 = __commonJS({
     var sse_no_compression_js_1 = require_sse_no_compression();
     var precompressed_asset_js_1 = require_precompressed_asset();
     var spa_static_1 = require_spa_static();
+    var spa_mount_1 = require_spa_mount();
     var cap_providers_1 = require_cap_providers();
     var logging_settings_1 = require_logging_settings();
     var request_census_settings_1 = require_request_census_settings();
@@ -430207,7 +430460,7 @@ var require_main4 = __commonJS({
               return reply.status(404).send({ error: "Not found" });
             }
             if (method === "GET" && spaIndexHtml) {
-              return reply.header("cache-control", (0, spa_static_1.spaShellCacheControl)()).type("text/html").send(fs.createReadStream(spaIndexHtml));
+              return (0, spa_mount_1.sendSpaShell)(reply, spaIndexHtml, request.headers);
             }
             return reply.status(404).send({ error: "Not found" });
           }
@@ -430217,7 +430470,7 @@ var require_main4 = __commonJS({
             if (!authHeader && !cookieToken) {
               if ((0, session_cookie_js_1.shouldRedirectToLogin)(request.method, request.headers.accept)) {
                 const qs = request.url.includes("?") ? request.url.slice(request.url.indexOf("?")) : "";
-                return reply.redirect((0, session_cookie_js_1.loginRedirectUrl)(fullPath + qs));
+                return reply.redirect((0, session_cookie_js_1.loginRedirectUrl)(fullPath + qs, (0, spa_mount_1.parseForwardedPrefix)(request.headers["x-forwarded-prefix"])));
               }
               return reply.status(401).send({ error: "Unauthorized" });
             }
@@ -430419,7 +430672,7 @@ var require_main4 = __commonJS({
           return reply.status(503).send({ error: "Admin UI is starting" });
         }
         const pathOnly = url.split("?")[0] ?? url;
-        if (/\.[a-zA-Z0-9]+$/.test(pathOnly)) {
+        if (pathOnly !== "/index.html" && /\.[a-zA-Z0-9]+$/.test(pathOnly)) {
           const rel = pathOnly.replace(/^\/+/, "");
           const abs = path.join(staticDir, rel);
           if ((abs === staticDir || abs.startsWith(staticDir + path.sep)) && fs.existsSync(abs)) {
@@ -430428,8 +430681,7 @@ var require_main4 = __commonJS({
           }
           return reply.callNotFound();
         }
-        reply.header("cache-control", (0, spa_static_1.spaShellCacheControl)());
-        return reply.type("text/html").send(fs.createReadStream(indexPath));
+        return (0, spa_mount_1.sendSpaShell)(reply, indexPath, request.headers);
       });
       const resolveAdminUi = async () => {
         try {

package/package.json

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