cubething_psync 0.1.0.dev5__tar.gz → 0.1.0.dev7__tar.gz

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubething_psync
-Version: 0.1.0.dev5
+Version: 0.1.0.dev7
 Summary: Simple project synchronization tool.
 Author-email: ada mandala <ada@cubething.dev>
 License-Expression: MIT
@@ -20,6 +20,7 @@ Dynamic: license-file
 </div>
 
 [![readthedocs](https://app.readthedocs.org/projects/psync/badge/?version=latest)](https://psync.readthedocs.io/en/latest)
+[![PyPI - Version](https://img.shields.io/pypi/v/cubething_psync)](https://pypi.org/project/cubething_psync)
 
 **psync** is a simple tool to sync your project over SSH. It consists of a
 client and server.

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/README.md

@@ -3,6 +3,7 @@
 </div>
 
 [![readthedocs](https://app.readthedocs.org/projects/psync/badge/?version=latest)](https://psync.readthedocs.io/en/latest)
+[![PyPI - Version](https://img.shields.io/pypi/v/cubething_psync)](https://pypi.org/project/cubething_psync)
 
 **psync** is a simple tool to sync your project over SSH. It consists of a
 client and server.

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cubething_psync"
-version = "0.1.0.dev5"
+version = "0.1.0.dev7"
 description = "Simple project synchronization tool."
 authors = [{name = "ada mandala", email="ada@cubething.dev"}]
 readme = "README.md"

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/src/client/args.py

@@ -10,14 +10,28 @@ from common.data import deserialize_env
 @dataclass
 class Args:
     target_path: str
-    dest_path: str
     extra: list[str]
     env: dict[str, str]
     args: list[str]
 
 
 parser = argparse.ArgumentParser(
-    prog="psync-client", description="Client for the psync server."
+    prog="psync-client",
+    usage="""\
+Client for the psync server.
+
+In addition to the options below, the client is configurable through environment
+variables.
+
+Variable          | Default
+------------------+-------------------------------
+PSYNC_SERVER_IP   | 127.0.0.1
+PSYNC_SERVER_PORT | 5000
+PSYNC_SSH_PORT    | 5022
+PSYNC_SERVER_DEST | /app/rsync/
+PSYNC_SSH_USER    | <unset>
+PSYNC_CERT_PATH   | ~/.local/share/psync/cert.pem
+""",
 )
 _action = parser.add_argument(
     "--path",
@@ -42,6 +56,8 @@ _action = parser.add_argument(
 
 SERVER_IP: str = os.environ.get("PSYNC_SERVER_IP", "127.0.0.1")
 SERVER_PORT: int = int(os.environ.get("PSYNC_SERVER_PORT", "5000"))
+SERVER_SSH_PORT: int = int(os.environ.get("PSYNC_SSH_PORT", "5022"))
+SERVER_DEST: str = os.environ.get("PSYNC_SERVER_DEST", "/app/rsync")
 USER: str = os.environ.get("PSYNC_SSH_USER", "")
 SSL_CERT_PATH: str = os.environ.get("PSYNC_CERT_PATH", "~/.local/share/psync/cert.pem")
 
@@ -55,9 +71,6 @@ def parse_args() -> Args:
         logging.error(f"Could not file at {target_path}")
         exit(1)
 
-    val_hash = hash(os.getcwd())
-    dest_path = f"~/.local/share/psync/{val_hash}/"
-
     extra: list[str] = []
     extra_raw = args.get("extra")
     if extra_raw is not None:
@@ -75,7 +88,6 @@ def parse_args() -> Args:
 
     return Args(
         target_path=str(target_path),
-        dest_path=dest_path,
         extra=extra or [],
         env=env,
         args=client_args,

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/src/client/main.py

@@ -3,6 +3,7 @@ psync client
 """
 
 import asyncio
+import hashlib
 import os
 import pathlib
 import signal
@@ -21,7 +22,16 @@ from common.data import (
 )
 import logging
 from common.log import InterceptHandler
-from client.args import SERVER_IP, SERVER_PORT, USER, SSL_CERT_PATH, Args, parse_args
+from client.args import (
+    SERVER_IP,
+    SERVER_PORT,
+    SERVER_SSH_PORT,
+    USER,
+    SSL_CERT_PATH,
+    SERVER_DEST,
+    Args,
+    parse_args,
+)
 
 
 class PsyncClient:
@@ -49,7 +59,9 @@ class PsyncClient:
             Default: 127.0.0.1
         PSYNC_SERVER_PORT: The port of the server instance.
             Default: 5000
-        PSYNC_SSH_USER: The SSH user for rsync.
+        PSYNC_SSH_PORT: The server instance's SSH port.
+            Default: 5001
+        PSYNC_SSH_USER: The server instance's SSH user.
             Default: Unset. Will use the default ssh user.
         PSYNC_CERT_PATH: Path to the SSL certificate. Used to trust self-signed certs. Should
             match the server's certificate.
@@ -87,7 +99,6 @@ class PsyncClient:
         ssl_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ssl_ctx.load_verify_locations(pathlib.Path(SSL_CERT_PATH).expanduser())
         ssl_ctx.check_hostname = False  # not ideal
-        print(ssl_ctx.get_ca_certs())
         async with websockets.connect(
             f"wss://{SERVER_IP}:{SERVER_PORT}", ssl=ssl_ctx
         ) as ws:
@@ -129,13 +140,10 @@ class PsyncClient:
                         logging.warning(f"Got unknown request {resp}")
 
 
-def __rsync(args: Args):
+def __rsync(project_hash: str, args: Args):
     """Runs rsync."""
-    if USER != "":
-        user = f"{USER}@"
-    else:
-        user = ""
-    url = f"{user}{SERVER_IP}:{args.dest_path}"
+    user = f"{USER}@" if USER != "" else ""
+    url = f"ssh://{user}{SERVER_IP}:{SERVER_SSH_PORT}/{SERVER_DEST}/{project_hash}/"
     rsync_args = [
         "rsync",
         "-avzr",
@@ -160,11 +168,14 @@ def main():
     log_level = os.environ.get("PSYNC_LOG", "INFO").upper()
     logging.basicConfig(handlers=[InterceptHandler()], level=log_level, force=True)
 
+    project_hash = hashlib.blake2s(os.getcwd().encode(), digest_size=8).hexdigest()
     args = parse_args()
-    __rsync(args)
+    __rsync(project_hash, args)
 
-    client_path = pathlib.Path(f"{args.dest_path}/{os.path.basename(args.target_path)}")
-    client = PsyncClient(args=args.args, env=args.env, path=client_path)
+    dest_path = pathlib.Path(
+        f"{SERVER_DEST}/{project_hash}/{os.path.basename(args.target_path)}"
+    )
+    client = PsyncClient(args=args.args, env=args.env, path=dest_path)
     asyncio.run(client.run())
 
 

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/src/cubething_psync.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cubething_psync
-Version: 0.1.0.dev5
+Version: 0.1.0.dev7
 Summary: Simple project synchronization tool.
 Author-email: ada mandala <ada@cubething.dev>
 License-Expression: MIT
@@ -20,6 +20,7 @@ Dynamic: license-file
 </div>
 
 [![readthedocs](https://app.readthedocs.org/projects/psync/badge/?version=latest)](https://psync.readthedocs.io/en/latest)
+[![PyPI - Version](https://img.shields.io/pypi/v/cubething_psync)](https://pypi.org/project/cubething_psync)
 
 **psync** is a simple tool to sync your project over SSH. It consists of a
 client and server.

{cubething_psync-0.1.0.dev5 → cubething_psync-0.1.0.dev7}/src/server/main.py

@@ -34,12 +34,6 @@ import logging
 from common.log import InterceptHandler
 
 
-def __get_host(ws: ServerConnection) -> str:
-    addrs: tuple[str, str] = ws.remote_address  # pyright: ignore[reportAny]
-    (host, _port) = addrs
-    return host
-
-
 SSL_CERT_PATH: str = environ.get("SSL_CERT_PATH", "./cert.pem")
 SSL_KEY_PATH: str = environ.get("SSL_KEY_PATH", "./key.pem")
 PSYNC_HOST: str = environ.get("PSYNC_SERVER_IP", "0.0.0.0")
@@ -88,6 +82,11 @@ class PsyncServer:
     __coroutine: Task[None] | None = None
     """The main coroutine for this server."""
 
+    def __get_host(self, ws: ServerConnection) -> str:
+        addrs: tuple[str, str] = ws.remote_address  # pyright: ignore[reportAny]
+        (host, _port) = addrs
+        return host
+
     async def serve(self) -> None:
         """
         The main interface for the server. Will serve forever, or until exited with SIGINT/Ctrl-C.
@@ -124,7 +123,7 @@ class PsyncServer:
         return inner
 
     async def __end_session(self, ws: ServerConnection):
-        host = __get_host(ws)
+        host = self.__get_host(ws)
         try:
             _ = self.__sessions.pop(host)
         except Exception:
@@ -179,7 +178,7 @@ class PsyncServer:
         return inner
 
     async def __open(self, req: OpenReq, ws: ServerConnection):
-        host = __get_host(ws)
+        host = self.__get_host(ws)
         if self.__sessions.get(host) is not None:
             self.__sessions[host]
             resp = ErrorResp(msg="Process already open for this client.")
@@ -228,7 +227,7 @@ class PsyncServer:
             pass
 
     async def __kill(self, _req: KillReq, ws: ServerConnection):
-        host = __get_host(ws)
+        host = self.__get_host(ws)
         p = self.__sessions.get(host)
         task = self.__tasks.get(host)
         if p is not None and task is not None: