webatem 2.2.1__tar.gz → 2.3.0__tar.gz

{webatem-2.2.1 → webatem-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webatem
-Version: 2.2.1
+Version: 2.3.0
 Summary: Browser-based control for Blackmagic ATEM switchers: run it, open the browser, your switchers are there
 Author: Lucas Romanenko
 License: MIT

{webatem-2.2.1 → webatem-2.3.0}/atem_control/control/consumer.py

@@ -199,6 +199,18 @@ class ATEMConsumer(ATEMConnectionLoggingMixin, ATEMStateMixin, AsyncWebsocketCon
     def is_connected(self) -> bool:
         return bool(self.connection and self.connection.is_connected)
 
+    @property
+    def is_ready(self) -> bool:
+        """The switcher's state is current. Through a transport re-handshake
+        ``is_connected`` stays True while this is False: what is sent then
+        goes out under the session being replaced, and is lost or lands
+        late (#38, #39). bmdwire before 1.3 has no ``is_ready``; there it
+        is ``is_connected``. The poll loop stays on ``is_connected``: it
+        must keep polling through the gap to see the switcher go and
+        come back."""
+        conn = self.connection
+        return bool(conn and getattr(conn, 'is_ready', conn.is_connected))
+
     # =========================================================================
     # WebSocket Lifecycle
     # =========================================================================
@@ -336,8 +348,12 @@ class ATEMConsumer(ATEMConnectionLoggingMixin, ATEMStateMixin, AsyncWebsocketCon
         drags (20 Hz × 30 KB = ~600 KB/s purely from per-command pushes,
         on top of the polling loop). That saturates the WebSocket write
         buffer and queues audio meter / other small messages behind it.
+
+        Refused while the switcher is away (``is_ready``), not only once
+        the worker is gone: a command sent into a re-handshake is lost,
+        or lands after the operator has moved on (#38, #39).
         """
-        if not self.is_connected:
+        if not self.is_ready:
             await self.send_json({'type': 'error', 'message': 'ATEM not connected'})
             return
 
@@ -722,9 +738,16 @@ class ATEMConsumer(ATEMConnectionLoggingMixin, ATEMStateMixin, AsyncWebsocketCon
                     if was_atem_reachable and not atem_reachable:
                         logger.info("ATEM dropped mid-session; notifying frontend")
                         try:
+                            # ``reconnecting``: bmdwire re-handshakes in
+                            # place until the switcher answers, and the
+                            # branch below says so. The page stays and
+                            # waits (#38); the other connected=False
+                            # notices (a failed connect, a disconnect)
+                            # send it to the connect page.
                             await self.send_json({
                                 'type': 'connection_status',
                                 'connected': False,
+                                'reconnecting': True,
                                 'message': 'ATEM connection lost',
                             })
                         except Exception as e:  # noqa: BLE001
@@ -1341,7 +1364,9 @@ class ATEMConsumer(ATEMConnectionLoggingMixin, ATEMStateMixin, AsyncWebsocketCon
         if not isinstance(slot, int) or slot < 0 or slot >= 32:
             await self.send_json({'type': 'error', 'message': f'Invalid slot: {slot}'})
             return
-        if not self.is_connected:
+        # is_ready, as for every command (#39): bmdwire's clear_still
+        # refuses a re-handshake too (bmdwire#8), but as a failed delete.
+        if not self.is_ready:
             await self.send_json({'type': 'error', 'message': 'ATEM not connected'})
             return
         try:

{webatem-2.2.1 → webatem-2.3.0}/atem_control/static/js/atem_control.js

@@ -885,6 +885,14 @@
   window.chromaSampleBox = chromaSampleBox;
 
   // ../../atem_control/js/runtime.js
+  var SESSION_VERBS = /* @__PURE__ */ new Set([
+    "connect",
+    "disconnect",
+    "refresh",
+    "subscribe_audio_meters",
+    "unsubscribe_audio_meters",
+    "media_pool_refresh"
+  ]);
   window.ATEMControl = {
     ws: null,
     // ---- Declared-state-keys guard ------------------------------------
@@ -1088,7 +1096,9 @@
     // global verbs ignore it. Explicit params.me wins over the stamp.
     cmd(command, params = {}) {
       if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
-      const me = window.Alpine?.store?.("atem")?.activeMe ?? 0;
+      const store = window.Alpine?.store?.("atem");
+      if (store?.switcherAway && !SESSION_VERBS.has(command)) return;
+      const me = store?.activeMe ?? 0;
       this.ws.send(JSON.stringify({ command, me, ...params }));
     },
     // Audio per-strip command helper. Bundles ``source`` and ``channel``
@@ -1431,9 +1441,15 @@
       const alpineInstance = Alpine.store("atem");
       switch (data.type) {
         case "connection_status":
+          if (!data.connected && data.reconnecting && alpineInstance.stateReady) {
+            alpineInstance.switcherAway = true;
+            alpineInstance.statusText = data.message;
+            break;
+          }
           alpineInstance.connected = data.connected;
           alpineInstance.statusText = data.message;
           if (data.connected) {
+            alpineInstance.switcherAway = false;
             alpineInstance.armAudioMixerWait();
             this.isReconnecting = false;
             this.connectingIP = null;
@@ -2440,6 +2456,12 @@
     Alpine.store("atem", {
       // Connection state
       connected: false,
+      // True from a mid-session "connection lost" (``reconnecting``) to
+      // "restored": the switcher went quiet and bmdwire is
+      // re-handshaking. ``connected`` stays true, so the surface keeps
+      // the last state on screen; it goes inert under a banner, and
+      // cmd() sends the switcher nothing (#38).
+      switcherAway: false,
       // ``stateReady`` flips true on the FIRST atem_state arrival
       // (see updateState). Templates that don't want to render against
       // the initial default values gate their x-show on