plc-checkweigher 1.32.3 → 1.33.1

package/bin/plc_checkweigher

@@ -174,12 +174,13 @@ restart)
     need_sudo
     banner "Restarting services"
     echo ""
-    spin_start "Restarting plc_watcher and plc_web"
-    sudo systemctl restart plc_watcher plc_web
+    spin_start "Restarting plc_watcher, plc_web and plc_selfheal"
+    sudo systemctl restart plc_watcher plc_web plc_selfheal 2>/dev/null \
+        || sudo systemctl restart plc_watcher plc_web
     sleep 2
     spin_ok
     echo ""
-    systemctl status plc_watcher plc_web --no-pager | grep -E 'Active|Main PID'
+    systemctl status plc_watcher plc_web plc_selfheal --no-pager 2>/dev/null | grep -E 'Active|Main PID'
     echo ""
     ;;
 
@@ -187,8 +188,9 @@ start)
     need_sudo
     banner "Starting services"
     echo ""
-    spin_start "Starting plc_watcher and plc_web"
-    sudo systemctl start plc_watcher plc_web
+    spin_start "Starting plc_watcher, plc_web and plc_selfheal"
+    sudo systemctl start plc_watcher plc_web plc_selfheal 2>/dev/null \
+        || sudo systemctl start plc_watcher plc_web
     sleep 1
     spin_ok
     echo ""
@@ -198,12 +200,15 @@ stop)
     need_sudo
     banner "Stopping services"
     echo ""
-    spin_start "Stopping plc_watcher and plc_web"
+    # Stop the self-healing daemon FIRST — otherwise it would detect the
+    # watcher/web going down and immediately restart them, fighting this stop.
+    spin_start "Stopping plc_selfheal, plc_watcher and plc_web"
+    sudo systemctl stop plc_selfheal 2>/dev/null || true
     sudo systemctl stop plc_watcher plc_web
     spin_ok
     echo ""
     warn "Services stopped — will restart automatically on next boot"
-    warn "To disable auto-start: sudo systemctl disable plc_watcher plc_web"
+    warn "To disable auto-start: sudo systemctl disable plc_watcher plc_web plc_selfheal"
     echo ""
     ;;
 
@@ -235,6 +240,87 @@ queue)
     echo ""
     ;;
 
+# ── Self-healing daemon ────────────────────────────────────────────────────────
+selfheal)
+    SUBCMD="${1:-status}"
+    shift || true
+    case "$SUBCMD" in
+    status)
+        banner "Self-Healing Daemon"
+        echo ""
+        ACTIVE=$(systemctl is-active   plc_selfheal 2>/dev/null || true)
+        ENABLED=$(systemctl is-enabled plc_selfheal 2>/dev/null || true)
+        if [[ "$ACTIVE" == "active" ]]; then
+            ok "plc_selfheal: RUNNING  (auto-start: ${ENABLED})"
+        else
+            warn "plc_selfheal: ${ACTIVE}  (auto-start: ${ENABLED})"
+            info "Start it:  sudo systemctl start plc_selfheal"
+        fi
+        echo ""
+        # Last-cycle / throttle state
+        _ST="/home/pi/reports/health/.selfheal_state.json"
+        if [[ -f "$_ST" ]]; then
+            "${PYTHON}" - "$_ST" << 'PYEOF' 2>/dev/null || true
+import json, sys, time
+try:
+    d = json.load(open(sys.argv[1]))
+except Exception:
+    sys.exit(0)
+lc = d.get("last_cycle", 0)
+if lc:
+    age = int(time.time() - lc)
+    print(f"  Last self-heal sweep: {age}s ago")
+rep = d.get("reported", {})
+if rep:
+    print(f"  Active unresolved problems: {len(rep)}")
+    for k in rep: print(f"     • {k}")
+else:
+    print("  No unresolved problems")
+PYEOF
+        else
+            info "No sweep has run yet (daemon may have just started)"
+        fi
+        echo ""
+        # Pending health reports on disk
+        _HD="/home/pi/reports/health"
+        if [[ -d "$_HD" ]]; then
+            _N=$(find "$_HD" -maxdepth 1 -name 'health_*.txt' 2>/dev/null | wc -l)
+            [[ "${_N:-0}" -gt 0 ]] && info "${_N} health report(s) in ${_HD}"
+        fi
+        echo ""
+        info "Recent activity:  plc_checkweigher selfheal logs"
+        echo ""
+        ;;
+    logs)
+        banner "Self-Heal Logs"
+        echo ""
+        exec journalctl -u plc_selfheal -n 50 -f --no-pager
+        ;;
+    now|run)
+        banner "Self-Heal — Immediate Sweep"
+        need_sudo
+        echo ""
+        spin_start "Running one self-heal cycle"
+        sudo "${PYTHON}" -c "
+import sys; sys.path.insert(0, '${INSTALL_DIR}')
+import selfheal
+healed, failed, env = selfheal.run_cycle()
+selfheal.maybe_report(healed, failed, env)
+print('HEALED:', len(healed), '| UNRESOLVED:', len(failed))
+for k,d in healed: print('  [HEALED]', k, '-', d)
+for k,d in failed: print('  [FAIL]  ', k, '-', d)
+" && spin_ok || spin_warn "Cycle completed with issues"
+        echo ""
+        ;;
+    *)
+        echo "Usage: plc_checkweigher selfheal [status|logs|now]"
+        echo "  status  — daemon state, last sweep, unresolved problems (default)"
+        echo "  logs    — follow the self-heal journal"
+        echo "  now     — run one self-heal sweep immediately"
+        ;;
+    esac
+    ;;
+
 # ── Push test ─────────────────────────────────────────────────────────────────
 push-test)
     banner "SMB Push Test"
