parrot-blackbox 1.0.9 → 1.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parrot-blackbox",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "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

@@ -197,7 +197,7 @@ export function snapshotDirFor(snapshot, { privileged = 'noninteractive' } = {})
     
     // Get the device that contains the root filesystem
     const deviceResult = execaSync('findmnt', ['-n', '-o', 'SOURCE', '/'], { reject: false });
-    const device = deviceResult.stdout.trim();
+    const device = deviceResult.stdout.trim().split('[')[0];
     
     if (device && deviceResult.exitCode === 0) {
       // Create temporary mount point
@@ -268,14 +268,25 @@ export async function runSnapshotBackup(cfg, state, { due, privileged = 'noninte
 
   let manifest;
   try {
-    manifest = await planAndPlace(dir, {
-      kind: 'snapshots',
-      id: created.name,
-      accounts,
-      remoteRoot: cfg.storage.remoteRoot,
-      chunkSize: cfg.storage.chunkSize,
-      onProgress,
-    });
+    const bin = process.argv[1] || 'parrot-blackbox';
+    const outPath = path.join(process.env.PBB_STATE_DIR || '/tmp', `manifest-${created.name}.json`);
+    const baseArgs = [process.execPath, bin, '_internal_upload', dir, 'snapshots', created.name, cfg.storage.remoteRoot, String(cfg.storage.chunkSize), outPath];
+    const args = process.env.PBB_SUDO_DIRECT === '1' ? baseArgs : ['-E', ...baseArgs];
+    
+    let res;
+    if (privileged === 'interactive') {
+      res = await sudoInteractive(args);
+    } else {
+      res = await sudoNonInteractive(args);
+    }
+    
+    if (res.exitCode !== 0) {
+      throw new Error(`upload failed (exit ${res.exitCode})`);
+    }
+    
+    const manifestStr = fs.readFileSync(outPath, 'utf8');
+    manifest = JSON.parse(manifestStr);
+    try { fs.rmSync(outPath, {force: true}); } catch {}
   } catch (e) {
     // The local snapshot exists and is safe; the cloud upload failed.
     journal('snapshots', `upload failed for ${created.name}: ${e.message}`, 'error');

package/src/cli.js

@@ -512,6 +512,36 @@ const main = defineCommand({
         console.log(`parrot-blackbox v${pkg.version}`);
         return;
 
+      case '_internal_upload': {
+        const localDir = rest[0];
+        const kind = rest[1];
+        const id = rest[2];
+        const remoteRoot = rest[3];
+        const chunkSize = parseInt(rest[4], 10);
+        const outPath = rest[5];
+        const { planAndPlace } = await import('./storage/allocator.js');
+        const s = p.spinner();
+        s.start(`Uploading snapshot ${id}...`);
+        const cfg = loadConfig();
+        const accs = await refreshAccounts(cfg);
+        try {
+          const manifest = await planAndPlace(localDir, { 
+            kind, id, accounts: accs, remoteRoot, chunkSize,
+            onProgress: (prog) => {
+              s.message(prog.text);
+            }
+          });
+          s.stop('✔ Upload complete');
+          import('node:fs').then(fs => fs.writeFileSync(outPath, JSON.stringify(manifest)));
+          process.exitCode = 0;
+        } catch (e) {
+          s.stop('✖ Upload failed');
+          console.error(`_internal_upload failed: ${e.message}`);
+          process.exitCode = 1;
+        }
+        return;
+      }
+
       case 'help':
       case '-h':
       case '--help':
@@ -522,6 +552,4 @@ const main = defineCommand({
         process.exitCode = 1;
     }
   },
-});
-
-runMain(main);
+});runMain(main);