@tiny-fish/cli 0.46.1-next.362 → 0.46.1-next.363

package/dist/commands/profile.js

@@ -2,22 +2,75 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { createRequire } from 'module';
+import { z } from 'zod';
 import { getApiKey } from '../lib/auth.js';
 import { deriveChromeKey, listAuthRelevantHostKeys, openCookiesDb, readCookiesForHost, } from '../lib/chrome-cookies.js';
 import { profileCreate, profileUpload } from '../lib/client.js';
 import { err, errLine, handleApiError, out, outLine } from '../lib/output.js';
 // ── Helpers ───────────────────────────────────────────────────────────────────
-function getChromeCookiesPath() {
+const chromeLocalStateSchema = z.object({
+    profile: z.object({ last_used: z.string().optional() }).optional(),
+});
+function getChromeRoot() {
     const platform = process.platform;
     if (platform === 'darwin') {
-        return path.join(os.homedir(), 'Library', 'Application Support', 'Google', 'Chrome', 'Default', 'Cookies');
+        return path.join(os.homedir(), 'Library', 'Application Support', 'Google', 'Chrome');
     }
     if (platform === 'linux') {
-        return path.join(os.homedir(), '.config', 'google-chrome', 'Default', 'Cookies');
+        return path.join(os.homedir(), '.config', 'google-chrome');
     }
     // Windows guard — handled in withCookiesDb
     return '';
 }
+function sanitizeChromeProfile(profile) {
+    if (!profile || profile === '.' || profile === '..' || path.basename(profile) !== profile) {
+        throw new Error('Chrome profile must be a directory name such as "Default" or "Profile 1"');
+    }
+    return profile;
+}
+function assertChromePathContained(targetPath) {
+    const chromeRoot = fs.realpathSync(getChromeRoot());
+    const resolvedTarget = fs.realpathSync(targetPath);
+    const relative = path.relative(chromeRoot, resolvedTarget);
+    if (relative === '..' || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative)) {
+        throw new Error('Chrome data path resolves outside the Chrome data directory');
+    }
+}
+function getChromeCookiesPath(requestedProfile) {
+    const chromeRoot = getChromeRoot();
+    if (requestedProfile !== undefined) {
+        return path.join(chromeRoot, sanitizeChromeProfile(requestedProfile), 'Cookies');
+    }
+    const localStatePath = path.join(chromeRoot, 'Local State');
+    try {
+        fs.lstatSync(localStatePath);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return path.join(chromeRoot, 'Default', 'Cookies');
+        }
+        throw error;
+    }
+    try {
+        assertChromePathContained(localStatePath);
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            throw new Error('Could not read Chrome profile state. Use --chrome-profile to select a profile.');
+        }
+        throw error;
+    }
+    try {
+        const localState = chromeLocalStateSchema.parse(JSON.parse(fs.readFileSync(localStatePath, 'utf8')));
+        const lastUsed = localState.profile?.last_used;
+        if (!lastUsed)
+            throw new Error('missing last-used profile');
+        return path.join(chromeRoot, sanitizeChromeProfile(lastUsed), 'Cookies');
+    }
+    catch {
+        throw new Error('Could not read Chrome profile state. Use --chrome-profile to select a profile.');
+    }
+}
 function validateDomain(domain) {
     if (domain.includes('/') || domain.includes('://') || /\s/.test(domain) || /:\d/.test(domain)) {
         err({ error: 'domain must be a plain hostname (e.g. github.com)' });
@@ -25,14 +78,15 @@ function validateDomain(domain) {
     }
 }
 // Opens a private copy of Chrome's cookie DB, derives the decryption key, and calls fn.
-function withCookiesDb(fn) {
+function withCookiesDb(chromeProfile, fn) {
     if (process.platform === 'win32') {
         throw new Error('Cookie extraction is not supported on Windows yet');
     }
-    const cookiesPath = getChromeCookiesPath();
+    const cookiesPath = getChromeCookiesPath(chromeProfile);
     if (!fs.existsSync(cookiesPath)) {
-        throw new Error(`Chrome cookies file not found at ${cookiesPath}. Is Google Chrome installed?`);
+        throw new Error(`Chrome cookies file not found at ${cookiesPath}. Use --chrome-profile to select another Chrome profile.`);
     }
+    assertChromePathContained(cookiesPath);
     // Copy the DB out of the profile directory so we avoid the Chrome file lock.
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'tinyfish-chrome-cookies-'));
     let db;
@@ -41,8 +95,11 @@ function withCookiesDb(fn) {
         fs.copyFileSync(cookiesPath, dbPath);
         // Committed rows can sit in Cookies-wal until Chrome checkpoints.
         for (const ext of ['-wal', '-shm']) {
-            if (fs.existsSync(cookiesPath + ext))
-                fs.copyFileSync(cookiesPath + ext, dbPath + ext);
+            const source = cookiesPath + ext;
+            if (fs.existsSync(source)) {
+                assertChromePathContained(source);
+                fs.copyFileSync(source, dbPath + ext);
+            }
         }
         try {
             db = openCookiesDb(dbPath);
@@ -67,11 +124,11 @@ function withCookiesDb(fn) {
         }
     }
 }
-function extractChromeCookies(domain, stats) {
-    return withCookiesDb((db, key) => readCookiesForHost(db, key, domain, stats));
+function extractChromeCookies(domain, chromeProfile, stats) {
+    return withCookiesDb(chromeProfile, (db, key) => readCookiesForHost(db, key, domain, stats));
 }
-function extractAllChromeCookies(stats) {
-    return withCookiesDb((db, key) => {
+function extractAllChromeCookies(chromeProfile, stats) {
+    return withCookiesDb(chromeProfile, (db, key) => {
         let hostKeys;
         try {
             hostKeys = listAuthRelevantHostKeys(db);
@@ -162,8 +219,8 @@ function extractCookiesOrThrow(opts) {
     // if extraction fails (Windows, no Chrome, no cookies).
     const stats = { keyringSkipped: 0 };
     const cookies = opts.allDomains
-        ? extractAllChromeCookies(stats)
-        : extractChromeCookies(opts.domain, stats);
+        ? extractAllChromeCookies(opts.chromeProfile, stats)
+        : extractChromeCookies(opts.domain, opts.chromeProfile, stats);
     // Warn even on partial success — surviving plaintext rows can mask
     // that every auth cookie was keyring-encrypted and skipped.
     if (stats.keyringSkipped > 0) {
@@ -232,6 +289,7 @@ export function registerProfile(program) {
         .description('Import Chrome cookies into a profile. Use --domain for a single domain or --all-domains for every domain in your Chrome profile. Exactly one must be provided.')
         .option('--domain <domain>', 'Domain to import cookies for (e.g. github.com)')
         .option('--all-domains', 'Import cookies for all registrable domains (e.g. github.com) found in your Chrome profile. IPs and non-resolvable hostnames (e.g. localhost) are skipped.')
+        .option('--chrome-profile <name>', 'Chrome profile directory (auto-detects the last-used profile by default)')
         .option('--profile-id <id>', 'Profile ID to import cookies into (creates new profile if omitted)')
         .option('--pretty', 'Human-readable output')
         .action(async (opts) => {
@@ -256,9 +314,10 @@ export function registerProfile(program) {
                 const created = await profileCreate(name, apiKey);
                 profileId = created.id;
             }
-            const result = opts.allDomains
+            const uploadResult = opts.allDomains
                 ? await uploadAllDomains(profileId, cookies, apiKey)
                 : await profileUpload(profileId, cookies, apiKey);
+            const result = { ...uploadResult, profile_id: profileId };
             if (result.domains_failed && result.domains_failed.length > 0) {
                 errLine(`Warning: failed to update cookies for domains: ${result.domains_failed.join(', ')}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiny-fish/cli",
-  "version": "0.46.1-next.362",
+  "version": "0.46.1-next.363",
   "description": "TinyFish CLI — run web automations from your terminal",
   "type": "module",
   "bin": {