@typhons/sandbox-tools 0.4.0 → 0.4.2

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@typhons/sandbox-tools",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "bin": {
     "sandbox-relay-client": "./relay-client.js",
     "sandbox-session-proxy": "./session-proxy.js",
-    "sandbox-watchdog": "./sandbox-watchdog.js",
-    "sandbox-start-all": "./sandbox-start-all.js",
+    "sandbox-watchdog": "./sandbox-watchdog.sh",
+    "sandbox-start-all": "./sandbox-start-all.sh",
     "check-claude-active": "./check-claude-active.js",
     "stop-agents": "./stop-agents.js",
     "sandbox-clone": "./clone.js"

package/sandbox-start-all.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+# Start all sandbox services: sshd + watchdog + keepalive.
+# Called on sandbox boot/resume.
+
+BIN="$(cd "$(dirname "$(readlink -f "$0")")" && pwd)"
+
+# Start sshd
+mkdir -p /run/sshd
+if ! pgrep -x sshd > /dev/null 2>&1; then
+  /usr/sbin/sshd 2>/dev/null || true
+  echo "[start-all] sshd started on port 2222"
+fi
+
+# Kill stale processes from snapshot
+pkill -9 -f session-proxy.js 2>/dev/null || true
+pkill -9 -f relay-client.js 2>/dev/null || true
+pkill -9 -f sandbox-watchdog 2>/dev/null || true
+pkill -9 -f check-claude-active 2>/dev/null || true
+sleep 1
+
+# Start watchdog (manages both session-proxy and relay-client)
+nohup bash "$BIN/sandbox-watchdog.sh" >> /tmp/ssh-relay.log 2>&1 &
+
+# Start keepalive daemon
+if ! pgrep -f "check-claude-active.*--daemon" > /dev/null 2>&1; then
+  nohup node "$BIN/check-claude-active.js" --daemon >> /tmp/claude-keepalive.log 2>&1 &
+fi

package/sandbox-watchdog.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# Watchdog: keeps both session-proxy and relay-client running.
+
+BIN="$(cd "$(dirname "$(readlink -f "$0")")" && pwd)"
+export SSH_PORT="${SSH_PORT:-2222}"
+
+log() { echo "[watchdog $(date +%H:%M:%S)] $*"; }
+
+# Start session-proxy with auto-restart
+(
+  while true; do
+    node "$BIN/session-proxy.js" 2>&1
+    EXIT_CODE=$?
+    log "session-proxy exited (code $EXIT_CODE), restarting in 2s..."
+    sleep 2
+  done
+) >> /tmp/session-proxy.log 2>&1 &
+SESSION_PROXY_PID=$!
+log "session-proxy watchdog started (pid $SESSION_PROXY_PID)"
+
+# Relay-client watchdog
+while true; do
+  node "$BIN/relay-client.js" 2>&1
+  EXIT_CODE=$?
+  if [ "$EXIT_CODE" = "42" ]; then
+    log "relay-client replaced by newer connection (exit 42), stopping all"
+    kill $SESSION_PROXY_PID 2>/dev/null
+    exit 0
+  fi
+  log "relay-client exited (code $EXIT_CODE), restarting in 2s..."
+  sleep 2
+done

package/sandbox-start-all.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import{execSync as e,spawn as n}from"child_process";import{dirname as a,join as r}from"path";import{fileURLToPath as d}from"url";import c from"fs";var i=a(d(import.meta.url));function s(o){try{e(o,{stdio:"inherit"})}catch{}}try{e("pgrep -x sshd",{stdio:"ignore"})}catch{e("mkdir -p /run/sshd",{stdio:"ignore"}),s("/usr/sbin/sshd"),console.log("[start-all] sshd started on port 2222")}s("pkill -9 -f sandbox-session-proxy");s("pkill -9 -f sandbox-relay-client");s("pkill -9 -f sandbox-watchdog");e("sleep 1");var t=c.openSync("/tmp/ssh-relay.log","a");n(process.execPath,[r(i,"sandbox-watchdog.js")],{stdio:["ignore",t,t],detached:!0,env:process.env}).unref();try{e('pgrep -f "check-claude-active.*--daemon"',{stdio:"ignore"})}catch{let o=c.openSync("/tmp/claude-keepalive.log","a");n(process.execPath,[r(i,"check-claude-active.js"),"--daemon"],{stdio:["ignore",o,o],detached:!0,env:process.env}).unref()}

package/sandbox-watchdog.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import{spawn as l}from"child_process";import{dirname as y,join as p}from"path";import{fileURLToPath as f}from"url";import c from"fs";var a=y(f(import.meta.url));process.env.SSH_PORT=process.env.SSH_PORT||"2222";function s(e){console.log(`[watchdog ${new Date().toISOString().slice(11,19)}] ${e}`)}function d(e,o,i,t){let n=c.openSync(i,"a");l(process.execPath,[o],{stdio:["ignore",n,n],env:process.env}).on("exit",r=>{c.closeSync(n),!(t&&t(r))&&(s(`${e} exited (code ${r}), restarting in 2s...`),setTimeout(()=>d(e,o,i,t),2e3))})}d("session-proxy",p(a,"session-proxy.js"),"/tmp/session-proxy.log");s("session-proxy watchdog started");function m(){l(process.execPath,[p(a,"relay-client.js")],{stdio:"inherit",env:process.env}).on("exit",o=>{o===42&&(s("relay-client replaced by newer connection (exit 42), stopping all"),process.exit(0)),s(`relay-client exited (code ${o}), restarting in 2s...`),setTimeout(m,2e3)})}m();