@actiondock/core 2.0.9 → 2.0.11-beta.0

package/src/storage/index.ts

@@ -55,11 +55,27 @@ export function createStorage(
  * 工厂函数：创建或连接 ActionDock 全局共享数据库（~/.actiondock/global.db）。
  * 用于跨 Package 共享的全局配置项存储。
  * 
- * @param customHome 自定义家目录路径（可选）
+ * @param customHomeOrOptions 自定义家目录路径或配置对象（可选）
+ * @param dataDirArg 自定义数据存储目录（可选）
  */
-export function createGlobalStorage(customHome?: string): RuntimeStorage {
-  const baseDir = getActionDockHome(customHome);
-  const dbPath = join(baseDir, ".actiondock", "global.db");
+export function createGlobalStorage(
+  customHomeOrOptions?: string | { customHome?: string; dataDir?: string },
+  dataDirArg?: string
+): RuntimeStorage {
+  let customHome: string | undefined;
+  let dataDir: string | undefined;
+
+  if (typeof customHomeOrOptions === "object" && customHomeOrOptions !== null) {
+    customHome = customHomeOrOptions.customHome;
+    dataDir = customHomeOrOptions.dataDir;
+  } else {
+    customHome = customHomeOrOptions;
+    dataDir = dataDirArg;
+  }
+
+  const dbPath = dataDir
+    ? join(dataDir, "global.db")
+    : join(getActionDockHome(customHome), ".actiondock", "global.db");
   return new SqliteRuntimeStorage({ dbPath, packageId: "__global__" });
 }
 

package/src/storage/sqlite.ts

@@ -1,10 +1,12 @@
 import { chmodSync, existsSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import type { JsonValue, RuntimeError, RunRecord } from "@actiondock/sdk";
+import { type Clock, getSystemClock } from "../runtime/clock";
 import { createDefaultSqliteDriver } from "./driver";
 import type {
   RuntimeStorage,
   SqliteDriver,
+  SqliteStatement,
   StateEntry,
   StorageOptions,
   TerminalRunStatus,
@@ -17,10 +19,21 @@ import type {
 export class SqliteRuntimeStorage implements RuntimeStorage {
   private driver: SqliteDriver;
   private packageId: string;
+  private clock: Clock;
   private isClosed = false;
+  private statementCache = new Map<string, SqliteStatement>();
+
+  get isOpen(): boolean {
+    return !this.isClosed;
+  }
+
+  get closed(): boolean {
+    return this.isClosed;
+  }
 
   constructor(options: StorageOptions) {
     this.packageId = options.packageId;
+    this.clock = options.clock ?? getSystemClock();
     const dbPath = options.dbPath || ":memory:";
 
     if (dbPath !== ":memory:") {
@@ -161,10 +174,22 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
     }
   }
 
+  /**
+   * 获取或复用预编译 SQL 语句缓存。
+   */
+  private getStatement(sql: string): SqliteStatement {
+    let stmt = this.statementCache.get(sql);
+    if (!stmt) {
+      stmt = this.driver.prepare(sql);
+      this.statementCache.set(sql, stmt);
+    }
+    return stmt;
+  }
+
   // --- Config 配置管理 ---
 
   getConfig<T = unknown>(key: string): T | undefined {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "SELECT value_json FROM config WHERE package_id = ? AND key = ?"
     );
     const row = stmt.get<{ value_json: string }>(this.packageId, key);
@@ -179,7 +204,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   }
 
   listConfig(): Record<string, unknown> {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "SELECT key, value_json FROM config WHERE package_id = ?"
     );
     const rows = stmt.all<{ key: string; value_json: string }>(this.packageId);
@@ -195,7 +220,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   }
 
   setConfig(key: string, value: unknown): void {
-    const stmt = this.driver.prepare(`
+    const stmt = this.getStatement(`
       INSERT INTO config (package_id, key, value_json, updated_at)
       VALUES (?, ?, ?, ?)
       ON CONFLICT(package_id, key) DO UPDATE SET
@@ -203,12 +228,12 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
         updated_at = excluded.updated_at
     `);
     const valJson = JSON.stringify(value);
-    const now = new Date().toISOString();
+    const now = this.clock.now().toISOString();
     stmt.run(this.packageId, key, valJson, now);
   }
 
   deleteConfig(key: string): boolean {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "DELETE FROM config WHERE package_id = ? AND key = ?"
     );
     const res = stmt.run(this.packageId, key);
@@ -218,7 +243,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   // --- State 状态管理 ---
 
   async getState<T = unknown>(namespace: string, key: string): Promise<T | undefined> {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "SELECT value_json, expires_at FROM state WHERE package_id = ? AND namespace = ? AND key = ?"
     );
     const row = stmt.get<{ value_json: string; expires_at?: string }>(
@@ -232,7 +257,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
 
     if (row.expires_at) {
       const expires = new Date(row.expires_at).getTime();
-      if (Date.now() >= expires) {
+      if (this.clock.now().getTime() >= expires) {
         this.deleteState(namespace, key).catch(() => {});
         return undefined;
       }
@@ -262,7 +287,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       const val = await this.getState<T>(ns, actualKey);
       if (val === undefined) return undefined;
 
-      const stmt = this.driver.prepare(
+      const stmt = this.getStatement(
         "SELECT updated_at, expires_at FROM state WHERE package_id = ? AND namespace = ? AND key = ?"
       );
       const row = stmt.get<{ updated_at: string; expires_at?: string }>(
@@ -277,14 +302,14 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
         key: actualKey,
         fullKey: targetKey,
         value: val,
-        updatedAt: row?.updated_at || new Date().toISOString(),
+        updatedAt: row?.updated_at || this.clock.now().toISOString(),
         expiresAt: row?.expires_at,
       };
     }
 
     const val = await this.getState<T>("", actualKey);
     if (val !== undefined) {
-      const stmt = this.driver.prepare(
+      const stmt = this.getStatement(
         "SELECT updated_at, expires_at FROM state WHERE package_id = ? AND namespace = ? AND key = ?"
       );
       const row = stmt.get<{ updated_at: string; expires_at?: string }>(
@@ -298,12 +323,12 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
         key: actualKey,
         fullKey: actualKey,
         value: val,
-        updatedAt: row?.updated_at || new Date().toISOString(),
+        updatedAt: row?.updated_at || this.clock.now().toISOString(),
         expiresAt: row?.expires_at,
       };
     }
 
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "SELECT namespace, key, value_json, updated_at, expires_at FROM state WHERE package_id = ? AND key = ?"
     );
     const rows = stmt.all<{
@@ -314,7 +339,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       expires_at?: string;
     }>(this.packageId, actualKey);
 
-    const now = Date.now();
+    const now = this.clock.now().getTime();
     for (const row of rows) {
       if (row.expires_at && now >= new Date(row.expires_at).getTime()) {
         continue;
@@ -345,7 +370,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
     value: T,
     ttl?: number
   ): Promise<void> {
-    const stmt = this.driver.prepare(`
+    const stmt = this.getStatement(`
       INSERT INTO state (package_id, namespace, key, value_json, updated_at, expires_at)
       VALUES (?, ?, ?, ?, ?, ?)
       ON CONFLICT(package_id, namespace, key) DO UPDATE SET
@@ -354,7 +379,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
         expires_at = excluded.expires_at
     `);
     const valJson = JSON.stringify(value);
-    const now = new Date();
+    const now = this.clock.now();
     const updatedAt = now.toISOString();
 
     let expiresAt: string | null = null;
@@ -366,7 +391,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   }
 
   async deleteState(namespace: string, key: string): Promise<boolean> {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "DELETE FROM state WHERE package_id = ? AND namespace = ? AND key = ?"
     );
     const res = stmt.run(this.packageId, namespace, key);
@@ -390,7 +415,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
     const deletedRoot = await this.deleteState("", actualKey);
     if (deletedRoot) return true;
 
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "DELETE FROM state WHERE package_id = ? AND key = ?"
     );
     const res = stmt.run(this.packageId, actualKey);
@@ -414,7 +439,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       params.push(`${escapedPrefix}%`);
     }
 
-    const stmt = this.driver.prepare(sql);
+    const stmt = this.getStatement(sql);
     const res = stmt.run(...params);
     return res.changes;
   }
@@ -437,14 +462,14 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       params.push(`${escapedPrefix}%`);
     }
 
-    const stmt = this.driver.prepare(sql);
+    const stmt = this.getStatement(sql);
     const rows = stmt.all<{
       namespace: string;
       key: string;
       expires_at?: string;
     }>(...params);
 
-    const now = Date.now();
+    const now = this.clock.now().getTime();
     const result: string[] = [];
 
     for (const row of rows) {
@@ -478,7 +503,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       params.push(`${escapedPrefix}%`);
     }
 
-    const stmt = this.driver.prepare(sql);
+    const stmt = this.getStatement(sql);
     const rows = stmt.all<{
       namespace: string;
       key: string;
@@ -487,7 +512,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       expires_at?: string;
     }>(...params);
 
-    const now = Date.now();
+    const now = this.clock.now().getTime();
     const results: StateEntry[] = [];
 
     for (const row of rows) {
@@ -519,7 +544,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   // --- Runs 运行记录管理 ---
 
   createRun(record: RunRecord | any): void {
-    const stmt = this.driver.prepare(`
+    const stmt = this.getStatement(`
       INSERT INTO runs (
         id, root_run_id, parent_run_id, package_id, package_instance_id,
         action_id, generation_id, owner_id, status, input_json, output_json,
@@ -567,7 +592,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   ): void {
     if (this.isClosed) return;
     try {
-      const stmt = this.driver.prepare(`
+      const stmt = this.getStatement(`
         UPDATE runs
         SET status = ?, output_json = ?, error_json = ?, finished_at = ?
         WHERE id = ?
@@ -576,16 +601,18 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
         status,
         output !== undefined ? JSON.stringify(output) : null,
         error ? JSON.stringify(error) : null,
-        finishedAt || new Date().toISOString(),
+        finishedAt || this.clock.now().toISOString(),
         id
       );
-    } catch {
-      // 数据库已关闭或操作异常，安全忽略
+    } catch (err) {
+      if (this.isClosed) return;
+      console.warn(`[SqliteRuntimeStorage] Failed to update run "${id}":`, err);
+      throw err;
     }
   }
 
   getRun(id: string): RunRecord | null {
-    const stmt = this.driver.prepare(
+    const stmt = this.getStatement(
       "SELECT * FROM runs WHERE id = ? AND package_id = ?"
     );
     const row = stmt.get<any>(id, this.packageId);
@@ -597,7 +624,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
     const limit = options.limit || 50;
     let rows: any[];
     if (options.actionId) {
-      const stmt = this.driver.prepare(`
+      const stmt = this.getStatement(`
         SELECT * FROM runs
         WHERE package_id = ? AND action_id = ?
         ORDER BY started_at DESC
@@ -605,7 +632,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       `);
       rows = stmt.all(this.packageId, options.actionId, limit);
     } else {
-      const stmt = this.driver.prepare(`
+      const stmt = this.getStatement(`
         SELECT * FROM runs
         WHERE package_id = ?
         ORDER BY started_at DESC
@@ -627,7 +654,7 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
       sql += " AND status = ?";
       params.push(options.status);
     }
-    const stmt = this.driver.prepare(sql);
+    const stmt = this.getStatement(sql);
     const res = stmt.run(...params);
     return res.changes;
   }
@@ -675,7 +702,9 @@ export class SqliteRuntimeStorage implements RuntimeStorage {
   }
 
   close(): void {
+    if (this.isClosed) return;
     this.isClosed = true;
+    this.statementCache.clear();
     try {
       this.driver.close();
     } catch {

package/src/storage/types.ts

@@ -1,4 +1,5 @@
 import type { JsonValue, RuntimeError, RunRecord } from "@actiondock/sdk";
+import type { Clock } from "../runtime/clock";
 
 /**
  * SQLite 基础参数值类型。
@@ -73,6 +74,8 @@ export interface StorageOptions {
   packageId: string;
   /** 显式注入的 SQLite 底层驱动 */
   driver?: SqliteDriver;
+  /** 可选注入的时间提供器，便于与模拟时钟联动 */
+  clock?: Clock;
 }
 
 /**
@@ -89,6 +92,11 @@ export type TerminalRunStatus =
  * 统一运行时存储抽象接口。
  */
 export interface RuntimeStorage {
+  /** 数据库是否处于打开状态 */
+  readonly isOpen?: boolean;
+  /** 数据库是否已关闭 */
+  readonly closed?: boolean;
+
   // --- Config 配置管理 ---
   getConfig<T = unknown>(key: string): T | undefined;
   listConfig(): Record<string, unknown>;

package/src/utils/index.ts

@@ -1,5 +1,7 @@
 import { homedir } from "node:os";
 
+export { findExecutable } from "@actiondock/sdk";
+
 /**
  * Parses duration strings like "500ms", "30s", "5m", "1h", "1d" or pure numbers into milliseconds.
  */

package/src/build/builder.ts

@@ -1,218 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { basename, dirname, join, resolve } from "node:path";
-import { loadActionFileMap, loadActions, loadProjectConfig } from "../project/loader";
-import type { ProjectConfig } from "../project/types";
-import { getPackageSlug } from "../utils";
-import { type ActionImport, generateStandaloneEntrypoint } from "./templates";
-
-/**
- * 独立二进制可执行文件构建选项。
- */
-export interface BuildOptions {
-  /** 目标项目根目录 */
-  projectRoot: string;
-  /** 目标架构（如 "bun-linux-x64", "bun-darwin-arm64", "bun-windows-x64" 等） */
-  target?: string;
-  /** 输出可执行文件的目标路径（默认输出到 dist/ 目录） */
-  outfile?: string;
-  /** 是否开启代码压缩混淆（默认 true） */
-  minify?: boolean;
-  /** 是否编译为 V8/JavaScriptCore 字节码（默认 true） */
-  bytecode?: boolean;
-  /** 显式挑选打包的 Action ID 清单（用于按需子集打包） */
-  actions?: string[];
-}
-
-/**
- * 独立二进制构建完成后的元数据结果对象。
- */
-export interface BuildResult {
-  /** 所属 Package ID */
-  packageId: string;
-  /** 打包的项目版本号 */
-  version: string;
-  /** 编译的目标平台架构 */
-  target: string;
-  /** 生成的独立二进制可执行文件绝对路径 */
-  executablePath: string;
-  /** 生成的 sidecar 元数据 JSON 文件绝对路径 */
-  metadataPath: string;
-  /** 打包内置的 Action ID 列表 */
-  actions: string[];
-}
-
-/**
- * 调用 Bun 原生编译引擎（Bun.build --compile）将 Action Package 打包为零外部依赖的独立二进制可执行文件。
- * 
- * 构建过程：
- * 1. 动态生成 Standalone 入口点代码（包含 StandaloneRuntime 与 Action 注册）。
- * 2. 生成 sidecar metadata 文件（.actiondock-meta.json），包含 Package 元数据与 sha256 校验和。
- * 3. 执行 Bun.build({ compile: true, target, minify, bytecode })。
- * 
- * @param options 构建参数
- * @returns 构建产物结果元数据
- */
-export async function buildProject(options: BuildOptions): Promise<BuildResult> {
-  const root = resolve(options.projectRoot);
-  const config = loadProjectConfig(root);
-  const actionsMap = await loadActions(root, config.actionsDir);
-
-  if (actionsMap.size === 0) {
-    throw new Error(`No valid actions found in ${join(root, config.actionsDir || "actions")}`);
-  }
-
-  if (options.actions && options.actions.length > 0) {
-    const requestedActions = new Set(options.actions);
-    for (const reqId of requestedActions) {
-      if (!actionsMap.has(reqId)) {
-        throw new Error(`Action '${reqId}' requested in build options not found in project`);
-      }
-    }
-    for (const id of Array.from(actionsMap.keys())) {
-      if (!requestedActions.has(id)) {
-        actionsMap.delete(id);
-      }
-    }
-  }
-
-  // Action imports list
-  const actionFileMap = await loadActionFileMap(root, config.actionsDir);
-  const actionImports: ActionImport[] = [];
-
-  for (const [id, entry] of actionFileMap.entries()) {
-    if (actionsMap.has(id)) {
-      actionImports.push({
-        id,
-        filePath: entry.filePath,
-      });
-    }
-  }
-
-  if (actionImports.length === 0) {
-    throw new Error("Could not map any action files for build");
-  }
-
-  // Create build dir
-  const buildDir = join(root, ".actiondock", ".build");
-  mkdirSync(buildDir, { recursive: true });
-
-  const entryCode = generateStandaloneEntrypoint(
-    config.id,
-    config.version,
-    config.description,
-    actionImports,
-    config.config
-  );
-  const entryPath = join(buildDir, "entry.ts");
-  writeFileSync(entryPath, entryCode, "utf-8");
-
-  // Determine target and outfile
-  const target = options.target || "bun";
-  const binaryName = getPackageSlug(config.id);
-
-  const defaultOutfile = join(root, "dist", binaryName);
-  const outfile = resolve(options.outfile || defaultOutfile);
-
-  mkdirSync(dirname(outfile), { recursive: true });
-
-  // Run bun build --compile --bytecode --minify
-  const buildArgs = [
-    "bun",
-    "build",
-    entryPath,
-    "--compile",
-    "--outfile",
-    outfile,
-  ];
-
-  if (options.bytecode !== false) {
-    buildArgs.push("--bytecode");
-  }
-
-  if (options.minify !== false) {
-    buildArgs.push("--minify");
-  }
-
-  if (options.target && options.target !== "bun" && options.target !== "host") {
-    // e.g. bun-linux-x64 or linux-x64
-    const formattedTarget = options.target.startsWith("bun-")
-      ? options.target
-      : `bun-${options.target}`;
-    buildArgs.push(`--target=${formattedTarget}`);
-  }
-
-  const proc = spawnSync(buildArgs[0], buildArgs.slice(1), {
-    cwd: root,
-    stdio: "pipe",
-  });
-
-  if (proc.error) {
-    throw new Error(`Bun compile failed to spawn: ${proc.error.message}`);
-  }
-
-  if (proc.status !== 0) {
-    const errText = proc.stderr?.toString() || proc.stdout?.toString() || "Unknown error";
-    throw new Error(`Bun compile failed (exit code ${proc.status}):\n${errText}`);
-  }
-
-  // Compile artifact resolution (on Windows bun compile automatically appends .exe)
-  let artifactPath = outfile;
-  if (!existsSync(artifactPath)) {
-    const withExe = outfile + ".exe";
-    if (existsSync(withExe)) {
-      artifactPath = withExe;
-    }
-  }
-
-  // Calculate build hash
-  const binaryBuffer = readFileSync(artifactPath);
-  const buildHash = createHash("sha256").update(binaryBuffer).digest("hex").slice(0, 16);
-
-  // Calculate lockHash
-  let lockHash = "none";
-  const lockFiles = ["bun.lock", "bun.lockb", "package.json"];
-  for (const lf of lockFiles) {
-    const p = join(root, lf);
-    if (existsSync(p)) {
-      lockHash = createHash("sha256").update(readFileSync(p)).digest("hex").slice(0, 16);
-      break;
-    }
-  }
-
-  const detectedBunVersion = (typeof (globalThis as any).Bun !== "undefined" && (globalThis as any).Bun.version) || (() => {
-    try {
-      const vProc = spawnSync("bun", ["--version"], { stdio: "pipe" });
-      return vProc.stdout ? vProc.stdout.toString().trim() : "unknown";
-    } catch {
-      return "unknown";
-    }
-  })();
-
-  // Generate artifact.json metadata
-  const metadata = {
-    packageId: config.id,
-    name: config.name,
-    version: config.version,
-    description: config.description,
-    target: options.target || "host",
-    actions: actionImports.map((a) => a.id),
-    bunVersion: detectedBunVersion,
-    lockHash,
-    buildHash,
-    createdAt: new Date().toISOString(),
-  };
-
-  const metadataPath = join(dirname(artifactPath), "artifact.json");
-  writeFileSync(metadataPath, JSON.stringify(metadata, null, 2) + "\n", "utf-8");
-
-  return {
-    packageId: config.id,
-    version: config.version,
-    target: options.target || "host",
-    executablePath: artifactPath,
-    metadataPath,
-    actions: metadata.actions,
-  };
-}