chartremotely 0.3.9__tar.gz → 0.3.11__tar.gz

{chartremotely-0.3.9 → chartremotely-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.9
+Version: 0.3.11
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 
@@ -219,7 +219,7 @@ Requires-Dist: pyobjc-framework-Quartz>=10; extra == "macos"
 Requires-Dist: pyobjc-framework-Security>=10; extra == "macos"
 Requires-Dist: mlx-whisper>=0.4.3; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "macos"
 Provides-Extra: setup
-Requires-Dist: tollbooth-dpyc[nostr]==0.106.0; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.109.3; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.9 → chartremotely-0.3.11}/chartremotely/doctor.py

@@ -75,7 +75,25 @@ def _check_services() -> tuple[str, str]:
     return service_verdict({name: services.running_python(name) for name in services.LABELS})
 
 
-def _check_controls() -> tuple[str, str]:
+def screen_locked() -> bool:
+    """True while the login session's screen is locked.
+
+    A locked screen hides every window from the accessibility layer, so the
+    chart's controls look missing when they are only out of reach.
+    """
+    import Quartz
+
+    session = Quartz.CGSessionCopyCurrentDictionary() or {}
+    return bool(session.get("CGSSessionScreenIsLocked"))
+
+
+LOCKED = (BAD, ("the screen is locked, so the chart controls cannot be read - "
+                "unlock this Mac; until then it cannot change the chart"))
+
+
+def _check_controls(locked=screen_locked) -> tuple[str, str]:
+    if locked():
+        return LOCKED
     from . import ax, symbol, timeframe
     cfg = config.load()
     try:
@@ -106,20 +124,47 @@ def _check_registry() -> tuple[str, str]:
     return OK, f"{len(rows)} securities cached"
 
 
+#: A free lookup the listener answers from a table: no operator trip, no
+#: fare, and the chart stays where it is. "read" was all three.
+LISTENER_PROBE = b"scale half"
+LISTENER_SECONDS = 5
+
+
+def _post_probe(port: int, token: str) -> str:
+    request = urllib.request.Request(
+        f"http://127.0.0.1:{port}/chart", data=LISTENER_PROBE,
+        headers={"X-Token": token}, method="POST")
+    with urllib.request.urlopen(request, timeout=LISTENER_SECONDS) as response:
+        return response.read().decode().strip()
+
+
+def listener_verdict(port: int, token: str, post=_post_probe) -> tuple[str, str]:
+    """Ask the listener a free table lookup and judge the answer."""
+    try:
+        reply = post(port, token)
+    except urllib.error.HTTPError as exc:
+        if exc.code == 403:
+            return BAD, f"listener on :{port} refused the token in config.json - restart it: chartremotely setup"
+        return BAD, f"listener on :{port} answered HTTP {exc.code}"
+    except urllib.error.URLError as exc:
+        if isinstance(exc.reason, TimeoutError):
+            return BAD, (f"listener on :{port} took over {LISTENER_SECONDS} s to answer a table lookup - "
+                         "restart it: chartremotely setup")
+        return WARN, f"nothing listening on :{port} - run: chartremotely serve"
+    except TimeoutError:
+        return BAD, (f"listener on :{port} took over {LISTENER_SECONDS} s to answer a table lookup - "
+                     "restart it: chartremotely setup")
+    if reply != "half":
+        return BAD, f"listener on :{port} answered {reply[:60]!r} to a table lookup"
+    return OK, f"listener answering on :{port}"
+
+
 def _check_listener() -> tuple[str, str]:
     cfg = config.load()
-    port = cfg["port"]
     token = cfg.get("token")
     if not token:
         return WARN, "no token yet - it is generated when the listener first starts"
