@sdods/db 0.14.0 → 0.15.0

package/dist/switch/prune.js

@@ -1,8 +1,10 @@
-import { existsSync, rmSync } from 'node:fs';
-import { join } from 'node:path';
 import { sql } from 'kysely';
-import { deleteRun } from '../repos/runs.js';
-/** Delete old runs (and their artifact directories) beyond `keepRuns` per project or older than `keepDays`. */
+import { deleteRuns } from '../repos/retention.js';
+/**
+ * Delete old runs (and their artifact directories) beyond `keepRuns` per project or older than
+ * `keepDays`. Live runs are never deleted. Goes through {@link deleteRuns}, so it is
+ * transactional, audited and clears references to the deleted runs.
+ */
 export async function prune(adb, opts) {
     const { db } = adb;
     let q = db
@@ -12,8 +14,7 @@ export async function prune(adb, opts) {
         'runs.id as id',
         'projects.slug as slug',
         'runs.created_at as created_at',
-        'runs.started_at as started_at',
-        'runs.artifacts_dir as artifacts_dir',
+        'runs.status as status',
     ])
         .orderBy(sql `coalesce(runs.started_at, runs.created_at)`, 'desc');
     if (opts.projectSlug)
@@ -28,23 +29,19 @@ export async function prune(adb, opts) {
         const tooMany = opts.keepRuns !== undefined && n > opts.keepRuns;
         const tooOld = cutoff !== null && new Date(String(r.created_at)).getTime() < cutoff;
         if (tooMany || tooOld)
-            victims.push(r);
-    }
-    if (!opts.dryRun) {
-        for (const v of victims) {
-            await deleteRun(db, v.id);
-            const dir = v.artifacts_dir ?? (opts.artifactsRoot ? join(opts.artifactsRoot, v.id) : null);
-            if (dir && existsSync(dir))
-                rmSync(dir, { recursive: true, force: true });
-        }
+            victims.push(r.id);
     }
+    const res = await deleteRuns(adb, victims, {
+        artifactsRoot: opts.artifactsRoot,
+        dryRun: opts.dryRun,
+        reason: opts.reason ?? 'prune',
+        actor: opts.actor,
+    });
     return {
-        deleted: victims.map((v) => ({
-            id: v.id,
-            projectSlug: v.slug,
-            createdAt: String(v.created_at),
-        })),
-        kept: rows.length - victims.length,
+        deleted: res.deleted.map(({ id, projectSlug, createdAt }) => ({ id, projectSlug, createdAt })),
+        kept: rows.length - res.deleted.length,
+        skipped: res.skipped,
+        freedBytes: res.freedBytes,
     };
 }
 //# sourceMappingURL=prune.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdods/db",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "SDODS platform database: one schema on SQLite or Postgres, migrations, result ingest and insights.",
   "license": "Apache-2.0",
   "funding": "https://sdods.com/sponsor/",
@@ -25,7 +25,7 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@sdods/contracts": "0.14.0",
+    "@sdods/contracts": "0.15.0",
     "better-sqlite3": "^13.0.3",
     "kysely": "^0.29.6",
     "pg": "^8.23.1",