parrot-blackbox 2.0.6 → 2.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "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/cli.js

@@ -19,7 +19,7 @@ import { listAccounts, addAccount, removeAccount, refreshAccounts, poolSummary }
 import { listArtifacts } from './storage/archive.js';
 import { loadConfig, loadState, saveConfig } from './core/store.js';
 import { configFile, stateDir } from './core/paths.js';
-import { bytesHuman } from './util/misc.js';
+import { bytesHuman, makeProgressRenderer } from './util/misc.js';
 import { isOnline } from './util/network.js';
 
 const require = createRequire(import.meta.url);
@@ -388,7 +388,9 @@ const main = defineCommand({
       case 'force':
       case 'backup': {
         // Runs every ENABLED job right now (default = the weekly snapshot).
-        const res = await runDueJobs({ force: true, privileged: 'interactive' });
+        const progress = makeProgressRenderer();
+        const res = await runDueJobs({ force: true, privileged: 'interactive', onProgress: progress });
+        progress.stop();
         const report = res.report || [];
         if (report.length === 0) console.log(pc.dim('No enabled backup jobs — run `parrot-blackbox` to set up the schedule.'));
         for (const r of report) {
@@ -410,7 +412,9 @@ const main = defineCommand({
         const [sub, ...args] = rest;
         if (sub === 'now' || sub === 'create' || sub === 'force') {
           try {
-            const r = await runSnapshotNow();
+            const progress = makeProgressRenderer();
+            const r = await runSnapshotNow(undefined, undefined, { onProgress: progress });
+            progress.stop();
             console.log(`${pc.green('✔')} Snapshot ${r.snapshot} created & uploaded (${bytesHuman(r.manifest.totalSize)}).`);
             if (r.pruned?.length) console.log(pc.dim(`Pruned: ${r.pruned.join(', ')}`));
           } catch (e) {

package/src/commands/wizard.js

@@ -24,7 +24,7 @@ import { installService, removeService } from './service.js';
 import { startDaemon, stopDaemon, daemonRunning } from '../daemon/daemon.js';
 import { runDoctor, runStatus, runUninstallWizard } from './manage.js';
 import { runSetup } from './setup.js';
-import { bytesHuman } from '../util/misc.js';
+import { bytesHuman, makeProgressRenderer } from '../util/misc.js';
 
 const require = createRequire(import.meta.url);
 const pkg = require('../../package.json');
@@ -163,7 +163,9 @@ async function backupNowAction() {
 /** Create + upload a snapshot immediately. */
 async function snapshotNowAction() {
   try {
-    const r = await runSnapshotNow();
+    const progress = makeProgressRenderer();
+    const r = await runSnapshotNow(undefined, undefined, { onProgress: progress });
+    progress.stop();
     p.log.success(`✔ Snapshot ${r.snapshot} created & uploaded (${bytesHuman(r.manifest?.totalSize ?? 0)}).`);
     if (r.pruned?.length) p.log.message(pc.dim(`Pruned: ${r.pruned.join(', ')}`));
   } catch (e) {

package/src/storage/allocator.js

@@ -269,6 +269,12 @@ export async function planAndPlaceStream(btrfsStream, { kind, id, accounts, remo
   let locs = [];
   let currentStart = 0;
   let target = getNextAccountAndPath();
+
+  // Speed tracking
+  let speedBytesWindow = 0;
+  let speedWindowStart = Date.now();
+  let currentSpeedMBs = 0;
+  const SPEED_WINDOW_MS = 1500; // recalculate speed every 1.5 s
   
   currentChild = spawn(process.env.PBB_RCLONE || 'rclone', ['rcat', `${target.remote}:${target.path}`]);
   let childFailed = false;
@@ -287,6 +293,7 @@ export async function planAndPlaceStream(btrfsStream, { kind, id, accounts, remo
       
       currentBytesInChunk += toWrite;
       totalBytes += toWrite;
+      speedBytesWindow += toWrite;
       offset += toWrite;
       
       if (!canContinue) {
@@ -309,7 +316,24 @@ export async function planAndPlaceStream(btrfsStream, { kind, id, accounts, remo
         currentChild.on('exit', (code) => { if (code !== 0) childFailed = true; });
       }
     }
-    if (onProgress) onProgress({ done: totalBytes, total: originalSize, text: `uploading stream: ${(totalBytes / (1024**2)).toFixed(1)} MB` });
+
+    // Recalculate speed on each chunk and emit progress
+    if (onProgress) {
+      const now = Date.now();
+      const elapsed = now - speedWindowStart;
+      if (elapsed >= SPEED_WINDOW_MS) {
+        currentSpeedMBs = (speedBytesWindow / (1024 * 1024)) / (elapsed / 1000);
+        speedBytesWindow = 0;
+        speedWindowStart = now;
+      }
+      onProgress({
+        done: totalBytes,
+        total: originalSize,
+        speedMBs: currentSpeedMBs,
+        remote: target.remote,
+        text: `uploading stream: ${(totalBytes / (1024 ** 2)).toFixed(1)} MB`,
+      });
+    }
   }
   
   if (currentChild) {

package/src/util/misc.js

@@ -111,4 +111,54 @@ export function shellQuote(s) {
 
 export function pad2(n) {
   return String(n).padStart(2, '0');
+}
+
+/**
+ * Returns an onProgress handler that renders a live, in-place progress bar
+ * with percentage, MB transferred, and upload speed.
+ *
+ * Expected event shape:
+ *   { done: number (bytes), total: number (bytes or 0), speedMBs?: number, remote?: string }
+ *
+ * Call renderer.stop() when done to advance to the next line.
+ *
+ * When `total` is 0 (stream size unknown) we display bytes + speed only.
+ */
+export function makeProgressRenderer() {
+  const isTTY = process.stdout.isTTY;
+  const BAR_WIDTH = 25;
+  let lastLine = '';
+
+  function render({ done = 0, total = 0, speedMBs = 0, remote = '' } = {}) {
+    const doneMB = done / (1024 * 1024);
+    const totalMB = total / (1024 * 1024);
+    const speedStr = speedMBs > 0 ? `  ${speedMBs.toFixed(1)} MB/s` : '';
+    const destStr  = remote ? `  → ${remote}` : '';
+
+    let line;
+    if (total > 0) {
+      const pct    = Math.min(100, Math.round((done / total) * 100));
+      const filled = Math.round((pct / 100) * BAR_WIDTH);
+      const bar    = '█'.repeat(filled) + '░'.repeat(BAR_WIDTH - filled);
+      line = `  [${bar}] ${String(pct).padStart(3)}%  ${doneMB.toFixed(1)} MB / ${totalMB.toFixed(1)} MB${speedStr}${destStr}`;
+    } else {
+      line = `  ⬆  ${doneMB.toFixed(1)} MB streamed${speedStr}${destStr}`;
+    }
+
+    if (isTTY) {
+      process.stdout.write(`\r${line}\x1b[K`);
+    } else if (line !== lastLine) {
+      // Non-TTY (piped / daemon log): only emit when something changes to
+      // avoid flooding the journal with thousands of identical lines.
+      process.stdout.write(line + '\n');
+    }
+    lastLine = line;
+  }
+
+  render.stop = function stop() {
+    if (isTTY && lastLine) process.stdout.write('\n');
+    lastLine = '';
+  };
+
+  return render;
 }