jishushell 0.4.24 → 0.5.15

package/scripts/perf/proxy.js

@@ -0,0 +1,96 @@
+import http from "k6/http";
+import { check, group, sleep } from "k6";
+import {
+  BASE_URL,
+  PASSWORD,
+  DEFAULT_THRESHOLDS,
+  DEFAULT_STAGES,
+  SMOKE_STAGES,
+  bearerHeaders,
+} from "./config.js";
+
+const isSmoke = __ENV.SMOKE === "true";
+
+export const options = {
+  stages: isSmoke ? SMOKE_STAGES : DEFAULT_STAGES,
+  thresholds: {
+    ...DEFAULT_THRESHOLDS,
+    "http_req_duration{name:list_models}": ["p(95)<300"],
+  },
+  tags: { suite: "proxy" },
+};
+
+/**
+ * Setup: obtain auth token for proxy requests.
+ */
+export function setup() {
+  const statusRes = http.get(`${BASE_URL}/api/auth/status`);
+  const initialized = statusRes.json("initialized");
+
+  let token;
+  if (!initialized) {
+    const initRes = http.post(
+      `${BASE_URL}/api/auth/init`,
+      JSON.stringify({ password: PASSWORD }),
+      { headers: { "Content-Type": "application/json" } },
+    );
+    token = initRes.json("token");
+  } else {
+    const loginRes = http.post(
+      `${BASE_URL}/api/auth/login`,
+      JSON.stringify({ password: PASSWORD }),
+      { headers: { "Content-Type": "application/json" } },
+    );
+    token = loginRes.json("token");
+  }
+
+  if (!token) {
+    throw new Error("Failed to obtain auth token during setup");
+  }
+  return { token };
+}
+
+export default function (data) {
+  const headers = bearerHeaders(data.token);
+
+  group("list-models", () => {
+    const res = http.get(`${BASE_URL}/proxy/v1/models`, {
+      headers,
+      tags: { name: "list_models" },
+    });
+    check(res, {
+      "models 200": (r) => r.status === 200,
+      "has data array": (r) => {
+        try {
+          return Array.isArray(r.json("data"));
+        } catch {
+          return false;
+        }
+      },
+    });
+  });
+
+  sleep(0.5);
+
+  group("list-providers", () => {
+    const res = http.get(`${BASE_URL}/api/llm/providers`, {
+      headers: {
+        "Content-Type": "application/json",
+        Cookie: `jishushell_session=${data.token}`,
+      },
+      tags: { name: "list_providers" },
+    });
+    check(res, {
+      "providers 200": (r) => r.status === 200,
+      "returns array": (r) => {
+        try {
+          return Array.isArray(r.json());
+        } catch {
+          return false;
+        }
+      },
+    });
+  });
+
+  sleep(1);
+}

package/scripts/run.sh

