webex-message-handler 0.6.6__tar.gz → 0.6.8__tar.gz

{webex_message_handler-0.6.6 → webex_message_handler-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex-message-handler
-Version: 0.6.6
+Version: 0.6.8
 Summary: Lightweight Webex Mercury WebSocket + KMS decryption for receiving bot messages without the full Webex SDK
 Project-URL: Homepage, https://github.com/3rg0n/webex-message-handler
 Project-URL: Repository, https://github.com/3rg0n/webex-message-handler
@@ -71,6 +71,18 @@ async def on_message(msg):
 def on_deleted(data):
     print(f"Message {data.message_id} deleted by {data.person_id}")
 
+@handler.on("message:updated")
+async def on_updated(msg):
+    print(f"[EDIT] [{msg.person_email}] {msg.text}")
+
+@handler.on("attachmentAction:created")
+def on_card(action):
+    print(f"Card submitted by {action.person_email}: {action.inputs}")
+
+@handler.on("room:updated")
+def on_room_updated(room):
+    print(f"Room {room.room_id} updated by {room.actor_id}")
+
 @handler.on("connected")
 def on_connected():
     print("Connected to Webex")
@@ -214,6 +226,11 @@ WebexMessageHandler(config: WebexMessageHandlerConfig)
 |-------|---------|-------------|
 | `message:created` | `DecryptedMessage` | New message received and decrypted |
 | `message:deleted` | `DeletedMessage` | Message was deleted |
+| `message:updated` | `DecryptedMessage` | Message was edited and re-decrypted |
+| `attachmentAction:created` | `AttachmentAction` | Adaptive Card submitted |
+| `room:created` | `RoomActivity` | New room/space created |
+| `room:updated` | `RoomActivity` | Room/space updated |
+| `membership:created` | `MembershipActivity` | Member added/removed or moderator changed |
 | `connected` | — | Connected/reconnected to Mercury |
 | `disconnected` | `reason: str` | Disconnected from Mercury |
 | `reconnecting` | `attempt: int` | Attempting to reconnect |
@@ -225,16 +242,64 @@ WebexMessageHandler(config: WebexMessageHandlerConfig)
 @dataclass
 class DecryptedMessage:
     id: str
+    parent_id: str | None   # Parent activity UUID (threaded replies)
     room_id: str
     person_id: str
     person_email: str
     text: str
     created: str
     html: str | None
-    room_type: str | None   # "direct" | "group"
+    room_type: str | None        # "direct" | "group"
+    mentioned_people: list[str]  # Person UUIDs from <spark-mention> tags
+    mentioned_groups: list[str]  # e.g. ["all"] from group mentions
+    files: list[str]             # File attachment URLs
     raw: MercuryActivity | None
 ```
 
+### `AttachmentAction`
+
+Emitted when a user submits an Adaptive Card.
+
+```python
+@dataclass
+class AttachmentAction:
+    id: str               # Activity UUID
+    message_id: str       # Parent message containing the card
+    person_id: str        # Person who submitted
+    person_email: str
+    room_id: str
+    inputs: dict[str, Any]  # Card form data
+    created: str
+    raw: MercuryActivity
+```
+
+### `RoomActivity`
+
+Emitted for room lifecycle events.
+
+```python
+@dataclass
+class RoomActivity:
+    id: str             # Activity UUID
+    room_id: str
+    actor_id: str       # Person who triggered the event
+    action: str         # "create" or "update"
+    created: str
+    raw: MercuryActivity
+```
+
+### `parse_mentions(html)`
+
+Extracts mentions from decrypted HTML. Called automatically during decryption — the results populate `DecryptedMessage.mentioned_people` and `DecryptedMessage.mentioned_groups`. Exported for standalone use.
+
+```python
+from webex_message_handler import parse_mentions
+
+result = parse_mentions(msg.html)
+# result.mentioned_people: ["uuid-1", "uuid-2"]
+# result.mentioned_groups: ["all"]
+```
+
 ## Architecture
 
 ```

{webex_message_handler-0.6.6 → webex_message_handler-0.6.8}/README.md

@@ -39,6 +39,18 @@ async def on_message(msg):
 def on_deleted(data):
     print(f"Message {data.message_id} deleted by {data.person_id}")
 
+@handler.on("message:updated")
+async def on_updated(msg):
+    print(f"[EDIT] [{msg.person_email}] {msg.text}")
+
+@handler.on("attachmentAction:created")
+def on_card(action):
+    print(f"Card submitted by {action.person_email}: {action.inputs}")
+
+@handler.on("room:updated")
+def on_room_updated(room):
+    print(f"Room {room.room_id} updated by {room.actor_id}")
+
 @handler.on("connected")
 def on_connected():
     print("Connected to Webex")
@@ -182,6 +194,11 @@ WebexMessageHandler(config: WebexMessageHandlerConfig)
 |-------|---------|-------------|
 | `message:created` | `DecryptedMessage` | New message received and decrypted |
 | `message:deleted` | `DeletedMessage` | Message was deleted |
+| `message:updated` | `DecryptedMessage` | Message was edited and re-decrypted |
+| `attachmentAction:created` | `AttachmentAction` | Adaptive Card submitted |
+| `room:created` | `RoomActivity` | New room/space created |
+| `room:updated` | `RoomActivity` | Room/space updated |
+| `membership:created` | `MembershipActivity` | Member added/removed or moderator changed |
 | `connected` | — | Connected/reconnected to Mercury |
 | `disconnected` | `reason: str` | Disconnected from Mercury |
 | `reconnecting` | `attempt: int` | Attempting to reconnect |
@@ -193,16 +210,64 @@ WebexMessageHandler(config: WebexMessageHandlerConfig)
 @dataclass
 class DecryptedMessage:
     id: str
+    parent_id: str | None   # Parent activity UUID (threaded replies)
     room_id: str
     person_id: str
     person_email: str
     text: str
     created: str
     html: str | None
-    room_type: str | None   # "direct" | "group"
+    room_type: str | None        # "direct" | "group"
+    mentioned_people: list[str]  # Person UUIDs from <spark-mention> tags
+    mentioned_groups: list[str]  # e.g. ["all"] from group mentions
+    files: list[str]             # File attachment URLs
     raw: MercuryActivity | None
 ```
 
+### `AttachmentAction`
+
+Emitted when a user submits an Adaptive Card.
+
+```python
+@dataclass
+class AttachmentAction:
+    id: str               # Activity UUID
+    message_id: str       # Parent message containing the card
+    person_id: str        # Person who submitted
+    person_email: str
+    room_id: str
+    inputs: dict[str, Any]  # Card form data
+    created: str
+    raw: MercuryActivity
+```
+
+### `RoomActivity`
+
+Emitted for room lifecycle events.
+
+```python
+@dataclass
+class RoomActivity:
+    id: str             # Activity UUID
+    room_id: str
+    actor_id: str       # Person who triggered the event
+    action: str         # "create" or "update"
+    created: str
+    raw: MercuryActivity
+```
+
+### `parse_mentions(html)`
+
+Extracts mentions from decrypted HTML. Called automatically during decryption — the results populate `DecryptedMessage.mentioned_people` and `DecryptedMessage.mentioned_groups`. Exported for standalone use.
+
+```python
+from webex_message_handler import parse_mentions
+
+result = parse_mentions(msg.html)
+# result.mentioned_people: ["uuid-1", "uuid-2"]
+# result.mentioned_groups: ["all"]
+```
+
 ## Architecture
 
 ```

{webex_message_handler-0.6.6 → webex_message_handler-0.6.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "webex-message-handler"
-version = "0.6.6"
+version = "0.6.8"
 description = "Lightweight Webex Mercury WebSocket + KMS decryption for receiving bot messages without the full Webex SDK"
 readme = "README.md"
 license = "MIT"

{webex_message_handler-0.6.6 → webex_message_handler-0.6.8}/src/webex_message_handler/kms_client.py

@@ -106,8 +106,8 @@ class KmsClient:
             kms_details = await response.json()
 
             self._kms_cluster = kms_details["kmsCluster"]
-            # Validate KMS cluster URL
-            validate_webex_url(self._kms_cluster, "https")
+            # Validate KMS cluster URL — Webex returns kms:// scheme for this field
+            validate_webex_url(self._kms_cluster, "kms")
 
             rsa_public_key_raw = kms_details["rsaPublicKey"]
             if isinstance(rsa_public_key_raw, str):

{webex_message_handler-0.6.6 → webex_message_handler-0.6.8}/src/webex_message_handler/url_validation.py

@@ -2,7 +2,7 @@
 
 from urllib.parse import urlparse
 
-ALLOWED_DOMAIN_SUFFIXES = ('.webex.com', '.wbx2.com', '.ciscospark.com', '.example.com')
+ALLOWED_WEBEX_DOMAINS = ("webex.com", "wbx2.com", "ciscospark.com", "example.com")
 
 
 def validate_webex_url(raw_url: str, required_scheme: str) -> None:
@@ -19,5 +19,5 @@ def validate_webex_url(raw_url: str, required_scheme: str) -> None:
     if parsed.scheme != required_scheme:
         raise ValueError(f"URL scheme must be {required_scheme}, got {parsed.scheme}")
     host = (parsed.hostname or "").lower()
-    if not any(host.endswith(suffix) for suffix in ALLOWED_DOMAIN_SUFFIXES):
+    if not any(host == domain or host.endswith(f".{domain}") for domain in ALLOWED_WEBEX_DOMAINS):
         raise ValueError(f"URL host {host} is not a recognized Webex domain")

webex_message_handler-0.6.8/tests/test_kms_client.py

@@ -0,0 +1,103 @@
+"""Tests for KmsClient."""
+
+import json
+from unittest.mock import AsyncMock
+
+import pytest
+from jwcrypto import jwk
+from jwcrypto.common import base64url_encode
+
+from webex_message_handler.errors import KmsError
+from webex_message_handler.kms_client import KmsClient
+from webex_message_handler.types import FetchRequest
+
+
+class _FakeFetchResponse:
+    def __init__(self, *, status: int, ok: bool, payload: dict[str, object]) -> None:
+        self.status = status
+        self.ok = ok
+        self._payload = payload
+
+    async def json(self) -> dict[str, object]:
+        return self._payload
+
+    async def text(self) -> str:
+        return json.dumps(self._payload)
+
+
+def _make_kms_response_token(payload: dict[str, object]) -> str:
+    header = base64url_encode(b'{"alg":"none"}')
+    body = base64url_encode(json.dumps(payload).encode("utf-8"))
+    signature = base64url_encode(b"signature")
+    return f"{header}.{body}.{signature}"
+
+
+def _build_kms_details(*, kms_cluster: str) -> dict[str, object]:
+    rsa_public_key = jwk.JWK.generate(kty="RSA", size=2048)
+    return {
+        "kmsCluster": kms_cluster,
+        "rsaPublicKey": json.loads(rsa_public_key.export_public()),
+    }
+
+
+@pytest.mark.asyncio
+async def test_initialize_accepts_kms_cluster_url() -> None:
+    requests: list[FetchRequest] = []
+    kms_details = _build_kms_details(kms_cluster="kms://ciscospark.com/keys")
+    remote_key = jwk.JWK.generate(kty="EC", crv="P-256")
+    wrapped_response = _make_kms_response_token(
+        {
+            "body": {
+                "key": {
+                    "jwk": json.loads(remote_key.export_public()),
+                    "uri": "kms://ciscospark.com/keys/key/123",
+                    "expirationDate": "2026-01-01T00:00:00Z",
+                }
+            }
+        }
+    )
+
+    async def http_do(request: FetchRequest) -> _FakeFetchResponse:
+        requests.append(request)
+        return _FakeFetchResponse(status=200, ok=True, payload=kms_details)
+
+    client = KmsClient(
+        token="test-token",
+        device_url="https://device.example.com",
+        user_id="user-123",
+        encryption_service_url="https://encryption.example.com",
+        http_do=http_do,
+    )
+    client._send_kms_request = AsyncMock(return_value=wrapped_response)  # type: ignore[method-assign]
+
+    await client.initialize()
+
+    assert client._initialized is True
+    assert client._kms_cluster == "kms://ciscospark.com/keys"
+    assert client._ephemeral_key is not None
+    assert client._ephemeral_key.get("kid") == "kms://ciscospark.com/keys/key/123"
+    assert len(requests) == 1
+    assert requests[0].method == "GET"
+    assert requests[0].url == "https://encryption.example.com/kms/user-123"
+
+
+@pytest.mark.asyncio
+async def test_initialize_rejects_https_kms_cluster_url() -> None:
+    kms_details = _build_kms_details(kms_cluster="https://ciscospark.com/keys")
+
+    async def http_do(request: FetchRequest) -> _FakeFetchResponse:
+        return _FakeFetchResponse(status=200, ok=True, payload=kms_details)
+
+    client = KmsClient(
+        token="test-token",
+        device_url="https://device.example.com",
+        user_id="user-123",
+        encryption_service_url="https://encryption.example.com",
+        http_do=http_do,
+    )
+    client._send_kms_request = AsyncMock()  # type: ignore[method-assign]
+
+    with pytest.raises(KmsError, match="URL scheme must be kms, got https"):
+        await client.initialize()
+
+    client._send_kms_request.assert_not_called()