capyy 0.5.2__tar.gz → 0.5.3__tar.gz

{capyy-0.5.2 → capyy-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capyy
-Version: 0.5.2
+Version: 0.5.3
 Summary: Easy, encrypted networking for Python: programs that talk (local, Wi-Fi, internet), home automation, and projects run with cy
 Author: Izac
 License-Expression: MIT
@@ -101,6 +101,19 @@ app.call("hello", nom="Izac")   # client side
 `mode` can be `local`, `wifi` or `network` (with `relay`, `key`, `fingerprint`). Strings starting with `$` are read
 from environment variables, e.g. `"key": "$CAPY_KEY"`. Inside a project, the `cy` command runs its `scripts` like `npm run` (`cy test`, `cy start`) and its files (`cy server`); create a project with `capy new`.
 
+## From the terminal
+
+```bash
+capy call localhost:4000 hello nom=Izac        # any capy server (add --no-tls for a plain one)
+capy wifi scan                                 # capy.wifi servers on your network
+capy wifi call home temperature
+capy network call home test --relay my-vps.example:3879 --key "$CAPY_KEY"
+cy call hello nom=Izac                         # inside a project: uses capy.config.json
+```
+
+Parameters are `name=value`; numbers, `true`/`false` and lists are parsed (`age=14` sends the number 14).
+The answer is printed as JSON; the exit code is 1 when the server answers `{"erreur": ...}`.
+
 ## Encryption (TLS)
 
 Everything is encrypted by default, with nothing to configure.

{capyy-0.5.2 → capyy-0.5.3}/README.md

@@ -79,6 +79,19 @@ app.call("hello", nom="Izac")   # client side
 `mode` can be `local`, `wifi` or `network` (with `relay`, `key`, `fingerprint`). Strings starting with `$` are read
 from environment variables, e.g. `"key": "$CAPY_KEY"`. Inside a project, the `cy` command runs its `scripts` like `npm run` (`cy test`, `cy start`) and its files (`cy server`); create a project with `capy new`.
 
+## From the terminal
+
+```bash
+capy call localhost:4000 hello nom=Izac        # any capy server (add --no-tls for a plain one)
+capy wifi scan                                 # capy.wifi servers on your network
+capy wifi call home temperature
+capy network call home test --relay my-vps.example:3879 --key "$CAPY_KEY"
+cy call hello nom=Izac                         # inside a project: uses capy.config.json
+```
+
+Parameters are `name=value`; numbers, `true`/`false` and lists are parsed (`age=14` sends the number 14).
+The answer is printed as JSON; the exit code is 1 when the server answers `{"erreur": ...}`.
+
 ## Encryption (TLS)
 
 Everything is encrypted by default, with nothing to configure.

{capyy-0.5.2 → capyy-0.5.3}/capy/__main__.py

@@ -6,16 +6,21 @@
 #   cy scripts                  -> liste les scripts
 #   cy server / cy client       -> lance un fichier de "files"
 #   cy run                      -> lance le serveur en fond, puis le client, puis arrête le serveur
+#   cy call ACTION [nom=valeur…] -> appelle une action du serveur du projet (local, wifi ou network)
 #
 # capy : tout le reste (et tout ce que fait cy)
 #   capy new NOM [mode]         -> crée un dossier NOM avec capy.config.json, server.py, client.py
 #   capy init [nom] [mode]      -> crée juste capy.config.json ici
 #   capy domo …                 -> la domotique (capy domo help)
 #   capy relay PORT [CLÉ]       -> lance un relais capy.network (sur le VPS)
+#   capy call HÔTE:PORT ACTION [nom=valeur…]       -> appelle une action d'un serveur capy
+#   capy wifi scan / capy wifi call NOM ACTION …   -> les serveurs du wifi
+#   capy network call NOM ACTION … [--relay R --key K]   /   capy network relay PORT [CLÉ]
 #   mode : local (par défaut), wifi ou network
 #   python3 -m capy = capy (si la commande n'est pas dans le PATH)
 
 import difflib
+import json
 import socket
 import subprocess
 import sys
@@ -30,11 +35,18 @@ USAGE = f"""Dans un projet capy ({FILE_NAME}) :
   cy scripts             liste les scripts
   cy server / client     lance un fichier de "files"
   cy run                 serveur en fond + client, puis arrête le serveur
+  cy call ACTION [nom=valeur…]   appelle une action du serveur du projet
 Partout :
   capy new NOM [mode]    crée un projet complet (config, server.py, client.py)
   capy init [nom] [mode] crée juste {FILE_NAME} ici
   capy domo …            la domotique (capy domo help)
   capy relay PORT [CLÉ]  lance un relais capy.network
+  capy call HÔTE:PORT ACTION [nom=valeur…] [--no-tls]
+  capy wifi scan                                 les serveurs capy du wifi
+  capy wifi call NOM ACTION [nom=valeur…] [--no-tls]
+  capy network call NOM ACTION [nom=valeur…] [--relay HÔTE:PORT] [--key CLÉ] [--fingerprint …]
+  capy network relay PORT [CLÉ]                  (= capy relay)
+  Paramètres : nom=Izac age=14 actif=true liste=[1,2] (les nombres, true/false et listes sont compris)
   modes : {", ".join(MODES)}"""
 
 
@@ -51,6 +63,118 @@ def _project():
         sys.exit(str(e))
 
 
+# Sortir les options "--nom valeur" (et "--drapeau") d'une liste d'arguments -> (options, reste)
+def _options(args, flags=(), values=()):
+    options, rest, i = {}, [], 0
+    while i < len(args):
+        word = args[i]
+        if word in flags:
+            options[word] = True
+        elif word in values:
+            if i + 1 >= len(args):
+                sys.exit(f"capy : il manque une valeur après {word}")
+            options[word] = args[i + 1]
+            i += 1
+        elif word.startswith("--"):
+            sys.exit(f"capy : option {word} inconnue (possibles : {', '.join((*flags, *values)) or 'aucune'})")
+        else:
+            rest.append(word)
+        i += 1
+    return options, rest
+
+
+# "nom=Izac" "age=14" -> {"nom": "Izac", "age": 14} : une valeur qui est du JSON (14, true, [1, 2]) est convertie
+def _params(words):
+    params = {}
+    for word in words:
+        key, sep, value = word.partition("=")
+        if not sep or not key:
+            sys.exit(f"capy : paramètre {word!r} invalide, écris nom=valeur (ex : nom=Izac age=14)")
+        try:
+            params[key] = json.loads(value)
+        except ValueError:
+            params[key] = value
+    return params
+
+
+# Faire l'appel et afficher la réponse en JSON ; code de sortie 1 si erreur (pratique dans un script)
+def _call(function):
+    import capy
+    try:
+        answer = function()
+    except (ConnectionError, ValueError, KeyError, capy.SecurityError) as e:
+        sys.exit(str(e).strip("'\""))
+    print(json.dumps(answer, indent=2, ensure_ascii=False))
+    if isinstance(answer, dict) and "erreur" in answer:
+        sys.exit(1)
+
+
+USAGE_CALL = "Usage : capy call HÔTE:PORT ACTION [nom=valeur…] [--no-tls]   (ex : capy call localhost:4000 hello nom=Izac)"
+
+
+# capy call localhost:4000 hello nom=Izac
+def call_direct(args):
+    import capy
+    options, rest = _options(args, flags=("--no-tls",))
+    if len(rest) < 2:
+        sys.exit(USAGE_CALL)
+    host, _, port = rest[0].rpartition(":")
+    if not host or not port.isdigit():
+        sys.exit(f"capy : adresse {rest[0]!r} invalide, écris HÔTE:PORT (ex : localhost:4000)\n{USAGE_CALL}")
+    _call(lambda: capy.call(host, int(port), rest[1], tls="--no-tls" not in options, **_params(rest[2:])))
+
+
+# capy wifi scan / capy wifi call maison hello nom=Izac
+def wifi(args):
+    import capy.wifi
+    sub = args[0] if args else None
+    if sub == "scan":
+        options, _ = _options(args[1:], values=("--timeout",))
+        found = capy.wifi.scan(timeout=float(options.get("--timeout", 1)))
+        if not found:
+            sys.exit("Aucun serveur capy.wifi trouvé (même wifi ? wifi public qui isole les appareils ?)")
+        for name, (ip, port) in sorted(found.items()):
+            print(f"  {name:<20} {ip}:{port}{'  (cet appareil)' if ip == '127.0.0.1' else ''}")
+    elif sub == "call":
+        options, rest = _options(args[1:], flags=("--no-tls",))
+        if len(rest) < 2:
+            sys.exit("Usage : capy wifi call NOM ACTION [nom=valeur…] [--no-tls]   (ex : capy wifi call maison hello)")
+        _call(lambda: capy.wifi.call(rest[0], rest[1], tls="--no-tls" not in options, **_params(rest[2:])))
+    else:
+        sys.exit("Usage : capy wifi scan [--timeout S]   ou   capy wifi call NOM ACTION [nom=valeur…] [--no-tls]")
+
+
+# capy network call maison hello --relay mon-vps.fr:3879 --key …   /   capy network relay 3879 CLÉ
+# Relais et clé : options, sinon le capy.config.json du dossier (mode network), sinon $CAPY_RELAY / $CAPY_KEY
+def network(args):
+    import os
+
+    import capy.network
+    sub = args[0] if args else None
+    if sub == "relay" or (sub or "").isdigit():  # capy network relay 3879 CLÉ (ou l'ancien capy network 3879 CLÉ)
+        capy.network.cli(args[1:] if sub == "relay" else args)
+    elif sub == "call":
+        options, rest = _options(args[1:], values=("--relay", "--key", "--fingerprint"))
+        if len(rest) < 2:
+            sys.exit("Usage : capy network call NOM ACTION [nom=valeur…] [--relay HÔTE:PORT] [--key CLÉ] [--fingerprint …]")
+        relay, key, fingerprint = options.get("--relay"), options.get("--key"), options.get("--fingerprint")
+        path = find(".")
+        if path and not relay:
+            try:
+                app = project(path)
+            except ValueError:
+                app = None
+            if app and app.mode == "network":
+                relay, key, fingerprint = app.relay, key or app.key, fingerprint or app.fingerprint
+        relay, key = relay or os.environ.get("CAPY_RELAY"), key or os.environ.get("CAPY_KEY")
+        if not relay:
+            sys.exit("capy : quel relais ? Ajoute --relay mon-vps.fr:3879 (ou un capy.config.json en mode network, ou $CAPY_RELAY)")
+        capy.network.use(relay, key=key, fingerprint=fingerprint)
+        _call(lambda: capy.network.call(rest[0], rest[1], **_params(rest[2:])))
+    else:
+        sys.exit("Usage : capy network call NOM ACTION [nom=valeur…] [--relay …] [--key …]   ou   capy network relay PORT [CLÉ]")
+
+
 # Lancer un fichier du projet avec le même Python, depuis le dossier du projet
 def _start(app, name, args=(), **options):
     try:
@@ -120,10 +244,19 @@ def main(args):
         from .domo.__main__ import cli as domo_cli
         domo_cli(args[1:])
         return
-    if command in ("relay", "network"):  # capy relay 3879 CLÉ
+    if command == "relay":  # capy relay 3879 CLÉ
         from .network import cli as relay_cli
         relay_cli(args[1:])
         return
+    if command == "network":
+        network(args[1:])
+        return
+    if command == "wifi":
+        wifi(args[1:])
+        return
+    if command == "call" and len(args) > 1 and ":" in args[1]:  # capy call localhost:4000 hello
+        call_direct(args[1:])
+        return
     if command in ("init", "new"):
         rest = args[1:]
         mode = next((a for a in rest if a in MODES), "local")
@@ -146,6 +279,10 @@ def main(args):
         print(app.describe())
     elif command == "run":
         run(app, args[1:])
+    elif command == "call":  # cy call hello nom=Izac : le serveur du projet, quel que soit son mode
+        if len(args) < 2:
+            sys.exit("Usage : cy call ACTION [nom=valeur…]   (ex : cy call hello nom=Izac)")
+        _call(lambda: app.call(args[1], **_params(args[2:])))
     elif command == "scripts":
         if not app.scripts:
             print('Pas de "scripts" dans ' + FILE_NAME + ', ex : "scripts": {"test": "python3 -m unittest"}')
@@ -173,7 +310,7 @@ def main(args):
 # La commande cy : seulement les commandes d'un projet
 def cli():
     args = sys.argv[1:]
-    if args[:1] in (["new"], ["init"], ["domo"], ["relay"], ["network"]):
+    if args[:1] in (["new"], ["init"], ["domo"], ["relay"], ["network"], ["wifi"]):
         sys.exit(f"cy sert dans un projet capy ; pour ça, c'est la commande capy : capy {' '.join(args)}")
     main(args)
 

{capyy-0.5.2 → capyy-0.5.3}/capy/_project.py

@@ -46,7 +46,7 @@ FIELDS = {
 
 EXAMPLE = {"name": "mon-projet", "mode": "local", "host": "localhost", "port": 4000, "tls": True,
            "files": {"server": "server.py", "client": "client.py"}}
-COMMANDS = ("init", "new", "run", "scripts", "help", "domo", "relay")  # Mots réservés de cy / capy (pas des noms de fichiers ni de scripts)
+COMMANDS = ("init", "new", "run", "scripts", "help", "call", "domo", "relay", "wifi", "network")  # Mots réservés de cy / capy (pas des noms de fichiers ni de scripts)
 
 
 # Dossier du script lancé (comme simplesuit.json) ; sans script (python3 -c, REPL) -> dossier actuel

{capyy-0.5.2 → capyy-0.5.3}/capy/_tls.py

@@ -12,6 +12,7 @@ import pathlib as pth
 import socket
 import ssl
 import subprocess
+import sys
 import threading
 
 CAPY_DIR = pth.Path.home() / ".capy"
@@ -119,7 +120,8 @@ def check(label, seen, pinned=None, who="capy", kind="serveur", local=False):
             CAPY_DIR.mkdir(exist_ok=True)
             known[label] = seen
             KNOWN_FILE.write_text(json.dumps(known, indent=4))
-            print(f"{who} : nouveau {kind} {label}, empreinte retenue {seen}", flush=True)
+            # Sur stderr : la sortie normale reste propre (ex : capy call … | jq)
+            print(f"{who} : nouveau {kind} {label}, empreinte retenue {seen}", file=sys.stderr, flush=True)
             return
     if not hmac.compare_digest(known[label], seen):
         raise SecurityError(

{capyy-0.5.2 → capyy-0.5.3}/capyy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capyy
-Version: 0.5.2
+Version: 0.5.3
 Summary: Easy, encrypted networking for Python: programs that talk (local, Wi-Fi, internet), home automation, and projects run with cy
 Author: Izac
 License-Expression: MIT
@@ -101,6 +101,19 @@ app.call("hello", nom="Izac")   # client side
 `mode` can be `local`, `wifi` or `network` (with `relay`, `key`, `fingerprint`). Strings starting with `$` are read
 from environment variables, e.g. `"key": "$CAPY_KEY"`. Inside a project, the `cy` command runs its `scripts` like `npm run` (`cy test`, `cy start`) and its files (`cy server`); create a project with `capy new`.
 
+## From the terminal
+
+```bash
+capy call localhost:4000 hello nom=Izac        # any capy server (add --no-tls for a plain one)
+capy wifi scan                                 # capy.wifi servers on your network
+capy wifi call home temperature
+capy network call home test --relay my-vps.example:3879 --key "$CAPY_KEY"
+cy call hello nom=Izac                         # inside a project: uses capy.config.json
+```
+
+Parameters are `name=value`; numbers, `true`/`false` and lists are parsed (`age=14` sends the number 14).
+The answer is printed as JSON; the exit code is 1 when the server answers `{"erreur": ...}`.
+
 ## Encryption (TLS)
 
 Everything is encrypted by default, with nothing to configure.

{capyy-0.5.2 → capyy-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "capyy"
-version = "0.5.2"
+version = "0.5.3"
 description = "Easy, encrypted networking for Python: programs that talk (local, Wi-Fi, internet), home automation, and projects run with cy"
 readme = "README.md"
 requires-python = ">=3.9"

{capyy-0.5.2 → capyy-0.5.3}/tests/test_capy.py

@@ -357,5 +357,59 @@ class TestProject(unittest.TestCase):
         self.assertEqual(json.loads(path.read_text())["key"], "$CAPY_KEY")
 
 
+# Les commandes capy / cy, lancées pour de vrai (dossier personnel temporaire : ~/.capy n'est pas touché)
+class TestCommandLine(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.home = tempfile.TemporaryDirectory()
+        cls.server = start(demo_server(capy.Server(0, tls=False)))
+        cls.relay_port = free_port()
+        threading.Thread(target=capy.network.Relay(cls.relay_port, key="cle").run, daemon=True).start()
+        time.sleep(0.5)
+        capy.network.use(f"127.0.0.1:{cls.relay_port}", key="cle")
+        start(demo_server(capy.network.Server("cli")), wait=lambda s: True)
+        time.sleep(1)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.home.cleanup()
+
+    def run_capy(self, *args, cwd=None):
+        import subprocess
+        import sys
+        # Autre HOME : Python ne voit plus les paquets installés pour l'utilisateur, on lui montre capy
+        env = {**os.environ, "HOME": self.home.name, "PYTHONPATH": str(pathlib.Path(__file__).resolve().parent.parent)}
+        return subprocess.run([sys.executable, "-m", "capy", *args], cwd=cwd or self.home.name, env=env,
+                              capture_output=True, text=True, timeout=30)
+
+    def test_call(self):
+        result = self.run_capy("call", f"localhost:{self.server.port}", "hello", "name=Zoé", "--no-tls")
+        self.assertEqual((result.returncode, json.loads(result.stdout)), (0, {"message": "Bonjour Zoé"}))
+        result = self.run_capy("call", f"localhost:{self.server.port}", "divide", "a=6", "b=3", "--no-tls")
+        self.assertEqual(json.loads(result.stdout), {"result": 2.0})  # "6" et "3" compris comme des nombres
+        result = self.run_capy("call", f"localhost:{self.server.port}", "nope", "--no-tls")
+        self.assertEqual(result.returncode, 1)  # Réponse {"erreur": ...} -> code 1
+        self.assertIn("nom=valeur", self.run_capy("call", f"localhost:{self.server.port}", "hello", "name", "--no-tls").stderr)
+
+    def test_project_call(self):
+        folder = pathlib.Path(self.home.name) / "projet"
+        folder.mkdir(exist_ok=True)
+        (folder / "capy.config.json").write_text(json.dumps({"port": self.server.port, "tls": False}))
+        result = self.run_capy("call", "hello", "name=Projet", cwd=folder)
+        self.assertEqual(json.loads(result.stdout), {"message": "Bonjour Projet"})
+
+    def test_network_call(self):
+        result = self.run_capy("network", "call", "cli", "hello", "name=Léa", "--relay", f"127.0.0.1:{self.relay_port}", "--key", "cle")
+        self.assertEqual(json.loads(result.stdout), {"message": "Bonjour Léa"})
+        self.assertIn("quel relais", self.run_capy("network", "call", "cli", "hello").stderr)
+
+    def test_reserved_script_names(self):
+        for name in ("call", "wifi", "network"):
+            with self.assertRaisesRegex(ValueError, "nom d'une commande"):
+                path = pathlib.Path(self.home.name) / "capy.config.json"
+                path.write_text(json.dumps({"port": 1, "scripts": {name: "echo"}}))
+                capy.project(path)
+
+
 if __name__ == "__main__":
     unittest.main()

{capyy-0.5.2 → capyy-0.5.3}/tests/test_domo.py

@@ -345,7 +345,10 @@ class TestBrands(unittest.TestCase):
         self.assertFalse(found["switch.radiateur"].state()["on"])
 
     def test_unreachable(self):
-        lamp = domo._wiz.WizLight("fantome", "127.0.0.1", port=free_port(socket.SOCK_DGRAM))
+        silent = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)  # Un port gardé, qui ne répond jamais
+        silent.bind(("127.0.0.1", 0))
+        self.addCleanup(silent.close)
+        lamp = domo._wiz.WizLight("fantome", "127.0.0.1", port=silent.getsockname()[1])
         self.assertEqual(lamp.state()["reachable"], False)
         with self.assertRaisesRegex(ConnectionError, "'fantome' \\(wiz\\) ne répond pas"):
             lamp.on()