parrot-blackbox 1.0.3 → 1.0.5

package/README.md

@@ -16,7 +16,7 @@ Parrot install died" — a single CLI + background daemon that:
    missed backups are run **in order, oldest first, the moment WiFi is back**.
    Every job is journalled and retried; a lock prevents collisions; state is
    written atomically. Nothing is silently lost.
-4. **Manages ~150 GB of free cloud storage for you** — 5 MEGA + 5 Google Drive
+4. **Manages ~175 GB of free cloud storage for you** — 5 MEGA + 5 Google Drive
    accounts are connected as one pool. Files are placed whole on whichever
    account has the most relative headroom; anything bigger than a single
    account's free space is split into byte-range chunks across accounts and a
@@ -436,13 +436,14 @@ y/e> y                                       ⬅ y confirms permanent deletion
 ## How the smart storage pool works
 
 ```
-5 MEGA      (20 GiB each)
-5 Drive     (10 GiB each)
+5 MEGA      (20 GiB each)     = 100 GiB
+5 Drive     (15 GiB each)     =  75 GiB   ← Google Drive free tier is 15 GiB
 ──────────────────────────────
-≈ 150 GiB managed automatically
+≈ 175 GiB managed automatically
 ```
 
-- Every account is exactly one rclone remote (`mega-1:`, `drive-2:` …).
+(Your live `account list` proves it: 10 accounts → 175 GiB total.)
+Every account is exactly one rclone remote (`mega-1:`, `gdrive-6:` …).
 - Each backup has **one manifest** that records where every file (or chunk) is.
 - Placement picks the account that would end up with the **lowest used
   percentage** (water-filling), then most free.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "parrot-blackbox — 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/snapshot.js

@@ -17,7 +17,7 @@ import { refreshAccounts } from '../storage/accounts.js';
 import { planAndPlace } from '../storage/allocator.js';
 import { listArtifacts, removeArtifact } from '../storage/archive.js';
 import { planPrune } from './retention.js';
-import { sudoInteractive, sudoNonInteractive } from '../util/sudo.js';
+import { sudoInteractive, sudoNonInteractive, sudoInteractiveCapture } from '../util/sudo.js';
 
 export class SudoDeferredError extends Error {
   constructor() {
@@ -50,18 +50,33 @@ function findPathInLine(line) {
     null;
 }
 
-/** `timeshift --list` works WITHOUT root — run it directly (no sudo hang risk). */
-async function runTimeshiftList() {
+/**
+ * `timeshift --list` needs admin on most installs — run it with sudo.
+ * Interactive: capture stdout while keeping stdin (so the sudo password
+ * prompt works). Non-interactive: `sudo -n`, falling back to a direct call
+ * for the few builds that allow unprivileged listing.
+ */
+async function runTimeshiftList({ privileged = 'noninteractive' } = {}) {
+  if (privileged === 'interactive') {
+    try {
+      const res = await sudoInteractiveCapture(['timeshift', '--list']);
+      return (res.exitCode === 0 ? res.stdout : res.stdout || res.stderr) || '';
+    } catch {
+      return '';
+    }
+  }
   try {
-    const res = await execa('timeshift', ['--list'], { reject: false });
-    return (res.exitCode === 0 ? res.stdout : res.stdout || res.stderr) || '';
+    const res = await sudoNonInteractive(['timeshift', '--list']);
+    if (res.exitCode === 0) return res.stdout || '';
+    const direct = await execa('timeshift', ['--list'], { reject: false });
+    return (direct.exitCode === 0 ? direct.stdout : direct.stdout || direct.stderr) || '';
   } catch {
     return '';
   }
 }
 
 export async function listLocalSnapshots({ privileged = 'noninteractive' } = {}) {
-  const text = await runTimeshiftList();
+  const text = await runTimeshiftList({ privileged });
   return parseTimeshiftList(text);
 }
 

package/src/cli.js

@@ -293,7 +293,7 @@ async function remoteCommands(rest) {
           message: 'Provider?',
           options: [
             { value: 'mega', label: 'MEGA (20 GB free tier)' },
-            { value: 'gdrive', label: 'Google Drive (10 GB free tier)' },
+            { value: 'gdrive', label: 'Google Drive (15 GB free tier)' },
           ],
         });
         if (p.isCancel(choice)) return;

package/src/commands/manage.js

@@ -185,14 +185,29 @@ export async function runRepair({ auto = false } = {}) {
   // 3. Service
   try {
     const { serviceFile, daemonLogFile } = await import('../core/paths.js');
-    const { serviceBackend } = await import('./service.js');
+    const { serviceBackend, installService } = await import('./service.js');
     const fsMod = await import('node:fs');
-    if (serviceBackend() === 'systemd' && !fsMod.existsSync(serviceFile())) {
-      const backend = await installService();
-      p.log.success(`Always-on service re-installed via ${backend}.`);
-      fixed.push('service');
+    if (serviceBackend() === 'systemd') {
+      // The ExecStart line must reference a REAL absolute path; the v1.0.4 unit
+      // wrote `node parrot-blackbox daemon foreground` (bare name) which crashed
+      // with "Cannot find module '/home/artkins/parrot-blackbox'".
+      let unitOk = false;
+      try {
+        const unit = fsMod.readFileSync(serviceFile(), 'utf8');
+        const execLine = unit.split('\n').find((l) => l.startsWith('ExecStart=')) || '';
+        unitOk = fsMod.existsSync(serviceFile()) && /ExecStart=\S+/.test(execLine) && /\//.test(execLine);
+      } catch {
+        unitOk = false;
+      }
+      if (!unitOk) {
+        const backend = await installService();
+        p.log.success(`Always-on service re-written via ${backend}.`);
+        fixed.push('service');
+      } else {
+        p.log.success('Service OK.');
+      }
     } else {
-      p.log.success('Service OK.');
+      p.log.success('Service backend OK.');
     }
   } catch (e) {
     p.log.warn(`Service check failed: ${e.message}`);

package/src/commands/remote.js

@@ -115,7 +115,7 @@ export async function registerRemotesAsAccounts() {
       message: `Provider for "${remote}"?`,
       options: [
         { value: 'mega', label: 'MEGA (20 GB free tier)' },
-        { value: 'gdrive', label: 'Google Drive (10 GB free tier)' },
+        { value: 'gdrive', label: 'Google Drive (15 GB free tier)' },
       ],
     });
     if (p.isCancel(provider)) continue;

package/src/commands/service.js

@@ -7,6 +7,7 @@
 
 import fs from 'node:fs';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { execa } from 'execa';
 import { serviceFile, daemonLogFile } from '../core/paths.js';
 import { loadConfig, journal, hasCommandSync } from '../core/store.js';
@@ -15,6 +16,8 @@ function findCliBin() {
   // npm-installed global binary (preferred) or our own bin entry.
   const candidates = [
     process.env.PBB_BIN,
+    // This module lives in src/commands/ → ../../bin/parrot-blackbox.js
+    path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..', 'bin', 'parrot-blackbox.js'),
     path.join(path.dirname(process.argv[1] || ''), 'parrot-blackbox.js'),
   ];
   return candidates.find((c) => c && fs.existsSync(c)) || 'parrot-blackbox';

package/src/commands/setup.js

@@ -99,7 +99,7 @@ async function storagePoolStep() {
         message: 'Which provider?',
         options: [
           { value: 'mega', label: 'MEGA (20 GB free tier)' },
-          { value: 'gdrive', label: 'Google Drive (10 GB free tier)' },
+          { value: 'gdrive', label: 'Google Drive (15 GB free tier)' },
         ],
       });
       if (p.isCancel(provider)) break;

package/src/commands/wizard.js

@@ -51,7 +51,7 @@ async function addAccountAction() {
       message: 'Which provider?',
       options: [
         { value: 'mega', label: 'MEGA (20 GB free tier)' },
-        { value: 'gdrive', label: 'Google Drive (10 GB free tier)' },
+        { value: 'gdrive', label: 'Google Drive (15 GB free tier)' },
         { value: 'back', label: '← Back' },
       ],
     });

package/src/core/store.js

@@ -52,7 +52,7 @@ export function defaultConfig() {
       chunkSize: 2 * GiB,
       providers: {
         mega: { defaultQuotaGiB: 20 },
-        gdrive: { defaultQuotaGiB: 10 },
+        gdrive: { defaultQuotaGiB: 15 },
       },
       accounts: [], // {id, provider, label, remote, quotaGiB?}
     },