boneIO 1.4.3__tar.gz → 1.4.4__tar.gz

{boneio-1.4.3/boneio.egg-info → boneio-1.4.4}/PKG-INFO

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

{boneio-1.4.3 → boneio-1.4.4}/boneio/components/input/detectors.py

@@ -467,7 +467,7 @@ class MultiClickDetector:
         if event.event_type is event.Type.FALLING_EDGE:
             # Button pressed (FALLING_EDGE on BeagleBone with pull-up)
             
-            # Software debounce
+            # Software debounce (press-vs-press)
             if self._state.last_press_ts and (timestamp_s - self._state.last_press_ts) < self._debounce_seconds:
                 delta_ms = (timestamp_s - self._state.last_press_ts) * 1000
                 _LOGGER.debug(
@@ -478,6 +478,19 @@ class MultiClickDetector:
                 )
                 return
 
+            # Cross-debounce: ignore press too close to release (bounce on falling edge
+            # after a real release). Without this, releasing a long-held button can
+            # generate a bounce FALLING that starts a new phantom press cycle.
+            if self._state.last_release_ts and (timestamp_s - self._state.last_release_ts) < self._debounce_seconds:
+                delta_ms = (timestamp_s - self._state.last_release_ts) * 1000
+                _LOGGER.debug(
+                    "Ignoring bounced press on %s (%.3f ms since release, debounce %.3f ms)",
+                    self._name,
+                    delta_ms,
+                    self._debounce_seconds * 1000,
+                )
+                return
+
             _LOGGER.debug("PRESSED: %s (%s)", self._name, self._pin)
             self._state.last_press_ts = timestamp_s
             self._state.last_press_loop_ts = self._loop.time()  # Store loop time for duration calc
@@ -618,13 +631,20 @@ class MultiClickDetector:
         timestamp_s = time.time()
 
         if is_pressed:
-            # Debounce
+            # Debounce (press-vs-press)
             if (
                 self._state.last_press_ts
                 and (timestamp_s - self._state.last_press_ts) < self._debounce_seconds
             ):
                 return
 
+            # Cross-debounce: ignore press too close to release (bounce)
+            if (
+                self._state.last_release_ts
+                and (timestamp_s - self._state.last_release_ts) < self._debounce_seconds
+            ):
+                return
+
             _LOGGER.debug("RAW PRESSED: %s (%s)", self._name, self._pin)
             self._state.last_press_ts = timestamp_s
             self._state.last_press_loop_ts = self._loop.time()

{boneio-1.4.3 → boneio-1.4.4}/boneio/core/cloud/data/docker-compose.yaml

@@ -9,17 +9,22 @@ services:
       - ./node-red/settings.js:/data/settings.js:ro
     extra_hosts:
       - "host.docker.internal:host-gateway"
+    logging:
+      driver: json-file
+      options:
+        max-size: "5m"
+        max-file: "2"
     networks:
       - edge
   caddy:
     image: caddy:2-alpine
     restart: unless-stopped
-    hostname: ${HOSTNAME}
+    hostname: ${HOSTNAME:-boneio}
     ports:
       - "${HTTP_PORT:-8091}:80"
       - "${HTTPS_PORT:-8443}:443"
     environment:
-      - HOST_HOSTNAME=${HOSTNAME}
+      - HOST_HOSTNAME=${HOSTNAME:-boneio}
     volumes:
       - ./caddy/502.html:/srv/502.html:ro
       - ./caddy/init-certs.sh:/init-certs.sh:ro
@@ -30,6 +35,11 @@ services:
     command: ["/init-certs.sh"]
     extra_hosts:
       - "host.docker.internal:host-gateway"
+    logging:
+      driver: json-file
+      options:
+        max-size: "5m"
+        max-file: "2"
     networks:
       - edge
 

{boneio-1.4.3 → boneio-1.4.4}/boneio/migrations/assets/MANIFEST.sha256

@@ -1,9 +1,8 @@
-# BoneIO migration asset manifest
-# Format: <sha256>  <relative-path>
-# Generated by scripts/generate_manifest.py — do not edit manually
-
+98b8ed657b4f7394521c3fe6b381a01ca7114e3f31495bab709707886559316a  MANIFEST.sha256
 f2ed05c6f5934a15f12571139bdc225804f67b8c83561cc39868f7b2296d2697  docker/daemon.json
