@actiondock/core 2.7.0 → 2.9.0

package/dist/server/routes/runs.js

@@ -1,13 +1,12 @@
-import { filterByIntent } from "../../filter/index.js";
-import { EXECUTION_FAILED } from "../../errors.js";
+import { ACTION_FORBIDDEN, CAPABILITY_UNAVAILABLE, EVENT_BACKPRESSURE_LIMIT, EVENT_CURSOR_EXPIRED, EXECUTION_FAILED, PACKAGE_FORBIDDEN, RUN_ALREADY_FINISHED, RUN_INTERRUPTED, RUN_NOT_FOUND, RUNS_CLEAR_ERROR, RUNS_LIST_ERROR, } from "../../errors.js";
 import { isTerminalRunStatus } from "../../storage/types.js";
 import { readJsonBody } from "../body.js";
-import { getSubPath, jsonResponse } from "./common.js";
+import { getSubPath, isActionAllowedByPolicy, isPackageAllowedByPolicy, jsonResponse } from "./common.js";
 /**
  * 处理历史运行记录查询、清理、详情及 SSE 流式日志接口。
  */
 export async function handleRunsRoutes(ctx) {
-    const { req, url, pathname, corsHeaders, options, target, host } = ctx;
+    const { req, url, pathname, corsHeaders, options, service, activePolicy: policy } = ctx;
     const subpath = getSubPath(pathname);
     // 1. Runs List: GET /api/v2/runs, GET /runs
     if (subpath === "/runs" && req.method === "GET") {
@@ -16,69 +15,47 @@ export async function handleRunsRoutes(ctx) {
             const actionId = url.searchParams.get("actionId") || undefined;
             const packageId = url.searchParams.get("packageId") || undefined;
             const intent = url.searchParams.get("intent") || undefined;
-            const limit = parseInt(url.searchParams.get("limit") || "50", 10);
-            if (packageId &&
-                options.packageAllowlist &&
-                options.packageAllowlist.length > 0 &&
-                !options.packageAllowlist.includes(packageId)) {
+            // limit 边界防护：非法或超界值回退默认 50，并夹紧到 1 至 500 区间
+            const parsedLimit = parseInt(url.searchParams.get("limit") || "50", 10);
+            const limit = Number.isFinite(parsedLimit) && parsedLimit > 0
+                ? Math.min(parsedLimit, 500)
+                : 50;
+            if (packageId && !isPackageAllowedByPolicy(packageId, policy)) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_FORBIDDEN",
+                        code: PACKAGE_FORBIDDEN,
                         message: `Package '${packageId}' is not in the allowed package list`,
                     },
                 }, 403, corsHeaders);
             }
