feat(agents): concurrent all-agent-driver upgrade

This commit is contained in:
Abeautifulsnow authored and GitHub committed 2026-07-24 23:50:50 +08:00
1 parent 2a99f91099
commit 95db01e359
15 files changed
+1083 -282

No files matched your search

@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest";
import { driverInstallProgressChannel, updateDriverInstallProgress, type DriverInstallProgress } from "@/lib/connection/driverInstallProgressUi";
import { driverInstallProgressChannel, isDriverInstallProgressForOperation, isDriverInstallProgressTarget, updateDriverInstallProgress, updatePerDriverProgress, type DriverInstallProgress } from "@/lib/connection/driverInstallProgressUi";
describe("driver install progress channels", () => {
it("classifies agent and JDBC plugin progress independently", () => {
@@ -17,6 +17,16 @@ describe("driver install progress channels", () => {
expect(updateDriverInstallProgress(jdbcProgress, agentProgress, "jdbc-plugin")).toBe(jdbcProgress);
});
it("rejects progress and terminal events from another operation", () => {
expect(isDriverInstallProgressForOperation({ operation_id: "upgrade-b", step: "driver", db_type: "mysql" }, "upgrade-a")).toBe(false);
expect(isDriverInstallProgressForOperation({ operation_id: "upgrade-b", step: "all-done" }, "upgrade-a")).toBe(false);
expect(isDriverInstallProgressForOperation({ operation_id: "upgrade-a", step: "all-done" }, "upgrade-a")).toBe(true);
});
it("keeps legacy progress compatible when no operation id is emitted", () => {
expect(isDriverInstallProgressForOperation({ step: "driver", db_type: "mysql" }, "upgrade-a")).toBe(true);
});
it("allows a built-in driver backed by JDBC to consume JDBC progress explicitly", () => {
const jdbcProgress: DriverInstallProgress = { step: "jdbc-plugin", downloaded: 40, total: 100 };
@@ -41,4 +51,27 @@ describe("driver install progress channels", () => {
expect(updateDriverInstallProgress(agentProgress, ambiguousDone, "agent")).toBe(agentProgress);
expect(updateDriverInstallProgress(jdbcProgress, ambiguousDone, "jdbc-plugin")).toBe(jdbcProgress);
});
it("keeps other drivers visible when one concurrent update completes", () => {
const progressByDbType: Record<string, DriverInstallProgress | null | undefined> = {};
updatePerDriverProgress(progressByDbType, { step: "driver", db_type: "mysql", downloaded: 50, total: 100 });
updatePerDriverProgress(progressByDbType, { step: "driver", db_type: "oracle", downloaded: 25, total: 100 });
updatePerDriverProgress(progressByDbType, { step: "done", db_type: "mysql" });
expect(progressByDbType.mysql).toBeNull();
expect(progressByDbType.oracle).toMatchObject({ step: "driver", downloaded: 25 });
expect(isDriverInstallProgressTarget("oracle", { installing: null, upgradingAll: true, progressMap: progressByDbType })).toBe(true);
});
it("clears all tracked progress on a batch completion event", () => {
const progressByDbType: Record<string, DriverInstallProgress | null | undefined> = {
mysql: { step: "driver", db_type: "mysql", downloaded: 50, total: 100 },
oracle: { step: "driver", db_type: "oracle", downloaded: 25, total: 100 },
};
updatePerDriverProgress(progressByDbType, { step: "all-done" });
expect(progressByDbType.mysql).toBeNull();
expect(progressByDbType.oracle).toBeNull();
});
});
@@ -1,20 +1,31 @@
export interface DriverInstallProgress {
operation_id?: string;
step: string;
downloaded?: number;
total?: number;
db_type?: string;
/** Number of drivers completed so far during a batch upgrade (1-based). */
completed?: number;
/** Total drivers in the batch. */
total_drivers?: number;
}
export interface DriverInstallProgressTargetState {
installing: string | null;
upgradingAll: boolean;
progress: DriverInstallProgress | null;
progressMap: Record<string, DriverInstallProgress | null | undefined>;
}
export type DriverInstallProgressChannel = "agent" | "jdbc-plugin";
const AGENT_PROGRESS_STEPS = new Set(["driver", "jre", "jre-extract", "all-done"]);
export function isDriverInstallProgressForOperation(progress: DriverInstallProgress, operationId: string | null): boolean {
// Keep accepting legacy unscoped events, while preventing another active
// install's terminal/progress event from mutating this dialog.
return !progress.operation_id || progress.operation_id === operationId;
}
export function driverInstallProgressChannel(progress: DriverInstallProgress): DriverInstallProgressChannel | null {
if (progress.step === "jdbc-plugin" || progress.step === "jdbc-plugin-extract") return "jdbc-plugin";
if (progress.db_type || AGENT_PROGRESS_STEPS.has(progress.step)) return "agent";
@@ -28,7 +39,26 @@ export function updateDriverInstallProgress(current: DriverInstallProgress | nul
return incoming;
}
export function driverInstallProgressPercent(progress: DriverInstallProgress | null): number | null {
/**
* Update a per-driver progress map with an incoming event.
* Returns the updated map (mutated in-place — returned for convenience).
*/
export function updatePerDriverProgress(progressMap: Record<string, DriverInstallProgress | null | undefined>, incoming: DriverInstallProgress): Record<string, DriverInstallProgress | null | undefined> {
if (incoming.step === "all-done") {
// Batch completion has no db_type, so it must be handled before routing.
for (const key of Object.keys(progressMap)) {
progressMap[key] = null;
}
return progressMap;
}
const dbType = incoming.db_type;
if (!dbType) return progressMap;
progressMap[dbType] = incoming.step === "done" ? null : incoming;
return progressMap;
}
export function driverInstallProgressPercent(progress: DriverInstallProgress | null | undefined): number | null {
if (!progress?.total || progress.total <= 0) return null;
const percent = Math.round(((progress.downloaded ?? 0) / progress.total) * 100);
return Math.min(100, Math.max(0, percent));
@@ -36,7 +66,11 @@ export function driverInstallProgressPercent(progress: DriverInstallProgress | n
export function isDriverInstallProgressTarget(dbType: string, state: DriverInstallProgressTargetState): boolean {
if (state.installing === dbType) return true;
return state.upgradingAll && state.progress?.db_type === dbType;
if (!state.upgradingAll) return false;
// During batch upgrade, check the per-driver map — the driver is "active"
// if it has a (non-null, non-"done") progress entry.
const progress = state.progressMap[dbType];
return progress !== null && progress !== undefined;
}
export function addDriverInstallQueue(queue: string[], dbType: string, activeDbType: string | null): string[] {