prim-ctrl 0.6.2__tar.gz → 0.6.4__tar.gz

{prim_ctrl-0.6.2 → prim_ctrl-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prim-ctrl
-Version: 0.6.2
+Version: 0.6.4
 Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
 Home-page: https://github.com/lmagyar/prim-ctrl
 License: Apache-2.0
@@ -13,6 +13,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: aiohttp (>=3.11.10,<4.0.0)
 Requires-Dist: dnspython (>=2.7.0,<3.0.0)
 Requires-Dist: platformdirs (>=4.3.6,<5.0.0)

{prim_ctrl-0.6.2 → prim_ctrl-0.6.4}/prim_ctrl/__main__.py

@@ -648,6 +648,25 @@ class AutomateTailscaleManager(Manager):
     async def stop(self):
         await self.automate.send_message('stop-tailscale')
 
+class WebhookPing(Pingable):
+    def __init__(self, session: aiohttp.ClientSession, webhooks: Webhooks, funnel: Funnel):
+        self.session = session
+        self.webhooks = webhooks
+        self.funnel = funnel
+        self.ping_url = f'{self.funnel.external_url}{Webhooks.get_ping_path()}'
+        self.__qualname__ = "Webhooks"
+
+    async def ping(self, availability_hint: bool | None = None):
+        logger.debug("Calling url %s", self.ping_url)
+        try:
+            async with self.session.get(self.ping_url, timeout=ClientTimeout(total=1)) as response:
+                return 'pong' == await response.text()
+        except Exception:
+            return False
+
+    async def _sleep_while_wait(self, available: bool):
+        await asyncio.sleep(1)
+
 class AutomatePhoneState(PhoneState):
     VARIABLE_STATE = 'state'
 
@@ -656,6 +675,7 @@ class AutomatePhoneState(PhoneState):
         self.webhooks = webhooks
         self.automate = automate
         self.funnel = funnel
+        self.webhook_ping = WebhookPing(session, webhooks, funnel)
 
     async def get(self, repeat: float, timeout: float):
         logger.info("Getting Phone state...")
@@ -665,9 +685,7 @@ class AutomatePhoneState(PhoneState):
         test_timeout = 10.0
         logger.debug("Testing Funnel with calling local webhook (timeout is %ds)", int(test_timeout))
         try:
-            async with self.session.get(f'{self.funnel.external_url}{Webhooks.get_ping_path()}', timeout=ClientTimeout(total=test_timeout)) as response:
-                if await response.text() != 'pong':
-                    raise Exception()
+            await self.webhook_ping.wait_for(True, test_timeout)
         except Exception as e:
             raise RuntimeError(f"Local Funnel is not configured properly for {self.funnel.external_url}") from e
 
@@ -804,7 +822,8 @@ class Control:
                         state[Control.LOCAL_VPN] = local_vpn_state
 
                         # start changing local state - we need a local vpn to be able to access the state of the remote vpn and optionally the phone
-                        await local.vpn.start(10, 30)
+                        if not state[Control.LOCAL_VPN]:
+                            await local.vpn.start(10, 30)
 
                         zeroconf_accessible = False
                         remote_accessible = False

{prim_ctrl-0.6.2 → prim_ctrl-0.6.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prim-ctrl"
-version = "0.6.2"
+version = "0.6.4"
 description = "Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN."
 license = "Apache-2.0"
 authors = ["Laszlo Magyar <lmagyar1973@gmail.com>"]