@riddix/hamh 2.1.0-alpha.848 → 2.1.0-alpha.850

package/dist/backend/cli.js

@@ -136608,7 +136608,20 @@ var PluginRegistry = class {
   }
 };
 
+// src/plugins/types.ts
+var SECRET_UNCHANGED = "__unchanged__";
+
 // src/api/plugin-api.ts
+function redactSecrets(config11, schema6) {
+  if (!schema6) return config11;
+  const out = { ...config11 };
+  for (const [key, prop] of Object.entries(schema6.properties)) {
+    if (prop.secret && out[key] != null && out[key] !== "") {
+      out[key] = SECRET_UNCHANGED;
+    }
+  }
+  return out;
+}
 var MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
 var BLOCKED_PREFIXES = [
   "/bin",
@@ -136647,7 +136660,10 @@ function pluginApi(bridgeService, storageLocation) {
         version: meta.version,
         source: meta.source,
         enabled: meta.enabled,
-        config: meta.config,
+        config: redactSecrets(
+          meta.config,
+          bridge.getPluginConfigSchema?.(meta.name)
+        ),
         circuitBreaker: info.circuitBreakers[meta.name],
         devices: info.devices.filter((d) => d.pluginName === meta.name).map((d) => ({
           id: d.device.id,
@@ -156746,6 +156762,9 @@ var PluginManager = class {
       } else if (this.runner.getState(name).failures === 0) {
         instance.started = true;
       }
+      if (instance.plugin.getCurrentConfig) {
+        instance.metadata.config = instance.plugin.getCurrentConfig();
+      }
     }
   }
   /**
@@ -156846,6 +156865,17 @@ var PluginManager = class {
   async updateConfig(pluginName, config11) {
     const instance = this.instances.get(pluginName);
     if (!instance) return false;
+    config11 = { ...config11 };
+    const schema6 = instance.plugin.getConfigSchema?.();
+    if (schema6) {
+      for (const [key, prop] of Object.entries(schema6.properties)) {
+        if (prop.secret && config11[key] === SECRET_UNCHANGED) {
+          const stored = instance.metadata.config[key];
+          if (stored == null) delete config11[key];
+          else config11[key] = stored;
+        }
+      }
+    }
     instance.metadata.config = config11;
     this.registry?.updateConfig(pluginName, config11);
     if (instance.plugin.onConfigChanged) {
@@ -161085,7 +161115,7 @@ function thermostatPreInitialize(self) {
   );
   self.state.thermostatRunningState = runningStateAllOff;
   if (self.features.autoMode) {
-    self.state.minSetpointDeadBand = self.state.minSetpointDeadBand ?? 0;
+    self.state.minSetpointDeadBand = 0;
   } else {
     if (self.state.minSetpointDeadBand !== void 0)
       self.state.minSetpointDeadBand = void 0;
@@ -161782,24 +161812,25 @@ function applyClimateFreezeForKeepModeOnIdle(computed, entity, entityId, keepMod
   }
   return computed;
 }
+function isTemperatureRangeActive(entity) {
+  const hasFeature = testBit(
+    entity.attributes.supported_features ?? 0,
+    ClimateDeviceFeature.TARGET_TEMPERATURE_RANGE
+  );
+  const currentMode = entity.state;
+  const isRangeMode = currentMode === ClimateHvacMode.heat_cool || currentMode === ClimateHvacMode.auto;
+  return hasFeature && isRangeMode;
+}
 var config5 = {
-  // Temperature range (target_temp_low/high) only works in heat_cool mode.
-  // In heat or cool mode, HA expects a single "temperature" value.
-  // We must check BOTH the feature flag AND the current HVAC mode.
-  supportsTemperatureRange: (entity) => {
-    const hasFeature = testBit(
-      entity.attributes.supported_features ?? 0,
-      ClimateDeviceFeature.TARGET_TEMPERATURE_RANGE
-    );
-    const currentMode = entity.state;
-    const isRangeMode = currentMode === ClimateHvacMode.heat_cool || currentMode === ClimateHvacMode.auto;
-    return hasFeature && isRangeMode;
-  },
+  supportsTemperatureRange: isTemperatureRangeActive,
   getMinTemperature: (entity, agent) => getTemp(agent, entity, "min_temp"),
   getMaxTemperature: (entity, agent) => getTemp(agent, entity, "max_temp"),
   getCurrentTemperature: (entity, agent) => getTemp(agent, entity, "current_temperature"),
-  getTargetHeatingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_low") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
-  getTargetCoolingTemperature: (entity, agent) => getTemp(agent, entity, "target_temp_high") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature"),
+  // Outside range mode the range attributes are stale: an integration can park
+  // target_temp_low/high while the mode it actually runs on is "temperature".
+  // Reading them then reports the parked value as the setpoint (#435).
+  getTargetHeatingTemperature: (entity, agent) => isTemperatureRangeActive(entity) ? getTemp(agent, entity, "target_temp_low") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature") : getTemp(agent, entity, "temperature") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "target_temp_low"),
+  getTargetCoolingTemperature: (entity, agent) => isTemperatureRangeActive(entity) ? getTemp(agent, entity, "target_temp_high") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "temperature") : getTemp(agent, entity, "temperature") ?? getTemp(agent, entity, "target_temperature") ?? getTemp(agent, entity, "target_temp_high"),
   getSystemMode: (entity, agent) => {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
     const computed = computeSystemMode(entity, agent);
@@ -161991,13 +162022,16 @@ function ClimateDevice(homeAssistantEntity, includeBasicInformation = true) {
   const rawMaxLimit = toMatterTemp(attributes9.max_temp) ?? 5e3;
   const minLimit = Math.min(rawMinLimit, rawMaxLimit);
   const maxLimit = Math.max(rawMinLimit, rawMaxLimit);
+  const rangeActive = isTemperatureRangeActive(
+    homeAssistantEntity.entity.state
+  );
   const initialState = {
     // Pass actual current_temperature for initial state.
     // If unavailable (null/undefined), update() will fall back to the
     // target setpoint so controllers don't display 0°C.
     localTemperature: toMatterTemp(attributes9.current_temperature),
-    occupiedHeatingSetpoint: toMatterTemp(attributes9.target_temp_low) ?? toMatterTemp(attributes9.temperature) ?? 2e3,
-    occupiedCoolingSetpoint: toMatterTemp(attributes9.target_temp_high) ?? toMatterTemp(attributes9.temperature) ?? 2400,
+    occupiedHeatingSetpoint: rangeActive ? toMatterTemp(attributes9.target_temp_low) ?? toMatterTemp(attributes9.temperature) ?? 2e3 : toMatterTemp(attributes9.temperature) ?? toMatterTemp(attributes9.target_temp_low) ?? 2e3,
+    occupiedCoolingSetpoint: rangeActive ? toMatterTemp(attributes9.target_temp_high) ?? toMatterTemp(attributes9.temperature) ?? 2400 : toMatterTemp(attributes9.temperature) ?? toMatterTemp(attributes9.target_temp_high) ?? 2400,
     // Use HA's actual min/max limits, fall back to wide range (0-50°C) if not
     // provided. Ordered above so min <= max always holds.
     minHeatSetpointLimit: minLimit,
@@ -173985,6 +174019,9 @@ var CameraPlugin = class {
   async onShutdown() {
     await this.teardown();
   }
+  getCurrentConfig() {
+    return { ...this.config };
+  }
   getConfigSchema() {
     return {
       title: "Camera",
@@ -174000,7 +174037,8 @@ var CameraPlugin = class {
           type: "string",
           title: "Long-lived access token",
           description: "Leave empty to use the bridge's Home Assistant connection.",
-          required: false
+          required: false,
+          secret: true
         },
         cameras: {
           type: "string",
@@ -174243,7 +174281,7 @@ var EntityIsolationServiceImpl = class {
    * Returns: { bridgeId: "ed5b4f8d...", entityName: "Küchenlicht" }
    */
   parseEndpointPath(errorMessage) {
-    const match = errorMessage.match(/([a-f0-9]{32})\.aggregator\.([^.]+)\./i);
+    const match = errorMessage.match(/([a-f0-9]{32})\.aggregator\.([^.\s>]+)/i);
     if (match) {
       return {
         bridgeId: match[1],
@@ -174271,6 +174309,9 @@ var EntityIsolationServiceImpl = class {
     if (msg.includes("Endpoint storage inaccessible")) {
       return "Endpoint storage inaccessible";
     }
+    if (msg.includes("Error initializing part")) {
+      return "Endpoint construction failure";
+    }
     if (msg.includes("aggregator.")) {
       return "Runtime error in endpoint";
     }
@@ -177900,7 +177941,7 @@ function formatPatchError(action, error) {
   return `${action}:${error instanceof Error ? error.message : String(error)}`;
 }
 
-// src/commands/start/start-handler.ts
+// src/commands/start/start-error-matchers.ts
 function extractErrorMessage(error) {
   if (error instanceof Error) return error.message;
   if (typeof error === "object" && error !== null) {
@@ -177913,14 +177954,17 @@ function extractErrorMessage(error) {
   }
   return String(error);
 }
+var AGGREGATOR_PATH_RE = /[0-9a-f]{32}\.aggregator\b/i;
 function shouldSuppressError(error) {
   const msg = extractErrorMessage(error);
-  return msg.includes("Connection lost") || msg.includes("Endpoint storage inaccessible") || msg.includes("Invalid intervalMs") || msg.includes("generalDiagnostics") || msg.includes("Behaviors have errors") || msg.includes("TransactionDestroyedError") || msg.includes("DestroyedDependencyError") || msg.includes("UninitializedDependencyError") || msg.includes("mutex-closed") || msg.includes("not a node and is not owned") || msg.includes("aggregator.");
+  return msg.includes("Connection lost") || msg.includes("Endpoint storage inaccessible") || msg.includes("Invalid intervalMs") || msg.includes("generalDiagnostics") || msg.includes("Behaviors have errors") || msg.includes("TransactionDestroyedError") || msg.includes("DestroyedDependencyError") || msg.includes("UninitializedDependencyError") || msg.includes("mutex-closed") || msg.includes("not a node and is not owned") || msg.includes("aggregator.") || AGGREGATOR_PATH_RE.test(msg);
 }
 function isIsolatableError(error) {
   const msg = error instanceof Error ? error.message : String(error);
-  return msg.includes("Invalid intervalMs") || msg.includes("Behaviors have errors") || msg.includes("TransactionDestroyedError") || msg.includes("DestroyedDependencyError") || msg.includes("UninitializedDependencyError") || msg.includes("Endpoint storage inaccessible") || msg.includes("aggregator.");
+  return msg.includes("Invalid intervalMs") || msg.includes("Behaviors have errors") || msg.includes("TransactionDestroyedError") || msg.includes("DestroyedDependencyError") || msg.includes("UninitializedDependencyError") || msg.includes("Endpoint storage inaccessible") || msg.includes("aggregator.") || AGGREGATOR_PATH_RE.test(msg);
 }
+
+// src/commands/start/start-handler.ts
 process.on("uncaughtException", (error) => {
   if (shouldSuppressError(error)) {
     return;