prim-ctrl 0.7.6__tar.gz → 0.7.8__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/PKG-INFO +2 -3
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/prim_ctrl/__main__.py +3 -4
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/pyproject.toml +1 -1
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/LICENSE +0 -0
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/README.md +0 -0
- {prim_ctrl-0.7.6 → prim_ctrl-0.7.8}/prim_ctrl/__init__.py +0 -0
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.3
|
|
2
2
|
Name: prim-ctrl
|
|
3
|
-
Version: 0.7.
|
|
3
|
+
Version: 0.7.8
|
|
4
4
|
Summary: Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN.
|
|
5
|
-
Home-page: https://github.com/lmagyar/prim-ctrl
|
|
6
5
|
License: Apache-2.0
|
|
7
6
|
Author: Laszlo Magyar
|
|
8
7
|
Author-email: lmagyar1973@gmail.com
|
|
@@ -23,8 +23,7 @@ import dns.rdatatype
|
|
|
23
23
|
from aiohttp import ClientTimeout, web
|
|
24
24
|
from aiohttp.abc import AbstractResolver as DnsResolver, ResolveResult
|
|
25
25
|
from platformdirs import user_cache_dir
|
|
26
|
-
from tailscale import Device as TailscaleDeviceInfo
|
|
27
|
-
from tailscale import Tailscale as TailscaleApi
|
|
26
|
+
from tailscale import Device as TailscaleDeviceInfo, Tailscale as TailscaleApi
|
|
28
27
|
from zeroconf import Zeroconf, ServiceInfo, ServiceListener as ZeroconfServiceListener
|
|
29
28
|
from zeroconf.asyncio import AsyncZeroconf
|
|
30
29
|
|
|
@@ -690,7 +689,7 @@ class LocalTailscale(Manageable):
|
|
|
690
689
|
start_result = await super().start(repeat, timeout)
|
|
691
690
|
if start_result and self.tailscale and self.machine_name:
|
|
692
691
|
max_last_seen_age = 7200
|
|
693
|
-
wait_on_fresh_start =
|
|
692
|
+
wait_on_fresh_start = 15
|
|
694
693
|
difference = datetime.now(timezone.utc).replace(microsecond=0) - device_info.last_seen if device_info.last_seen else None
|
|
695
694
|
difference_sec = difference.total_seconds() if difference else None
|
|
696
695
|
if difference_sec is None or difference_sec > max_last_seen_age:
|
|
@@ -888,7 +887,7 @@ class AutomatePhoneState(PhoneState):
|
|
|
888
887
|
|
|
889
888
|
# test external funnel + webhooks availability, ie. test funnel tcp forwarders
|
|
890
889
|
# it will NOT be routed locally, so the route is equivalent with / similar to what Automate will see
|
|
891
|
-
test_timeout =
|
|
890
|
+
test_timeout = 60.0
|
|
892
891
|
logger.debug("Testing Funnel with calling external webhook (timeout is %ds)", int(test_timeout))
|
|
893
892
|
try:
|
|
894
893
|
await self.external_webhook_ping.wait_for(True, test_timeout)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[tool.poetry]
|
|
2
2
|
name = "prim-ctrl"
|
|
3
|
-
version = "0.7.
|
|
3
|
+
version = "0.7.8"
|
|
4
4
|
description = "Primitive Ctrl - Remote control of your phone's Primitive FTPd Android SFTP server and optionally Tailscale VPN."
|
|
5
5
|
license = "Apache-2.0"
|
|
6
6
|
authors = ["Laszlo Magyar <lmagyar1973@gmail.com>"]
|
|
File without changes
|
|
File without changes
|
|
File without changes
|