-806f93c15b304153672ed2a1783716d5867b5b8045a0e0dff270e147f7792e02  docker/nodered/docker-compose.yaml
+22dfe7d55e5ed85ea0f4149b7776b7504a12b91905701657a88840ae1208087c  docker/nodered/caddy/502.html
+3e4a91a1737ce82c6bcdbbc31fce214790c0432a608ac34de7fc4e5c58cfd550  docker/nodered/caddy/init-certs.sh
+cd90e1bcb6488669179c8e7a40a6265923e0fea045cc79d5b7559ebb309131b6  docker/nodered/docker-compose.yaml
 30467786de3a35e02f9f5049b29ec1808056814e7c2fc5e507ff4b0991cde557  docker/nodered/nginx/default.conf
 66b00c1e480113a098b90d9948284781896c943006c1a3fe882d515f63b9d3e8  docker/nodered/node-red/settings.js
 67b4d45f890f073bee66dcf6d6026bd42515d938566b90d2b2a6f7ea016f3764  journald/journald.conf

boneio-1.4.4/boneio/migrations/assets/docker/nodered/caddy/502.html

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>boneIO — Service Unavailable</title>
+  <style>
+    body {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+      background: #1a1a2e;
+      color: #e0e0e0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      min-height: 100vh;
+      margin: 0;
+    }
+    .container {
+      text-align: center;
+      padding: 2rem;
+    }
+    h1 { color: #e94560; font-size: 2rem; margin-bottom: 0.5rem; }
+    p { color: #a0a0b0; font-size: 1.1rem; }
+    .retry { margin-top: 1.5rem; }
+    .retry a {
+      color: #0f3460;
+      background: #e94560;
+      padding: 0.6rem 1.5rem;
+      border-radius: 6px;
+      text-decoration: none;
+      font-weight: 600;
+    }
+  </style>
+</head>
+<body>
+  <div class="container">
+    <h1>Service Unavailable</h1>
+    <p>boneIO is starting up or temporarily unavailable.</p>
+    <p>Please wait a moment and try again.</p>
+    <div class="retry"><a href="/">Retry</a></div>
+  </div>
+</body>
+</html>

boneio-1.4.4/boneio/migrations/assets/docker/nodered/caddy/init-certs.sh

@@ -0,0 +1,107 @@
+#!/bin/sh
+# Caddy init script for non-cloud mode (self-signed HTTPS only).
+# Generates a Caddyfile with HTTP and self-signed HTTPS reverse proxy
+# for boneIO and Node-RED.
+
+HOSTNAME_FILE="/data/last_hostname"
+CURRENT_HOSTNAME="${HOST_HOSTNAME:-$(cat /etc/host_hostname 2>/dev/null || hostname)}"
+
+echo "Current hostname: $CURRENT_HOSTNAME"
+echo "Mode: local (self-signed HTTPS)"
+
+# Check if hostname changed (for self-signed cert regeneration)
+if [ -f "$HOSTNAME_FILE" ]; then
+    LAST_HOSTNAME=$(cat "$HOSTNAME_FILE")
+    if [ "$LAST_HOSTNAME" != "$CURRENT_HOSTNAME" ]; then
+        echo "Hostname changed from $LAST_HOSTNAME to $CURRENT_HOSTNAME"
+        echo "Removing old self-signed certificates..."
+        rm -rf /data/caddy/certificates/local/*
+        rm -rf /data/caddy/pki/*
+        rm -rf /config/caddy/*
+    fi
+else
+    echo "First run on this device, clearing any existing certificates..."
+    rm -rf /data/caddy/certificates/local/*
+    rm -rf /data/caddy/pki/*
+    rm -rf /config/caddy/*
+fi
+
+echo "$CURRENT_HOSTNAME" > "$HOSTNAME_FILE"
+
+# Generate Caddyfile
+cat > /tmp/Caddyfile << EOF
+{
+        # Global options - empty for internal issuer
+}
+
+# HTTP - serve directly
+:80 {
+        handle_errors {
+                @502-504 expression {err.status_code} >= 502 && {err.status_code} <= 504
+                handle @502-504 {
+                        root * /srv
+                        rewrite * /502.html
+                        file_server
+                }
+        }
+
+        handle /nodered-status {
+                header Content-Type application/json
+                header X-NodeRed-Available "true"
+                header Access-Control-Expose-Headers "X-NodeRed-Available"
+                respond \`{"available": true}\` 200
+        }
+
+        handle /nodered/* {
+                reverse_proxy node-red:1880 {
+                        header_up X-Forwarded-Proto {scheme}
+                        header_down X-NodeRed-Available "true"
+                }
+        }
+
+        handle {
+                reverse_proxy host.docker.internal:8090 {
+                        header_up X-Forwarded-Proto {scheme}
+                }
+        }
+}
+
+# HTTPS with self-signed certificate (catch-all for hostname and IP access)
+https:// {
+        tls internal {
+                on_demand
+        }
+
+        handle_errors {
+                @502-504 expression {err.status_code} >= 502 && {err.status_code} <= 504
+                handle @502-504 {
+                        root * /srv
+                        rewrite * /502.html
+                        file_server
+                }
+        }
+
+        handle /nodered-status {
+                header Content-Type application/json
+                header X-NodeRed-Available "true"
+                header Access-Control-Expose-Headers "X-NodeRed-Available"
+                respond \`{"available": true}\` 200
+        }
+
+        handle /nodered/* {
+                reverse_proxy node-red:1880 {
+                        header_up X-Forwarded-Proto {scheme}
+                        header_down X-NodeRed-Available "true"
+                }
+        }
+
+        handle {
+                reverse_proxy host.docker.internal:8090 {
+                        header_up X-Forwarded-Proto {scheme}
+                }
+        }
+}
+EOF
+
+# Start Caddy with generated config
+exec caddy run --config /tmp/Caddyfile --adapter caddyfile

boneio-1.4.4/boneio/migrations/assets/docker/nodered/docker-compose.yaml

@@ -0,0 +1,47 @@
+services:
+  node-red:
+    image: nodered/node-red:4.1.2-22-minimal
+    restart: unless-stopped
+    environment:
+      TZ: Europe/Warsaw
+    volumes:
+      - ./node-red/data:/data
+      - ./node-red/settings.js:/data/settings.js:ro
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    logging:
+      driver: json-file
+      options:
+        max-size: "5m"
+        max-file: "2"
+    networks:
+      - edge
+  caddy:
+    image: caddy:2-alpine
+    restart: unless-stopped
+    hostname: ${HOSTNAME:-boneio}
+    ports:
+      - "${HTTP_PORT:-8091}:80"
+      - "${HTTPS_PORT:-8443}:443"
+    environment:
+      - HOST_HOSTNAME=${HOSTNAME:-boneio}
+    volumes:
+      - ./caddy/502.html:/srv/502.html:ro
+      - ./caddy/init-certs.sh:/init-certs.sh:ro
+      - ./caddy/data:/data
+      - ./caddy/config:/config
+      - /etc/hostname:/etc/host_hostname:ro
+    entrypoint: /bin/sh
+    command: ["/init-certs.sh"]
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    logging:
+      driver: json-file
+      options:
+        max-size: "5m"
+        max-file: "2"
+    networks:
+      - edge
+
+networks:
+  edge:

boneio-1.4.4/boneio/migrations/versions/v1_4_4_caddy.py

@@ -0,0 +1,68 @@
+"""BoneIO 1.4.4 — Replace nginx with Caddy for reverse proxy.
+
+Replaces the nginx-based reverse proxy with Caddy, providing:
+- Self-signed HTTPS on port 8443 (out of the box)
+- HTTP on port 8091 (same as before)
+- Seamless upgrade path to cloud mode (wildcard SSL)
+- Unified docker-compose for all deployments
+
+Also installs Caddy init script and 502 error page.
+"""
+
+from __future__ import annotations
+
+from boneio.migrations.actions import (
+    InstallFile,
+    MigrationAction,
+    RemoveFile,
+)
+
+VERSION = "1.4.4"
+DESCRIPTION = "Replace nginx with Caddy reverse proxy (HTTPS support)"
+REQUIRES_ROOT = True
+
+_BONEIO_USER = "boneio"
+_BONEIO_HOME = f"/home/{_BONEIO_USER}"
+
+
+def plan() -> list[MigrationAction]:
+    """Return the ordered list of migration actions for version 1.4.4.
+
+    Returns:
+        List of :class:`MigrationAction` to apply in order.
+    """
+    return [
+        # 1. Install Caddy init script (non-cloud, self-signed HTTPS)
+        InstallFile(
+            src="docker/nodered/caddy/init-certs.sh",
+            dst=f"{_BONEIO_HOME}/docker/nodered/caddy/init-certs.sh",
+            mode=0o755,
+            owner=_BONEIO_USER,
+            group=_BONEIO_USER,
+        ),
+
+        # 2. Install 502 error page
+        InstallFile(
+            src="docker/nodered/caddy/502.html",
+            dst=f"{_BONEIO_HOME}/docker/nodered/caddy/502.html",
+            mode=0o644,
+            owner=_BONEIO_USER,
+            group=_BONEIO_USER,
+        ),
+
+        # NOTE: docker-compose.yaml IS installed here (nginx → caddy).
+        # Cloud users: registration.py auto-detects on next startup (line 184)
+        # that cloud config is missing and switches back. Safe.
+
+        # 3. Replace docker-compose.yaml (nginx → caddy)
+        InstallFile(
+            src="docker/nodered/docker-compose.yaml",
+            dst=f"{_BONEIO_HOME}/docker/nodered/docker-compose.yaml",
+            mode=0o644,
+            owner=_BONEIO_USER,
+            group=_BONEIO_USER,
+        ),
+
+        # 4. Remove old nginx config (no longer needed)
+        RemoveFile(path=f"{_BONEIO_HOME}/docker/nodered/nginx/default.conf"),
+    ]

boneio-1.4.4/boneio/version.py

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

{boneio-1.4.3 → boneio-1.4.4/boneio.egg-info}/PKG-INFO

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

{boneio-1.4.3 → boneio-1.4.4}/boneio.egg-info/SOURCES.txt

@@ -248,6 +248,8 @@ boneio/migrations/runner.py
 boneio/migrations/assets/MANIFEST.sha256
 boneio/migrations/assets/docker/daemon.json
 boneio/migrations/assets/docker/nodered/docker-compose.yaml
+boneio/migrations/assets/docker/nodered/caddy/502.html
+boneio/migrations/assets/docker/nodered/caddy/init-certs.sh
 boneio/migrations/assets/docker/nodered/nginx/default.conf
 boneio/migrations/assets/docker/nodered/node-red/settings.js
 boneio/migrations/assets/journald/journald.conf
@@ -271,6 +273,7 @@ boneio/migrations/versions/v1_3_1_fix_oled_boot.py
 boneio/migrations/versions/v1_3_2_cleanup_can_sudoers.py
 boneio/migrations/versions/v1_4_0_fix_mqtt_sudoers.py
 boneio/migrations/versions/v1_4_3_oled_shutdown.py
+boneio/migrations/versions/v1_4_4_caddy.py
 boneio/modbus/__init__.py
 boneio/modbus/cli.py
 boneio/modbus/client.py

boneio-1.4.3/boneio/migrations/assets/docker/nodered/docker-compose.yaml

@@ -1,30 +0,0 @@
-services:
-  node-red:
-    image: nodered/node-red:4.1.2-22-minimal
-    restart: unless-stopped
-    environment:
-      TZ: Europe/Warsaw
-    volumes:
-      - ./node-red/data:/data
-      - ./node-red/settings.js:/data/settings.js:ro
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    networks:
-      - edge
-
-  nginx:
-    image: nginx:1.29-alpine-slim
-    restart: unless-stopped
-    depends_on:
-      - node-red
-    ports:
-      - "${NGINX_PORT:-8091}:80"
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    networks:
-      - edge
-
-networks:
-  edge:

boneio-1.4.3/boneio/version.py

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