@paa1997/metho 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paa1997/metho",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Automated recon pipeline: subfinder → gau → filter → katana → findsomething",
   "type": "module",
   "bin": {

package/src/tools/installer.js

@@ -1,13 +1,40 @@
-import { execSync } from 'child_process';
+import { exec, execSync } from 'child_process';
 import { existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 
 const isWin = process.platform === 'win32';
 
+function execAsync(cmd, options = {}) {
+  return new Promise((resolve, reject) => {
+    exec(cmd, options, (err, stdout, stderr) => {
+      if (err) {
+        err.stdout = stdout;
+        err.stderr = stderr;
+        reject(err);
+      } else {
+        resolve({ stdout, stderr });
+      }
+    });
+  });
+}
+
 /**
  * Check if a binary is available on PATH.
  */
-export function isBinaryAvailable(binary) {
+export async function isBinaryAvailable(binary) {
+  try {
+    const cmd = isWin ? `where ${binary}` : `which ${binary}`;
+    await execAsync(cmd, { stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Synchronous version for quick checks that don't need to yield.
+ */
+export function isBinaryAvailableSync(binary) {
   try {
     const cmd = isWin ? `where ${binary}` : `which ${binary}`;
     execSync(cmd, { stdio: 'pipe' });
@@ -20,9 +47,9 @@ export function isBinaryAvailable(binary) {
 /**
  * Check if httpx on PATH is ProjectDiscovery's version (not Python's httpx CLI).
  */
-export function isProjectDiscoveryHttpx() {
+export async function isProjectDiscoveryHttpx() {
   try {
-    const output = execSync('httpx -version', { stdio: 'pipe', timeout: 5000 }).toString();
+    await execAsync('httpx -version', { stdio: 'pipe', timeout: 5000 });
     return true;
   } catch (err) {
     const stderr = err.stderr ? err.stderr.toString() : '';
@@ -42,13 +69,13 @@ export function isProjectDiscoveryHttpx() {
  * Attempt to install a tool using its install command (globally via go install).
  * Returns true if install succeeded, false otherwise.
  */
-export function attemptInstall(toolDef, logger) {
+export async function attemptInstall(toolDef, logger) {
   if (!toolDef.installCmd) {
     return false;
   }
 
   if (toolDef.installCmd.startsWith('go install')) {
-    if (!isBinaryAvailable('go')) {
+    if (!await isBinaryAvailable('go')) {
       logger.warn('Go is not installed. Cannot auto-install Go tools.');
       logger.warn('Install Go from https://go.dev/dl/ and ensure GOPATH/bin is in PATH.');
       return false;
@@ -57,12 +84,11 @@ export function attemptInstall(toolDef, logger) {
 
   logger.info(`Installing ${toolDef.binary}: ${toolDef.installCmd}`);
   try {
-    execSync(toolDef.installCmd, {
-      stdio: 'pipe',
+    await execAsync(toolDef.installCmd, {
       timeout: 120000,
       env: { ...process.env },
     });
-    return isBinaryAvailable(toolDef.binary);
+    return await isBinaryAvailable(toolDef.binary);
   } catch (err) {
     logger.debug(`Install failed for ${toolDef.binary}: ${err.message}`);
     return false;
@@ -73,12 +99,12 @@ export function attemptInstall(toolDef, logger) {
  * Install a Go tool to a local directory instead of GOPATH/bin.
  * Returns the full path to the installed binary, or null on failure.
  */
-export function installToLocal(toolDef, localBinDir, logger) {
+export async function installToLocal(toolDef, localBinDir, logger) {
   if (!toolDef.installCmd || !toolDef.installCmd.startsWith('go install')) {
     return null;
   }
 
-  if (!isBinaryAvailable('go')) {
+  if (!await isBinaryAvailable('go')) {
     logger.warn('Go is not installed. Cannot auto-install Go tools.');
     logger.warn('Install Go from https://go.dev/dl/ and ensure GOPATH/bin is in PATH.');
     return null;
@@ -91,8 +117,7 @@ export function installToLocal(toolDef, localBinDir, logger) {
 
   logger.info(`Installing ${toolDef.binary} to ${localBinDir}...`);
   try {
-    execSync(toolDef.installCmd, {
-      stdio: 'pipe',
+    await execAsync(toolDef.installCmd, {
       timeout: 120000,
       env: { ...process.env, GOBIN: localBinDir },
     });

package/src/tools/manager.js

@@ -48,13 +48,13 @@ export async function ensureTools(config, logger) {
 
     logger.debug(`Checking for ${toolName} (${toolDef.binary})...`);
 
-    if (isBinaryAvailable(toolDef.binary)) {
+    if (await isBinaryAvailable(toolDef.binary)) {
       // Special check: verify httpx is ProjectDiscovery's, not Python's
-      if (toolName === 'httpx' && !isProjectDiscoveryHttpx()) {
+      if (toolName === 'httpx' && !await isProjectDiscoveryHttpx()) {
         logger.warn('Found Python\'s httpx on PATH (not ProjectDiscovery\'s)');
         logger.info('Installing ProjectDiscovery httpx locally to avoid conflict...');
 
-        const localPath = installToLocal(toolDef, LOCAL_BIN_DIR, logger);
+        const localPath = await installToLocal(toolDef, LOCAL_BIN_DIR, logger);
         if (localPath) {
           resolvedPaths[toolName] = localPath;
           logger.success(`ProjectDiscovery httpx installed at ${localPath}`);
@@ -76,7 +76,7 @@ export async function ensureTools(config, logger) {
 
     // Tool not found at all — try global install first
     logger.warn(`${toolName} not found, installing...`);
-    const installed = attemptInstall(toolDef, logger);
+    const installed = await attemptInstall(toolDef, logger);
 
     if (installed) {
       resolvedPaths[toolName] = toolDef.binary;
@@ -85,7 +85,7 @@ export async function ensureTools(config, logger) {
       // Try local install as fallback
       if (toolDef.installCmd && toolDef.installCmd.startsWith('go install')) {
         logger.info(`Global install failed, trying local install to ${LOCAL_BIN_DIR}...`);
-        const localPath = installToLocal(toolDef, LOCAL_BIN_DIR, logger);
+        const localPath = await installToLocal(toolDef, LOCAL_BIN_DIR, logger);
         if (localPath) {
           resolvedPaths[toolName] = localPath;
           logger.success(`${toolName} installed locally at ${localPath}`);