prim-ctrl 0.7.0__tar.gz → 0.7.2__tar.gz

{prim_ctrl-0.7.0 → prim_ctrl-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prim-ctrl
-Version: 0.7.0
+Version: 0.7.2
 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
@@ -105,10 +105,12 @@ Optionally, if you want to edit or even contribute to the source, you also need
 - Download the https://raw.githubusercontent.com/lmagyar/prim-ctrl/main/res/prim-ctrl.flo Automate flow to your phone (see [image](https://raw.githubusercontent.com/lmagyar/prim-ctrl/main/res/prim-ctrl.png) of the flow)
 - Import it with the ... menu / Import command
 - Enable all privileges
-- Click on the flow, edit the 2. block ("Set variable google_account to...), enter your Google account and press Save
+- Click on the flow, edit the 2nd block (Set variable google_account to...), enter your Google account's email and press Save
+  - Optionally, if the Google account your phone is registered to is different from the Google account you use to send messages to Automate (eg. you manage a phone that is a jukebox or a family member's phone and you use your personal account to send messages), edit the 3rd block (Set variable other_managing_accounts to...), enter one or more Google account's email (separated with space or comma) and press Save
 - Start the flow
 - Settings
-  - Run on system startup: enable
+  - Safety
+    - Run on system startup: enable
 
 ### Primitive FTPd
 
@@ -174,10 +176,12 @@ Note: optionally if your laptop is accessible through Tailscale Funnel then VPN
 Output: even when -b option is not used, the script will output 'connected=(local|remote)', what you can use to determine whether to use -a option for the prim-sync script
 
 positional arguments:
-  automate-account                 your Google account email you set up in the Automate flow's first Set variable block's Value field
+  automate-account                 your Google account email you set up in the Automate flow's 2nd block's (Set variable google_account to...) Value field
   automate-device                  the device name you can see at the Automate flow's Cloud receive block's This device field
   automate-tokenfile               filename containing Automates's Secret that located under your .secrets folder
-                                   (generated on https://llamalab.com/automate/cloud, use the same Google account you set up on the Cloud receive block)
+                                   (generated on https://llamalab.com/automate/cloud, use the same Google account you set the automate_account option to)
+                                   Note: if the account you use to send messages is different from the automate_account option,
+                                   set it up in the Automate flow's 3rd block's (Set variable other_managing_accounts to...) Value field
   server-name                      the Servername configuration option from Primitive FTPd app
   keyfile                          private SSH key filename located under your .ssh folder, see the documentation of prim-sync for more details
 

{prim_ctrl-0.7.0 → prim_ctrl-0.7.2}/README.md

@@ -79,10 +79,12 @@ Optionally, if you want to edit or even contribute to the source, you also need
 - Download the https://raw.githubusercontent.com/lmagyar/prim-ctrl/main/res/prim-ctrl.flo Automate flow to your phone (see [image](https://raw.githubusercontent.com/lmagyar/prim-ctrl/main/res/prim-ctrl.png) of the flow)
 - Import it with the ... menu / Import command
 - Enable all privileges
-- Click on the flow, edit the 2. block ("Set variable google_account to...), enter your Google account and press Save
+- Click on the flow, edit the 2nd block (Set variable google_account to...), enter your Google account's email and press Save
+  - Optionally, if the Google account your phone is registered to is different from the Google account you use to send messages to Automate (eg. you manage a phone that is a jukebox or a family member's phone and you use your personal account to send messages), edit the 3rd block (Set variable other_managing_accounts to...), enter one or more Google account's email (separated with space or comma) and press Save
 - Start the flow
 - Settings
-  - Run on system startup: enable
+  - Safety
+    - Run on system startup: enable
 
 ### Primitive FTPd
 
@@ -148,10 +150,12 @@ Note: optionally if your laptop is accessible through Tailscale Funnel then VPN
 Output: even when -b option is not used, the script will output 'connected=(local|remote)', what you can use to determine whether to use -a option for the prim-sync script
 
 positional arguments:
-  automate-account                 your Google account email you set up in the Automate flow's first Set variable block's Value field
+  automate-account                 your Google account email you set up in the Automate flow's 2nd block's (Set variable google_account to...) Value field
   automate-device                  the device name you can see at the Automate flow's Cloud receive block's This device field
   automate-tokenfile               filename containing Automates's Secret that located under your .secrets folder
-                                   (generated on https://llamalab.com/automate/cloud, use the same Google account you set up on the Cloud receive block)
+                                   (generated on https://llamalab.com/automate/cloud, use the same Google account you set the automate_account option to)
+                                   Note: if the account you use to send messages is different from the automate_account option,
+                                   set it up in the Automate flow's 3rd block's (Set variable other_managing_accounts to...) Value field
   server-name                      the Servername configuration option from Primitive FTPd app
   keyfile                          private SSH key filename located under your .ssh folder, see the documentation of prim-sync for more details
 

{prim_ctrl-0.7.0 → prim_ctrl-0.7.2}/prim_ctrl/__main__.py

@@ -284,7 +284,7 @@ class Service(Manageable):
 
         self._connect_timeout = 2
         self._special_exceptions = ()
-        self._special_exceptions_handler : Callable[[Exception], None] | None = None
+        self._special_exceptions_handler : Callable[[Exception], bool] | None = None
 
     async def _connect(self, host: str, port: int):
         logger.debug(" Connecting with TCP to %s:%d (timeout is %ds)", host, port, self._connect_timeout)
@@ -306,10 +306,13 @@ class Service(Manageable):
         except self._special_exceptions as e:
             if availability_hint is None or availability_hint:
                 if self._special_exceptions_handler:
-                    self._special_exceptions_handler(e)
+                    if self._special_exceptions_handler(e):
+                        raise
+                    else:
+                        return False
                 else:
                     logger.debug("  Unexpected ping exception: %s", LazyStr(e))
-                raise
+                    raise
             else:
                 return False
         except Exception as e:
@@ -323,12 +326,15 @@ class SshService(Service):
         self.keyfile = keyfile
 
         self._connect_timeout = 3
-        self._special_exceptions = (asyncssh.misc.HostKeyNotVerifiable, asyncssh.misc.PermissionDenied)
+        self._special_exceptions = (asyncssh.misc.HostKeyNotVerifiable, asyncssh.misc.PermissionDenied, asyncssh.misc.DisconnectError)
         def _handle_special_exceptions(e: Exception):
             if isinstance(e, asyncssh.misc.HostKeyNotVerifiable):
                 e.add_note("Check your known_hosts file, see the documentation of prim-sync for more details")
-            else:
+            elif isinstance(e, asyncssh.misc.PermissionDenied):
                 e.add_note("Check your private SSH key file, see the documentation of prim-sync for more details")
+            else:
+                return False
+            return True
         self._special_exceptions_handler = _handle_special_exceptions
 
     async def _connect(self, host: str, port: int):
@@ -970,8 +976,13 @@ class Control:
 
     async def execute(self, args, local: Local, phone: Phone):
         async def _stop(restore_state: dict | None, stop_only_started: bool = False):
-            if local.vpn and phone.vpn and phone.remote_sftp and await local.vpn.test() and await phone.vpn.test():
-                if (restore_state is None or not restore_state.get(Control.PHONE_SFTP, stop_only_started)) and await phone.remote_sftp.test():
+            async def _suppress(coro, default: bool):
+                try:
+                    return await coro
+                except:
+                    return default
+            if local.vpn and phone.vpn and phone.remote_sftp and await _suppress(local.vpn.test(), True) and await _suppress(phone.vpn.test(), True):
+                if (restore_state is None or not restore_state.get(Control.PHONE_SFTP, stop_only_started)) and await _suppress(phone.remote_sftp.test(), True):
                     try:
                         await phone.remote_sftp.stop(10, 30)
                     except Exception as e:
@@ -1075,7 +1086,10 @@ class Control:
                         state[Control.CONNECTED] = Control.ZEROCONF if zeroconf_accessible else Control.REMOTE
                         print(StateSerializer.dumps(state))
                     except Exception:
-                        await _stop(state, stop_only_started = True)
+                        try:
+                            await _stop(state, stop_only_started = True)
+                        except Exception as e:
+                            logger.exception_or_error(e, args)
                         raise
                 else:
                     try:
@@ -1098,10 +1112,12 @@ class AutomateControl(Control):
                 "Output: even when -b option is not used, the script will output 'connected=(local|remote)', what you can use to determine whether to use -a option for the prim-sync script",
             formatter_class=WideHelpFormatter)
 
-        parser.add_argument('automate_account', metavar='automate-account', help="your Google account email you set up in the Automate flow's first Set variable block's Value field")
+        parser.add_argument('automate_account', metavar='automate-account', help="your Google account email you set up in the Automate flow's 2nd block's (Set variable google_account to...) Value field")
         parser.add_argument('automate_device', metavar='automate-device', help="the device name you can see at the Automate flow's Cloud receive block's This device field")
         parser.add_argument('automate_tokenfile', metavar='automate-tokenfile', help="filename containing Automates's Secret that located under your .secrets folder\n"
-            "(generated on https://llamalab.com/automate/cloud, use the same Google account you set up on the Cloud receive block)")
+            "(generated on https://llamalab.com/automate/cloud, use the same Google account you set the automate_account option to)\n"
+            "Note: if the account you use to send messages is different from the automate_account option,\n"
+            "set it up in the Automate flow's 3rd block's (Set variable other_managing_accounts to...) Value field")
 
         Control.setup_parser_arguments(parser)
 

{prim_ctrl-0.7.0 → prim_ctrl-0.7.2}/pyproject.toml

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