osintkit 0.1.3 → 0.1.4

package/bin/osintkit.js

@@ -1,42 +1,54 @@
 #!/usr/bin/env node
-const { spawn } = require('child_process');
+const { spawn, spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-// The npm package root is one level up from bin/
 const packageDir = path.dirname(path.dirname(__filename));
+const isWin = process.platform === 'win32';
+
+const venvPython = isWin
+    ? path.join(packageDir, '.venv', 'Scripts', 'python.exe')
+    : path.join(packageDir, '.venv', 'bin', 'python3');
+
+// If venv doesn't exist yet, run postinstall first (self-healing first run)
+if (!fs.existsSync(venvPython)) {
+    const postinstall = path.join(packageDir, 'postinstall.js');
+    if (fs.existsSync(postinstall)) {
+        console.log('osintkit: first run — setting up Python environment...');
+        const r = spawnSync(process.execPath, [postinstall], {
+            stdio: 'inherit',
+            cwd: packageDir,
+        });
+        if (!fs.existsSync(venvPython)) {
+            console.error('\nosintkit: setup failed. Run manually:');
+            console.error(`  node ${postinstall}`);
+            process.exit(1);
+        }
+    }
+}
 
-// Prefer venv Python (installed by postinstall), fall back to system Python.
-// Checks both Unix (.venv/bin/) and Windows (.venv/Scripts/) paths.
 function findPython() {
+    // Prefer venv Python (Unix + Windows)
     const venvCandidates = [
-        path.join(packageDir, '.venv', 'bin', 'python3'),        // Unix
-        path.join(packageDir, '.venv', 'bin', 'python'),          // Unix fallback
-        path.join(packageDir, '.venv', 'Scripts', 'python.exe'),  // Windows
-        path.join(packageDir, 'venv', 'bin', 'python3'),          // Unix alt name
-        path.join(packageDir, 'venv', 'bin', 'python'),           // Unix alt fallback
-        path.join(packageDir, 'venv', 'Scripts', 'python.exe'),   // Windows alt name
+        path.join(packageDir, '.venv', 'bin', 'python3'),
+        path.join(packageDir, '.venv', 'bin', 'python'),
+        path.join(packageDir, '.venv', 'Scripts', 'python.exe'),
+        path.join(packageDir, 'venv', 'bin', 'python3'),
+        path.join(packageDir, 'venv', 'Scripts', 'python.exe'),
     ];
     for (const p of venvCandidates) {
         if (fs.existsSync(p)) return p;
     }
-
     // Fall back to system Python
-    const systemCandidates = process.platform === 'win32'
-        ? ['python', 'python3']
-        : ['python3.11', 'python3', 'python'];
+    const systemCandidates = isWin ? ['python', 'python3'] : ['python3.11', 'python3', 'python'];
     for (const bin of systemCandidates) {
-        try {
-            require('child_process').execSync(`${bin} --version`, { stdio: 'ignore' });
-            return bin;
-        } catch (_) {}
+        const r = spawnSync(bin, ['--version'], { stdio: 'pipe' });
+        if (r.status === 0) return bin;
     }
     return 'python3';
 }
 
 const pythonBin = findPython();
-
-// Always set PYTHONPATH so the package is importable regardless of install method
 const env = {
     ...process.env,
     PYTHONPATH: process.env.PYTHONPATH

package/osintkit/__init__.py

@@ -1,3 +1,3 @@
 """osintkit - OSINT CLI tool for personal digital footprint analysis."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osintkit",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OSINT CLI for personal digital footprint analysis",
   "bin": {
     "osintkit": "./bin/osintkit.js"

package/postinstall.js

@@ -1,75 +1,94 @@
 #!/usr/bin/env node
 /**
- * osintkit postinstall — installs all Python dependencies automatically.
- *
- * Runs after `npm install -g osintkit`.
- * Installs:
- *   1. Core Python deps (typer, rich, httpx, pydantic, etc.) from requirements.txt
- *   2. Optional OSINT tools (maigret, holehe, sherlock) from requirements-tools.txt
- *
- * Uses --break-system-packages on Linux/macOS where needed (Python 3.11+).
- * Falls back gracefully if pip isn't available.
+ * osintkit postinstall — creates a venv inside the package dir and installs
+ * all Python dependencies into it. The npm shim (bin/osintkit.js) will then
+ * always find and use this venv's Python, avoiding any system Python confusion.
  */
 
-const { execSync } = require('child_process');
+const { spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
 const packageDir = __dirname;
+const venvDir = path.join(packageDir, '.venv');
 const req = path.join(packageDir, 'requirements.txt');
 const reqTools = path.join(packageDir, 'requirements-tools.txt');
 
-function findPip() {
-    for (const bin of ['pip3', 'pip']) {
-        try {
-            execSync(`${bin} --version`, { stdio: 'ignore' });
-            return bin;
-        } catch (_) {}
+// Platform-aware paths inside the venv
+const isWin = process.platform === 'win32';
+const venvPython = isWin
+    ? path.join(venvDir, 'Scripts', 'python.exe')
+    : path.join(venvDir, 'bin', 'python3');
+const venvPip = isWin
+    ? path.join(venvDir, 'Scripts', 'pip.exe')
+    : path.join(venvDir, 'bin', 'pip3');
+
+function findSystemPython() {
+    const candidates = isWin
+        ? ['python', 'python3']
+        : ['python3.13', 'python3.12', 'python3.11', 'python3.10', 'python3'];
+    for (const bin of candidates) {
+        const r = spawnSync(bin, ['--version'], { encoding: 'utf8' });
+        if (r.status === 0) {
+            // Must be >= 3.10
+            const match = (r.stdout || r.stderr || '').match(/Python (\d+)\.(\d+)/);
+            if (match && (parseInt(match[1]) > 3 || parseInt(match[2]) >= 10)) {
+                return bin;
+            }
+        }
     }
     return null;
 }
 
-function pipInstall(pip, requirementsFile, label) {
-    if (!fs.existsSync(requirementsFile)) {
-        console.log(`  ⚠️  ${label}: requirements file not found, skipping`);
-        return;
-    }
+function run(cmd, args, opts = {}) {
+    const r = spawnSync(cmd, args, { encoding: 'utf8', cwd: packageDir, ...opts });
+    return r;
+}
 
-    const flags = ['-r', requirementsFile, '-q', '--disable-pip-version-check'];
+console.log('\nosintkit: setting up Python environment...\n');
 
-    // Try with --break-system-packages first (needed on modern Linux/macOS)
-    try {
-        execSync(`${pip} install ${flags.join(' ')} --break-system-packages`, {
-            stdio: 'pipe',
-            cwd: packageDir,
-        });
-        console.log(`  ✅  ${label} installed`);
-        return;
-    } catch (_) {}
+// Step 1: find a usable Python 3.10+
+const sysPython = findSystemPython();
+if (!sysPython) {
+    console.log('  ❌  Python 3.10+ not found.');
+    console.log('      Install from https://python.org then re-run: npm install -g osintkit\n');
+    process.exit(0);
+}
+console.log(`  ✅  Found Python: ${sysPython}`);
 
-    // Fall back without the flag (works on older systems / virtual envs)
-    try {
-        execSync(`${pip} install ${flags.join(' ')}`, {
-            stdio: 'pipe',
-            cwd: packageDir,
-        });
-        console.log(`  ✅  ${label} installed`);
-        return;
-    } catch (err) {
-        console.log(`  ⚠️  ${label}: could not install (${err.message.split('\n')[0]})`);
+// Step 2: create venv (skip if already exists)
+if (!fs.existsSync(venvPython)) {
+    console.log(`  🔧  Creating venv at ${venvDir} ...`);
+    const r = run(sysPython, ['-m', 'venv', venvDir]);
+    if (r.status !== 0) {
+        console.log('  ❌  Failed to create venv.');
+        console.log(`      ${(r.stderr || '').trim()}`);
+        console.log('      Try: python3 -m venv .venv (in the package dir)\n');
+        process.exit(0);
     }
+    console.log('  ✅  Venv created');
+} else {
+    console.log('  ✅  Venv already exists');
 }
 
-console.log('\nosintkit: installing Python dependencies...\n');
+// Step 3: upgrade pip inside venv
+run(venvPython, ['-m', 'pip', 'install', '--upgrade', 'pip', '-q']);
 
-const pip = findPip();
-if (!pip) {
-    console.log('  ⚠️  pip not found — skipping Python dependency install.');
-    console.log('  Run manually: pip3 install -r requirements.txt -r requirements-tools.txt');
-    process.exit(0);
+// Step 4: install deps into venv
+function pipInstall(requirementsFile, label) {
+    if (!fs.existsSync(requirementsFile)) return;
+    console.log(`  📦  Installing ${label}...`);
+    const r = run(venvPython, ['-m', 'pip', 'install', '-r', requirementsFile, '-q', '--disable-pip-version-check']);
+    if (r.status === 0) {
+        console.log(`  ✅  ${label} installed`);
+    } else {
+        const err = (r.stderr || r.stdout || '').trim().split('\n').slice(-3).join('\n');
+        console.log(`  ❌  ${label} failed:\n      ${err}`);
+        console.log(`      Fix: ${venvPython} -m pip install -r ${requirementsFile}`);
+    }
 }
 
-pipInstall(pip, req, 'Core dependencies');
-pipInstall(pip, reqTools, 'OSINT tools (maigret, holehe, sherlock)');
+pipInstall(req, 'Core dependencies (typer, rich, httpx...)');
+pipInstall(reqTools, 'OSINT tools (maigret, holehe, sherlock)');
 
-console.log('\nosintkit ready. Run: osintkit new\n');
+console.log('\n  ✅  osintkit ready. Run: osintkit new\n');

package/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "osintkit"
-version = "0.1.3"
+version = "0.1.4"
 description = "OSINT CLI tool for personal digital footprint analysis"
 authors = ["Your Name <you@example.com>"]
 license = "MIT"