diff --git a/CHANGELOG.de.md b/CHANGELOG.de.md index b039b56..a0f865e 100644 --- a/CHANGELOG.de.md +++ b/CHANGELOG.de.md @@ -1,21 +1,28 @@ # Changelog -## [0.9.6.1] – 2026-05-02 +## [0.9.7] – 2026-05-08 + +### Neu +- **fetch_credentials-Tool:** Ruft MQTT-Credentials direkt vom Drucker per HTTP ab — kein laufender Anycubic Slicer nötig, nur die Drucker-IP. Linux-Binary und Windows-EXE im Release enthalten. (Beitrag von bebu, PR #19) ### Fixes -- **Upload-Banner:** Banner wird nach Stopp/Abbruch nicht mehr erneut angezeigt — `file_ready` und Thumbnail werden jetzt gecleared wenn der Drucker `stoped` oder `canceled` meldet +- **Upload großer GCode-Dateien:** Dateien >1 MB wurden mit HTTP 413 abgelehnt — aiohttp `client_max_size` auf 256 MB erhöht +- **Upload-Timeout:** Socket-Timeout nach GCode-Upload von 10s auf 120s erhöht — große Dateien führten zu einem Absturz der Bridge mit leerer Antwort während der Drucker noch verarbeitete --- ## [0.9.6] – 2026-05-02 ### Neu -- **Fortschritts-Karte:** Verstrichen / Slicer-Schätzung / Restzeit als Mini-Cards (gleicher Stil wie Temperaturkarten) -- **Layer-Mini-Card:** Layerzahl als Mini-Card neben der Fortschrittsleiste +- **Licht-Status-Synchronisierung:** Ein/Aus-Zustand und Helligkeit des Druckerlichts werden jetzt live über `light/report` MQTT gelesen — der Licht-Toggle in der UI spiegelt den echten Druckerstatus wider +- **Zeit-Minicards:** Fortschritts-Panel zeigt jetzt drei Karten — Verstrichen, Restzeit und Slicer-Schätzung — sowie einen Layer-Badge neben dem Fortschrittsbalken +- **Slicer-Schätzzeit aus GCode:** Geschätzte Druckzeit wird direkt aus der hochgeladenen GCode-Datei gelesen (OrcaSlicer: `; total estimated time:` am Dateiende, PrusaSlicer: `; estimated printing time` im Header) +- **Erweiterte Druckerstatus-Strings:** `pausing`, `paused`, `resuming`, `resumed`, `stopping`, `stopped` hinzugefügt — fehlten bisher und ließen die UI rohe Status-Codes bei Pause/Fortsetzen/Stopp anzeigen ### Fixes -- **Slicer-Schätzzeit:** OrcaSlicer schreibt die geschätzte Zeit ans Ende der GCode-Datei — Bridge liest jetzt auch die letzten 64 KB (vorher nur die ersten 16 KB) -- **start.sh:** `config/`-Verzeichnis wird jetzt automatisch erstellt und `config.ini.example` wird beim ersten Start hineinkopiert (Issue #15) +- **file_ready-Banner:** Upload-Banner wird nach Stopp oder Abbruch eines Drucks nicht mehr angezeigt +- **Zeitanzeige bei Stopp/Abbruch:** Verstrichen-, Restzeit- und Slicer-Schätzung werden auf null zurückgesetzt wenn ein Druck gestoppt oder abgebrochen wird +- **start.sh:** `config/`-Verzeichnis und `config.ini.example` werden beim ersten Start automatisch angelegt wenn sie fehlen (Issue #15) --- diff --git a/CHANGELOG.md b/CHANGELOG.md index aa68df2..9e9de25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,28 @@ # Changelog -## [0.9.6.1] – 2026-05-02 +## [0.9.7] – 2026-05-08 + +### New +- **fetch_credentials tool:** Fetches and decrypts MQTT credentials directly from the printer via HTTP — no running Anycubic Slicer required, only the printer IP needed. Linux binary and Windows EXE included in release. (Contributed by bebu, PR #19) ### Fixes -- **Upload banner:** Banner is no longer shown again after print stop/cancel — `file_ready` and thumbnail are now cleared when the printer reports `stoped` or `canceled` +- **Large GCode upload:** Files >1 MB were rejected with HTTP 413 — aiohttp `client_max_size` raised to 256 MB +- **Upload timeout:** Socket timeout after GCode upload raised from 10s to 120s — large files caused the bridge to crash with an empty response while the printer was still processing --- ## [0.9.6] – 2026-05-02 ### New -- **Progress card:** Elapsed / Slicer estimate / Remaining time shown as mini-cards (same style as temperature cards) -- **Layer mini-card:** Layer count displayed as mini-card next to the progress bar +- **Light status sync:** Light on/off state and brightness are now read live from the printer via `light/report` MQTT message — the light toggle in the UI reflects the actual printer state +- **Time mini-cards:** Progress panel now shows three cards — Elapsed, Remaining and Slicer estimate — with a layer counter badge next to the progress bar +- **Slicer estimate from GCode:** Estimated print time is parsed directly from the uploaded GCode file (OrcaSlicer: `; total estimated time:` at end of file, PrusaSlicer: `; estimated printing time` in header) +- **Extended printer status strings:** Added `pausing`, `paused`, `resuming`, `resumed`, `stopping`, `stopped` states — previously missing, causing the UI to show raw status codes during pause/resume/stop transitions ### Fixes -- **Slicer estimate time:** OrcaSlicer writes the estimated time at the end of the GCode file — bridge now also scans the last 64 KB (previously only the first 16 KB were checked) -- **start.sh:** `config/` directory is now created automatically and `config.ini.example` is copied into it on first run (Issue #15) +- **file_ready banner:** Upload banner is no longer shown after print stop or cancel +- **Timers on stop/cancel:** Elapsed, remaining and slicer estimate times are reset to zero when a print is stopped or cancelled +- **start.sh:** `config/` directory and `config.ini.example` are now created automatically on first run if missing (Issue #15) --- diff --git a/README.de.md b/README.de.md index 61cba37..478946f 100644 --- a/README.de.md +++ b/README.de.md @@ -2,7 +2,7 @@ # KX-Bridge – Anycubic Kobra X -**Version:** 0.9.6.1 +**Version:** 0.9.7 Steuere deinen **Anycubic Kobra X** mit OrcaSlicer — ohne Klipper, ohne Raspberry Pi. KX-Bridge ist eine Moonraker-kompatible Bridge die direkt mit dem Drucker kommuniziert. @@ -18,13 +18,23 @@ Den Kobra X in den LAN-Modus versetzen: ### Schritt 2 – Credentials holen -Die MQTT-Zugangsdaten sind druckerspezifisch. So holst du sie: +Die MQTT-Zugangsdaten sind druckerspezifisch und an die Hardware gebunden. + +**Option A – fetch_credentials (empfohlen):** + +```bash +fetch_credentials --ip 192.168.x.x --write-config +``` + +Holt die Credentials direkt per HTTP vom Drucker und schreibt sie automatisch in `config/config.ini`. Benötigt nur die Drucker-IP — kein Slicer nötig. + +**Option B – extract_credentials (wenn Drucker-IP unbekannt):** 1. **AnycubicSlicerNext** öffnen und Drucker verbinden (bis Status angezeigt wird) -2. **`extract_credentials.exe`** (Windows) oder **`extract_credentials`** (Linux) ausführen — gibt Username, Password, Device-ID und Drucker-IP aus -3. Werte merken / kopieren +2. **`extract_credentials`** ausführen — gibt Username, Password, Device-ID und Drucker-IP aus +3. Werte im Web-UI eintragen (⚙-Menü) -> **Download:** [gitea.it-drui.de/viewit/KX-Bridge-Release/releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `extract_credentials.exe` (Windows) / `extract_credentials` (Linux) im jeweiligen Release-Asset +> **Download:** [gitea.it-drui.de/viewit/KX-Bridge-Release/releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `fetch_credentials` / `extract_credentials` (Linux & Windows) im jeweiligen Release-Asset ### Schritt 3 – Bridge starten @@ -36,7 +46,7 @@ Das Skript baut das Docker-Image automatisch beim ersten Aufruf. **Web-UI öffnen:** `http://BRIDGE-IP:7125` → Das ⚙-Menü öffnet sich beim ersten Start automatisch -→ Credentials aus Schritt 2 eintragen → **Speichern & Neustart** +→ Bei Option B: Credentials aus Schritt 2 eintragen → **Speichern & Neustart** **OrcaSlicer verbinden:** Drucker → Verbindungstyp **Moonraker** → Host: `http://BRIDGE-IP:7125` @@ -116,7 +126,8 @@ docker-compose down ## Fehlerbehebung **„Falsche MQTT-Zugangsdaten"** beim Start: -- AnycubicSlicerNext neu starten, Drucker verbinden, `extract_credentials` erneut ausführen +- `fetch_credentials --ip --write-config` erneut ausführen und Bridge neu starten +- Wenn IP unbekannt: AnycubicSlicerNext neu starten, Drucker verbinden, `extract_credentials` erneut ausführen - Nur die IP-Adresse ins Feld eintragen, keinen Port (✗ `192.168.1.102:9883` → ✓ `192.168.1.102`) **Drucker nicht gefunden / kein LAN-Modus:** diff --git a/README.md b/README.md index c263428..10e48ba 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # KX-Bridge – Anycubic Kobra X -**Version:** 0.9.6.1 +**Version:** 0.9.7 Control your **Anycubic Kobra X** with OrcaSlicer — no Klipper, no Raspberry Pi. KX-Bridge is a Moonraker-compatible bridge that communicates directly with the printer. diff --git a/VERSION b/VERSION index c698940..c81aa44 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.6.1 +0.9.7 diff --git a/fetch_credentials.py b/fetch_credentials.py index 46bdc7a..2b7b876 100644 --- a/fetch_credentials.py +++ b/fetch_credentials.py @@ -1,22 +1,20 @@ #!/usr/bin/env python3 """ -Decrypt printer configuration data using AES-256-CBC +fetch_credentials.py – Fetches and decrypts Anycubic Kobra X credentials via HTTP API. -This script decrypts encrypted printer configuration data from a 3D printer using AES-256-CBC. -The method was reverse engineered from the vue project embedded in libWorkbench.so, -which is part of Anycubic Slicer Next. -The decryption key is derived from the device token, -and the IV is obtained from the response token in the encrypted data. +Original approach by bebu (PR #19, KX-Bridge-Release). +Reverse engineered from the Vue project embedded in libWorkbench.so (Anycubic Slicer Next). +No running slicer required — only the printer IP in LAN. -- Algorithm: AES-256-CBC -- Key: Characters 16-32 of the token from info.json -- IV: The response token from ctrl.json -- Mode: CBC with PKCS7 padding +Algorithm: AES-256-CBC + Key: token[16:32] from /info response + IV: response token from /ctrl response Usage: - python3 fetch_credentials.py --ip 192.168.2.32 - python3 fetch_credentials.py --ip 192.168.2.32 --port 18910 - python3 fetch_credentials.py --ctrl ctrl.json --info info.json --output config.json + python3 fetch_credentials.py --ip 192.168.x.x + python3 fetch_credentials.py --ip 192.168.x.x --write-config + python3 fetch_credentials.py --ip 192.168.x.x --write-config --config-file ../config/config.ini + python3 fetch_credentials.py --ctrl ctrl.json --info info.json """ import json @@ -24,6 +22,7 @@ import sys import base64 import hashlib import argparse +import os import time import random import string @@ -190,18 +189,24 @@ def main(): # Parse command-line arguments parser = argparse.ArgumentParser( - description='Decrypt Anycubic printer configuration data', + description='Fetch and decrypt Anycubic Kobra X credentials via HTTP API', ) # HTTP mode - parser.add_argument('--ip', help='IP address of the printer (fetch via HTTP)') - parser.add_argument('--port', type=int, default=18910, help='Printer port (default: 18910)') - + parser.add_argument('--ip', help='IP address of the printer') + parser.add_argument('--port', type=int, default=18910, help='Printer HTTP port (default: 18910)') + # File mode parser.add_argument('--ctrl', default='ctrl.json', help='Path to ctrl.json (default: ctrl.json)') parser.add_argument('--info', default='info.json', help='Path to info.json (default: info.json)') - parser.add_argument('--output', default='decrypted_printer_config.json', help='Output file (default: decrypted_printer_config.json)') + + # Output + parser.add_argument('--output', default=None, help='Save raw decrypted JSON to file (optional)') + parser.add_argument('--write-config', action='store_true', + help='Write credentials to config.ini') + parser.add_argument('--config-file', default=None, + help='Path to config.ini (default: ../config/config.ini relative to this script)') parser.add_argument('--verbose', '-v', action='store_true', help='Verbose output') - + args = parser.parse_args() # Determine mode: HTTP or file @@ -253,15 +258,15 @@ def main(): print(f"Error: {args.info} not found", file=sys.stderr) return 1 - # Read data.json + # Read ctrl.json try: - with open(args.data, 'r') as f: + with open(args.ctrl, 'r') as f: data = json.load(f) except json.JSONDecodeError as e: - print(f"Error reading {args.data}: {e}", file=sys.stderr) + print(f"Error reading {args.ctrl}: {e}", file=sys.stderr) return 1 except Exception as e: - print(f"Error reading {args.data}: {e}", file=sys.stderr) + print(f"Error reading {args.ctrl}: {e}", file=sys.stderr) return 1 # Read info.json @@ -315,31 +320,78 @@ def main(): print(f"Error during decryption: {result.get('error')}", file=sys.stderr) return 1 - # Pretty print result + # Show result + print() + print("=" * 55) + print(" CREDENTIALS") + print("=" * 55) + print(f" {'Printer IP':12s} {result.get('ip', 'n/a')}") + print(f" {'Username':12s} {result.get('username', 'n/a')}") + print(f" {'Password':12s} {result.get('password', 'n/a')}") + print(f" {'Device-ID':12s} {result.get('deviceId', 'n/a')}") + print(f" {'Mode-ID':12s} {result.get('modeId', 'n/a')}") + print(f" {'Model':12s} {result.get('modelName', 'n/a')}") + print(f" {'Broker':12s} {result.get('broker', 'n/a')}") + print("=" * 55) + if args.verbose: - print("=" * 70) - print("Decrypted Configuration:") - print("=" * 70) - print(json.dumps(result, indent=2)) print() - - # Save to file - try: - with open(args.output, 'w') as f: - json.dump(result, f, indent=2) - - if args.verbose: - print("=" * 70) - print(f"Successfully saved decrypted config to: {args.output}") - print("=" * 70) + print("Full decrypted config:") + # Strip certs/keys from verbose output to avoid cluttering terminal + display = {k: v for k, v in result.items() if k not in ('devicecrt', 'devicepk')} + print(json.dumps(display, indent=2)) + + # Optionally save raw JSON + if args.output: + try: + with open(args.output, 'w') as f: + json.dump(result, f, indent=2) + print(f"\nRaw config saved to: {args.output}") + except Exception as e: + print(f"Error writing to {args.output}: {e}", file=sys.stderr) + return 1 + + # Write config.ini + if args.write_config: + if args.config_file: + config_path = args.config_file else: - print(f"Decrypted config saved to: {args.output}") - except Exception as e: - print(f"Error writing to {args.output}: {e}", file=sys.stderr) - return 1 - + config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), + '..', 'config', 'config.ini') + config_path = os.path.normpath(config_path) + + _write_config_ini(result, config_path) + else: + print(f"\nTip: pass --write-config to write credentials directly to config.ini") + return 0 +def _write_config_ini(result: dict, config_path: str): + """Write fetched credentials into config.ini, preserving existing non-credential keys.""" + import configparser + + cfg = configparser.ConfigParser() + + if os.path.isfile(config_path): + cfg.read(config_path) + + if not cfg.has_section('connection'): + cfg.add_section('connection') + + cfg.set('connection', 'printer_ip', result.get('ip', '')) + cfg.set('connection', 'mqtt_port', '9883') + cfg.set('connection', 'username', result.get('username', '')) + cfg.set('connection', 'password', result.get('password', '')) + cfg.set('connection', 'device_id', result.get('deviceId', '')) + cfg.set('connection', 'mode_id', result.get('modeId', '20030')) + + os.makedirs(os.path.dirname(config_path), exist_ok=True) + with open(config_path, 'w') as f: + cfg.write(f) + + print(f"\n✓ Credentials written to '{config_path}'.") + + if __name__ == '__main__': sys.exit(main()) diff --git a/kobrax_client.py b/kobrax_client.py index f05f20e..afd9f6c 100644 --- a/kobrax_client.py +++ b/kobrax_client.py @@ -523,7 +523,7 @@ class KobraXClient: sock = socket.create_connection((self.host, 18910), timeout=30) sock.sendall(headers + body) - sock.settimeout(10) + sock.settimeout(120) # große GCode-Dateien brauchen Zeit bis der Drucker antwortet response = b"" try: while True: diff --git a/kobrax_moonraker_bridge.py b/kobrax_moonraker_bridge.py index 841e9b1..07a6434 100644 --- a/kobrax_moonraker_bridge.py +++ b/kobrax_moonraker_bridge.py @@ -178,6 +178,7 @@ class KobraXBridge: client.callbacks["info/report"] = self._on_info client.callbacks["file/report"] = self._on_file client.callbacks["multiColorBox/report"] = self._on_multicolor_box + client.callbacks["light/report"] = self._on_light # ------------------------------------------------------------------------- # MQTT callbacks (called from reader thread) @@ -289,6 +290,12 @@ class KobraXBridge: log.info(f"AMS-Slots empfangen: {len(slots)}, loaded_slot={self._ams_loaded_slot}") self._push_status_update() + def _on_light(self, payload: dict): + d = payload.get("data") or {} + self._state["light_on"] = bool(d.get("status", 0)) + self._state["light_brightness"] = int(d.get("brightness", 80)) + self._push_status_update() + # OrcaSlicer filament preset IDs (MoonrakerPrinterAgent.cpp mapping) _TRAY_INFO_IDX = { "PLA": "OGFL99", "PLA-CF": "OGFL98", "PLA SILK": "OGFL96", @@ -3077,7 +3084,7 @@ def _mqtt_error_msg(exc: Exception) -> str: def build_app(bridge: KobraXBridge) -> web.Application: - app = web.Application() + app = web.Application(client_max_size=256 * 1024 * 1024) # 256 MB für große GCode-Dateien r = app.router # Moonraker API