boneio 1.4.0.dev12__tar.gz → 1.4.0.dev14__tar.gz

{boneio-1.4.0.dev12/boneio.egg-info → boneio-1.4.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.4.0.dev12
+Version: 1.4.0.dev14
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/components/irrigation/controller.py

@@ -262,43 +262,62 @@ class IrrigationController:
     def _eligible_zones(self) -> list[tuple[int, IrrigationZone]]:
         """Determine which zones are eligible to run in this cycle.
 
+        This is a **pure** function — it does NOT modify skip counters.
+        Use :meth:`_apply_skip_counters` once at the start of a scheduled
+        cycle to advance counters.
+
         Uses a counter-based system: each zone has a skip counter that
         increments every scheduled cycle. When the counter reaches
         run_every_n - 1, the zone is eligible and the counter resets.
-        Manual starts do not affect the counter.
         """
         eligible: list[tuple[int, IrrigationZone]] = []
         for idx, zone in self._ordered_zones():
             if not zone.enabled:
-                _LOGGER.debug("Irrigation %s: zone %s skipped (disabled)", self.id, zone.id)
                 continue
             if zone.run_every_n <= 1:
-                # run_every_n=1 means run every time
                 eligible.append((idx, zone))
                 continue
             counter_key = f"zone/{zone.id}/skip_count"
             skip_count = int(self._get(counter_key, 0))
             if skip_count >= zone.run_every_n - 1:
+                eligible.append((idx, zone))
+        return eligible
+
+    def _apply_skip_counters(self) -> None:
+        """Advance skip counters for all zones at the start of a scheduled cycle.
+
+        For each enabled zone with ``run_every_n > 1``:
+        - If the zone IS eligible (skip_count >= run_every_n - 1),
+          reset counter to 0 (zone will run this cycle).
+        - If the zone is NOT eligible, increment the counter.
+
+        Must be called **exactly once** per scheduled cycle, before
+        ``_eligible_zones()`` is used to build the run list.
+        """
+        for _idx, zone in self._ordered_zones():
+            if not zone.enabled or zone.run_every_n <= 1:
+                continue
+            counter_key = f"zone/{zone.id}/skip_count"
+            skip_count = int(self._get(counter_key, 0))
+            if skip_count >= zone.run_every_n - 1:
+                # Zone is eligible — reset counter
+                self._save(counter_key, 0)
                 _LOGGER.debug(
-                    "Irrigation %s: zone %s eligible (skip_count=%d >= %d)",
+                    "Irrigation %s: zone %s counter reset (was %d, eligible)",
                     self.id,
                     zone.id,
                     skip_count,
-                    zone.run_every_n - 1,
                 )
-                eligible.append((idx, zone))
-                # Reset counter — will be saved when zone finishes in _advance_to_next_zone
             else:
                 skip_count += 1
                 self._save(counter_key, skip_count)
                 _LOGGER.debug(
-                    "Irrigation %s: zone %s NOT eligible (skip_count=%d < %d)",
+                    "Irrigation %s: zone %s counter incremented to %d/%d",
                     self.id,
                     zone.id,
                     skip_count,
                     zone.run_every_n - 1,
                 )
-        return eligible
 
     async def publish_all_states(self) -> None:
         controller_state = ON if self._state in (ControllerState.RUNNING, ControllerState.PAUSED) else OFF
@@ -346,7 +365,23 @@ class IrrigationController:
                 active,
                 self._active_zone_idx,
             )
