@actiondock/core 2.4.0 → 2.5.0

package/dist/target/remote.js

@@ -2,13 +2,17 @@ import { ActionResolver } from "../catalog/action-resolver.js";
 import { cancelRemoteRun, clearRemoteRuns, clearRemoteState, deleteRemoteConfig, deleteRemoteStateKey, executeRemoteAction, fetchRemoteActionShow, fetchRemoteActions, fetchRemoteConfig, fetchRemoteInfo, fetchRemotePlaybookShow, fetchRemotePlaybooks, fetchRemoteRun, fetchRemoteRuns, fetchRemoteStateList, getRemoteStateKey, setRemoteConfig, setRemoteStateKey, assertSecureTransport, } from "../profile/client.js";
 import { normalizeServerUrl } from "../profile/manager.js";
 import { isTerminalRunStatus } from "../storage/types.js";
-import { ACTIONDOCK_PROTOCOL_VERSION, TargetError, TARGET_PROTOCOL_UNSUPPORTED, TARGET_CAPABILITY_UNAVAILABLE, TARGET_RESULT_UNKNOWN, } from "./types.js";
+import { ACTIONDOCK_PROTOCOL_VERSION, TargetError, TARGET_PROTOCOL_UNSUPPORTED, TARGET_CAPABILITY_UNAVAILABLE, TARGET_RESULT_UNKNOWN, TARGET_CLOSED, } from "./types.js";
 import { ACTION_CANCELLED, EXECUTION_FAILED, STATE_KEY_NOT_FOUND, TIMEOUT } from "../errors.js";