-            const allRuns = [];
-            const seenRunIds = new Set();
-            const apps = host
-                ? host.listApps()
-                : (() => {
-                    const inner = target?.unwrap?.();
-                    return inner && "listApps" in inner ? inner.listApps() : [inner].filter(Boolean);
-                })();
-            for (const app of apps) {
-                if (!app)
-                    continue;
-                if (packageId && app.packageId !== packageId)
-                    continue;
-                if (options.packageAllowlist && options.packageAllowlist.length > 0) {
-                    if (!options.packageAllowlist.includes(app.packageId)) {
-                        continue;
-                    }
-                }
-                if (app.storage && typeof app.storage.listRuns === "function") {
-                    try {
-                        // 状态过滤下推到存储层 SQL，避免先分页后过滤导致某包前 N 条非目标状态时贡献 0 条
-                        const records = app.storage.listRuns({ actionId, status, limit });
-                        for (const r of records) {
-                            if (!seenRunIds.has(r.id)) {
-                                seenRunIds.add(r.id);
-                                if (options.packageAllowlist &&
-                                    options.packageAllowlist.length > 0 &&
-                                    r.packageId &&
-                                    !options.packageAllowlist.includes(r.packageId)) {
-                                    continue;
-                                }
-                                allRuns.push(r);
-                            }
-                        }
-                    }
-                    catch (err) {
-                        // 单包查询失败不阻断整体列表响应，但必须可观测
-                        console.warn(`[actiondock] listRuns failed for package '${app.packageId}': ${err instanceof Error ? err.message : String(err)}`);
-                    }
-                }
+            if (actionId && !isActionAllowedByPolicy({ packageId, actionId }, policy)) {
+                return jsonResponse({
+                    ok: false,
+                    error: {
+                        code: ACTION_FORBIDDEN,
+                        message: `Action '${packageId ? `${packageId}/${actionId}` : actionId}' is not in the allowed action list`,
+                    },
+                }, 403, corsHeaders);
             }
-            allRuns.sort((a, b) => (b.startedAt || "").localeCompare(a.startedAt || ""));
-            const filtered = intent
-                ? filterByIntent(allRuns, intent, [(r) => r.id, (r) => r.actionId, (r) => r.status, (r) => r.packageId], false)
-                : allRuns;
-            const sliced = filtered.slice(0, limit);
-            return jsonResponse({ ok: true, total: filtered.length, items: sliced }, 200, corsHeaders);
+            let allRuns = await service.runs.list({
+                actionId,
+                status,
+                packageId,
+                intent,
+                limit,
+            });
+            if (policy.packageAllowlist && policy.packageAllowlist.length > 0) {
+                allRuns = allRuns.filter((r) => isPackageAllowedByPolicy(r.packageId, policy));
+            }
+            if (policy.actionAllowlist && policy.actionAllowlist.length > 0) {
+                allRuns = allRuns.filter((r) => isActionAllowedByPolicy({ packageId: r.packageId, actionId: r.actionId }, policy));
+            }
+            const sliced = allRuns.slice(0, limit);
+            return jsonResponse({ ok: true, total: allRuns.length, items: sliced }, 200, corsHeaders);
         }
         catch (err) {
-            return jsonResponse({ ok: false, error: { code: "RUNS_LIST_ERROR", message: err.message } }, 500, corsHeaders);
+            return jsonResponse({ ok: false, error: { code: RUNS_LIST_ERROR, message: err.message } }, 500, corsHeaders);
         }
     }
     // 2. Runs Clear: POST /api/v2/runs/clear, DELETE /api/v2/runs, etc.
@@ -92,61 +69,48 @@ export async function handleRunsRoutes(ctx) {
             const packageId = url.searchParams.get("packageId") || body.packageId || undefined;
             const actionId = url.searchParams.get("actionId") || body.actionId || undefined;
             const status = url.searchParams.get("status") || body.status || undefined;
-            if (packageId &&
-                options.packageAllowlist &&
-                options.packageAllowlist.length > 0 &&
-                !options.packageAllowlist.includes(packageId)) {
+            if (packageId && !isPackageAllowedByPolicy(packageId, policy)) {
                 return jsonResponse({
                     ok: false,
                     error: {
-                        code: "PACKAGE_FORBIDDEN",
+                        code: PACKAGE_FORBIDDEN,
                         message: `Package '${packageId}' is not in the allowed package list`,
                     },
                 }, 403, corsHeaders);
             }
             let clearedCount = 0;
-            const apps = host
-                ? host.listApps()
-                : (() => {
-                    const inner = target?.unwrap?.();
-                    return inner && "listApps" in inner ? inner.listApps() : [inner].filter(Boolean);
-                })();
-            for (const app of apps) {
-                if (!app)
-                    continue;
-                if (packageId && app.packageId !== packageId)
-                    continue;
-                if (options.packageAllowlist && options.packageAllowlist.length > 0) {
-                    if (!options.packageAllowlist.includes(app.packageId)) {
-                        continue;
-                    }
-                }
-                if (app.storage && typeof app.storage.clearRuns === "function") {
-                    clearedCount += app.storage.clearRuns({ actionId, status });
-                }
+            if (service.runs.clear) {
+                clearedCount = await service.runs.clear({ packageId, actionId, status });
             }
             return jsonResponse({ ok: true, clearedCount }, 200, corsHeaders);
         }
         catch (err) {
-            return jsonResponse({ ok: false, error: { code: "RUNS_CLEAR_ERROR", message: err.message } }, 500, corsHeaders);
+            return jsonResponse({ ok: false, error: { code: RUNS_CLEAR_ERROR, message: err.message } }, 500, corsHeaders);
         }
     }
     // 3. Run Events SSE: GET /api/v2/runs/:runId/events (and stream alias)
     const runEventsMatch = subpath.match(/^\/runs\/([^/]+)\/(events|stream)$/);
     if (runEventsMatch && req.method === "GET") {
         const runId = decodeURIComponent(runEventsMatch[1]);
-        const run = await target.getRun(runId);
+        const run = await service.runs.get(runId);
         if (!run) {
-            return jsonResponse({ ok: false, error: { code: "RUN_NOT_FOUND", message: `Run '${runId}' not found` } }, 404, corsHeaders);
+            return jsonResponse({ ok: false, error: { code: RUN_NOT_FOUND, message: `Run '${runId}' not found` } }, 404, corsHeaders);
+        }
+        if (!isPackageAllowedByPolicy(run.packageId, policy)) {
+            return jsonResponse({
+                ok: false,
+                error: {
+                    code: PACKAGE_FORBIDDEN,
+                    message: `Package '${run.packageId || "unknown"}' is not in the allowed package list`,
+                },
+            }, 403, corsHeaders);
         }
-        if (options.packageAllowlist &&
-            options.packageAllowlist.length > 0 &&
-            (!run.packageId || !options.packageAllowlist.includes(run.packageId))) {
+        if (!isActionAllowedByPolicy({ packageId: run.packageId, actionId: run.actionId }, policy)) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "PACKAGE_FORBIDDEN",
-                    message: `Package '${run.packageId}' is not in the allowed package list`,
+                    code: ACTION_FORBIDDEN,
+                    message: `Action '${run.packageId ? `${run.packageId}/${run.actionId}` : run.actionId}' is not in the allowed action list`,
                 },
             }, 403, corsHeaders);
         }
