conson-xp 1.51.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

{conson_xp-1.51.1.dist-info → conson_xp-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.51.1
+Version: 2.0.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -46,7 +46,6 @@ Requires-Dist: pydantic>=2.11
 Requires-Dist: HAP-python[QRCode]>=5.0.0
 Requires-Dist: punq>=0.7.0
 Requires-Dist: twisted>=25.5.0
-Requires-Dist: bubus>=1.5.6
 Requires-Dist: psygnal>=0.15.0
 Requires-Dist: textual>=1.0.0
 Requires-Dist: python-statemachine>=2.5.0
@@ -399,15 +398,6 @@ xp file validate
 
 xp help
 
-xp homekit
-
-xp homekit config
-xp homekit config show
-xp homekit config validate
-
-xp homekit start
-
-
 xp module
 xp module categories
 xp module info

{conson_xp-1.51.1.dist-info → conson_xp-2.0.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-conson_xp-1.51.1.dist-info/METADATA,sha256=15wTMgVInRD7kUjYvZe3AtZPgmPGG_XcXsaGRB3Vjds,11448
-conson_xp-1.51.1.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.51.1.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.51.1.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=PTmuTUb4TXiPuSSkKX3UT63IhH_fx4EpMP33cMsA6Nc,182
+conson_xp-2.0.0.dist-info/METADATA,sha256=tK46Z8_p-HD8WeGz-pDaZ93S9IxsuLrcSPS96yBBA2A,11319
+conson_xp-2.0.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-2.0.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-2.0.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=kAoWCUKDiEEtQSn6qquI38IMu38W_n_3af1nhKORdzk,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
-xp/cli/commands/__init__.py,sha256=G7A1KFRSV0CEeDTqr_khu-K9_sc01CTI2KSfkFcaBRM,4949
+xp/cli/commands/__init__.py,sha256=9TGP3uTxAU-s-kVChvQ-Fn3-HVYj-QpeQ05Is-20HRo,4788
 xp/cli/commands/conbus/__init__.py,sha256=HYaX2__XxwD3Xaw4CzflvL8CwoUa4yR6wOyH8wwyofM,535
 xp/cli/commands/conbus/conbus.py,sha256=GpWq1QS3mKfQFG77nTED-_hsvcnXb3ZIrC6DhfyhzBE,3538
 xp/cli/commands/conbus/conbus_actiontable_commands.py,sha256=EpyLG_6RxhIQY4BWxDXTyo8yzpBwbHfZDOgmRl--R5w,7378
@@ -26,9 +26,6 @@ xp/cli/commands/conbus/conbus_raw_commands.py,sha256=o1dVZqiRw7J3_8Bge7DJucFyAqt
 xp/cli/commands/conbus/conbus_receive_commands.py,sha256=LdxoOUdM5atkC8fFlp-GK7HQ7oxTnjrSFDx-lQ3nme0,1925
 xp/cli/commands/conbus/conbus_scan_commands.py,sha256=QuRT4Vx5TqervCOUsZ4wcxvy7Jwra4hl2-DIt8cDcoE,1828
 xp/cli/commands/file_commands.py,sha256=dx6a4xNxuReXq7dOyL8ebn6lyifzDm0d0OsuDjyr_90,5547
-xp/cli/commands/homekit/__init__.py,sha256=qqwY8ulxTx1S74Mzpb6EKjBLT6fWTNdf9PQ3HKuERKY,50
-xp/cli/commands/homekit/homekit.py,sha256=BoX7BVbgz2fehahe4_jPgEpOSIzKg790-9ADjoSKsKY,3604
-xp/cli/commands/homekit/homekit_start_commands.py,sha256=tfRRAFdTp74RsZ4alqYTvRpfSrSXyFKr5Zdc3prgbuQ,1125
 xp/cli/commands/module_commands.py,sha256=KCbGkt6Zr1i4yrXanb-WXZ08PDChNkMk3Y5B5La8BaM,5406
 xp/cli/commands/reverse_proxy_commands.py,sha256=GFgRoAXU0cf1QNFu3WYNcXdbMndGMaGHtHRkMwePTyc,5485
 xp/cli/commands/server/__init__.py,sha256=iunDmcaax9U-SHymgGzUlPadGdZLFl9LlhXu2mnyb64,49
@@ -43,8 +40,8 @@ xp/cli/commands/telegram/telegram_parse_commands.py,sha256=xCDRRFgj41RtStvwROfi-
 xp/cli/commands/telegram/telegram_version_commands.py,sha256=hAMjSAa7zfMNfNFln63sKeNPcmW89bISkcVs6BgsqOg,1558
 xp/cli/commands/term/__init__.py,sha256=1NNST_8YJfj5LCujQISwQflK6LyEn7mDmZpMpvI9d-o,116
 xp/cli/commands/term/term.py,sha256=gjvsv2OE-F_KNWQrWi04fXQ5cGo0l8P-Ortbb5KTA-A,309
-xp/cli/commands/term/term_commands.py,sha256=Z3pq_xzP0j5YfYFOwASaZUxXDkikSV_E4cFjMb69LUU,1796
-xp/cli/main.py,sha256=Wbtji5ddW3IEoAfecHrEPk8W_w1bGD20B-NqAWfI_F4,1968
+xp/cli/commands/term/term_commands.py,sha256=pw-hEddLf89_NKft3JPsZALe-7vtvNeq9upubysqLX8,1799
+xp/cli/main.py,sha256=wr8jCGqgAvre0KFz4wZUWV0IpKa25cs2yLYAAcMoOIw,1906
 xp/cli/utils/__init__.py,sha256=gTGIj60Uai0iE7sr9_TtEpl04fD7krtTzbbigXUsUVU,46
 xp/cli/utils/click_tree.py,sha256=sr4l9RWTCnASkdvkJKnRRxWSQPlF1DbFdBNu9gL7Ekc,1693
 xp/cli/utils/datapoint_type_choice.py,sha256=fGgwZAmY_jwBt4fc1LQfyqhvf-TBOUgL3ph9idIDvAI,1680
@@ -84,10 +81,10 @@ xp/models/config/__init__.py,sha256=gEZnX9eE3DjFtLtF32riEjJQLypqQRbyPauBI4Cowbs,
 xp/models/config/conson_module_config.py,sha256=t1G0LnNNMnjs3ahhz4-Z_5SlEv2FCrcRq13OmvZ2pvA,3009
 xp/models/homekit/__init__.py,sha256=5HDSOClCu0ArK3IICn3_LDMMLBAzLjBxUUSF73bxSSk,34
 xp/models/homekit/homekit_accessory.py,sha256=ANjDWlFxeNTstl7lKdmf6vMOC0wc005vpiD6awRcptA,1052
-xp/models/homekit/homekit_config.py,sha256=EqoiZ1E6l9bBjxKqK1nxVGRfFY5ZtRHH-jZhYtRH2gU,3048
+xp/models/homekit/homekit_config.py,sha256=pgZOnocue60LjV8ce46MyJ3mo5CqLix6TmT64qxPOks,3267
 xp/models/log_entry.py,sha256=tAiNwouCP2d4jKiHJY9a-2iAi8LWTpG-TZsOPDIstlA,4423
 xp/models/protocol/__init__.py,sha256=TJ_CJKchA-xgQiv5vCo_ndBBZjrcaTmjT74bR0T-5Cw,38
-xp/models/protocol/conbus_protocol.py,sha256=hF78N5xvBzMiyWoKd8i_avA8kJ1As_9Pplkw1GMqKzk,9145
+xp/models/protocol/conbus_protocol.py,sha256=gFaXK1VY74aVQhMH69Dr-dTDbDuQDQGs8vKmXqK_te8,9318
 xp/models/response.py,sha256=z0376hEVNh1Z_R9CtzmKNbJBzCo_Aun2ImI9dTtrVe4,1254
 xp/models/telegram/__init__.py,sha256=-_exhjlRLbBNuPxHC4tLA2SAgf8M0yHJMeyEoQIk9PI,53
 xp/models/telegram/action_type.py,sha256=ys3yInmD97bKotB-nlPdfo8ZPXKaYxzG0CxV9wHK-zo,797
@@ -106,7 +103,7 @@ xp/models/telegram/telegram.py,sha256=-kNloBlwMJ5w1-FAMSLzBPnyOGUNEBG3SG2d0eTi2P
 xp/models/telegram/telegram_type.py,sha256=IjGEosbs7IDqYT7ktn-FcKS-kAJ4eXW-KJGkkoAGysw,428
 xp/models/telegram/timeparam_type.py,sha256=z5EQ32SQjDi7zKshtkvDzqaMfPMUeXCWKEGI5VgvBvU,1142
 xp/models/term/__init__.py,sha256=VVZsEyXBEr-TnBlrFFifZ6PjJHUl2kwnRUZx_kC2Ljg,343
-xp/models/term/accessory_state.py,sha256=GcMtCxOeHpc3IPDO1F9j2I6rdhaNV75iQ2md--XY6jo,1650
+xp/models/term/accessory_state.py,sha256=doW1upkKxYeYJ8tlnLtN3Y0AAfIC7mrI4dsYNbuAvn8,1653
 xp/models/term/connection_state.py,sha256=oYcst01uH35kO541jGuXMqvJ2iduiHYryUsMK0d89pQ,1807
 xp/models/term/module_state.py,sha256=i7u8y_B5ScMRULQb_kMSD_wwKzbrLHlkECsTgNS46PQ,939
 xp/models/term/protocol_keys_config.py,sha256=tSlkxEwgQuVRYLTaUNd569osQsNCdb9ED4InNgX9rKo,1223
@@ -143,26 +140,10 @@ xp/services/conbus/conbus_raw_service.py,sha256=OQuV521VOQraf2PGF2B9868vh7sDgmfc
 xp/services/conbus/conbus_receive_service.py,sha256=TFf3W65brGsy6QZICpIs0Xy9bgqyL1vgQuhS_eHuIZs,5416
 xp/services/conbus/conbus_scan_service.py,sha256=_Ka0OUDNYhDgZIR49Q0P5GTxJq6RcAAX2DVqEDdtb5U,6888
 xp/services/conbus/write_config_service.py,sha256=BCfmLNPRDpwSwRMRYJvx2FXA8IZsdgmyeTXIYvmb4ys,9004
-xp/services/homekit/__init__.py,sha256=xAMKmln_AmEFdOOJGKWYi96seRlKDQpKx3-hm7XbdIo,36
-xp/services/homekit/homekit_cache_service.py,sha256=z1TB6icEqd1paoilVTewuFL0lXVCQbvrOJkJvvQECJY,11060
-xp/services/homekit/homekit_conbus_service.py,sha256=XPKv7Mit1rn7XLaQZcKmlMMUlyj-o0J2z8XBH3NaEIM,3390
-xp/services/homekit/homekit_config_validator.py,sha256=jf09jHIFbZg7YpDbGsGHT1p4a1vpUED2xR6iZN19cfM,10875
-xp/services/homekit/homekit_conson_validator.py,sha256=tmUxBzytX9FbUWTR1XdbAi_qb_whAdGPSaml98Czszg,3858
-xp/services/homekit/homekit_dimminglight.py,sha256=EzfGhy3zZkbFPfN72Dh_eSb5mJQOpxGi6ZwnyEOSHxU,5819
-xp/services/homekit/homekit_dimminglight_service.py,sha256=0Ve6cXtY7v7JCv7gibOBWjPfCU7KK4Lk6GjIu9_GhyE,5282
-xp/services/homekit/homekit_hap_service.py,sha256=yrlw9I4G3JsaeBqsVLyURlAk9gd6CAKIUSoheOYIioI,12596
-xp/services/homekit/homekit_lightbulb.py,sha256=rN9rNxHZDFl5lom8bvhi3jC3rGgrELhrRWTMg4l6ziQ,3692
-xp/services/homekit/homekit_lightbulb_service.py,sha256=fKK5wvV73On1p0zBH8k30iirHYW0mBRiHEaTEf4Jcnc,2785
-xp/services/homekit/homekit_module_service.py,sha256=3zUwm-Dp-8V0nCU-ssVMZmi_kht_Y_ulVgqRSHoLooY,1548
-xp/services/homekit/homekit_outlet.py,sha256=gh9YFYt4DgOkba4nWKRM40EH878254DErSOK3eneZYk,5258
-xp/services/homekit/homekit_outlet_service.py,sha256=VVeuUas5HROaMwfbc_FO-gVp_mXR8YYBQJeTWh2SSJQ,3840
-xp/services/homekit/homekit_service.py,sha256=mmO9dHd1PAkOLkM7wwbpC0iBnULN4XZxeHUnCMKOL7g,14127
 xp/services/log_file_service.py,sha256=y775InPlpG8Z_uitHt7yrgRG-3vlIuCfdJjiZzPc_MA,10578
 xp/services/module_type_service.py,sha256=ga4WO7dmJEaDKrXPmrJ-72n4UaEZonead23lHBkFN1E,7505
-xp/services/protocol/__init__.py,sha256=4zC__3e-Hma_IrmFCvsL44wJRd5LLHLSI_tahqdaTF8,741
-xp/services/protocol/conbus_event_protocol.py,sha256=7AMn_5jr8lWPbf3C2s0P-r-w4PgdsmsBVcK0UMmrdaw,19572
-xp/services/protocol/protocol_factory.py,sha256=gWXQtOdgtOyn0Tu_aydYFd_cTdU-jtsKVuMl-ru133s,2512
-xp/services/protocol/telegram_protocol.py,sha256=hyEMJUUhgQe_2R8CDio8xT5tpLtgoXS8W0aDd7wN48E,9538
+xp/services/protocol/__init__.py,sha256=o5adyCwOrqSf4ADUStor44TFUerYx6QmxGpq4Q0dhSo,631
+xp/services/protocol/conbus_event_protocol.py,sha256=5BmvhZCqDuXekhbTuuOvz1dke6fqsZIJsaWYF8s-mGU,19653
 xp/services/reverse_proxy_service.py,sha256=Xuxo2ajjmTXLg5yd6gRGKHpFPX4-6kpOUg10doZB8vw,15161
 xp/services/server/__init__.py,sha256=QEcCj-jK0goAukJCe15TKYFQfSAzWsduPT_wW0HxZU8,48
 xp/services/server/base_server_service.py,sha256=Yu4sTOtp3a1yc3O3J7J-51i9FdFqG-VWBv9aNf0j-9k,12845
@@ -185,12 +166,13 @@ xp/services/telegram/telegram_output_service.py,sha256=9deqtcPndRqJ-3XQUWlJhXaVc
 xp/services/telegram/telegram_service.py,sha256=jPu0Xrh3IpvqPLyuQT5Vf8HHw00vBingONHdxf_9TkI,13315
 xp/services/telegram/telegram_version_service.py,sha256=oXnZ_K7OQ7xD-GEj3zDYp52KlkqVuHpO4bf7gMlC_w4,10574
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
-xp/services/term/homekit_service.py,sha256=3g6Twhg6wcRT2E01Daa2J41lzdyX6gVjfz5wgutOvgQ,19307
+xp/services/term/homekit_accessory_driver.py,sha256=jHhHHOOvzdDjuYys1cUZHcH2uwZy_Y6o5aGAQqXGAVg,5935
+xp/services/term/homekit_service.py,sha256=h1wAguhUG9f8cdolFKsp-V-iZV5x52Wm0L7syKoK6Qs,25183
 xp/services/term/protocol_monitor_service.py,sha256=5YBI0Nu7B7gMhaTbUhL6k9LSRfnCIj6CwrCYHiMHavA,10067
 xp/services/term/state_monitor_service.py,sha256=EK9tNBfamAIV0z0EMsXDYWC-rXv6l6k_bHsC8xyEFSo,17116
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
-xp/term/homekit.py,sha256=IYJEVhQUFUcmC_TubYxcvlU5IKF-2sL_giBNKO35fjU,3642
-xp/term/homekit.tcss,sha256=qeR_OV8D_9Mxb-aPNz-MH0ZJOsdCk-fJ-zv6CQV5ihw,1382
+xp/term/homekit.py,sha256=A9l9zK6KSBx_Cc8I_AZhAWdQjZYnTGLxkln6CzFn3-Q,8935
+xp/term/homekit.tcss,sha256=A1f5-V3mvxAMZK_ERq8lLjNcOWH0U5tblIBbeL3OYYM,1382
 xp/term/protocol.py,sha256=6MX3mduLei-AgLGaIe8lfOSu4Hi0y3KGePFFM2ssstc,3475
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
 xp/term/state.py,sha256=FBpYV_bWYJh9o17qcMx6sHgUARQS-uNOtUt6G7Vs1n8,3274
@@ -199,14 +181,14 @@ xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,2
 xp/term/widgets/help_menu.py,sha256=KLkdIXfhARLFNEs2lv1u0sYBz9LzOCcDLxbMGzc7e5Y,1812
 xp/term/widgets/modules_list.py,sha256=qAG-n0nK0YdNE9v4C3-sHgxLvF1i1FR7v_GArdaoUQw,7831
 xp/term/widgets/protocol_log.py,sha256=E68QmSMpOFrvrPTo_gOQVfyiDqY5c_y8fkNKnQw6Vwo,2650
-xp/term/widgets/room_list.py,sha256=3q3otusnQn4qFRbTY0-QbpMP3vPmywM0izYRA_KjXn0,7871
+xp/term/widgets/room_list.py,sha256=ecdpK-QOP1Zmi0ntYxpWhik9EQc8wBNNjPirMWhJ7gs,9807
 xp/term/widgets/status_footer.py,sha256=biV3EzfVSgm1T7Ofi88LXsTFCkD5mI_6Cpe-RpuOSxA,3429
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
 xp/utils/checksum.py,sha256=Px1S3dFGA-_plavBxrq3IqmprNlgtNDunE3whg6Otwg,1722
-xp/utils/dependencies.py,sha256=XHOAq5nIbXD8oq4FBp3wWvinDa4Ti7cUktJtUB0z51A,25339
+xp/utils/dependencies.py,sha256=DBkzKKsRAw_dzLRlpQxaKKxtnytQA9G_a6YWglQDVlE,20664
 xp/utils/event_helper.py,sha256=zD0K3TPfGEThU9vUNlDtglTai3Cmm30727iwjDZy6Dk,1007
 xp/utils/logging.py,sha256=wJ1d-yg97NiZUrt2F8iDMcmnHVwC-PErcI-7dpyiRDc,3777
 xp/utils/serialization.py,sha256=TS1OwpTOemSvXsCGw3js4JkYYFEqkzrPe8V9QYQefdw,4684
 xp/utils/state_machine.py,sha256=W9AY4ntRZnFeHAa5d43hm37j53uJPlqkRvWTPiBhJ_0,2464
 xp/utils/time_utils.py,sha256=K17godWpL18VEypbTlvNOEDG6R3huYnf29yjkcnwRpU,3796
-conson_xp-1.51.1.dist-info/RECORD,,
+conson_xp-2.0.0.dist-info/RECORD,,

xp/__init__.py

@@ -4,7 +4,7 @@ XP CLI tool for remote console bus operations.
 conson-xp package.
 """
 
-__version__ = "1.51.1"
+__version__ = "2.0.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/cli/commands/__init__.py

@@ -66,8 +66,6 @@ from xp.cli.commands.conbus.conbus_raw_commands import send_raw_telegrams
 from xp.cli.commands.conbus.conbus_receive_commands import receive_telegrams
 from xp.cli.commands.conbus.conbus_scan_commands import scan_module
 from xp.cli.commands.file_commands import file
-from xp.cli.commands.homekit.homekit import homekit
-from xp.cli.commands.homekit.homekit_start_commands import homekit_start
 from xp.cli.commands.module_commands import module
 from xp.cli.commands.reverse_proxy_commands import reverse_proxy
 from xp.cli.commands.server.server_commands import server
@@ -111,8 +109,6 @@ __all__ = [
     "linknumber",
     "blink",
     "checksum",
-    "homekit",
-    "homekit_start",
     "term",
     # Individual command functions
     "protocol_monitor",

xp/cli/commands/term/term_commands.py

@@ -57,7 +57,7 @@ def homekit_monitor(ctx: Context) -> None:
     Start TUI for HomeKit accessory monitoring.
 
     Displays HomeKit rooms and accessories with real-time state updates
-    in an interactive terminal interface. Press action keys (a-z) to
+    in an interactive terminal interface. Press action keys (a-z0-9) to
     toggle accessories.
 
     Args:

xp/cli/main.py

@@ -3,8 +3,6 @@
 import click
 from click_help_colors import HelpColorsGroup
 
-from xp.cli.commands import homekit
-
 # Import all conbus command modules to register their commands
 from xp.cli.commands.conbus import conbus_discover_commands  # noqa: F401
 from xp.cli.commands.conbus import conbus_export_commands  # noqa: F401
@@ -47,7 +45,6 @@ def cli(ctx: click.Context) -> None:
 
 # Register all command groups
 cli.add_command(conbus)
-cli.add_command(homekit)
 cli.add_command(telegram)
 cli.add_command(module)
 cli.add_command(file)

xp/models/homekit/homekit_config.py

@@ -16,10 +16,14 @@ class NetworkConfig(BaseModel):
     Attributes:
         ip: IP address for the network connection.
         port: Port number for the network connection.
+        pincode: HomeKit pairing code (format: XXX-XX-XXX).
+        accessory_state_file: Path to file for persisting accessory state.
     """
 
     ip: Union[IPvAnyAddress, IPv4Address, IPv6Address, str] = "127.0.0.1"
     port: int = 51826
+    pincode: str = "031-45-154"
+    accessory_state_file: str = "./accessory.state"
 
 
 class RoomConfig(BaseModel):

xp/models/protocol/conbus_protocol.py

@@ -2,10 +2,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING
 
-from bubus import BaseEvent
-from pydantic import Field
+from pydantic import BaseModel, Field
 
 from xp.models.config.conson_module_config import ConsonModuleConfig
 from xp.models.homekit.homekit_config import HomekitAccessoryConfig
@@ -13,23 +12,25 @@ from xp.models.telegram.datapoint_type import DataPointType
 
 if TYPE_CHECKING:
     from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-    from xp.services.protocol.telegram_protocol import TelegramProtocol
 
 
-class ConnectionMadeEvent(BaseEvent):
+class ConnectionMadeEvent(BaseModel):
     """
     Event dispatched when TCP connection is established.
 
     Attributes:
-        protocol: Reference to the TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: Reference to the ConbusEventProtocol instance.
     """
 
-    protocol: TelegramProtocol = Field(
-        description="Reference to the TelegramProtocol instance"
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(
+        description="Reference to the ConbusEventProtocol instance"
     )
 
 
-class ConnectionFailedEvent(BaseEvent):
+class ConnectionFailedEvent(BaseModel):
     """
     Event dispatched when TCP connection fails.
 
@@ -40,7 +41,7 @@ class ConnectionFailedEvent(BaseEvent):
     reason: str = Field(description="Failure reason")
 
 
-class SendWriteConfigEvent(BaseEvent):
+class SendWriteConfigEvent(BaseModel):
     """
     Event for sending write config commands.
 
@@ -57,7 +58,7 @@ class SendWriteConfigEvent(BaseEvent):
     value: int = Field(description="Set brightness value")
 
 
-class SendActionEvent(BaseEvent):
+class SendActionEvent(BaseModel):
     """
     Event for sending action commands.
 
@@ -76,7 +77,7 @@ class SendActionEvent(BaseEvent):
     off_action: str = Field(description="off action")
 
 
-class DatapointEvent(BaseEvent):
+class DatapointEvent(BaseModel):
     """
     Base event for datapoint operations.
 
@@ -131,7 +132,7 @@ class ReadDatapointFromProtocolEvent(DatapointEvent):
     pass
 
 
-class ModuleEvent(BaseEvent):
+class ModuleEvent(BaseModel):
     """
     Event dispatched when light bulb set is on.
 
@@ -163,7 +164,7 @@ class LightBulbSetOnEvent(ModuleEvent):
     value: bool = Field(description="On or Off the light bulb set")
 
 
-class LightBulbGetOnEvent(ModuleEvent, BaseEvent[bool]):
+class LightBulbGetOnEvent(ModuleEvent):
     """Event dispatched when getting light bulb on state."""
 
     pass
@@ -192,7 +193,7 @@ class OutletGetInUseEvent(ModuleEvent):
     pass
 
 
-class OutletSetInUseEvent(ModuleEvent, BaseEvent[bool]):
+class OutletSetInUseEvent(ModuleEvent):
     """
     Event dispatched when outlet set is on.
 
@@ -239,7 +240,7 @@ class DimmingLightGetBrightnessEvent(ModuleEvent):
     pass
 
 
-class ConnectionLostEvent(BaseEvent):
+class ConnectionLostEvent(BaseModel):
     """
     Event dispatched when TCP connection is lost.
 
@@ -250,12 +251,13 @@ class ConnectionLostEvent(BaseEvent):
     reason: str = Field(description="Disconnection reason")
 
 
-class TelegramEvent(BaseEvent):
+class TelegramEvent(BaseModel):
     """
     Event for telegram operations.
 
     Attributes:
-        protocol: TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: ConbusEventProtocol instance.
         frame: Frame <S0123450001F02D12FK>.
         telegram: Telegram S0123450001F02D12FK.
         payload: Payload S0123450001F02D12.
@@ -265,9 +267,9 @@ class TelegramEvent(BaseEvent):
         checksum_valid: Checksum valid true or false.
     """
 
-    protocol: Union[TelegramProtocol, ConbusEventProtocol] = Field(
-        description="TelegramProtocol instance"
-    )
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(description="ConbusEventProtocol instance")
     frame: str = Field(description="Frame <S0123450001F02D12FK>")
     telegram: str = Field(description="Telegram: S0123450001F02D12FK")
     payload: str = Field(description="Payload: S0123450001F02D12")
@@ -279,7 +281,7 @@ class TelegramEvent(BaseEvent):
     )
 
 
-class ModuleStateChangedEvent(BaseEvent):
+class ModuleStateChangedEvent(BaseModel):
     """
     Event dispatched when a module's state changes (from event telegram).
 
@@ -314,16 +316,19 @@ class TelegramReceivedEvent(TelegramEvent):
     pass
 
 
-class InvalidTelegramReceivedEvent(BaseEvent):
+class InvalidTelegramReceivedEvent(BaseModel):
     """
     Event dispatched when an invalid telegram frame is received.
 
     Attributes:
-        protocol: TelegramProtocol instance.
+        model_config: Pydantic model configuration.
+        protocol: ConbusEventProtocol instance.
         frame: Frame <S0123450001F02D12FK>.
         error: Error with the received telegram.
     """
 
-    protocol: TelegramProtocol = Field(description="TelegramProtocol instance")
+    model_config = {"arbitrary_types_allowed": True}
+
+    protocol: ConbusEventProtocol = Field(description="ConbusEventProtocol instance")
     frame: str = Field(description="Frame <S0123450001F02D12FK>")
     error: str = Field(description="Error with the received telegram")

xp/models/term/accessory_state.py

@@ -13,7 +13,7 @@ class AccessoryState:
     Attributes:
         room_name: Room containing the accessory (e.g., "Salon").
         accessory_name: Accessory display name (e.g., "Variateur salon").
-        action: Action key (a-z) for toggle control.
+        action: Action key (a-z0-9) for toggle control.
         output_state: Output state ("ON", "OFF", "?").
         dimming_state: Dimming percentage for dimmable modules, "-" if OFF, empty otherwise.
         module_name: Module identifier (e.g., "A12").

xp/services/protocol/__init__.py

@@ -8,11 +8,10 @@ from xp.models.protocol.conbus_protocol import (
     TelegramReceivedEvent,
 )
 from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-from xp.services.protocol.telegram_protocol import TelegramProtocol
 
-__all__ = ["TelegramProtocol", "ConbusEventProtocol"]
+__all__ = ["ConbusEventProtocol"]
 
-# Rebuild models after TelegramProtocol and ConbusEventProtocol are imported to resolve forward references
+# Rebuild models after ConbusEventProtocol is imported to resolve forward references
 ConnectionMadeEvent.model_rebuild()
 InvalidTelegramReceivedEvent.model_rebuild()
 ModuleDiscoveredEvent.model_rebuild()

xp/services/protocol/conbus_event_protocol.py

@@ -169,7 +169,7 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
             payload = telegram[:-2]  # S0123450001F02D12
             checksum = telegram[-2:].decode()  # FK
             serial_number = (
-                telegram[1:11] if telegram_type in ("S", "R") else b""
+                telegram[1:11].decode("latin-1") if telegram_type in ("S", "R") else ""
             )  # 0123450001
             calculated_checksum = calculate_checksum(payload.decode(encoding="latin-1"))
 
@@ -391,12 +391,12 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.logger.debug(f"buildProtocol: {addr}")
         return self
 
-    def clientConnectionFailed(self, connector: IConnector, reason: Failure) -> None:
+    def clientConnectionFailed(self, _connector: IConnector, reason: Failure) -> None:
         """
         Handle client connection failure.
 
         Args:
-            connector: Connection connector instance.
+            _connector: Connection connector instance (unused, required by Twisted).
             reason: Failure reason details.
         """
         self.logger.debug(f"clientConnectionFailed: {reason}")
@@ -404,12 +404,12 @@ class ConbusEventProtocol(protocol.Protocol, protocol.ClientFactory):
         self.connection_failed(reason)
         self._cancel_timeout()
 
-    def clientConnectionLost(self, connector: IConnector, reason: Failure) -> None:
+    def clientConnectionLost(self, _connector: IConnector, reason: Failure) -> None:
         """
         Handle client connection lost event.
 
         Args:
-            connector: Connection connector instance.
+            _connector: Connection connector instance (unused, required by Twisted).
             reason: Reason for connection loss.
         """
         self.logger.debug(f"clientConnectionLost: {reason}")

xp/services/term/homekit_accessory_driver.py

@@ -0,0 +1,171 @@
+"""HomeKit Accessory Driver for pyhap integration."""
+
+import asyncio
+import logging
+from typing import Callable, Dict, Optional
+
+from pyhap.accessory import Accessory, Bridge
+from pyhap.accessory_driver import AccessoryDriver
+from pyhap.const import CATEGORY_LIGHTBULB, CATEGORY_OUTLET
+
+from xp.models.homekit.homekit_config import HomekitConfig
+
+
+class XPAccessory(Accessory):
+    """Single accessory wrapping a Conbus output."""
+
+    def __init__(
+        self,
+        driver: "HomekitAccessoryDriver",
+        name: str,
+        display_name: str,
+        service_type: str,
+        aid: int,
+    ) -> None:
+        """
+        Initialize the XP accessory.
+
+        Args:
+            driver: HomekitAccessoryDriver instance.
+            name: Accessory name (unique identifier for internal tracking).
+            display_name: Display name shown in HomeKit (from config description).
+            service_type: Service type ('light', 'outlet', 'dimminglight').
+            aid: Accessory ID for HomeKit.
+        """
+        super().__init__(driver._driver, display_name, aid=aid)
+        self._hk_driver = driver
+        self._accessory_id = name
+        self.logger = logging.getLogger(__name__)
+
+        if service_type == "dimminglight":
+            self.category = CATEGORY_LIGHTBULB
+            serv = self.add_preload_service("Lightbulb", chars=["On", "Brightness"])
+            # Note: Brightness setter_callback deferred to future update
+        elif service_type == "outlet":
+            self.category = CATEGORY_OUTLET
+            serv = self.add_preload_service("Outlet")
+        else:
+            self.category = CATEGORY_LIGHTBULB
+            serv = self.add_preload_service("Lightbulb")
+
+        self._char_on = serv.configure_char("On", setter_callback=self._set_on)
+
+    def _set_on(self, value: bool) -> None:
+        """
+        Handle HomeKit set on/off request.
+
+        Args:
+            value: True for on, False for off.
+        """
+        if self._hk_driver._on_set:
+            self._hk_driver._on_set(self._accessory_id, value)
+
+    def update_state(self, is_on: bool) -> None:
+        """
+        Update accessory state from Conbus event.
+
+        Args:
+            is_on: True if accessory is on, False otherwise.
+        """
+        self._char_on.set_value(is_on)
+
+
+class HomekitAccessoryDriver:
+    """Wrapper around pyhap AccessoryDriver."""
+
+    def __init__(self, homekit_config: HomekitConfig) -> None:
+        """
+        Initialize the HomeKit accessory driver.
+
+        Args:
+            homekit_config: HomekitConfig with network and accessory settings.
+        """
+        self.logger = logging.getLogger(__name__)
+        self._homekit_config = homekit_config
+        self._driver: Optional[AccessoryDriver] = None
+        self._accessories: Dict[str, XPAccessory] = {}
+        self._on_set: Optional[Callable[[str, bool], None]] = None
+
+    def set_callback(self, on_set: Callable[[str, bool], None]) -> None:
+        """
+        Set callback for HomeKit set events.
+
+        Args:
+            on_set: Callback(accessory_name, is_on) called when HomeKit app toggles.
+        """
+        self._on_set = on_set
+
+    def _setup_bridge(self, config: HomekitConfig) -> None:
+        """
+        Set up HomeKit bridge with accessories.
+
+        Args:
+            config: HomekitConfig with accessory definitions.
+        """
+        assert self._driver is not None
+        bridge = Bridge(self._driver, config.bridge.name)
+        aid = 2  # Bridge is 1
+
+        for acc_config in config.accessories:
+            accessory = XPAccessory(
+                driver=self,
+                name=acc_config.name,
+                display_name=acc_config.description,
+                service_type=acc_config.service,
+                aid=aid,
+            )
+            bridge.add_accessory(accessory)
+            self._accessories[acc_config.name] = accessory
+            aid += 1
+
+        self._driver.add_accessory(bridge)
+
+    async def start(self) -> None:
+        """Start the AccessoryDriver (non-blocking)."""
+        try:
+            # Enable pyhap debug logging
+            pyhap_logger = logging.getLogger("pyhap")
+            pyhap_logger.setLevel(logging.DEBUG)
+
+            # Create driver with the running event loop
+            loop = asyncio.get_running_loop()
+            config = self._homekit_config
+            pincode = config.homekit.pincode.encode()
+            self.logger.info(
+                f"Starting HAP driver on {config.homekit.ip}:{config.homekit.port} with pincode {config.homekit.pincode}"
+            )
+            self._driver = AccessoryDriver(
+                loop=loop,
+                address=str(config.homekit.ip),
+                port=config.homekit.port,
+                pincode=pincode,
+                persist_file=config.homekit.accessory_state_file,
+            )
+            self._setup_bridge(config)
+            await self._driver.async_start()
+            self.logger.info("AccessoryDriver started successfully")
+        except Exception as e:
+            self.logger.error(f"Error starting AccessoryDriver: {e}", exc_info=True)
+
+    async def stop(self) -> None:
+        """Stop the AccessoryDriver."""
+        if not self._driver:
+            return
+        try:
+            await self._driver.async_stop()
+            self.logger.info("AccessoryDriver stopped successfully")
+        except Exception as e:
+            self.logger.error(f"Error stopping AccessoryDriver: {e}", exc_info=True)
+
+    def update_state(self, accessory_name: str, is_on: bool) -> None:
+        """
+        Update accessory state from Conbus event.
+
+        Args:
+            accessory_name: Accessory name to update.
+            is_on: True if accessory is on, False otherwise.
+        """
+        if acc := self._accessories.get(accessory_name):
+            acc.update_state(is_on)
+        else:
+            self.logger.warning(f"Unknown accessory name: {accessory_name}")