parrot-blackbox 2.1.2 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "Crash-proof, multi-cloud backup & recovery automation for Parrot OS. Daily/weekly off-disk backups with automatic catch-up, smart storage across many MEGA + Google Drive accounts, Timeshift snapshot backups and one-command restore.",
   "type": "module",
   "main": "src/cli.js",

package/src/backup/urgent.js

@@ -103,8 +103,25 @@ export function buildUrgentBundle({ home = process.env.HOME } = {}) {
  */
 export async function runUrgentBackup(cfg = loadConfig(), state = loadState(), { onProgress } = {}) {
   const now = clock();
-  const id = iso(now);
-  journal('urgent', `start id=${id}`);
+
+  // ── Resume an interrupted upload ─────────────────────────────────────────
+  // If a previous urgent upload died mid-transfer (power cut / crash / Ctrl+C),
+  // a pending marker was persisted in state BEFORE any long work began. On the
+  // next run we REUSE that id so `planAndPlace` writes back into the SAME cloud
+  // directory — rclone copy is per-file idempotent, so already-uploaded files
+  // are skipped and only the remainder is transferred, then the manifest is
+  // rewritten once the last file lands. The bundle itself is regenerated (the
+  // staging dir is transient), which is fine because the sources are fixed.
+  const resumed = Boolean(state.urgentPending?.id);
+  const id = resumed ? state.urgentPending.id : iso(now);
+  if (!resumed) {
+    state.urgentPending = { id, since: iso(now) };
+    saveState(state); // persist the marker before any long work → crash-safe
+    journal('urgent', `start id=${id}`);
+  } else {
+    journal('urgent', `resume id=${id} (previous upload was interrupted)`);
+  }
+
   const bundle = buildUrgentBundle();
 
   const accounts = await refreshAccounts(cfg);
@@ -134,11 +151,16 @@ export async function runUrgentBackup(cfg = loadConfig(), state = loadState(), {
     totalSize: manifest.totalSize,
     entryCount: manifest.entries?.length || 0,
   };
+  // Only clear the pending marker once the upload FULLY landed (manifest is on
+  // the cloud + mirrored locally). If we crash before this line, the next run
+  // resumes the same id — re-copying is a no-op for finished files.
+  delete state.urgentPending;
   saveState(state);
   journal('urgent', `done id=${id} bytes=${manifest.totalSize}`);
 
   return {
     id,
+    resumed,
     manifest,
     sizeBytes: manifest.totalSize,
     skippedRepos: bundle.skippedRepos,

package/src/cli.js

@@ -423,7 +423,7 @@ const main = defineCommand({
         try {
           const r = await runUrgentBackup(undefined, undefined, { onProgress: progress });
           progress.stop();
-          console.log(`${pc.green('✔')} Urgent backup stored (${bytesHuman(r.sizeBytes)}). Restore with: \`parrot-blackbox restore urgent\`.`);
+          console.log(`${pc.green('✔')} Urgent backup ${r.resumed ? 'resumed & ' : ''}stored (${bytesHuman(r.sizeBytes)}). Restore with: \`parrot-blackbox restore urgent\`.`);
           if (r.skippedRepos?.length) console.log(pc.dim(`Skipped ${r.skippedRepos.length} git-tracked folder(s).`));
           if (r.missing?.length) console.log(pc.dim(`Source(s) not present, skipped: ${r.missing.join(', ')}.`));
         } catch (e) {