-            self._publish(self._zone_state_topic(zone.id), {"state": active})
+            zone_payload: dict[str, Any] = {"state": active}
+            # Add next_run attributes for zones with run_every_n > 1
+            if zone.run_every_n > 1:
+                zone_next_dt = self._compute_zone_next_run_time(zone)
+                counter_key = f"zone/{zone.id}/skip_count"
+                skip_count = int(self._get(counter_key, 0))
+                zone_payload["run_every_n"] = zone.run_every_n
+                zone_payload["skip_count"] = skip_count
+                if zone_next_dt is not None:
+                    local_tz = _local_now().tzinfo
+                    next_local = zone_next_dt.astimezone(local_tz)
+                    zone_payload["next_run_iso"] = zone_next_dt.isoformat()
+                    zone_payload["next_run_pretty"] = next_local.strftime("%d %b %Y, %H:%M")
+                else:
+                    zone_payload["next_run_iso"] = ""
+                    zone_payload["next_run_pretty"] = ""
+            self._publish(self._zone_state_topic(zone.id), zone_payload)
             self._publish(
                 self._setting_state_topic(f"zone/{zone.id}/enabled"),
                 {"state": ON if zone.enabled else OFF},
@@ -464,7 +499,7 @@ class IrrigationController:
             _LOGGER.info("Irrigation %s skipped one full cycle", self.id)
             return
 
-        await self._start_cycle_from_eligible()
+        await self._start_cycle_from_eligible(scheduled=True)
 
     async def start_single_zone(self, zone_id: str) -> None:
         _LOGGER.debug(
@@ -502,8 +537,17 @@ class IrrigationController:
         _LOGGER.debug("Irrigation %s calling _start_zone(%d) for zone '%s'", self.id, match_idx, zone_id)
         await self._start_zone(match_idx)
 
-    async def _start_cycle_from_eligible(self) -> None:
+    async def _start_cycle_from_eligible(self, scheduled: bool = False) -> None:
+        """Build the eligible zone list and start the first zone.
+
+        When ``scheduled`` is True (i.e. triggered by the daily schedule,
+        not a repeat), skip counters are advanced **after** reading
+        eligibility so that the current counter values decide this cycle
+        and the increments prepare counters for the next one.
+        """
         eligible = self._eligible_zones()
+        if scheduled:
+            self._apply_skip_counters()
         _LOGGER.debug(
             "Irrigation %s _start_cycle_from_eligible: %d eligible zones: %s",
             self.id,
@@ -535,9 +579,6 @@ class IrrigationController:
 
         finished_idx = self._active_zone_idx
         finished_zone = self._zones[finished_idx]
-        # Reset skip counter for scheduled runs only (manual starts don't affect counters)
-        if not self._single_zone_mode:
-            self._save(f"zone/{finished_zone.id}/skip_count", 0)
 
         if self._single_zone_mode:
             _LOGGER.debug("Irrigation %s: single zone mode complete for zone '%s'", self.id, finished_zone.id)
@@ -650,6 +691,13 @@ class IrrigationController:
         self._active_zone_remaining_s = duration
         self._state = ControllerState.RUNNING
 
+        # Publish state immediately so the UI (frontend + HA) shows
+        # RUNNING right away, before any pump/valve delay sleeps.
+        # The timer has not been armed yet so zone_end_time will be
+        # empty, but a second publish happens after hardware activation.
+        self._run_start_utc = utcnow()
+        await self.publish_all_states()
+
         if src is not None:
             if src.pump_start_valve_delay_s > 0:
                 # Source first (pump+valve), then zone valve after delay
@@ -1032,6 +1080,46 @@ class IrrigationController:
                 earliest = candidate
         return earliest
 
+    def _compute_zone_next_run_time(self, zone: IrrigationZone) -> datetime | None:
+        """Compute when a specific zone will actually run next.
+
+        Accounts for ``run_every_n``: if the zone needs 2 more skipped
+        cycles before it's eligible, this returns the fire time of the
+        (skip_remaining + 1)th upcoming schedule.
+
+        Args:
+            zone: The irrigation zone to compute for.
+
+        Returns:
+            Timezone-aware UTC datetime of the zone's next actual run,
+            or None if no schedules are configured or the controller
+            is in standby or the zone is disabled.
+        """
+        if not self._schedule or self._standby or not zone.enabled:
+            return None
+
+        if zone.run_every_n <= 1:
+            # Runs every cycle — same as controller next_run_time
+            return self._compute_next_run_time()
+
+        counter_key = f"zone/{zone.id}/skip_count"
+        skip_count = int(self._get(counter_key, 0))
+        remaining_skips = max(0, (zone.run_every_n - 1) - skip_count)
+
+        # The zone will run on the (remaining_skips + 1)th cycle
+        cycles_until_run = remaining_skips + 1
+
+        # Find the Nth fire time across all schedules
+        # Strategy: collect fire times from all schedules, sort, pick Nth
+        earliest: datetime | None = None
+        for schedule in self._schedule:
+            time_str = schedule.get("time", "06:00")
+            days = str(schedule.get("days", "daily")).strip().lower()
+            candidate = _nth_fire_time(time_str, days, n=cycles_until_run)
+            if earliest is None or candidate < earliest:
+                earliest = candidate
+        return earliest
+
     def start_schedules(self) -> None:
         self.stop_schedules()
         for idx, schedule in enumerate(self._schedule):
@@ -1071,17 +1159,25 @@ def _local_now() -> datetime:
 def _next_fire_time(time_str: str, days: str) -> datetime:
     """Compute next fire time for a schedule entry.
 
+    Shorthand for ``_nth_fire_time(time_str, days, n=1)``.
+    """
+    return _nth_fire_time(time_str, days, n=1)
+
+
+def _nth_fire_time(time_str: str, days: str, n: int = 1) -> datetime:
+    """Compute the Nth upcoming fire time for a schedule entry.
+
     The user-configured ``time_str`` (e.g. "18:00") is in **local time**.
-    We build the candidate in the system's local timezone and then convert
-    to UTC so that comparisons with ``utcnow()`` and HA's
-    ``device_class: timestamp`` work correctly.
+    We build candidates in the system's local timezone and then convert
+    to UTC.
 
     Args:
         time_str: Schedule time in "HH:MM" format (local time).
-        days: Day filter string ("daily", "weekdays", "weekends", "mon,wed,fri", etc.).
+        days: Day filter string ("daily", "weekdays", "weekends", etc.).
+        n: Which occurrence to return (1 = next, 2 = the one after, etc.).
 
     Returns:
-        Next fire time as a timezone-aware UTC datetime.
+        Nth fire time as a timezone-aware UTC datetime.
     """
     now_local = _local_now()
 
@@ -1093,8 +1189,9 @@ def _next_fire_time(time_str: str, days: str) -> datetime:
         target_h, target_m = 6, 0
 
     allowed_days = _DAYS_MAP.get(days, _DAYS_MAP["daily"])
+    found = 0
 
-    for plus_days in range(0, 8):
+    for plus_days in range(0, 366):
         candidate_local = (now_local + timedelta(days=plus_days)).replace(
             hour=target_h,
             minute=target_m,
@@ -1102,10 +1199,12 @@ def _next_fire_time(time_str: str, days: str) -> datetime:
             microsecond=0,
         )
         if candidate_local.weekday() in allowed_days and candidate_local > now_local:
-            # Convert to UTC for consistent comparison with utcnow()
-            return candidate_local.astimezone(dt.UTC)
+            found += 1
+            if found >= n:
+                return candidate_local.astimezone(dt.UTC)
 
-    fallback_local = (now_local + timedelta(days=1)).replace(
+    # Fallback (should never reach for n <= 365)
+    fallback_local = (now_local + timedelta(days=n)).replace(
         hour=target_h,
         minute=target_m,
         second=0,
@@ -1113,3 +1212,4 @@ def _next_fire_time(time_str: str, days: str) -> datetime:
     )
     return fallback_local.astimezone(dt.UTC)
 
+

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/core/manager/inputs.py

@@ -130,8 +130,16 @@ class InputManager:
                 return False
             return False
 
-        def configure_single_input(configure_sensor_func: Callable, gpio: dict) -> None:
-            """Configure a single input (event or binary sensor)."""
+        def configure_single_input(
+            configure_sensor_func: Callable, gpio: dict, expected_class: type
+        ) -> None:
+            """Configure a single input (event or binary sensor).
+
+            Args:
+                configure_sensor_func: The _configure_event_sensor or _configure_binary_sensor method.
+                gpio: GPIO configuration dictionary.
+                expected_class: The expected class type (GpioEventButton or GpioInputBinarySensor).
+            """
             # Work on a copy to avoid modifying the cached config
             gpio_copy = gpio.copy()
 
@@ -149,6 +157,18 @@ class InputManager:
 
             existing_input = self._inputs.get(input_id, None) if reload_config else None
 
+            # Guard: if the existing input is a different class (type changed,
+            # e.g. event → binary_sensor), do NOT pass it as existing_input.
+            # A new object with the correct detector must be created instead.
+            if existing_input is not None and not isinstance(existing_input, expected_class):
+                _LOGGER.info(
+                    "Input %s type changed from %s to %s, creating new input object",
+                    input_id,
+                    type(existing_input).__name__,
+                    expected_class.__name__,
+                )
+                existing_input = None
+
             input_device = configure_sensor_func(
                 gpio=gpio_copy,
                 pin=pin,
@@ -172,14 +192,22 @@ class InputManager:
         # Configure event buttons
         for gpio in self._event_pins:
             try:
-                configure_single_input(configure_sensor_func=self._configure_event_sensor, gpio=gpio)
+                configure_single_input(
+                    configure_sensor_func=self._configure_event_sensor,
+                    gpio=gpio,
+                    expected_class=GpioEventButton,
+                )
             except GPIOInputException as err:
                 _LOGGER.error("Failed to configure event input: %s", err)
 
         # Configure binary sensors
         for gpio in self._binary_pins:
             try:
-                configure_single_input(configure_sensor_func=self._configure_binary_sensor, gpio=gpio)
+                configure_single_input(
+                    configure_sensor_func=self._configure_binary_sensor,
+                    gpio=gpio,
+                    expected_class=GpioInputBinarySensor,
+                )
             except GPIOInputException as err:
                 _LOGGER.error("Failed to configure binary sensor: %s", err)
 
@@ -490,21 +518,25 @@ class InputManager:
         # Get config from ConfigHelper (already reloaded by Manager)
         config = self._manager._config_helper.get_config()
 
-        # Build map of new inputs from config (input_id -> {pin, area})
+        # Build map of new inputs from config (input_id -> {pin, area, ha_type})
         # Note: boneio_input is normalized to lowercase to match yaml_util.py behavior
         new_input_map: dict[str, dict] = {}
-        for gpio in config.get(EVENT_ENTITY, []) + config.get(BINARY_SENSOR, []):
-            pin = gpio.get("pin")
-            # Determine input ID (same logic as in _configure_event_sensor/_configure_binary_sensor)
-            if "id" in gpio:
-                input_id = gpio["id"]
-            elif "boneio_input" in gpio:
-                input_id = gpio["boneio_input"].lower()
-            elif pin:
-                input_id = pin
-            else:
-                continue
-            new_input_map[input_id] = {"pin": pin, "area": gpio.get("area")}
+        for ha_type, gpio_list in [
+            (EVENT_ENTITY, config.get(EVENT_ENTITY, [])),
+            (BINARY_SENSOR, config.get(BINARY_SENSOR, [])),
+        ]:
+            for gpio in gpio_list:
+                pin = gpio.get("pin")
+                # Determine input ID (same logic as in _configure_event_sensor/_configure_binary_sensor)
+                if "id" in gpio:
+                    input_id = gpio["id"]
+                elif "boneio_input" in gpio:
+                    input_id = gpio["boneio_input"].lower()
+                elif pin:
+                    input_id = pin
+                else:
+                    continue
+                new_input_map[input_id] = {"pin": pin, "area": gpio.get("area"), "ha_type": ha_type}
 
         # Find inputs to remove (in current config but not in new config)
         current_input_ids = set(self._inputs.keys())
@@ -512,12 +544,29 @@ class InputManager:
 
         inputs_to_remove = current_input_ids - new_input_ids
 
-        _LOGGER.info(f"Input reload: current={current_input_ids}, new={new_input_ids}, to_remove={inputs_to_remove}")
+        _LOGGER.info("Input reload: current=%s, new=%s, to_remove=%s", current_input_ids, new_input_ids, inputs_to_remove)
+
+        # Detect inputs whose type changed (event <-> binary_sensor).
+        # These must be removed and re-created with the correct detector class.
+        inputs_type_changed: set[str] = set()
+        for input_id, new_info in new_input_map.items():
+            existing = self._inputs.get(input_id)
+            if existing is None:
+                continue
+            new_ha_type = new_info["ha_type"]
+            # GpioEventButton has input_type=INPUT, GpioInputBinarySensor has input_type=INPUT_SENSOR
+            if new_ha_type == EVENT_ENTITY and not isinstance(existing, GpioEventButton):
+                inputs_type_changed.add(input_id)
+            elif new_ha_type == BINARY_SENSOR and not isinstance(existing, GpioInputBinarySensor):
+                inputs_type_changed.add(input_id)
+
+        if inputs_type_changed:
+            _LOGGER.info("Input type changed for: %s — will recreate with new detector", inputs_type_changed)
 
         # Remove deleted inputs from internal state (GPIO pin stays registered - minimal overhead)
         ha_discovery_changed = False
 
-        for input_id in inputs_to_remove:
+        for input_id in inputs_to_remove | inputs_type_changed:
             input_device = self._inputs.get(input_id)
             if input_device:
                 old_area = getattr(input_device, "area", None)
@@ -528,7 +577,7 @@ class InputManager:
 
                 # Remove from internal state (GPIO detector will be replaced by new input class)
                 del self._inputs[input_id]
-                _LOGGER.info(f"Removed input {input_id}")
+                _LOGGER.info("Removed input %s (type_changed=%s)", input_id, input_id in inputs_type_changed)
 
         # Check for area changes on remaining inputs
         for input_id, input_device in self._inputs.items():
@@ -537,7 +586,7 @@ class InputManager:
 
             if old_area != new_area:
                 ha_discovery_changed = True
-                _LOGGER.info(f"Input {input_id} area changed: {old_area} -> {new_area}, removing old HA Discovery")
+                _LOGGER.info("Input %s area changed: %s -> %s, removing old HA Discovery", input_id, old_area, new_area)
                 self._remove_input_ha_discovery(input_id, old_area)
 
         # Wait for HA to process the removal before sending new discovery
@@ -547,6 +596,7 @@ class InputManager:
 
         # _configure_inputs with reload_config=True will:
         # - Update existing inputs (actions, area, name)
+        # - Create new inputs for type-changed entries (old objects removed above)
         # - Add new inputs if their GPIO pin is already registered
         self._configure_inputs(reload_config=True)
 

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/core/manager/irrigation.py

@@ -581,6 +581,14 @@ class IrrigationManager:
                 ),
             )
 
+            # Remove stale per-zone next_run sensor (migrated to valve attributes)
+            if zone.run_every_n > 1:
+                self._manager.publish_ha_discovery(
+                    id=f"{ctrl.id}_zone_{zone.id}_next_run",
+                    ha_type="sensor",
+                    payload="",
+                )
+
         for idx, _schedule in enumerate(ctrl._schedule):
             _pub(
                 id=f"{ctrl.id}_schedule_{idx}_skip",

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/hardware/display/oled.py

@@ -541,7 +541,7 @@ class Oled:
         else:
             self._next_screen()
 
-        if not self._cancel_sleep_handle and self._sleep_timeout.total_seconds > 0:
+        if self._sleep_timeout.total_seconds > 0:
             self.start_sleep_timer()
 
     def _update_display(self) -> None:

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/integration/homeassistant.py

@@ -439,6 +439,10 @@ def ha_irrigation_valve_message(
     msg["state_topic"] = f"{topic}/{IRRIGATION}/{ctrl_id}/{suffix}"
     msg["command_topic"] = f"{topic}/cmd/{IRRIGATION}/{ctrl_id}/{suffix}/set"
     msg["value_template"] = "{{ value_json.state }}"
+    msg["json_attributes_topic"] = f"{topic}/{IRRIGATION}/{ctrl_id}/{suffix}"
+    msg["json_attributes_template"] = (
+        "{{ value_json | tojson }}"
+    )
     msg["icon"] = "mdi:sprinkler-variant"
     return msg
 

{boneio-1.4.0.dev12 → boneio-1.4.0.dev14}/boneio/modbus/devices/hvac/eht-topventil-plus.json

@@ -105,8 +105,10 @@
           "name": "Filter reset command",
           "address": 24,
           "write_address": 24,
-          "entity_type": "writeable_sensor_discrete",
-          "value_type": "S_WORD"
+          "entity_type": "writeable_binary_sensor_discrete",
+          "value_type": "S_WORD",
+          "payload_on": "1",
+          "payload_off": "0"
         }
       ]
     },
@@ -182,7 +184,7 @@
     {
       "name": "Operating mode",
       "source": "operating_mode_number",
-      "entity_type": "select",
+      "entity_type": "text_sensor",
       "x_mapping": {
         "0": "Off",
         "1": "Ventilation",
@@ -213,6 +215,72 @@
         "1": "Summer"
       }
     },
+    {
+      "name": "Ventilation switch",
+      "source": "ventilation",
+      "entity_type": "switch",
+      "x_mapping": {
+        "0": "OFF",
+        "1": "ON"
+      },
+      "payload_off": "OFF",
+      "payload_on": "ON"
+    },
+    {
+      "name": "Dehumidification switch",
+      "source": "dehumidifier",
+      "entity_type": "switch",
+      "x_mapping": {
+        "0": "OFF",
+        "1": "ON"
+      },
+      "payload_off": "OFF",
+      "payload_on": "ON"
+    },
+    {
+      "name": "Integration switch",
+      "source": "integration",
+      "entity_type": "switch",
+      "x_mapping": {
+        "0": "OFF",
+        "1": "ON"
+      },
+      "payload_off": "OFF",
+      "payload_on": "ON"
+    },
+    {
+      "name": "Recirculation switch",
+      "source": "recirculation",
+      "entity_type": "switch",
+      "x_mapping": {
+        "0": "OFF",
+        "1": "ON"
+      },
+      "payload_off": "OFF",
+      "payload_on": "ON"
+    },
+    {
+      "name": "Fan speed control",
+      "source": "fan_speed",
+      "entity_type": "select",
+      "x_mapping": {
+        "0": "Off",
+        "1": "Low",
+        "2": "Medium",
+        "3": "High"
+      }
+    },
+    {
+      "name": "Filter reset",
+      "source": "filter_reset_command",
+      "entity_type": "switch",
+      "x_mapping": {
+        "0": "OFF",
+        "1": "RESET"
+      },
+      "payload_off": "OFF",
+      "payload_on": "RESET"
+    },
     {
       "name": "Alarm code",
       "source": "alarm_code_number",

boneio-1.4.0.dev14/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.4.0dev14"

boneio-1.4.0.dev12/boneio/webui/frontend-dist/assets/ConfigEditor-Cs0wqNzh.js → boneio-1.4.0.dev14/boneio/webui/frontend-dist/assets/ConfigEditor-DqDX4DyY.js

@@ -1 +1 @@
-import{r as e}from"./rolldown-runtime-Dw2cE7zH.js";import{a as t,i as n,n as r,o as i,r as a,t as o,zt as s}from"./monaco-CAZoGZNF.js";import{b as c}from"./vendor-BD5Ml_Uz.js";import{Mt as l,Nt as u,at as d,f,ot as p,p as m,st as h,t as g}from"./useTranslation-BbOWxWUU.js";var _=e(s(),1);function v(){let[e,t]=(0,_.useState)(`dark`);return(0,_.useEffect)(()=>{t(localStorage.getItem(`theme`)||`dark`);let e=new MutationObserver(e=>{e.forEach(e=>{e.attributeName===`data-theme`&&t(document.documentElement.getAttribute(`data-theme`)||`dark`)})});return e.observe(document.documentElement,{attributes:!0,attributeFilter:[`data-theme`]}),()=>e.disconnect()},[]),e}function y(e){return l({tag:`svg`,attr:{viewBox:`0 0 24 24`},child:[{tag:`path`,attr:{d:`M11.28 9.53 8.81 12l2.47 2.47a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-3-3a.75.75 0 0 1 0-1.06l3-3a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z`},child:[]},{tag:`path`,attr:{d:`M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25H15v-17H3.75a.25.25 0 0 0-.25.25Zm13 16.75h3.75a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H16.5Z`},child:[]}]})(e)}var b=c();function x({isOpen:e,onClose:t}){let{t:n}=g(),[r,i]=(0,_.useState)(!1),[a,o]=(0,_.useState)(null),s=async()=>{i(!0);try{let e=await u.get(`/api/check_configuration`);o({status:e.data.status,message:e.data.message})}catch{o({status:`error`,message:n(`config_check.failed`)})}finally{i(!1)}};return e?(0,b.jsx)(`div`,{className:`fixed inset-0 bg-base-300/80 flex items-center justify-center z-50`,children:(0,b.jsxs)(`div`,{className:`bg-base-200 p-8 rounded-lg shadow-lg max-w-2xl w-full mx-4`,children:[(0,b.jsx)(`h2`,{className:`text-2xl font-bold mb-6`,children:n(`config_check.title`)}),r?(0,b.jsxs)(`div`,{className:`flex flex-col items-center gap-4 py-8`,children:[(0,b.jsx)(`div`,{className:`loading loading-spinner loading-lg`}),(0,b.jsx)(`p`,{className:`text-lg`,children:n(`config_check.checking`)})]}):a?(0,b.jsxs)(`div`,{className:`space-y-4`,children:[(0,b.jsx)(`div`,{className:`text-lg font-semibold ${a.status===`success`?`text-success`:`text-error`}`,children:a.status===`success`?n(`config_check.valid`):n(`config_check.error`)}),a.message&&(0,b.jsx)(`pre`,{className:`bg-base-300 p-4 rounded-lg whitespace-pre-wrap`,children:a.message}),(0,b.jsxs)(`div`,{className:`flex justify-end gap-4 mt-6`,children:[(0,b.jsx)(`button`,{className:`btn btn-ghost`,onClick:()=>{o(null),t()},children:n(`common.close`)}),(0,b.jsx)(`button`,{className:`btn btn-primary`,onClick:()=>{o(null),s()},children:n(`config_check.check_again`)})]})]}):(0,b.jsxs)(`div`,{className:`space-y-6`,children:[(0,b.jsx)(`p`,{className:`text-base-content/70`,children:n(`config_check.description`)}),(0,b.jsxs)(`div`,{className:`flex justify-end gap-4`,children:[(0,b.jsx)(`button`,{className:`btn btn-ghost`,onClick:t,children:n(`common.cancel`)}),(0,b.jsx)(`button`,{className:`btn btn-primary`,onClick:s,children:n(`config_check.check_button`)})]})]})]})}):null}function S(e){return new Worker(`/assets/yaml.worker-nZQZSRZ7.js`,{name:e?.name})}self.MonacoEnvironment={getWorker(e,t){return t===`yaml`?new S:t===`json`?new o:new r}},i.config({monaco:n});var C;function w(){let[e,n]=(0,_.useState)([]),[r,i]=(0,_.useState)(null),[o,s]=(0,_.useState)(``),[c,l]=(0,_.useState)(!1),[g,S]=(0,_.useState)(`waiting`),[w,T]=(0,_.useState)(!0),[E,D]=(0,_.useState)(!1),O=v(),k=async()=>{try{n((await u.get(`/api/files`)).data.items)}catch(e){console.error(`Error loading directory:`,e)}},A=async e=>{try{let t=`/api/files/${encodeURIComponent(e)}`,n=await u.get(t);i(e),s(n.data.content),localStorage.setItem(`lastOpenedFile`,e)}catch(e){console.error(`Error loading file:`,e)}},j=async()=>{if(r)try{await u.put(`/api/files/${encodeURIComponent(r)}`,{content:o}),console.log(`File saved successfully`)}catch(e){console.error(`Error saving file:`,e)}},M=async e=>{if(!C){let t=(await u.get(`/schema/config.schema.json`)).data;C=await a(e,{enableSchemaRequest:!0,schemas:[{uri:window.location.origin+`/schema/config.schema.json`,fileMatch:[`config.yaml`,`config.yml`],schema:t},...Object.keys(t.properties).map(e=>({uri:window.location.origin+`/schema/${e}.schema.json`,fileMatch:[`${e}.yaml`,`${e}.yml`],schema:t.properties[e]}))],validate:!0})}},N=async(e,t)=>{e.addCommand(t.KeyMod.CtrlCmd|t.KeyCode.KeyS,()=>{j()})},P=e=>{n(t=>{let n=t=>t.map(t=>t.path===e?{...t,isOpen:!t.isOpen}:t.children?{...t,children:n(t.children)}:t);return n(t)})},F=(e,t=0)=>e.map(e=>{let n=t==0||e.isOpen;return(0,b.jsxs)(`div`,{children:[(0,b.jsxs)(`button`,{className:`flex items-center gap-2 w-full px-2 py-1 hover:bg-base-300 ${r===e.path?`bg-primary/10`:``}`,style:{paddingLeft:`${t*16+8}px`},onClick:()=>e.type===`file`?A(e.path):P(e.path),children:[e.type===`directory`&&(0,b.jsx)(`span`,{className:`text-xs`,children:n?(0,b.jsx)(f,{}):(0,b.jsx)(m,{})}),(0,b.jsx)(`span`,{className:`text-base-content/70`,children:e.type===`directory`?n?(0,b.jsx)(h,{}):(0,b.jsx)(p,{}):(0,b.jsx)(d,{})}),(0,b.jsx)(`span`,{className:`text-sm truncate`,children:e.name})]}),e.type===`directory`&&n&&e.children&&F(e.children,t+1)]},e.path)}),I=async()=>{try{return await u.get(`/api/files`),!0}catch{return!1}},L=async()=>{for(l(!0),S(`waiting`),await new Promise(e=>setTimeout(e,2e3)),S(`checking`);;){if(await I()){S(`ready`),await new Promise(e=>setTimeout(e,1e3)),l(!1),k();break}await new Promise(e=>setTimeout(e,1e3))}};return(0,_.useEffect)(()=>{(async()=>{await k();let e=localStorage.getItem(`lastOpenedFile`);e&&A(e)})()},[]),(0,b.jsxs)(`div`,{className:`flex h-full bg-base-300`,children:[c?(0,b.jsx)(`div`,{className:`fixed inset-0 bg-base-300/80 flex items-center justify-center z-50`,children:(0,b.jsxs)(`div`,{className:`bg-base-200 p-8 rounded-lg shadow-lg text-center`,children:[(0,b.jsx)(`div`,{className:`loading loading-spinner loading-lg mb-4`}),(0,b.jsxs)(`h2`,{className:`text-xl font-bold mb-4`,children:[g===`waiting`&&`Restarting Service...`,g===`checking`&&`Waiting for Service...`,g===`ready`&&`Service Restarted!`]}),(0,b.jsxs)(`p`,{className:`text-base-content/70`,children:[g===`waiting`&&`Initiating service restart`,g===`checking`&&`Checking if service is back online`,g===`ready`&&`Redirecting...`]})]})}):null,(0,b.jsxs)(`div`,{className:`${w?`w-64`:`w-0`} transition-all duration-300 bg-base-200 border-r border-base-content/10 overflow-hidden`,children:[(0,b.jsx)(`div`,{className:`p-2 text-sm font-semibold text-base-content/70 uppercase`,children:`Explorer`}),(0,b.jsx)(`div`,{className:`overflow-y-auto`,children:F(e)})]}),(0,b.jsxs)(`div`,{className:`flex-1 overflow-hidden flex flex-col h-full max-h-screen`,children:[(0,b.jsxs)(`div`,{className:`flex items-center p-2 border-b border-base-content/10`,children:[(0,b.jsx)(`button`,{onClick:()=>T(!w),className:`btn btn-ghost btn-sm p-1`,title:w?`Hide file tree`:`Show file tree`,children:(0,b.jsx)(y,{className:`h-5 w-5 opacity-70 transition-transform duration-200 ${w?``:`rotate-180`}`})}),r&&(0,b.jsx)(`span`,{className:`ml-2 text-sm opacity-70`,children:r})]}),(0,b.jsx)(`div`,{className:`flex-1 overflow-hidden`,children:(0,b.jsx)(t,{height:`100%`,width:`100%`,defaultLanguage:`yaml`,path:r||`config.yaml`,theme:O===`light`?`vs-light`:`vs-dark`,value:o,onChange:e=>s(e||``),onMount:N,beforeMount:M,options:{minimap:{enabled:!0},scrollBeyondLastLine:!1,fontSize:14,automaticLayout:!0,readOnly:!1,formatOnType:!0,formatOnPaste:!0,quickSuggestions:{other:!0,comments:!1,strings:!0}}})}),(0,b.jsxs)(`div`,{className:`h-12 bg-base-200 border-t border-base-content/10 flex items-center justify-end px-4 gap-4`,children:[(0,b.jsx)(`button`,{onClick:j,disabled:!r,className:`btn btn-primary btn-sm`,children:`Save`}),(0,b.jsx)(`button`,{onClick:()=>D(!0),className:`btn btn-primary btn-sm`,children:`Check Config`}),(0,b.jsx)(`button`,{onClick:async()=>{await j();try{if((await u.post(`/api/restart`)).data.status===`not available`){let e=document.getElementById(`toast`);e&&(e.classList.remove(`hidden`),setTimeout(()=>{e.classList.add(`hidden`)},5e3))}else console.log(`Service restarted successfully`),L()}catch(e){console.error(`Error restarting service:`,e)}},disabled:!r,className:`btn btn-secondary btn-sm`,children:`Save and Restart`})]})]}),(0,b.jsx)(`div`,{id:`toast`,className:`toast toast-end hidden`,children:(0,b.jsx)(`div`,{className:`alert alert-warning`,children:(0,b.jsx)(`span`,{children:`Restart not possible. Application is not running as systemd service. Restart manually.`})})}),(0,b.jsx)(x,{isOpen:E,onClose:()=>D(!1)})]})}export{w as default};
+import{r as e}from"./rolldown-runtime-Dw2cE7zH.js";import{a as t,i as n,n as r,o as i,r as a,t as o,zt as s}from"./monaco-CAZoGZNF.js";import{b as c}from"./vendor-BD5Ml_Uz.js";import{Mt as l,Nt as u,at as d,f,ot as p,p as m,st as h,t as g}from"./useTranslation-DUpbl8sU.js";var _=e(s(),1);function v(){let[e,t]=(0,_.useState)(`dark`);return(0,_.useEffect)(()=>{t(localStorage.getItem(`theme`)||`dark`);let e=new MutationObserver(e=>{e.forEach(e=>{e.attributeName===`data-theme`&&t(document.documentElement.getAttribute(`data-theme`)||`dark`)})});return e.observe(document.documentElement,{attributes:!0,attributeFilter:[`data-theme`]}),()=>e.disconnect()},[]),e}function y(e){return l({tag:`svg`,attr:{viewBox:`0 0 24 24`},child:[{tag:`path`,attr:{d:`M11.28 9.53 8.81 12l2.47 2.47a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215l-3-3a.75.75 0 0 1 0-1.06l3-3a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z`},child:[]},{tag:`path`,attr:{d:`M3.75 2h16.5c.966 0 1.75.784 1.75 1.75v16.5A1.75 1.75 0 0 1 20.25 22H3.75A1.75 1.75 0 0 1 2 20.25V3.75C2 2.784 2.784 2 3.75 2ZM3.5 3.75v16.5c0 .138.112.25.25.25H15v-17H3.75a.25.25 0 0 0-.25.25Zm13 16.75h3.75a.25.25 0 0 0 .25-.25V3.75a.25.25 0 0 0-.25-.25H16.5Z`},child:[]}]})(e)}var b=c();function x({isOpen:e,onClose:t}){let{t:n}=g(),[r,i]=(0,_.useState)(!1),[a,o]=(0,_.useState)(null),s=async()=>{i(!0);try{let e=await u.get(`/api/check_configuration`);o({status:e.data.status,message:e.data.message})}catch{o({status:`error`,message:n(`config_check.failed`)})}finally{i(!1)}};return e?(0,b.jsx)(`div`,{className:`fixed inset-0 bg-base-300/80 flex items-center justify-center z-50`,children:(0,b.jsxs)(`div`,{className:`bg-base-200 p-8 rounded-lg shadow-lg max-w-2xl w-full mx-4`,children:[(0,b.jsx)(`h2`,{className:`text-2xl font-bold mb-6`,children:n(`config_check.title`)}),r?(0,b.jsxs)(`div`,{className:`flex flex-col items-center gap-4 py-8`,children:[(0,b.jsx)(`div`,{className:`loading loading-spinner loading-lg`}),(0,b.jsx)(`p`,{className:`text-lg`,children:n(`config_check.checking`)})]}):a?(0,b.jsxs)(`div`,{className:`space-y-4`,children:[(0,b.jsx)(`div`,{className:`text-lg font-semibold ${a.status===`success`?`text-success`:`text-error`}`,children:a.status===`success`?n(`config_check.valid`):n(`config_check.error`)}),a.message&&(0,b.jsx)(`pre`,{className:`bg-base-300 p-4 rounded-lg whitespace-pre-wrap`,children:a.message}),(0,b.jsxs)(`div`,{className:`flex justify-end gap-4 mt-6`,children:[(0,b.jsx)(`button`,{className:`btn btn-ghost`,onClick:()=>{o(null),t()},children:n(`common.close`)}),(0,b.jsx)(`button`,{className:`btn btn-primary`,onClick:()=>{o(null),s()},children:n(`config_check.check_again`)})]})]}):(0,b.jsxs)(`div`,{className:`space-y-6`,children:[(0,b.jsx)(`p`,{className:`text-base-content/70`,children:n(`config_check.description`)}),(0,b.jsxs)(`div`,{className:`flex justify-end gap-4`,children:[(0,b.jsx)(`button`,{className:`btn btn-ghost`,onClick:t,children:n(`common.cancel`)}),(0,b.jsx)(`button`,{className:`btn btn-primary`,onClick:s,children:n(`config_check.check_button`)})]})]})]})}):null}function S(e){return new Worker(`/assets/yaml.worker-nZQZSRZ7.js`,{name:e?.name})}self.MonacoEnvironment={getWorker(e,t){return t===`yaml`?new S:t===`json`?new o:new r}},i.config({monaco:n});var C;function w(){let[e,n]=(0,_.useState)([]),[r,i]=(0,_.useState)(null),[o,s]=(0,_.useState)(``),[c,l]=(0,_.useState)(!1),[g,S]=(0,_.useState)(`waiting`),[w,T]=(0,_.useState)(!0),[E,D]=(0,_.useState)(!1),O=v(),k=async()=>{try{n((await u.get(`/api/files`)).data.items)}catch(e){console.error(`Error loading directory:`,e)}},A=async e=>{try{let t=`/api/files/${encodeURIComponent(e)}`,n=await u.get(t);i(e),s(n.data.content),localStorage.setItem(`lastOpenedFile`,e)}catch(e){console.error(`Error loading file:`,e)}},j=async()=>{if(r)try{await u.put(`/api/files/${encodeURIComponent(r)}`,{content:o}),console.log(`File saved successfully`)}catch(e){console.error(`Error saving file:`,e)}},M=async e=>{if(!C){let t=(await u.get(`/schema/config.schema.json`)).data;C=await a(e,{enableSchemaRequest:!0,schemas:[{uri:window.location.origin+`/schema/config.schema.json`,fileMatch:[`config.yaml`,`config.yml`],schema:t},...Object.keys(t.properties).map(e=>({uri:window.location.origin+`/schema/${e}.schema.json`,fileMatch:[`${e}.yaml`,`${e}.yml`],schema:t.properties[e]}))],validate:!0})}},N=async(e,t)=>{e.addCommand(t.KeyMod.CtrlCmd|t.KeyCode.KeyS,()=>{j()})},P=e=>{n(t=>{let n=t=>t.map(t=>t.path===e?{...t,isOpen:!t.isOpen}:t.children?{...t,children:n(t.children)}:t);return n(t)})},F=(e,t=0)=>e.map(e=>{let n=t==0||e.isOpen;return(0,b.jsxs)(`div`,{children:[(0,b.jsxs)(`button`,{className:`flex items-center gap-2 w-full px-2 py-1 hover:bg-base-300 ${r===e.path?`bg-primary/10`:``}`,style:{paddingLeft:`${t*16+8}px`},onClick:()=>e.type===`file`?A(e.path):P(e.path),children:[e.type===`directory`&&(0,b.jsx)(`span`,{className:`text-xs`,children:n?(0,b.jsx)(f,{}):(0,b.jsx)(m,{})}),(0,b.jsx)(`span`,{className:`text-base-content/70`,children:e.type===`directory`?n?(0,b.jsx)(h,{}):(0,b.jsx)(p,{}):(0,b.jsx)(d,{})}),(0,b.jsx)(`span`,{className:`text-sm truncate`,children:e.name})]}),e.type===`directory`&&n&&e.children&&F(e.children,t+1)]},e.path)}),I=async()=>{try{return await u.get(`/api/files`),!0}catch{return!1}},L=async()=>{for(l(!0),S(`waiting`),await new Promise(e=>setTimeout(e,2e3)),S(`checking`);;){if(await I()){S(`ready`),await new Promise(e=>setTimeout(e,1e3)),l(!1),k();break}await new Promise(e=>setTimeout(e,1e3))}};return(0,_.useEffect)(()=>{(async()=>{await k();let e=localStorage.getItem(`lastOpenedFile`);e&&A(e)})()},[]),(0,b.jsxs)(`div`,{className:`flex h-full bg-base-300`,children:[c?(0,b.jsx)(`div`,{className:`fixed inset-0 bg-base-300/80 flex items-center justify-center z-50`,children:(0,b.jsxs)(`div`,{className:`bg-base-200 p-8 rounded-lg shadow-lg text-center`,children:[(0,b.jsx)(`div`,{className:`loading loading-spinner loading-lg mb-4`}),(0,b.jsxs)(`h2`,{className:`text-xl font-bold mb-4`,children:[g===`waiting`&&`Restarting Service...`,g===`checking`&&`Waiting for Service...`,g===`ready`&&`Service Restarted!`]}),(0,b.jsxs)(`p`,{className:`text-base-content/70`,children:[g===`waiting`&&`Initiating service restart`,g===`checking`&&`Checking if service is back online`,g===`ready`&&`Redirecting...`]})]})}):null,(0,b.jsxs)(`div`,{className:`${w?`w-64`:`w-0`} transition-all duration-300 bg-base-200 border-r border-base-content/10 overflow-hidden`,children:[(0,b.jsx)(`div`,{className:`p-2 text-sm font-semibold text-base-content/70 uppercase`,children:`Explorer`}),(0,b.jsx)(`div`,{className:`overflow-y-auto`,children:F(e)})]}),(0,b.jsxs)(`div`,{className:`flex-1 overflow-hidden flex flex-col h-full max-h-screen`,children:[(0,b.jsxs)(`div`,{className:`flex items-center p-2 border-b border-base-content/10`,children:[(0,b.jsx)(`button`,{onClick:()=>T(!w),className:`btn btn-ghost btn-sm p-1`,title:w?`Hide file tree`:`Show file tree`,children:(0,b.jsx)(y,{className:`h-5 w-5 opacity-70 transition-transform duration-200 ${w?``:`rotate-180`}`})}),r&&(0,b.jsx)(`span`,{className:`ml-2 text-sm opacity-70`,children:r})]}),(0,b.jsx)(`div`,{className:`flex-1 overflow-hidden`,children:(0,b.jsx)(t,{height:`100%`,width:`100%`,defaultLanguage:`yaml`,path:r||`config.yaml`,theme:O===`light`?`vs-light`:`vs-dark`,value:o,onChange:e=>s(e||``),onMount:N,beforeMount:M,options:{minimap:{enabled:!0},scrollBeyondLastLine:!1,fontSize:14,automaticLayout:!0,readOnly:!1,formatOnType:!0,formatOnPaste:!0,quickSuggestions:{other:!0,comments:!1,strings:!0}}})}),(0,b.jsxs)(`div`,{className:`h-12 bg-base-200 border-t border-base-content/10 flex items-center justify-end px-4 gap-4`,children:[(0,b.jsx)(`button`,{onClick:j,disabled:!r,className:`btn btn-primary btn-sm`,children:`Save`}),(0,b.jsx)(`button`,{onClick:()=>D(!0),className:`btn btn-primary btn-sm`,children:`Check Config`}),(0,b.jsx)(`button`,{onClick:async()=>{await j();try{if((await u.post(`/api/restart`)).data.status===`not available`){let e=document.getElementById(`toast`);e&&(e.classList.remove(`hidden`),setTimeout(()=>{e.classList.add(`hidden`)},5e3))}else console.log(`Service restarted successfully`),L()}catch(e){console.error(`Error restarting service:`,e)}},disabled:!r,className:`btn btn-secondary btn-sm`,children:`Save and Restart`})]})]}),(0,b.jsx)(`div`,{id:`toast`,className:`toast toast-end hidden`,children:(0,b.jsx)(`div`,{className:`alert alert-warning`,children:(0,b.jsx)(`span`,{children:`Restart not possible. Application is not running as systemd service. Restart manually.`})})}),(0,b.jsx)(x,{isOpen:E,onClose:()=>D(!1)})]})}export{w as default};