jishushell 0.0.1 → 0.4.2-beta2

package/scripts/run.sh

@@ -0,0 +1,310 @@
+#!/bin/bash
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
+
+PORT="${JISHUSHELL_PORT:-8090}"
+HOST="${JISHUSHELL_HOST:-0.0.0.0}"
+MODE="${1:-}"
+
+# ─── Colors ───────────────────────────────────────────────────────────────────
+BOLD='\033[1m'
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+RED='\033[0;31m'
+CYAN='\033[0;36m'
+NC='\033[0m'
+
+info()    { echo -e "${CYAN}·${NC} $*"; }
+success() { echo -e "${GREEN}✓${NC} $*"; }
+warn()    { echo -e "${YELLOW}!${NC} $*"; }
+error()   { echo -e "${RED}✗${NC} $*" >&2; }
+
+# ─── Usage ────────────────────────────────────────────────────────────────────
+usage() {
+    cat <<EOF
+Usage: bash scripts/run.sh [mode]
+
+Modes:
+  (default)   Build backend (if needed) + start server
+  dev         Start backend in watch mode + frontend dev server (both in foreground)
+  build       Build backend TypeScript + frontend
+  frontend    Start frontend dev server only (Vite)
+  server      Start backend server only (no build)
+
+Environment variables:
+  JISHUSHELL_PORT   Server port (default: 8090)
+  JISHUSHELL_HOST   Server host (default: 0.0.0.0)
+
+Examples:
+  bash scripts/run.sh            # production-like start
+  bash scripts/run.sh dev        # full dev mode with hot reload
+  bash scripts/run.sh build      # compile everything
+EOF
+}
+
+# ─── Checks ───────────────────────────────────────────────────────────────────
+check_node() {
+    if ! command -v node &>/dev/null; then
+        error "Node.js is not installed or not in PATH"
+        exit 1
+    fi
+    local ver
+    ver="$(node --version 2>/dev/null | sed 's/^v//')"
+    local major="${ver%%.*}"
+    if [[ "$major" -lt 18 ]]; then
+        error "Node.js >= 18 required (found v${ver})"
+        exit 1
+    fi
+}
+
+# Kill any process occupying a given TCP port
+kill_port() {
+    local port="$1"
+    local pids
+    pids="$(lsof -ti tcp:"$port" 2>/dev/null || true)"
+    if [[ -n "$pids" ]]; then
+        warn "Port ${port} is in use (PID(s): ${pids}) — killing..."
+        echo "$pids" | xargs kill -TERM 2>/dev/null || true
+        local waited=0
+        while lsof -ti tcp:"$port" &>/dev/null 2>&1 && [[ $waited -lt 5 ]]; do
+            sleep 0.5
+            waited=$((waited + 1))
+        done
+        if lsof -ti tcp:"$port" &>/dev/null 2>&1; then
+            echo "$pids" | xargs kill -KILL 2>/dev/null || true
+        fi
+        success "Port ${port} freed"
+    fi
+}
+
+# ─── Nomad ────────────────────────────────────────────────────────────────────
+ensure_nomad() {
+    # 如果 Nomad 相关端口有任何进程，全部 kill（确保干净重启）
+    local nomad_ports_pids
+    nomad_ports_pids="$(sudo lsof -ti tcp:4646,4647,4648 2>/dev/null || lsof -ti tcp:4646,4647,4648 2>/dev/null || true)"
+    if [[ -n "$nomad_ports_pids" ]]; then
+        warn "Found existing Nomad process(es) — killing..."
+        echo "$nomad_ports_pids" | sort -u | xargs kill -TERM 2>/dev/null || true
+        local waited=0
+        while [[ $waited -lt 6 ]]; do
+            sleep 0.5
+            waited=$((waited + 1))
+            local remaining
+            remaining="$(sudo lsof -ti tcp:4646,4647,4648 2>/dev/null || lsof -ti tcp:4646,4647,4648 2>/dev/null || true)"
+            [[ -z "$remaining" ]] && break
+        done
+        # SIGKILL any stragglers
+        local remaining
+        remaining="$(sudo lsof -ti tcp:4646,4647,4648 2>/dev/null || lsof -ti tcp:4646,4647,4648 2>/dev/null || true)"
+        if [[ -n "$remaining" ]]; then
+            echo "$remaining" | sort -u | xargs kill -KILL 2>/dev/null || true
+            sleep 1
+        fi
+        success "Nomad ports 4646/4647/4648 freed"
+    fi
+
+    # 查找 nomad 二进制：优先用 jishushell 自带的
+    local nomad_bin="${HOME}/.jishushell/bin/nomad"
+    if [[ ! -x "$nomad_bin" ]]; then
+        nomad_bin="$(command -v nomad 2>/dev/null || true)"
+    fi
+    if [[ -z "$nomad_bin" ]]; then
+        warn "Nomad not found — skipping (instances will not start)"
+        return 0
+    fi
+
+    local config_path="${HOME}/.jishushell/nomad/nomad.hcl"
+    local log_path="${HOME}/.jishushell/nomad/nomad.log"
+    mkdir -p "${HOME}/.jishushell/nomad"
+
+    if [[ -f "$config_path" ]]; then
+        info "Starting Nomad agent (config: $config_path)..."
+        if [[ $EUID -eq 0 ]]; then
+            nohup "$nomad_bin" agent -config="$config_path" > "$log_path" 2>&1 &
+        elif sudo -n true 2>/dev/null; then
+            sudo nohup "$nomad_bin" agent -config="$config_path" > "$log_path" 2>&1 &
+        else
+            nohup "$nomad_bin" agent -config="$config_path" > "$log_path" 2>&1 &
+        fi
+    else
+        info "No nomad.hcl found — starting Nomad in dev mode..."
+        nohup "$nomad_bin" agent -dev -bind=127.0.0.1 > "$log_path" 2>&1 &
+    fi
+
+    # 等待 Nomad 就绪（最多 15 秒）
+    local tries=0
+    while ! lsof -ti tcp:4646 &>/dev/null && [[ $tries -lt 15 ]]; do
+        sleep 1
+        tries=$((tries + 1))
+    done
+
+    if lsof -ti tcp:4646 &>/dev/null; then
+        success "Nomad started on port 4646 (log: $log_path)"
+    else
+        warn "Nomad did not come up within 15s — check $log_path"
+    fi
+}
+
+check_deps() {
+    if [[ ! -d "$PROJECT_ROOT/node_modules" ]]; then
+        info "Backend dependencies not installed — running npm install..."
+        (cd "$PROJECT_ROOT" && npm install)
+    fi
+}
+
+check_frontend_deps() {
+    if [[ ! -d "$PROJECT_ROOT/frontend/node_modules" ]]; then
+        info "Frontend dependencies not installed — running npm install..."
+        (cd "$PROJECT_ROOT/frontend" && npm install)
+    fi
+}
+
+# ─── Build ────────────────────────────────────────────────────────────────────
+build_backend() {
+    info "Compiling TypeScript..."
+    (cd "$PROJECT_ROOT" && npm run build)
+    success "Backend compiled → dist/"
+}
+
+build_frontend() {
+    check_frontend_deps
+    info "Building frontend..."
+    (cd "$PROJECT_ROOT/frontend" && npm run build)
+    success "Frontend built → frontend/dist/"
+}
+
+needs_build() {
+    # Build if dist/ doesn't exist or any src/ file is newer than dist/server.js
+    if [[ ! -f "$PROJECT_ROOT/dist/server.js" ]]; then
+        return 0
+    fi
+    if find "$PROJECT_ROOT/src" -name "*.ts" -newer "$PROJECT_ROOT/dist/server.js" 2>/dev/null | grep -q .; then
+        return 0
+    fi
+    return 1
+}
+
+needs_frontend_build() {
+    [[ ! -f "$PROJECT_ROOT/frontend/dist/index.html" ]]
+}
+
+# ─── Modes ────────────────────────────────────────────────────────────────────
+mode_default() {
+    echo -e "\n${BOLD}${CYAN}JishuShell${NC} — starting server on port ${PORT}\n"
+
+    kill_port "$PORT"
+    check_deps
+
+    if needs_build; then
+        warn "dist/ is missing or outdated — building..."
+        build_backend
+    else
+        info "Backend already up to date (skip build)"
+    fi
+
+    if needs_frontend_build; then
+        warn "frontend/dist/ not found — building frontend..."
+        check_frontend_deps
+        build_frontend
+    else
+        info "Frontend already built (skip build)"
+    fi
+
+    success "Launching JishuShell on http://${HOST}:${PORT}"
+    exec node "$PROJECT_ROOT/dist/cli.js" --port "$PORT" --host "$HOST"
+}
+
+mode_dev() {
+    echo -e "\n${BOLD}${CYAN}JishuShell${NC} — development mode\n"
+
+    kill_port "$PORT"
+    kill_port 5173
+    check_deps
+    check_frontend_deps
+
+    # Start TSC in watch mode (background)
+    info "Starting TypeScript compiler in watch mode..."
+    (cd "$PROJECT_ROOT" && npm run dev) &
+    TSC_PID=$!
+
+    # Give tsc a moment to produce initial output
+    sleep 2
+
+    # Start Vite frontend dev server (background)
+    info "Starting Vite frontend dev server..."
+    (cd "$PROJECT_ROOT/frontend" && npm run dev) &
+    VITE_PID=$!
+
+    # Wait for initial build before starting server
+    local tries=0
+    while [[ ! -f "$PROJECT_ROOT/dist/server.js" && $tries -lt 15 ]]; do
+        sleep 1
+        tries=$((tries + 1))
+    done
+
+    if [[ ! -f "$PROJECT_ROOT/dist/server.js" ]]; then
+        error "TypeScript compile timed out — dist/server.js not found"
+        kill $TSC_PID $VITE_PID 2>/dev/null || true
+        exit 1
+    fi
+
+    # Start backend server (foreground, restart on crash)
+    info "Starting backend server on port ${PORT}..."
+    success "Backend:  http://${HOST}:${PORT}"
+    success "Frontend: http://localhost:5173 (Vite dev server)"
+    echo ""
+
+    # Trap Ctrl+C to kill child processes
+    trap 'echo ""; info "Shutting down..."; kill $TSC_PID $VITE_PID 2>/dev/null; exit 0' INT TERM
+
+    node "$PROJECT_ROOT/dist/cli.js" --port "$PORT" --host "$HOST"
+
+    # Cleanup on exit
+    kill $TSC_PID $VITE_PID 2>/dev/null || true
+}
+
+mode_build() {
+    echo -e "\n${BOLD}${CYAN}JishuShell${NC} — build\n"
+    check_deps
+    build_backend
+    build_frontend
+    success "Build complete"
+}
+
+mode_frontend() {
+    echo -e "\n${BOLD}${CYAN}JishuShell${NC} — frontend dev server\n"
+    check_frontend_deps
+    info "Starting Vite at http://localhost:5173 (proxy → http://localhost:${PORT})"
+    exec sh -c "cd \"$PROJECT_ROOT/frontend\" && npm run dev"
+}
+
+mode_server() {
+    echo -e "\n${BOLD}${CYAN}JishuShell${NC} — server only\n"
+    if [[ ! -f "$PROJECT_ROOT/dist/server.js" ]]; then
+        error "dist/server.js not found — run 'bash scripts/run.sh build' first"
+        exit 1
+    fi
+    kill_port "$PORT"
+    success "Launching on http://${HOST}:${PORT}"
+    exec node "$PROJECT_ROOT/dist/cli.js" --port "$PORT" --host "$HOST"
+}
+
+# ─── Entry point ──────────────────────────────────────────────────────────────
+check_node
+
+# Nomad 最先启动（build/frontend/help 模式不需要）
+case "$MODE" in
+    ""|dev|server) ensure_nomad ;;
+esac
+
+case "$MODE" in
+    ""           ) mode_default ;;
+    dev          ) mode_dev ;;
+    build        ) mode_build ;;
+    frontend     ) mode_frontend ;;
+    server       ) mode_server ;;
+    --help|-h    ) usage ;;
+    *            ) error "Unknown mode: $MODE"; echo ""; usage; exit 1 ;;
+esac

