let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(cron): move store into ~/.clawdis/cron

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-13 12:38:08 +00:00
parent 3863fe6412
commit 3e2e4be680
10 changed files with 90 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cron/store.ts
View File

@@ -6,12 +6,9 @@ import JSON5 from "json5";
import { CONFIG_DIR } from "../utils.js";
import type { CronStoreFile } from "./types.js";
export const LEGACY_CRON_STORE_PATH = path.join(
CONFIG_DIR,
"cron",
"jobs.json",
);
export const DEFAULT_CRON_STORE_PATH = path.join(CONFIG_DIR, "cron.json");
export const DEFAULT_CRON_DIR = path.join(CONFIG_DIR, "cron");
export const DEFAULT_CRON_STORE_PATH = path.join(DEFAULT_CRON_DIR, "jobs.json");
export const LEGACY_FLAT_CRON_STORE_PATH = path.join(CONFIG_DIR, "cron.json");
export function resolveCronStorePath(storePath?: string) {
if (storePath?.trim()) {
@@ -20,11 +17,52 @@ export function resolveCronStorePath(storePath?: string) {
return path.resolve(raw.replace("~", os.homedir()));
return path.resolve(raw);
}
if (fs.existsSync(LEGACY_CRON_STORE_PATH)) return LEGACY_CRON_STORE_PATH;
return DEFAULT_CRON_STORE_PATH;
}
async function maybeMigrateLegacyFlatStore(storePath: string) {
const resolved = path.resolve(storePath);
const resolvedDefault = path.resolve(DEFAULT_CRON_STORE_PATH);
if (resolved !== resolvedDefault) return;
if (fs.existsSync(resolved)) return;
if (!fs.existsSync(LEGACY_FLAT_CRON_STORE_PATH)) return;
try {
const raw = await fs.promises.readFile(
LEGACY_FLAT_CRON_STORE_PATH,
"utf-8",
);
const parsed = JSON5.parse(raw) as Partial<CronStoreFile> | null;
const jobs = Array.isArray(parsed?.jobs) ? (parsed?.jobs as never[]) : [];
const store: CronStoreFile = {
version: 1,
jobs: jobs.filter(Boolean) as never as CronStoreFile["jobs"],
};
await saveCronStore(storePath, store);
await fs.promises.mkdir(DEFAULT_CRON_DIR, { recursive: true });
const destBase = path.join(DEFAULT_CRON_DIR, "cron.json.migrated");
const dest = fs.existsSync(destBase)
? path.join(
DEFAULT_CRON_DIR,
`cron.json.migrated.${process.pid}.${Math.random().toString(16).slice(2)}`,
)
: destBase;
try {
await fs.promises.rename(LEGACY_FLAT_CRON_STORE_PATH, dest);
} catch {
await fs.promises.copyFile(LEGACY_FLAT_CRON_STORE_PATH, dest);
await fs.promises.unlink(LEGACY_FLAT_CRON_STORE_PATH).catch(() => {
/* ignore */
});
}
} catch {
// Best-effort; keep legacy store if anything fails.
}
}
export async function loadCronStore(storePath: string): Promise<CronStoreFile> {
await maybeMigrateLegacyFlatStore(storePath);
try {
const raw = await fs.promises.readFile(storePath, "utf-8");
const parsed = JSON5.parse(raw) as Partial<CronStoreFile> | null;