uns-kit 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

uns_kit/__init__.py

@@ -2,6 +2,10 @@ from .topic_builder import TopicBuilder
 from .packet import UnsPacket, DataPayload, TablePayload
 from .client import UnsMqttClient
 from .config import UnsConfig
+from .status_monitor import StatusMonitor
+from .uns_mqtt_proxy import UnsMqttProxy, MessageMode
+from .proxy_process import UnsProxyProcess
+from .version import __version__
 
 __all__ = [
     "TopicBuilder",
@@ -10,4 +14,9 @@ __all__ = [
     "TablePayload",
     "UnsMqttClient",
     "UnsConfig",
+    "StatusMonitor",
+    "UnsMqttProxy",
+    "MessageMode",
+    "UnsProxyProcess",
+    "__version__",
 ]

uns_kit/client.py

@@ -3,15 +3,22 @@ from __future__ import annotations
 import asyncio
 import contextlib
 from contextlib import asynccontextmanager
+from datetime import datetime, timezone
+import uuid
+import socket
 from typing import AsyncIterator, List, Optional
 
-from asyncio_mqtt import Client, MqttError, Message
+from asyncio_mqtt import Client, MqttError, Message, Will, Topic
+from paho.mqtt.client import MQTTv5, MQTTv311
 
 from .packet import UnsPacket
 from .topic_builder import TopicBuilder
 
 
 class UnsMqttClient:
+    _exception_handler_installed = False
+    _exception_handler_loop_id: int | None = None
+
     def __init__(
         self,
         host: str,
@@ -26,45 +33,135 @@ class UnsMqttClient:
         clean_session: bool = True,
         reconnect_interval: float = 2.0,
         max_reconnect_interval: float = 30.0,
+        instance_name: Optional[str] = None,
+        publisher_active: Optional[bool] = None,
+        subscriber_active: Optional[bool] = None,
+        stats_interval: float = 60.0,
+        enable_status: bool = True,
     ):
         self.host = host
         self.port = port
-        self.username = username
-        self.password = password
-        self.client_id = client_id
+        self.username = username if username not in ("", None) else None
+        self.password = password if password not in ("", None) else None
+        if client_id:
+            self.client_id = client_id
+        else:
+            base = topic_builder.process_name
+            if instance_name:
+                base = f"{base}-{instance_name}"
+            self.client_id = f"{base}-{uuid.uuid4().hex[:8]}"
         self.tls = tls
         self.keepalive = keepalive
         self.clean_session = clean_session
         self.reconnect_interval = reconnect_interval
         self.max_reconnect_interval = max_reconnect_interval
         self.topic_builder = topic_builder
+        self.instance_name = instance_name
+        self.publisher_active = publisher_active
+        self.subscriber_active = subscriber_active
+        self.stats_interval = stats_interval
+        self.enable_status = enable_status
         self._client: Optional[Client] = None
         self._status_task: Optional[asyncio.Task] = None
+        self._stats_task: Optional[asyncio.Task] = None
         self._connected = asyncio.Event()
         self._closing = False
         self._connect_lock = asyncio.Lock()
+        self._published_message_count = 0
+        self._published_message_bytes = 0
+        self._subscribed_message_count = 0
+        self._subscribed_message_bytes = 0
+
+        if self.instance_name:
+            self.status_topic = self.topic_builder.instance_status_topic(self.instance_name)
+        else:
+            self.status_topic = self.topic_builder.process_status_topic
+
+    def _install_exception_handler(self) -> None:
+        loop = asyncio.get_running_loop()
+        loop_id = id(loop)
+        if UnsMqttClient._exception_handler_installed and UnsMqttClient._exception_handler_loop_id == loop_id:
+            return
+        original = loop.get_exception_handler()
+
+        def handler(loop: asyncio.AbstractEventLoop, context: dict) -> None:
+            exc = context.get("exception")
+            message = context.get("message", "")
+            if isinstance(exc, MqttError) and "Unexpected disconnect" in str(exc):
+                # Swallow noisy disconnect futures; reconnect logic handles it.
+                return
+            if isinstance(exc, MqttError) and "Future exception was never retrieved" in message:
+                return
+            if original:
+                original(loop, context)
+            else:
+                loop.default_exception_handler(context)
+
+        loop.set_exception_handler(handler)
+        UnsMqttClient._exception_handler_installed = True
+        UnsMqttClient._exception_handler_loop_id = loop_id
 
     async def _connect_once(self) -> None:
-        will = {
-            "topic": f"{self.topic_builder.process_status_topic}alive",
-            "payload": b"",
-            "qos": 0,
-            "retain": True,
-        }
-        client = Client(
-            hostname=self.host,
-            port=self.port,
-            username=self.username,
-            password=self.password,
-            client_id=self.client_id,
-            keepalive=self.keepalive,
-            clean_session=self.clean_session,
-            tls=self.tls,
-            will=will,
+        await self._probe_socket()
+        will = Will(
+            topic=f"{self.status_topic}alive",
+            payload=b"",
+            qos=0,
+            retain=True,
         )
-        await client.connect()
-        self._client = client
-        self._connected.set()
+        base_kwargs = {
+            "hostname": self.host,
+            "port": self.port,
+            "username": self.username,
+            "password": self.password,
+            "client_id": self.client_id,
+            "keepalive": self.keepalive,
+            "will": will,
+        }
+        if self.tls:
+            try:
+                import ssl
+                base_kwargs["tls_context"] = ssl.create_default_context()
+            except Exception:
+                pass
+
+        last_error: Exception | None = None
+        # Prefer MQTT 3.1.1 for widest broker compatibility (some brokers
+        # allow connect with MQTTv5 but then drop subscriptions unexpectedly).
+        for protocol in (MQTTv311, MQTTv5):
+            kwargs = dict(base_kwargs)
+            kwargs["protocol"] = protocol
+            if protocol == MQTTv5:
+                kwargs["clean_start"] = self.clean_session
+                kwargs.pop("clean_session", None)
+            else:
+                kwargs["clean_session"] = self.clean_session
+                kwargs.pop("clean_start", None)
+            try:
+                try:
+                    client = Client(**kwargs)
+                except TypeError:
+                    kwargs.pop("tls_context", None)
+                    client = Client(**kwargs)
+                await client.connect()
+                self._client = client
+                self._connected.set()
+                return
+            except Exception as exc:
+                last_error = exc
+                continue
+        if last_error:
+            raise last_error
+
+    async def _probe_socket(self) -> None:
+        try:
+            loop = asyncio.get_event_loop()
+            await loop.run_in_executor(
+                None,
+                lambda: socket.create_connection((self.host, self.port or 1883), timeout=2),
+            )
+        except Exception as exc:
+            raise MqttError(f"Cannot reach MQTT broker at {self.host}:{self.port or 1883}") from exc
 
     async def _ensure_connected(self) -> None:
         if self._connected.is_set():
@@ -72,17 +169,31 @@ class UnsMqttClient:
         async with self._connect_lock:
             if self._connected.is_set():
                 return
+            self._install_exception_handler()
             backoff = self.reconnect_interval
             while not self._closing:
                 try:
                     await self._connect_once()
-                    if not self._status_task or self._status_task.done():
-                        self._status_task = asyncio.create_task(self._publish_status_loop())
+                    if self.enable_status:
+                        if not self._status_task or self._status_task.done():
+                            self._status_task = asyncio.create_task(self._publish_status_loop())
+                            self._status_task.add_done_callback(self._handle_task_error)
+                        if not self._stats_task or self._stats_task.done():
+                            self._stats_task = asyncio.create_task(self._publish_stats_loop())
+                            self._stats_task.add_done_callback(self._handle_task_error)
                     return
                 except MqttError:
                     await asyncio.sleep(backoff)
                     backoff = min(backoff * 2, self.max_reconnect_interval)
 
+    def _handle_task_error(self, task: asyncio.Task) -> None:
+        try:
+            task.exception()
+        except asyncio.CancelledError:
+            return
+        except Exception:
+            self._connected.clear()
+
     async def connect(self) -> None:
         await self._ensure_connected()
 
@@ -92,6 +203,10 @@ class UnsMqttClient:
             self._status_task.cancel()
             with contextlib.suppress(asyncio.CancelledError):
                 await self._status_task
+        if self._stats_task:
+            self._stats_task.cancel()
+            with contextlib.suppress(asyncio.CancelledError):
+                await self._stats_task
         if self._client:
             with contextlib.suppress(Exception):
                 await self._client.disconnect()
@@ -102,6 +217,9 @@ class UnsMqttClient:
         for attempt in range(2):
             try:
                 assert self._client
+                payload_bytes = payload.encode() if isinstance(payload, str) else payload
+                self._published_message_count += 1
+                self._published_message_bytes += len(payload_bytes)
                 await self._client.publish(topic, payload, qos=qos, retain=retain)
                 return
             except MqttError:
@@ -119,14 +237,30 @@ class UnsMqttClient:
     async def messages(self, topics: str | List[str]) -> AsyncIterator[AsyncIterator[Message]]:
         await self._ensure_connected()
         assert self._client
-        manager = self._client.filtered_messages(topics) if isinstance(topics, str) else self._client.unfiltered_messages()
-        async with manager as messages:
-            if isinstance(topics, str):
-                await self._client.subscribe(topics)
-            else:
-                for t in topics:
-                    await self._client.subscribe(t)
-            yield messages
+        async with self._client.messages() as messages:
+            try:
+                if isinstance(topics, str):
+                    await self._client.subscribe(topics)
+                else:
+                    for t in topics:
+                        await self._client.subscribe(t)
+            except MqttError:
+                self._connected.clear()
+                raise
+
+            async def wrapped() -> AsyncIterator[Message]:
+                try:
+                    async for msg in messages:
+                        self._subscribed_message_count += 1
+                        self._subscribed_message_bytes += len(msg.payload or b"")
+                        yield msg
+                except MqttError:
+                    self._connected.clear()
+                    return
+                except asyncio.CancelledError:
+                    return
+
+            yield wrapped()
 
     async def resilient_messages(self, topics: str | List[str]) -> AsyncIterator[Message]:
         """
@@ -142,17 +276,74 @@ class UnsMqttClient:
                 self._connected.clear()
                 await asyncio.sleep(self.reconnect_interval)
                 continue
+            except Exception:
+                self._connected.clear()
+                await asyncio.sleep(self.reconnect_interval)
+                continue
 
     async def _publish_status_loop(self) -> None:
-        uptime_topic = f"{self.topic_builder.process_status_topic}uptime"
-        alive_topic = f"{self.topic_builder.process_status_topic}alive"
+        uptime_topic = f"{self.status_topic}uptime"
+        alive_topic = f"{self.status_topic}alive"
+        publisher_topic = f"{self.status_topic}t-publisher-active"
+        subscriber_topic = f"{self.status_topic}t-subscriber-active"
         start = asyncio.get_event_loop().time()
         try:
             while not self._closing:
-                now = asyncio.get_event_loop().time()
-                uptime_minutes = int((now - start) / 60)
-                await self.publish_raw(alive_topic, b"", qos=0, retain=True)
-                await self.publish_raw(uptime_topic, str(uptime_minutes).encode(), qos=0, retain=True)
+                try:
+                    now = asyncio.get_event_loop().time()
+                    uptime_minutes = int((now - start) / 60)
+                    time = datetime.now(timezone.utc)
+                    alive_packet = UnsPacket.data(value=1, uom="bit", time=time)
+                    uptime_packet = UnsPacket.data(value=uptime_minutes, uom="min", time=time)
+                    await self.publish_raw(alive_topic, UnsPacket.to_json(alive_packet), qos=0, retain=False)
+                    await self.publish_raw(uptime_topic, UnsPacket.to_json(uptime_packet), qos=0, retain=False)
+                    if self.publisher_active is not None:
+                        publisher_packet = UnsPacket.data(value=1 if self.publisher_active else 0, uom="bit", time=time)
+                        await self.publish_raw(publisher_topic, UnsPacket.to_json(publisher_packet), qos=0, retain=False)
+                    if self.subscriber_active is not None:
+                        subscriber_packet = UnsPacket.data(value=1 if self.subscriber_active else 0, uom="bit", time=time)
+                        await self.publish_raw(subscriber_topic, UnsPacket.to_json(subscriber_packet), qos=0, retain=False)
+                except MqttError:
+                    self._connected.clear()
+                except Exception:
+                    self._connected.clear()
                 await asyncio.sleep(10)
         except asyncio.CancelledError:
             pass
+
+    async def _publish_stats_loop(self) -> None:
+        published_count_topic = f"{self.status_topic}published-message-count"
+        published_bytes_topic = f"{self.status_topic}published-message-bytes"
+        subscribed_count_topic = f"{self.status_topic}subscribed-message-count"
+        subscribed_bytes_topic = f"{self.status_topic}subscribed-message-bytes"
+        try:
+            while not self._closing:
+                try:
+                    time = datetime.now(timezone.utc)
+                    published_count_packet = UnsPacket.data(value=self._published_message_count, time=time)
+                    published_bytes_packet = UnsPacket.data(
+                        value=round(self._published_message_bytes / 1024),
+                        uom="kB",
+                        time=time,
+                    )
+                    subscribed_count_packet = UnsPacket.data(value=self._subscribed_message_count, time=time)
+                    subscribed_bytes_packet = UnsPacket.data(
+                        value=round(self._subscribed_message_bytes / 1024),
+                        uom="kB",
+                        time=time,
+                    )
+                    await self.publish_raw(published_count_topic, UnsPacket.to_json(published_count_packet), qos=0, retain=False)
+                    await self.publish_raw(published_bytes_topic, UnsPacket.to_json(published_bytes_packet), qos=0, retain=False)
+                    await self.publish_raw(subscribed_count_topic, UnsPacket.to_json(subscribed_count_packet), qos=0, retain=False)
+                    await self.publish_raw(subscribed_bytes_topic, UnsPacket.to_json(subscribed_bytes_packet), qos=0, retain=False)
+                    self._published_message_count = 0
+                    self._published_message_bytes = 0
+                    self._subscribed_message_count = 0
+                    self._subscribed_message_bytes = 0
+                except MqttError:
+                    self._connected.clear()
+                except Exception:
+                    self._connected.clear()
+                await asyncio.sleep(self.stats_interval)
+        except asyncio.CancelledError:
+            pass

uns_kit/config.py

@@ -6,27 +6,85 @@ from pathlib import Path
 from typing import List, Optional
 
 from .topic_builder import TopicBuilder
+from .version import __version__
 
 
 @dataclass
 class UnsConfig:
-    host: str
-    port: Optional[int] = None
-    username: Optional[str] = None
-    password: Optional[str] = None
-    client_id: Optional[str] = None
-    tls: bool = False
+    # MQTT infra (matches TS nested config.infra)
+    infra_host: str
+    infra_port: Optional[int] = None
+    infra_username: Optional[str] = None
+    infra_password: Optional[str] = None
+    infra_client_id: Optional[str] = None
+    infra_tls: bool = False
     keepalive: int = 60
     clean_session: bool = True
     mqtt_sub_to_topics: Optional[List[str]] = None
     package_name: str = "uns-kit"
-    package_version: str = "0.0.1"
+    package_version: str = __version__
     process_name: str = "uns-process"
 
     @staticmethod
     def load(path: Path) -> "UnsConfig":
         data = json.loads(path.read_text())
-        return UnsConfig(**data)
+
+        if "infra" not in data or "uns" not in data:
+            raise ValueError("config.json must include 'infra' and 'uns' sections (TS-style config)")
+
+        infra = data.get("infra", {}) or {}
+        uns_section = data.get("uns", {}) or {}
+
+        proto = (infra.get("protocol") or "").lower()
+        tls = proto in ("mqtts", "ssl", "wss")
+
+        host = infra.get("host") or (infra.get("hosts") or [None])[0]
+        if not host:
+            raise ValueError("infra.host (or hosts[0]) is required")
+
+        return UnsConfig(
+            infra_host=host,
+            infra_port=infra.get("port"),
+            infra_username=_none_if_empty(infra.get("username")),
+            infra_password=_none_if_empty(infra.get("password")),
+            infra_client_id=_none_if_empty(infra.get("clientId")),
+            infra_tls=infra.get("tls") if infra.get("tls") is not None else tls,
+            mqtt_sub_to_topics=infra.get("mqttSubToTopics"),
+            keepalive=infra.get("keepalive", 60),
+            clean_session=infra.get("clean", True),
+            package_name=uns_section.get("packageName", "uns-kit"),
+            package_version=uns_section.get("packageVersion") or __version__,
+            process_name=uns_section.get("processName", "uns-process"),
+        )
 
     def topic_builder(self) -> TopicBuilder:
         return TopicBuilder(self.package_name, self.package_version, self.process_name)
+
+    # Convenience accessors for MQTT client creation
+    @property
+    def host(self) -> str:
+        return self.infra_host
+
+    @property
+    def port(self) -> Optional[int]:
+        return self.infra_port
+
+    @property
+    def username(self) -> Optional[str]:
+        return self.infra_username
+
+    @property
+    def password(self) -> Optional[str]:
+        return self.infra_password
+
+    @property
+    def client_id(self) -> Optional[str]:
+        return self.infra_client_id
+
+    @property
+    def tls(self) -> bool:
+        return self.infra_tls
+
+
+def _none_if_empty(value: Optional[str]) -> Optional[str]:
+    return None if value == "" else value

uns_kit/packet.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, asdict
+from dataclasses import dataclass
 from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 import json
 
 
 def isoformat(dt: datetime) -> str:
-    return dt.astimezone(timezone.utc).isoformat()
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+    dt = dt.astimezone(timezone.utc)
+    return dt.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
 
 
 @dataclass
@@ -16,40 +19,138 @@ class DataPayload:
     uom: Optional[str] = None
     time: Optional[str] = None
     dataGroup: Optional[str] = None
-    createdAt: Optional[str] = None
-    expiresAt: Optional[str] = None
+    intervalStart: Optional[str | int] = None
+    intervalEnd: Optional[str | int] = None
+    windowStart: Optional[str | int] = None
+    windowEnd: Optional[str | int] = None
+    eventId: Optional[str] = None
+    deleted: Optional[bool] = None
+    deletedAt: Optional[str | int] = None
+    lastSeen: Optional[str | int] = None
+    foreignEventKey: Optional[str] = None
 
 
 @dataclass
 class TablePayload:
-    table: Any
+    time: str
+    columns: Any
     dataGroup: Optional[str] = None
-    createdAt: Optional[str] = None
-    expiresAt: Optional[str] = None
+    intervalStart: Optional[str | int] = None
+    intervalEnd: Optional[str | int] = None
+    windowStart: Optional[str | int] = None
+    windowEnd: Optional[str | int] = None
+    eventId: Optional[str] = None
+    deleted: Optional[bool] = None
+    deletedAt: Optional[str | int] = None
+    lastSeen: Optional[str | int] = None
+
+
+def _value_type(value: Any) -> str:
+    if value is None:
+        return "null"
+    if isinstance(value, bool):
+        return "boolean"
+    if isinstance(value, (int, float)):
+        return "number"
+    if isinstance(value, str):
+        return "string"
+    return "object"
+
+
+def _normalize_payload_fields(payload: Dict[str, Any], extra: Dict[str, Any]) -> None:
+    mapping = {
+        "data_group": "dataGroup",
+        "interval_start": "intervalStart",
+        "interval_end": "intervalEnd",
+        "window_start": "windowStart",
+        "window_end": "windowEnd",
+        "event_id": "eventId",
+        "deleted_at": "deletedAt",
+        "last_seen": "lastSeen",
+        "foreign_event_key": "foreignEventKey",
+    }
+    for key, value in extra.items():
+        target = mapping.get(key, key)
+        payload[target] = value
+
+
+def _prune_none(payload: Dict[str, Any]) -> None:
+    for key in list(payload.keys()):
+        if payload[key] is None:
+            payload.pop(key, None)
 
 
 class UnsPacket:
-    version: int = 1
+    version: str = "1.3.0"
 
     @staticmethod
     def data(
         value: Any,
         uom: Optional[str] = None,
-        time: Optional[datetime] = None,
+        time: Optional[datetime | str] = None,
         data_group: Optional[str] = None,
+        created_at: Optional[datetime | str] = None,
+        expires_at: Optional[datetime | str] = None,
+        **extra: Any,
     ) -> Dict[str, Any]:
-        payload = DataPayload(
-          value=value,
-          uom=uom,
-          time=isoformat(time or datetime.utcnow()),
-          dataGroup=data_group,
+        resolved_time = (
+            time if isinstance(time, str) else isoformat(time or datetime.now(timezone.utc))
         )
-        return {"version": UnsPacket.version, "message": {"data": asdict(payload)}}
+        payload = {
+            "value": value,
+            "uom": uom,
+            "time": resolved_time,
+            "dataGroup": data_group,
+            "valueType": _value_type(value),
+        }
+        _normalize_payload_fields(payload, extra)
+        _prune_none(payload)
+        message: Dict[str, Any] = {"data": payload}
+        if created_at is not None:
+            message["createdAt"] = created_at if isinstance(created_at, str) else isoformat(created_at)
+        if expires_at is not None:
+            message["expiresAt"] = expires_at if isinstance(expires_at, str) else isoformat(expires_at)
+        return {"version": UnsPacket.version, "message": message}
 
     @staticmethod
-    def table(table: Any, data_group: Optional[str] = None) -> Dict[str, Any]:
-        payload = TablePayload(table=table, dataGroup=data_group)
-        return {"version": UnsPacket.version, "message": {"table": asdict(payload)}}
+    def table(
+        table: Optional[Dict[str, Any]] = None,
+        *,
+        columns: Optional[Any] = None,
+        time: Optional[datetime | str] = None,
+        data_group: Optional[str] = None,
+        created_at: Optional[datetime | str] = None,
+        expires_at: Optional[datetime | str] = None,
+        **extra: Any,
+    ) -> Dict[str, Any]:
+        if table is None:
+            if columns is None:
+                raise ValueError("table() requires either table dict or columns list")
+            resolved_time = (
+                time if isinstance(time, str) else isoformat(time or datetime.now(timezone.utc))
+            )
+            payload = {
+                "time": resolved_time,
+                "columns": columns,
+                "dataGroup": data_group,
+            }
+        else:
+            payload = dict(table)
+            if "time" not in payload:
+                payload["time"] = (
+                    time if isinstance(time, str) else isoformat(time or datetime.now(timezone.utc))
+                )
+            if data_group is not None and "dataGroup" not in payload:
+                payload["dataGroup"] = data_group
+
+        _normalize_payload_fields(payload, extra)
+        _prune_none(payload)
+        message: Dict[str, Any] = {"table": payload}
+        if created_at is not None:
+            message["createdAt"] = created_at if isinstance(created_at, str) else isoformat(created_at)
+        if expires_at is not None:
+            message["expiresAt"] = expires_at if isinstance(expires_at, str) else isoformat(expires_at)
+        return {"version": UnsPacket.version, "message": message}
 
     @staticmethod
     def to_json(packet: Dict[str, Any]) -> str:
@@ -61,3 +162,14 @@ class UnsPacket:
             return json.loads(packet_str)
         except Exception:
             return None
+
+    @staticmethod
+    def from_message(message: Dict[str, Any]) -> Dict[str, Any]:
+        msg = dict(message)
+        data = msg.get("data")
+        if isinstance(data, dict):
+            if "valueType" not in data and "value" in data:
+                data = dict(data)
+                data["valueType"] = _value_type(data.get("value"))
+                msg["data"] = data
+        return {"version": UnsPacket.version, "message": msg}