@@ -81,7 +81,7 @@ kill_port() {
 
 # ─── Nomad ────────────────────────────────────────────────────────────────────
 ensure_nomad() {
-    # 如果 Nomad 相关端口有任何进程，全部 kill（确保干净重启）
+    # If anything is holding Nomad-related ports, kill it all to guarantee a clean restart.
     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
@@ -105,7 +105,7 @@ ensure_nomad() {
         success "Nomad ports 4646/4647/4648 freed"
     fi
 
-    # 查找 nomad 二进制：优先用 jishushell 自带的
+    # Locate the nomad binary; prefer the one bundled with jishushell.
     local nomad_bin="${HOME}/.jishushell/bin/nomad"
     if [[ ! -x "$nomad_bin" ]]; then
         nomad_bin="$(command -v nomad 2>/dev/null || true)"
@@ -133,7 +133,7 @@ ensure_nomad() {
         nohup "$nomad_bin" agent -dev -bind=127.0.0.1 > "$log_path" 2>&1 &
     fi
 
-    # 等待 Nomad 就绪（最多 15 秒）
+    # Wait for Nomad to become ready (up to 15 seconds).
     local tries=0
     while ! lsof -ti tcp:4646 &>/dev/null && [[ $tries -lt 15 ]]; do
         sleep 1
@@ -294,7 +294,7 @@ mode_server() {
 # ─── Entry point ──────────────────────────────────────────────────────────────
 check_node
 
-# Nomad 最先启动（build/frontend/help 模式不需要）
+# Start Nomad first (not required in build/frontend/help modes).
 case "$MODE" in
     ""|dev|server) ensure_nomad ;;
 esac

package/scripts/smoke/files-w1.sh

@@ -0,0 +1,142 @@
+#!/bin/bash
+#
+# End-to-end smoke for Files M1 W1 (PR-4).
+#
+# Drives the eight /api/files endpoints against a running jishushell panel:
+#   1. GET  /api/files                  (list root)
+#   2. PUT  /api/files?path=...         (upload, octet-stream)
+#   3. GET  /api/files?path=...         (list subdirectory)
+#   4. POST /api/files/mkdir            (create directory)
+#   5. POST /api/files/move             (move/rename)
+#   6. GET  /api/files/raw?path=...     (stream download, sha verified)
+#   7. GET  /api/files/preview?path=... (text preview, truncation)
+#   8. GET  /api/files/quota            (quota info)
+#   9. DELETE /api/files?path=...       (soft-delete)
+#  10. PUT with Content-Type: text/plain → expect 415
+#  11. PUT with path traversal           → expect 400
+#
+# Usage:
+#   # Either provide a token directly:
+#   JISHUSHELL_URL=http://pi2:8090 JISHUSHELL_TOKEN=... ./scripts/smoke/files-w1.sh
+#   # Or let the script log in for you:
+#   JISHUSHELL_URL=http://pi2:8090 JISHUSHELL_PASSWORD=... ./scripts/smoke/files-w1.sh
+#
+# Per docs/feedback_validate_before_commit.md, this script MUST run on a real
+# Pi2 box before the Files W1 work is considered complete.
+
+set -eo pipefail
+
+PANEL_URL="${JISHUSHELL_URL:-http://127.0.0.1:8090}"
+AUTH_TOKEN="${JISHUSHELL_TOKEN:-}"
+PANEL_PASSWORD="${JISHUSHELL_PASSWORD:-}"
+PREFIX="${PREFIX:-smoke-w1}"
+
+if [[ -z "$AUTH_TOKEN" && -z "$PANEL_PASSWORD" ]]; then
+  echo "ERROR: set JISHUSHELL_TOKEN or JISHUSHELL_PASSWORD env var" >&2
+  exit 1
+fi
+
+if [[ -z "$AUTH_TOKEN" ]]; then
+  echo "[auth] logging in as admin"
+  AUTH_TOKEN=$(curl -sS -X POST -H "Content-Type: application/json" \
+    -d "{\"password\":\"$PANEL_PASSWORD\"}" \
+    "$PANEL_URL/api/auth/login" | sed -n 's/.*"token":"\([^"]*\)".*/\1/p')
+  if [[ -z "$AUTH_TOKEN" ]]; then
+    echo "ERROR: login failed" >&2
+    exit 1
+  fi
+  echo "  ok: got JWT (${#AUTH_TOKEN} chars)"
+fi
+
+H_AUTH=(-H "Authorization: Bearer $AUTH_TOKEN")
+fail() { echo "FAIL: $*" >&2; exit 1; }
+pass() { echo "  ok: $*"; }
+
+# Cleanup any leftovers from a previous run (best-effort)
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX/x.txt" "${H_AUTH[@]}" >/dev/null || true
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX/y.txt" "${H_AUTH[@]}" >/dev/null || true
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX/sub" "${H_AUTH[@]}" >/dev/null || true
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX" "${H_AUTH[@]}" >/dev/null || true
+
+echo "[1/11] List root"
+RESP=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files")
+echo "$RESP" | grep -q '"entries"' || fail "list root missing entries: $RESP"
+pass "list root ok"
+
+echo "[2/11] mkdir $PREFIX"
+RESP=$(curl -sS -X POST "${H_AUTH[@]}" -H "Content-Type: application/json" \
+  -d "{\"path\":\"$PREFIX\"}" "$PANEL_URL/api/files/mkdir")
+echo "$RESP" | grep -q "\"$PREFIX\"" || fail "mkdir failed: $RESP"
+pass "mkdir $PREFIX"
+
+echo "[3/11] PUT octet-stream upload"
+echo -n "hello smoke" > /tmp/files-smoke-w1.bin
+RESP=$(curl -sS -X PUT "${H_AUTH[@]}" \
+  -H "Content-Type: application/octet-stream" \
+  --data-binary @/tmp/files-smoke-w1.bin \
+  "$PANEL_URL/api/files?path=$PREFIX/x.txt")
+echo "$RESP" | grep -q '"size":11' || fail "upload size wrong: $RESP"
+ETAG=$(echo "$RESP" | sed -n 's/.*"etag":"\([^"]*\)".*/\1/p')
+[[ -n "$ETAG" ]] || fail "upload returned no etag: $RESP"
+pass "uploaded $PREFIX/x.txt (etag=$ETAG)"
+
+echo "[4/11] PUT with wrong Content-Type expects 415"
+CODE=$(curl -sS -o /dev/null -w "%{http_code}" -X PUT "${H_AUTH[@]}" \
+  -H "Content-Type: text/plain" --data "x" \
+  "$PANEL_URL/api/files?path=$PREFIX/y.txt")
+[[ "$CODE" == "415" ]] || fail "expected 415, got $CODE"
+pass "wrong content-type → 415"
+
+echo "[5/11] PUT path traversal expects 400"
+CODE=$(curl -sS -o /dev/null -w "%{http_code}" -X PUT "${H_AUTH[@]}" \
+  -H "Content-Type: application/octet-stream" --data "x" \
+  "$PANEL_URL/api/files?path=../../../etc/passwd")
+[[ "$CODE" == "400" ]] || fail "expected 400, got $CODE"
+pass "path traversal → 400"
+
+echo "[6/11] List $PREFIX"
+RESP=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files?path=$PREFIX")
+echo "$RESP" | grep -q '"x.txt"' || fail "missing x.txt in list: $RESP"
+pass "subdirectory listing ok"
+
+echo "[7/11] Move x.txt → sub/x.txt"
+curl -sS -X POST "${H_AUTH[@]}" -H "Content-Type: application/json" \
+  -d "{\"path\":\"$PREFIX/sub\"}" "$PANEL_URL/api/files/mkdir" >/dev/null
+RESP=$(curl -sS -X POST "${H_AUTH[@]}" -H "Content-Type: application/json" \
+  -d "{\"from\":\"$PREFIX/x.txt\",\"to\":\"$PREFIX/sub/x.txt\"}" \
+  "$PANEL_URL/api/files/move")
+echo "$RESP" | grep -q '"to":' || fail "move response missing 'to': $RESP"
+pass "move ok"
+
+echo "[8/11] GET /raw streams content"
+GOT=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files/raw?path=$PREFIX/sub/x.txt")
+[[ "$GOT" == "hello smoke" ]] || fail "raw content mismatch: '$GOT'"
+pass "raw download verified"
+
+echo "[9/11] GET /preview truncates"
+RESP=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files/preview?path=$PREFIX/sub/x.txt&max_kb=1")
+echo "$RESP" | grep -q '"truncated":false' || fail "preview missing truncated:false: $RESP"
+echo "$RESP" | grep -q '"content":"hello smoke"' || fail "preview content mismatch: $RESP"
+pass "preview ok"
+
+echo "[10/11] GET /quota"
+RESP=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files/quota")
+echo "$RESP" | grep -q '"quota_mb"' || fail "quota response missing quota_mb: $RESP"
+pass "quota ok"
+
+echo "[11/11] DELETE soft-deletes to .trash/"
+CODE=$(curl -sS -o /dev/null -w "%{http_code}" -X DELETE "${H_AUTH[@]}" \
+  "$PANEL_URL/api/files?path=$PREFIX/sub/x.txt")
+[[ "$CODE" == "204" ]] || fail "expected 204, got $CODE"
+# Confirm by listing — file should be gone from sub/
+RESP=$(curl -sS "${H_AUTH[@]}" "$PANEL_URL/api/files?path=$PREFIX/sub")
+echo "$RESP" | grep -q '"x.txt"' && fail "x.txt still in sub/ after delete"
+pass "soft-delete ok"
+
+# Final cleanup
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX/sub" "${H_AUTH[@]}" >/dev/null || true
+curl -s -X DELETE "$PANEL_URL/api/files?path=$PREFIX" "${H_AUTH[@]}" >/dev/null || true
+rm -f /tmp/files-smoke-w1.bin
+
+echo ""
+echo "✓ All 11 smoke checks passed against $PANEL_URL"

package/scripts/smoke-backend.mjs

@@ -0,0 +1,122 @@
+#!/usr/bin/env node
+/**
+ * CI smoke test: compile backend → spawn server → verify /api/auth/status → exit.
+ *
+ * Uses the same stdout-parsing approach as tests/e2e-real/helpers/server-manager.ts
+ * to discover the OS-assigned port.
+ *
+ * Exit codes:
+ *   0 — smoke test passed
+ *   1 — smoke test failed (server did not start or health check failed)
+ */
+
+import { spawn } from "child_process";
+import { mkdtempSync, rmSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+import { setTimeout as delay } from "timers/promises";
+
+const STARTUP_TIMEOUT_MS = 15_000;
+const HEALTH_POLL_INTERVAL_MS = 200;
+const HEALTH_POLL_ATTEMPTS = 25;
+
+const testHome = mkdtempSync(join(tmpdir(), "jishushell-smoke-"));
+let serverProcess = null;
+
+let cleaning = false;
+
+async function cleanup(exitCode) {
+  if (cleaning) return;
+  cleaning = true;
+  if (serverProcess && !serverProcess.killed) {
+    serverProcess.kill("SIGTERM");
+    await delay(500);
+    if (!serverProcess.killed) {
+      try { serverProcess.kill("SIGKILL"); } catch { /* already dead */ }
+    }
+  }
+  try { rmSync(testHome, { recursive: true, force: true }); } catch { /* noop */ }
+  process.exit(exitCode);
+}
+
+process.on("SIGINT", () => cleanup(1));
+process.on("SIGTERM", () => cleanup(1));
+process.on("unhandledRejection", (err) => {
+  console.error("[smoke] unhandled rejection:", err);
+  cleanup(1);
+});
+
+async function main() {
+  const cliPath = join(process.cwd(), "dist", "cli.js");
+
+  console.log(`[smoke] JISHUSHELL_HOME = ${testHome}`);
+  console.log(`[smoke] Starting server: node ${cliPath} serve --port 0 --host 127.0.0.1`);
+
+  serverProcess = spawn("node", [cliPath, "serve", "--port", "0", "--host", "127.0.0.1"], {
+    env: {
+      ...process.env,
+      JISHUSHELL_HOME: testHome,
+      JISHUSHELL_JWT_SECRET: "ci-smoke-test-jwt-secret-that-is-at-least-32-chars",
+      NODE_ENV: "test",
+    },
+    stdio: ["ignore", "pipe", "pipe"],
+  });
+
+  // Discover assigned port from stdout/stderr
+  const port = await new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error("Server did not start within 15 seconds")), STARTUP_TIMEOUT_MS);
+    let output = "";
+
+    const onData = (chunk) => {
+      output += chunk.toString();
+      const match = output.match(/listening at http:\/\/127\.0\.0\.1:(\d+)/);
+      if (match) {
+        clearTimeout(timer);
+        resolve(parseInt(match[1], 10));
+      }
+    };
+
+    serverProcess.stdout.on("data", onData);
+    serverProcess.stderr.on("data", onData);
+    serverProcess.on("exit", (code) => {
+      clearTimeout(timer);
+      reject(new Error(`Server exited with code ${code} before becoming ready.\nOutput:\n${output}`));
+    });
+  });
+
+  console.log(`[smoke] Server listening on port ${port}`);
+
+  // Poll /api/auth/status
+  let lastStatus = 0;
+  for (let i = 0; i < HEALTH_POLL_ATTEMPTS; i++) {
+    try {
+      const resp = await fetch(`http://127.0.0.1:${port}/api/auth/status`, {
+        signal: AbortSignal.timeout(2000),
+      });
+      lastStatus = resp.status;
+      if (resp.ok) {
+        console.log(`[smoke] PASSED: /api/auth/status returned ${resp.status}`);
+        await cleanup(0);
+        return;
+      }
+    } catch {
+      // Server may not be fully ready yet
+    }
+
+    if (serverProcess.exitCode !== null) {
+      console.error(`[smoke] FAILED: Server exited unexpectedly with code ${serverProcess.exitCode}`);
+      await cleanup(1);
+      return;
+    }
+
+    await delay(HEALTH_POLL_INTERVAL_MS);
+  }
+
+  console.error(`[smoke] FAILED: /api/auth/status returned ${lastStatus} after ${HEALTH_POLL_ATTEMPTS} attempts`);
+  await cleanup(1);
+}
+
+main().catch(async (err) => {
+  console.error(`[smoke] FAILED: ${err.message}`);
+  await cleanup(1);
+});