+import { getInsecureDispatcher } from "../server/dispatcher.js";
 /**
  * 读取并解析远端 SSE 事件流。
  */
 export async function* streamRemoteEvents(serverUrl, runId, token, options) {
-    assertSecureTransport(serverUrl, token, options?.allowInsecureHttp);
+    assertSecureTransport(serverUrl, token, {
+        allowInsecureHttp: options?.allowInsecureHttp,
+        insecure: options?.insecure,
+    });
     const base = normalizeServerUrl(serverUrl);
     const candidateUrls = [
         `${base}/api/v2/runs/${encodeURIComponent(runId)}/events`,
@@ -27,10 +31,17 @@ export async function* streamRemoteEvents(serverUrl, runId, token, options) {
     let res;
     for (const url of candidateUrls) {
         try {
-            const resp = await fetch(url, {
+            const fetchInit = {
                 headers,
                 signal: options?.signal,
-            });
+            };
+            if (options?.dispatcher) {
+                fetchInit.dispatcher = options.dispatcher;
+            }
+            else if (options?.insecure) {
+                fetchInit.dispatcher = getInsecureDispatcher();
+            }
+            const resp = await fetch(url, fetchInit);
             if (resp.status === 410) {
                 let errJson;
                 try {
@@ -238,18 +249,31 @@ export class RemoteActionDockTarget {
     timeoutMs;
     baseTimeoutMs;
     allowInsecureHttp;
+    insecure;
+    dispatcher;
+    isClosed = false;
     constructor(options) {
         this.serverUrl = options.serverUrl;
         this.token = options.token;
         this.timeoutMs = options.timeoutMs;
         this.baseTimeoutMs = options.baseTimeoutMs ?? 60000;
         this.allowInsecureHttp = options.allowInsecureHttp;
+        this.insecure = options.insecure;
+        this.dispatcher = options.dispatcher;
+    }
+    assertNotClosed() {
+        if (this.isClosed) {
+            throw new TargetError(TARGET_CLOSED, "RemoteActionDockTarget is closed");
+        }
     }
     async info() {
+        this.assertNotClosed();
         let raw;
         try {
             raw = await fetchRemoteInfo(this.serverUrl, this.token, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
         }
         catch (err) {
@@ -287,12 +311,16 @@ export class RemoteActionDockTarget {
         };
     }
     async listPackages() {
+        this.assertNotClosed();
         const info = await this.info();
         return info.packages;
     }
     async listActions(options) {
+        this.assertNotClosed();
         const rawList = await fetchRemoteActions(this.serverUrl, this.token, options?.query, {
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
         let summaries = rawList.map((item) => ({
             id: item.id,
@@ -311,6 +339,7 @@ export class RemoteActionDockTarget {
         return summaries;
     }
     async describeAction(ref) {
+        this.assertNotClosed();
         let parsed;
         try {
             parsed = ActionResolver.parseRef(ref);
@@ -323,6 +352,8 @@ export class RemoteActionDockTarget {
             : parsed.actionId;
         const raw = await fetchRemoteActionShow(this.serverUrl, actionId, this.token, {
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
         return {
             id: raw.id,
@@ -338,9 +369,12 @@ export class RemoteActionDockTarget {
         };
     }
     async listPlaybooks(options) {
+        this.assertNotClosed();
         const rawList = await fetchRemotePlaybooks(this.serverUrl, this.token, {
             ...options,
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
         return rawList.map((item) => ({
             id: item.id,
@@ -351,8 +385,11 @@ export class RemoteActionDockTarget {
         }));
     }
     async describePlaybook(id) {
+        this.assertNotClosed();
         const raw = await fetchRemotePlaybookShow(this.serverUrl, id, this.token, {
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
         const parsedPkgId = id.includes("/") ? id.slice(0, id.lastIndexOf("/")) : undefined;
         return {
@@ -365,6 +402,7 @@ export class RemoteActionDockTarget {
         };
     }
     async runAction(ref, input, options) {
+        this.assertNotClosed();
         let parsed;
         try {
             parsed = ActionResolver.parseRef(ref);
@@ -383,9 +421,12 @@ export class RemoteActionDockTarget {
             requestId: options?.requestId,
             async: false,
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
     }
     async startAction(ref, input, options) {
+        this.assertNotClosed();
         let parsed;
         try {
             parsed = ActionResolver.parseRef(ref);
@@ -404,6 +445,8 @@ export class RemoteActionDockTarget {
             requestId: options?.requestId,
             async: true,
             allowInsecureHttp: this.allowInsecureHttp,
+            insecure: this.insecure,
+            dispatcher: this.dispatcher,
         });
         if (!res.ok) {
             return {
@@ -440,6 +483,16 @@ export class RemoteActionDockTarget {
                 },
             };
         }
+        if (this.isClosed) {
+            return {
+                ok: false,
+                runId,
+                error: {
+                    code: TARGET_CLOSED,
+                    message: "RemoteActionDockTarget is closed",
+                },
+            };
+        }
         const internalController = new AbortController();
         let sseTimedOut = false;
         let timer;
@@ -467,6 +520,16 @@ export class RemoteActionDockTarget {
             }
         }
         catch (err) {
+            if (err?.code === TARGET_CLOSED || this.isClosed) {
+                return {
+                    ok: false,
+                    runId,
+                    error: {
+                        code: TARGET_CLOSED,
+                        message: "RemoteActionDockTarget is closed",
+                    },
+                };
+            }
             if (!signal?.aborted && !sseTimedOut) {
                 // SSE 通道异常视为不可用：记录后按指数退避进入轮询兜底
                 console.warn(`[ActionDock] SSE event stream unavailable for run '${runId}', falling back to polling: ${err?.message || String(err)}`);
@@ -492,9 +555,34 @@ export class RemoteActionDockTarget {
         }
         const remainingWaitMs = Math.max(0, maxWaitMs - (Date.now() - startTime));
         if (remainingWaitMs <= 0) {
-            const run = await this.getRun(runId);
-            if (run && isTerminalRunStatus(run.status)) {
-                return this.formatTerminalRunResult(run, runId);
+            if (this.isClosed) {
+                return {
+                    ok: false,
+                    runId,
+                    error: {
+                        code: TARGET_CLOSED,
+                        message: "RemoteActionDockTarget is closed",
+                    },
+                };
+            }
+            try {
+                const run = await this.getRun(runId);
+                if (run && isTerminalRunStatus(run.status)) {
+                    return this.formatTerminalRunResult(run, runId);
+                }
+            }
+            catch (err) {
+                if (err?.code === TARGET_CLOSED || this.isClosed) {
+                    return {
+                        ok: false,
+                        runId,
+                        error: {
+                            code: TARGET_CLOSED,
+                            message: "RemoteActionDockTarget is closed",
+                        },
+                    };
+                }
+                throw err;
             }
             const waitedMs = Date.now() - startTime;
             return {
@@ -518,6 +606,16 @@ export class RemoteActionDockTarget {
         let delayMs = Math.min(150, Math.max(10, Math.floor((remainingWaitMs || maxWaitMs) / 4)));
         const maxDelayMs = 2000;
         while (Date.now() - startTime < maxWaitMs) {
+            if (this.isClosed) {
+                return {
+                    ok: false,
+                    runId,
+                    error: {
+                        code: TARGET_CLOSED,
+                        message: "RemoteActionDockTarget is closed",
+                    },
+                };
+            }
             if (signal?.aborted) {
                 return {
                     ok: false,
@@ -528,9 +626,24 @@ export class RemoteActionDockTarget {
                     },
                 };
             }
-            const run = await this.getRun(runId);
-            if (run && isTerminalRunStatus(run.status)) {
-                return this.formatTerminalRunResult(run, runId);
+            try {
+                const run = await this.getRun(runId);
+                if (run && isTerminalRunStatus(run.status)) {
+                    return this.formatTerminalRunResult(run, runId);
+                }
+            }
+            catch (err) {
+                if (err?.code === TARGET_CLOSED || this.isClosed) {
+                    return {
+                        ok: false,
+                        runId,
+                        error: {
+                            code: TARGET_CLOSED,
+                            message: "RemoteActionDockTarget is closed",
+                        },
+                    };
+                }
+                throw err;
             }
             await new Promise((resolve) => setTimeout(resolve, delayMs));
             delayMs = Math.min(delayMs * 2, maxDelayMs);
@@ -569,6 +682,7 @@ export class RemoteActionDockTarget {
         };
     }
     async listRuns(options) {
+        this.assertNotClosed();
         try {
             const res = await fetchRemoteRuns(this.serverUrl, this.token, {
                 packageId: options?.packageId,
@@ -577,6 +691,8 @@ export class RemoteActionDockTarget {
                 intent: options?.intent,
                 limit: options?.limit,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return res.items || [];
         }
@@ -585,10 +701,13 @@ export class RemoteActionDockTarget {
         }
     }
     async clearRuns(options) {
+        this.assertNotClosed();
         try {
             const res = await clearRemoteRuns(this.serverUrl, this.token, {
                 ...options,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return res.clearedCount ?? 0;
         }
@@ -597,9 +716,12 @@ export class RemoteActionDockTarget {
         }
     }
     async getRun(runId) {
+        this.assertNotClosed();
         try {
             return await fetchRemoteRun(this.serverUrl, runId, this.token, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
         }
         catch (err) {
@@ -611,9 +733,12 @@ export class RemoteActionDockTarget {
         }
     }
     async cancelRun(runId, reason) {
+        this.assertNotClosed();
         try {
             const res = await cancelRemoteRun(this.serverUrl, runId, this.token, reason, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return { outcome: "requested", runId: res.runId };
         }
@@ -644,13 +769,25 @@ export class RemoteActionDockTarget {
             throw err;
         }
     }
-    async *events(runId, options) {
-        yield* streamRemoteEvents(this.serverUrl, runId, this.token, {
-            ...options,
-            allowInsecureHttp: this.allowInsecureHttp,
-        });
+    events(runId, options) {
+        this.assertNotClosed();
+        const self = this;
+        async function* stream() {
+            self.assertNotClosed();
+            for await (const event of streamRemoteEvents(self.serverUrl, runId, self.token, {
+                ...options,
+                allowInsecureHttp: self.allowInsecureHttp,
+                insecure: self.insecure,
+                dispatcher: self.dispatcher,
+            })) {
+                self.assertNotClosed();
+                yield event;
+            }
+        }
+        return stream();
     }
     async getConfig(packageId, key) {
+        this.assertNotClosed();
         try {
             const list = await this.listConfig(packageId);
             const found = list.find((c) => c.key === key);
@@ -670,9 +807,12 @@ export class RemoteActionDockTarget {
         }
     }
     async setConfig(packageId, key, value) {
+        this.assertNotClosed();
         try {
             await setRemoteConfig(this.serverUrl, key, value, this.token, packageId || undefined, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
         }
         catch (err) {
@@ -680,9 +820,12 @@ export class RemoteActionDockTarget {
         }
     }
     async deleteConfig(packageId, key) {
+        this.assertNotClosed();
         try {
             const res = await deleteRemoteConfig(this.serverUrl, key, this.token, packageId || undefined, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return Boolean(res?.deleted ?? true);
         }
@@ -691,9 +834,12 @@ export class RemoteActionDockTarget {
         }
     }
     async listConfig(packageId) {
+        this.assertNotClosed();
         try {
             const res = await fetchRemoteConfig(this.serverUrl, this.token, packageId || undefined, {
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             if (Array.isArray(res))
                 return res;
@@ -717,12 +863,15 @@ export class RemoteActionDockTarget {
         }
     }
     async getState(packageId, actionId, key, options) {
+        this.assertNotClosed();
         try {
             const res = await getRemoteStateKey(this.serverUrl, key, this.token, {
                 package: packageId || undefined,
                 action: actionId || undefined,
                 namespace: options?.namespace,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             if (res === undefined)
                 return undefined;
@@ -739,6 +888,7 @@ export class RemoteActionDockTarget {
         }
     }
     async setState(packageId, actionId, key, value, options) {
+        this.assertNotClosed();
         try {
             await setRemoteStateKey(this.serverUrl, key, value, this.token, {
                 package: packageId || undefined,
@@ -746,6 +896,8 @@ export class RemoteActionDockTarget {
                 namespace: options?.namespace,
                 ttl: options?.ttl,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
         }
         catch (err) {
@@ -753,12 +905,15 @@ export class RemoteActionDockTarget {
         }
     }
     async deleteState(packageId, actionId, key, options) {
+        this.assertNotClosed();
         try {
             const res = await deleteRemoteStateKey(this.serverUrl, key, this.token, {
                 package: packageId || undefined,
                 action: actionId || undefined,
                 namespace: options?.namespace,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return Boolean(res?.deleted ?? true);
         }
@@ -770,6 +925,7 @@ export class RemoteActionDockTarget {
         }
     }
     async listStateKeys(packageId, actionId, options) {
+        this.assertNotClosed();
         try {
             const res = await fetchRemoteStateList(this.serverUrl, this.token, {
                 package: packageId || undefined,
@@ -777,6 +933,8 @@ export class RemoteActionDockTarget {
                 namespace: options?.namespace,
                 prefix: options?.prefix,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return res.keys || [];
         }
@@ -785,6 +943,7 @@ export class RemoteActionDockTarget {
         }
     }
     async clearState(packageId, actionId, options) {
+        this.assertNotClosed();
         try {
             const res = await clearRemoteState(this.serverUrl, this.token, {
                 package: packageId || undefined,
@@ -793,6 +952,8 @@ export class RemoteActionDockTarget {
                 prefix: options?.prefix,
                 all: options?.all,
                 allowInsecureHttp: this.allowInsecureHttp,
+                insecure: this.insecure,
+                dispatcher: this.dispatcher,
             });
             return res.clearedCount ?? 0;
         }
@@ -801,10 +962,14 @@ export class RemoteActionDockTarget {
         }
     }
     async listStateEntries(packageId, options) {
+        this.assertNotClosed();
         throw new TargetError(TARGET_CAPABILITY_UNAVAILABLE, "TARGET_CAPABILITY_UNAVAILABLE: listStateEntries is not supported on remote target");
     }
     async close(_options) {
-        // 远程 Target 无本地资源需要释放
+        if (this.isClosed) {
+            return;
+        }
+        this.isClosed = true;
     }
 }
 /**

package/dist/target/types.d.ts

@@ -14,6 +14,7 @@ export declare const ACTIONDOCK_PROTOCOL_VERSION = "2.0";
 export declare const TARGET_PROTOCOL_UNSUPPORTED = "TARGET_PROTOCOL_UNSUPPORTED";
 export declare const TARGET_CAPABILITY_UNAVAILABLE = "TARGET_CAPABILITY_UNAVAILABLE";
 export declare const TARGET_RESULT_UNKNOWN = "TARGET_RESULT_UNKNOWN";
+export declare const TARGET_CLOSED = "TARGET_CLOSED";
 /**
  * 结构化 Target 异常类。
  */
@@ -213,11 +214,19 @@ export interface RemoteTargetOptions {
     token?: string;
     /** 是否允许向非回环地址发送明文 HTTP 请求（默认 false） */
     allowInsecureHttp?: boolean;
+    /** 是否跳过 TLS 证书合法性校验（用于局域网自签证书） */
+    insecure?: boolean;
+    /** 自定义底层 HTTP 调度器（平台中立） */
+    dispatcher?: unknown;
     /** 请求超时时间（毫秒） */
     timeoutMs?: number;
     /** 轮询等待基准底线超时时间（毫秒，默认 60000ms） */
     baseTimeoutMs?: number;
 }
+/**
+ * 远程 ActionDockTarget 选项别名契约。
+ */
+export type RemoteActionDockTargetOptions = RemoteTargetOptions;
 /**
  * 监督进程 IPC 目标初始化选项。
  */

package/dist/target/types.js

@@ -8,6 +8,7 @@ export const ACTIONDOCK_PROTOCOL_VERSION = "2.0";
 export const TARGET_PROTOCOL_UNSUPPORTED = "TARGET_PROTOCOL_UNSUPPORTED";
 export const TARGET_CAPABILITY_UNAVAILABLE = "TARGET_CAPABILITY_UNAVAILABLE";
 export const TARGET_RESULT_UNKNOWN = "TARGET_RESULT_UNKNOWN";
+export const TARGET_CLOSED = "TARGET_CLOSED";
 /**
  * 结构化 Target 异常类。
  */

package/dist/version.d.ts

@@ -1,4 +1,4 @@
 /**
  * ActionDock 核心版本号单一事实源。
  */
-export declare const ACTIONDOCK_VERSION = "2.4.0";
+export declare const ACTIONDOCK_VERSION = "2.5.0";

package/dist/version.js

@@ -1,4 +1,4 @@
 /**
  * ActionDock 核心版本号单一事实源。
  */
-export const ACTIONDOCK_VERSION = "2.4.0";
+export const ACTIONDOCK_VERSION = "2.5.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actiondock/core",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "ActionDock Core Engine - Project loader, runtime execution, SQLite storage, standalone builder, and skill exporter",
   "type": "module",
   "main": "./dist/index.js",
@@ -29,7 +29,7 @@
     "test": "node ../../scripts/run-tests.ts"
   },
   "dependencies": {
-    "@actiondock/sdk": "^2.4.0",
+    "@actiondock/sdk": "^2.5.0",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1"
   },