aws-runtime-bridge 1.0.2 → 1.1.0

package/dist/services/terminal-persistence.js

@@ -6,9 +6,30 @@
 import path from 'node:path';
 import os from 'node:os';
 import { promises as fs } from 'node:fs';
-import { ensureDir } from '../utils/file-utils.js';
+import { atomicWriteJsonFile, withFileLock } from '../utils/file-utils.js';
 import { createLogger } from '../utils/logger.js';
 const log = createLogger('terminal-persistence');
+async function readAllPersistedSessions(filePath) {
+    try {
+        const raw = await fs.readFile(filePath, 'utf-8');
+        return JSON.parse(raw);
+    }
+    catch (error) {
+        const err = error;
+        if (err.code !== 'ENOENT') {
+            log.warn(`[readAllPersistedSessions] 读取持久化会话失败: ${filePath}, error=${err.message}`);
+        }
+        return [];
+    }
+}
+async function updatePersistedSessions(updater) {
+    const filePath = getPersistedSessionsFile();
+    await withFileLock(filePath, async () => {
+        const sessions = await readAllPersistedSessions(filePath);
+        const nextSessions = await updater(sessions);
+        await atomicWriteJsonFile(filePath, nextSessions);
+    });
+}
 /**
  * 获取持久化会话文件路径
  *
@@ -24,15 +45,11 @@ export function getPersistedSessionsFile() {
  */
 export async function loadPersistedSessions() {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const sessions = JSON.parse(raw);
+    return withFileLock(filePath, async () => {
+        const sessions = await readAllPersistedSessions(filePath);
         // 只返回状态为 running 的会话
         return sessions.filter(s => s.status === 'running');
-    }
-    catch {
-        return [];
-    }
+    });
 }
 /**
  * 保存持久化的终端会话列表
@@ -41,8 +58,9 @@ export async function loadPersistedSessions() {
  */
 export async function savePersistedSessions(sessions) {
     const filePath = getPersistedSessionsFile();
-    await ensureDir(path.dirname(filePath));
-    await fs.writeFile(filePath, JSON.stringify(sessions, null, 2), 'utf-8');
+    await withFileLock(filePath, async () => {
+        await atomicWriteJsonFile(filePath, sessions);
+    });
 }
 /**
  * 添加或更新持久化会话
@@ -50,15 +68,17 @@ export async function savePersistedSessions(sessions) {
  * @param session - 会话数据
  */
 export async function upsertPersistedSession(session) {
-    const sessions = await loadPersistedSessions();
-    const index = sessions.findIndex(s => s.sessionId === session.sessionId);
-    if (index >= 0) {
-        sessions[index] = session;
-    }
-    else {
-        sessions.push(session);
-    }
-    await savePersistedSessions(sessions);
+    await updatePersistedSessions((sessions) => {
+        const runningSessions = sessions.filter(s => s.status === 'running');
+        const index = runningSessions.findIndex(s => s.sessionId === session.sessionId);
+        if (index >= 0) {
+            runningSessions[index] = session;
+        }
+        else {
+            runningSessions.push(session);
+        }
+        return runningSessions;
+    });
 }
 /**
  * 移除持久化会话（从完整文件中删除，包括 stopped 状态的）
@@ -67,9 +87,8 @@ export async function upsertPersistedSession(session) {
  */
 export async function removePersistedSession(sessionId) {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const allSessions = JSON.parse(raw);
+    await withFileLock(filePath, async () => {
+        const allSessions = await readAllPersistedSessions(filePath);
         const beforeCount = allSessions.length;
         const filtered = allSessions.filter(s => s.sessionId !== sessionId);
         const afterCount = filtered.length;
@@ -79,12 +98,8 @@ export async function removePersistedSession(sessionId) {
         else {
             log.warn(`[removePersistedSession] 未找到要删除的会话: sessionId=${sessionId}, 当前会话数=${beforeCount}`);
         }
-        await savePersistedSessions(filtered);
-    }
-    catch (error) {
-        // 文件不存在，无需删除
-        log.debug(`[removePersistedSession] 文件不存在或读取失败: ${filePath}`);
-    }
+        await atomicWriteJsonFile(filePath, filtered);
+    });
 }
 /**
  * 根据 agentId 查找持久化会话
@@ -104,9 +119,8 @@ export async function findPersistedSessionByAgentId(agentId) {
  */
 export async function removePersistedSessionByAgentId(agentId) {
     const filePath = getPersistedSessionsFile();
-    try {
-        const raw = await fs.readFile(filePath, 'utf-8');
-        const allSessions = JSON.parse(raw);
+    await withFileLock(filePath, async () => {
+        const allSessions = await readAllPersistedSessions(filePath);
         const beforeCount = allSessions.length;
         const filtered = allSessions.filter(s => s.agentId !== agentId);
         const afterCount = filtered.length;
@@ -116,10 +130,6 @@ export async function removePersistedSessionByAgentId(agentId) {
         else {
             log.debug(`[removePersistedSessionByAgentId] 未找到要删除的会话: agentId=${agentId}`);
         }
-        await savePersistedSessions(filtered);
-    }
-    catch (error) {
-        // 文件不存在，无需删除
-        log.debug(`[removePersistedSessionByAgentId] 文件不存在或读取失败: ${filePath}`);
-    }
+        await atomicWriteJsonFile(filePath, filtered);
+    });
 }

package/dist/services/terminal-persistence.test.js

@@ -1,8 +1,33 @@
 /**
  * Terminal Persistence 服务单元测试
  */
-import { describe, it, expect } from 'vitest';
+import path from 'node:path';
+import { promises as fs } from 'node:fs';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+const tmpRoot = path.join(process.cwd(), '.tmp-vitest-terminal-persistence');
+vi.mock('node:os', () => ({
+    default: {
+        tmpdir: () => tmpRoot,
+    },
+}));
+const persistence = await import('./terminal-persistence.js');
+function makeSession(sessionId, agentId) {
+    return {
+        sessionId,
+        agentId,
+        workspacePath: `/workspace/${agentId}`,
+        command: 'claude',
+        startedAt: new Date(0).toISOString(),
+        status: 'running',
+    };
+}
 describe('terminal-persistence service', () => {
+    beforeEach(async () => {
+        await fs.rm(tmpRoot, { recursive: true, force: true });
+    });
+    afterEach(async () => {
+        await fs.rm(tmpRoot, { recursive: true, force: true });
+    });
     it('generates correct file path', () => {
         const getPersistedSessionsFile = (tmpdir) => {
             return `${tmpdir}/agentswork-runtime-bridge/sessions.json`;
@@ -85,4 +110,25 @@ describe('terminal-persistence service', () => {
         };
         expect(parseSessions('invalid json')).toEqual([]);
     });
+    it('serializes concurrent upserts without losing sessions', async () => {
+        await Promise.all([
+            persistence.upsertPersistedSession(makeSession('session-1', 'agent-1')),
+            persistence.upsertPersistedSession(makeSession('session-2', 'agent-2')),
+            persistence.upsertPersistedSession(makeSession('session-3', 'agent-3')),
+        ]);
+        const sessions = await persistence.loadPersistedSessions();
+        expect(sessions.map(session => session.sessionId).sort()).toEqual(['session-1', 'session-2', 'session-3']);
+    });
+    it('does not revive a removed session during concurrent writes', async () => {
+        await persistence.savePersistedSessions([
+            makeSession('session-1', 'agent-1'),
+            makeSession('session-2', 'agent-2'),
+        ]);
+        await Promise.all([
+            persistence.removePersistedSession('session-1'),
+            persistence.upsertPersistedSession(makeSession('session-3', 'agent-3')),
+        ]);
+        const sessions = await persistence.loadPersistedSessions();
+        expect(sessions.map(session => session.sessionId).sort()).toEqual(['session-2', 'session-3']);
+    });
 });

package/dist/utils/file-utils.d.ts

@@ -1,6 +1,9 @@
 import type { SkillPackage, DownloadResult, Skill } from '../types.js';
 import type { AppFlags, InstalledSkill, CcSwitchSdk } from '@cc-switch/sdk';
 export declare function ensureDir(targetDir: string): Promise<string>;
+export declare function withFileLock<T>(targetPath: string, operation: () => Promise<T>): Promise<T>;
+export declare function atomicWriteFile(targetPath: string, content: string): Promise<void>;
+export declare function atomicWriteJsonFile(targetPath: string, value: unknown): Promise<void>;
 export declare function downloadSkillZip(skillPackage: SkillPackage, targetDir: string): Promise<DownloadResult | null>;
 export declare function runCommand(command: string, args: string[]): Promise<void>;
 export declare function escapePowerShellLiteral(text: string): string;

package/dist/utils/file-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE5E,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA0ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}
+{"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI5E,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAqBjG;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAWxF;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,YAAY,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CA0ChC;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhG;AAED,wBAAsB,oCAAoC,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASlG;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAW1E;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAM1D;AAED,wBAAsB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,WAAW,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAyBhC"}

package/dist/utils/file-utils.js

@@ -4,10 +4,42 @@ import { promises as fs } from 'node:fs';
 import { createHash, randomUUID } from 'node:crypto';
 import axios from 'axios';
 import { schedulerBaseUrl, runtimeToken } from '../config.js';
+const fileLocks = new Map();
 export async function ensureDir(targetDir) {
     await fs.mkdir(targetDir, { recursive: true });
     return targetDir;
 }
+export async function withFileLock(targetPath, operation) {
+    const lockKey = path.resolve(targetPath);
+    const previous = fileLocks.get(lockKey) ?? Promise.resolve();
+    let release;
+    const current = new Promise((resolve) => {
+        release = resolve;
+    });
+    const chained = previous.then(() => current);
+    fileLocks.set(lockKey, chained);
+    await previous;
+    try {
+        return await operation();
+    }
+    finally {
+        release();
+        if (fileLocks.get(lockKey) === chained) {
+            fileLocks.delete(lockKey);
+        }
+    }
+}
+export async function atomicWriteFile(targetPath, content) {
+    await ensureDir(path.dirname(targetPath));
+    const targetDir = path.dirname(targetPath);
+    const targetBase = path.basename(targetPath);
+    const tmpPath = path.join(targetDir, `.${targetBase}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+    await fs.writeFile(tmpPath, content, 'utf-8');
+    await fs.rename(tmpPath, targetPath);
+}
+export async function atomicWriteJsonFile(targetPath, value) {
+    await atomicWriteFile(targetPath, `${JSON.stringify(value, null, 2)}\n`);
+}
 export async function downloadSkillZip(skillPackage, targetDir) {
     if (!skillPackage || !skillPackage.downloadUrl) {
         return null;