@@ -612,20 +698,23 @@ console-passwd)
 
 # ─────────────────────────────────────────────────────────────────────────────
 # FIX — auto-detect and repair common issues
-# Usage: fix [-wifi] [-health] [-programs] [-errors]   (no flags = run all)
+# Usage: fix [-wifi] [-health] [-programs] [-errors] [-registers]  (no flags = all but registers)
 # ─────────────────────────────────────────────────────────────────────────────
 fix)
-    FIX_WIFI=0; FIX_HEALTH=0; FIX_PROGRAMS=0; FIX_ERRORS=0
+    FIX_WIFI=0; FIX_HEALTH=0; FIX_PROGRAMS=0; FIX_ERRORS=0; FIX_REGISTERS=0
     if [[ $# -eq 0 ]]; then
+        # -registers is opt-in only: it talks to the PLC and may rewrite the
+        # register map, so it is excluded from the default "fix everything" run.
         FIX_WIFI=1; FIX_HEALTH=1; FIX_PROGRAMS=1; FIX_ERRORS=1
     else
         for _flag in "$@"; do
             case "$_flag" in
-            -wifi)     FIX_WIFI=1 ;;
-            -health)   FIX_HEALTH=1 ;;
-            -programs) FIX_PROGRAMS=1 ;;
-            -errors)   FIX_ERRORS=1 ;;
-            *) warn "Unknown flag: $_flag  (valid: -wifi  -health  -programs  -errors)" ;;
+            -wifi)      FIX_WIFI=1 ;;
+            -health)    FIX_HEALTH=1 ;;
+            -programs)  FIX_PROGRAMS=1 ;;
+            -errors)    FIX_ERRORS=1 ;;
+            -registers) FIX_REGISTERS=1 ;;
+            *) warn "Unknown flag: $_flag  (valid: -wifi  -health  -programs  -errors  -registers)" ;;
             esac
         done
     fi
@@ -634,10 +723,11 @@ fix)
     mkdir -p "$LOG_DIR" 2>/dev/null || true
     # Build mode tag: "all" or hyphen-joined active scopes
     _LOG_MODES=""
