parrot-blackbox 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "1.0.4",
+  "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/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/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';