feat: remote client deel 1
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"agent_access_token": "change-me-agent-token",
|
||||
"client_id": "",
|
||||
"display_name": "MacBook Pro van Jan",
|
||||
"endpoint": "http://192.168.1.25:8765",
|
||||
"heartbeat_interval_seconds": 20,
|
||||
"platform": "macos",
|
||||
"registration_token": "change-me-registration-token",
|
||||
"shares": {
|
||||
"downloads": "/Users/jan/Downloads",
|
||||
"movies": "/Users/jan/Movies",
|
||||
"pictures": "/Users/jan/Pictures"
|
||||
},
|
||||
"webmanager_base_url": "http://127.0.0.1:8080"
|
||||
}
|
||||
@@ -0,0 +1,168 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import sys
|
||||
import time
|
||||
import uuid
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
from urllib import error, request
|
||||
|
||||
|
||||
AGENT_VERSION = "1.1.0-phase1"
|
||||
|
||||
|
||||
@dataclass
|
||||
class AgentConfig:
|
||||
config_path: Path
|
||||
webmanager_base_url: str
|
||||
registration_token: str
|
||||
agent_access_token: str
|
||||
display_name: str
|
||||
endpoint: str
|
||||
shares: dict[str, str]
|
||||
heartbeat_interval_seconds: int
|
||||
client_id: str
|
||||
platform: str = "macos"
|
||||
|
||||
@property
|
||||
def normalized_base_url(self) -> str:
|
||||
return self.webmanager_base_url.rstrip("/")
|
||||
|
||||
|
||||
def load_config(config_path: Path) -> AgentConfig:
|
||||
raw = json.loads(config_path.read_text(encoding="utf-8"))
|
||||
client_id = str(raw.get("client_id", "")).strip()
|
||||
if not client_id:
|
||||
client_id = str(uuid.uuid4())
|
||||
raw["client_id"] = client_id
|
||||
config_path.write_text(json.dumps(raw, indent=2, sort_keys=True) + "\n", encoding="utf-8")
|
||||
|
||||
shares_raw = raw.get("shares") or {}
|
||||
shares: dict[str, str] = {}
|
||||
if isinstance(shares_raw, dict):
|
||||
for key, value in shares_raw.items():
|
||||
normalized_key = str(key).strip()
|
||||
normalized_value = str(value).strip()
|
||||
if normalized_key and normalized_value:
|
||||
shares[normalized_key] = normalized_value
|
||||
|
||||
if not shares:
|
||||
raise ValueError("config requires at least one share")
|
||||
|
||||
return AgentConfig(
|
||||
config_path=config_path,
|
||||
webmanager_base_url=str(raw.get("webmanager_base_url", "")).strip(),
|
||||
registration_token=str(raw.get("registration_token", "")).strip(),
|
||||
agent_access_token=str(raw.get("agent_access_token", "")).strip(),
|
||||
display_name=str(raw.get("display_name", "")).strip(),
|
||||
endpoint=str(raw.get("public_endpoint", raw.get("endpoint", ""))).strip(),
|
||||
shares=shares,
|
||||
heartbeat_interval_seconds=max(5, int(raw.get("heartbeat_interval_seconds", 20))),
|
||||
client_id=client_id,
|
||||
platform=str(raw.get("platform", "macos")).strip() or "macos",
|
||||
)
|
||||
|
||||
|
||||
def require_non_empty(value: str, field: str) -> str:
|
||||
normalized = value.strip()
|
||||
if not normalized:
|
||||
raise ValueError(f"config field '{field}' is required")
|
||||
return normalized
|
||||
|
||||
|
||||
def build_register_payload(config: AgentConfig) -> dict[str, Any]:
|
||||
return {
|
||||
"client_id": config.client_id,
|
||||
"display_name": config.display_name,
|
||||
"platform": config.platform,
|
||||
"agent_version": AGENT_VERSION,
|
||||
"endpoint": config.endpoint,
|
||||
"shares": [{"key": key, "label": key.capitalize()} for key in sorted(config.shares.keys())],
|
||||
}
|
||||
|
||||
|
||||
def build_heartbeat_payload(config: AgentConfig) -> dict[str, Any]:
|
||||
return {
|
||||
"client_id": config.client_id,
|
||||
"agent_version": AGENT_VERSION,
|
||||
}
|
||||
|
||||
|
||||
def post_json(url: str, token: str, payload: dict[str, Any]) -> dict[str, Any]:
|
||||
data = json.dumps(payload).encode("utf-8")
|
||||
req = request.Request(
|
||||
url,
|
||||
method="POST",
|
||||
data=data,
|
||||
headers={
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {token}",
|
||||
},
|
||||
)
|
||||
with request.urlopen(req, timeout=10) as resp:
|
||||
return json.loads(resp.read().decode("utf-8"))
|
||||
|
||||
|
||||
def run(config: AgentConfig) -> None:
|
||||
require_non_empty(config.webmanager_base_url, "webmanager_base_url")
|
||||
require_non_empty(config.registration_token, "registration_token")
|
||||
require_non_empty(config.agent_access_token, "agent_access_token")
|
||||
require_non_empty(config.display_name, "display_name")
|
||||
require_non_empty(config.endpoint, "public_endpoint")
|
||||
|
||||
register_url = f"{config.normalized_base_url}/api/clients/register"
|
||||
heartbeat_url = f"{config.normalized_base_url}/api/clients/heartbeat"
|
||||
|
||||
print(f"Starting remote client agent for {config.display_name} ({config.client_id})", flush=True)
|
||||
print("agent_access_token is configured for future authenticated agent endpoints", flush=True)
|
||||
|
||||
while True:
|
||||
try:
|
||||
post_json(register_url, config.registration_token, build_register_payload(config))
|
||||
print("register ok", flush=True)
|
||||
break
|
||||
except error.HTTPError as exc:
|
||||
print(f"register failed: HTTP {exc.code}", file=sys.stderr, flush=True)
|
||||
except error.URLError as exc:
|
||||
print(f"register failed: {exc.reason}", file=sys.stderr, flush=True)
|
||||
time.sleep(config.heartbeat_interval_seconds)
|
||||
|
||||
while True:
|
||||
try:
|
||||
post_json(heartbeat_url, config.registration_token, build_heartbeat_payload(config))
|
||||
print("heartbeat ok", flush=True)
|
||||
except error.HTTPError as exc:
|
||||
print(f"heartbeat failed: HTTP {exc.code}", file=sys.stderr, flush=True)
|
||||
except error.URLError as exc:
|
||||
print(f"heartbeat failed: {exc.reason}", file=sys.stderr, flush=True)
|
||||
time.sleep(config.heartbeat_interval_seconds)
|
||||
|
||||
|
||||
def parse_args() -> argparse.Namespace:
|
||||
parser = argparse.ArgumentParser(description="Remote client agent Phase 1 for WebManager MVP")
|
||||
parser.add_argument(
|
||||
"--config",
|
||||
default=str(Path(__file__).resolve().with_name("remote_client_agent.example.json")),
|
||||
help="Path to remote client agent config JSON",
|
||||
)
|
||||
return parser.parse_args()
|
||||
|
||||
|
||||
def main() -> int:
|
||||
args = parse_args()
|
||||
try:
|
||||
config = load_config(Path(args.config).resolve())
|
||||
run(config)
|
||||
except KeyboardInterrupt:
|
||||
return 130
|
||||
except Exception as exc:
|
||||
print(str(exc), file=sys.stderr)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
Reference in New Issue
Block a user