akashcli 4.6.5__tar.gz → 4.6.7__tar.gz

{akashcli-4.6.5 → akashcli-4.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.6.5
+Version: 4.6.7
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.6.5 → akashcli-4.6.7}/akashcli/__init__.py

@@ -2,6 +2,6 @@ try:
     from importlib.metadata import version
     __version__ = version("akashcli")
 except Exception:
-    __version__ = "4.6.5"
+    __version__ = "4.6.7"
 
 AKASH_VERSION = __version__

{akashcli-4.6.5 → akashcli-4.6.7}/akashcli/cli.py

@@ -40,7 +40,7 @@ def _gr(s: str) -> str:          return f"{_GR}{s}{_RS}"
 
 # ── Spinner (single-line, no flicker) ────────────────────────────────────────
 class _Spin:
-    """Minimal inline spinner — uses \r, no alternate screen, no deps."""
+    """Minimal inline spinner - uses \r, no alternate screen, no deps."""
     _FRAMES = ("⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏")
 
     def __init__(self, label: str):
@@ -77,13 +77,12 @@ class _Spin:
 def _resolve_client(url_override: str = None, require_key: bool = False):
     """
     Return (api_key_or_None, base_url).
-
-    require_key=True  — hard-fail with a clear message if no key found
-                        (used by serve/devices which cannot work without server auth).
-    require_key=False — return None for api_key if missing; caller shows warning
-                        and can offer a local/offline fallback.
+    require_key=True  - hard-fail with a clear message if no key found
+    require_key=False - return None for api_key if missing; caller shows warning
     """
     import os as _os
+    from urllib.parse import urlparse as _up
+    from ._net import patch_dns_globally as _patch_dns
     config = ConfigManager.load()
     base = (
         url_override
@@ -91,6 +90,11 @@ def _resolve_client(url_override: str = None, require_key: bool = False):
         or config.get("api_url", "https://jstore.2bd.net")
     ).rstrip("/")
 
+    host = _up(base).hostname or ""
+    if host:
+        try: _patch_dns(host)
+        except Exception: pass
+
     api_key = _os.getenv("AKASH_API_KEY") or config.get("api_key") or None
 
     if not api_key and require_key:
@@ -99,10 +103,8 @@ def _resolve_client(url_override: str = None, require_key: bool = False):
         raise typer.Exit(1)
 
     return api_key, base
-
-
 _GUEST_WARNING = (
-    f"  {_Y}⚠{_RS}  {_Y}Running as guest{_RS} — not logged in.\n"
+    f"  {_Y}⚠{_RS}  {_Y}Running as guest{_RS} - not logged in.\n"
     f"  {_DM}Features are limited and your data won't be saved to the cloud.\n"
     f"  Run {_RS}{_C}akash login{_RS}{_DM} to unlock full access.{_RS}"
 )
@@ -138,8 +140,8 @@ def _upload_with_progress(client: AkashClient, tmp_path: str, password=None) ->
 
 
 # ── Two-tier app structure ────────────────────────────────────────────────────
-# `app`       — primary commands (backup / restore / pull / run / shell …)
-# `cloud_app` — file management (akash cloud upload/files/stream/delete/manage/bulk)
+# `app`       - primary commands (backup / restore / pull / run / shell …)
+# `cloud_app` - file management (akash cloud upload/files/stream/delete/manage/bulk)
 
 
 def _version_callback(value: bool):
@@ -155,27 +157,35 @@ app = typer.Typer(
     no_args_is_help=False,
 )
 
+def raise_exit():
+    raise typer.Exit(0)
+
+def _print_version(value: bool):
+    if value:
+        from . import __version__
+        print(f"akashcli v{__version__}")
+        raise typer.Exit(0)
+
 @app.callback(invoke_without_command=True)
 def _main(ctx: typer.Context,
           version: bool = typer.Option(False, "--version", "-v", is_eager=True, expose_value=False,
-                                       callback=lambda v: (print("akashcli v1.5.0"), raise_exit()) if v else None,
+                                       callback=_print_version,
                                        help="Show version and exit."),
           help: bool = typer.Option(False, "--help", "-h", is_eager=True, expose_value=False,
                                     callback=lambda v: (_print_help(), raise_exit()) if v else None,
                                     help="Show this message and exit.")):
