prim-ctrl 0.7.10__tar.gz → 0.7.12__tar.gz

{prim_ctrl-0.7.10 → prim_ctrl-0.7.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prim-ctrl
-Version: 0.7.10
+Version: 0.7.12
 Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
 License: Apache-2.0
 Author: Laszlo Magyar

{prim_ctrl-0.7.10 → prim_ctrl-0.7.12}/prim_ctrl/__main__.py

@@ -845,6 +845,10 @@ class WebhookPing(Pingable):
         self.ping_url = f'{self.funnel.external_url}{Webhooks.get_ping_path()}'
         self.__qualname__ = "Webhooks"
 
+    async def wait_for(self, available: bool, timeout: float):
+        self._sleepcounter = 0
+        await super().wait_for(available, timeout)
+
     async def ping(self, availability_hint: bool | None = None):
         logger.debug("Calling url %s", self.ping_url)
         try:
@@ -854,7 +858,10 @@ class WebhookPing(Pingable):
             return False
 
     async def _sleep_while_wait(self, available: bool):
+        if 0 != self._sleepcounter and 0 == self._sleepcounter % 60:
+            logger.info("Waiting for %s (%s) to be accessible...", LazyStr(self.get_class_name), self.ping_url)
         await asyncio.sleep(1)
+        self._sleepcounter += 1
 
 class AutomatePhoneState(PhoneState):
     VARIABLE_STATE = 'state'
@@ -888,7 +895,7 @@ class AutomatePhoneState(PhoneState):
 
         # test external funnel + webhooks availability, ie. test funnel tcp forwarders
         # it will NOT be routed locally, so the route is equivalent with / similar to what Automate will see
-        test_timeout = 60.0
+        test_timeout = 300.0
         logger.debug("Testing Funnel with calling external webhook (timeout is %ds)", int(test_timeout))
         try:
             await self.external_webhook_ping.wait_for(True, test_timeout)

{prim_ctrl-0.7.10 → prim_ctrl-0.7.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prim-ctrl"
-version = "0.7.10"
+version = "0.7.12"
 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>"]