-    request = urllib.request.Request(
-        f"http://127.0.0.1:{port}/chart", data=b"read",
-        headers={"X-Token": token}, method="POST")
-    try:
-        with urllib.request.urlopen(request, timeout=5) as response:
-            return OK, f"listener answering on :{port} - {response.read().decode().strip()}"
-    except urllib.error.URLError:
-        return WARN, f"nothing listening on :{port} - run: chartremotely serve"
+    return listener_verdict(cfg["port"], token)
 
 
 CHECKS = (

{chartremotely-0.3.9 → chartremotely-0.3.11}/chartremotely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chartremotely
-Version: 0.3.9
+Version: 0.3.11
 Summary: Remote control of desktop charting applications on macOS
 Author: Lonnie VanZandt
 License: 
@@ -219,7 +219,7 @@ Requires-Dist: pyobjc-framework-Quartz>=10; extra == "macos"
 Requires-Dist: pyobjc-framework-Security>=10; extra == "macos"
 Requires-Dist: mlx-whisper>=0.4.3; (sys_platform == "darwin" and platform_machine == "arm64") and extra == "macos"
 Provides-Extra: setup
-Requires-Dist: tollbooth-dpyc[nostr]==0.106.0; extra == "setup"
+Requires-Dist: tollbooth-dpyc[nostr]==0.109.3; extra == "setup"
 Provides-Extra: dev
 Requires-Dist: pytest>=8; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{chartremotely-0.3.9 → chartremotely-0.3.11}/chartremotely.egg-info/requires.txt

@@ -13,4 +13,4 @@ pyobjc-framework-Security>=10
 mlx-whisper>=0.4.3
 
 [setup]
-tollbooth-dpyc[nostr]==0.106.0
+tollbooth-dpyc[nostr]==0.109.3

{chartremotely-0.3.9 → chartremotely-0.3.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chartremotely"
-version = "0.3.9"
+version = "0.3.11"
 description = "Remote control of desktop charting applications on macOS"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -25,7 +25,7 @@ macos = [
 ]
 # `chartremotely setup` makes and proves Nostr identities. The key and proof
 # code is the tollbooth-dpyc SDK's own, never rewritten here.
-setup = ["tollbooth-dpyc[nostr]==0.106.0"]
+setup = ["tollbooth-dpyc[nostr]==0.109.3"]
 dev = ["pytest>=8", "ruff>=0.6"]
 
 [project.urls]

{chartremotely-0.3.9 → chartremotely-0.3.11}/tests/test_doctor.py

@@ -40,3 +40,51 @@ def test_both_running_on_a_live_python_is_ok():
 def test_launchctl_print_yields_the_pid_only_while_running():
     assert services.pid_in("com.chartremotely.relay = {\n\tstate = running\n\tpid = 12804\n}") == 12804
     assert services.pid_in("com.chartremotely.relay = {\n\tstate = not running\n}") is None
+
+
+# -- the listener: a free table lookup, never a paid chart read ----------------------------
+
+import urllib.error
+
+
+def test_the_listener_probe_is_a_free_lookup_never_read():
+    # server.LOOKUPS needs Quartz to import; the verb is pinned here instead.
+    assert doctor.LISTENER_PROBE.split()[0] == b"scale"
+
+
+def test_a_listener_that_answers_the_lookup_is_ok():
+    assert doctor.listener_verdict(8899, "t", post=lambda port, token: "half")[0] == doctor.OK
+
+
+def _raises(exc):
+    def post(port, token):
+        raise exc
+    return post
+
+
+def test_a_slow_listener_fails_and_says_so():
+    for exc in (TimeoutError("timed out"), urllib.error.URLError(TimeoutError("timed out"))):
+        status, detail = doctor.listener_verdict(8899, "t", post=_raises(exc))
+        assert status == doctor.BAD and "took over" in detail
+
+
+def test_nothing_listening_points_at_serve():
+    status, detail = doctor.listener_verdict(8899, "t", post=_raises(urllib.error.URLError(ConnectionRefusedError())))
+    assert status == doctor.WARN and "chartremotely serve" in detail
+
+
+def test_a_refused_token_is_named():
+    refused = urllib.error.HTTPError("http://127.0.0.1:8899/chart", 403, "Forbidden", {}, None)
+    status, detail = doctor.listener_verdict(8899, "t", post=_raises(refused))
+    assert status == doctor.BAD and "token" in detail
+
+
+def test_a_wrong_answer_fails():
+    assert doctor.listener_verdict(8899, "t", post=lambda port, token: "ERR nope")[0] == doctor.BAD
+
+
+# -- chart controls: a locked screen is named, not mistaken for a missing chart -----------
+
+def test_a_locked_screen_is_named_before_looking_for_controls():
+    status, detail = doctor._check_controls(locked=lambda: True)
+    assert status == doctor.BAD and "locked" in detail and "unlock" in detail