@@ -165,44 +129,62 @@ export async function handleRunsRoutes(ctx) {
                 afterCursor = trimmed;
             }
         }
-        const eventStream = target.events(runId, { after: afterCursor, signal: req.signal });
+        if (!service.events) {
+            return jsonResponse({
+                ok: false,
+                error: {
+                    code: CAPABILITY_UNAVAILABLE,
+                    message: "EventsPort is not supported by this ActionDock service",
+                },
+            }, 501);
+        }
+        const eventStream = service.events.events(runId, { after: afterCursor, signal: req.signal });
         const iterator = eventStream[Symbol.asyncIterator]();
-        // 检查游标是否在建流前已过期：拉取首个事件，若抛出 EVENT_CURSOR_EXPIRED 直接返回 410
+        const encoder = new TextEncoder();
+        const encodeEvent = (evt) => {
+            const eventType = evt.type || "message";
+            const idField = evt.eventId ? `id: ${evt.eventId}\n` : `id: ${evt.sequence}\n`;
+            return encoder.encode(`${idField}event: ${eventType}\ndata: ${JSON.stringify(evt)}\n\n`);
+        };
+        // 游标过期检测：仅等待首事件一小段时间（过期错误通常在拉取瞬间抛出）；
+        // 超时后立即开流，保证响应头及时下发，不再等首事件到达
+        const CURSOR_PROBE_MS = 250;
         let firstResult;
