forked from wrenn/wrenn
Merge pull request 'Set up working host registration (including BYOC) with the CP' (#6) from host-registration into dev
Reviewed-on: wrenn/sandbox#6
This commit is contained in:
@ -6,7 +6,6 @@ REDIS_URL=redis://localhost:6379/0
|
|||||||
|
|
||||||
# Control Plane
|
# Control Plane
|
||||||
CP_LISTEN_ADDR=:8000
|
CP_LISTEN_ADDR=:8000
|
||||||
CP_HOST_AGENT_ADDR=localhost:50051
|
|
||||||
|
|
||||||
# Host Agent
|
# Host Agent
|
||||||
AGENT_LISTEN_ADDR=:50051
|
AGENT_LISTEN_ADDR=:50051
|
||||||
|
|||||||
@ -17,7 +17,8 @@ import (
|
|||||||
"git.omukk.dev/wrenn/sandbox/internal/auth/oauth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth/oauth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/config"
|
"git.omukk.dev/wrenn/sandbox/internal/config"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/scheduler"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@ -66,12 +67,11 @@ func main() {
|
|||||||
}
|
}
|
||||||
slog.Info("connected to redis")
|
slog.Info("connected to redis")
|
||||||
|
|
||||||
// Connect RPC client for the host agent.
|
// Host client pool — manages Connect RPC clients to host agents.
|
||||||
agentHTTP := &http.Client{Timeout: 10 * time.Minute}
|
hostPool := lifecycle.NewHostClientPool()
|
||||||
agentClient := hostagentv1connect.NewHostAgentServiceClient(
|
|
||||||
agentHTTP,
|
// Scheduler — picks a host for each new sandbox (round-robin for now).
|
||||||
cfg.HostAgentAddr,
|
hostScheduler := scheduler.NewRoundRobinScheduler(queries)
|
||||||
)
|
|
||||||
|
|
||||||
// OAuth provider registry.
|
// OAuth provider registry.
|
||||||
oauthRegistry := oauth.NewRegistry()
|
oauthRegistry := oauth.NewRegistry()
|
||||||
@ -87,11 +87,11 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// API server.
|
// API server.
|
||||||
srv := api.New(queries, agentClient, pool, rdb, []byte(cfg.JWTSecret), oauthRegistry, cfg.OAuthRedirectURL)
|
srv := api.New(queries, hostPool, hostScheduler, pool, rdb, []byte(cfg.JWTSecret), oauthRegistry, cfg.OAuthRedirectURL)
|
||||||
|
|
||||||
// Start reconciler.
|
// Start host monitor (passive + active reconciliation every 30s).
|
||||||
reconciler := api.NewReconciler(queries, agentClient, "default", 5*time.Second)
|
monitor := api.NewHostMonitor(queries, hostPool, 30*time.Second)
|
||||||
reconciler.Start(ctx)
|
monitor.Start(ctx)
|
||||||
|
|
||||||
httpServer := &http.Server{
|
httpServer := &http.Server{
|
||||||
Addr: cfg.ListenAddr,
|
Addr: cfg.ListenAddr,
|
||||||
@ -114,7 +114,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
slog.Info("control plane starting", "addr", cfg.ListenAddr, "agent", cfg.HostAgentAddr)
|
slog.Info("control plane starting", "addr", cfg.ListenAddr)
|
||||||
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||||
slog.Error("http server error", "error", err)
|
slog.Error("http server error", "error", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|||||||
@ -8,9 +8,12 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/joho/godotenv"
|
||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/devicemapper"
|
"git.omukk.dev/wrenn/sandbox/internal/devicemapper"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/hostagent"
|
"git.omukk.dev/wrenn/sandbox/internal/hostagent"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/sandbox"
|
"git.omukk.dev/wrenn/sandbox/internal/sandbox"
|
||||||
@ -18,7 +21,10 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
registrationToken := flag.String("register", "", "One-time registration token from the control plane")
|
// Best-effort load — missing .env file is fine.
|
||||||
|
_ = godotenv.Load()
|
||||||
|
|
||||||
|
registrationToken := flag.String("register", "", "One-time registration token from the control plane (required on first run)")
|
||||||
advertiseAddr := flag.String("address", "", "Externally-reachable address (ip:port) for this host agent")
|
advertiseAddr := flag.String("address", "", "Externally-reachable address (ip:port) for this host agent")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
@ -42,7 +48,16 @@ func main() {
|
|||||||
listenAddr := envOrDefault("AGENT_LISTEN_ADDR", ":50051")
|
listenAddr := envOrDefault("AGENT_LISTEN_ADDR", ":50051")
|
||||||
rootDir := envOrDefault("AGENT_FILES_ROOTDIR", "/var/lib/wrenn")
|
rootDir := envOrDefault("AGENT_FILES_ROOTDIR", "/var/lib/wrenn")
|
||||||
cpURL := os.Getenv("AGENT_CP_URL")
|
cpURL := os.Getenv("AGENT_CP_URL")
|
||||||
tokenFile := filepath.Join(rootDir, "host-token")
|
tokenFile := filepath.Join(rootDir, "host.jwt")
|
||||||
|
|
||||||
|
if cpURL == "" {
|
||||||
|
slog.Error("AGENT_CP_URL environment variable is required")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
if *advertiseAddr == "" {
|
||||||
|
slog.Error("--address flag is required (externally-reachable ip:port)")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
cfg := sandbox.Config{
|
cfg := sandbox.Config{
|
||||||
KernelPath: filepath.Join(rootDir, "kernels", "vmlinux"),
|
KernelPath: filepath.Join(rootDir, "kernels", "vmlinux"),
|
||||||
@ -58,13 +73,7 @@ func main() {
|
|||||||
|
|
||||||
mgr.StartTTLReaper(ctx)
|
mgr.StartTTLReaper(ctx)
|
||||||
|
|
||||||
if *advertiseAddr == "" {
|
// Register with the control plane and start heartbeating.
|
||||||
slog.Error("--address flag is required (externally-reachable ip:port)")
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Register with the control plane (if configured).
|
|
||||||
if cpURL != "" {
|
|
||||||
hostToken, err := hostagent.Register(ctx, hostagent.RegistrationConfig{
|
hostToken, err := hostagent.Register(ctx, hostagent.RegistrationConfig{
|
||||||
CPURL: cpURL,
|
CPURL: cpURL,
|
||||||
RegistrationToken: *registrationToken,
|
RegistrationToken: *registrationToken,
|
||||||
@ -83,39 +92,61 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
slog.Info("host registered", "host_id", hostID)
|
slog.Info("host registered", "host_id", hostID)
|
||||||
hostagent.StartHeartbeat(ctx, cpURL, hostID, hostToken, 30*time.Second)
|
|
||||||
|
// httpServer is declared here so the shutdown func can reference it.
|
||||||
|
httpServer := &http.Server{Addr: listenAddr}
|
||||||
|
|
||||||
|
// doShutdown is the single shutdown path. sync.Once ensures mgr.Shutdown
|
||||||
|
// and httpServer.Shutdown are each called exactly once regardless of
|
||||||
|
// whether shutdown is triggered by a signal, a heartbeat 404, or the
|
||||||
|
// Terminate RPC.
|
||||||
|
var shutdownOnce sync.Once
|
||||||
|
doShutdown := func(reason string) {
|
||||||
|
shutdownOnce.Do(func() {
|
||||||
|
slog.Info("shutting down", "reason", reason)
|
||||||
|
cancel()
|
||||||
|
shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||||
|
defer shutdownCancel()
|
||||||
|
mgr.Shutdown(shutdownCtx)
|
||||||
|
if err := httpServer.Shutdown(shutdownCtx); err != nil {
|
||||||
|
slog.Error("http server shutdown error", "error", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
srv := hostagent.NewServer(mgr)
|
srv := hostagent.NewServer(mgr, func() {
|
||||||
|
doShutdown("Terminate RPC received")
|
||||||
|
})
|
||||||
path, handler := hostagentv1connect.NewHostAgentServiceHandler(srv)
|
path, handler := hostagentv1connect.NewHostAgentServiceHandler(srv)
|
||||||
|
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.Handle(path, handler)
|
mux.Handle(path, handler)
|
||||||
|
httpServer.Handler = mux
|
||||||
|
|
||||||
httpServer := &http.Server{
|
// Start heartbeat loop. Handler must be set before this because the
|
||||||
Addr: listenAddr,
|
// immediate beat can trigger doShutdown → httpServer.Shutdown synchronously.
|
||||||
Handler: mux,
|
hostagent.StartHeartbeat(ctx, cpURL, tokenFile, hostID, 30*time.Second,
|
||||||
}
|
// pauseAll: called on 3 consecutive network failures.
|
||||||
|
func() {
|
||||||
|
pauseCtx, pauseCancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||||
|
defer pauseCancel()
|
||||||
|
mgr.PauseAll(pauseCtx)
|
||||||
|
},
|
||||||
|
// onDeleted: called when CP returns 404 (host was deleted).
|
||||||
|
func() {
|
||||||
|
doShutdown("host deleted from CP")
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
// Graceful shutdown on signal.
|
// Graceful shutdown on SIGINT/SIGTERM.
|
||||||
sigCh := make(chan os.Signal, 1)
|
sigCh := make(chan os.Signal, 1)
|
||||||
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||||
go func() {
|
go func() {
|
||||||
sig := <-sigCh
|
sig := <-sigCh
|
||||||
slog.Info("received signal, shutting down", "signal", sig)
|
doShutdown("signal: " + sig.String())
|
||||||
cancel()
|
|
||||||
|
|
||||||
shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
||||||
defer shutdownCancel()
|
|
||||||
|
|
||||||
mgr.Shutdown(shutdownCtx)
|
|
||||||
|
|
||||||
if err := httpServer.Shutdown(shutdownCtx); err != nil {
|
|
||||||
slog.Error("http server shutdown error", "error", err)
|
|
||||||
}
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
slog.Info("host agent starting", "addr", listenAddr)
|
slog.Info("host agent starting", "addr", listenAddr, "host_id", hostID)
|
||||||
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||||
slog.Error("http server error", "error", err)
|
slog.Error("http server error", "error", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|||||||
19
db/migrations/20260324120214_host_refresh_tokens.sql
Normal file
19
db/migrations/20260324120214_host_refresh_tokens.sql
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
-- +goose Up
|
||||||
|
|
||||||
|
-- Refresh tokens for host agent JWT rotation.
|
||||||
|
-- Hosts exchange a refresh token for a new short-lived JWT + new refresh token (rotation).
|
||||||
|
-- Refresh tokens expire after 60 days; hosts must re-register with a new one-time token after that.
|
||||||
|
CREATE TABLE host_refresh_tokens (
|
||||||
|
id TEXT PRIMARY KEY,
|
||||||
|
host_id TEXT NOT NULL REFERENCES hosts(id) ON DELETE CASCADE,
|
||||||
|
token_hash TEXT NOT NULL UNIQUE, -- SHA-256 hex of the opaque token
|
||||||
|
expires_at TIMESTAMPTZ NOT NULL,
|
||||||
|
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||||
|
revoked_at TIMESTAMPTZ -- NULL = active; set on rotation or host delete
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_host_refresh_tokens_host ON host_refresh_tokens(host_id);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
|
||||||
|
DROP TABLE host_refresh_tokens;
|
||||||
19
db/queries/host_refresh_tokens.sql
Normal file
19
db/queries/host_refresh_tokens.sql
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
-- name: InsertHostRefreshToken :one
|
||||||
|
INSERT INTO host_refresh_tokens (id, host_id, token_hash, expires_at)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING *;
|
||||||
|
|
||||||
|
-- name: GetHostRefreshTokenByHash :one
|
||||||
|
SELECT * FROM host_refresh_tokens
|
||||||
|
WHERE token_hash = $1 AND revoked_at IS NULL AND expires_at > NOW();
|
||||||
|
|
||||||
|
-- name: RevokeHostRefreshToken :exec
|
||||||
|
UPDATE host_refresh_tokens SET revoked_at = NOW() WHERE id = $1;
|
||||||
|
|
||||||
|
-- name: RevokeHostRefreshTokensByHost :exec
|
||||||
|
UPDATE host_refresh_tokens SET revoked_at = NOW()
|
||||||
|
WHERE host_id = $1 AND revoked_at IS NULL;
|
||||||
|
|
||||||
|
-- name: DeleteExpiredHostRefreshTokens :exec
|
||||||
|
DELETE FROM host_refresh_tokens
|
||||||
|
WHERE expires_at < NOW() OR revoked_at IS NOT NULL;
|
||||||
@ -67,3 +67,19 @@ SELECT * FROM host_tokens WHERE host_id = $1 ORDER BY created_at DESC;
|
|||||||
|
|
||||||
-- name: GetHostByTeam :one
|
-- name: GetHostByTeam :one
|
||||||
SELECT * FROM hosts WHERE id = $1 AND team_id = $2;
|
SELECT * FROM hosts WHERE id = $1 AND team_id = $2;
|
||||||
|
|
||||||
|
-- name: ListActiveHosts :many
|
||||||
|
-- Returns all hosts that have completed registration (not pending/offline).
|
||||||
|
SELECT * FROM hosts WHERE status NOT IN ('pending', 'offline') ORDER BY created_at;
|
||||||
|
|
||||||
|
-- name: UpdateHostHeartbeatAndStatus :execrows
|
||||||
|
-- Updates last_heartbeat_at and transitions unreachable hosts back to online.
|
||||||
|
-- Returns 0 if no host was found (deleted), which the caller treats as 404.
|
||||||
|
UPDATE hosts
|
||||||
|
SET last_heartbeat_at = NOW(),
|
||||||
|
status = CASE WHEN status = 'unreachable' THEN 'online' ELSE status END,
|
||||||
|
updated_at = NOW()
|
||||||
|
WHERE id = $1;
|
||||||
|
|
||||||
|
-- name: MarkHostUnreachable :exec
|
||||||
|
UPDATE hosts SET status = 'unreachable', updated_at = NOW() WHERE id = $1;
|
||||||
|
|||||||
@ -56,3 +56,20 @@ WHERE id = ANY($1::text[]);
|
|||||||
SELECT * FROM sandboxes
|
SELECT * FROM sandboxes
|
||||||
WHERE team_id = $1 AND status IN ('running', 'paused', 'starting')
|
WHERE team_id = $1 AND status IN ('running', 'paused', 'starting')
|
||||||
ORDER BY created_at DESC;
|
ORDER BY created_at DESC;
|
||||||
|
|
||||||
|
-- name: MarkSandboxesMissingByHost :exec
|
||||||
|
-- Called when the host monitor marks a host unreachable.
|
||||||
|
-- Marks running/starting/pending sandboxes on that host as 'missing' so users see
|
||||||
|
-- the sandbox is not currently reachable, without permanently losing the record.
|
||||||
|
UPDATE sandboxes
|
||||||
|
SET status = 'missing',
|
||||||
|
last_updated = NOW()
|
||||||
|
WHERE host_id = $1 AND status IN ('running', 'starting', 'pending');
|
||||||
|
|
||||||
|
-- name: BulkRestoreRunning :exec
|
||||||
|
-- Called by the reconciler when a host comes back online and its sandboxes are
|
||||||
|
-- confirmed alive. Restores only sandboxes that are in 'missing' state.
|
||||||
|
UPDATE sandboxes
|
||||||
|
SET status = 'running',
|
||||||
|
last_updated = NOW()
|
||||||
|
WHERE id = ANY($1::text[]) AND status = 'missing';
|
||||||
|
|||||||
84
frontend/src/lib/api/hosts.ts
Normal file
84
frontend/src/lib/api/hosts.ts
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
import { apiFetch } from './client';
|
||||||
|
|
||||||
|
export type Host = {
|
||||||
|
id: string;
|
||||||
|
type: 'regular' | 'byoc';
|
||||||
|
team_id?: string;
|
||||||
|
team_name?: string;
|
||||||
|
provider?: string;
|
||||||
|
availability_zone?: string;
|
||||||
|
arch?: string;
|
||||||
|
cpu_cores?: number;
|
||||||
|
memory_mb?: number;
|
||||||
|
disk_gb?: number;
|
||||||
|
address?: string;
|
||||||
|
status: 'pending' | 'online' | 'offline' | 'unreachable' | 'draining';
|
||||||
|
last_heartbeat_at?: string;
|
||||||
|
created_by: string;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type CreateHostParams = {
|
||||||
|
type: 'regular' | 'byoc';
|
||||||
|
team_id?: string;
|
||||||
|
provider?: string;
|
||||||
|
availability_zone?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type CreateHostResult = {
|
||||||
|
host: Host;
|
||||||
|
registration_token: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function listHosts(): Promise<{ ok: true; data: Host[] } | { ok: false; error: string }> {
|
||||||
|
return apiFetch<Host[]>('GET', '/api/v1/hosts');
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function createHost(
|
||||||
|
params: CreateHostParams
|
||||||
|
): Promise<{ ok: true; data: CreateHostResult } | { ok: false; error: string }> {
|
||||||
|
return apiFetch<CreateHostResult>('POST', '/api/v1/hosts', params);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function deleteHost(
|
||||||
|
id: string,
|
||||||
|
force = false
|
||||||
|
): Promise<{ ok: true } | { ok: false; error: string; sandbox_ids?: string[] }> {
|
||||||
|
const url = `/api/v1/hosts/${id}${force ? '?force=true' : ''}`;
|
||||||
|
const res = await apiFetch<void>('DELETE', url);
|
||||||
|
if (!res.ok) {
|
||||||
|
return res as { ok: false; error: string };
|
||||||
|
}
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getDeletePreview(
|
||||||
|
id: string
|
||||||
|
): Promise<{ ok: true; data: { host: Host; sandbox_ids: string[] } } | { ok: false; error: string }> {
|
||||||
|
return apiFetch<{ host: Host; sandbox_ids: string[] }>('GET', `/api/v1/hosts/${id}/delete-preview`);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function statusColor(status: Host['status']): string {
|
||||||
|
switch (status) {
|
||||||
|
case 'online':
|
||||||
|
return 'var(--color-accent)';
|
||||||
|
case 'pending':
|
||||||
|
return 'var(--color-amber)';
|
||||||
|
case 'offline':
|
||||||
|
case 'unreachable':
|
||||||
|
return 'var(--color-red)';
|
||||||
|
case 'draining':
|
||||||
|
return 'var(--color-blue)';
|
||||||
|
default:
|
||||||
|
return 'var(--color-text-muted)';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatSpecs(host: Host): string {
|
||||||
|
const parts: string[] = [];
|
||||||
|
if (host.cpu_cores) parts.push(`${host.cpu_cores} vCPU`);
|
||||||
|
if (host.memory_mb) parts.push(`${Math.round(host.memory_mb / 1024)}GB RAM`);
|
||||||
|
if (host.disk_gb) parts.push(`${host.disk_gb}GB disk`);
|
||||||
|
return parts.join(' · ') || '—';
|
||||||
|
}
|
||||||
@ -29,6 +29,7 @@ export type TeamWithRole = {
|
|||||||
id: string;
|
id: string;
|
||||||
name: string;
|
name: string;
|
||||||
slug: string;
|
slug: string;
|
||||||
|
is_byoc: boolean;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
role: string;
|
role: string;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -19,12 +19,23 @@ function isTokenExpired(token: string): boolean {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function decodeJWTPayload(token: string): Record<string, unknown> {
|
||||||
|
try {
|
||||||
|
const payload = token.split('.')[1];
|
||||||
|
return JSON.parse(atob(payload.replace(/-/g, '+').replace(/_/g, '/')));
|
||||||
|
} catch {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function createAuth() {
|
function createAuth() {
|
||||||
let token = $state<string | null>(null);
|
let token = $state<string | null>(null);
|
||||||
let userId = $state<string | null>(null);
|
let userId = $state<string | null>(null);
|
||||||
let teamId = $state<string | null>(null);
|
let teamId = $state<string | null>(null);
|
||||||
let email = $state<string | null>(null);
|
let email = $state<string | null>(null);
|
||||||
let name = $state<string | null>(null);
|
let name = $state<string | null>(null);
|
||||||
|
let isAdmin = $state(false);
|
||||||
|
let role = $state<string>('member');
|
||||||
let initialized = $state(false);
|
let initialized = $state(false);
|
||||||
|
|
||||||
// Initialize from localStorage synchronously at module load.
|
// Initialize from localStorage synchronously at module load.
|
||||||
@ -36,6 +47,9 @@ function createAuth() {
|
|||||||
teamId = localStorage.getItem(STORAGE_KEYS.teamId);
|
teamId = localStorage.getItem(STORAGE_KEYS.teamId);
|
||||||
email = localStorage.getItem(STORAGE_KEYS.email);
|
email = localStorage.getItem(STORAGE_KEYS.email);
|
||||||
name = localStorage.getItem(STORAGE_KEYS.name);
|
name = localStorage.getItem(STORAGE_KEYS.name);
|
||||||
|
const payload = decodeJWTPayload(stored);
|
||||||
|
isAdmin = Boolean(payload.is_admin);
|
||||||
|
role = String(payload.role || 'member');
|
||||||
} else if (stored) {
|
} else if (stored) {
|
||||||
// Expired — clean up.
|
// Expired — clean up.
|
||||||
for (const key of Object.values(STORAGE_KEYS)) {
|
for (const key of Object.values(STORAGE_KEYS)) {
|
||||||
@ -63,6 +77,12 @@ function createAuth() {
|
|||||||
get name() {
|
get name() {
|
||||||
return name;
|
return name;
|
||||||
},
|
},
|
||||||
|
get isAdmin() {
|
||||||
|
return isAdmin;
|
||||||
|
},
|
||||||
|
get role() {
|
||||||
|
return role;
|
||||||
|
},
|
||||||
get isAuthenticated() {
|
get isAuthenticated() {
|
||||||
return isAuthenticated;
|
return isAuthenticated;
|
||||||
},
|
},
|
||||||
@ -76,6 +96,9 @@ function createAuth() {
|
|||||||
teamId = data.team_id;
|
teamId = data.team_id;
|
||||||
email = data.email;
|
email = data.email;
|
||||||
name = data.name;
|
name = data.name;
|
||||||
|
const payload = decodeJWTPayload(data.token);
|
||||||
|
isAdmin = Boolean(payload.is_admin);
|
||||||
|
role = String(payload.role || 'member');
|
||||||
|
|
||||||
localStorage.setItem(STORAGE_KEYS.token, data.token);
|
localStorage.setItem(STORAGE_KEYS.token, data.token);
|
||||||
localStorage.setItem(STORAGE_KEYS.userId, data.user_id);
|
localStorage.setItem(STORAGE_KEYS.userId, data.user_id);
|
||||||
@ -90,6 +113,8 @@ function createAuth() {
|
|||||||
teamId = null;
|
teamId = null;
|
||||||
email = null;
|
email = null;
|
||||||
name = null;
|
name = null;
|
||||||
|
isAdmin = false;
|
||||||
|
role = 'member';
|
||||||
|
|
||||||
for (const key of Object.values(STORAGE_KEYS)) {
|
for (const key of Object.values(STORAGE_KEYS)) {
|
||||||
localStorage.removeItem(key);
|
localStorage.removeItem(key);
|
||||||
|
|||||||
184
frontend/src/lib/components/AdminSidebar.svelte
Normal file
184
frontend/src/lib/components/AdminSidebar.svelte
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/stores';
|
||||||
|
import { auth } from '$lib/auth.svelte';
|
||||||
|
import {
|
||||||
|
IconServer,
|
||||||
|
IconSettings,
|
||||||
|
IconLogout,
|
||||||
|
IconSidebar,
|
||||||
|
IconBell,
|
||||||
|
IconDocs,
|
||||||
|
IconChevron,
|
||||||
|
IconShield
|
||||||
|
} from './icons';
|
||||||
|
|
||||||
|
let { collapsed = $bindable(false) }: { collapsed: boolean } = $props();
|
||||||
|
|
||||||
|
type NavItem = {
|
||||||
|
label: string;
|
||||||
|
icon: typeof IconServer;
|
||||||
|
href: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const managementItems: NavItem[] = [
|
||||||
|
{ label: 'Hosts', icon: IconServer, href: '/admin/hosts' }
|
||||||
|
];
|
||||||
|
|
||||||
|
function isActive(href: string): boolean {
|
||||||
|
const p = $page.url.pathname;
|
||||||
|
return p === href || p.startsWith(href + '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleCollapsed() {
|
||||||
|
collapsed = !collapsed;
|
||||||
|
localStorage.setItem('wrenn_sidebar_collapsed', String(collapsed));
|
||||||
|
}
|
||||||
|
|
||||||
|
let userName = $derived(auth.name || auth.email || '');
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<aside
|
||||||
|
class="relative flex h-screen shrink-0 flex-col overflow-hidden border-r border-[var(--color-border)] bg-[var(--color-bg-1)] transition-[width] duration-250 ease-in-out"
|
||||||
|
style="width: {collapsed ? '56px' : '230px'}"
|
||||||
|
>
|
||||||
|
<!-- Subtle accent top-edge — marks this as an elevated context -->
|
||||||
|
<div class="absolute inset-x-0 top-0 h-[2px] bg-gradient-to-r from-[var(--color-accent)]/60 via-[var(--color-accent)] to-[var(--color-accent)]/60"></div>
|
||||||
|
|
||||||
|
<!-- Brand + collapse toggle -->
|
||||||
|
<div class="flex shrink-0 items-center px-4 pt-6 pb-4 {collapsed ? 'justify-center' : 'justify-between'}">
|
||||||
|
{#if !collapsed}
|
||||||
|
<div class="flex items-center gap-2.5">
|
||||||
|
<div class="relative">
|
||||||
|
<img
|
||||||
|
src="/logo.svg"
|
||||||
|
alt="Wrenn"
|
||||||
|
class="h-7 w-7 shrink-0 rounded-[var(--radius-logo)]"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-col gap-0.5 leading-none">
|
||||||
|
<span class="font-brand text-[1.286rem] text-[var(--color-text-bright)]">Wrenn</span>
|
||||||
|
<span class="inline-flex w-fit items-center gap-1 rounded-full bg-[var(--color-accent)]/15 px-1.5 py-px text-[10px] font-bold uppercase tracking-[0.1em] text-[var(--color-accent-bright)]">
|
||||||
|
<IconShield size={8} />
|
||||||
|
Admin
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<!-- Collapsed: show shield as admin identity marker -->
|
||||||
|
<div class="flex h-7 w-7 items-center justify-center rounded-[var(--radius-button)] bg-[var(--color-accent)]/10 text-[var(--color-accent-bright)]">
|
||||||
|
<IconShield size={14} />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
<button
|
||||||
|
onclick={toggleCollapsed}
|
||||||
|
class="flex h-7 w-7 shrink-0 items-center justify-center rounded-[var(--radius-button)] text-[var(--color-text-tertiary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-secondary)] {collapsed ? 'absolute top-5 right-1.5' : ''}"
|
||||||
|
title={collapsed ? 'Expand sidebar' : 'Collapse sidebar'}
|
||||||
|
>
|
||||||
|
<IconSidebar size={16} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Back to dashboard -->
|
||||||
|
<div class="px-3 pb-3 {collapsed ? 'px-1.5' : ''}">
|
||||||
|
<a
|
||||||
|
href="/dashboard"
|
||||||
|
class="flex items-center rounded-[var(--radius-input)] px-2.5 py-2 text-ui text-[var(--color-text-tertiary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-secondary)] {collapsed ? 'justify-center px-2' : 'gap-2'}"
|
||||||
|
title={collapsed ? 'Back to dashboard' : undefined}
|
||||||
|
>
|
||||||
|
<IconChevron size={12} direction="left" class="shrink-0" />
|
||||||
|
{#if !collapsed}<span>Dashboard</span>{/if}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mx-4 mb-3 h-px bg-[var(--color-border)] {collapsed ? 'mx-3' : ''}"></div>
|
||||||
|
|
||||||
|
<!-- Navigation -->
|
||||||
|
<nav class="flex-1 overflow-y-auto px-3 {collapsed ? 'px-1.5' : ''}">
|
||||||
|
<div class="mb-3">
|
||||||
|
{#if !collapsed}
|
||||||
|
<div class="mb-1 px-2.5 py-1.5 text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">
|
||||||
|
Management
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="mx-1 my-2 h-px bg-[var(--color-border)]"></div>
|
||||||
|
{/if}
|
||||||
|
{#each managementItems as item}
|
||||||
|
{#if isActive(item.href)}
|
||||||
|
<a
|
||||||
|
href={item.href}
|
||||||
|
class="group relative flex items-center rounded-[var(--radius-input)] bg-[var(--color-accent-glow-mid)] px-2.5 py-2.5 transition-colors duration-150 {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? item.label : undefined}
|
||||||
|
>
|
||||||
|
{#if !collapsed}
|
||||||
|
<div class="absolute left-0 top-1/2 h-5 w-[3px] -translate-y-1/2 rounded-r-full bg-[var(--color-accent)]"></div>
|
||||||
|
{/if}
|
||||||
|
<item.icon size={16} class="shrink-0 text-[var(--color-accent-bright)]" />
|
||||||
|
{#if !collapsed}
|
||||||
|
<span class="text-ui font-medium text-[var(--color-accent-bright)]">{item.label}</span>
|
||||||
|
{/if}
|
||||||
|
</a>
|
||||||
|
{:else}
|
||||||
|
<a
|
||||||
|
href={item.href}
|
||||||
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 transition-colors duration-150 hover:bg-[var(--color-bg-3)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? item.label : undefined}
|
||||||
|
>
|
||||||
|
<item.icon size={16} class="shrink-0 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
|
||||||
|
{#if !collapsed}
|
||||||
|
<span class="text-ui text-[var(--color-text-primary)] transition-colors duration-150 group-hover:text-[var(--color-text-bright)]">{item.label}</span>
|
||||||
|
{/if}
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<!-- Bottom links -->
|
||||||
|
<div class="shrink-0 px-3 pb-1 {collapsed ? 'px-1.5' : ''}">
|
||||||
|
<a
|
||||||
|
href="/docs"
|
||||||
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? 'Docs' : undefined}
|
||||||
|
>
|
||||||
|
<IconDocs size={16} class="shrink-0 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
|
||||||
|
{#if !collapsed}<span class="text-ui">Docs</span>{/if}
|
||||||
|
</a>
|
||||||
|
<a
|
||||||
|
href="/dashboard/notifications"
|
||||||
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? 'Notifications' : undefined}
|
||||||
|
>
|
||||||
|
<IconBell size={16} class="shrink-0 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
|
||||||
|
{#if !collapsed}<span class="text-ui">Notifications</span>{/if}
|
||||||
|
</a>
|
||||||
|
<a
|
||||||
|
href="/dashboard/settings"
|
||||||
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? 'Settings' : undefined}
|
||||||
|
>
|
||||||
|
<IconSettings size={16} class="shrink-0 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
|
||||||
|
{#if !collapsed}<span class="text-ui">Settings</span>{/if}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- User footer -->
|
||||||
|
<div
|
||||||
|
class="flex shrink-0 items-center border-t border-[var(--color-border)] px-3 py-2.5 {collapsed ? 'justify-center px-1.5' : 'gap-2.5'}"
|
||||||
|
>
|
||||||
|
{#if !collapsed}
|
||||||
|
<div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-[var(--color-bg-4)] text-badge font-bold uppercase text-[var(--color-text-secondary)]">
|
||||||
|
{userName[0] ?? ''}
|
||||||
|
</div>
|
||||||
|
<span class="flex-1 truncate text-ui text-[var(--color-text-secondary)]">
|
||||||
|
{userName}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
<button
|
||||||
|
onclick={() => auth.logout()}
|
||||||
|
class="flex shrink-0 items-center justify-center rounded-[var(--radius-button)] transition-colors duration-150 hover:text-[var(--color-red)] {collapsed ? 'h-7 w-7 text-[var(--color-text-muted)] hover:bg-[var(--color-bg-3)]' : 'h-6 w-6 text-[var(--color-text-tertiary)]'}"
|
||||||
|
title="Sign out"
|
||||||
|
>
|
||||||
|
<IconLogout size={collapsed ? 15 : 14} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
@ -19,7 +19,9 @@
|
|||||||
IconSidebar,
|
IconSidebar,
|
||||||
IconBell,
|
IconBell,
|
||||||
IconDocs,
|
IconDocs,
|
||||||
IconAudit
|
IconAudit,
|
||||||
|
IconServer,
|
||||||
|
IconShield
|
||||||
} from './icons';
|
} from './icons';
|
||||||
|
|
||||||
let { collapsed = $bindable(false) }: { collapsed: boolean } = $props();
|
let { collapsed = $bindable(false) }: { collapsed: boolean } = $props();
|
||||||
@ -39,6 +41,8 @@
|
|||||||
label: string;
|
label: string;
|
||||||
icon: typeof IconMonitor;
|
icon: typeof IconMonitor;
|
||||||
href: string;
|
href: string;
|
||||||
|
disabled?: boolean;
|
||||||
|
disabledHint?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
const platformItems: NavItem[] = [
|
const platformItems: NavItem[] = [
|
||||||
@ -46,11 +50,24 @@
|
|||||||
{ label: 'Templates', icon: IconBox, href: '/dashboard/snapshots' }
|
{ label: 'Templates', icon: IconBox, href: '/dashboard/snapshots' }
|
||||||
];
|
];
|
||||||
|
|
||||||
const managementItems: NavItem[] = [
|
let currentTeamIsByoc = $derived(
|
||||||
|
teamsStore.list.find((t) => t.id === auth.teamId)?.is_byoc ?? false
|
||||||
|
);
|
||||||
|
|
||||||
|
let managementItems = $derived<NavItem[]>([
|
||||||
{ label: 'Keys', icon: IconKey, href: '/dashboard/keys' },
|
{ label: 'Keys', icon: IconKey, href: '/dashboard/keys' },
|
||||||
{ label: 'Team', icon: IconMembers, href: '/dashboard/team' },
|
{ label: 'Team', icon: IconMembers, href: '/dashboard/team' },
|
||||||
{ label: 'Audit Logs', icon: IconAudit, href: '/dashboard/audit' }
|
{ label: 'Audit Logs', icon: IconAudit, href: '/dashboard/audit' },
|
||||||
];
|
...(currentTeamIsByoc
|
||||||
|
? [{
|
||||||
|
label: 'BYOC',
|
||||||
|
icon: IconServer,
|
||||||
|
href: '/dashboard/byoc',
|
||||||
|
disabled: auth.role === 'member',
|
||||||
|
disabledHint: 'Available to team owners and admins only'
|
||||||
|
}]
|
||||||
|
: [])
|
||||||
|
]);
|
||||||
|
|
||||||
const billingItems: NavItem[] = [
|
const billingItems: NavItem[] = [
|
||||||
{ label: 'Usage', icon: IconUsage, href: '/dashboard/usage' },
|
{ label: 'Usage', icon: IconUsage, href: '/dashboard/usage' },
|
||||||
@ -232,6 +249,16 @@
|
|||||||
|
|
||||||
<!-- Bottom links -->
|
<!-- Bottom links -->
|
||||||
<div class="shrink-0 px-3 pb-1 {collapsed ? 'px-1.5' : ''}">
|
<div class="shrink-0 px-3 pb-1 {collapsed ? 'px-1.5' : ''}">
|
||||||
|
{#if auth.isAdmin}
|
||||||
|
<a
|
||||||
|
href="/admin"
|
||||||
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
|
title={collapsed ? 'Admin' : undefined}
|
||||||
|
>
|
||||||
|
<IconShield size={16} class="shrink-0 opacity-50 transition-opacity duration-150 group-hover:opacity-100" />
|
||||||
|
{#if !collapsed}<span class="text-ui">Admin</span>{/if}
|
||||||
|
</a>
|
||||||
|
{/if}
|
||||||
<a
|
<a
|
||||||
href="/docs"
|
href="/docs"
|
||||||
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
class="group flex items-center rounded-[var(--radius-input)] px-2.5 py-2.5 text-[var(--color-text-secondary)] transition-colors duration-150 hover:bg-[var(--color-bg-3)] hover:text-[var(--color-text-primary)] {collapsed ? 'justify-center px-2' : 'gap-3'}"
|
||||||
@ -300,7 +327,19 @@
|
|||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{#each items as item}
|
{#each items as item}
|
||||||
{#if isActive(item.href)}
|
{#if item.disabled}
|
||||||
|
<div
|
||||||
|
class="flex cursor-not-allowed items-center rounded-[var(--radius-input)] px-2.5 py-2.5 opacity-35 {collapsed
|
||||||
|
? 'justify-center px-2'
|
||||||
|
: 'gap-3'}"
|
||||||
|
title={collapsed ? item.disabledHint ?? item.label : item.disabledHint}
|
||||||
|
>
|
||||||
|
<item.icon size={16} class="shrink-0" />
|
||||||
|
{#if !collapsed}
|
||||||
|
<span class="text-ui text-[var(--color-text-primary)]">{item.label}</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{:else if isActive(item.href)}
|
||||||
<a
|
<a
|
||||||
href={item.href}
|
href={item.href}
|
||||||
class="group relative flex items-center rounded-[var(--radius-input)] bg-[var(--color-accent-glow-mid)] px-2.5 py-2.5 transition-colors duration-150 {collapsed
|
class="group relative flex items-center rounded-[var(--radius-input)] bg-[var(--color-accent-glow-mid)] px-2.5 py-2.5 transition-colors duration-150 {collapsed
|
||||||
|
|||||||
19
frontend/src/lib/components/icons/IconGear.svelte
Normal file
19
frontend/src/lib/components/icons/IconGear.svelte
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let { size = 18, class: className = '' }: { size?: number; class?: string } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width={size}
|
||||||
|
height={size}
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.75"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
class={className}
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path d="M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6z" />
|
||||||
|
<path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1-2.83 2.83l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-4 0v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1 0-4h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 2.83-2.83l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 4 0v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 0 4h-.09a1.65 1.65 0 0 0-1.51 1z" />
|
||||||
|
</svg>
|
||||||
21
frontend/src/lib/components/icons/IconServer.svelte
Normal file
21
frontend/src/lib/components/icons/IconServer.svelte
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let { size = 18, class: className = '' }: { size?: number; class?: string } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width={size}
|
||||||
|
height={size}
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.75"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
class={className}
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<rect x="2" y="2" width="20" height="8" rx="2" ry="2" />
|
||||||
|
<rect x="2" y="14" width="20" height="8" rx="2" ry="2" />
|
||||||
|
<line x1="6" y1="6" x2="6.01" y2="6" />
|
||||||
|
<line x1="6" y1="18" x2="6.01" y2="18" />
|
||||||
|
</svg>
|
||||||
18
frontend/src/lib/components/icons/IconShield.svelte
Normal file
18
frontend/src/lib/components/icons/IconShield.svelte
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
let { size = 18, class: className = '' }: { size?: number; class?: string } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width={size}
|
||||||
|
height={size}
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="1.75"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-linejoin="round"
|
||||||
|
class={className}
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
|
||||||
|
</svg>
|
||||||
@ -23,3 +23,6 @@ export { default as IconBell } from './IconBell.svelte';
|
|||||||
export { default as IconDocs } from './IconDocs.svelte';
|
export { default as IconDocs } from './IconDocs.svelte';
|
||||||
export { default as IconAudit } from './IconAudit.svelte';
|
export { default as IconAudit } from './IconAudit.svelte';
|
||||||
export { default as IconBox } from './IconBox.svelte';
|
export { default as IconBox } from './IconBox.svelte';
|
||||||
|
export { default as IconServer } from './IconServer.svelte';
|
||||||
|
export { default as IconGear } from './IconGear.svelte';
|
||||||
|
export { default as IconShield } from './IconShield.svelte';
|
||||||
|
|||||||
7
frontend/src/routes/admin/+layout.svelte
Normal file
7
frontend/src/routes/admin/+layout.svelte
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import Toaster from '$lib/components/Toaster.svelte';
|
||||||
|
let { children } = $props();
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<Toaster />
|
||||||
|
{@render children()}
|
||||||
9
frontend/src/routes/admin/+layout.ts
Normal file
9
frontend/src/routes/admin/+layout.ts
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
import { browser } from '$app/environment';
|
||||||
|
import { redirect } from '@sveltejs/kit';
|
||||||
|
import { auth } from '$lib/auth.svelte';
|
||||||
|
|
||||||
|
export const load = () => {
|
||||||
|
if (!browser) return;
|
||||||
|
if (!auth.isAuthenticated) redirect(302, '/login');
|
||||||
|
if (!auth.isAdmin) redirect(302, '/dashboard');
|
||||||
|
};
|
||||||
5
frontend/src/routes/admin/+page.svelte
Normal file
5
frontend/src/routes/admin/+page.svelte
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
onMount(() => goto('/admin/hosts', { replaceState: true }));
|
||||||
|
</script>
|
||||||
679
frontend/src/routes/admin/hosts/+page.svelte
Normal file
679
frontend/src/routes/admin/hosts/+page.svelte
Normal file
@ -0,0 +1,679 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import AdminSidebar from '$lib/components/AdminSidebar.svelte';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { toast } from '$lib/toast.svelte';
|
||||||
|
import { formatDate, timeAgo } from '$lib/utils/format';
|
||||||
|
import {
|
||||||
|
listHosts,
|
||||||
|
createHost,
|
||||||
|
deleteHost,
|
||||||
|
getDeletePreview,
|
||||||
|
statusColor,
|
||||||
|
formatSpecs,
|
||||||
|
type Host,
|
||||||
|
type CreateHostResult
|
||||||
|
} from '$lib/api/hosts';
|
||||||
|
|
||||||
|
const PAGE_SIZE = 50;
|
||||||
|
|
||||||
|
let collapsed = $state(
|
||||||
|
typeof window !== 'undefined'
|
||||||
|
? localStorage.getItem('wrenn_sidebar_collapsed') === 'true'
|
||||||
|
: false
|
||||||
|
);
|
||||||
|
|
||||||
|
let activeTab = $state<'platform' | 'byoc'>('platform');
|
||||||
|
|
||||||
|
// All hosts fetched once
|
||||||
|
let allHosts = $state<Host[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Platform tab state
|
||||||
|
let platformHosts = $derived(allHosts.filter((h) => h.type === 'regular'));
|
||||||
|
|
||||||
|
// BYOC tab state — grouped by team, sorted by count descending, paginated
|
||||||
|
let byocHosts = $derived(allHosts.filter((h) => h.type === 'byoc'));
|
||||||
|
let byocPage = $state(0);
|
||||||
|
|
||||||
|
type TeamGroup = { teamId: string | null; teamName: string; hosts: Host[] };
|
||||||
|
|
||||||
|
let byocGroups = $derived.by<TeamGroup[]>(() => {
|
||||||
|
const map = new Map<string, TeamGroup>();
|
||||||
|
for (const h of byocHosts) {
|
||||||
|
const key = h.team_id ?? '__none__';
|
||||||
|
if (!map.has(key)) {
|
||||||
|
map.set(key, {
|
||||||
|
teamId: h.team_id ?? null,
|
||||||
|
teamName: h.team_name ?? h.team_id ?? 'Unknown Team',
|
||||||
|
hosts: []
|
||||||
|
});
|
||||||
|
}
|
||||||
|
map.get(key)!.hosts.push(h);
|
||||||
|
}
|
||||||
|
return [...map.values()].sort((a, b) => b.hosts.length - a.hosts.length);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Flatten for pagination: all byoc hosts sorted by team group count order
|
||||||
|
let flatByocHosts = $derived(byocGroups.flatMap((g) => g.hosts));
|
||||||
|
let byocPageCount = $derived(Math.max(1, Math.ceil(flatByocHosts.length / PAGE_SIZE)));
|
||||||
|
let byocPageHosts = $derived(flatByocHosts.slice(byocPage * PAGE_SIZE, (byocPage + 1) * PAGE_SIZE));
|
||||||
|
|
||||||
|
// Stats across all hosts
|
||||||
|
let onlineCount = $derived(allHosts.filter((h) => h.status === 'online').length);
|
||||||
|
let pendingCount = $derived(allHosts.filter((h) => h.status === 'pending').length);
|
||||||
|
let totalCount = $derived(allHosts.length);
|
||||||
|
|
||||||
|
// Create dialog (platform hosts)
|
||||||
|
let showCreate = $state(false);
|
||||||
|
let createForm = $state({ provider: '', availability_zone: '' });
|
||||||
|
let creating = $state(false);
|
||||||
|
let createError = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Token reveal
|
||||||
|
let createdResult = $state<CreateHostResult | null>(null);
|
||||||
|
let tokenCopied = $state(false);
|
||||||
|
let checkmarkVisible = $state(false);
|
||||||
|
|
||||||
|
// Delete confirmation
|
||||||
|
let deleteTarget = $state<Host | null>(null);
|
||||||
|
let deletePreviewSandboxes = $state<string[]>([]);
|
||||||
|
let deletePreviewLoading = $state(false);
|
||||||
|
let deleting = $state(false);
|
||||||
|
let deleteError = $state<string | null>(null);
|
||||||
|
|
||||||
|
let flashHostId = $state<string | null>(null);
|
||||||
|
let newHostId = $state<string | null>(null);
|
||||||
|
|
||||||
|
async function fetchHosts() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
const result = await listHosts();
|
||||||
|
if (result.ok) {
|
||||||
|
allHosts = result.data;
|
||||||
|
} else {
|
||||||
|
error = result.error;
|
||||||
|
}
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleCreatePlatform() {
|
||||||
|
creating = true;
|
||||||
|
createError = null;
|
||||||
|
const result = await createHost({
|
||||||
|
type: 'regular',
|
||||||
|
provider: createForm.provider.trim() || undefined,
|
||||||
|
availability_zone: createForm.availability_zone.trim() || undefined
|
||||||
|
});
|
||||||
|
if (result.ok) {
|
||||||
|
showCreate = false;
|
||||||
|
createForm = { provider: '', availability_zone: '' };
|
||||||
|
createdResult = result.data;
|
||||||
|
newHostId = result.data.host.id;
|
||||||
|
allHosts = [result.data.host, ...allHosts];
|
||||||
|
flashHostId = result.data.host.id;
|
||||||
|
// Trigger checkmark animation after modal mounts
|
||||||
|
setTimeout(() => (checkmarkVisible = true), 80);
|
||||||
|
setTimeout(() => (flashHostId = null), 2500);
|
||||||
|
} else {
|
||||||
|
createError = result.error;
|
||||||
|
}
|
||||||
|
creating = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openDeleteConfirm(host: Host) {
|
||||||
|
deleteTarget = host;
|
||||||
|
deleteError = null;
|
||||||
|
deletePreviewSandboxes = [];
|
||||||
|
deletePreviewLoading = true;
|
||||||
|
const preview = await getDeletePreview(host.id);
|
||||||
|
deletePreviewLoading = false;
|
||||||
|
if (preview.ok) {
|
||||||
|
deletePreviewSandboxes = preview.data.sandbox_ids;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDelete() {
|
||||||
|
if (!deleteTarget) return;
|
||||||
|
deleting = true;
|
||||||
|
deleteError = null;
|
||||||
|
const result = await deleteHost(deleteTarget.id, deletePreviewSandboxes.length > 0);
|
||||||
|
if (result.ok) {
|
||||||
|
allHosts = allHosts.filter((h) => h.id !== deleteTarget!.id);
|
||||||
|
deleteTarget = null;
|
||||||
|
toast.success('Host deleted');
|
||||||
|
} else {
|
||||||
|
deleteError = result.error;
|
||||||
|
}
|
||||||
|
deleting = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copyToken(token: string) {
|
||||||
|
await navigator.clipboard.writeText(token);
|
||||||
|
tokenCopied = true;
|
||||||
|
setTimeout(() => (tokenCopied = false), 2000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeTokenReveal() {
|
||||||
|
createdResult = null;
|
||||||
|
checkmarkVisible = false;
|
||||||
|
newHostId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(fetchHosts);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex h-screen overflow-hidden bg-[var(--color-bg-0)]">
|
||||||
|
<AdminSidebar bind:collapsed />
|
||||||
|
|
||||||
|
<main class="flex min-w-0 flex-1 flex-col overflow-hidden">
|
||||||
|
<!-- Header -->
|
||||||
|
<header class="flex shrink-0 flex-col gap-4 border-b border-[var(--color-border)] bg-[var(--color-bg-1)] px-6 py-5">
|
||||||
|
<div class="flex items-start justify-between">
|
||||||
|
<div>
|
||||||
|
<h1 class="font-serif text-[1.75rem] leading-none tracking-[-0.03em] text-[var(--color-text-bright)]">
|
||||||
|
Hosts
|
||||||
|
</h1>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Platform and BYOC compute across all teams.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{#if activeTab === 'platform'}
|
||||||
|
<button
|
||||||
|
onclick={() => { showCreate = true; createError = null; createForm = { provider: '', availability_zone: '' }; }}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-accent)] px-4 py-2 text-ui font-semibold text-white shadow-sm transition-all duration-150 hover:brightness-115 hover:-translate-y-px active:translate-y-0"
|
||||||
|
>
|
||||||
|
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
|
||||||
|
Add Host
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Stat pills -->
|
||||||
|
{#if !loading && !error}
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<div class="flex items-baseline gap-1 rounded-[var(--radius-button)] border border-[var(--color-border)] bg-[var(--color-bg-2)] px-2.5 py-1">
|
||||||
|
<span class="font-mono font-semibold text-ui tabular-nums text-[var(--color-text-bright)]">{totalCount}</span>
|
||||||
|
<span class="text-label text-[var(--color-text-muted)]">total</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-baseline gap-1.5 rounded-[var(--radius-button)] border border-[var(--color-accent)]/25 bg-[var(--color-accent)]/8 px-2.5 py-1">
|
||||||
|
<span class="relative mt-px flex h-1.5 w-1.5 shrink-0 self-center">
|
||||||
|
<span class="absolute inline-flex h-full w-full animate-ping rounded-full bg-[var(--color-accent)] opacity-60"></span>
|
||||||
|
<span class="relative inline-flex h-1.5 w-1.5 rounded-full bg-[var(--color-accent)]"></span>
|
||||||
|
</span>
|
||||||
|
<span class="font-mono font-semibold text-ui tabular-nums text-[var(--color-accent-bright)]">{onlineCount}</span>
|
||||||
|
<span class="text-label text-[var(--color-accent-bright)]/70">online</span>
|
||||||
|
</div>
|
||||||
|
{#if pendingCount > 0}
|
||||||
|
<div class="flex items-baseline gap-1 rounded-[var(--radius-button)] border border-[var(--color-amber)]/25 bg-[var(--color-amber)]/8 px-2.5 py-1">
|
||||||
|
<span class="font-mono font-semibold text-ui tabular-nums text-[var(--color-amber)]">{pendingCount}</span>
|
||||||
|
<span class="text-label text-[var(--color-amber)]/70">pending</span>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<!-- Tabs -->
|
||||||
|
<div class="flex shrink-0 border-b border-[var(--color-border)] bg-[var(--color-bg-1)] px-6">
|
||||||
|
{#each [['platform', 'Platform', platformHosts.length], ['byoc', 'BYOC', byocHosts.length]] as [id, label, count] (id)}
|
||||||
|
<button
|
||||||
|
onclick={() => { activeTab = id as 'platform' | 'byoc'; if (id === 'byoc') byocPage = 0; }}
|
||||||
|
class="relative py-3 pr-5 text-ui transition-colors duration-150 {activeTab === id
|
||||||
|
? 'font-medium text-[var(--color-text-bright)]'
|
||||||
|
: 'text-[var(--color-text-tertiary)] hover:text-[var(--color-text-secondary)]'}"
|
||||||
|
>
|
||||||
|
{label}
|
||||||
|
{#if activeTab === id}
|
||||||
|
<span class="absolute bottom-0 left-0 right-5 h-[2px] rounded-t-full bg-[var(--color-accent)]"></span>
|
||||||
|
{/if}
|
||||||
|
{#if !loading}
|
||||||
|
<span class="ml-2 rounded-full bg-[var(--color-bg-4)] px-1.5 py-0.5 text-label text-[var(--color-text-muted)]">
|
||||||
|
{count}
|
||||||
|
</span>
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
{/each}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Body -->
|
||||||
|
<div class="flex-1 overflow-y-auto p-6">
|
||||||
|
{#if loading}
|
||||||
|
{@render skeletonRows()}
|
||||||
|
{:else if error}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-4 py-3 text-ui text-[var(--color-red)]">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
{:else if activeTab === 'platform'}
|
||||||
|
{@render hostsTable(platformHosts, false)}
|
||||||
|
{:else}
|
||||||
|
<!-- BYOC hosts: grouped by team -->
|
||||||
|
{#if byocHosts.length === 0}
|
||||||
|
{@render emptyState('byoc')}
|
||||||
|
{:else}
|
||||||
|
<div class="space-y-5">
|
||||||
|
{#each byocGroups as group (group.teamId ?? '__none__')}
|
||||||
|
{@const groupPageHosts = byocPageHosts.filter(h => h.team_id === group.teamId || (group.teamId === null && !h.team_id))}
|
||||||
|
{#if groupPageHosts.length > 0}
|
||||||
|
<div>
|
||||||
|
<div class="mb-2.5 flex items-center gap-2.5">
|
||||||
|
<span class="text-label font-semibold uppercase tracking-[0.08em] text-[var(--color-text-tertiary)]">
|
||||||
|
{group.teamName}
|
||||||
|
</span>
|
||||||
|
<span class="rounded-full bg-[var(--color-bg-3)] px-1.5 py-0.5 font-mono text-label text-[var(--color-text-muted)]">
|
||||||
|
{group.hosts.length}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{@render hostsTable(groupPageHosts, false)}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/each}
|
||||||
|
|
||||||
|
<!-- Pagination -->
|
||||||
|
{#if byocPageCount > 1}
|
||||||
|
<div class="flex items-center justify-between pt-2">
|
||||||
|
<span class="text-meta text-[var(--color-text-muted)]">
|
||||||
|
Page {byocPage + 1} of {byocPageCount} · {byocHosts.length} hosts
|
||||||
|
</span>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<button
|
||||||
|
onclick={() => (byocPage = Math.max(0, byocPage - 1))}
|
||||||
|
disabled={byocPage === 0}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-3 py-1.5 text-meta text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:cursor-not-allowed disabled:opacity-40"
|
||||||
|
>
|
||||||
|
← Previous
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onclick={() => (byocPage = Math.min(byocPageCount - 1, byocPage + 1))}
|
||||||
|
disabled={byocPage >= byocPageCount - 1}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-3 py-1.5 text-meta text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:cursor-not-allowed disabled:opacity-40"
|
||||||
|
>
|
||||||
|
Next →
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#snippet skeletonRows()}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-1)] overflow-hidden">
|
||||||
|
<table class="w-full">
|
||||||
|
<thead>
|
||||||
|
<tr class="border-b border-[var(--color-border)]">
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Host</th>
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Status</th>
|
||||||
|
<th class="hidden px-4 py-3 md:table-cell text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Specs</th>
|
||||||
|
<th class="hidden px-4 py-3 lg:table-cell text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Last Heartbeat</th>
|
||||||
|
<th class="px-4 py-3"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each Array(5) as _, i}
|
||||||
|
<tr class="border-b border-[var(--color-border)] last:border-0" style="animation-delay: {i * 60}ms">
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="skeleton mb-1.5 h-3 w-28 rounded"></div>
|
||||||
|
<div class="skeleton h-2.5 w-20 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="skeleton h-3 w-16 rounded-full"></div>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 md:table-cell">
|
||||||
|
<div class="skeleton h-3 w-24 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<div class="skeleton h-3 w-20 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5 text-right">
|
||||||
|
<div class="skeleton ml-auto h-6 w-14 rounded"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
{#snippet hostsTable(hosts: Host[], _showTeam: boolean)}
|
||||||
|
{#if hosts.length === 0}
|
||||||
|
{@render emptyState('platform')}
|
||||||
|
{:else}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-1)] overflow-hidden">
|
||||||
|
<table class="w-full">
|
||||||
|
<thead>
|
||||||
|
<tr class="border-b border-[var(--color-border)]">
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Host</th>
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Status</th>
|
||||||
|
<th class="hidden px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)] md:table-cell">Specs</th>
|
||||||
|
<th class="hidden px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)] lg:table-cell">Last Heartbeat</th>
|
||||||
|
<th class="px-4 py-3"></th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each hosts as host (host.id)}
|
||||||
|
<tr
|
||||||
|
class="row-entry border-b border-[var(--color-border)] last:border-0 transition-colors duration-200
|
||||||
|
{host.id === newHostId ? 'new-row' : ''}
|
||||||
|
{flashHostId === host.id ? 'bg-[var(--color-accent-glow)]' : 'hover:bg-[var(--color-bg-2)]'}"
|
||||||
|
>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="font-mono text-meta text-[var(--color-text-primary)]">{host.id}</div>
|
||||||
|
{#if host.address}
|
||||||
|
<div class="mt-0.5 font-mono text-label text-[var(--color-text-muted)]">{host.address}</div>
|
||||||
|
{/if}
|
||||||
|
{#if host.provider || host.availability_zone}
|
||||||
|
<div class="mt-0.5 text-label text-[var(--color-text-tertiary)]">
|
||||||
|
{[host.provider, host.availability_zone].filter(Boolean).join(' · ')}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<span class="flex items-center gap-1.5 text-meta font-medium" style="color: {statusColor(host.status)}">
|
||||||
|
{#if host.status === 'online'}
|
||||||
|
<span class="relative flex h-1.5 w-1.5 shrink-0">
|
||||||
|
<span class="absolute inline-flex h-full w-full animate-ping rounded-full opacity-60" style="background: {statusColor(host.status)}"></span>
|
||||||
|
<span class="relative inline-flex h-1.5 w-1.5 rounded-full" style="background: {statusColor(host.status)}"></span>
|
||||||
|
</span>
|
||||||
|
{:else}
|
||||||
|
<span class="h-1.5 w-1.5 shrink-0 rounded-full" style="background: {statusColor(host.status)}"></span>
|
||||||
|
{/if}
|
||||||
|
{host.status}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 md:table-cell">
|
||||||
|
<span class="text-meta text-[var(--color-text-secondary)]">{formatSpecs(host)}</span>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<span class="text-meta text-[var(--color-text-muted)]" title={host.last_heartbeat_at ? formatDate(host.last_heartbeat_at) : undefined}>
|
||||||
|
{host.last_heartbeat_at ? timeAgo(host.last_heartbeat_at) : '—'}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5 text-right">
|
||||||
|
<button
|
||||||
|
onclick={() => openDeleteConfirm(host)}
|
||||||
|
class="rounded-[var(--radius-button)] px-3 py-1.5 text-meta text-[var(--color-text-tertiary)] transition-colors duration-150 hover:bg-[var(--color-red)]/10 hover:text-[var(--color-red)]"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
{#snippet emptyState(type: 'platform' | 'byoc')}
|
||||||
|
<div class="flex flex-col items-center justify-center py-24 text-center">
|
||||||
|
<div class="mb-5 flex h-16 w-16 items-center justify-center rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-2)]">
|
||||||
|
<svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round" class="text-[var(--color-text-muted)]"><rect x="2" y="2" width="20" height="8" rx="2"/><rect x="2" y="14" width="20" height="8" rx="2"/><line x1="6" y1="6" x2="6.01" y2="6"/><line x1="6" y1="18" x2="6.01" y2="18"/></svg>
|
||||||
|
</div>
|
||||||
|
<p class="font-serif text-[1.125rem] leading-snug text-[var(--color-text-secondary)]">
|
||||||
|
{type === 'platform' ? 'No platform hosts yet.' : 'No BYOC hosts across any team.'}
|
||||||
|
</p>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-muted)]">
|
||||||
|
{type === 'platform'
|
||||||
|
? 'Add a host to start scheduling capsules onto your own compute.'
|
||||||
|
: 'Teams that register their own compute will appear here.'}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
<!-- Add Platform Host Dialog -->
|
||||||
|
{#if showCreate}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 bg-black/60"
|
||||||
|
role="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onclick={() => { if (!creating) showCreate = false; }}
|
||||||
|
onkeydown={(e) => { if (e.key === 'Escape' && !creating) showCreate = false; }}
|
||||||
|
></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[420px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Add Platform Host
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Register a new platform-managed host. You'll receive a one-time registration token.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{#if createError}
|
||||||
|
<div class="mt-4 rounded-[var(--radius-input)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-3 py-2 text-meta text-[var(--color-red)]">
|
||||||
|
{createError}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="mt-5 space-y-4">
|
||||||
|
<div>
|
||||||
|
<label class="mb-1.5 block text-label font-semibold uppercase tracking-[0.05em] text-[var(--color-text-tertiary)]" for="platform-provider">
|
||||||
|
Provider <span class="normal-case font-normal text-[var(--color-text-muted)]">(optional)</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="platform-provider"
|
||||||
|
type="text"
|
||||||
|
placeholder="e.g. aws, gcp, bare-metal"
|
||||||
|
bind:value={createForm.provider}
|
||||||
|
disabled={creating}
|
||||||
|
class="w-full rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-4)] px-3 py-2 text-ui text-[var(--color-text-bright)] outline-none placeholder:text-[var(--color-text-muted)] transition-colors duration-150 focus:border-[var(--color-accent)] disabled:opacity-60"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label class="mb-1.5 block text-label font-semibold uppercase tracking-[0.05em] text-[var(--color-text-tertiary)]" for="platform-az">
|
||||||
|
Availability Zone <span class="normal-case font-normal text-[var(--color-text-muted)]">(optional)</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="platform-az"
|
||||||
|
type="text"
|
||||||
|
placeholder="e.g. us-east-1a"
|
||||||
|
bind:value={createForm.availability_zone}
|
||||||
|
disabled={creating}
|
||||||
|
class="w-full rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-4)] px-3 py-2 text-ui text-[var(--color-text-bright)] outline-none placeholder:text-[var(--color-text-muted)] transition-colors duration-150 focus:border-[var(--color-accent)] disabled:opacity-60"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6 flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onclick={() => (showCreate = false)}
|
||||||
|
disabled={creating}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-4 py-2 text-ui text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onclick={handleCreatePlatform}
|
||||||
|
disabled={creating}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-accent)] px-5 py-2 text-ui font-semibold text-white transition-all duration-150 hover:brightness-115 hover:-translate-y-px active:translate-y-0 disabled:opacity-50 disabled:hover:translate-y-0"
|
||||||
|
>
|
||||||
|
{#if creating}
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Adding…
|
||||||
|
{:else}
|
||||||
|
Add Host
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<!-- Token reveal -->
|
||||||
|
{#if createdResult}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div class="absolute inset-0 bg-black/60"></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[500px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<!-- Animated checkmark -->
|
||||||
|
<div class="mb-5 flex h-12 w-12 items-center justify-center rounded-full bg-[var(--color-accent-glow)]">
|
||||||
|
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent-bright)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<polyline
|
||||||
|
points="20 6 9 17 4 12"
|
||||||
|
class="checkmark-path"
|
||||||
|
class:checkmark-drawn={checkmarkVisible}
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Host registered
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Pass this token to the host agent to complete registration. It expires in
|
||||||
|
<strong class="font-semibold text-[var(--color-amber)]">1 hour</strong> and is single-use.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="mt-5 rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-0)] p-3">
|
||||||
|
<div class="flex items-start gap-2">
|
||||||
|
<code class="flex-1 break-all font-mono text-[0.8rem] leading-relaxed text-[var(--color-text-primary)]">
|
||||||
|
{createdResult.registration_token}
|
||||||
|
</code>
|
||||||
|
<button
|
||||||
|
onclick={() => copyToken(createdResult!.registration_token)}
|
||||||
|
class="shrink-0 rounded-[var(--radius-button)] px-2.5 py-1.5 text-label font-semibold transition-all duration-200 {tokenCopied
|
||||||
|
? 'bg-[var(--color-accent-glow)] text-[var(--color-accent-bright)] scale-95'
|
||||||
|
: 'bg-[var(--color-bg-5)] text-[var(--color-text-secondary)] hover:text-[var(--color-text-primary)]'}"
|
||||||
|
>
|
||||||
|
{tokenCopied ? '✓ Copied' : 'Copy'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-3 flex items-start gap-2 rounded-[var(--radius-input)] border border-[var(--color-amber)]/30 bg-[var(--color-amber)]/6 px-3 py-2.5">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--color-amber)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mt-0.5 shrink-0"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
|
||||||
|
<p class="text-meta text-[var(--color-amber)]">
|
||||||
|
This token will not be shown again. Store it safely before closing.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6">
|
||||||
|
<button
|
||||||
|
onclick={closeTokenReveal}
|
||||||
|
class="w-full rounded-[var(--radius-button)] bg-[var(--color-bg-4)] px-4 py-2.5 text-ui font-medium text-[var(--color-text-primary)] transition-colors duration-150 hover:bg-[var(--color-bg-5)]"
|
||||||
|
>
|
||||||
|
Done
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<!-- Delete confirmation -->
|
||||||
|
{#if deleteTarget}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 bg-black/60"
|
||||||
|
role="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onclick={() => { if (!deleting) deleteTarget = null; }}
|
||||||
|
onkeydown={(e) => { if (e.key === 'Escape' && !deleting) deleteTarget = null; }}
|
||||||
|
></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[420px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Delete Host
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Permanently remove <code class="rounded bg-[var(--color-bg-4)] px-1.5 py-0.5 font-mono text-[0.8rem] text-[var(--color-text-primary)]">{deleteTarget.id}</code>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{#if deletePreviewLoading}
|
||||||
|
<div class="mt-4 flex items-center gap-2 text-meta text-[var(--color-text-muted)]">
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Checking active capsules…
|
||||||
|
</div>
|
||||||
|
{:else if deletePreviewSandboxes.length > 0}
|
||||||
|
<div class="mt-4 rounded-[var(--radius-input)] border border-[var(--color-amber)]/30 bg-[var(--color-amber)]/6 px-3 py-2.5">
|
||||||
|
<p class="text-meta font-semibold text-[var(--color-amber)]">
|
||||||
|
{deletePreviewSandboxes.length} active capsule{deletePreviewSandboxes.length === 1 ? '' : 's'} will be destroyed.
|
||||||
|
</p>
|
||||||
|
<p class="mt-0.5 text-meta text-[var(--color-amber)]/70">
|
||||||
|
All running workloads on this host will be terminated immediately.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if deleteError}
|
||||||
|
<div class="mt-3 rounded-[var(--radius-input)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-3 py-2 text-meta text-[var(--color-red)]">
|
||||||
|
{deleteError}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="mt-6 flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onclick={() => (deleteTarget = null)}
|
||||||
|
disabled={deleting}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-4 py-2 text-ui text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onclick={handleDelete}
|
||||||
|
disabled={deleting || deletePreviewLoading}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-red)] px-5 py-2 text-ui font-semibold text-white transition-all duration-150 hover:brightness-110 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{#if deleting}
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Deleting…
|
||||||
|
{:else}
|
||||||
|
{deletePreviewSandboxes.length > 0 ? 'Force Delete' : 'Delete'}
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
@keyframes fadeUp {
|
||||||
|
from { opacity: 0; transform: translateY(10px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideIn {
|
||||||
|
from { opacity: 0; transform: translateX(-6px); }
|
||||||
|
to { opacity: 1; transform: translateX(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes shimmer {
|
||||||
|
0% { background-position: -200% 0; }
|
||||||
|
100% { background-position: 200% 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton {
|
||||||
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
var(--color-bg-3) 25%,
|
||||||
|
var(--color-bg-4) 50%,
|
||||||
|
var(--color-bg-3) 75%
|
||||||
|
);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: shimmer 1.4s ease infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-row {
|
||||||
|
animation: slideIn 0.3s cubic-bezier(0.25, 1, 0.5, 1) both;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Checkmark draw animation */
|
||||||
|
.checkmark-path {
|
||||||
|
stroke-dasharray: 30;
|
||||||
|
stroke-dashoffset: 30;
|
||||||
|
transition: stroke-dashoffset 0.4s cubic-bezier(0.25, 1, 0.5, 1) 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkmark-drawn {
|
||||||
|
stroke-dashoffset: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
587
frontend/src/routes/dashboard/byoc/+page.svelte
Normal file
587
frontend/src/routes/dashboard/byoc/+page.svelte
Normal file
@ -0,0 +1,587 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import Sidebar from '$lib/components/Sidebar.svelte';
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import { auth } from '$lib/auth.svelte';
|
||||||
|
import { toast } from '$lib/toast.svelte';
|
||||||
|
import { formatDate, timeAgo } from '$lib/utils/format';
|
||||||
|
import {
|
||||||
|
listHosts,
|
||||||
|
createHost,
|
||||||
|
deleteHost,
|
||||||
|
getDeletePreview,
|
||||||
|
statusColor,
|
||||||
|
formatSpecs,
|
||||||
|
type Host,
|
||||||
|
type CreateHostResult
|
||||||
|
} from '$lib/api/hosts';
|
||||||
|
|
||||||
|
let collapsed = $state(
|
||||||
|
typeof window !== 'undefined'
|
||||||
|
? localStorage.getItem('wrenn_sidebar_collapsed') === 'true'
|
||||||
|
: false
|
||||||
|
);
|
||||||
|
|
||||||
|
let canManage = $derived(auth.role === 'owner' || auth.role === 'admin');
|
||||||
|
|
||||||
|
// List state
|
||||||
|
let hosts = $state<Host[]>([]);
|
||||||
|
let loading = $state(true);
|
||||||
|
let error = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Create dialog
|
||||||
|
let showCreate = $state(false);
|
||||||
|
let createForm = $state({ provider: '', availability_zone: '' });
|
||||||
|
let creating = $state(false);
|
||||||
|
let createError = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Token reveal — shown once after creation
|
||||||
|
let createdResult = $state<CreateHostResult | null>(null);
|
||||||
|
let tokenCopied = $state(false);
|
||||||
|
let checkmarkVisible = $state(false);
|
||||||
|
|
||||||
|
// Delete confirmation
|
||||||
|
let deleteTarget = $state<Host | null>(null);
|
||||||
|
let deletePreviewSandboxes = $state<string[]>([]);
|
||||||
|
let deletePreviewLoading = $state(false);
|
||||||
|
let deleting = $state(false);
|
||||||
|
let deleteError = $state<string | null>(null);
|
||||||
|
|
||||||
|
let flashHostId = $state<string | null>(null);
|
||||||
|
let newHostId = $state<string | null>(null);
|
||||||
|
|
||||||
|
// Derived stats
|
||||||
|
let onlineCount = $derived(hosts.filter((h) => h.status === 'online').length);
|
||||||
|
|
||||||
|
async function fetchHosts() {
|
||||||
|
loading = true;
|
||||||
|
error = null;
|
||||||
|
const result = await listHosts();
|
||||||
|
if (result.ok) {
|
||||||
|
hosts = result.data.filter((h) => h.type === 'byoc');
|
||||||
|
} else {
|
||||||
|
error = result.error;
|
||||||
|
}
|
||||||
|
loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleCreate() {
|
||||||
|
creating = true;
|
||||||
|
createError = null;
|
||||||
|
const result = await createHost({
|
||||||
|
type: 'byoc',
|
||||||
|
team_id: auth.teamId ?? undefined,
|
||||||
|
provider: createForm.provider.trim() || undefined,
|
||||||
|
availability_zone: createForm.availability_zone.trim() || undefined
|
||||||
|
});
|
||||||
|
if (result.ok) {
|
||||||
|
showCreate = false;
|
||||||
|
createForm = { provider: '', availability_zone: '' };
|
||||||
|
createdResult = result.data;
|
||||||
|
newHostId = result.data.host.id;
|
||||||
|
hosts = [result.data.host, ...hosts];
|
||||||
|
flashHostId = result.data.host.id;
|
||||||
|
setTimeout(() => (checkmarkVisible = true), 80);
|
||||||
|
setTimeout(() => (flashHostId = null), 2500);
|
||||||
|
} else {
|
||||||
|
createError = result.error;
|
||||||
|
}
|
||||||
|
creating = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openDeleteConfirm(host: Host) {
|
||||||
|
deleteTarget = host;
|
||||||
|
deleteError = null;
|
||||||
|
deletePreviewSandboxes = [];
|
||||||
|
deletePreviewLoading = true;
|
||||||
|
const preview = await getDeletePreview(host.id);
|
||||||
|
deletePreviewLoading = false;
|
||||||
|
if (preview.ok) {
|
||||||
|
deletePreviewSandboxes = preview.data.sandbox_ids;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleDelete() {
|
||||||
|
if (!deleteTarget) return;
|
||||||
|
deleting = true;
|
||||||
|
deleteError = null;
|
||||||
|
const result = await deleteHost(deleteTarget.id, deletePreviewSandboxes.length > 0);
|
||||||
|
if (result.ok) {
|
||||||
|
hosts = hosts.filter((h) => h.id !== deleteTarget!.id);
|
||||||
|
deleteTarget = null;
|
||||||
|
toast.success('Host deleted');
|
||||||
|
} else {
|
||||||
|
deleteError = result.error;
|
||||||
|
}
|
||||||
|
deleting = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function copyToken(token: string) {
|
||||||
|
await navigator.clipboard.writeText(token);
|
||||||
|
tokenCopied = true;
|
||||||
|
setTimeout(() => (tokenCopied = false), 2000);
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeTokenReveal() {
|
||||||
|
createdResult = null;
|
||||||
|
checkmarkVisible = false;
|
||||||
|
newHostId = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(fetchHosts);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="flex h-screen overflow-hidden bg-[var(--color-bg-0)]">
|
||||||
|
<Sidebar bind:collapsed />
|
||||||
|
|
||||||
|
<main class="flex min-w-0 flex-1 flex-col overflow-hidden">
|
||||||
|
<!-- Header -->
|
||||||
|
<header class="flex shrink-0 flex-col gap-4 border-b border-[var(--color-border)] bg-[var(--color-bg-1)] px-6 py-5">
|
||||||
|
<div class="flex items-start justify-between">
|
||||||
|
<div>
|
||||||
|
<h1 class="font-serif text-[1.75rem] leading-none tracking-[-0.03em] text-[var(--color-text-bright)]">
|
||||||
|
BYOC Hosts
|
||||||
|
</h1>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Your own compute, running Wrenn capsules.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{#if canManage}
|
||||||
|
<button
|
||||||
|
onclick={() => { showCreate = true; createError = null; createForm = { provider: '', availability_zone: '' }; }}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-accent)] px-4 py-2 text-ui font-semibold text-white shadow-sm transition-all duration-150 hover:brightness-115 hover:-translate-y-px active:translate-y-0"
|
||||||
|
>
|
||||||
|
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
|
||||||
|
Register Host
|
||||||
|
</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Stat pills (only when data is loaded) -->
|
||||||
|
{#if !loading && !error && hosts.length > 0}
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<div class="flex items-baseline gap-1 rounded-[var(--radius-button)] border border-[var(--color-border)] bg-[var(--color-bg-2)] px-2.5 py-1">
|
||||||
|
<span class="font-mono font-semibold text-ui tabular-nums text-[var(--color-text-bright)]">{hosts.length}</span>
|
||||||
|
<span class="text-label text-[var(--color-text-muted)]">total</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex items-baseline gap-1.5 rounded-[var(--radius-button)] border border-[var(--color-accent)]/25 bg-[var(--color-accent)]/8 px-2.5 py-1">
|
||||||
|
<span class="relative mt-px flex h-1.5 w-1.5 shrink-0 self-center">
|
||||||
|
<span class="absolute inline-flex h-full w-full animate-ping rounded-full bg-[var(--color-accent)] opacity-60"></span>
|
||||||
|
<span class="relative inline-flex h-1.5 w-1.5 rounded-full bg-[var(--color-accent)]"></span>
|
||||||
|
</span>
|
||||||
|
<span class="font-mono font-semibold text-ui tabular-nums text-[var(--color-accent-bright)]">{onlineCount}</span>
|
||||||
|
<span class="text-label text-[var(--color-accent-bright)]/70">online</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<!-- Body -->
|
||||||
|
<div class="flex-1 overflow-y-auto p-6">
|
||||||
|
{#if loading}
|
||||||
|
{@render skeletonRows()}
|
||||||
|
{:else if error}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-4 py-3 text-ui text-[var(--color-red)]">
|
||||||
|
{error}
|
||||||
|
</div>
|
||||||
|
{:else if hosts.length === 0}
|
||||||
|
{@render emptyState()}
|
||||||
|
{:else}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-1)] overflow-hidden">
|
||||||
|
<table class="w-full">
|
||||||
|
<thead>
|
||||||
|
<tr class="border-b border-[var(--color-border)]">
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Host</th>
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Status</th>
|
||||||
|
<th class="hidden px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)] md:table-cell">Specs</th>
|
||||||
|
<th class="hidden px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)] lg:table-cell">Last Heartbeat</th>
|
||||||
|
<th class="hidden px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)] lg:table-cell">Registered</th>
|
||||||
|
{#if canManage}
|
||||||
|
<th class="px-4 py-3"></th>
|
||||||
|
{/if}
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each hosts as host (host.id)}
|
||||||
|
<tr
|
||||||
|
class="border-b border-[var(--color-border)] last:border-0 transition-colors duration-200
|
||||||
|
{host.id === newHostId ? 'new-row' : ''}
|
||||||
|
{flashHostId === host.id ? 'bg-[var(--color-accent-glow)]' : 'hover:bg-[var(--color-bg-2)]'}"
|
||||||
|
>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="font-mono text-meta text-[var(--color-text-primary)]">{host.id}</div>
|
||||||
|
{#if host.address}
|
||||||
|
<div class="mt-0.5 font-mono text-label text-[var(--color-text-muted)]">{host.address}</div>
|
||||||
|
{/if}
|
||||||
|
{#if host.provider || host.availability_zone}
|
||||||
|
<div class="mt-0.5 text-label text-[var(--color-text-tertiary)]">
|
||||||
|
{[host.provider, host.availability_zone].filter(Boolean).join(' · ')}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<span class="flex items-center gap-1.5 text-meta font-medium" style="color: {statusColor(host.status)}">
|
||||||
|
{#if host.status === 'online'}
|
||||||
|
<span class="relative flex h-1.5 w-1.5 shrink-0">
|
||||||
|
<span class="absolute inline-flex h-full w-full animate-ping rounded-full opacity-60" style="background: {statusColor(host.status)}"></span>
|
||||||
|
<span class="relative inline-flex h-1.5 w-1.5 rounded-full" style="background: {statusColor(host.status)}"></span>
|
||||||
|
</span>
|
||||||
|
{:else}
|
||||||
|
<span class="h-1.5 w-1.5 shrink-0 rounded-full" style="background: {statusColor(host.status)}"></span>
|
||||||
|
{/if}
|
||||||
|
{host.status}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 md:table-cell">
|
||||||
|
<span class="text-meta text-[var(--color-text-secondary)]">{formatSpecs(host)}</span>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<span class="text-meta text-[var(--color-text-muted)]" title={host.last_heartbeat_at ? formatDate(host.last_heartbeat_at) : undefined}>
|
||||||
|
{host.last_heartbeat_at ? timeAgo(host.last_heartbeat_at) : '—'}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<span class="text-meta text-[var(--color-text-muted)]" title={formatDate(host.created_at)}>
|
||||||
|
{timeAgo(host.created_at)}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
{#if canManage}
|
||||||
|
<td class="px-4 py-3.5 text-right">
|
||||||
|
<button
|
||||||
|
onclick={() => openDeleteConfirm(host)}
|
||||||
|
class="rounded-[var(--radius-button)] px-3 py-1.5 text-meta text-[var(--color-text-tertiary)] transition-colors duration-150 hover:bg-[var(--color-red)]/10 hover:text-[var(--color-red)]"
|
||||||
|
>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
</td>
|
||||||
|
{/if}
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#snippet skeletonRows()}
|
||||||
|
<div class="rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-1)] overflow-hidden">
|
||||||
|
<table class="w-full">
|
||||||
|
<thead>
|
||||||
|
<tr class="border-b border-[var(--color-border)]">
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Host</th>
|
||||||
|
<th class="px-4 py-3 text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Status</th>
|
||||||
|
<th class="hidden px-4 py-3 md:table-cell text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Specs</th>
|
||||||
|
<th class="hidden px-4 py-3 lg:table-cell text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Last Heartbeat</th>
|
||||||
|
<th class="hidden px-4 py-3 lg:table-cell text-left text-label font-semibold uppercase tracking-[0.06em] text-[var(--color-text-tertiary)]">Registered</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{#each Array(4) as _, i}
|
||||||
|
<tr class="border-b border-[var(--color-border)] last:border-0" style="animation-delay: {i * 60}ms">
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="skeleton mb-1.5 h-3 w-28 rounded"></div>
|
||||||
|
<div class="skeleton h-2.5 w-20 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-3.5">
|
||||||
|
<div class="skeleton h-3 w-16 rounded-full"></div>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 md:table-cell">
|
||||||
|
<div class="skeleton h-3 w-24 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<div class="skeleton h-3 w-20 rounded"></div>
|
||||||
|
</td>
|
||||||
|
<td class="hidden px-4 py-3.5 lg:table-cell">
|
||||||
|
<div class="skeleton h-3 w-16 rounded"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{/each}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
{#snippet emptyState()}
|
||||||
|
<div class="flex flex-col items-center justify-center py-24 text-center">
|
||||||
|
<div class="mb-5 flex h-16 w-16 items-center justify-center rounded-[var(--radius-card)] border border-[var(--color-border)] bg-[var(--color-bg-2)]">
|
||||||
|
<svg width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round" class="text-[var(--color-text-muted)]"><rect x="2" y="2" width="20" height="8" rx="2"/><rect x="2" y="14" width="20" height="8" rx="2"/><line x1="6" y1="6" x2="6.01" y2="6"/><line x1="6" y1="18" x2="6.01" y2="18"/></svg>
|
||||||
|
</div>
|
||||||
|
{#if canManage}
|
||||||
|
<p class="font-serif text-[1.125rem] leading-snug text-[var(--color-text-secondary)]">
|
||||||
|
No hosts yet.
|
||||||
|
</p>
|
||||||
|
<p class="mt-1.5 max-w-[340px] text-ui text-[var(--color-text-muted)]">
|
||||||
|
Register a server and Wrenn will schedule capsules on your own infrastructure.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
onclick={() => { showCreate = true; createError = null; }}
|
||||||
|
class="mt-6 flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-accent)] px-4 py-2 text-ui font-semibold text-white shadow-sm transition-all duration-150 hover:brightness-115 hover:-translate-y-px active:translate-y-0"
|
||||||
|
>
|
||||||
|
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
|
||||||
|
Register your first host
|
||||||
|
</button>
|
||||||
|
{:else}
|
||||||
|
<p class="font-serif text-[1.125rem] leading-snug text-[var(--color-text-secondary)]">
|
||||||
|
No hosts registered.
|
||||||
|
</p>
|
||||||
|
<p class="mt-1.5 max-w-[320px] text-ui text-[var(--color-text-muted)]">
|
||||||
|
Ask a team owner or admin to register a BYOC host for your team.
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/snippet}
|
||||||
|
|
||||||
|
<!-- Register Host Dialog -->
|
||||||
|
{#if showCreate}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 bg-black/60"
|
||||||
|
role="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onclick={() => { if (!creating) showCreate = false; }}
|
||||||
|
onkeydown={(e) => { if (e.key === 'Escape' && !creating) showCreate = false; }}
|
||||||
|
></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[420px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Register Host
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Add a server to your team's BYOC pool. You'll receive a one-time registration token.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{#if createError}
|
||||||
|
<div class="mt-4 rounded-[var(--radius-input)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-3 py-2 text-meta text-[var(--color-red)]">
|
||||||
|
{createError}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="mt-5 space-y-4">
|
||||||
|
<div>
|
||||||
|
<label class="mb-1.5 block text-label font-semibold uppercase tracking-[0.05em] text-[var(--color-text-tertiary)]" for="byoc-provider">
|
||||||
|
Provider <span class="normal-case font-normal text-[var(--color-text-muted)]">(optional)</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="byoc-provider"
|
||||||
|
type="text"
|
||||||
|
placeholder="e.g. aws, gcp, bare-metal"
|
||||||
|
bind:value={createForm.provider}
|
||||||
|
disabled={creating}
|
||||||
|
class="w-full rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-4)] px-3 py-2 text-ui text-[var(--color-text-bright)] outline-none placeholder:text-[var(--color-text-muted)] transition-colors duration-150 focus:border-[var(--color-accent)] disabled:opacity-60"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label class="mb-1.5 block text-label font-semibold uppercase tracking-[0.05em] text-[var(--color-text-tertiary)]" for="byoc-az">
|
||||||
|
Availability Zone <span class="normal-case font-normal text-[var(--color-text-muted)]">(optional)</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
id="byoc-az"
|
||||||
|
type="text"
|
||||||
|
placeholder="e.g. us-east-1a"
|
||||||
|
bind:value={createForm.availability_zone}
|
||||||
|
disabled={creating}
|
||||||
|
class="w-full rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-4)] px-3 py-2 text-ui text-[var(--color-text-bright)] outline-none placeholder:text-[var(--color-text-muted)] transition-colors duration-150 focus:border-[var(--color-accent)] disabled:opacity-60"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6 flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onclick={() => (showCreate = false)}
|
||||||
|
disabled={creating}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-4 py-2 text-ui text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onclick={handleCreate}
|
||||||
|
disabled={creating}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-accent)] px-5 py-2 text-ui font-semibold text-white transition-all duration-150 hover:brightness-115 hover:-translate-y-px active:translate-y-0 disabled:opacity-50 disabled:hover:translate-y-0"
|
||||||
|
>
|
||||||
|
{#if creating}
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Registering…
|
||||||
|
{:else}
|
||||||
|
Register
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<!-- Registration Token Reveal -->
|
||||||
|
{#if createdResult}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div class="absolute inset-0 bg-black/60"></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[500px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<!-- Animated checkmark -->
|
||||||
|
<div class="mb-5 flex h-12 w-12 items-center justify-center rounded-full bg-[var(--color-accent-glow)]">
|
||||||
|
<svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent-bright)" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round">
|
||||||
|
<polyline
|
||||||
|
points="20 6 9 17 4 12"
|
||||||
|
class="checkmark-path"
|
||||||
|
class:checkmark-drawn={checkmarkVisible}
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Host registered
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Pass this token to the host agent to complete registration. It expires in
|
||||||
|
<strong class="font-semibold text-[var(--color-amber)]">1 hour</strong> and is single-use.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="mt-5 rounded-[var(--radius-input)] border border-[var(--color-border)] bg-[var(--color-bg-0)] p-3">
|
||||||
|
<div class="flex items-start gap-2">
|
||||||
|
<code class="flex-1 break-all font-mono text-[0.8rem] leading-relaxed text-[var(--color-text-primary)]">
|
||||||
|
{createdResult.registration_token}
|
||||||
|
</code>
|
||||||
|
<button
|
||||||
|
onclick={() => copyToken(createdResult!.registration_token)}
|
||||||
|
class="shrink-0 rounded-[var(--radius-button)] px-2.5 py-1.5 text-label font-semibold transition-all duration-200 {tokenCopied
|
||||||
|
? 'bg-[var(--color-accent-glow)] text-[var(--color-accent-bright)] scale-95'
|
||||||
|
: 'bg-[var(--color-bg-5)] text-[var(--color-text-secondary)] hover:text-[var(--color-text-primary)]'}"
|
||||||
|
>
|
||||||
|
{tokenCopied ? '✓ Copied' : 'Copy'}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-3 flex items-start gap-2 rounded-[var(--radius-input)] border border-[var(--color-amber)]/30 bg-[var(--color-amber)]/6 px-3 py-2.5">
|
||||||
|
<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="var(--color-amber)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mt-0.5 shrink-0"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
|
||||||
|
<p class="text-meta text-[var(--color-amber)]">
|
||||||
|
This token will not be shown again. Store it safely before closing.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6">
|
||||||
|
<button
|
||||||
|
onclick={closeTokenReveal}
|
||||||
|
class="w-full rounded-[var(--radius-button)] bg-[var(--color-bg-4)] px-4 py-2.5 text-ui font-medium text-[var(--color-text-primary)] transition-colors duration-150 hover:bg-[var(--color-bg-5)]"
|
||||||
|
>
|
||||||
|
Done
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<!-- Delete Confirmation Dialog -->
|
||||||
|
{#if deleteTarget}
|
||||||
|
<div class="fixed inset-0 z-50 flex items-center justify-center">
|
||||||
|
<div
|
||||||
|
class="absolute inset-0 bg-black/60"
|
||||||
|
role="button"
|
||||||
|
tabindex="-1"
|
||||||
|
onclick={() => { if (!deleting) deleteTarget = null; }}
|
||||||
|
onkeydown={(e) => { if (e.key === 'Escape' && !deleting) deleteTarget = null; }}
|
||||||
|
></div>
|
||||||
|
<div
|
||||||
|
class="relative w-full max-w-[420px] rounded-[var(--radius-card)] border border-[var(--color-border-mid)] bg-[var(--color-bg-2)] p-6 shadow-xl"
|
||||||
|
style="animation: fadeUp 0.18s cubic-bezier(0.25,1,0.5,1) both"
|
||||||
|
>
|
||||||
|
<h2 class="font-serif text-[1.375rem] leading-tight tracking-[-0.02em] text-[var(--color-text-bright)]">
|
||||||
|
Delete Host
|
||||||
|
</h2>
|
||||||
|
<p class="mt-1.5 text-ui text-[var(--color-text-tertiary)]">
|
||||||
|
Remove <code class="rounded bg-[var(--color-bg-4)] px-1.5 py-0.5 font-mono text-[0.8rem] text-[var(--color-text-primary)]">{deleteTarget.id}</code> from your BYOC pool.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{#if deletePreviewLoading}
|
||||||
|
<div class="mt-4 flex items-center gap-2 text-meta text-[var(--color-text-muted)]">
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Checking active capsules…
|
||||||
|
</div>
|
||||||
|
{:else if deletePreviewSandboxes.length > 0}
|
||||||
|
<div class="mt-4 rounded-[var(--radius-input)] border border-[var(--color-amber)]/30 bg-[var(--color-amber)]/6 px-3 py-2.5">
|
||||||
|
<p class="text-meta font-semibold text-[var(--color-amber)]">
|
||||||
|
{deletePreviewSandboxes.length} active capsule{deletePreviewSandboxes.length === 1 ? '' : 's'} will be destroyed.
|
||||||
|
</p>
|
||||||
|
<p class="mt-0.5 text-meta text-[var(--color-amber)]/70">
|
||||||
|
All running workloads on this host will be terminated immediately.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
{#if deleteError}
|
||||||
|
<div class="mt-3 rounded-[var(--radius-input)] border border-[var(--color-red)]/30 bg-[var(--color-red)]/5 px-3 py-2 text-meta text-[var(--color-red)]">
|
||||||
|
{deleteError}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<div class="mt-6 flex justify-end gap-3">
|
||||||
|
<button
|
||||||
|
onclick={() => (deleteTarget = null)}
|
||||||
|
disabled={deleting}
|
||||||
|
class="rounded-[var(--radius-button)] border border-[var(--color-border)] px-4 py-2 text-ui text-[var(--color-text-secondary)] transition-colors duration-150 hover:border-[var(--color-border-mid)] hover:text-[var(--color-text-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onclick={handleDelete}
|
||||||
|
disabled={deleting || deletePreviewLoading}
|
||||||
|
class="flex items-center gap-2 rounded-[var(--radius-button)] bg-[var(--color-red)] px-5 py-2 text-ui font-semibold text-white transition-all duration-150 hover:brightness-110 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{#if deleting}
|
||||||
|
<svg class="animate-spin" width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
|
||||||
|
Deleting…
|
||||||
|
{:else}
|
||||||
|
{deletePreviewSandboxes.length > 0 ? 'Force Delete' : 'Delete'}
|
||||||
|
{/if}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
|
<style>
|
||||||
|
@keyframes fadeUp {
|
||||||
|
from { opacity: 0; transform: translateY(10px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes slideIn {
|
||||||
|
from { opacity: 0; transform: translateX(-6px); }
|
||||||
|
to { opacity: 1; transform: translateX(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes shimmer {
|
||||||
|
0% { background-position: -200% 0; }
|
||||||
|
100% { background-position: 200% 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.skeleton {
|
||||||
|
background: linear-gradient(
|
||||||
|
90deg,
|
||||||
|
var(--color-bg-3) 25%,
|
||||||
|
var(--color-bg-4) 50%,
|
||||||
|
var(--color-bg-3) 75%
|
||||||
|
);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: shimmer 1.4s ease infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-row {
|
||||||
|
animation: slideIn 0.3s cubic-bezier(0.25, 1, 0.5, 1) both;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Checkmark draw animation */
|
||||||
|
.checkmark-path {
|
||||||
|
stroke-dasharray: 30;
|
||||||
|
stroke-dashoffset: 30;
|
||||||
|
transition: stroke-dashoffset 0.4s cubic-bezier(0.25, 1, 0.5, 1) 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkmark-drawn {
|
||||||
|
stroke-dashoffset: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
20
internal/api/agent_helper.go
Normal file
20
internal/api/agent_helper.go
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
||||||
|
)
|
||||||
|
|
||||||
|
// agentForHost looks up the host record and returns a Connect RPC client for it.
|
||||||
|
// Returns an error if the host is not found or has no address.
|
||||||
|
func agentForHost(ctx context.Context, queries *db.Queries, pool *lifecycle.HostClientPool, hostID string) (hostagentv1connect.HostAgentServiceClient, error) {
|
||||||
|
host, err := queries.GetHost(ctx, hostID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("host not found: %w", err)
|
||||||
|
}
|
||||||
|
return pool.GetForHost(host)
|
||||||
|
}
|
||||||
@ -168,7 +168,7 @@ func (h *authHandler) Signup(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := auth.SignJWT(h.jwtSecret, userID, teamID, req.Email, req.Name, "owner")
|
token, err := auth.SignJWT(h.jwtSecret, userID, teamID, req.Email, req.Name, "owner", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
||||||
return
|
return
|
||||||
@ -228,7 +228,7 @@ func (h *authHandler) Login(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role)
|
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role, user.IsAdmin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
||||||
return
|
return
|
||||||
@ -298,7 +298,7 @@ func (h *authHandler) SwitchTeam(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := auth.SignJWT(h.jwtSecret, ac.UserID, req.TeamID, ac.Email, user.Name, membership.Role)
|
token, err := auth.SignJWT(h.jwtSecret, ac.UserID, req.TeamID, ac.Email, user.Name, membership.Role, user.IsAdmin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
writeError(w, http.StatusInternalServerError, "internal_error", "failed to generate token")
|
||||||
return
|
return
|
||||||
|
|||||||
@ -14,17 +14,17 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type execHandler struct {
|
type execHandler struct {
|
||||||
db *db.Queries
|
db *db.Queries
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newExecHandler(db *db.Queries, agent hostagentv1connect.HostAgentServiceClient) *execHandler {
|
func newExecHandler(db *db.Queries, pool *lifecycle.HostClientPool) *execHandler {
|
||||||
return &execHandler{db: db, agent: agent}
|
return &execHandler{db: db, pool: pool}
|
||||||
}
|
}
|
||||||
|
|
||||||
type execRequest struct {
|
type execRequest struct {
|
||||||
@ -73,7 +73,13 @@ func (h *execHandler) Exec(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
|
|
||||||
resp, err := h.agent.Exec(ctx, connect.NewRequest(&pb.ExecRequest{
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := agent.Exec(ctx, connect.NewRequest(&pb.ExecRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Cmd: req.Cmd,
|
Cmd: req.Cmd,
|
||||||
Args: req.Args,
|
Args: req.Args,
|
||||||
|
|||||||
@ -14,17 +14,17 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type execStreamHandler struct {
|
type execStreamHandler struct {
|
||||||
db *db.Queries
|
db *db.Queries
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newExecStreamHandler(db *db.Queries, agent hostagentv1connect.HostAgentServiceClient) *execStreamHandler {
|
func newExecStreamHandler(db *db.Queries, pool *lifecycle.HostClientPool) *execStreamHandler {
|
||||||
return &execStreamHandler{db: db, agent: agent}
|
return &execStreamHandler{db: db, pool: pool}
|
||||||
}
|
}
|
||||||
|
|
||||||
var upgrader = websocket.Upgrader{
|
var upgrader = websocket.Upgrader{
|
||||||
@ -80,11 +80,17 @@ func (h *execStreamHandler) ExecStream(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
sendWSError(conn, "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Open streaming exec to host agent.
|
// Open streaming exec to host agent.
|
||||||
streamCtx, cancel := context.WithCancel(ctx)
|
streamCtx, cancel := context.WithCancel(ctx)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
stream, err := h.agent.ExecStream(streamCtx, connect.NewRequest(&pb.ExecStreamRequest{
|
stream, err := agent.ExecStream(streamCtx, connect.NewRequest(&pb.ExecStreamRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Cmd: startMsg.Cmd,
|
Cmd: startMsg.Cmd,
|
||||||
Args: startMsg.Args,
|
Args: startMsg.Args,
|
||||||
|
|||||||
@ -11,17 +11,17 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type filesHandler struct {
|
type filesHandler struct {
|
||||||
db *db.Queries
|
db *db.Queries
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newFilesHandler(db *db.Queries, agent hostagentv1connect.HostAgentServiceClient) *filesHandler {
|
func newFilesHandler(db *db.Queries, pool *lifecycle.HostClientPool) *filesHandler {
|
||||||
return &filesHandler{db: db, agent: agent}
|
return &filesHandler{db: db, pool: pool}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upload handles POST /v1/sandboxes/{id}/files/write.
|
// Upload handles POST /v1/sandboxes/{id}/files/write.
|
||||||
@ -75,7 +75,13 @@ func (h *filesHandler) Upload(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := h.agent.WriteFile(ctx, connect.NewRequest(&pb.WriteFileRequest{
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := agent.WriteFile(ctx, connect.NewRequest(&pb.WriteFileRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Path: filePath,
|
Path: filePath,
|
||||||
Content: content,
|
Content: content,
|
||||||
@ -120,7 +126,13 @@ func (h *filesHandler) Download(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := h.agent.ReadFile(ctx, connect.NewRequest(&pb.ReadFileRequest{
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := agent.ReadFile(ctx, connect.NewRequest(&pb.ReadFileRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Path: req.Path,
|
Path: req.Path,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@ -12,17 +12,17 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type filesStreamHandler struct {
|
type filesStreamHandler struct {
|
||||||
db *db.Queries
|
db *db.Queries
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newFilesStreamHandler(db *db.Queries, agent hostagentv1connect.HostAgentServiceClient) *filesStreamHandler {
|
func newFilesStreamHandler(db *db.Queries, pool *lifecycle.HostClientPool) *filesStreamHandler {
|
||||||
return &filesStreamHandler{db: db, agent: agent}
|
return &filesStreamHandler{db: db, pool: pool}
|
||||||
}
|
}
|
||||||
|
|
||||||
// StreamUpload handles POST /v1/sandboxes/{id}/files/stream/write.
|
// StreamUpload handles POST /v1/sandboxes/{id}/files/stream/write.
|
||||||
@ -88,8 +88,14 @@ func (h *filesStreamHandler) StreamUpload(w http.ResponseWriter, r *http.Request
|
|||||||
}
|
}
|
||||||
defer filePart.Close()
|
defer filePart.Close()
|
||||||
|
|
||||||
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Open client-streaming RPC to host agent.
|
// Open client-streaming RPC to host agent.
|
||||||
stream := h.agent.WriteFileStream(ctx)
|
stream := agent.WriteFileStream(ctx)
|
||||||
|
|
||||||
// Send metadata first.
|
// Send metadata first.
|
||||||
if err := stream.Send(&pb.WriteFileStreamRequest{
|
if err := stream.Send(&pb.WriteFileStreamRequest{
|
||||||
@ -164,8 +170,14 @@ func (h *filesStreamHandler) StreamDownload(w http.ResponseWriter, r *http.Reque
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Open server-streaming RPC to host agent.
|
// Open server-streaming RPC to host agent.
|
||||||
stream, err := h.agent.ReadFileStream(ctx, connect.NewRequest(&pb.ReadFileStreamRequest{
|
stream, err := agent.ReadFileStream(ctx, connect.NewRequest(&pb.ReadFileStreamRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Path: req.Path,
|
Path: req.Path,
|
||||||
}))
|
}))
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -34,6 +35,25 @@ type createHostResponse struct {
|
|||||||
RegistrationToken string `json:"registration_token"`
|
RegistrationToken string `json:"registration_token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type refreshTokenRequest struct {
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type refreshTokenResponse struct {
|
||||||
|
Host hostResponse `json:"host"`
|
||||||
|
Token string `json:"token"`
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type deletePreviewResponse struct {
|
||||||
|
Host hostResponse `json:"host"`
|
||||||
|
SandboxIDs []string `json:"sandbox_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type hasSandboxesErrorResponse struct {
|
||||||
|
SandboxIDs []string `json:"sandbox_ids"`
|
||||||
|
}
|
||||||
|
|
||||||
type registerHostRequest struct {
|
type registerHostRequest struct {
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
Arch string `json:"arch,omitempty"`
|
Arch string `json:"arch,omitempty"`
|
||||||
@ -46,6 +66,7 @@ type registerHostRequest struct {
|
|||||||
type registerHostResponse struct {
|
type registerHostResponse struct {
|
||||||
Host hostResponse `json:"host"`
|
Host hostResponse `json:"host"`
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type addTagRequest struct {
|
type addTagRequest struct {
|
||||||
@ -56,6 +77,7 @@ type hostResponse struct {
|
|||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Type string `json:"type"`
|
Type string `json:"type"`
|
||||||
TeamID *string `json:"team_id,omitempty"`
|
TeamID *string `json:"team_id,omitempty"`
|
||||||
|
TeamName *string `json:"team_name,omitempty"`
|
||||||
Provider *string `json:"provider,omitempty"`
|
Provider *string `json:"provider,omitempty"`
|
||||||
AvailabilityZone *string `json:"availability_zone,omitempty"`
|
AvailabilityZone *string `json:"availability_zone,omitempty"`
|
||||||
Arch *string `json:"arch,omitempty"`
|
Arch *string `json:"arch,omitempty"`
|
||||||
@ -153,16 +175,41 @@ func (h *hostHandler) Create(w http.ResponseWriter, r *http.Request) {
|
|||||||
// List handles GET /v1/hosts.
|
// List handles GET /v1/hosts.
|
||||||
func (h *hostHandler) List(w http.ResponseWriter, r *http.Request) {
|
func (h *hostHandler) List(w http.ResponseWriter, r *http.Request) {
|
||||||
ac := auth.MustFromContext(r.Context())
|
ac := auth.MustFromContext(r.Context())
|
||||||
|
admin := h.isAdmin(r, ac.UserID)
|
||||||
|
|
||||||
hosts, err := h.svc.List(r.Context(), ac.TeamID, h.isAdmin(r, ac.UserID))
|
hosts, err := h.svc.List(r.Context(), ac.TeamID, admin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
writeError(w, http.StatusInternalServerError, "db_error", "failed to list hosts")
|
writeError(w, http.StatusInternalServerError, "db_error", "failed to list hosts")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collect unique team IDs so we can fetch team names in one pass.
|
||||||
|
var teamNames map[string]string
|
||||||
|
if admin {
|
||||||
|
seen := make(map[string]struct{})
|
||||||
|
for _, host := range hosts {
|
||||||
|
if host.TeamID.Valid {
|
||||||
|
seen[host.TeamID.String] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(seen) > 0 {
|
||||||
|
teamNames = make(map[string]string, len(seen))
|
||||||
|
for id := range seen {
|
||||||
|
if team, err := h.queries.GetTeam(r.Context(), id); err == nil {
|
||||||
|
teamNames[id] = team.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
resp := make([]hostResponse, len(hosts))
|
resp := make([]hostResponse, len(hosts))
|
||||||
for i, host := range hosts {
|
for i, host := range hosts {
|
||||||
resp[i] = hostToResponse(host)
|
resp[i] = hostToResponse(host)
|
||||||
|
if host.TeamID.Valid {
|
||||||
|
if name, ok := teamNames[host.TeamID.String]; ok {
|
||||||
|
resp[i].TeamName = &name
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
writeJSON(w, http.StatusOK, resp)
|
writeJSON(w, http.StatusOK, resp)
|
||||||
@ -183,18 +230,54 @@ func (h *hostHandler) Get(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeJSON(w, http.StatusOK, hostToResponse(host))
|
writeJSON(w, http.StatusOK, hostToResponse(host))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete handles DELETE /v1/hosts/{id}.
|
// DeletePreview handles GET /v1/hosts/{id}/delete-preview.
|
||||||
func (h *hostHandler) Delete(w http.ResponseWriter, r *http.Request) {
|
// Returns what would be affected without making changes, for confirmation UI.
|
||||||
|
func (h *hostHandler) DeletePreview(w http.ResponseWriter, r *http.Request) {
|
||||||
hostID := chi.URLParam(r, "id")
|
hostID := chi.URLParam(r, "id")
|
||||||
ac := auth.MustFromContext(r.Context())
|
ac := auth.MustFromContext(r.Context())
|
||||||
|
|
||||||
if err := h.svc.Delete(r.Context(), hostID, ac.UserID, ac.TeamID, h.isAdmin(r, ac.UserID)); err != nil {
|
preview, err := h.svc.DeletePreview(r.Context(), hostID, ac.TeamID, h.isAdmin(r, ac.UserID))
|
||||||
|
if err != nil {
|
||||||
status, code, msg := serviceErrToHTTP(err)
|
status, code, msg := serviceErrToHTTP(err)
|
||||||
writeError(w, status, code, msg)
|
writeError(w, status, code, msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
writeJSON(w, http.StatusOK, deletePreviewResponse{
|
||||||
|
Host: hostToResponse(preview.Host),
|
||||||
|
SandboxIDs: preview.SandboxIDs,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete handles DELETE /v1/hosts/{id}.
|
||||||
|
// Without ?force=true: returns 409 with affected sandbox IDs if any are active.
|
||||||
|
// With ?force=true: gracefully stops all sandboxes then deletes the host.
|
||||||
|
func (h *hostHandler) Delete(w http.ResponseWriter, r *http.Request) {
|
||||||
|
hostID := chi.URLParam(r, "id")
|
||||||
|
ac := auth.MustFromContext(r.Context())
|
||||||
|
force := r.URL.Query().Get("force") == "true"
|
||||||
|
|
||||||
|
err := h.svc.Delete(r.Context(), hostID, ac.UserID, ac.TeamID, h.isAdmin(r, ac.UserID), force)
|
||||||
|
if err == nil {
|
||||||
w.WriteHeader(http.StatusNoContent)
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if it's a "has running sandboxes" error and return a structured 409.
|
||||||
|
var hasSandboxes *service.HostHasSandboxesError
|
||||||
|
if errors.As(err, &hasSandboxes) {
|
||||||
|
writeJSON(w, http.StatusConflict, map[string]any{
|
||||||
|
"error": map[string]any{
|
||||||
|
"code": "has_active_sandboxes",
|
||||||
|
"message": "host has active sandboxes; use ?force=true to destroy them and delete the host",
|
||||||
|
"sandbox_ids": hasSandboxes.SandboxIDs,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
status, code, msg := serviceErrToHTTP(err)
|
||||||
|
writeError(w, status, code, msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// RegenerateToken handles POST /v1/hosts/{id}/token.
|
// RegenerateToken handles POST /v1/hosts/{id}/token.
|
||||||
@ -249,6 +332,7 @@ func (h *hostHandler) Register(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeJSON(w, http.StatusCreated, registerHostResponse{
|
writeJSON(w, http.StatusCreated, registerHostResponse{
|
||||||
Host: hostToResponse(result.Host),
|
Host: hostToResponse(result.Host),
|
||||||
Token: result.JWT,
|
Token: result.JWT,
|
||||||
|
RefreshToken: result.RefreshToken,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -264,7 +348,8 @@ func (h *hostHandler) Heartbeat(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := h.svc.Heartbeat(r.Context(), hc.HostID); err != nil {
|
if err := h.svc.Heartbeat(r.Context(), hc.HostID); err != nil {
|
||||||
writeError(w, http.StatusInternalServerError, "db_error", "failed to update heartbeat")
|
status, code, msg := serviceErrToHTTP(err)
|
||||||
|
writeError(w, status, code, msg)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,6 +396,33 @@ func (h *hostHandler) RemoveTag(w http.ResponseWriter, r *http.Request) {
|
|||||||
w.WriteHeader(http.StatusNoContent)
|
w.WriteHeader(http.StatusNoContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RefreshToken handles POST /v1/hosts/auth/refresh (unauthenticated).
|
||||||
|
// The host agent sends its refresh token to receive a new JWT and rotated refresh token.
|
||||||
|
func (h *hostHandler) RefreshToken(w http.ResponseWriter, r *http.Request) {
|
||||||
|
var req refreshTokenRequest
|
||||||
|
if err := decodeJSON(r, &req); err != nil {
|
||||||
|
writeError(w, http.StatusBadRequest, "invalid_request", "invalid JSON body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if req.RefreshToken == "" {
|
||||||
|
writeError(w, http.StatusBadRequest, "invalid_request", "refresh_token is required")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := h.svc.Refresh(r.Context(), req.RefreshToken)
|
||||||
|
if err != nil {
|
||||||
|
status, code, msg := serviceErrToHTTP(err)
|
||||||
|
writeError(w, status, code, msg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
writeJSON(w, http.StatusOK, refreshTokenResponse{
|
||||||
|
Host: hostToResponse(result.Host),
|
||||||
|
Token: result.JWT,
|
||||||
|
RefreshToken: result.RefreshToken,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// ListTags handles GET /v1/hosts/{id}/tags.
|
// ListTags handles GET /v1/hosts/{id}/tags.
|
||||||
func (h *hostHandler) ListTags(w http.ResponseWriter, r *http.Request) {
|
func (h *hostHandler) ListTags(w http.ResponseWriter, r *http.Request) {
|
||||||
hostID := chi.URLParam(r, "id")
|
hostID := chi.URLParam(r, "id")
|
||||||
|
|||||||
@ -156,7 +156,7 @@ func (h *oauthHandler) Callback(w http.ResponseWriter, r *http.Request) {
|
|||||||
redirectWithError(w, r, redirectBase, "db_error")
|
redirectWithError(w, r, redirectBase, "db_error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role)
|
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role, user.IsAdmin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("oauth login: failed to sign jwt", "error", err)
|
slog.Error("oauth login: failed to sign jwt", "error", err)
|
||||||
redirectWithError(w, r, redirectBase, "internal_error")
|
redirectWithError(w, r, redirectBase, "internal_error")
|
||||||
@ -255,7 +255,7 @@ func (h *oauthHandler) Callback(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := auth.SignJWT(h.jwtSecret, userID, teamID, email, profile.Name, "owner")
|
token, err := auth.SignJWT(h.jwtSecret, userID, teamID, email, profile.Name, "owner", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("oauth: failed to sign jwt", "error", err)
|
slog.Error("oauth: failed to sign jwt", "error", err)
|
||||||
redirectWithError(w, r, redirectBase, "internal_error")
|
redirectWithError(w, r, redirectBase, "internal_error")
|
||||||
@ -290,7 +290,7 @@ func (h *oauthHandler) retryAsLogin(w http.ResponseWriter, r *http.Request, prov
|
|||||||
redirectWithError(w, r, redirectBase, "db_error")
|
redirectWithError(w, r, redirectBase, "db_error")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role)
|
token, err := auth.SignJWT(h.jwtSecret, user.ID, team.ID, user.Email, user.Name, role, user.IsAdmin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("oauth: retry login: failed to sign jwt", "error", err)
|
slog.Error("oauth: retry login: failed to sign jwt", "error", err)
|
||||||
redirectWithError(w, r, redirectBase, "internal_error")
|
redirectWithError(w, r, redirectBase, "internal_error")
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
@ -14,20 +15,45 @@ import (
|
|||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/id"
|
"git.omukk.dev/wrenn/sandbox/internal/id"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/service"
|
"git.omukk.dev/wrenn/sandbox/internal/service"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/validate"
|
"git.omukk.dev/wrenn/sandbox/internal/validate"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type snapshotHandler struct {
|
type snapshotHandler struct {
|
||||||
svc *service.TemplateService
|
svc *service.TemplateService
|
||||||
db *db.Queries
|
db *db.Queries
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
func newSnapshotHandler(svc *service.TemplateService, db *db.Queries, agent hostagentv1connect.HostAgentServiceClient) *snapshotHandler {
|
func newSnapshotHandler(svc *service.TemplateService, db *db.Queries, pool *lifecycle.HostClientPool) *snapshotHandler {
|
||||||
return &snapshotHandler{svc: svc, db: db, agent: agent}
|
return &snapshotHandler{svc: svc, db: db, pool: pool}
|
||||||
|
}
|
||||||
|
|
||||||
|
// deleteSnapshotBroadcast attempts to delete snapshot files on all online hosts.
|
||||||
|
// Snapshots aren't currently host-tracked in the DB, so we broadcast to all hosts
|
||||||
|
// and ignore NotFound errors. TODO: add host_id to templates table.
|
||||||
|
func (h *snapshotHandler) deleteSnapshotBroadcast(ctx context.Context, name string) error {
|
||||||
|
hosts, err := h.db.ListActiveHosts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("list hosts: %w", err)
|
||||||
|
}
|
||||||
|
for _, host := range hosts {
|
||||||
|
if host.Status != "online" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
agent, err := h.pool.GetForHost(host)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := agent.DeleteSnapshot(ctx, connect.NewRequest(&pb.DeleteSnapshotRequest{Name: name})); err != nil {
|
||||||
|
if connect.CodeOf(err) != connect.CodeNotFound {
|
||||||
|
slog.Warn("snapshot: failed to delete on host", "host_id", host.ID, "name", name, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type createSnapshotRequest struct {
|
type createSnapshotRequest struct {
|
||||||
@ -93,10 +119,9 @@ func (h *snapshotHandler) Create(w http.ResponseWriter, r *http.Request) {
|
|||||||
writeError(w, http.StatusConflict, "already_exists", "snapshot name already exists; use ?overwrite=true to replace")
|
writeError(w, http.StatusConflict, "already_exists", "snapshot name already exists; use ?overwrite=true to replace")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Delete old files from the agent before removing the DB record.
|
// Delete old snapshot files from all hosts before removing the DB record.
|
||||||
if _, err := h.agent.DeleteSnapshot(ctx, connect.NewRequest(&pb.DeleteSnapshotRequest{Name: req.Name})); err != nil {
|
if err := h.deleteSnapshotBroadcast(ctx, req.Name); err != nil {
|
||||||
status, code, msg := agentErrToHTTP(err)
|
writeError(w, http.StatusInternalServerError, "agent_error", "failed to delete existing snapshot files")
|
||||||
writeError(w, status, code, "failed to delete existing snapshot files: "+msg)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := h.db.DeleteTemplateByTeam(ctx, db.DeleteTemplateByTeamParams{Name: req.Name, TeamID: ac.TeamID}); err != nil {
|
if err := h.db.DeleteTemplateByTeam(ctx, db.DeleteTemplateByTeamParams{Name: req.Name, TeamID: ac.TeamID}); err != nil {
|
||||||
@ -116,7 +141,13 @@ func (h *snapshotHandler) Create(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := h.agent.CreateSnapshot(ctx, connect.NewRequest(&pb.CreateSnapshotRequest{
|
agent, err := agentForHost(ctx, h.db, h.pool, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "host_unavailable", "sandbox host is not reachable")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := agent.CreateSnapshot(ctx, connect.NewRequest(&pb.CreateSnapshotRequest{
|
||||||
SandboxId: req.SandboxID,
|
SandboxId: req.SandboxID,
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
}))
|
}))
|
||||||
@ -186,11 +217,8 @@ func (h *snapshotHandler) Delete(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := h.agent.DeleteSnapshot(ctx, connect.NewRequest(&pb.DeleteSnapshotRequest{
|
if err := h.deleteSnapshotBroadcast(ctx, name); err != nil {
|
||||||
Name: name,
|
writeError(w, http.StatusInternalServerError, "agent_error", "failed to delete snapshot files")
|
||||||
})); err != nil {
|
|
||||||
status, code, msg := agentErrToHTTP(err)
|
|
||||||
writeError(w, status, code, "failed to delete snapshot files: "+msg)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,6 +25,7 @@ type teamResponse struct {
|
|||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Slug string `json:"slug"`
|
Slug string `json:"slug"`
|
||||||
|
IsByoc bool `json:"is_byoc"`
|
||||||
CreatedAt string `json:"created_at"`
|
CreatedAt string `json:"created_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,6 +48,7 @@ func teamToResponse(t db.Team) teamResponse {
|
|||||||
ID: t.ID,
|
ID: t.ID,
|
||||||
Name: t.Name,
|
Name: t.Name,
|
||||||
Slug: t.Slug,
|
Slug: t.Slug,
|
||||||
|
IsByoc: t.IsByoc,
|
||||||
}
|
}
|
||||||
if t.CreatedAt.Valid {
|
if t.CreatedAt.Valid {
|
||||||
resp.CreatedAt = t.CreatedAt.Time.Format(time.RFC3339)
|
resp.CreatedAt = t.CreatedAt.Time.Format(time.RFC3339)
|
||||||
@ -321,3 +323,25 @@ func (h *teamHandler) Leave(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
w.WriteHeader(http.StatusNoContent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetBYOC handles PUT /v1/admin/teams/{id}/byoc (admin only).
|
||||||
|
// Enables or disables the BYOC feature flag for a team.
|
||||||
|
func (h *teamHandler) SetBYOC(w http.ResponseWriter, r *http.Request) {
|
||||||
|
teamID := chi.URLParam(r, "id")
|
||||||
|
|
||||||
|
var req struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
if err := decodeJSON(r, &req); err != nil {
|
||||||
|
writeError(w, http.StatusBadRequest, "invalid_request", "invalid JSON body")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := h.svc.SetBYOC(r.Context(), teamID, req.Enabled); err != nil {
|
||||||
|
status, code, msg := serviceErrToHTTP(err)
|
||||||
|
writeError(w, status, code, msg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
}
|
||||||
|
|||||||
202
internal/api/host_monitor.go
Normal file
202
internal/api/host_monitor.go
Normal file
@ -0,0 +1,202 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
|
|
||||||
|
"connectrpc.com/connect"
|
||||||
|
)
|
||||||
|
|
||||||
|
// unreachableThreshold is how long a host can go without a heartbeat before
|
||||||
|
// it is considered unreachable (3 missed 30-second heartbeats).
|
||||||
|
const unreachableThreshold = 90 * time.Second
|
||||||
|
|
||||||
|
// HostMonitor runs on a fixed interval and performs two duties:
|
||||||
|
//
|
||||||
|
// 1. Passive check: marks hosts whose last_heartbeat_at is stale as
|
||||||
|
// "unreachable" and marks their active sandboxes as "missing".
|
||||||
|
//
|
||||||
|
// 2. Active reconciliation: for each online host, calls ListSandboxes and
|
||||||
|
// reconciles DB state against live host state — restoring "missing"
|
||||||
|
// sandboxes that are actually alive, and stopping orphaned ones.
|
||||||
|
type HostMonitor struct {
|
||||||
|
db *db.Queries
|
||||||
|
pool *lifecycle.HostClientPool
|
||||||
|
interval time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHostMonitor creates a HostMonitor.
|
||||||
|
func NewHostMonitor(queries *db.Queries, pool *lifecycle.HostClientPool, interval time.Duration) *HostMonitor {
|
||||||
|
return &HostMonitor{
|
||||||
|
db: queries,
|
||||||
|
pool: pool,
|
||||||
|
interval: interval,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start runs the monitor loop until the context is cancelled.
|
||||||
|
func (m *HostMonitor) Start(ctx context.Context) {
|
||||||
|
go func() {
|
||||||
|
ticker := time.NewTicker(m.interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
// Run immediately on startup so the CP doesn't wait one full interval
|
||||||
|
// before reconciling host and sandbox state.
|
||||||
|
m.run(ctx)
|
||||||
|
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-ticker.C:
|
||||||
|
m.run(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *HostMonitor) run(ctx context.Context) {
|
||||||
|
hosts, err := m.db.ListActiveHosts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("host monitor: failed to list hosts", "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, host := range hosts {
|
||||||
|
m.checkHost(ctx, host)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *HostMonitor) checkHost(ctx context.Context, host db.Host) {
|
||||||
|
// --- Passive phase: check heartbeat staleness ---
|
||||||
|
|
||||||
|
stale := !host.LastHeartbeatAt.Valid ||
|
||||||
|
time.Since(host.LastHeartbeatAt.Time) > unreachableThreshold
|
||||||
|
|
||||||
|
if stale && host.Status != "unreachable" {
|
||||||
|
slog.Info("host monitor: marking host unreachable", "host_id", host.ID,
|
||||||
|
"last_heartbeat", host.LastHeartbeatAt.Time)
|
||||||
|
if err := m.db.MarkHostUnreachable(ctx, host.ID); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to mark host unreachable", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
if err := m.db.MarkSandboxesMissingByHost(ctx, host.ID); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to mark sandboxes missing", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Active reconciliation: only for online hosts ---
|
||||||
|
|
||||||
|
if host.Status != "online" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
agent, err := m.pool.GetForHost(host)
|
||||||
|
if err != nil {
|
||||||
|
// Host has no address yet (e.g., just registered) — skip.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := agent.ListSandboxes(ctx, connect.NewRequest(&pb.ListSandboxesRequest{}))
|
||||||
|
if err != nil {
|
||||||
|
// RPC failure is a transient condition; the passive phase will catch it
|
||||||
|
// if heartbeats stop arriving.
|
||||||
|
slog.Debug("host monitor: ListSandboxes failed (transient)", "host_id", host.ID, "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build set of sandbox IDs alive on the host.
|
||||||
|
alive := make(map[string]struct{}, len(resp.Msg.Sandboxes))
|
||||||
|
for _, sb := range resp.Msg.Sandboxes {
|
||||||
|
alive[sb.SandboxId] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
autoPaused := make(map[string]struct{}, len(resp.Msg.AutoPausedSandboxIds))
|
||||||
|
for _, id := range resp.Msg.AutoPausedSandboxIds {
|
||||||
|
autoPaused[id] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Restore sandboxes that are "missing" in DB but alive on host ---
|
||||||
|
// This handles the case where CP marked them missing due to a transient
|
||||||
|
// heartbeat gap, but the host was actually fine.
|
||||||
|
|
||||||
|
missingSandboxes, err := m.db.ListSandboxesByHostAndStatus(ctx, db.ListSandboxesByHostAndStatusParams{
|
||||||
|
HostID: host.ID,
|
||||||
|
Column2: []string{"missing"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("host monitor: failed to list missing sandboxes", "host_id", host.ID, "error", err)
|
||||||
|
} else {
|
||||||
|
var toRestore []string
|
||||||
|
var toStop []string
|
||||||
|
for _, sb := range missingSandboxes {
|
||||||
|
if _, ok := alive[sb.ID]; ok {
|
||||||
|
toRestore = append(toRestore, sb.ID)
|
||||||
|
} else {
|
||||||
|
toStop = append(toStop, sb.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(toRestore) > 0 {
|
||||||
|
slog.Info("host monitor: restoring missing sandboxes", "host_id", host.ID, "count", len(toRestore))
|
||||||
|
if err := m.db.BulkRestoreRunning(ctx, toRestore); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to restore missing sandboxes", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(toStop) > 0 {
|
||||||
|
slog.Info("host monitor: stopping confirmed-dead missing sandboxes", "host_id", host.ID, "count", len(toStop))
|
||||||
|
if err := m.db.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
||||||
|
Column1: toStop,
|
||||||
|
Status: "stopped",
|
||||||
|
}); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to stop missing sandboxes", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Find running sandboxes in DB that are no longer alive on the host ---
|
||||||
|
|
||||||
|
runningSandboxes, err := m.db.ListSandboxesByHostAndStatus(ctx, db.ListSandboxesByHostAndStatusParams{
|
||||||
|
HostID: host.ID,
|
||||||
|
Column2: []string{"running"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("host monitor: failed to list running sandboxes", "host_id", host.ID, "error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var toPause, toStop []string
|
||||||
|
for _, sb := range runningSandboxes {
|
||||||
|
if _, ok := alive[sb.ID]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := autoPaused[sb.ID]; ok {
|
||||||
|
toPause = append(toPause, sb.ID)
|
||||||
|
} else {
|
||||||
|
toStop = append(toStop, sb.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(toPause) > 0 {
|
||||||
|
slog.Info("host monitor: marking auto-paused sandboxes", "host_id", host.ID, "count", len(toPause))
|
||||||
|
if err := m.db.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
||||||
|
Column1: toPause,
|
||||||
|
Status: "paused",
|
||||||
|
}); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to mark paused", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(toStop) > 0 {
|
||||||
|
slog.Info("host monitor: marking orphaned sandboxes stopped", "host_id", host.ID, "count", len(toStop))
|
||||||
|
if err := m.db.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
||||||
|
Column1: toStop,
|
||||||
|
Status: "stopped",
|
||||||
|
}); err != nil {
|
||||||
|
slog.Warn("host monitor: failed to mark stopped", "host_id", host.ID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -89,6 +89,8 @@ func serviceErrToHTTP(err error) (int, string, string) {
|
|||||||
return http.StatusConflict, "invalid_state", msg
|
return http.StatusConflict, "invalid_state", msg
|
||||||
case strings.Contains(msg, "forbidden"):
|
case strings.Contains(msg, "forbidden"):
|
||||||
return http.StatusForbidden, "forbidden", msg
|
return http.StatusForbidden, "forbidden", msg
|
||||||
|
case strings.Contains(msg, "invalid or expired"):
|
||||||
|
return http.StatusUnauthorized, "unauthorized", msg
|
||||||
case strings.Contains(msg, "invalid"):
|
case strings.Contains(msg, "invalid"):
|
||||||
return http.StatusBadRequest, "invalid_request", msg
|
return http.StatusBadRequest, "invalid_request", msg
|
||||||
default:
|
default:
|
||||||
|
|||||||
30
internal/api/middleware_admin.go
Normal file
30
internal/api/middleware_admin.go
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
// requireAdmin validates that the authenticated user is a platform admin.
|
||||||
|
// Must run after requireJWT (depends on AuthContext being present).
|
||||||
|
// Re-validates against the DB — the JWT is_admin claim is for UI only;
|
||||||
|
// the DB is the source of truth for admin access.
|
||||||
|
func requireAdmin(queries *db.Queries) func(http.Handler) http.Handler {
|
||||||
|
return func(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
ac, ok := auth.FromContext(r.Context())
|
||||||
|
if !ok {
|
||||||
|
writeError(w, http.StatusUnauthorized, "unauthorized", "authentication required")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
user, err := queries.GetUserByID(r.Context(), ac.UserID)
|
||||||
|
if err != nil || !user.IsAdmin {
|
||||||
|
writeError(w, http.StatusForbidden, "forbidden", "admin access required")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
next.ServeHTTP(w, r)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -31,7 +31,9 @@ func requireJWT(secret []byte) func(http.Handler) http.Handler {
|
|||||||
Email: claims.Email,
|
Email: claims.Email,
|
||||||
Name: claims.Name,
|
Name: claims.Name,
|
||||||
Role: claims.Role,
|
Role: claims.Role,
|
||||||
|
IsAdmin: claims.IsAdmin,
|
||||||
})
|
})
|
||||||
|
|
||||||
next.ServeHTTP(w, r.WithContext(ctx))
|
next.ServeHTTP(w, r.WithContext(ctx))
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1193,8 +1193,16 @@ paths:
|
|||||||
security:
|
security:
|
||||||
- bearerAuth: []
|
- bearerAuth: []
|
||||||
description: |
|
description: |
|
||||||
Admins can delete any host. Team owners can delete BYOC hosts
|
Admins can delete any host. Team owners and admins can delete BYOC hosts
|
||||||
belonging to their team.
|
belonging to their team. Without `?force=true`, returns 409 if the host
|
||||||
|
has active sandboxes. With `?force=true`, destroys all sandboxes first.
|
||||||
|
parameters:
|
||||||
|
- name: force
|
||||||
|
in: query
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: boolean
|
||||||
|
description: If true, destroy all sandboxes on the host before deleting.
|
||||||
responses:
|
responses:
|
||||||
"204":
|
"204":
|
||||||
description: Host deleted
|
description: Host deleted
|
||||||
@ -1204,6 +1212,12 @@ paths:
|
|||||||
application/json:
|
application/json:
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/Error"
|
$ref: "#/components/schemas/Error"
|
||||||
|
"409":
|
||||||
|
description: Host has active sandboxes (only when force is not set)
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/HostHasSandboxesError"
|
||||||
|
|
||||||
/v1/hosts/{id}/token:
|
/v1/hosts/{id}/token:
|
||||||
parameters:
|
parameters:
|
||||||
@ -1312,6 +1326,72 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/Error"
|
$ref: "#/components/schemas/Error"
|
||||||
|
|
||||||
|
/v1/hosts/auth/refresh:
|
||||||
|
post:
|
||||||
|
summary: Refresh host JWT
|
||||||
|
operationId: refreshHostToken
|
||||||
|
tags: [hosts]
|
||||||
|
description: |
|
||||||
|
Exchanges a refresh token for a new JWT and rotated refresh token.
|
||||||
|
The old refresh token is immediately revoked. No authentication required —
|
||||||
|
the refresh token itself is the credential.
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/RefreshHostTokenRequest"
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: New JWT and rotated refresh token
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/RefreshHostTokenResponse"
|
||||||
|
"401":
|
||||||
|
description: Invalid, expired, or revoked refresh token
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/Error"
|
||||||
|
|
||||||
|
/v1/hosts/{id}/delete-preview:
|
||||||
|
parameters:
|
||||||
|
- name: id
|
||||||
|
in: path
|
||||||
|
required: true
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
|
||||||
|
get:
|
||||||
|
summary: Preview host deletion
|
||||||
|
operationId: getHostDeletePreview
|
||||||
|
tags: [hosts]
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
description: |
|
||||||
|
Returns the list of sandbox IDs that would be destroyed if the host
|
||||||
|
were deleted with `?force=true`. No state is modified.
|
||||||
|
responses:
|
||||||
|
"200":
|
||||||
|
description: Deletion preview
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/HostDeletePreview"
|
||||||
|
"403":
|
||||||
|
description: Insufficient permissions
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/Error"
|
||||||
|
"404":
|
||||||
|
description: Host not found
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: "#/components/schemas/Error"
|
||||||
|
|
||||||
/v1/hosts/{id}/tags:
|
/v1/hosts/{id}/tags:
|
||||||
parameters:
|
parameters:
|
||||||
- name: id
|
- name: id
|
||||||
@ -1405,7 +1485,7 @@ components:
|
|||||||
type: apiKey
|
type: apiKey
|
||||||
in: header
|
in: header
|
||||||
name: X-Host-Token
|
name: X-Host-Token
|
||||||
description: Long-lived host JWT returned from POST /v1/hosts/register. Valid for 1 year.
|
description: Host JWT returned from POST /v1/hosts/register or POST /v1/hosts/auth/refresh. Valid for 7 days.
|
||||||
|
|
||||||
schemas:
|
schemas:
|
||||||
SignupRequest:
|
SignupRequest:
|
||||||
@ -1505,7 +1585,7 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
status:
|
status:
|
||||||
type: string
|
type: string
|
||||||
enum: [pending, running, paused, stopped, error]
|
enum: [pending, starting, running, paused, hibernated, stopped, missing, error]
|
||||||
template:
|
template:
|
||||||
type: string
|
type: string
|
||||||
vcpus:
|
vcpus:
|
||||||
@ -1661,7 +1741,10 @@ components:
|
|||||||
$ref: "#/components/schemas/Host"
|
$ref: "#/components/schemas/Host"
|
||||||
token:
|
token:
|
||||||
type: string
|
type: string
|
||||||
description: Long-lived host JWT for X-Host-Token header. Valid for 1 year.
|
description: Host JWT for X-Host-Token header. Valid for 7 days.
|
||||||
|
refresh_token:
|
||||||
|
type: string
|
||||||
|
description: Refresh token for obtaining new JWTs. Valid for 60 days; rotated on each use.
|
||||||
|
|
||||||
Host:
|
Host:
|
||||||
type: object
|
type: object
|
||||||
@ -1697,7 +1780,7 @@ components:
|
|||||||
nullable: true
|
nullable: true
|
||||||
status:
|
status:
|
||||||
type: string
|
type: string
|
||||||
enum: [pending, online, offline, draining]
|
enum: [pending, online, offline, draining, unreachable]
|
||||||
last_heartbeat_at:
|
last_heartbeat_at:
|
||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
@ -1711,6 +1794,54 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
|
|
||||||
|
RefreshHostTokenRequest:
|
||||||
|
type: object
|
||||||
|
required: [refresh_token]
|
||||||
|
properties:
|
||||||
|
refresh_token:
|
||||||
|
type: string
|
||||||
|
description: Refresh token obtained from registration or a previous refresh.
|
||||||
|
|
||||||
|
RefreshHostTokenResponse:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
host:
|
||||||
|
$ref: "#/components/schemas/Host"
|
||||||
|
token:
|
||||||
|
type: string
|
||||||
|
description: New host JWT. Valid for 7 days.
|
||||||
|
refresh_token:
|
||||||
|
type: string
|
||||||
|
description: New refresh token. Valid for 60 days; old token is revoked.
|
||||||
|
|
||||||
|
HostDeletePreview:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
host:
|
||||||
|
$ref: "#/components/schemas/Host"
|
||||||
|
sandbox_ids:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
description: IDs of sandboxes that would be destroyed on force-delete.
|
||||||
|
|
||||||
|
HostHasSandboxesError:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
error:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
code:
|
||||||
|
type: string
|
||||||
|
example: host_has_sandboxes
|
||||||
|
message:
|
||||||
|
type: string
|
||||||
|
sandbox_ids:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
description: IDs of active sandboxes blocking deletion.
|
||||||
|
|
||||||
AddTagRequest:
|
AddTagRequest:
|
||||||
type: object
|
type: object
|
||||||
required: [tag]
|
required: [tag]
|
||||||
|
|||||||
@ -1,126 +0,0 @@
|
|||||||
package api
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"log/slog"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"connectrpc.com/connect"
|
|
||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Reconciler periodically compares the host agent's sandbox list with the DB
|
|
||||||
// and marks sandboxes that no longer exist on the host as stopped.
|
|
||||||
type Reconciler struct {
|
|
||||||
db *db.Queries
|
|
||||||
agent hostagentv1connect.HostAgentServiceClient
|
|
||||||
hostID string
|
|
||||||
interval time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewReconciler creates a new reconciler.
|
|
||||||
func NewReconciler(db *db.Queries, agent hostagentv1connect.HostAgentServiceClient, hostID string, interval time.Duration) *Reconciler {
|
|
||||||
return &Reconciler{
|
|
||||||
db: db,
|
|
||||||
agent: agent,
|
|
||||||
hostID: hostID,
|
|
||||||
interval: interval,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start runs the reconciliation loop until the context is cancelled.
|
|
||||||
func (rc *Reconciler) Start(ctx context.Context) {
|
|
||||||
go func() {
|
|
||||||
ticker := time.NewTicker(rc.interval)
|
|
||||||
defer ticker.Stop()
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ctx.Done():
|
|
||||||
return
|
|
||||||
case <-ticker.C:
|
|
||||||
rc.reconcile(ctx)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (rc *Reconciler) reconcile(ctx context.Context) {
|
|
||||||
// Single RPC returns both the running sandbox list and any IDs that
|
|
||||||
// were auto-paused by the TTL reaper since the last call.
|
|
||||||
resp, err := rc.agent.ListSandboxes(ctx, connect.NewRequest(&pb.ListSandboxesRequest{}))
|
|
||||||
if err != nil {
|
|
||||||
slog.Warn("reconciler: failed to list sandboxes from host agent", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build a set of sandbox IDs that are alive on the host.
|
|
||||||
alive := make(map[string]struct{}, len(resp.Msg.Sandboxes))
|
|
||||||
for _, sb := range resp.Msg.Sandboxes {
|
|
||||||
alive[sb.SandboxId] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build auto-paused set from the same response.
|
|
||||||
autoPausedSet := make(map[string]struct{}, len(resp.Msg.AutoPausedSandboxIds))
|
|
||||||
for _, id := range resp.Msg.AutoPausedSandboxIds {
|
|
||||||
autoPausedSet[id] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get all DB sandboxes for this host that are running.
|
|
||||||
// Paused sandboxes are excluded: they are expected to not exist on the
|
|
||||||
// host agent because pause = snapshot + destroy resources.
|
|
||||||
dbSandboxes, err := rc.db.ListSandboxesByHostAndStatus(ctx, db.ListSandboxesByHostAndStatusParams{
|
|
||||||
HostID: rc.hostID,
|
|
||||||
Column2: []string{"running"},
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
slog.Warn("reconciler: failed to list DB sandboxes", "error", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find sandboxes in DB that are no longer on the host.
|
|
||||||
var stale []string
|
|
||||||
for _, sb := range dbSandboxes {
|
|
||||||
if _, ok := alive[sb.ID]; !ok {
|
|
||||||
stale = append(stale, sb.ID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(stale) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Split stale sandboxes into those auto-paused by the TTL reaper vs
|
|
||||||
// those that crashed/were orphaned.
|
|
||||||
var toPause, toStop []string
|
|
||||||
for _, id := range stale {
|
|
||||||
if _, ok := autoPausedSet[id]; ok {
|
|
||||||
toPause = append(toPause, id)
|
|
||||||
} else {
|
|
||||||
toStop = append(toStop, id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(toPause) > 0 {
|
|
||||||
slog.Info("reconciler: marking auto-paused sandboxes", "count", len(toPause), "ids", toPause)
|
|
||||||
if err := rc.db.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
|
||||||
Column1: toPause,
|
|
||||||
Status: "paused",
|
|
||||||
}); err != nil {
|
|
||||||
slog.Warn("reconciler: failed to mark auto-paused sandboxes", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(toStop) > 0 {
|
|
||||||
slog.Info("reconciler: marking stale sandboxes as stopped", "count", len(toStop), "ids", toStop)
|
|
||||||
if err := rc.db.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
|
||||||
Column1: toStop,
|
|
||||||
Status: "stopped",
|
|
||||||
}); err != nil {
|
|
||||||
slog.Warn("reconciler: failed to update stale sandboxes", "error", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -11,8 +11,9 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/auth/oauth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth/oauth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/scheduler"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/service"
|
"git.omukk.dev/wrenn/sandbox/internal/service"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed openapi.yaml
|
//go:embed openapi.yaml
|
||||||
@ -24,25 +25,34 @@ type Server struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// New constructs the chi router and registers all routes.
|
// New constructs the chi router and registers all routes.
|
||||||
func New(queries *db.Queries, agent hostagentv1connect.HostAgentServiceClient, pool *pgxpool.Pool, rdb *redis.Client, jwtSecret []byte, oauthRegistry *oauth.Registry, oauthRedirectURL string) *Server {
|
func New(
|
||||||
|
queries *db.Queries,
|
||||||
|
pool *lifecycle.HostClientPool,
|
||||||
|
sched scheduler.HostScheduler,
|
||||||
|
pgPool *pgxpool.Pool,
|
||||||
|
rdb *redis.Client,
|
||||||
|
jwtSecret []byte,
|
||||||
|
oauthRegistry *oauth.Registry,
|
||||||
|
oauthRedirectURL string,
|
||||||
|
) *Server {
|
||||||
r := chi.NewRouter()
|
r := chi.NewRouter()
|
||||||
r.Use(requestLogger())
|
r.Use(requestLogger())
|
||||||
|
|
||||||
// Shared service layer.
|
// Shared service layer.
|
||||||
sandboxSvc := &service.SandboxService{DB: queries, Agent: agent}
|
sandboxSvc := &service.SandboxService{DB: queries, Pool: pool, Scheduler: sched}
|
||||||
apiKeySvc := &service.APIKeyService{DB: queries}
|
apiKeySvc := &service.APIKeyService{DB: queries}
|
||||||
templateSvc := &service.TemplateService{DB: queries}
|
templateSvc := &service.TemplateService{DB: queries}
|
||||||
hostSvc := &service.HostService{DB: queries, Redis: rdb, JWT: jwtSecret}
|
hostSvc := &service.HostService{DB: queries, Redis: rdb, JWT: jwtSecret, Pool: pool}
|
||||||
teamSvc := &service.TeamService{DB: queries, Pool: pool, Agent: agent}
|
teamSvc := &service.TeamService{DB: queries, Pool: pgPool, HostPool: pool}
|
||||||
|
|
||||||
sandbox := newSandboxHandler(sandboxSvc)
|
sandbox := newSandboxHandler(sandboxSvc)
|
||||||
exec := newExecHandler(queries, agent)
|
exec := newExecHandler(queries, pool)
|
||||||
execStream := newExecStreamHandler(queries, agent)
|
execStream := newExecStreamHandler(queries, pool)
|
||||||
files := newFilesHandler(queries, agent)
|
files := newFilesHandler(queries, pool)
|
||||||
filesStream := newFilesStreamHandler(queries, agent)
|
filesStream := newFilesStreamHandler(queries, pool)
|
||||||
snapshots := newSnapshotHandler(templateSvc, queries, agent)
|
snapshots := newSnapshotHandler(templateSvc, queries, pool)
|
||||||
authH := newAuthHandler(queries, pool, jwtSecret)
|
authH := newAuthHandler(queries, pgPool, jwtSecret)
|
||||||
oauthH := newOAuthHandler(queries, pool, jwtSecret, oauthRegistry, oauthRedirectURL)
|
oauthH := newOAuthHandler(queries, pgPool, jwtSecret, oauthRegistry, oauthRedirectURL)
|
||||||
apiKeys := newAPIKeyHandler(apiKeySvc)
|
apiKeys := newAPIKeyHandler(apiKeySvc)
|
||||||
hostH := newHostHandler(hostSvc, queries)
|
hostH := newHostHandler(hostSvc, queries)
|
||||||
teamH := newTeamHandler(teamSvc)
|
teamH := newTeamHandler(teamSvc)
|
||||||
@ -123,6 +133,9 @@ func New(queries *db.Queries, agent hostagentv1connect.HostAgentServiceClient, p
|
|||||||
// Unauthenticated: one-time registration token.
|
// Unauthenticated: one-time registration token.
|
||||||
r.Post("/register", hostH.Register)
|
r.Post("/register", hostH.Register)
|
||||||
|
|
||||||
|
// Unauthenticated: refresh token exchange.
|
||||||
|
r.Post("/auth/refresh", hostH.RefreshToken)
|
||||||
|
|
||||||
// Host-token-authenticated: heartbeat.
|
// Host-token-authenticated: heartbeat.
|
||||||
r.With(requireHostToken(jwtSecret)).Post("/{id}/heartbeat", hostH.Heartbeat)
|
r.With(requireHostToken(jwtSecret)).Post("/{id}/heartbeat", hostH.Heartbeat)
|
||||||
|
|
||||||
@ -134,6 +147,7 @@ func New(queries *db.Queries, agent hostagentv1connect.HostAgentServiceClient, p
|
|||||||
r.Route("/{id}", func(r chi.Router) {
|
r.Route("/{id}", func(r chi.Router) {
|
||||||
r.Get("/", hostH.Get)
|
r.Get("/", hostH.Get)
|
||||||
r.Delete("/", hostH.Delete)
|
r.Delete("/", hostH.Delete)
|
||||||
|
r.Get("/delete-preview", hostH.DeletePreview)
|
||||||
r.Post("/token", hostH.RegenerateToken)
|
r.Post("/token", hostH.RegenerateToken)
|
||||||
r.Get("/tags", hostH.ListTags)
|
r.Get("/tags", hostH.ListTags)
|
||||||
r.Post("/tags", hostH.AddTag)
|
r.Post("/tags", hostH.AddTag)
|
||||||
@ -142,6 +156,13 @@ func New(queries *db.Queries, agent hostagentv1connect.HostAgentServiceClient, p
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Platform admin routes — require JWT + DB-validated admin status.
|
||||||
|
r.Route("/v1/admin", func(r chi.Router) {
|
||||||
|
r.Use(requireJWT(jwtSecret))
|
||||||
|
r.Use(requireAdmin(queries))
|
||||||
|
r.Put("/teams/{id}/byoc", teamH.SetBYOC)
|
||||||
|
})
|
||||||
|
|
||||||
return &Server{router: r}
|
return &Server{router: r}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@ type AuthContext struct {
|
|||||||
Email string // empty when authenticated via API key
|
Email string // empty when authenticated via API key
|
||||||
Name string // empty when authenticated via API key
|
Name string // empty when authenticated via API key
|
||||||
Role string // owner, admin, or member; empty when authenticated via API key
|
Role string // owner, admin, or member; empty when authenticated via API key
|
||||||
|
IsAdmin bool // platform-level admin; always false when authenticated via API key
|
||||||
}
|
}
|
||||||
|
|
||||||
// WithAuthContext returns a new context with the given AuthContext.
|
// WithAuthContext returns a new context with the given AuthContext.
|
||||||
|
|||||||
@ -8,7 +8,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const jwtExpiry = 6 * time.Hour
|
const jwtExpiry = 6 * time.Hour
|
||||||
const hostJWTExpiry = 8760 * time.Hour // 1 year
|
const hostJWTExpiry = 7 * 24 * time.Hour // 7 days; host refreshes via refresh token
|
||||||
|
const HostRefreshTokenExpiry = 60 * 24 * time.Hour // 60 days; exported for service layer
|
||||||
|
|
||||||
// Claims are the JWT payload for user tokens.
|
// Claims are the JWT payload for user tokens.
|
||||||
type Claims struct {
|
type Claims struct {
|
||||||
@ -17,17 +18,19 @@ type Claims struct {
|
|||||||
Role string `json:"role"` // owner, admin, or member within TeamID
|
Role string `json:"role"` // owner, admin, or member within TeamID
|
||||||
Email string `json:"email"`
|
Email string `json:"email"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
|
IsAdmin bool `json:"is_admin,omitempty"` // platform-level admin flag
|
||||||
jwt.RegisteredClaims
|
jwt.RegisteredClaims
|
||||||
}
|
}
|
||||||
|
|
||||||
// SignJWT signs a new 6-hour JWT for the given user.
|
// SignJWT signs a new 6-hour JWT for the given user.
|
||||||
func SignJWT(secret []byte, userID, teamID, email, name, role string) (string, error) {
|
func SignJWT(secret []byte, userID, teamID, email, name, role string, isAdmin bool) (string, error) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
claims := Claims{
|
claims := Claims{
|
||||||
TeamID: teamID,
|
TeamID: teamID,
|
||||||
Role: role,
|
Role: role,
|
||||||
Email: email,
|
Email: email,
|
||||||
Name: name,
|
Name: name,
|
||||||
|
IsAdmin: isAdmin,
|
||||||
RegisteredClaims: jwt.RegisteredClaims{
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
Subject: userID,
|
Subject: userID,
|
||||||
IssuedAt: jwt.NewNumericDate(now),
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
|
|||||||
@ -2,7 +2,6 @@ package config
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
)
|
)
|
||||||
@ -12,7 +11,6 @@ type Config struct {
|
|||||||
DatabaseURL string
|
DatabaseURL string
|
||||||
RedisURL string
|
RedisURL string
|
||||||
ListenAddr string
|
ListenAddr string
|
||||||
HostAgentAddr string
|
|
||||||
JWTSecret string
|
JWTSecret string
|
||||||
|
|
||||||
OAuthGitHubClientID string
|
OAuthGitHubClientID string
|
||||||
@ -27,11 +25,10 @@ func Load() Config {
|
|||||||
// Best-effort load — missing .env file is fine.
|
// Best-effort load — missing .env file is fine.
|
||||||
_ = godotenv.Load()
|
_ = godotenv.Load()
|
||||||
|
|
||||||
cfg := Config{
|
return Config{
|
||||||
DatabaseURL: envOrDefault("DATABASE_URL", "postgres://wrenn:wrenn@localhost:5432/wrenn?sslmode=disable"),
|
DatabaseURL: envOrDefault("DATABASE_URL", "postgres://wrenn:wrenn@localhost:5432/wrenn?sslmode=disable"),
|
||||||
RedisURL: envOrDefault("REDIS_URL", "redis://localhost:6379/0"),
|
RedisURL: envOrDefault("REDIS_URL", "redis://localhost:6379/0"),
|
||||||
ListenAddr: envOrDefault("CP_LISTEN_ADDR", ":8080"),
|
ListenAddr: envOrDefault("CP_LISTEN_ADDR", ":8080"),
|
||||||
HostAgentAddr: envOrDefault("CP_HOST_AGENT_ADDR", "http://localhost:50051"),
|
|
||||||
JWTSecret: os.Getenv("JWT_SECRET"),
|
JWTSecret: os.Getenv("JWT_SECRET"),
|
||||||
|
|
||||||
OAuthGitHubClientID: os.Getenv("OAUTH_GITHUB_CLIENT_ID"),
|
OAuthGitHubClientID: os.Getenv("OAUTH_GITHUB_CLIENT_ID"),
|
||||||
@ -39,13 +36,6 @@ func Load() Config {
|
|||||||
OAuthRedirectURL: envOrDefault("OAUTH_REDIRECT_URL", "https://app.wrenn.dev"),
|
OAuthRedirectURL: envOrDefault("OAUTH_REDIRECT_URL", "https://app.wrenn.dev"),
|
||||||
CPPublicURL: os.Getenv("CP_PUBLIC_URL"),
|
CPPublicURL: os.Getenv("CP_PUBLIC_URL"),
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure the host agent address has a scheme.
|
|
||||||
if !strings.HasPrefix(cfg.HostAgentAddr, "http://") && !strings.HasPrefix(cfg.HostAgentAddr, "https://") {
|
|
||||||
cfg.HostAgentAddr = "http://" + cfg.HostAgentAddr
|
|
||||||
}
|
|
||||||
|
|
||||||
return cfg
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func envOrDefault(key, def string) string {
|
func envOrDefault(key, def string) string {
|
||||||
|
|||||||
92
internal/db/host_refresh_tokens.sql.go
Normal file
92
internal/db/host_refresh_tokens.sql.go
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
// Code generated by sqlc. DO NOT EDIT.
|
||||||
|
// versions:
|
||||||
|
// sqlc v1.30.0
|
||||||
|
// source: host_refresh_tokens.sql
|
||||||
|
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/jackc/pgx/v5/pgtype"
|
||||||
|
)
|
||||||
|
|
||||||
|
const deleteExpiredHostRefreshTokens = `-- name: DeleteExpiredHostRefreshTokens :exec
|
||||||
|
DELETE FROM host_refresh_tokens
|
||||||
|
WHERE expires_at < NOW() OR revoked_at IS NOT NULL
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) DeleteExpiredHostRefreshTokens(ctx context.Context) error {
|
||||||
|
_, err := q.db.Exec(ctx, deleteExpiredHostRefreshTokens)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
const getHostRefreshTokenByHash = `-- name: GetHostRefreshTokenByHash :one
|
||||||
|
SELECT id, host_id, token_hash, expires_at, created_at, revoked_at FROM host_refresh_tokens
|
||||||
|
WHERE token_hash = $1 AND revoked_at IS NULL AND expires_at > NOW()
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) GetHostRefreshTokenByHash(ctx context.Context, tokenHash string) (HostRefreshToken, error) {
|
||||||
|
row := q.db.QueryRow(ctx, getHostRefreshTokenByHash, tokenHash)
|
||||||
|
var i HostRefreshToken
|
||||||
|
err := row.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.HostID,
|
||||||
|
&i.TokenHash,
|
||||||
|
&i.ExpiresAt,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.RevokedAt,
|
||||||
|
)
|
||||||
|
return i, err
|
||||||
|
}
|
||||||
|
|
||||||
|
const insertHostRefreshToken = `-- name: InsertHostRefreshToken :one
|
||||||
|
INSERT INTO host_refresh_tokens (id, host_id, token_hash, expires_at)
|
||||||
|
VALUES ($1, $2, $3, $4)
|
||||||
|
RETURNING id, host_id, token_hash, expires_at, created_at, revoked_at
|
||||||
|
`
|
||||||
|
|
||||||
|
type InsertHostRefreshTokenParams struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
HostID string `json:"host_id"`
|
||||||
|
TokenHash string `json:"token_hash"`
|
||||||
|
ExpiresAt pgtype.Timestamptz `json:"expires_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (q *Queries) InsertHostRefreshToken(ctx context.Context, arg InsertHostRefreshTokenParams) (HostRefreshToken, error) {
|
||||||
|
row := q.db.QueryRow(ctx, insertHostRefreshToken,
|
||||||
|
arg.ID,
|
||||||
|
arg.HostID,
|
||||||
|
arg.TokenHash,
|
||||||
|
arg.ExpiresAt,
|
||||||
|
)
|
||||||
|
var i HostRefreshToken
|
||||||
|
err := row.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.HostID,
|
||||||
|
&i.TokenHash,
|
||||||
|
&i.ExpiresAt,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.RevokedAt,
|
||||||
|
)
|
||||||
|
return i, err
|
||||||
|
}
|
||||||
|
|
||||||
|
const revokeHostRefreshToken = `-- name: RevokeHostRefreshToken :exec
|
||||||
|
UPDATE host_refresh_tokens SET revoked_at = NOW() WHERE id = $1
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) RevokeHostRefreshToken(ctx context.Context, id string) error {
|
||||||
|
_, err := q.db.Exec(ctx, revokeHostRefreshToken, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
const revokeHostRefreshTokensByHost = `-- name: RevokeHostRefreshTokensByHost :exec
|
||||||
|
UPDATE host_refresh_tokens SET revoked_at = NOW()
|
||||||
|
WHERE host_id = $1 AND revoked_at IS NULL
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) RevokeHostRefreshTokensByHost(ctx context.Context, hostID string) error {
|
||||||
|
_, err := q.db.Exec(ctx, revokeHostRefreshTokensByHost, hostID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
@ -234,6 +234,50 @@ func (q *Queries) InsertHostToken(ctx context.Context, arg InsertHostTokenParams
|
|||||||
return i, err
|
return i, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const listActiveHosts = `-- name: ListActiveHosts :many
|
||||||
|
SELECT id, type, team_id, provider, availability_zone, arch, cpu_cores, memory_mb, disk_gb, address, status, last_heartbeat_at, metadata, created_by, created_at, updated_at, cert_fingerprint, mtls_enabled FROM hosts WHERE status NOT IN ('pending', 'offline') ORDER BY created_at
|
||||||
|
`
|
||||||
|
|
||||||
|
// Returns all hosts that have completed registration (not pending/offline).
|
||||||
|
func (q *Queries) ListActiveHosts(ctx context.Context) ([]Host, error) {
|
||||||
|
rows, err := q.db.Query(ctx, listActiveHosts)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var items []Host
|
||||||
|
for rows.Next() {
|
||||||
|
var i Host
|
||||||
|
if err := rows.Scan(
|
||||||
|
&i.ID,
|
||||||
|
&i.Type,
|
||||||
|
&i.TeamID,
|
||||||
|
&i.Provider,
|
||||||
|
&i.AvailabilityZone,
|
||||||
|
&i.Arch,
|
||||||
|
&i.CpuCores,
|
||||||
|
&i.MemoryMb,
|
||||||
|
&i.DiskGb,
|
||||||
|
&i.Address,
|
||||||
|
&i.Status,
|
||||||
|
&i.LastHeartbeatAt,
|
||||||
|
&i.Metadata,
|
||||||
|
&i.CreatedBy,
|
||||||
|
&i.CreatedAt,
|
||||||
|
&i.UpdatedAt,
|
||||||
|
&i.CertFingerprint,
|
||||||
|
&i.MtlsEnabled,
|
||||||
|
); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items = append(items, i)
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
|
||||||
const listHosts = `-- name: ListHosts :many
|
const listHosts = `-- name: ListHosts :many
|
||||||
SELECT id, type, team_id, provider, availability_zone, arch, cpu_cores, memory_mb, disk_gb, address, status, last_heartbeat_at, metadata, created_by, created_at, updated_at, cert_fingerprint, mtls_enabled FROM hosts ORDER BY created_at DESC
|
SELECT id, type, team_id, provider, availability_zone, arch, cpu_cores, memory_mb, disk_gb, address, status, last_heartbeat_at, metadata, created_by, created_at, updated_at, cert_fingerprint, mtls_enabled FROM hosts ORDER BY created_at DESC
|
||||||
`
|
`
|
||||||
@ -461,6 +505,15 @@ func (q *Queries) MarkHostTokenUsed(ctx context.Context, id string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const markHostUnreachable = `-- name: MarkHostUnreachable :exec
|
||||||
|
UPDATE hosts SET status = 'unreachable', updated_at = NOW() WHERE id = $1
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) MarkHostUnreachable(ctx context.Context, id string) error {
|
||||||
|
_, err := q.db.Exec(ctx, markHostUnreachable, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
const registerHost = `-- name: RegisterHost :execrows
|
const registerHost = `-- name: RegisterHost :execrows
|
||||||
UPDATE hosts
|
UPDATE hosts
|
||||||
SET arch = $2,
|
SET arch = $2,
|
||||||
@ -521,6 +574,21 @@ func (q *Queries) UpdateHostHeartbeat(ctx context.Context, id string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const updateHostHeartbeatAndStatus = `-- name: UpdateHostHeartbeatAndStatus :execrows
|
||||||
|
UPDATE hosts
|
||||||
|
SET last_heartbeat_at = NOW(),
|
||||||
|
status = CASE WHEN status = 'unreachable' THEN 'online' ELSE status END,
|
||||||
|
updated_at = NOW()
|
||||||
|
WHERE id = $1
|
||||||
|
`
|
||||||
|
|
||||||
|
// Updates last_heartbeat_at and transitions unreachable hosts back to online.
|
||||||
|
// Returns 0 if no host was found (deleted).
|
||||||
|
func (q *Queries) UpdateHostHeartbeatAndStatus(ctx context.Context, id string) (int64, error) {
|
||||||
|
result, err := q.db.Exec(ctx, updateHostHeartbeatAndStatus, id)
|
||||||
|
return result.RowsAffected(), err
|
||||||
|
}
|
||||||
|
|
||||||
const updateHostStatus = `-- name: UpdateHostStatus :exec
|
const updateHostStatus = `-- name: UpdateHostStatus :exec
|
||||||
UPDATE hosts SET status = $2, updated_at = NOW() WHERE id = $1
|
UPDATE hosts SET status = $2, updated_at = NOW() WHERE id = $1
|
||||||
`
|
`
|
||||||
|
|||||||
@ -36,6 +36,15 @@ type Host struct {
|
|||||||
MtlsEnabled bool `json:"mtls_enabled"`
|
MtlsEnabled bool `json:"mtls_enabled"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type HostRefreshToken struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
HostID string `json:"host_id"`
|
||||||
|
TokenHash string `json:"token_hash"`
|
||||||
|
ExpiresAt pgtype.Timestamptz `json:"expires_at"`
|
||||||
|
CreatedAt pgtype.Timestamptz `json:"created_at"`
|
||||||
|
RevokedAt pgtype.Timestamptz `json:"revoked_at"`
|
||||||
|
}
|
||||||
|
|
||||||
type HostTag struct {
|
type HostTag struct {
|
||||||
HostID string `json:"host_id"`
|
HostID string `json:"host_id"`
|
||||||
Tag string `json:"tag"`
|
Tag string `json:"tag"`
|
||||||
|
|||||||
@ -11,6 +11,20 @@ import (
|
|||||||
"github.com/jackc/pgx/v5/pgtype"
|
"github.com/jackc/pgx/v5/pgtype"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const bulkRestoreRunning = `-- name: BulkRestoreRunning :exec
|
||||||
|
UPDATE sandboxes
|
||||||
|
SET status = 'running',
|
||||||
|
last_updated = NOW()
|
||||||
|
WHERE id = ANY($1::text[]) AND status = 'missing'
|
||||||
|
`
|
||||||
|
|
||||||
|
// Called by the reconciler when a host comes back online and its sandboxes are
|
||||||
|
// confirmed alive. Restores only sandboxes that are in 'missing' state.
|
||||||
|
func (q *Queries) BulkRestoreRunning(ctx context.Context, dollar_1 []string) error {
|
||||||
|
_, err := q.db.Exec(ctx, bulkRestoreRunning, dollar_1)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
const bulkUpdateStatusByIDs = `-- name: BulkUpdateStatusByIDs :exec
|
const bulkUpdateStatusByIDs = `-- name: BulkUpdateStatusByIDs :exec
|
||||||
UPDATE sandboxes
|
UPDATE sandboxes
|
||||||
SET status = $2,
|
SET status = $2,
|
||||||
@ -300,6 +314,21 @@ func (q *Queries) ListSandboxesByTeam(ctx context.Context, teamID string) ([]San
|
|||||||
return items, nil
|
return items, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const markSandboxesMissingByHost = `-- name: MarkSandboxesMissingByHost :exec
|
||||||
|
UPDATE sandboxes
|
||||||
|
SET status = 'missing',
|
||||||
|
last_updated = NOW()
|
||||||
|
WHERE host_id = $1 AND status IN ('running', 'starting', 'pending')
|
||||||
|
`
|
||||||
|
|
||||||
|
// Called when the host monitor marks a host unreachable.
|
||||||
|
// Marks running/starting/pending sandboxes on that host as 'missing' so users see
|
||||||
|
// the sandbox is not currently reachable, without permanently losing the record.
|
||||||
|
func (q *Queries) MarkSandboxesMissingByHost(ctx context.Context, hostID string) error {
|
||||||
|
_, err := q.db.Exec(ctx, markSandboxesMissingByHost, hostID)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
const updateLastActive = `-- name: UpdateLastActive :exec
|
const updateLastActive = `-- name: UpdateLastActive :exec
|
||||||
UPDATE sandboxes
|
UPDATE sandboxes
|
||||||
SET last_active_at = $2,
|
SET last_active_at = $2,
|
||||||
|
|||||||
@ -17,6 +17,13 @@ import (
|
|||||||
"golang.org/x/sys/unix"
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// tokenFile is the JSON format persisted to AGENT_FILES_ROOTDIR/host.jwt.
|
||||||
|
type tokenFile struct {
|
||||||
|
HostID string `json:"host_id"`
|
||||||
|
JWT string `json:"jwt"`
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
|
}
|
||||||
|
|
||||||
// RegistrationConfig holds the configuration for host registration.
|
// RegistrationConfig holds the configuration for host registration.
|
||||||
type RegistrationConfig struct {
|
type RegistrationConfig struct {
|
||||||
CPURL string // Control plane base URL (e.g., http://localhost:8000)
|
CPURL string // Control plane base URL (e.g., http://localhost:8000)
|
||||||
@ -37,6 +44,17 @@ type registerRequest struct {
|
|||||||
type registerResponse struct {
|
type registerResponse struct {
|
||||||
Host json.RawMessage `json:"host"`
|
Host json.RawMessage `json:"host"`
|
||||||
Token string `json:"token"`
|
Token string `json:"token"`
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type refreshRequest struct {
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type refreshResponse struct {
|
||||||
|
Host json.RawMessage `json:"host"`
|
||||||
|
Token string `json:"token"`
|
||||||
|
RefreshToken string `json:"refresh_token"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type errorResponse struct {
|
type errorResponse struct {
|
||||||
@ -46,20 +64,47 @@ type errorResponse struct {
|
|||||||
} `json:"error"`
|
} `json:"error"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Register calls the control plane to register this host agent and persists
|
// loadTokenFile reads and parses the persisted token file.
|
||||||
// the returned JWT to disk. Returns the host JWT token string.
|
func loadTokenFile(path string) (*tokenFile, error) {
|
||||||
func Register(ctx context.Context, cfg RegistrationConfig) (string, error) {
|
data, err := os.ReadFile(path)
|
||||||
// Check if we already have a saved token.
|
if err != nil {
|
||||||
if data, err := os.ReadFile(cfg.TokenFile); err == nil {
|
return nil, err
|
||||||
token := strings.TrimSpace(string(data))
|
|
||||||
if token != "" {
|
|
||||||
slog.Info("loaded existing host token", "file", cfg.TokenFile)
|
|
||||||
return token, nil
|
|
||||||
}
|
}
|
||||||
|
// Support legacy format (raw JWT string) for backwards compatibility.
|
||||||
|
trimmed := strings.TrimSpace(string(data))
|
||||||
|
if !strings.HasPrefix(trimmed, "{") {
|
||||||
|
// Old format: just the JWT, no refresh token.
|
||||||
|
hostID, _ := hostIDFromJWT(trimmed)
|
||||||
|
return &tokenFile{HostID: hostID, JWT: trimmed}, nil
|
||||||
}
|
}
|
||||||
|
var tf tokenFile
|
||||||
|
if err := json.Unmarshal(data, &tf); err != nil {
|
||||||
|
return nil, fmt.Errorf("parse token file: %w", err)
|
||||||
|
}
|
||||||
|
return &tf, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// saveTokenFile writes the token file as JSON with 0600 permissions.
|
||||||
|
func saveTokenFile(path string, tf tokenFile) error {
|
||||||
|
data, err := json.MarshalIndent(tf, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("marshal token file: %w", err)
|
||||||
|
}
|
||||||
|
return os.WriteFile(path, data, 0600)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Register calls the control plane to register this host agent and persists
|
||||||
|
// the returned JWT and refresh token to disk. Returns the host JWT token string.
|
||||||
|
func Register(ctx context.Context, cfg RegistrationConfig) (string, error) {
|
||||||
|
// If no explicit registration token was given, reuse the saved JWT.
|
||||||
|
// A --register flag always overrides the local file so operators can
|
||||||
|
// force re-registration without manually deleting host.jwt.
|
||||||
if cfg.RegistrationToken == "" {
|
if cfg.RegistrationToken == "" {
|
||||||
return "", fmt.Errorf("no saved host token and no registration token provided")
|
if tf, err := loadTokenFile(cfg.TokenFile); err == nil && tf.JWT != "" {
|
||||||
|
slog.Info("loaded existing host token", "file", cfg.TokenFile, "host_id", tf.HostID)
|
||||||
|
return tf.JWT, nil
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("no saved host token and no registration token provided (use --register flag)")
|
||||||
}
|
}
|
||||||
|
|
||||||
arch := runtime.GOARCH
|
arch := runtime.GOARCH
|
||||||
@ -117,46 +162,182 @@ func Register(ctx context.Context, cfg RegistrationConfig) (string, error) {
|
|||||||
return "", fmt.Errorf("registration response missing token")
|
return "", fmt.Errorf("registration response missing token")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Persist the token to disk for subsequent startups.
|
hostID, err := hostIDFromJWT(regResp.Token)
|
||||||
if err := os.WriteFile(cfg.TokenFile, []byte(regResp.Token), 0600); err != nil {
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("extract host ID from JWT: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Persist JWT + refresh token.
|
||||||
|
tf := tokenFile{
|
||||||
|
HostID: hostID,
|
||||||
|
JWT: regResp.Token,
|
||||||
|
RefreshToken: regResp.RefreshToken,
|
||||||
|
}
|
||||||
|
if err := saveTokenFile(cfg.TokenFile, tf); err != nil {
|
||||||
return "", fmt.Errorf("save host token: %w", err)
|
return "", fmt.Errorf("save host token: %w", err)
|
||||||
}
|
}
|
||||||
slog.Info("host registered and token saved", "file", cfg.TokenFile)
|
slog.Info("host registered and token saved", "file", cfg.TokenFile, "host_id", hostID)
|
||||||
|
|
||||||
return regResp.Token, nil
|
return regResp.Token, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RefreshJWT exchanges the refresh token for a new JWT + rotated refresh token.
|
||||||
|
// It reads and updates the token file in place.
|
||||||
|
func RefreshJWT(ctx context.Context, cpURL, tokenFilePath string) (string, error) {
|
||||||
|
tf, err := loadTokenFile(tokenFilePath)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("load token file: %w", err)
|
||||||
|
}
|
||||||
|
if tf.RefreshToken == "" {
|
||||||
|
return "", fmt.Errorf("no refresh token available; host must re-register")
|
||||||
|
}
|
||||||
|
|
||||||
|
body, _ := json.Marshal(refreshRequest{RefreshToken: tf.RefreshToken})
|
||||||
|
url := strings.TrimRight(cpURL, "/") + "/v1/hosts/auth/refresh"
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(body))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("create refresh request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
client := &http.Client{Timeout: 15 * time.Second}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("refresh request failed: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
respBody, _ := io.ReadAll(resp.Body)
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
var errResp errorResponse
|
||||||
|
if json.Unmarshal(respBody, &errResp) == nil {
|
||||||
|
return "", fmt.Errorf("refresh failed (%d): %s", resp.StatusCode, errResp.Error.Message)
|
||||||
|
}
|
||||||
|
return "", fmt.Errorf("refresh failed (%d): %s", resp.StatusCode, string(respBody))
|
||||||
|
}
|
||||||
|
|
||||||
|
var refResp refreshResponse
|
||||||
|
if err := json.Unmarshal(respBody, &refResp); err != nil {
|
||||||
|
return "", fmt.Errorf("parse refresh response: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
tf.JWT = refResp.Token
|
||||||
|
tf.RefreshToken = refResp.RefreshToken
|
||||||
|
if err := saveTokenFile(tokenFilePath, *tf); err != nil {
|
||||||
|
return "", fmt.Errorf("save refreshed token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
slog.Info("host JWT refreshed", "host_id", tf.HostID)
|
||||||
|
return refResp.Token, nil
|
||||||
|
}
|
||||||
|
|
||||||
// StartHeartbeat launches a background goroutine that sends periodic heartbeats
|
// StartHeartbeat launches a background goroutine that sends periodic heartbeats
|
||||||
// to the control plane. It runs until the context is cancelled.
|
// to the control plane. It runs until the context is cancelled.
|
||||||
func StartHeartbeat(ctx context.Context, cpURL, hostID, hostToken string, interval time.Duration) {
|
//
|
||||||
url := strings.TrimRight(cpURL, "/") + "/v1/hosts/" + hostID + "/heartbeat"
|
// On 401/403: the heartbeat loop attempts to refresh the JWT. If the refresh
|
||||||
|
// also fails (expired refresh token), it calls pauseAll and stops.
|
||||||
|
//
|
||||||
|
// On repeated network failures (3 consecutive), it calls pauseAll but keeps
|
||||||
|
// retrying — the connection may recover and the host should resume heartbeating.
|
||||||
|
//
|
||||||
|
// onDeleted is called when CP returns 404, meaning this host record was deleted.
|
||||||
|
// The token file is removed before calling onDeleted so subsequent starts prompt
|
||||||
|
// for a new registration token.
|
||||||
|
func StartHeartbeat(ctx context.Context, cpURL, tokenFilePath, hostID string, interval time.Duration, pauseAll func(), onDeleted func()) {
|
||||||
client := &http.Client{Timeout: 10 * time.Second}
|
client := &http.Client{Timeout: 10 * time.Second}
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
ticker := time.NewTicker(interval)
|
ticker := time.NewTicker(interval)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
|
consecutiveFailures := 0
|
||||||
|
pausedDueToFailure := false
|
||||||
|
currentJWT := ""
|
||||||
|
|
||||||
|
// Load the current JWT from disk.
|
||||||
|
if tf, err := loadTokenFile(tokenFilePath); err == nil {
|
||||||
|
currentJWT = tf.JWT
|
||||||
|
}
|
||||||
|
|
||||||
|
// beat sends one heartbeat. Returns true if the loop should stop.
|
||||||
|
beat := func() (stop bool) {
|
||||||
|
url := strings.TrimRight(cpURL, "/") + "/v1/hosts/" + hostID + "/heartbeat"
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
|
||||||
|
if err != nil {
|
||||||
|
slog.Warn("heartbeat: failed to create request", "error", err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
req.Header.Set("X-Host-Token", currentJWT)
|
||||||
|
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
consecutiveFailures++
|
||||||
|
slog.Warn("heartbeat: request failed", "error", err, "consecutive_failures", consecutiveFailures)
|
||||||
|
if consecutiveFailures >= 3 && !pausedDueToFailure {
|
||||||
|
slog.Error("heartbeat: CP unreachable after 3 failures — pausing all sandboxes")
|
||||||
|
if pauseAll != nil {
|
||||||
|
pauseAll()
|
||||||
|
}
|
||||||
|
pausedDueToFailure = true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
resp.Body.Close()
|
||||||
|
|
||||||
|
switch resp.StatusCode {
|
||||||
|
case http.StatusNoContent:
|
||||||
|
if consecutiveFailures > 0 || pausedDueToFailure {
|
||||||
|
slog.Info("heartbeat: CP connection restored")
|
||||||
|
}
|
||||||
|
consecutiveFailures = 0
|
||||||
|
pausedDueToFailure = false
|
||||||
|
|
||||||
|
case http.StatusUnauthorized, http.StatusForbidden:
|
||||||
|
slog.Warn("heartbeat: JWT rejected — attempting token refresh")
|
||||||
|
newJWT, refreshErr := RefreshJWT(ctx, cpURL, tokenFilePath)
|
||||||
|
if refreshErr != nil {
|
||||||
|
slog.Error("heartbeat: JWT refresh failed — pausing all sandboxes; manual re-registration required",
|
||||||
|
"error", refreshErr)
|
||||||
|
if pauseAll != nil && !pausedDueToFailure {
|
||||||
|
pauseAll()
|
||||||
|
pausedDueToFailure = true
|
||||||
|
}
|
||||||
|
// Stop the heartbeat loop — operator must re-register.
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
currentJWT = newJWT
|
||||||
|
slog.Info("heartbeat: JWT refreshed successfully")
|
||||||
|
|
||||||
|
case http.StatusNotFound:
|
||||||
|
slog.Error("heartbeat: host no longer exists in CP — host was deleted; removing token file and exiting")
|
||||||
|
if err := os.Remove(tokenFilePath); err != nil && !os.IsNotExist(err) {
|
||||||
|
slog.Warn("heartbeat: failed to remove token file", "error", err)
|
||||||
|
}
|
||||||
|
if onDeleted != nil {
|
||||||
|
onDeleted()
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
|
||||||
|
default:
|
||||||
|
slog.Warn("heartbeat: unexpected status", "status", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send an immediate heartbeat on startup so the CP sees the host as
|
||||||
|
// online without waiting for the first ticker tick.
|
||||||
|
if beat() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
|
if beat() {
|
||||||
if err != nil {
|
return
|
||||||
slog.Warn("heartbeat: failed to create request", "error", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
req.Header.Set("X-Host-Token", hostToken)
|
|
||||||
|
|
||||||
resp, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
slog.Warn("heartbeat: request failed", "error", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resp.Body.Close()
|
|
||||||
|
|
||||||
if resp.StatusCode != http.StatusNoContent {
|
|
||||||
slog.Warn("heartbeat: unexpected status", "status", resp.StatusCode)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -166,6 +347,12 @@ func StartHeartbeat(ctx context.Context, cpURL, hostID, hostToken string, interv
|
|||||||
// HostIDFromToken extracts the host_id claim from a host JWT without
|
// HostIDFromToken extracts the host_id claim from a host JWT without
|
||||||
// verifying the signature (the agent doesn't have the signing secret).
|
// verifying the signature (the agent doesn't have the signing secret).
|
||||||
func HostIDFromToken(token string) (string, error) {
|
func HostIDFromToken(token string) (string, error) {
|
||||||
|
return hostIDFromJWT(token)
|
||||||
|
}
|
||||||
|
|
||||||
|
// hostIDFromJWT is the internal implementation used by both HostIDFromToken and
|
||||||
|
// the token file loader.
|
||||||
|
func hostIDFromJWT(token string) (string, error) {
|
||||||
parts := strings.Split(token, ".")
|
parts := strings.Split(token, ".")
|
||||||
if len(parts) != 3 {
|
if len(parts) != 3 {
|
||||||
return "", fmt.Errorf("invalid JWT format")
|
return "", fmt.Errorf("invalid JWT format")
|
||||||
|
|||||||
@ -23,11 +23,14 @@ import (
|
|||||||
type Server struct {
|
type Server struct {
|
||||||
hostagentv1connect.UnimplementedHostAgentServiceHandler
|
hostagentv1connect.UnimplementedHostAgentServiceHandler
|
||||||
mgr *sandbox.Manager
|
mgr *sandbox.Manager
|
||||||
|
terminate func() // called when the CP requests agent termination
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewServer creates a new host agent RPC server.
|
// NewServer creates a new host agent RPC server.
|
||||||
func NewServer(mgr *sandbox.Manager) *Server {
|
// terminate is invoked (in a goroutine) when the CP calls the Terminate RPC,
|
||||||
return &Server{mgr: mgr}
|
// allowing main to perform a clean shutdown.
|
||||||
|
func NewServer(mgr *sandbox.Manager, terminate func()) *Server {
|
||||||
|
return &Server{mgr: mgr, terminate: terminate}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) CreateSandbox(
|
func (s *Server) CreateSandbox(
|
||||||
@ -412,3 +415,14 @@ func (s *Server) ListSandboxes(
|
|||||||
AutoPausedSandboxIds: s.mgr.DrainAutoPausedIDs(),
|
AutoPausedSandboxIds: s.mgr.DrainAutoPausedIDs(),
|
||||||
}), nil
|
}), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *Server) Terminate(
|
||||||
|
_ context.Context,
|
||||||
|
_ *connect.Request[pb.TerminateRequest],
|
||||||
|
) (*connect.Response[pb.TerminateResponse], error) {
|
||||||
|
slog.Info("terminate RPC received — scheduling shutdown")
|
||||||
|
if s.terminate != nil {
|
||||||
|
go s.terminate()
|
||||||
|
}
|
||||||
|
return connect.NewResponse(&pb.TerminateResponse{}), nil
|
||||||
|
}
|
||||||
|
|||||||
@ -67,3 +67,17 @@ func NewRegistrationToken() string {
|
|||||||
}
|
}
|
||||||
return hex.EncodeToString(b)
|
return hex.EncodeToString(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewRefreshTokenID generates a new refresh token record ID in the format "hrt-" + 8 hex chars.
|
||||||
|
func NewRefreshTokenID() string {
|
||||||
|
return "hrt-" + hex8()
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRefreshToken generates a 64-char hex token (32 bytes of entropy) for use as a host refresh token.
|
||||||
|
func NewRefreshToken() string {
|
||||||
|
b := make([]byte, 32)
|
||||||
|
if _, err := rand.Read(b); err != nil {
|
||||||
|
panic(fmt.Sprintf("crypto/rand failed: %v", err))
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(b)
|
||||||
|
}
|
||||||
|
|||||||
77
internal/lifecycle/hostpool.go
Normal file
77
internal/lifecycle/hostpool.go
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
package lifecycle
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
||||||
|
)
|
||||||
|
|
||||||
|
// HostClientPool maintains a cache of Connect RPC clients keyed by host ID.
|
||||||
|
// Clients are created lazily on first access and evicted when a host is removed
|
||||||
|
// or goes unreachable. The pool is safe for concurrent use.
|
||||||
|
type HostClientPool struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
clients map[string]hostagentv1connect.HostAgentServiceClient
|
||||||
|
httpClient *http.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewHostClientPool creates a new pool. The underlying HTTP client uses a
|
||||||
|
// 10-minute timeout to support long-running streaming operations.
|
||||||
|
func NewHostClientPool() *HostClientPool {
|
||||||
|
return &HostClientPool{
|
||||||
|
clients: make(map[string]hostagentv1connect.HostAgentServiceClient),
|
||||||
|
httpClient: &http.Client{Timeout: 10 * time.Minute},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get returns a Connect RPC client for the given host, creating one if necessary.
|
||||||
|
// address is the host agent address (ip:port or full URL). The scheme is added if absent.
|
||||||
|
func (p *HostClientPool) Get(hostID, address string) hostagentv1connect.HostAgentServiceClient {
|
||||||
|
p.mu.RLock()
|
||||||
|
c, ok := p.clients[hostID]
|
||||||
|
p.mu.RUnlock()
|
||||||
|
if ok {
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
p.mu.Lock()
|
||||||
|
defer p.mu.Unlock()
|
||||||
|
// Double-check after acquiring write lock.
|
||||||
|
if c, ok = p.clients[hostID]; ok {
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
c = hostagentv1connect.NewHostAgentServiceClient(p.httpClient, ensureScheme(address))
|
||||||
|
p.clients[hostID] = c
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetForHost is a convenience wrapper that extracts the address from a db.Host
|
||||||
|
// and returns an error if the host has no address recorded yet.
|
||||||
|
func (p *HostClientPool) GetForHost(h db.Host) (hostagentv1connect.HostAgentServiceClient, error) {
|
||||||
|
if !h.Address.Valid || h.Address.String == "" {
|
||||||
|
return nil, fmt.Errorf("host %s has no address", h.ID)
|
||||||
|
}
|
||||||
|
return p.Get(h.ID, h.Address.String), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evict removes the cached client for the given host, forcing a new client to be
|
||||||
|
// created on the next call to Get. Call this when a host's address changes or when
|
||||||
|
// a host is deleted.
|
||||||
|
func (p *HostClientPool) Evict(hostID string) {
|
||||||
|
p.mu.Lock()
|
||||||
|
delete(p.clients, hostID)
|
||||||
|
p.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensureScheme adds "http://" if the address has no scheme.
|
||||||
|
func ensureScheme(addr string) string {
|
||||||
|
if strings.HasPrefix(addr, "http://") || strings.HasPrefix(addr, "https://") {
|
||||||
|
return addr
|
||||||
|
}
|
||||||
|
return "http://" + addr
|
||||||
|
}
|
||||||
@ -1183,6 +1183,28 @@ func (m *Manager) Shutdown(ctx context.Context) {
|
|||||||
m.loops.ReleaseAll()
|
m.loops.ReleaseAll()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PauseAll pauses every running sandbox managed by this host agent.
|
||||||
|
// Called when the host loses connectivity to the control plane to avoid
|
||||||
|
// leaving running VMs unmanaged. It is best-effort: failures for individual
|
||||||
|
// sandboxes are logged but do not stop the rest.
|
||||||
|
func (m *Manager) PauseAll(ctx context.Context) {
|
||||||
|
m.mu.RLock()
|
||||||
|
ids := make([]string, 0, len(m.boxes))
|
||||||
|
for id, sb := range m.boxes {
|
||||||
|
if sb.Status == models.StatusRunning {
|
||||||
|
ids = append(ids, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
m.mu.RUnlock()
|
||||||
|
|
||||||
|
slog.Info("pausing all running sandboxes due to CP connection loss", "count", len(ids))
|
||||||
|
for _, sbID := range ids {
|
||||||
|
if err := m.Pause(ctx, sbID); err != nil {
|
||||||
|
slog.Warn("PauseAll: failed to pause sandbox", "id", sbID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// warnErr logs a warning if err is non-nil. Used for best-effort cleanup
|
// warnErr logs a warning if err is non-nil. Used for best-effort cleanup
|
||||||
// in error paths where the primary error has already been captured.
|
// in error paths where the primary error has already been captured.
|
||||||
func warnErr(msg string, id string, err error) {
|
func warnErr(msg string, id string, err error) {
|
||||||
|
|||||||
69
internal/scheduler/round_robin.go
Normal file
69
internal/scheduler/round_robin.go
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
package scheduler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sync/atomic"
|
||||||
|
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
// HostScheduler selects a host for a new sandbox. Implementations may use
|
||||||
|
// different strategies (round-robin, least-loaded, tag-based, etc.).
|
||||||
|
type HostScheduler interface {
|
||||||
|
// SelectHost returns a host that can accept a new sandbox.
|
||||||
|
// For BYOC teams (isByoc=true), only online BYOC hosts belonging to teamID
|
||||||
|
// are considered. For non-BYOC teams, only online regular (platform) hosts
|
||||||
|
// are considered. Returns an error if no suitable host is available.
|
||||||
|
SelectHost(ctx context.Context, teamID string, isByoc bool) (db.Host, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RoundRobinScheduler cycles through eligible online hosts in round-robin order.
|
||||||
|
// It re-fetches the host list on every call so that newly registered or
|
||||||
|
// recovered hosts are considered immediately.
|
||||||
|
type RoundRobinScheduler struct {
|
||||||
|
db *db.Queries
|
||||||
|
counter atomic.Int64
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRoundRobinScheduler creates a RoundRobinScheduler backed by the given DB.
|
||||||
|
func NewRoundRobinScheduler(queries *db.Queries) *RoundRobinScheduler {
|
||||||
|
return &RoundRobinScheduler{db: queries}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SelectHost returns the next eligible online host in round-robin order.
|
||||||
|
func (s *RoundRobinScheduler) SelectHost(ctx context.Context, teamID string, isByoc bool) (db.Host, error) {
|
||||||
|
hosts, err := s.db.ListActiveHosts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return db.Host{}, fmt.Errorf("list hosts: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var eligible []db.Host
|
||||||
|
for _, h := range hosts {
|
||||||
|
if h.Status != "online" || !h.Address.Valid || h.Address.String == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if isByoc {
|
||||||
|
// BYOC team: only use hosts belonging to this team.
|
||||||
|
if h.Type != "byoc" || !h.TeamID.Valid || h.TeamID.String != teamID {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Non-BYOC team: only use platform (regular) hosts.
|
||||||
|
if h.Type != "regular" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
eligible = append(eligible, h)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(eligible) == 0 {
|
||||||
|
if isByoc {
|
||||||
|
return db.Host{}, fmt.Errorf("no online BYOC hosts available for team")
|
||||||
|
}
|
||||||
|
return db.Host{}, fmt.Errorf("no online platform hosts available")
|
||||||
|
}
|
||||||
|
|
||||||
|
idx := s.counter.Add(1) - 1
|
||||||
|
return eligible[int(idx%int64(len(eligible)))], nil
|
||||||
|
}
|
||||||
@ -2,12 +2,14 @@ package service
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"connectrpc.com/connect"
|
||||||
"github.com/jackc/pgx/v5"
|
"github.com/jackc/pgx/v5"
|
||||||
"github.com/jackc/pgx/v5/pgtype"
|
"github.com/jackc/pgx/v5/pgtype"
|
||||||
"github.com/redis/go-redis/v9"
|
"github.com/redis/go-redis/v9"
|
||||||
@ -15,6 +17,8 @@ import (
|
|||||||
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
"git.omukk.dev/wrenn/sandbox/internal/auth"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/id"
|
"git.omukk.dev/wrenn/sandbox/internal/id"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HostService provides host management operations.
|
// HostService provides host management operations.
|
||||||
@ -22,6 +26,7 @@ type HostService struct {
|
|||||||
DB *db.Queries
|
DB *db.Queries
|
||||||
Redis *redis.Client
|
Redis *redis.Client
|
||||||
JWT []byte
|
JWT []byte
|
||||||
|
Pool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
// HostCreateParams holds the parameters for creating a host.
|
// HostCreateParams holds the parameters for creating a host.
|
||||||
@ -50,10 +55,24 @@ type HostRegisterParams struct {
|
|||||||
Address string
|
Address string
|
||||||
}
|
}
|
||||||
|
|
||||||
// HostRegisterResult holds the registered host and its long-lived JWT.
|
// HostRegisterResult holds the registered host, its short-lived JWT, and a long-lived refresh token.
|
||||||
type HostRegisterResult struct {
|
type HostRegisterResult struct {
|
||||||
Host db.Host
|
Host db.Host
|
||||||
JWT string
|
JWT string
|
||||||
|
RefreshToken string
|
||||||
|
}
|
||||||
|
|
||||||
|
// HostRefreshResult holds a new JWT and rotated refresh token after a successful refresh.
|
||||||
|
type HostRefreshResult struct {
|
||||||
|
Host db.Host
|
||||||
|
JWT string
|
||||||
|
RefreshToken string
|
||||||
|
}
|
||||||
|
|
||||||
|
// HostDeletePreview describes what will be affected by deleting a host.
|
||||||
|
type HostDeletePreview struct {
|
||||||
|
Host db.Host
|
||||||
|
SandboxIDs []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// regTokenPayload is the JSON stored in Redis for registration tokens.
|
// regTokenPayload is the JSON stored in Redis for registration tokens.
|
||||||
@ -64,6 +83,14 @@ type regTokenPayload struct {
|
|||||||
|
|
||||||
const regTokenTTL = time.Hour
|
const regTokenTTL = time.Hour
|
||||||
|
|
||||||
|
// requireAdminOrOwner returns nil iff the role is "owner" or "admin".
|
||||||
|
func requireAdminOrOwner(role string) error {
|
||||||
|
if role == "owner" || role == "admin" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("forbidden: only team owners and admins can manage BYOC hosts")
|
||||||
|
}
|
||||||
|
|
||||||
// Create creates a new host record and generates a one-time registration token.
|
// Create creates a new host record and generates a one-time registration token.
|
||||||
func (s *HostService) Create(ctx context.Context, p HostCreateParams) (HostCreateResult, error) {
|
func (s *HostService) Create(ctx context.Context, p HostCreateParams) (HostCreateResult, error) {
|
||||||
if p.Type != "regular" && p.Type != "byoc" {
|
if p.Type != "regular" && p.Type != "byoc" {
|
||||||
@ -75,7 +102,7 @@ func (s *HostService) Create(ctx context.Context, p HostCreateParams) (HostCreat
|
|||||||
return HostCreateResult{}, fmt.Errorf("forbidden: only admins can create regular hosts")
|
return HostCreateResult{}, fmt.Errorf("forbidden: only admins can create regular hosts")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// BYOC: admin or team owner.
|
// BYOC: platform admin, or team owner/admin.
|
||||||
if p.TeamID == "" {
|
if p.TeamID == "" {
|
||||||
return HostCreateResult{}, fmt.Errorf("invalid request: team_id is required for BYOC hosts")
|
return HostCreateResult{}, fmt.Errorf("invalid request: team_id is required for BYOC hosts")
|
||||||
}
|
}
|
||||||
@ -90,18 +117,21 @@ func (s *HostService) Create(ctx context.Context, p HostCreateParams) (HostCreat
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return HostCreateResult{}, fmt.Errorf("check team membership: %w", err)
|
return HostCreateResult{}, fmt.Errorf("check team membership: %w", err)
|
||||||
}
|
}
|
||||||
if membership.Role != "owner" {
|
if err := requireAdminOrOwner(membership.Role); err != nil {
|
||||||
return HostCreateResult{}, fmt.Errorf("forbidden: only team owners can create BYOC hosts")
|
return HostCreateResult{}, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate team exists and is not deleted for BYOC hosts.
|
// Validate team exists, is not deleted, and has BYOC enabled.
|
||||||
if p.TeamID != "" {
|
if p.TeamID != "" {
|
||||||
team, err := s.DB.GetTeam(ctx, p.TeamID)
|
team, err := s.DB.GetTeam(ctx, p.TeamID)
|
||||||
if err != nil || team.DeletedAt.Valid {
|
if err != nil || team.DeletedAt.Valid {
|
||||||
return HostCreateResult{}, fmt.Errorf("invalid request: team not found")
|
return HostCreateResult{}, fmt.Errorf("invalid request: team not found")
|
||||||
}
|
}
|
||||||
|
if !team.IsByoc {
|
||||||
|
return HostCreateResult{}, fmt.Errorf("forbidden: BYOC is not enabled for this team")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hostID := id.NewHostID()
|
hostID := id.NewHostID()
|
||||||
@ -168,7 +198,6 @@ func (s *HostService) RegenerateToken(ctx context.Context, hostID, userID, teamI
|
|||||||
return HostCreateResult{}, fmt.Errorf("invalid state: can only regenerate token for pending hosts (status: %s)", host.Status)
|
return HostCreateResult{}, fmt.Errorf("invalid state: can only regenerate token for pending hosts (status: %s)", host.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Same permission model as Create/Delete.
|
|
||||||
if !isAdmin {
|
if !isAdmin {
|
||||||
if host.Type != "byoc" {
|
if host.Type != "byoc" {
|
||||||
return HostCreateResult{}, fmt.Errorf("forbidden: only admins can manage regular hosts")
|
return HostCreateResult{}, fmt.Errorf("forbidden: only admins can manage regular hosts")
|
||||||
@ -186,8 +215,8 @@ func (s *HostService) RegenerateToken(ctx context.Context, hostID, userID, teamI
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return HostCreateResult{}, fmt.Errorf("check team membership: %w", err)
|
return HostCreateResult{}, fmt.Errorf("check team membership: %w", err)
|
||||||
}
|
}
|
||||||
if membership.Role != "owner" {
|
if err := requireAdminOrOwner(membership.Role); err != nil {
|
||||||
return HostCreateResult{}, fmt.Errorf("forbidden: only team owners can regenerate tokens")
|
return HostCreateResult{}, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -216,7 +245,7 @@ func (s *HostService) RegenerateToken(ctx context.Context, hostID, userID, teamI
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Register validates a one-time registration token, updates the host with
|
// Register validates a one-time registration token, updates the host with
|
||||||
// machine specs, and returns a long-lived host JWT.
|
// machine specs, and returns a short-lived host JWT plus a long-lived refresh token.
|
||||||
func (s *HostService) Register(ctx context.Context, p HostRegisterParams) (HostRegisterResult, error) {
|
func (s *HostService) Register(ctx context.Context, p HostRegisterParams) (HostRegisterResult, error) {
|
||||||
// Atomic consume: GetDel returns the value and deletes in one operation,
|
// Atomic consume: GetDel returns the value and deletes in one operation,
|
||||||
// preventing concurrent requests from consuming the same token.
|
// preventing concurrent requests from consuming the same token.
|
||||||
@ -264,18 +293,97 @@ func (s *HostService) Register(ctx context.Context, p HostRegisterParams) (HostR
|
|||||||
slog.Warn("failed to mark host token used", "token_id", payload.TokenID, "error", err)
|
slog.Warn("failed to mark host token used", "token_id", payload.TokenID, "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Issue a long-lived refresh token.
|
||||||
|
refreshToken, err := s.issueRefreshToken(ctx, payload.HostID)
|
||||||
|
if err != nil {
|
||||||
|
return HostRegisterResult{}, fmt.Errorf("issue refresh token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
// Re-fetch the host to get the updated state.
|
// Re-fetch the host to get the updated state.
|
||||||
host, err := s.DB.GetHost(ctx, payload.HostID)
|
host, err := s.DB.GetHost(ctx, payload.HostID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return HostRegisterResult{}, fmt.Errorf("fetch updated host: %w", err)
|
return HostRegisterResult{}, fmt.Errorf("fetch updated host: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return HostRegisterResult{Host: host, JWT: hostJWT}, nil
|
return HostRegisterResult{Host: host, JWT: hostJWT, RefreshToken: refreshToken}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Heartbeat updates the last heartbeat timestamp for a host.
|
// Refresh validates a refresh token, rotates it (revokes old, issues new),
|
||||||
|
// and returns a fresh JWT plus the new refresh token.
|
||||||
|
func (s *HostService) Refresh(ctx context.Context, refreshToken string) (HostRefreshResult, error) {
|
||||||
|
hash := hashToken(refreshToken)
|
||||||
|
|
||||||
|
row, err := s.DB.GetHostRefreshTokenByHash(ctx, hash)
|
||||||
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("invalid or expired refresh token")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("lookup refresh token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
host, err := s.DB.GetHost(ctx, row.HostID)
|
||||||
|
if err != nil {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("host not found: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sign new JWT.
|
||||||
|
hostJWT, err := auth.SignHostJWT(s.JWT, host.ID)
|
||||||
|
if err != nil {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("sign host JWT: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue-then-revoke rotation: insert new token first so a crash between
|
||||||
|
// the two DB calls leaves the host with two valid tokens rather than zero.
|
||||||
|
newRefreshToken, err := s.issueRefreshToken(ctx, host.ID)
|
||||||
|
if err != nil {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("issue new refresh token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Revoke old refresh token after the new one is safely persisted.
|
||||||
|
if err := s.DB.RevokeHostRefreshToken(ctx, row.ID); err != nil {
|
||||||
|
return HostRefreshResult{}, fmt.Errorf("revoke old refresh token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return HostRefreshResult{Host: host, JWT: hostJWT, RefreshToken: newRefreshToken}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// issueRefreshToken creates a new refresh token record in the DB and returns
|
||||||
|
// the opaque token string.
|
||||||
|
func (s *HostService) issueRefreshToken(ctx context.Context, hostID string) (string, error) {
|
||||||
|
token := id.NewRefreshToken()
|
||||||
|
hash := hashToken(token)
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
if _, err := s.DB.InsertHostRefreshToken(ctx, db.InsertHostRefreshTokenParams{
|
||||||
|
ID: id.NewRefreshTokenID(),
|
||||||
|
HostID: hostID,
|
||||||
|
TokenHash: hash,
|
||||||
|
ExpiresAt: pgtype.Timestamptz{Time: now.Add(auth.HostRefreshTokenExpiry), Valid: true},
|
||||||
|
}); err != nil {
|
||||||
|
return "", fmt.Errorf("insert refresh token: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// hashToken returns the hex-encoded SHA-256 hash of the token.
|
||||||
|
func hashToken(token string) string {
|
||||||
|
h := sha256.Sum256([]byte(token))
|
||||||
|
return fmt.Sprintf("%x", h)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Heartbeat updates the last heartbeat timestamp for a host and transitions
|
||||||
|
// any 'unreachable' host back to 'online'. Returns a "host not found" error
|
||||||
|
// (which becomes 404) if the host record no longer exists (e.g., was deleted).
|
||||||
func (s *HostService) Heartbeat(ctx context.Context, hostID string) error {
|
func (s *HostService) Heartbeat(ctx context.Context, hostID string) error {
|
||||||
return s.DB.UpdateHostHeartbeat(ctx, hostID)
|
n, err := s.DB.UpdateHostHeartbeatAndStatus(ctx, hostID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return fmt.Errorf("host not found")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// List returns hosts visible to the caller.
|
// List returns hosts visible to the caller.
|
||||||
@ -301,37 +409,139 @@ func (s *HostService) Get(ctx context.Context, hostID, teamID string, isAdmin bo
|
|||||||
return host, nil
|
return host, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete removes a host. Admins can delete any host. Team owners can delete
|
// DeletePreview returns what would be affected by deleting the host, without
|
||||||
// BYOC hosts belonging to their team.
|
// making any changes. Use this to show the user a confirmation prompt.
|
||||||
func (s *HostService) Delete(ctx context.Context, hostID, userID, teamID string, isAdmin bool) error {
|
func (s *HostService) DeletePreview(ctx context.Context, hostID, teamID string, isAdmin bool) (HostDeletePreview, error) {
|
||||||
host, err := s.DB.GetHost(ctx, hostID)
|
host, err := s.checkDeletePermission(ctx, hostID, "", teamID, isAdmin)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("host not found: %w", err)
|
return HostDeletePreview{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
sandboxes, err := s.DB.ListSandboxesByHostAndStatus(ctx, db.ListSandboxesByHostAndStatusParams{
|
||||||
|
HostID: hostID,
|
||||||
|
Column2: []string{"pending", "starting", "running", "missing"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return HostDeletePreview{}, fmt.Errorf("list sandboxes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ids := make([]string, len(sandboxes))
|
||||||
|
for i, sb := range sandboxes {
|
||||||
|
ids[i] = sb.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
return HostDeletePreview{Host: host, SandboxIDs: ids}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete removes a host. Without force it returns an error listing active
|
||||||
|
// sandboxes so the caller can present a confirmation. With force it gracefully
|
||||||
|
// destroys all running sandboxes before deleting the host record.
|
||||||
|
func (s *HostService) Delete(ctx context.Context, hostID, userID, teamID string, isAdmin, force bool) error {
|
||||||
|
host, err := s.checkDeletePermission(ctx, hostID, userID, teamID, isAdmin)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
sandboxes, err := s.DB.ListSandboxesByHostAndStatus(ctx, db.ListSandboxesByHostAndStatusParams{
|
||||||
|
HostID: hostID,
|
||||||
|
Column2: []string{"pending", "starting", "running", "missing"},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("list sandboxes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(sandboxes) > 0 && !force {
|
||||||
|
ids := make([]string, len(sandboxes))
|
||||||
|
for i, sb := range sandboxes {
|
||||||
|
ids[i] = sb.ID
|
||||||
|
}
|
||||||
|
return &HostHasSandboxesError{SandboxIDs: ids}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gracefully destroy running sandboxes and terminate the agent (best-effort).
|
||||||
|
if host.Address.Valid && host.Address.String != "" {
|
||||||
|
agent, err := s.Pool.GetForHost(host)
|
||||||
|
if err == nil {
|
||||||
|
for _, sb := range sandboxes {
|
||||||
|
if sb.Status == "running" || sb.Status == "starting" {
|
||||||
|
_, rpcErr := agent.DestroySandbox(ctx, connect.NewRequest(&pb.DestroySandboxRequest{
|
||||||
|
SandboxId: sb.ID,
|
||||||
|
}))
|
||||||
|
if rpcErr != nil && connect.CodeOf(rpcErr) != connect.CodeNotFound {
|
||||||
|
slog.Warn("delete host: failed to destroy sandbox on agent", "sandbox_id", sb.ID, "error", rpcErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Tell the agent to shut itself down immediately.
|
||||||
|
if _, rpcErr := agent.Terminate(ctx, connect.NewRequest(&pb.TerminateRequest{})); rpcErr != nil {
|
||||||
|
slog.Warn("delete host: failed to send Terminate to agent", "host_id", hostID, "error", rpcErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mark all affected sandboxes as stopped in DB.
|
||||||
|
if len(sandboxes) > 0 {
|
||||||
|
sbIDs := make([]string, len(sandboxes))
|
||||||
|
for i, sb := range sandboxes {
|
||||||
|
sbIDs[i] = sb.ID
|
||||||
|
}
|
||||||
|
if err := s.DB.BulkUpdateStatusByIDs(ctx, db.BulkUpdateStatusByIDsParams{
|
||||||
|
Column1: sbIDs,
|
||||||
|
Status: "stopped",
|
||||||
|
}); err != nil {
|
||||||
|
slog.Warn("delete host: failed to mark sandboxes stopped", "host_id", hostID, "error", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Revoke all refresh tokens for this host.
|
||||||
|
if err := s.DB.RevokeHostRefreshTokensByHost(ctx, hostID); err != nil {
|
||||||
|
slog.Warn("delete host: failed to revoke refresh tokens", "host_id", hostID, "error", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evict the client from the pool so no further RPCs are sent.
|
||||||
|
if s.Pool != nil {
|
||||||
|
s.Pool.Evict(hostID)
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.DB.DeleteHost(ctx, hostID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkDeletePermission verifies the caller has permission to delete the given
|
||||||
|
// host and returns the host record on success.
|
||||||
|
func (s *HostService) checkDeletePermission(ctx context.Context, hostID, userID, teamID string, isAdmin bool) (db.Host, error) {
|
||||||
|
host, err := s.DB.GetHost(ctx, hostID)
|
||||||
|
if err != nil {
|
||||||
|
return db.Host{}, fmt.Errorf("host not found: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if isAdmin {
|
||||||
|
return host, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if !isAdmin {
|
|
||||||
if host.Type != "byoc" {
|
if host.Type != "byoc" {
|
||||||
return fmt.Errorf("forbidden: only admins can delete regular hosts")
|
return db.Host{}, fmt.Errorf("forbidden: only admins can delete regular hosts")
|
||||||
}
|
}
|
||||||
if !host.TeamID.Valid || host.TeamID.String != teamID {
|
if !host.TeamID.Valid || host.TeamID.String != teamID {
|
||||||
return fmt.Errorf("forbidden: host does not belong to your team")
|
return db.Host{}, fmt.Errorf("forbidden: host does not belong to your team")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if userID != "" {
|
||||||
membership, err := s.DB.GetTeamMembership(ctx, db.GetTeamMembershipParams{
|
membership, err := s.DB.GetTeamMembership(ctx, db.GetTeamMembershipParams{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
TeamID: teamID,
|
TeamID: teamID,
|
||||||
})
|
})
|
||||||
if errors.Is(err, pgx.ErrNoRows) {
|
if errors.Is(err, pgx.ErrNoRows) {
|
||||||
return fmt.Errorf("forbidden: not a member of the specified team")
|
return db.Host{}, fmt.Errorf("forbidden: not a member of the specified team")
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("check team membership: %w", err)
|
return db.Host{}, fmt.Errorf("check team membership: %w", err)
|
||||||
}
|
}
|
||||||
if membership.Role != "owner" {
|
if err := requireAdminOrOwner(membership.Role); err != nil {
|
||||||
return fmt.Errorf("forbidden: only team owners can delete BYOC hosts")
|
return db.Host{}, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return s.DB.DeleteHost(ctx, hostID)
|
return host, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddTag adds a tag to a host.
|
// AddTag adds a tag to a host.
|
||||||
@ -357,3 +567,14 @@ func (s *HostService) ListTags(ctx context.Context, hostID, teamID string, isAdm
|
|||||||
}
|
}
|
||||||
return s.DB.GetHostTags(ctx, hostID)
|
return s.DB.GetHostTags(ctx, hostID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HostHasSandboxesError is returned by Delete when the host has active sandboxes
|
||||||
|
// and force was not set. The caller should present the list to the user and
|
||||||
|
// re-call Delete with force=true if they confirm.
|
||||||
|
type HostHasSandboxesError struct {
|
||||||
|
SandboxIDs []string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *HostHasSandboxesError) Error() string {
|
||||||
|
return fmt.Sprintf("host has %d active sandbox(es): %v", len(e.SandboxIDs), e.SandboxIDs)
|
||||||
|
}
|
||||||
|
|||||||
@ -11,16 +11,18 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/id"
|
"git.omukk.dev/wrenn/sandbox/internal/id"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/scheduler"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/validate"
|
"git.omukk.dev/wrenn/sandbox/internal/validate"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// SandboxService provides sandbox lifecycle operations shared between the
|
// SandboxService provides sandbox lifecycle operations shared between the
|
||||||
// REST API and the dashboard.
|
// REST API and the dashboard.
|
||||||
type SandboxService struct {
|
type SandboxService struct {
|
||||||
DB *db.Queries
|
DB *db.Queries
|
||||||
Agent hostagentv1connect.HostAgentServiceClient
|
Pool *lifecycle.HostClientPool
|
||||||
|
Scheduler scheduler.HostScheduler
|
||||||
}
|
}
|
||||||
|
|
||||||
// SandboxCreateParams holds the parameters for creating a sandbox.
|
// SandboxCreateParams holds the parameters for creating a sandbox.
|
||||||
@ -32,8 +34,34 @@ type SandboxCreateParams struct {
|
|||||||
TimeoutSec int32
|
TimeoutSec int32
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create creates a new sandbox: inserts a pending DB record, calls the host agent,
|
// agentForSandbox looks up the host for the given sandbox and returns a client.
|
||||||
// and updates the record to running. Returns the sandbox DB row.
|
func (s *SandboxService) agentForSandbox(ctx context.Context, sandboxID string) (hostagentClient, db.Sandbox, error) {
|
||||||
|
sb, err := s.DB.GetSandbox(ctx, sandboxID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, db.Sandbox{}, fmt.Errorf("sandbox not found: %w", err)
|
||||||
|
}
|
||||||
|
host, err := s.DB.GetHost(ctx, sb.HostID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, db.Sandbox{}, fmt.Errorf("host not found for sandbox: %w", err)
|
||||||
|
}
|
||||||
|
agent, err := s.Pool.GetForHost(host)
|
||||||
|
if err != nil {
|
||||||
|
return nil, db.Sandbox{}, fmt.Errorf("get agent client: %w", err)
|
||||||
|
}
|
||||||
|
return agent, sb, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// hostagentClient is a local alias to avoid the full package path in signatures.
|
||||||
|
type hostagentClient = interface {
|
||||||
|
CreateSandbox(ctx context.Context, req *connect.Request[pb.CreateSandboxRequest]) (*connect.Response[pb.CreateSandboxResponse], error)
|
||||||
|
DestroySandbox(ctx context.Context, req *connect.Request[pb.DestroySandboxRequest]) (*connect.Response[pb.DestroySandboxResponse], error)
|
||||||
|
PauseSandbox(ctx context.Context, req *connect.Request[pb.PauseSandboxRequest]) (*connect.Response[pb.PauseSandboxResponse], error)
|
||||||
|
ResumeSandbox(ctx context.Context, req *connect.Request[pb.ResumeSandboxRequest]) (*connect.Response[pb.ResumeSandboxResponse], error)
|
||||||
|
PingSandbox(ctx context.Context, req *connect.Request[pb.PingSandboxRequest]) (*connect.Response[pb.PingSandboxResponse], error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create creates a new sandbox: picks a host via the scheduler, inserts a pending
|
||||||
|
// DB record, calls the host agent, and updates the record to running.
|
||||||
func (s *SandboxService) Create(ctx context.Context, p SandboxCreateParams) (db.Sandbox, error) {
|
func (s *SandboxService) Create(ctx context.Context, p SandboxCreateParams) (db.Sandbox, error) {
|
||||||
if p.Template == "" {
|
if p.Template == "" {
|
||||||
p.Template = "minimal"
|
p.Template = "minimal"
|
||||||
@ -58,12 +86,33 @@ func (s *SandboxService) Create(ctx context.Context, p SandboxCreateParams) (db.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if p.TeamID == "" {
|
||||||
|
return db.Sandbox{}, fmt.Errorf("invalid request: team_id is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Determine whether this team uses BYOC hosts or platform hosts.
|
||||||
|
team, err := s.DB.GetTeam(ctx, p.TeamID)
|
||||||
|
if err != nil {
|
||||||
|
return db.Sandbox{}, fmt.Errorf("team not found: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pick a host for this sandbox.
|
||||||
|
host, err := s.Scheduler.SelectHost(ctx, p.TeamID, team.IsByoc)
|
||||||
|
if err != nil {
|
||||||
|
return db.Sandbox{}, fmt.Errorf("select host: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
agent, err := s.Pool.GetForHost(host)
|
||||||
|
if err != nil {
|
||||||
|
return db.Sandbox{}, fmt.Errorf("get agent client: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
sandboxID := id.NewSandboxID()
|
sandboxID := id.NewSandboxID()
|
||||||
|
|
||||||
if _, err := s.DB.InsertSandbox(ctx, db.InsertSandboxParams{
|
if _, err := s.DB.InsertSandbox(ctx, db.InsertSandboxParams{
|
||||||
ID: sandboxID,
|
ID: sandboxID,
|
||||||
TeamID: p.TeamID,
|
TeamID: p.TeamID,
|
||||||
HostID: "default",
|
HostID: host.ID,
|
||||||
Template: p.Template,
|
Template: p.Template,
|
||||||
Status: "pending",
|
Status: "pending",
|
||||||
Vcpus: p.VCPUs,
|
Vcpus: p.VCPUs,
|
||||||
@ -73,7 +122,7 @@ func (s *SandboxService) Create(ctx context.Context, p SandboxCreateParams) (db.
|
|||||||
return db.Sandbox{}, fmt.Errorf("insert sandbox: %w", err)
|
return db.Sandbox{}, fmt.Errorf("insert sandbox: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := s.Agent.CreateSandbox(ctx, connect.NewRequest(&pb.CreateSandboxRequest{
|
resp, err := agent.CreateSandbox(ctx, connect.NewRequest(&pb.CreateSandboxRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
Template: p.Template,
|
Template: p.Template,
|
||||||
Vcpus: p.VCPUs,
|
Vcpus: p.VCPUs,
|
||||||
@ -126,7 +175,12 @@ func (s *SandboxService) Pause(ctx context.Context, sandboxID, teamID string) (d
|
|||||||
return db.Sandbox{}, fmt.Errorf("sandbox is not running (status: %s)", sb.Status)
|
return db.Sandbox{}, fmt.Errorf("sandbox is not running (status: %s)", sb.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := s.Agent.PauseSandbox(ctx, connect.NewRequest(&pb.PauseSandboxRequest{
|
agent, _, err := s.agentForSandbox(ctx, sandboxID)
|
||||||
|
if err != nil {
|
||||||
|
return db.Sandbox{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := agent.PauseSandbox(ctx, connect.NewRequest(&pb.PauseSandboxRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
})); err != nil {
|
})); err != nil {
|
||||||
return db.Sandbox{}, fmt.Errorf("agent pause: %w", err)
|
return db.Sandbox{}, fmt.Errorf("agent pause: %w", err)
|
||||||
@ -151,7 +205,12 @@ func (s *SandboxService) Resume(ctx context.Context, sandboxID, teamID string) (
|
|||||||
return db.Sandbox{}, fmt.Errorf("sandbox is not paused (status: %s)", sb.Status)
|
return db.Sandbox{}, fmt.Errorf("sandbox is not paused (status: %s)", sb.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := s.Agent.ResumeSandbox(ctx, connect.NewRequest(&pb.ResumeSandboxRequest{
|
agent, _, err := s.agentForSandbox(ctx, sandboxID)
|
||||||
|
if err != nil {
|
||||||
|
return db.Sandbox{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
resp, err := agent.ResumeSandbox(ctx, connect.NewRequest(&pb.ResumeSandboxRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
TimeoutSec: sb.TimeoutSec,
|
TimeoutSec: sb.TimeoutSec,
|
||||||
}))
|
}))
|
||||||
@ -181,8 +240,13 @@ func (s *SandboxService) Destroy(ctx context.Context, sandboxID, teamID string)
|
|||||||
return fmt.Errorf("sandbox not found: %w", err)
|
return fmt.Errorf("sandbox not found: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
agent, _, err := s.agentForSandbox(ctx, sandboxID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// Destroy on host agent. A not-found response is fine — sandbox is already gone.
|
// Destroy on host agent. A not-found response is fine — sandbox is already gone.
|
||||||
if _, err := s.Agent.DestroySandbox(ctx, connect.NewRequest(&pb.DestroySandboxRequest{
|
if _, err := agent.DestroySandbox(ctx, connect.NewRequest(&pb.DestroySandboxRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
})); err != nil && connect.CodeOf(err) != connect.CodeNotFound {
|
})); err != nil && connect.CodeOf(err) != connect.CodeNotFound {
|
||||||
return fmt.Errorf("agent destroy: %w", err)
|
return fmt.Errorf("agent destroy: %w", err)
|
||||||
@ -206,7 +270,12 @@ func (s *SandboxService) Ping(ctx context.Context, sandboxID, teamID string) err
|
|||||||
return fmt.Errorf("sandbox is not running (status: %s)", sb.Status)
|
return fmt.Errorf("sandbox is not running (status: %s)", sb.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := s.Agent.PingSandbox(ctx, connect.NewRequest(&pb.PingSandboxRequest{
|
agent, _, err := s.agentForSandbox(ctx, sandboxID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := agent.PingSandbox(ctx, connect.NewRequest(&pb.PingSandboxRequest{
|
||||||
SandboxId: sandboxID,
|
SandboxId: sandboxID,
|
||||||
})); err != nil {
|
})); err != nil {
|
||||||
return fmt.Errorf("agent ping: %w", err)
|
return fmt.Errorf("agent ping: %w", err)
|
||||||
|
|||||||
@ -14,8 +14,8 @@ import (
|
|||||||
|
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/db"
|
"git.omukk.dev/wrenn/sandbox/internal/db"
|
||||||
"git.omukk.dev/wrenn/sandbox/internal/id"
|
"git.omukk.dev/wrenn/sandbox/internal/id"
|
||||||
|
"git.omukk.dev/wrenn/sandbox/internal/lifecycle"
|
||||||
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
pb "git.omukk.dev/wrenn/sandbox/proto/hostagent/gen"
|
||||||
"git.omukk.dev/wrenn/sandbox/proto/hostagent/gen/hostagentv1connect"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var teamNameRE = regexp.MustCompile(`^[A-Za-z0-9 _\-@']{1,128}$`)
|
var teamNameRE = regexp.MustCompile(`^[A-Za-z0-9 _\-@']{1,128}$`)
|
||||||
@ -24,7 +24,7 @@ var teamNameRE = regexp.MustCompile(`^[A-Za-z0-9 _\-@']{1,128}$`)
|
|||||||
type TeamService struct {
|
type TeamService struct {
|
||||||
DB *db.Queries
|
DB *db.Queries
|
||||||
Pool *pgxpool.Pool
|
Pool *pgxpool.Pool
|
||||||
Agent hostagentv1connect.HostAgentServiceClient
|
HostPool *lifecycle.HostClientPool
|
||||||
}
|
}
|
||||||
|
|
||||||
// TeamWithRole pairs a team with the calling user's role in it.
|
// TeamWithRole pairs a team with the calling user's role in it.
|
||||||
@ -177,11 +177,17 @@ func (s *TeamService) DeleteTeam(ctx context.Context, teamID, callerUserID strin
|
|||||||
|
|
||||||
var stopIDs []string
|
var stopIDs []string
|
||||||
for _, sb := range sandboxes {
|
for _, sb := range sandboxes {
|
||||||
if _, err := s.Agent.DestroySandbox(ctx, connect.NewRequest(&pb.DestroySandboxRequest{
|
host, hostErr := s.DB.GetHost(ctx, sb.HostID)
|
||||||
|
if hostErr == nil {
|
||||||
|
agent, agentErr := s.HostPool.GetForHost(host)
|
||||||
|
if agentErr == nil {
|
||||||
|
if _, err := agent.DestroySandbox(ctx, connect.NewRequest(&pb.DestroySandboxRequest{
|
||||||
SandboxId: sb.ID,
|
SandboxId: sb.ID,
|
||||||
})); err != nil && connect.CodeOf(err) != connect.CodeNotFound {
|
})); err != nil && connect.CodeOf(err) != connect.CodeNotFound {
|
||||||
slog.Warn("team delete: failed to destroy sandbox", "sandbox_id", sb.ID, "error", err)
|
slog.Warn("team delete: failed to destroy sandbox", "sandbox_id", sb.ID, "error", err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
stopIDs = append(stopIDs, sb.ID)
|
stopIDs = append(stopIDs, sb.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -368,3 +374,27 @@ func (s *TeamService) LeaveTeam(ctx context.Context, teamID, callerUserID string
|
|||||||
func (s *TeamService) SearchUsersByEmailPrefix(ctx context.Context, prefix string) ([]db.SearchUsersByEmailPrefixRow, error) {
|
func (s *TeamService) SearchUsersByEmailPrefix(ctx context.Context, prefix string) ([]db.SearchUsersByEmailPrefixRow, error) {
|
||||||
return s.DB.SearchUsersByEmailPrefix(ctx, pgtype.Text{String: prefix, Valid: true})
|
return s.DB.SearchUsersByEmailPrefix(ctx, pgtype.Text{String: prefix, Valid: true})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetBYOC enables the BYOC feature flag for a team. Once enabled, BYOC cannot
|
||||||
|
// be disabled — it is a one-way transition.
|
||||||
|
// Admin-only — the caller must verify admin status before invoking this.
|
||||||
|
func (s *TeamService) SetBYOC(ctx context.Context, teamID string, enabled bool) error {
|
||||||
|
team, err := s.DB.GetTeam(ctx, teamID)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("team not found: %w", err)
|
||||||
|
}
|
||||||
|
if team.DeletedAt.Valid {
|
||||||
|
return fmt.Errorf("team not found")
|
||||||
|
}
|
||||||
|
if !enabled {
|
||||||
|
return fmt.Errorf("invalid request: BYOC cannot be disabled once enabled")
|
||||||
|
}
|
||||||
|
if team.IsByoc {
|
||||||
|
// Already enabled — idempotent, no-op.
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err := s.DB.SetTeamBYOC(ctx, db.SetTeamBYOCParams{ID: teamID, IsByoc: true}); err != nil {
|
||||||
|
return fmt.Errorf("set byoc: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@ -1830,6 +1830,78 @@ func (*PingSandboxResponse) Descriptor() ([]byte, []int) {
|
|||||||
return file_hostagent_proto_rawDescGZIP(), []int{32}
|
return file_hostagent_proto_rawDescGZIP(), []int{32}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TerminateRequest struct {
|
||||||
|
state protoimpl.MessageState `protogen:"open.v1"`
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *TerminateRequest) Reset() {
|
||||||
|
*x = TerminateRequest{}
|
||||||
|
mi := &file_hostagent_proto_msgTypes[33]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *TerminateRequest) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*TerminateRequest) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *TerminateRequest) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_hostagent_proto_msgTypes[33]
|
||||||
|
if x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use TerminateRequest.ProtoReflect.Descriptor instead.
|
||||||
|
func (*TerminateRequest) Descriptor() ([]byte, []int) {
|
||||||
|
return file_hostagent_proto_rawDescGZIP(), []int{33}
|
||||||
|
}
|
||||||
|
|
||||||
|
type TerminateResponse struct {
|
||||||
|
state protoimpl.MessageState `protogen:"open.v1"`
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *TerminateResponse) Reset() {
|
||||||
|
*x = TerminateResponse{}
|
||||||
|
mi := &file_hostagent_proto_msgTypes[34]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *TerminateResponse) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*TerminateResponse) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *TerminateResponse) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_hostagent_proto_msgTypes[34]
|
||||||
|
if x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use TerminateResponse.ProtoReflect.Descriptor instead.
|
||||||
|
func (*TerminateResponse) Descriptor() ([]byte, []int) {
|
||||||
|
return file_hostagent_proto_rawDescGZIP(), []int{34}
|
||||||
|
}
|
||||||
|
|
||||||
var File_hostagent_proto protoreflect.FileDescriptor
|
var File_hostagent_proto protoreflect.FileDescriptor
|
||||||
|
|
||||||
const file_hostagent_proto_rawDesc = "" +
|
const file_hostagent_proto_rawDesc = "" +
|
||||||
@ -1955,7 +2027,10 @@ const file_hostagent_proto_rawDesc = "" +
|
|||||||
"\x12PingSandboxRequest\x12\x1d\n" +
|
"\x12PingSandboxRequest\x12\x1d\n" +
|
||||||
"\n" +
|
"\n" +
|
||||||
"sandbox_id\x18\x01 \x01(\tR\tsandboxId\"\x15\n" +
|
"sandbox_id\x18\x01 \x01(\tR\tsandboxId\"\x15\n" +
|
||||||
"\x13PingSandboxResponse2\xce\t\n" +
|
"\x13PingSandboxResponse\"\x12\n" +
|
||||||
|
"\x10TerminateRequest\"\x13\n" +
|
||||||
|
"\x11TerminateResponse2\x9c\n" +
|
||||||
|
"\n" +
|
||||||
"\x10HostAgentService\x12X\n" +
|
"\x10HostAgentService\x12X\n" +
|
||||||
"\rCreateSandbox\x12\".hostagent.v1.CreateSandboxRequest\x1a#.hostagent.v1.CreateSandboxResponse\x12[\n" +
|
"\rCreateSandbox\x12\".hostagent.v1.CreateSandboxRequest\x1a#.hostagent.v1.CreateSandboxResponse\x12[\n" +
|
||||||
"\x0eDestroySandbox\x12#.hostagent.v1.DestroySandboxRequest\x1a$.hostagent.v1.DestroySandboxResponse\x12U\n" +
|
"\x0eDestroySandbox\x12#.hostagent.v1.DestroySandboxRequest\x1a$.hostagent.v1.DestroySandboxResponse\x12U\n" +
|
||||||
@ -1971,7 +2046,8 @@ const file_hostagent_proto_rawDesc = "" +
|
|||||||
"ExecStream\x12\x1f.hostagent.v1.ExecStreamRequest\x1a .hostagent.v1.ExecStreamResponse0\x01\x12`\n" +
|
"ExecStream\x12\x1f.hostagent.v1.ExecStreamRequest\x1a .hostagent.v1.ExecStreamResponse0\x01\x12`\n" +
|
||||||
"\x0fWriteFileStream\x12$.hostagent.v1.WriteFileStreamRequest\x1a%.hostagent.v1.WriteFileStreamResponse(\x01\x12]\n" +
|
"\x0fWriteFileStream\x12$.hostagent.v1.WriteFileStreamRequest\x1a%.hostagent.v1.WriteFileStreamResponse(\x01\x12]\n" +
|
||||||
"\x0eReadFileStream\x12#.hostagent.v1.ReadFileStreamRequest\x1a$.hostagent.v1.ReadFileStreamResponse0\x01\x12R\n" +
|
"\x0eReadFileStream\x12#.hostagent.v1.ReadFileStreamRequest\x1a$.hostagent.v1.ReadFileStreamResponse0\x01\x12R\n" +
|
||||||
"\vPingSandbox\x12 .hostagent.v1.PingSandboxRequest\x1a!.hostagent.v1.PingSandboxResponseB\xb0\x01\n" +
|
"\vPingSandbox\x12 .hostagent.v1.PingSandboxRequest\x1a!.hostagent.v1.PingSandboxResponse\x12L\n" +
|
||||||
|
"\tTerminate\x12\x1e.hostagent.v1.TerminateRequest\x1a\x1f.hostagent.v1.TerminateResponseB\xb0\x01\n" +
|
||||||
"\x10com.hostagent.v1B\x0eHostagentProtoP\x01Z;git.omukk.dev/wrenn/sandbox/proto/hostagent/gen;hostagentv1\xa2\x02\x03HXX\xaa\x02\fHostagent.V1\xca\x02\fHostagent\\V1\xe2\x02\x18Hostagent\\V1\\GPBMetadata\xea\x02\rHostagent::V1b\x06proto3"
|
"\x10com.hostagent.v1B\x0eHostagentProtoP\x01Z;git.omukk.dev/wrenn/sandbox/proto/hostagent/gen;hostagentv1\xa2\x02\x03HXX\xaa\x02\fHostagent.V1\xca\x02\fHostagent\\V1\xe2\x02\x18Hostagent\\V1\\GPBMetadata\xea\x02\rHostagent::V1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -1986,7 +2062,7 @@ func file_hostagent_proto_rawDescGZIP() []byte {
|
|||||||
return file_hostagent_proto_rawDescData
|
return file_hostagent_proto_rawDescData
|
||||||
}
|
}
|
||||||
|
|
||||||
var file_hostagent_proto_msgTypes = make([]protoimpl.MessageInfo, 33)
|
var file_hostagent_proto_msgTypes = make([]protoimpl.MessageInfo, 35)
|
||||||
var file_hostagent_proto_goTypes = []any{
|
var file_hostagent_proto_goTypes = []any{
|
||||||
(*CreateSandboxRequest)(nil), // 0: hostagent.v1.CreateSandboxRequest
|
(*CreateSandboxRequest)(nil), // 0: hostagent.v1.CreateSandboxRequest
|
||||||
(*CreateSandboxResponse)(nil), // 1: hostagent.v1.CreateSandboxResponse
|
(*CreateSandboxResponse)(nil), // 1: hostagent.v1.CreateSandboxResponse
|
||||||
@ -2021,6 +2097,8 @@ var file_hostagent_proto_goTypes = []any{
|
|||||||
(*ReadFileStreamResponse)(nil), // 30: hostagent.v1.ReadFileStreamResponse
|
(*ReadFileStreamResponse)(nil), // 30: hostagent.v1.ReadFileStreamResponse
|
||||||
(*PingSandboxRequest)(nil), // 31: hostagent.v1.PingSandboxRequest
|
(*PingSandboxRequest)(nil), // 31: hostagent.v1.PingSandboxRequest
|
||||||
(*PingSandboxResponse)(nil), // 32: hostagent.v1.PingSandboxResponse
|
(*PingSandboxResponse)(nil), // 32: hostagent.v1.PingSandboxResponse
|
||||||
|
(*TerminateRequest)(nil), // 33: hostagent.v1.TerminateRequest
|
||||||
|
(*TerminateResponse)(nil), // 34: hostagent.v1.TerminateResponse
|
||||||
}
|
}
|
||||||
var file_hostagent_proto_depIdxs = []int32{
|
var file_hostagent_proto_depIdxs = []int32{
|
||||||
16, // 0: hostagent.v1.ListSandboxesResponse.sandboxes:type_name -> hostagent.v1.SandboxInfo
|
16, // 0: hostagent.v1.ListSandboxesResponse.sandboxes:type_name -> hostagent.v1.SandboxInfo
|
||||||
@ -2042,22 +2120,24 @@ var file_hostagent_proto_depIdxs = []int32{
|
|||||||
26, // 16: hostagent.v1.HostAgentService.WriteFileStream:input_type -> hostagent.v1.WriteFileStreamRequest
|
26, // 16: hostagent.v1.HostAgentService.WriteFileStream:input_type -> hostagent.v1.WriteFileStreamRequest
|
||||||
29, // 17: hostagent.v1.HostAgentService.ReadFileStream:input_type -> hostagent.v1.ReadFileStreamRequest
|
29, // 17: hostagent.v1.HostAgentService.ReadFileStream:input_type -> hostagent.v1.ReadFileStreamRequest
|
||||||
31, // 18: hostagent.v1.HostAgentService.PingSandbox:input_type -> hostagent.v1.PingSandboxRequest
|
31, // 18: hostagent.v1.HostAgentService.PingSandbox:input_type -> hostagent.v1.PingSandboxRequest
|
||||||
1, // 19: hostagent.v1.HostAgentService.CreateSandbox:output_type -> hostagent.v1.CreateSandboxResponse
|
33, // 19: hostagent.v1.HostAgentService.Terminate:input_type -> hostagent.v1.TerminateRequest
|
||||||
3, // 20: hostagent.v1.HostAgentService.DestroySandbox:output_type -> hostagent.v1.DestroySandboxResponse
|
1, // 20: hostagent.v1.HostAgentService.CreateSandbox:output_type -> hostagent.v1.CreateSandboxResponse
|
||||||
5, // 21: hostagent.v1.HostAgentService.PauseSandbox:output_type -> hostagent.v1.PauseSandboxResponse
|
3, // 21: hostagent.v1.HostAgentService.DestroySandbox:output_type -> hostagent.v1.DestroySandboxResponse
|
||||||
7, // 22: hostagent.v1.HostAgentService.ResumeSandbox:output_type -> hostagent.v1.ResumeSandboxResponse
|
5, // 22: hostagent.v1.HostAgentService.PauseSandbox:output_type -> hostagent.v1.PauseSandboxResponse
|
||||||
13, // 23: hostagent.v1.HostAgentService.Exec:output_type -> hostagent.v1.ExecResponse
|
7, // 23: hostagent.v1.HostAgentService.ResumeSandbox:output_type -> hostagent.v1.ResumeSandboxResponse
|
||||||
15, // 24: hostagent.v1.HostAgentService.ListSandboxes:output_type -> hostagent.v1.ListSandboxesResponse
|
13, // 24: hostagent.v1.HostAgentService.Exec:output_type -> hostagent.v1.ExecResponse
|
||||||
18, // 25: hostagent.v1.HostAgentService.WriteFile:output_type -> hostagent.v1.WriteFileResponse
|
15, // 25: hostagent.v1.HostAgentService.ListSandboxes:output_type -> hostagent.v1.ListSandboxesResponse
|
||||||
20, // 26: hostagent.v1.HostAgentService.ReadFile:output_type -> hostagent.v1.ReadFileResponse
|
18, // 26: hostagent.v1.HostAgentService.WriteFile:output_type -> hostagent.v1.WriteFileResponse
|
||||||
9, // 27: hostagent.v1.HostAgentService.CreateSnapshot:output_type -> hostagent.v1.CreateSnapshotResponse
|
20, // 27: hostagent.v1.HostAgentService.ReadFile:output_type -> hostagent.v1.ReadFileResponse
|
||||||
11, // 28: hostagent.v1.HostAgentService.DeleteSnapshot:output_type -> hostagent.v1.DeleteSnapshotResponse
|
9, // 28: hostagent.v1.HostAgentService.CreateSnapshot:output_type -> hostagent.v1.CreateSnapshotResponse
|
||||||
22, // 29: hostagent.v1.HostAgentService.ExecStream:output_type -> hostagent.v1.ExecStreamResponse
|
11, // 29: hostagent.v1.HostAgentService.DeleteSnapshot:output_type -> hostagent.v1.DeleteSnapshotResponse
|
||||||
28, // 30: hostagent.v1.HostAgentService.WriteFileStream:output_type -> hostagent.v1.WriteFileStreamResponse
|
22, // 30: hostagent.v1.HostAgentService.ExecStream:output_type -> hostagent.v1.ExecStreamResponse
|
||||||
30, // 31: hostagent.v1.HostAgentService.ReadFileStream:output_type -> hostagent.v1.ReadFileStreamResponse
|
28, // 31: hostagent.v1.HostAgentService.WriteFileStream:output_type -> hostagent.v1.WriteFileStreamResponse
|
||||||
32, // 32: hostagent.v1.HostAgentService.PingSandbox:output_type -> hostagent.v1.PingSandboxResponse
|
30, // 32: hostagent.v1.HostAgentService.ReadFileStream:output_type -> hostagent.v1.ReadFileStreamResponse
|
||||||
19, // [19:33] is the sub-list for method output_type
|
32, // 33: hostagent.v1.HostAgentService.PingSandbox:output_type -> hostagent.v1.PingSandboxResponse
|
||||||
5, // [5:19] is the sub-list for method input_type
|
34, // 34: hostagent.v1.HostAgentService.Terminate:output_type -> hostagent.v1.TerminateResponse
|
||||||
|
20, // [20:35] is the sub-list for method output_type
|
||||||
|
5, // [5:20] is the sub-list for method input_type
|
||||||
5, // [5:5] is the sub-list for extension type_name
|
5, // [5:5] is the sub-list for extension type_name
|
||||||
5, // [5:5] is the sub-list for extension extendee
|
5, // [5:5] is the sub-list for extension extendee
|
||||||
0, // [0:5] is the sub-list for field type_name
|
0, // [0:5] is the sub-list for field type_name
|
||||||
@ -2087,7 +2167,7 @@ func file_hostagent_proto_init() {
|
|||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: unsafe.Slice(unsafe.StringData(file_hostagent_proto_rawDesc), len(file_hostagent_proto_rawDesc)),
|
RawDescriptor: unsafe.Slice(unsafe.StringData(file_hostagent_proto_rawDesc), len(file_hostagent_proto_rawDesc)),
|
||||||
NumEnums: 0,
|
NumEnums: 0,
|
||||||
NumMessages: 33,
|
NumMessages: 35,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 1,
|
NumServices: 1,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -74,6 +74,9 @@ const (
|
|||||||
// HostAgentServicePingSandboxProcedure is the fully-qualified name of the HostAgentService's
|
// HostAgentServicePingSandboxProcedure is the fully-qualified name of the HostAgentService's
|
||||||
// PingSandbox RPC.
|
// PingSandbox RPC.
|
||||||
HostAgentServicePingSandboxProcedure = "/hostagent.v1.HostAgentService/PingSandbox"
|
HostAgentServicePingSandboxProcedure = "/hostagent.v1.HostAgentService/PingSandbox"
|
||||||
|
// HostAgentServiceTerminateProcedure is the fully-qualified name of the HostAgentService's
|
||||||
|
// Terminate RPC.
|
||||||
|
HostAgentServiceTerminateProcedure = "/hostagent.v1.HostAgentService/Terminate"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HostAgentServiceClient is a client for the hostagent.v1.HostAgentService service.
|
// HostAgentServiceClient is a client for the hostagent.v1.HostAgentService service.
|
||||||
@ -108,6 +111,10 @@ type HostAgentServiceClient interface {
|
|||||||
ReadFileStream(context.Context, *connect.Request[gen.ReadFileStreamRequest]) (*connect.ServerStreamForClient[gen.ReadFileStreamResponse], error)
|
ReadFileStream(context.Context, *connect.Request[gen.ReadFileStreamRequest]) (*connect.ServerStreamForClient[gen.ReadFileStreamResponse], error)
|
||||||
// PingSandbox resets the inactivity timer for a running sandbox.
|
// PingSandbox resets the inactivity timer for a running sandbox.
|
||||||
PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error)
|
PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error)
|
||||||
|
// Terminate instructs the host agent to destroy all sandboxes and exit.
|
||||||
|
// Called by the control plane immediately when a host is deleted so the
|
||||||
|
// agent shuts down without waiting for the next heartbeat cycle.
|
||||||
|
Terminate(context.Context, *connect.Request[gen.TerminateRequest]) (*connect.Response[gen.TerminateResponse], error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewHostAgentServiceClient constructs a client for the hostagent.v1.HostAgentService service. By
|
// NewHostAgentServiceClient constructs a client for the hostagent.v1.HostAgentService service. By
|
||||||
@ -205,6 +212,12 @@ func NewHostAgentServiceClient(httpClient connect.HTTPClient, baseURL string, op
|
|||||||
connect.WithSchema(hostAgentServiceMethods.ByName("PingSandbox")),
|
connect.WithSchema(hostAgentServiceMethods.ByName("PingSandbox")),
|
||||||
connect.WithClientOptions(opts...),
|
connect.WithClientOptions(opts...),
|
||||||
),
|
),
|
||||||
|
terminate: connect.NewClient[gen.TerminateRequest, gen.TerminateResponse](
|
||||||
|
httpClient,
|
||||||
|
baseURL+HostAgentServiceTerminateProcedure,
|
||||||
|
connect.WithSchema(hostAgentServiceMethods.ByName("Terminate")),
|
||||||
|
connect.WithClientOptions(opts...),
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -224,6 +237,7 @@ type hostAgentServiceClient struct {
|
|||||||
writeFileStream *connect.Client[gen.WriteFileStreamRequest, gen.WriteFileStreamResponse]
|
writeFileStream *connect.Client[gen.WriteFileStreamRequest, gen.WriteFileStreamResponse]
|
||||||
readFileStream *connect.Client[gen.ReadFileStreamRequest, gen.ReadFileStreamResponse]
|
readFileStream *connect.Client[gen.ReadFileStreamRequest, gen.ReadFileStreamResponse]
|
||||||
pingSandbox *connect.Client[gen.PingSandboxRequest, gen.PingSandboxResponse]
|
pingSandbox *connect.Client[gen.PingSandboxRequest, gen.PingSandboxResponse]
|
||||||
|
terminate *connect.Client[gen.TerminateRequest, gen.TerminateResponse]
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateSandbox calls hostagent.v1.HostAgentService.CreateSandbox.
|
// CreateSandbox calls hostagent.v1.HostAgentService.CreateSandbox.
|
||||||
@ -296,6 +310,11 @@ func (c *hostAgentServiceClient) PingSandbox(ctx context.Context, req *connect.R
|
|||||||
return c.pingSandbox.CallUnary(ctx, req)
|
return c.pingSandbox.CallUnary(ctx, req)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Terminate calls hostagent.v1.HostAgentService.Terminate.
|
||||||
|
func (c *hostAgentServiceClient) Terminate(ctx context.Context, req *connect.Request[gen.TerminateRequest]) (*connect.Response[gen.TerminateResponse], error) {
|
||||||
|
return c.terminate.CallUnary(ctx, req)
|
||||||
|
}
|
||||||
|
|
||||||
// HostAgentServiceHandler is an implementation of the hostagent.v1.HostAgentService service.
|
// HostAgentServiceHandler is an implementation of the hostagent.v1.HostAgentService service.
|
||||||
type HostAgentServiceHandler interface {
|
type HostAgentServiceHandler interface {
|
||||||
// CreateSandbox boots a new microVM with the given configuration.
|
// CreateSandbox boots a new microVM with the given configuration.
|
||||||
@ -328,6 +347,10 @@ type HostAgentServiceHandler interface {
|
|||||||
ReadFileStream(context.Context, *connect.Request[gen.ReadFileStreamRequest], *connect.ServerStream[gen.ReadFileStreamResponse]) error
|
ReadFileStream(context.Context, *connect.Request[gen.ReadFileStreamRequest], *connect.ServerStream[gen.ReadFileStreamResponse]) error
|
||||||
// PingSandbox resets the inactivity timer for a running sandbox.
|
// PingSandbox resets the inactivity timer for a running sandbox.
|
||||||
PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error)
|
PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error)
|
||||||
|
// Terminate instructs the host agent to destroy all sandboxes and exit.
|
||||||
|
// Called by the control plane immediately when a host is deleted so the
|
||||||
|
// agent shuts down without waiting for the next heartbeat cycle.
|
||||||
|
Terminate(context.Context, *connect.Request[gen.TerminateRequest]) (*connect.Response[gen.TerminateResponse], error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewHostAgentServiceHandler builds an HTTP handler from the service implementation. It returns the
|
// NewHostAgentServiceHandler builds an HTTP handler from the service implementation. It returns the
|
||||||
@ -421,6 +444,12 @@ func NewHostAgentServiceHandler(svc HostAgentServiceHandler, opts ...connect.Han
|
|||||||
connect.WithSchema(hostAgentServiceMethods.ByName("PingSandbox")),
|
connect.WithSchema(hostAgentServiceMethods.ByName("PingSandbox")),
|
||||||
connect.WithHandlerOptions(opts...),
|
connect.WithHandlerOptions(opts...),
|
||||||
)
|
)
|
||||||
|
hostAgentServiceTerminateHandler := connect.NewUnaryHandler(
|
||||||
|
HostAgentServiceTerminateProcedure,
|
||||||
|
svc.Terminate,
|
||||||
|
connect.WithSchema(hostAgentServiceMethods.ByName("Terminate")),
|
||||||
|
connect.WithHandlerOptions(opts...),
|
||||||
|
)
|
||||||
return "/hostagent.v1.HostAgentService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return "/hostagent.v1.HostAgentService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
switch r.URL.Path {
|
switch r.URL.Path {
|
||||||
case HostAgentServiceCreateSandboxProcedure:
|
case HostAgentServiceCreateSandboxProcedure:
|
||||||
@ -451,6 +480,8 @@ func NewHostAgentServiceHandler(svc HostAgentServiceHandler, opts ...connect.Han
|
|||||||
hostAgentServiceReadFileStreamHandler.ServeHTTP(w, r)
|
hostAgentServiceReadFileStreamHandler.ServeHTTP(w, r)
|
||||||
case HostAgentServicePingSandboxProcedure:
|
case HostAgentServicePingSandboxProcedure:
|
||||||
hostAgentServicePingSandboxHandler.ServeHTTP(w, r)
|
hostAgentServicePingSandboxHandler.ServeHTTP(w, r)
|
||||||
|
case HostAgentServiceTerminateProcedure:
|
||||||
|
hostAgentServiceTerminateHandler.ServeHTTP(w, r)
|
||||||
default:
|
default:
|
||||||
http.NotFound(w, r)
|
http.NotFound(w, r)
|
||||||
}
|
}
|
||||||
@ -515,3 +546,7 @@ func (UnimplementedHostAgentServiceHandler) ReadFileStream(context.Context, *con
|
|||||||
func (UnimplementedHostAgentServiceHandler) PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error) {
|
func (UnimplementedHostAgentServiceHandler) PingSandbox(context.Context, *connect.Request[gen.PingSandboxRequest]) (*connect.Response[gen.PingSandboxResponse], error) {
|
||||||
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("hostagent.v1.HostAgentService.PingSandbox is not implemented"))
|
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("hostagent.v1.HostAgentService.PingSandbox is not implemented"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (UnimplementedHostAgentServiceHandler) Terminate(context.Context, *connect.Request[gen.TerminateRequest]) (*connect.Response[gen.TerminateResponse], error) {
|
||||||
|
return nil, connect.NewError(connect.CodeUnimplemented, errors.New("hostagent.v1.HostAgentService.Terminate is not implemented"))
|
||||||
|
}
|
||||||
|
|||||||
@ -49,6 +49,11 @@ service HostAgentService {
|
|||||||
// PingSandbox resets the inactivity timer for a running sandbox.
|
// PingSandbox resets the inactivity timer for a running sandbox.
|
||||||
rpc PingSandbox(PingSandboxRequest) returns (PingSandboxResponse);
|
rpc PingSandbox(PingSandboxRequest) returns (PingSandboxResponse);
|
||||||
|
|
||||||
|
// Terminate instructs the host agent to destroy all sandboxes and exit.
|
||||||
|
// Called by the control plane immediately when a host is deleted so the
|
||||||
|
// agent shuts down without waiting for the next heartbeat cycle.
|
||||||
|
rpc Terminate(TerminateRequest) returns (TerminateResponse);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
message CreateSandboxRequest {
|
message CreateSandboxRequest {
|
||||||
@ -236,3 +241,10 @@ message PingSandboxRequest {
|
|||||||
|
|
||||||
message PingSandboxResponse {}
|
message PingSandboxResponse {}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// ── Terminate ────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
message TerminateRequest {}
|
||||||
|
|
||||||
|
message TerminateResponse {}
|
||||||
|
|||||||
Reference in New Issue
Block a user