conson-xp 1.0.1__py3-none-any.whl → 1.1.0__py3-none-any.whl

{conson_xp-1.0.1.dist-info → conson_xp-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.0.1
+Version: 1.1.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.0.1.dist-info → conson_xp-1.1.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.0.1.dist-info/METADATA,sha256=wo_NyCrK54bsHkSF0LihKlfeDtxR02DHb8ONbd-Wv_I,9296
-conson_xp-1.0.1.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-conson_xp-1.0.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.0.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=vAQhsuRRkcqth5YA78Q1OHLSN5KKxSPyl7s7tokrbis,175
+conson_xp-1.1.0.dist-info/METADATA,sha256=KNX3bIZASGxhb2Jhka3QNunZP3mYShzXHmoq1KwMMJ8,9296
+conson_xp-1.1.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+conson_xp-1.1.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.1.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=xf8lEjT8dAYyPp5o_Owqe-WYUCt94T7RPlhhUrh5Tr0,175
 xp/api/__init__.py,sha256=fCWjkuTzDlyJ8hIpU_QEBNcah3BB2bqVSfZwmP4ee5k,51
 xp/api/main.py,sha256=8OMXUYKnpsqjjnLChokC_M0DXZy-whrxY2dU4QTvr8A,3389
 xp/api/models/__init__.py,sha256=Xl8j2qiHc-Vb8b1ZmNZaMj7RtMvk0G_2SOvMgQumYzs,54
@@ -35,7 +35,7 @@ xp/cli/commands/conbus/conbus_msactiontable_commands.py,sha256=n1g-ZKjjjbCQqTPGC
 xp/cli/commands/conbus/conbus_output_commands.py,sha256=Y98-ibcgGB_L52VtczyJqtkGLKESzZjeGvwdLdwM35E,3900
 xp/cli/commands/conbus/conbus_raw_commands.py,sha256=NRST1cg9tO7zVUwiTKqCBpwfwP1-yvnKTDrwwIMaz68,1572
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=jV5zAmiIKK3_oDpTs9yF1YklIRcJNvOrkI6O2deb1eQ,1380
-xp/cli/commands/conbus/conbus_scan_commands.py,sha256=HjZMhU1hPRuUSWMURB9UUeZt8aNMDlBYCktwrXUgsCY,4190
+xp/cli/commands/conbus/conbus_scan_commands.py,sha256=5SeRL-RZaXkqgKEGA4wt9zayS8GHiPU3yMHBb1kNfj8,1329
 xp/cli/commands/file_commands.py,sha256=YEkho5HU5-SEVqTKKWoYPYXI0qWDr9PZaAuEt8fIXak,4855
 xp/cli/commands/homekit/__init__.py,sha256=qqwY8ulxTx1S74Mzpb6EKjBLT6fWTNdf9PQ3HKuERKY,50
 xp/cli/commands/homekit/homekit.py,sha256=EOaGvXybNlxYxRr4gtml7OtRWbOIV5wVaYfMrpIFJk4,3355
@@ -133,7 +133,7 @@ xp/services/conbus/conbus_linknumber_set_service.py,sha256=cmCP8zZ8Szb-vwYHvDbZU
 xp/services/conbus/conbus_output_service.py,sha256=w2yBeMdZn3g3wbwUoUnv3gKbqUuGcabeEaH8qw1AyUs,6689
 xp/services/conbus/conbus_raw_service.py,sha256=riANTAiXTdSzOWbp_g-IQjdRhAf8CzZnNJtlT-aDvRs,3746
 xp/services/conbus/conbus_receive_service.py,sha256=k6hzxh-D4piizb3e5Vsz-2Mfft_5KnAXoov4xk9wVY0,3123
-xp/services/conbus/conbus_scan_service.py,sha256=ODKXqD84aSkT6z_B7KHolUx2o5yuLP0gpTCAR-UoHOk,4505
+xp/services/conbus/conbus_scan_service.py,sha256=faiSeaNGYRPb9qWsmFE4cjiz3Tkv6vQVZHdwIlPzU9s,4494
 xp/services/homekit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xp/services/homekit/homekit_cache_service.py,sha256=XMZBTz2ZVTq8OZM3h0Fxu738XPlPRdvq6JLaWMbAS4Q,10289
 xp/services/homekit/homekit_conbus_service.py,sha256=71JeM-phBTiGMRr2bEfCiF85eHNIzmxtkCi2Zn0B5uA,2595
@@ -151,7 +151,7 @@ xp/services/homekit/homekit_service.py,sha256=yksnbcqbrckxWTqtJkaaPh_wd2xYH9yCOt
 xp/services/log_file_service.py,sha256=E2CSVbw5W_uk13efILb6OGqeERbxCBWjIsCbHjeps_0,10401
 xp/services/module_type_service.py,sha256=Q3TFZdiknF24OqGAP6Op1F8_SL8aslkHwPh6o_M7wxM,7010
 xp/services/protocol/__init__.py,sha256=XUj54if_nJTfqrEDZfj40nfLr-2xjfKm4CIgHMabp-o,719
-xp/services/protocol/conbus_protocol.py,sha256=GKmEB4hXAJO4sr3QHfhS_zF-J5BqV3Yi7QNexeSfzLg,7610
+xp/services/protocol/conbus_protocol.py,sha256=ePDP3O-xmEFROaOJ-2ndSUpN0TMrVGhodWT66spfdlE,7676
 xp/services/protocol/protocol_factory.py,sha256=c3CkMoWAuk9lmHdXIG51B5-S0aIaB7-mHuyULyr_jS4,1248
 xp/services/protocol/telegram_protocol.py,sha256=4mybR5gFreN_Kxw04fujt1gKIvr3Mg6O_6WwoTXe2i8,8568
 xp/services/reverse_proxy_service.py,sha256=OIPm-9y2I-xf1tESZBfgiLd_hgfGQdgrsxAFdhotmJ0,13231
@@ -178,4 +178,4 @@ xp/utils/dependencies.py,sha256=PbdI30ug3JCNn1IS9B1jGDEq5wQ_3hDrTLE2Pr-f7AA,1960
 xp/utils/event_helper.py,sha256=W-A_xmoXlpWZBbJH6qdaN50o3-XrwFsDgvAGMJDiAgo,1001
 xp/utils/serialization.py,sha256=hZcrpzaBOe3a2wS_RFCIRs9PvnYsrbK7Ulq6s1rU0q4,4456
 xp/utils/time_utils.py,sha256=Yi3JxHrHsd9ZZxTBRIqlTOz1FYTCeE1IZbefDaXIop8,3800
-conson_xp-1.0.1.dist-info/RECORD,,
+conson_xp-1.1.0.dist-info/RECORD,,

xp/__init__.py

@@ -2,7 +2,7 @@
 
 """conson-xp"""
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/cli/commands/conbus/conbus_scan_commands.py

@@ -1,7 +1,6 @@
 """Conbus client operations CLI commands."""
 
 import json
-import threading
 
 import click
 from click import Context
@@ -16,18 +15,9 @@ from xp.services.conbus.conbus_scan_service import ConbusScanService
 @conbus.command("scan")
 @click.argument("serial_number", type=SERIAL)
 @click.argument("function_code", type=str)
-@click.option(
-    "--background",
-    "-b",
-    default=True,
-    is_flag=True,
-    help="Run scan in background with live output",
-)
 @click.pass_context
 @connection_command()
-def scan_module(
-    ctx: Context, serial_number: str, function_code: str, background: bool
-) -> None:
+def scan_module(ctx: Context, serial_number: str, function_code: str) -> None:
     """
     Scan all datapoints of a function_code for a module.
 
@@ -36,90 +26,20 @@ def scan_module(
     \b
         xp conbus scan 0012345011 02 # Scan all datapoints of function Read data points (02)
     """
-    service = ctx.obj.get("container").get_container().resolve(ConbusScanService)
-
-    # Shared state for results collection and live output
-    results = []
-    successful_count = 0
-    failed_count = 0
-
-    def progress_callback(response: ConbusResponse, total: int, count: int) -> None:
-        nonlocal successful_count, failed_count
-        results.append(response)
-
-        if count % 10 == 0:
-            click.echo(f"{count}/{total} datapoints scanned.")
-
-        # Count results for JSON output
-        if response.success:
-            successful_count += 1
-        else:
-            failed_count += 1
-
-    try:
-        with service:
-            if background:
-                # Background processing
-
-                # Use background scanning with progress callback
-                scan_complete = threading.Event()
-
-                def background_scan() -> None:
-                    try:
-                        service.scan_module(
-                            serial_number, function_code, progress_callback
-                        )
-                    except (ValueError, KeyError, ConnectionError):
-                        pass  # Will be handled by outer error handling
-                    finally:
-                        scan_complete.set()
-
-                # Start background thread
-                scan_thread = threading.Thread(target=background_scan, daemon=True)
-                scan_thread.start()
-
-                # Wait for completion or user interrupt
-                try:
-                    while not scan_complete.is_set():
-                        scan_complete.wait(1.0)  # Check every second
-                except KeyboardInterrupt:
-                    # Output partial results in JSON format
-                    output = {
-                        "serial_number": serial_number,
-                        "total_scans": len(results),
-                        "successful_scans": successful_count,
-                        "failed_scans": failed_count,
-                        "background_mode": background,
-                        "interrupted": True,
-                        "results": [result.to_dict() for result in results],
-                    }
-                    click.echo(json.dumps(output, indent=2))
-                    raise click.Abort()
-
-                # Wait for thread to complete
-                scan_thread.join(timeout=1.0)
-
-            else:
-                # Traditional synchronous scanning
-                results = service.scan_module(
-                    serial_number,
-                    function_code,
-                    progress_callback,
-                )
-                successful_count = len([r for r in results if r.success])
-                failed_count = len([r for r in results if not r.success])
-
-        # Final output
-        output = {
-            "serial_number": serial_number,
-            "total_scans": len(results),
-            "successful_scans": successful_count,
-            "failed_scans": failed_count,
-            "background_mode": background,
-            "results": [result.to_dict() for result in results],
-        }
-        click.echo(json.dumps(output, indent=2))
-
-    except click.Abort:
-        # User interrupted the scan
-        raise
+    service: ConbusScanService = (
+        ctx.obj.get("container").get_container().resolve(ConbusScanService)
+    )
+
+    def on_progress(progress: str) -> None:
+        click.echo(progress)
+
+    def on_finish(service_response: ConbusResponse) -> None:
+        click.echo(json.dumps(service_response.to_dict(), indent=2))
+
+    with service:
+        service.scan_module(
+            serial_number=serial_number,
+            function_code=function_code,
+            progress_callback=on_progress,
+            finish_callback=on_finish,
+        )

xp/services/conbus/conbus_scan_service.py

@@ -91,7 +91,7 @@ class ConbusScanService(ConbusProtocol):
         if self.finish_callback:
             self.finish_callback(self.service_response)
 
-    def scan_module_background(
+    def scan_module(
         self,
         serial_number: str,
         function_code: str,

xp/services/protocol/conbus_protocol.py

@@ -75,7 +75,7 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
                 )
 
             self.logger.debug(
-                f"frameReceived payload: {payload.decode()}, checksum: {checksum}"
+                f"frameReceived payload: {payload.decode('latin-1')}, checksum: {checksum}"
             )
 
             # Reset timeout on activity
@@ -83,9 +83,9 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
 
             telegram_received = TelegramReceivedEvent(
                 protocol=self,
-                frame=frame.decode(),
-                telegram=telegram.decode(),
-                payload=payload.decode(),
+                frame=frame.decode("latin-1"),
+                telegram=telegram.decode("latin-1"),
+                payload=payload.decode("latin-1"),
                 telegram_type=telegram_type,
                 serial_number=serial_number,
                 checksum=checksum,
@@ -112,6 +112,7 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug(f"Sending frame: {frame.decode()}")
         self.transport.write(frame)  # type: ignore
         self.telegram_sent(frame.decode())
+        self._reset_timeout()
 
     def send_telegram(
         self,