+        let cursorExpired = null;
+        const firstPull = iterator.next();
         try {
-            firstResult = await iterator.next();
+            firstResult = await Promise.race([
+                firstPull,
+                new Promise((resolve) => setTimeout(() => resolve(undefined), CURSOR_PROBE_MS)),
+            ]);
         }
         catch (err) {
-            if (err?.code === "EVENT_CURSOR_EXPIRED") {
-                return jsonResponse({
-                    ok: false,
-                    error: {
-                        code: "EVENT_CURSOR_EXPIRED",
-                        message: err.message || "Event cursor has expired",
-                        details: err.details,
-                    },
-                }, 410, corsHeaders);
-            }
-            throw err;
+            cursorExpired = err;
+        }
+        if (cursorExpired?.code === EVENT_CURSOR_EXPIRED) {
+            return jsonResponse({
+                ok: false,
+                error: {
+                    code: EVENT_CURSOR_EXPIRED,
+                    message: cursorExpired.message || "Event cursor has expired",
+                    details: cursorExpired.details,
+                },
+            }, 410, corsHeaders);
         }
         const stream = new ReadableStream({
             async start(controller) {
-                const encoder = new TextEncoder();
                 let sawFinish = false;
-                let eventsCount = 0;
                 try {
-                    // 先消费首个事件结果
-                    if (!firstResult.done) {
-                        eventsCount++;
-                        const evt = firstResult.value;
+                    // 先消费首个事件结果（探测期内未完成则继续等待）
+                    const first = firstResult ?? (await firstPull);
+                    if (!first.done) {
+                        const evt = first.value;
                         if (evt.type === "finish") {
                             sawFinish = true;
                         }
-                        const eventType = evt.type || "message";
-                        const idField = evt.eventId ? `id: ${evt.eventId}\n` : `id: ${evt.sequence}\n`;
-                        controller.enqueue(encoder.encode(`${idField}event: ${eventType}\ndata: ${JSON.stringify(evt)}\n\n`));
+                        controller.enqueue(encodeEvent(evt));
                         // 若首条事件为背压终止事件，立即关闭通道
-                        if (evt.type === "error" && evt.error?.code === "EVENT_BACKPRESSURE_LIMIT") {
+                        if (evt.type === "error" && evt.error?.code === EVENT_BACKPRESSURE_LIMIT) {
                             controller.close();
                             return;
                         }
@@ -212,16 +194,13 @@ export async function handleRunsRoutes(ctx) {
                         const nextResult = await iterator.next();
                         if (nextResult.done)
                             break;
-                        eventsCount++;
                         const evt = nextResult.value;
                         if (evt.type === "finish") {
                             sawFinish = true;
                         }
-                        const eventType = evt.type || "message";
-                        const idField = evt.eventId ? `id: ${evt.eventId}\n` : `id: ${evt.sequence}\n`;
-                        controller.enqueue(encoder.encode(`${idField}event: ${eventType}\ndata: ${JSON.stringify(evt)}\n\n`));
+                        controller.enqueue(encodeEvent(evt));
                         // 若收到背压截断终止事件，正常关闭流通道
-                        if (evt.type === "error" && evt.error?.code === "EVENT_BACKPRESSURE_LIMIT") {
+                        if (evt.type === "error" && evt.error?.code === EVENT_BACKPRESSURE_LIMIT) {
                             break;
                         }
                     }
@@ -236,7 +215,7 @@ export async function handleRunsRoutes(ctx) {
                                     ok: false,
                                     runId,
                                     error: run.error || {
-                                        code: run.status === "interrupted" ? "RUN_INTERRUPTED" : EXECUTION_FAILED,
+                                        code: run.status === "interrupted" ? RUN_INTERRUPTED : EXECUTION_FAILED,
                                         message: `Run finished with status ${run.status}`,
                                     },
                                 },
@@ -244,8 +223,11 @@ export async function handleRunsRoutes(ctx) {
                         controller.enqueue(encoder.encode(`event: finish\ndata: ${JSON.stringify(finishEvt)}\n\n`));
                     }
                 }
-                catch {
-                    // 忽略中断
+                catch (err) {
+                    // 流中断不静默：保留诊断线索（客户端断连属正常路径，仅记录非预期异常）
+                    if (!(err instanceof Error) || err.name !== "AbortError") {
+                        console.warn(`[RunsRoute] SSE stream for run '${runId}' interrupted: ${err instanceof Error ? err.message : String(err)}`);
+                    }
                 }
                 finally {
                     try {
@@ -254,7 +236,16 @@ export async function handleRunsRoutes(ctx) {
                     catch { }
                 }
             },
-            cancel() { },
+            cancel() {
+                // 客户端断开时释放底层事件迭代器，避免资源悬挂
+                try {
+                    const ret = iterator.return?.();
+                    if (ret && typeof ret.catch === "function") {
+                        ret.catch(() => { });
+                    }
+                }
+                catch { }
+            },
         });
         return new Response(stream, {
             status: 200,
@@ -270,43 +261,62 @@ export async function handleRunsRoutes(ctx) {
     const runShowMatch = subpath.match(/^\/runs\/([^/]+)$/);
     if (runShowMatch && req.method === "GET") {
         const runId = decodeURIComponent(runShowMatch[1]);
-        const run = await target.getRun(runId);
+        const run = await service.runs.get(runId);
         if (!run) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "RUN_NOT_FOUND",
+                    code: RUN_NOT_FOUND,
                     message: `Run '${runId}' not found`,
                 },
             }, 404, corsHeaders);
         }
-        if (options.packageAllowlist &&
-            options.packageAllowlist.length > 0 &&
-            (!run.packageId || !options.packageAllowlist.includes(run.packageId))) {
+        if (!isPackageAllowedByPolicy(run.packageId, policy)) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "PACKAGE_FORBIDDEN",
+                    code: PACKAGE_FORBIDDEN,
                     message: `Package '${run.packageId || "unknown"}' is not in the allowed package list`,
                 },
             }, 403, corsHeaders);
         }
+        if (!isActionAllowedByPolicy({ packageId: run.packageId, actionId: run.actionId }, policy)) {
+            return jsonResponse({
+                ok: false,
+                error: {
+                    code: ACTION_FORBIDDEN,
+                    message: `Action '${run.packageId ? `${run.packageId}/${run.actionId}` : run.actionId}' is not in the allowed action list`,
+                },
+            }, 403, corsHeaders);
+        }
         return jsonResponse(run, 200, corsHeaders);
     }
     // 5. Run Cancel: POST /api/v2/runs/:runId/cancel, POST /runs/:runId/cancel
     const runCancelMatch = subpath.match(/^\/runs\/([^/]+)\/cancel$/);
     if (runCancelMatch && req.method === "POST") {
         const runId = decodeURIComponent(runCancelMatch[1]);
-        if (options.packageAllowlist && options.packageAllowlist.length > 0) {
-            const run = await target.getRun(runId);
-            if (run && (!run.packageId || !options.packageAllowlist.includes(run.packageId))) {
-                return jsonResponse({
-                    ok: false,
-                    error: {
-                        code: "PACKAGE_FORBIDDEN",
-                        message: `Package '${run.packageId}' is not in the allowed package list`,
-                    },
-                }, 403, corsHeaders);
+        if ((policy.packageAllowlist && policy.packageAllowlist.length > 0) ||
+            (policy.actionAllowlist && policy.actionAllowlist.length > 0)) {
+            const run = await service.runs.get(runId);
+            if (run) {
+                if (!isPackageAllowedByPolicy(run.packageId, policy)) {
+                    return jsonResponse({
+                        ok: false,
+                        error: {
+                            code: PACKAGE_FORBIDDEN,
+                            message: `Package '${run.packageId || "unknown"}' is not in the allowed package list`,
+                        },
+                    }, 403, corsHeaders);
+                }
+                if (!isActionAllowedByPolicy({ packageId: run.packageId, actionId: run.actionId }, policy)) {
+                    return jsonResponse({
+                        ok: false,
+                        error: {
+                            code: ACTION_FORBIDDEN,
+                            message: `Action '${run.packageId ? `${run.packageId}/${run.actionId}` : run.actionId}' is not in the allowed action list`,
+                        },
+                    }, 403, corsHeaders);
+                }
             }
         }
         let body = {};
@@ -315,12 +325,12 @@ export async function handleRunsRoutes(ctx) {
         }
         catch { }
         const reason = body?.reason || "Cancelled by client request";
-        const cancelResult = await target.cancelRun(runId, reason);
+        const cancelResult = await service.runs.cancel(runId, reason);
         if (cancelResult.outcome === "not_found") {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "RUN_NOT_FOUND",
+                    code: RUN_NOT_FOUND,
                     message: `Run '${runId}' not found`,
                 },
             }, 404, corsHeaders);
@@ -329,7 +339,7 @@ export async function handleRunsRoutes(ctx) {
             return jsonResponse({
                 ok: false,
                 error: {
-                    code: "RUN_ALREADY_FINISHED",
+                    code: RUN_ALREADY_FINISHED,
                     message: `Run '${runId}' has already finished with status '${cancelResult.status}'`,
                     status: cancelResult.status,
                 },

package/dist/server/routes/state.d.ts

@@ -1,6 +1,6 @@
 import { type RouteContext } from "./common.js";
 /**
  * 处理状态键名列表、读取、写入、删除及清空接口。
- * 在未显式开启管理功能 (options.enableManagement !== true) 时返回 403 拒绝。
+ * 在未显式开启管理功能时返回 403 拒绝。
  */
 export declare function handleStateRoutes(ctx: RouteContext): Promise<Response | null>;