package/scripts/setup-pi.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+set -e
+
+# JishuShell - Raspberry Pi setup script
+# Usage: bash scripts/setup-pi.sh [--port PORT]
+
+INSTALL_DIR="${INSTALL_DIR:-$(cd "$(dirname "$0")/.." && pwd)}"
+SERVICE_PORT="${SERVICE_PORT:-8090}"
+
+# Parse optional --port arg
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --port) SERVICE_PORT="$2"; shift 2 ;;
+    *) shift ;;
+  esac
+done
+
+echo "=== JishuShell Setup ==="
+echo "Install dir: $INSTALL_DIR"
+
+cd "$INSTALL_DIR"
+
+# --- 1. Check / install Node.js >= 22 ---
+echo "[1/3] Checking Node.js..."
+NODE_OK=false
+if command -v node &>/dev/null; then
+    NODE_MAJOR=$(node -e "process.exit(parseInt(process.versions.node) >= 22 ? 0 : 1)" 2>/dev/null && echo ok || echo no)
+    [ "$NODE_MAJOR" = "ok" ] && NODE_OK=true
+fi
+
+if [ "$NODE_OK" = "false" ]; then
+    echo "  Installing Node.js 22 via NodeSource..."
+    curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - > /dev/null 2>&1
+    sudo apt-get install -y nodejs > /dev/null 2>&1
+fi
+echo "  Node.js: $(node --version)"
+
+# --- 2. npm ci (production deps only) ---
+echo "[2/3] Installing npm dependencies..."
+npm ci --omit=dev --silent 2>/dev/null || npm install --omit=dev --silent
+
+# --- 3. Register systemd service (best-effort) ---
+echo "[3/3] Registering jishushell as a systemd service..."
+NODE_BIN=$(which node)
+CLI_BIN="$INSTALL_DIR/dist/cli.js"
+CURRENT_USER=$(whoami)
+
+SERVICE_FILE="/tmp/jishushell.service"
+cat > "$SERVICE_FILE" << EOF
+[Unit]
+Description=JishuShell Panel
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=$CURRENT_USER
+WorkingDirectory=$INSTALL_DIR
+ExecStart=$NODE_BIN $CLI_BIN --port $SERVICE_PORT
+Restart=on-failure
+RestartSec=5
+Environment=NODE_ENV=production
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+if sudo cp "$SERVICE_FILE" /etc/systemd/system/jishushell.service 2>/dev/null; then
+    sudo systemctl daemon-reload
+    sudo systemctl enable jishushell
+    sudo systemctl restart jishushell
+    echo "  systemd service enabled (auto-start on boot)."
+else
+    echo "  (no sudo) Starting manually..."
+    nohup node "$CLI_BIN" --port "$SERVICE_PORT" > "$HOME/.jishushell/panel.log" 2>&1 &
+fi
+
+echo ""
+echo "=== Setup complete! ==="
+echo "JishuShell running on http://$(hostname -I | awk '{print $1}' 2>/dev/null || echo localhost):$SERVICE_PORT"