-    [[ $FIX_WIFI     -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}wifi"
-    [[ $FIX_HEALTH   -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}health"
-    [[ $FIX_PROGRAMS -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}programs"
-    [[ $FIX_ERRORS   -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}errors"
+    [[ $FIX_WIFI      -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}wifi"
+    [[ $FIX_HEALTH    -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}health"
+    [[ $FIX_PROGRAMS  -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}programs"
+    [[ $FIX_ERRORS    -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}errors"
+    [[ $FIX_REGISTERS -eq 1 ]] && _LOG_MODES="${_LOG_MODES:+${_LOG_MODES}-}registers"
     [[ "$_LOG_MODES" == "wifi-health-programs-errors" ]] && _LOG_MODES="all"
     LOG_FILE="${LOG_DIR}/fix_${_LOG_MODES}_$(date '+%Y%m%d_%H%M%S').log"
     flog()      { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" >> "$LOG_FILE"; }
@@ -647,7 +737,7 @@ fix)
     ffix_err()  { spin_err  "$*"; flog "ERROR : $*"; }
 
     FIX_COUNT=0
-    flog "=== Run started | wifi=${FIX_WIFI} health=${FIX_HEALTH} programs=${FIX_PROGRAMS} errors=${FIX_ERRORS} ==="
+    flog "=== Run started | wifi=${FIX_WIFI} health=${FIX_HEALTH} programs=${FIX_PROGRAMS} errors=${FIX_ERRORS} registers=${FIX_REGISTERS} ==="
 
     banner "Auto Fix"
     echo ""
@@ -1152,6 +1242,37 @@ SMBC
         echo ""
     fi
 
+    # ─────────────────────────────────────────────────────────────────────────
+    # REGISTERS — confirm the live PLC register layout and auto-correct the map
+    # ─────────────────────────────────────────────────────────────────────────
+    if [[ $FIX_REGISTERS -eq 1 ]]; then
+        echo -e "  ${B}▸ PLC Registers${NC}"; hr; echo ""
+        flog "=== Register scan ==="
+        # The scanner connects to the PLC, decodes known + candidate registers,
+        # and — if the read weight reads 0 while an item is on the scale —
+        # detects the real register and writes data/register_map.json so the
+        # code self-corrects without a source edit.
+        _REG_OUT=$("${PYTHON}" -c "
+import sys; sys.path.insert(0, '${INSTALL_DIR}')
+import regmap
+changed, _ = regmap.scan(write=True)
+sys.exit(10 if changed else 0)
+" 2>&1)
+        _REG_RC=$?
+        echo "$_REG_OUT"
+        while IFS= read -r _rl; do flog "REG: $_rl"; done <<< "$_REG_OUT"
+        echo ""
+        if [[ $_REG_RC -eq 10 ]]; then
+            ffix_ok "Register map auto-corrected — read weight remapped"
+            # New map takes effect on the reader's next item; restart to apply now.
+            sudo systemctl restart plc_watcher 2>/dev/null || true
+            ffix_info "plc_watcher restarted to apply the new register map"
+        else
+            ffix_info "Register scan complete — no remap needed"
+        fi
+        echo ""
+    fi
+
     # ── Summary ───────────────────────────────────────────────────────────────
     flog "=== Complete: ${FIX_COUNT} fix(es) applied ==="
     hr
@@ -1296,7 +1417,8 @@ update)
     # ── Update systemd unit files if they changed ─────────────────────────────
     _UNITS_UPDATED=0
     for _svc_src in "${INSTALL_DIR}/plc_watcher.service" \
-                    "${INSTALL_DIR}/web/plc_web.service"; do
+                    "${INSTALL_DIR}/web/plc_web.service" \
+                    "${INSTALL_DIR}/plc_selfheal.service"; do
         [[ ! -f "$_svc_src" ]] && continue
         _svc_dst="/etc/systemd/system/$(basename "$_svc_src")"
         if [[ ! -f "$_svc_dst" ]] || ! diff -q "$_svc_src" "$_svc_dst" &>/dev/null; then
@@ -1309,6 +1431,22 @@ update)
         spin_ok "systemd reloaded"
     fi
 
+    # ── Self-healing daemon present + enabled (retrofit older installs) ────────
+    spin_start "Self-healing daemon"
+    if [[ -f "${INSTALL_DIR}/selfheal.py" && -f /etc/systemd/system/plc_selfheal.service ]]; then
+        if ! systemctl is-enabled --quiet plc_selfheal 2>/dev/null; then
+            sudo systemctl enable plc_selfheal 2>/dev/null || true
+            spin_ok "plc_selfheal enabled"
+        elif ! systemctl is-active --quiet plc_selfheal 2>/dev/null; then
+            sudo systemctl start plc_selfheal 2>/dev/null || true
+            spin_ok "plc_selfheal started"
+        else
+            spin_ok "plc_selfheal active"
+        fi
+    else
+        spin_warn "selfheal.py or unit missing — will be installed on next full setup"
+    fi
+
     # ── Update Plymouth boot splash ───────────────────────────────────────────
     _THEME_DIR="/usr/share/plymouth/themes/saismruth"
     _LOGO_SRC="${INSTALL_DIR}/assets/logo.png"
@@ -1566,6 +1704,7 @@ SUDOEOF
     if [[ $_CODE_CHANGED -eq 1 || $_UNITS_UPDATED -eq 1 ]]; then
         spin_start "Restarting services"
         sudo systemctl restart plc_watcher plc_web 2>/dev/null
+        sudo systemctl restart plc_selfheal 2>/dev/null || true
         sleep 2
         spin_ok "Services restarted"
     else
@@ -1699,12 +1838,13 @@ uninstall)
     # ── 1. Stop and disable services ─────────────────────────────────────────
     echo ""
     ustep "Stopping and disabling services"
-    for SVC in plc_watcher plc_web; do
+    for SVC in plc_selfheal plc_watcher plc_web; do
         systemctl is-active  --quiet "$SVC" 2>/dev/null && sudo systemctl stop    "$SVC" 2>/dev/null || true
         systemctl is-enabled --quiet "$SVC" 2>/dev/null && sudo systemctl disable "$SVC" 2>/dev/null || true
     done
     sudo rm -f /etc/systemd/system/plc_watcher.service \
-               /etc/systemd/system/plc_web.service
+               /etc/systemd/system/plc_web.service \
+               /etc/systemd/system/plc_selfheal.service
     spin_ok "Services removed"
 
     # ── 2. System drop-ins ───────────────────────────────────────────────────
@@ -1856,13 +1996,17 @@ help|--help|-h)
     echo "    fix -health                Fix disk, memory, time, dirs"
     echo "    fix -programs              Fix services, packages, queue, unit files"
     echo "    fix -errors                Scan journal, verify RT/permissions/PLC/config"
+    echo "    fix -registers             Confirm live PLC register layout + auto-correct map"
     echo "    logs                       Stream live logs (plc_watcher + plc_web)"
     echo "    queue                      Show SMB pending queue and delivery ledger"
+    echo "    selfheal status            Self-healing daemon state + unresolved problems"
+    echo "    selfheal logs              Follow the self-heal journal"
+    echo "    selfheal now               Run one self-heal sweep immediately"
     echo ""
     echo -e "  ${W}Services${NC}"
-    echo "    start                      Start plc_watcher and plc_web"
-    echo "    stop                       Stop both services"
-    echo "    restart                    Restart both services"
+    echo "    start                      Start watcher, web and self-heal"
+    echo "    stop                       Stop all services"
+    echo "    restart                    Restart all services"
     echo ""
     echo -e "  ${W}Network${NC}"
     echo "    wifi                       Scan and switch WiFi network"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plc-checkweigher",
-  "version": "1.32.3",
+  "version": "1.33.1",
   "description": "One-command installer for the PLC Check-Weigher system on Raspberry Pi (PREEMPT_RT kernel, Python stack, WiFi, SMB, systemd RT services)",
   "scripts": {
     "postinstall": "node bin/cli.js"

package/setup.sh

@@ -432,9 +432,37 @@ WantedBy=multi-user.target
 EOF
     ok "plc_web.service       (Nice=-10)"
 
+    # ── Self-healing daemon — auto-repairs services/files/configs at runtime ──
+    cat > /etc/systemd/system/plc_selfheal.service << EOF
+[Unit]
+Description=PLC Check-Weigher Self-Healing Daemon
+After=network.target plc_watcher.service plc_web.service
+Wants=plc_watcher.service plc_web.service
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=${INSTALL_DIR}
+Environment=PYTHONUNBUFFERED=1
+ExecStart=${VENV_DIR}/bin/python3 -u ${INSTALL_DIR}/selfheal.py
+Restart=always
+RestartSec=10
+Nice=10
+CPUAffinity=0 1 2
+IOSchedulingClass=idle
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+    cp /etc/systemd/system/plc_selfheal.service "${INSTALL_DIR}/plc_selfheal.service"
+    chown "${PI_USER}:${PI_USER}" "${INSTALL_DIR}/plc_selfheal.service"
+    ok "plc_selfheal.service  (auto-repair · cores 0-2 · Nice=10)"
+
     systemctl daemon-reload
-    systemctl enable plc_watcher.service plc_web.service
-    ok "Both services enabled — start automatically after reboot"
+    systemctl enable plc_watcher.service plc_web.service plc_selfheal.service
+    ok "All services enabled — start automatically after reboot"
 
     cp /etc/systemd/system/plc_watcher.service "${INSTALL_DIR}/plc_watcher.service"
     chown "${PI_USER}:${PI_USER}" "${INSTALL_DIR}/plc_watcher.service"