-    """akash — your encrypted terminal cloud."""
+    """akash - your encrypted terminal cloud."""
     if ctx.invoked_subcommand is None:
         _print_help()
         raise typer.Exit(0)
 
-def raise_exit():
-    raise typer.Exit(0)
+
 
 def _print_help():
     C, G, Y, DM, RS = _C, _G, _Y, _DM, _RS
     lines = [
         f"",
-        f"  {C}akash{RS}  {DM}— encrypted cloud backup · remote shell · file vault{RS}",
+        f"  {C}akash{RS}  {DM}- encrypted cloud backup · remote shell · file vault{RS}",
         f"",
         f"  {DM}ACCOUNT{RS}",
         f"  {C}login{RS}    {DM}[--label NAME]{RS}      save your API key + name this device",
@@ -186,7 +196,7 @@ def _print_help():
         f"  {C}backup{RS}                        save this terminal environment to the cloud",
         f"  {C}restore{RS}                       restore environment from the cloud",
         f"  {C}saves{RS}                         list your saved environments",
-        f"  {C}pull{RS}     {DM}<CODE>{RS}               restore on any machine — no login needed",
+        f"  {C}pull{RS}     {DM}<CODE>{RS}               restore on any machine - no login needed",
         f"",
         f"  {DM}REMOTE SHELL{RS}",
         f"  {C}shell{RS}    {DM}[--device NAME]{RS}     open a shell here, on a device, or local",
@@ -286,19 +296,16 @@ def version(url: Optional[str] = typer.Option(None, "--url", help="Server URL to
 
 @app.command()
 def whoami():
-    """Show current account and storage usage."""
+    """Show current account and storage usage with animation."""
     try:
-        client = AkashClient()
-        user = client.whoami()
+        with _Spin("checking account credentials…"):
+            client = AkashClient()
+            user = client.whoami()
         _ok(f"account  {_cy(user.owner)}")
         _info(f"storage  {_ye(str(user.quota_used))}/{_ye(str(user.quota_limit))}")
     except Exception as e:
         _err(str(e))
         raise typer.Exit(1)
-
-
-# ── akash cloud upload ────────────────────────────────────────────────────────
-
 @cloud_app.command("upload")
 def cloud_upload(
     path:     Optional[Path] = typer.Argument(None,  help="File to upload"),
@@ -477,7 +484,7 @@ def _print_reload_hint(meta: dict):
     shell = meta.get("shell", os.getenv("SHELL", "")) if meta else os.getenv("SHELL", "")
     shell_name = Path(shell).name if shell else "bash"
     _p()
-    print(f"  {_G}↻{_RS}  terminal restored — apply config now:")
+    print(f"  {_G}↻{_RS}  terminal restored - apply config now:")
     if "zsh" in shell_name:
         _info("exec zsh        reload zsh entirely")
         _info("source ~/.zshrc  reload config only")
@@ -503,9 +510,9 @@ def backup(
     """Save your terminal environment to the cloud.
 
     Files from --include are tiered by size:
-      < 50 MB   — packed inline into the archive
-      50-500 MB — uploaded separately; reference stored in akash.largefiles
-      > 500 MB  — skipped (use --large-files to override)
+      < 50 MB   - packed inline into the archive
+      50-500 MB - uploaded separately; reference stored in akash.largefiles
+      > 500 MB  - skipped (use --large-files to override)
 
     Package manifest (pip, apt, npm …) is recorded and reinstalls on pull.
     """
@@ -566,7 +573,7 @@ def backup(
             deduped  = [e for e in lf_entries if e.get("deduped")]
             uploaded = [e for e in lf_entries if not e.get("deduped")]
             if deduped:
-                _ok(f"{len(deduped)} large file(s) already in cloud — skipped upload")
+                _ok(f"{len(deduped)} large file(s) already in cloud - skipped upload")
             if uploaded:
                 from .storage import human_size as _hs
                 total_bytes = sum(e.get("size", 0) for e in uploaded)
@@ -587,7 +594,7 @@ def backup(
 
         has_pkgs = manifest.get("has_packages", False)
         if has_pkgs:
-            _ok("package manifest saved — will reinstall on pull")
+            _ok("package manifest saved - will reinstall on pull")
         elif no_pkgs:
             _info("package manifest skipped (--no-pkgs)")
 
@@ -677,11 +684,11 @@ def restore(
         meta      = manifest.get("meta", {})
 
         if dry_run:
-            _info(f"dry run — nothing written   label: {snap_label}")
+            _info(f"dry run - nothing written   label: {snap_label}")
             pkg_manifest = result.get("pkg_manifest")
             if pkg_manifest:
                 total_pkgs = sum(len(v) for v in pkg_manifest.values())
-                _info(f"packages: {total_pkgs} ({', '.join(pkg_manifest.keys())}) — would reinstall")
+                _info(f"packages: {total_pkgs} ({', '.join(pkg_manifest.keys())}) - would reinstall")
             _p()
             print(f"  {_DM}files that would be restored:{_RS}")
             for p in result["restored"]:
@@ -720,7 +727,7 @@ def saves(raw: bool = typer.Option(False, "--json", help="Raw JSON output")):
         snaps = list_snapshots(client)
 
         if not snaps:
-            _info("no saves found — run `akash backup` to create one")
+            _info("no saves found - run `akash backup` to create one")
             return
 
         if raw:
@@ -766,7 +773,7 @@ def pull(
     password: Optional[str] = typer.Option(None, "--password","-p",help="Password for encrypted saves"),
     no_pkgs:  bool          = typer.Option(False,"--no-pkgs",      help="Skip package reinstall"),
 ):
-    """One-shot restore — no login needed. Works on a fresh machine.
+    """One-shot restore - no login needed. Works on a fresh machine.
 
     Downloads your save, decrypts it, restores dotfiles, and reinstalls
     packages automatically. Use --no-pkgs to restore dotfiles only.
@@ -811,7 +818,7 @@ def pull(
 
     _ok(f"found  {_cy(filename)}  {_dim(f'{size_kb:.1f} KB')}")
     if tier_info.get("device_locked"):
-        _info("device-locked save — verifying machine fingerprint…")
+        _info("device-locked save - verifying machine fingerprint…")
 
     # ── Download ──────────────────────────────────────────────────────────────
     chunks: list    = []
@@ -895,10 +902,10 @@ def pull(
     meta       = manifest.get("meta", {})
 
     if dry_run:
-        _info(f"dry run — nothing written   label: {snap_label}")
+        _info(f"dry run - nothing written   label: {snap_label}")
         if _bs_pkg_manifest:
             total_pkgs = sum(len(v) for v in _bs_pkg_manifest.values())
-            _info(f"packages: {total_pkgs} ({', '.join(_bs_pkg_manifest.keys())}) — would reinstall")
+            _info(f"packages: {total_pkgs} ({', '.join(_bs_pkg_manifest.keys())}) - would reinstall")
         _p()
         for p in restored_list:
             _info(p)
@@ -920,7 +927,7 @@ def pull(
 def check(
     seal: bool = typer.Option(False, "--seal", help="Re-seal the integrity manifest"),
 ):
-    """Verify file integrity — or re-seal with --seal.
+    """Verify file integrity - or re-seal with --seal.
 
     Examples:
       akash check          verify all source files are untampered
@@ -937,10 +944,10 @@ def check(
         from .integrity import status as _status
         s = _status()
         if not s["sealed"]:
-            _warn(f"not sealed yet — run {_cy('akash check --seal')} to enable tamper detection")
+            _warn(f"not sealed yet - run {_cy('akash check --seal')} to enable tamper detection")
             return
         if s["ok"]:
-            _ok(f"integrity OK — {s['files']} files verified")
+            _ok(f"integrity OK - {s['files']} files verified")
         else:
             _err("tamper detected!")
             print(s["message"], file=sys.stderr)
@@ -968,7 +975,7 @@ def run(
     device:    Optional[str] = typer.Option(None,  "--device", "-d",
                                             help="Run on a device (set up with: akash serve --label NAME)"),
 ):
-    """Run a command — locally, on the server, or on an enrolled device.
+    """Run a command - locally, on the server, or on an enrolled device.
 
     No login needed:
       akash run "df -h"                          runs locally
@@ -1032,7 +1039,7 @@ def run(
 
         if reauth:
             _clear_cached_token()
-            _info("cleared cached token — re-authenticating…")
+            _info("cleared cached token - re-authenticating…")
 
         with _Spin("authenticating…"):
             token = acquire_exec_token(api_key, base)
@@ -1142,9 +1149,9 @@ def shell(
     device: Optional[str] = typer.Option(None,  "--device", "-d",
                                          help="Device label to connect to (set up with: akash serve --label NAME)"),
     code:   Optional[str] = typer.Option(None,  "--code",   "-c",
-                                         help="Pairing code from `akash serve` — no login needed"),
+                                         help="Pairing code from `akash serve` - no login needed"),
 ):
-    """Open a shell — local, on a device, or via a one-time pairing code.
+    """Open a shell - local, on a device, or via a one-time pairing code.
 
     No login needed:
       akash shell                     open a local bash shell
@@ -1221,7 +1228,7 @@ def shell(
         # ── Server shell ──────────────────────────────────────────────────
         if reauth:
             _clear_cached_token()
-            _info("cleared cached token — re-authenticating…")
+            _info("cleared cached token - re-authenticating…")
 
         with _Spin("authenticating…"):
             token = acquire_exec_token(api_key, base)
@@ -1251,7 +1258,7 @@ def devices(
     authorize: Optional[str] = typer.Option(None,  "--authorize", "-a", help="Grant server execution access to device"),
     raw:    bool          = typer.Option(False, "--json",          help="Raw JSON output"),
 ):
-    """List enrolled devices — or revoke one.
+    """List enrolled devices - or revoke one.
 
     Each device you run `akash serve` on appears here.
     Connect from anywhere with: akash shell --device NAME
@@ -1274,13 +1281,13 @@ def devices(
 
     if not api_key:
         _p()
-        _info("no devices yet — here's how to set up remote access:")
+        _info("no devices yet - here's how to set up remote access:")
         _p()
-        print(f"  {_DM}Step 1 — on each device you want to reach:{_RS}")
+        print(f"  {_DM}Step 1 - on each device you want to reach:{_RS}")
         print(f"    {_cy('akash login --label termux')}   {_DM}(name this device){_RS}")
-        print(f"    {_cy('akash serve')}                  {_DM}(keep running — makes it reachable){_RS}")
+        print(f"    {_cy('akash serve')}                  {_DM}(keep running - makes it reachable){_RS}")
         _p()
-        print(f"  {_DM}Step 2 — from anywhere:{_RS}")
+        print(f"  {_DM}Step 2 - from anywhere:{_RS}")
         print(f"    {_cy('akash shell --device termux')}  {_DM}(open a shell on it){_RS}")
         print(f"    {_cy('akash run --device termux \"cmd\"')} {_DM}(run a command on it){_RS}")
         _p()
@@ -1369,7 +1376,7 @@ def serve(
     stop:     bool          = typer.Option(False, "--stop",      help="Stop background serve daemon"),
     share:    bool          = typer.Option(False, "--share",     help="Guest mode: get a one-time code, no login needed"),
 ):
-    """Make this device reachable for remote shell — with or without login.
+    """Make this device reachable for remote shell - with or without login.
 
     No login needed (one-time pairing code):
       akash serve --share            prints a code, share it with anyone
@@ -1607,7 +1614,7 @@ def send(
         tags = make_tags(ident["fingerprint"], recip_fp)
         client.update_file(result.file_code, tags=tags)
     except Exception:
-        pass  # Tags are best-effort — file is already uploaded
+        pass  # Tags are best-effort - file is already uploaded
 
     # ── 6. Report ─────────────────────────────────────────────────────────────
     log_op("send", ok=True, code=result.file_code, to=recip_fp, file=file.name)
@@ -1679,7 +1686,7 @@ def inbox(
             p2p_files.append((f, p))
 
     if not p2p_files:
-        _info("inbox empty — no P2P files addressed to your identity")
+        _info("inbox empty - no P2P files addressed to your identity")
         _info(f"your fingerprint: {_ye(ident['fingerprint'])}")
         return
 
@@ -1754,7 +1761,7 @@ def _decrypt_one(code: str, ident: dict, client, out: Optional[Path],
 
     # ── Decrypt ───────────────────────────────────────────────────────────────
     if not is_p2p_envelope(raw):
-        _err("this file is not a P2P envelope — cannot decrypt")
+        _err("this file is not a P2P envelope - cannot decrypt")
         return
 
     try:
@@ -1847,12 +1854,12 @@ def pipe(
     else:
         import sys as _sys
         if _sys.stdin.isatty():
-            _err("nothing to pipe — use --run or pipe stdin:  echo 'hello' | akash pipe")
+            _err("nothing to pipe - use --run or pipe stdin:  echo 'hello' | akash pipe")
             raise typer.Exit(1)
         data = _sys.stdin.buffer.read()
 
     if not data:
-        _err("empty input — nothing to upload")
+        _err("empty input - nothing to upload")
         raise typer.Exit(1)
 
     size_kb = len(data) / 1024
@@ -1908,7 +1915,7 @@ def cmd_log(
     raw:    bool           = typer.Option(False, "--json",        help="Raw JSON output"),
     stats:  bool           = typer.Option(False, "--stats", "-s", help="Show summary instead of list"),
 ):
-    """Show operation history — or a summary with --stats.
+    """Show operation history - or a summary with --stats.
 
     Examples:
       akash log                   last 20 operations
@@ -1922,7 +1929,7 @@ def cmd_log(
     if stats:
         s = log_summary()
         if s["total"] == 0:
-            _info("no log entries yet — run some commands first")
+            _info("no log entries yet - run some commands first")
             return
         _p()
         print(f"  {_C}◈{_RS}  operation history")
@@ -1978,7 +1985,7 @@ def cmd_log(
 # ── akash env ─────────────────────────────────────────────────────────────────
 
 env_app = typer.Typer(
-    help="Encrypted local .env store — set, get, push, pull.",
+    help="Encrypted local .env store - set, get, push, pull.",
     rich_markup_mode=None,
 )
 app.add_typer(env_app, name="env", help="set · get · push · pull encrypted .env variables")
@@ -2003,14 +2010,14 @@ def env_list(name: Optional[str] = typer.Argument(None, help="Env name to list k
         _p()
         max_k = max(len(k) for k in data)
         for k, v in sorted(data.items()):
-            # Redact long secrets — show first 4 chars then ***
+            # Redact long secrets - show first 4 chars then ***
             disp = v if len(v) <= 6 else v[:4] + "***"
             print(f"  {_DM}{k:<{max_k}}{_RS}  {disp}")
         _p()
     else:
         envs = list_envs()
         if not envs:
-            _info("no env stores yet — create with: akash env set <NAME> KEY=VALUE")
+            _info("no env stores yet - create with: akash env set <NAME> KEY=VALUE")
             return
         _p()
         for e in envs:
@@ -2198,7 +2205,7 @@ def env_push(
 ):
     """Upload an encrypted env backup to the cloud.
 
-    The backup is machine-encrypted — only the same machine key can decrypt it.
+    The backup is machine-encrypted - only the same machine key can decrypt it.
     Share the code with your team, then they run: akash env pull <CODE> <NAME>
 
     Example:

{akashcli-4.6.5 → akashcli-4.6.7}/akashcli/relay.py

@@ -25,7 +25,7 @@ Wire protocol (all JSON frames over the relay WebSocket):
 
 from __future__ import annotations
 
-AKASH_VERSION = "4.6.5"
+AKASH_VERSION = "4.6.7"
 
 import base64
 import json

{akashcli-4.6.5 → akashcli-4.6.7}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.6.5
+Version: 4.6.7
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.6.5 → akashcli-4.6.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "4.6.5"
+version = "4.6.7"
 description = "Akash CLI — secure remote shell relay, file vault, and device management"
 readme = "README.md"
 requires-python = ">=3.9"