package/scripts/start-feishu1.js

@@ -0,0 +1,46 @@
+import { readFileSync } from 'fs';
+
+const m = JSON.parse(readFileSync('/home/pi/.jishushell/instances/feishu-1/instance.json', 'utf-8'));
+const r = m.runtime;
+
+// Get datacenter from Nomad nodes API
+const nodesResp = await fetch('http://127.0.0.1:4646/v1/nodes');
+const nodes = await nodesResp.json();
+const datacenter = nodes?.[0]?.Datacenter || 'jishushell-raspberrypi';
+console.error('Using datacenter:', datacenter);
+
+const job = {
+  Job: {
+    ID: 'openclaw-feishu-1',
+    Name: 'openclaw-feishu-1',
+    Type: 'service',
+    Datacenters: [datacenter],
+    TaskGroups: [{
+      Name: 'openclaw',
+      Count: 1,
+      RestartPolicy: { Attempts: 3, Interval: 300000000000, Delay: 15000000000, Mode: 'delay' },
+      Tasks: [{
+        Name: 'openclaw',
+        Driver: 'raw_exec',
+        Config: { command: r.command, args: r.args },
+        Env: {
+          HOME: '/home/pi',
+          TMPDIR: '/tmp',
+          PATH: '/home/pi/.local/bin:/home/pi/.npm-global/bin:/usr/local/bin:/usr/bin:/bin',
+          ...r.env,
+          OPENCLAW_HOME: m.openclaw_home,
+          OPENCLAW_INSTANCE_ID: m.id,
+        },
+        Resources: { CPU: 1000, MemoryMB: 3072 },
+      }],
+    }],
+  },
+};
+
+const resp = await fetch('http://127.0.0.1:4646/v1/jobs', {
+  method: 'POST',
+  headers: { 'Content-Type': 'application/json' },
+  body: JSON.stringify(job),
+});
+const result = await resp.json();
+console.log(JSON.stringify(result, null, 2));