doc-fetch-cli 2.0.2 → 2.0.4

package/bin/doc-fetch.js

@@ -1,25 +1,42 @@
 #!/usr/bin/env node
+/**
+ * DocFetch CLI Wrapper
+ * Spawns the correct platform-specific Go binary
+ */
+
 const { spawn } = require('child_process');
 const path = require('path');
-const os = require('os');
 const fs = require('fs');
 
-// Get the package installation directory
 const packageDir = path.join(__dirname, '..');
 
-// Determine binary name based on platform (what postinstall creates)
-const platform = os.platform();
-const binaryName = platform === 'win32' ? 'doc-fetch.exe' : 'doc-fetch';
+// Binary name is set by postinstall script
+// Default fallbacks if postinstall didn't run
+let binaryName = 'doc-fetch';
+const platform = process.platform;
+
+if (platform === 'win32') {
+  binaryName = 'doc-fetch.exe';
+} else if (platform === 'darwin') {
+  binaryName = 'doc-fetch';
+} else {
+  binaryName = 'doc-fetch';
+}
 
-// Try multiple possible locations
-const possiblePaths = [
-  path.join(packageDir, binaryName),        // Root directory (postinstall copies here)
-  path.join(packageDir, 'bin', binaryName), // bin/ directory (fallback)
+// Try to find the actual binary
+const possibleBinaries = [
+  binaryName,
+  'doc-fetch.exe',
+  'doc-fetch_windows_amd64.exe',
+  'doc-fetch_darwin_amd64',
+  'doc-fetch_darwin_arm64',
+  'doc-fetch_linux_amd64',
+  'doc-fetch_linux_arm64',
 ];
 
-// Find the binary
 let binaryPath = null;
-for (const testPath of possiblePaths) {
+for (const name of possibleBinaries) {
+  const testPath = path.join(packageDir, name);
   if (fs.existsSync(testPath)) {
     binaryPath = testPath;
     break;
@@ -29,24 +46,12 @@ for (const testPath of possiblePaths) {
 if (!binaryPath) {
   console.error('❌ doc-fetch binary not found!');
   console.error('');
-  console.error(`💡 Platform: ${platform} (${os.arch()})`);
-  console.error('💡 Expected: doc-fetch' + (platform === 'win32' ? '.exe' : ''));
-  console.error('');
-  console.error('💡 Troubleshooting steps:');
-  console.error('   1. List files: ls -la $(npm root -g)/doc-fetch-cli/');
-  console.error('   2. Look for platform-specific binary:');
-  if (platform === 'win32') {
-    console.error('      doc-fetch_windows_amd64.exe');
-  } else if (platform === 'darwin') {
-    console.error('      doc-fetch_darwin_amd64 (Intel) or doc-fetch_darwin_arm64 (M1/M2)');
-  } else {
-    console.error('      doc-fetch_linux_amd64 (x64) or doc-fetch_linux_arm64 (ARM)');
-  }
-  console.error('   3. Manually copy: cp <platform-binary> doc-fetch' + (platform === 'win32' ? '.exe' : ''));
-  console.error('   4. Make executable: chmod +x doc-fetch (Linux/macOS only)');
-  console.error('   5. Reinstall: npm uninstall -g doc-fetch-cli && npm install -g doc-fetch-cli@latest');
+  console.error('💡 Platform:', platform, '(' + process.arch + ')');
+  console.error('💡 Searched in:', packageDir);
   console.error('');
-  console.error('📦 Package directory:', packageDir);
+  console.error('💡 Try reinstalling:');
+  console.error('   npm uninstall -g doc-fetch-cli');
+  console.error('   npm install -g doc-fetch-cli@latest');
   process.exit(1);
 }
 
@@ -59,16 +64,15 @@ const child = spawn(binaryPath, args, {
 
 child.on('error', (err) => {
   if (err.code === 'ENOENT') {
-    console.error('❌ Failed to execute doc-fetch binary');
-    console.error(`   Binary path: ${binaryPath}`);
+    console.error('❌ Failed to execute binary');
+    console.error('   Path:', binaryPath);
     console.error('   Error: File not found or no execute permission');
-    console.error('');
     if (platform !== 'win32') {
+      console.error('');
       console.error('💡 Fix permissions: chmod +x "' + binaryPath + '"');
     }
-    console.error('💡 Or reinstall: npm uninstall -g doc-fetch-cli && npm install -g doc-fetch-cli@latest');
   } else {
-    console.error('❌ Failed to start doc-fetch:', err.message);
+    console.error('❌ Failed to start:', err.message);
   }
   process.exit(1);
 });

package/bin/postinstall.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 /**
  * Post-install script for doc-fetch-cli
- * Copies the correct platform-specific binary and sets up PATH
+ * Detects and uses the correct platform binary (no copying needed)
  */
 
-const { execSync } = require('child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
@@ -15,185 +14,92 @@ const packageDir = path.join(__dirname, '..');
 const platform = os.platform();
 const arch = os.arch();
 
-// Determine which binary to use
-let binaryName;
-let expectedBinary;
-
+// Define binary names to search for (in priority order)
+let searchNames = [];
 if (platform === 'win32') {
-  binaryName = 'doc-fetch.exe';
-  expectedBinary = 'doc-fetch_windows_amd64.exe';
+  searchNames = ['doc-fetch_windows_amd64.exe', 'doc-fetch.exe'];
 } else if (platform === 'darwin') {
-  binaryName = 'doc-fetch';
-  expectedBinary = 'doc-fetch_darwin_amd64';
+  searchNames = arch === 'arm64' 
+    ? ['doc-fetch_darwin_arm64', 'doc-fetch_darwin_amd64', 'doc-fetch']
+    : ['doc-fetch_darwin_amd64', 'doc-fetch_darwin_arm64', 'doc-fetch'];
 } else {
   // Linux
-  binaryName = 'doc-fetch';
-  expectedBinary = arch === 'arm64' ? 'doc-fetch_linux_arm64' : 'doc-fetch_linux_amd64';
+  searchNames = arch === 'arm64'
+    ? ['doc-fetch_linux_arm64', 'doc-fetch_linux_amd64', 'doc-fetch']
+    : ['doc-fetch_linux_amd64', 'doc-fetch_linux_arm64', 'doc-fetch'];
 }
 
-const sourcePath = path.join(packageDir, expectedBinary);
-const destPath = path.join(packageDir, binaryName);
-
 console.log(`📦 Platform: ${platform} ${arch}`);
-console.log(`📦 Expected binary: ${expectedBinary}`);
-console.log(`📦 Will copy to: ${binaryName}\n`);
+console.log(`🔍 Searching for binary...\n`);
 
-// List all available binaries for debugging
-console.log('📋 Available binaries in package:');
-let hasPlatformBinary = false;
+// List all doc-fetch binaries in package
+console.log('📋 Available binaries:');
 let foundBinary = null;
 try {
   const files = fs.readdirSync(packageDir);
   const binaries = files.filter(f => f.includes('doc-fetch') && !f.endsWith('.js'));
+  
   if (binaries.length === 0) {
-    console.log('   ⚠️  No binaries found! Package may be corrupted.');
-  } else {
-    binaries.forEach(file => {
-      const stats = fs.statSync(path.join(packageDir, file));
-      const size = (stats.size / 1024 / 1024).toFixed(2);
-      
-      // Check if this is the correct binary for current platform
-      let isCorrect = false;
-      if (platform === 'win32' && file.endsWith('.exe')) {
-        isCorrect = true;
-        foundBinary = file;
-      } else if (platform !== 'win32' && !file.endsWith('.exe') && 
-                 (file === 'doc-fetch' || file.includes(`_${platform}_`))) {
-        isCorrect = true;
-        foundBinary = file;
-      }
-      
-      const marker = isCorrect ? '✅' : 'ℹ️ ';
-      console.log(`   ${marker} ${file} (${size} MB)`);
-      
-      if (isCorrect && file === expectedBinary) {
-        hasPlatformBinary = true;
-      }
-    });
+    console.log('   ❌ No binaries found! Package is corrupted.\n');
+    process.exit(1);
   }
-} catch (e) {
-  console.log(`   ❌ Could not list directory: ${e.message}`);
-}
-console.log('');
-
-// Smart detection: Copy platform binary to generic name if needed
-if (foundBinary && fs.existsSync(path.join(packageDir, foundBinary))) {
-  // Check if we need to copy (found binary != expected generic name)
-  if (foundBinary !== binaryName) {
-    console.log(`✅ Found platform binary: ${foundBinary}`);
-    console.log(`📋 Copying to: ${binaryName}`);
+  
+  binaries.forEach(file => {
+    const stats = fs.statSync(path.join(packageDir, file));
+    const size = (stats.size / 1024 / 1024).toFixed(2);
     
-    try {
-      fs.copyFileSync(path.join(packageDir, foundBinary), path.join(packageDir, binaryName));
-      
-      if (platform !== 'win32') {
-        fs.chmodSync(path.join(packageDir, binaryName), 0o755);
-      }
-      
-      console.log(`✅ Binary installed successfully!\n`);
-      
-      // Verify it works
-      const testPath = path.join(packageDir, binaryName);
-      if (fs.existsSync(testPath)) {
-        console.log('✨ Installation complete! You can now use: doc-fetch\n');
-        return; // Success!
-      }
-    } catch (copyError) {
-      console.error(`⚠️  Copy failed: ${copyError.message}`);
-      console.error('');
-      console.error('💡 Manual fix:');
-      console.error(`   cd "${packageDir}"`);
-      if (platform === 'win32') {
-        console.error(`   copy "${foundBinary}" "${binaryName}"`);
-      } else {
-        console.error(`   cp "${foundBinary}" "${binaryName}"`);
-        console.error(`   chmod +x "${binaryName}"`);
-      }
-      process.exit(1);
+    // Check if this is a valid binary for current platform
+    const isValid = searchNames.includes(file);
+    const marker = isValid ? '✅' : 'ℹ️ ';
+    console.log(`   ${marker} ${file} (${size} MB)`);
+    
+    // Use first valid match
+    if (isValid && !foundBinary) {
+      foundBinary = file;
     }
-  } else {
-    // Binary already has correct name
-    console.log(`✅ Binary already correctly named: ${binaryName}\n`);
-    console.log('✨ Installation complete! You can now use: doc-fetch\n');
-    return;
-  }
-}
-
-// If we get here, something really went wrong
-if (!fs.existsSync(sourcePath) && !hasPlatformBinary && !foundBinary) {
-  console.error('⚠️  CRITICAL: No compatible binary found!');
-  console.error(`   Searched for: ${expectedBinary}`);
-  console.error(`   Found instead: ${foundBinary || 'nothing compatible'}`);
-  console.error('');
-  console.error('💡 This is a packaging error - the NPM package was published without your platform binary.');
-  console.error('');
-  console.error('💡 Immediate workaround - Install from source:');
-  console.error('   1. Install Go: https://golang.org/dl/');
-  console.error('   2. Run these commands:');
-  console.error('      npm uninstall -g doc-fetch-cli');
-  console.error('      git clone https://github.com/AlphaTechini/doc-fetch.git');
-  console.error('      cd doc-fetch');
-  if (platform === 'win32') {
-    console.error('      go build -o doc-fetch.exe ./cmd/docfetch');
-    console.error('      copy doc-fetch.exe "' + packageDir + '"');
-  } else {
-    console.error('      go build -o doc-fetch ./cmd/docfetch');
-    console.error('      cp doc-fetch "' + packageDir + '"');
-    console.error('      chmod +x "' + path.join(packageDir, 'doc-fetch') + '"');
-  }
-  console.error('');
-  console.error('💡 Or wait for fixed version (check for updates):');
-  console.error('   npm install -g doc-fetch-cli@latest');
+  });
+} catch (e) {
+  console.log(`   ❌ Error listing directory: ${e.message}\n`);
   process.exit(1);
 }
 
-console.log(`✅ Found source binary: ${expectedBinary}`);
+console.log('');
 
-// Copy the binary to the expected location
-try {
-  console.log(`📋 Copying: ${expectedBinary} → ${binaryName}`);
-  fs.copyFileSync(sourcePath, destPath);
-  console.log(`✅ Copy successful`);
-  
-  // Verify the destination exists
-  if (!fs.existsSync(destPath)) {
-    throw new Error('Destination file does not exist after copy');
-  }
-  
-  // Make executable on Unix-like systems
-  if (platform !== 'win32') {
-    fs.chmodSync(destPath, 0o755);
-    console.log(`✅ Set executable permissions`);
-  } else {
-    console.log(`ℹ️  Windows: No chmod needed`);
-  }
-  
-  console.log(`\n✅ Binary installed: ${binaryName}`);
-} catch (error) {
-  console.error(`\n❌ CRITICAL: Failed to install binary!`);
-  console.error(`   Source: ${sourcePath}`);
-  console.error(`   Destination: ${destPath}`);
-  console.error(`   Error: ${error.message}`);
+if (!foundBinary) {
+  console.error('❌ CRITICAL: No compatible binary found for your platform!');
+  console.error(`   Searched for: ${searchNames.join(', ')}`);
   console.error('');
-  console.error('💡 Manual fix:');
-  console.error(`   1. Navigate to: ${packageDir}`);
-  console.error(`   2. Rename: ${expectedBinary} → ${binaryName}`);
-  if (platform !== 'win32') {
-    console.error(`   3. Run: chmod +x ${binaryName}`);
-  }
+  console.error('💡 This is a packaging error. Please:');
+  console.error('   1. Report issue: https://github.com/AlphaTechini/doc-fetch/issues');
+  console.error('   2. Include your platform: ' + platform + ' ' + arch);
+  console.error('   3. Or install from source (see README)\n');
   process.exit(1);
 }
 
-// Verify installation
-try {
-  const result = execSync(`"${destPath}" --help`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] });
-  console.log('✅ Binary verified working\n');
-} catch (error) {
-  console.error('⚠️  Warning: Could not verify binary execution');
-  console.error(`   Error: ${error.message}\n`);
+// Update wrapper script to use found binary
+const wrapperPath = path.join(packageDir, 'bin', 'doc-fetch.js');
+if (fs.existsSync(wrapperPath)) {
+  try {
+    let wrapper = fs.readFileSync(wrapperPath, 'utf8');
+    
+    // Update the binary name in wrapper
+    wrapper = wrapper.replace(
+      /const binaryName = ['"][^'"]+['"];/,
+      `const binaryName = '${foundBinary}';`
+    );
+    
+    fs.writeFileSync(wrapperPath, wrapper);
+    console.log(`✅ Configured wrapper to use: ${foundBinary}`);
+  } catch (e) {
+    console.log(`⚠️  Could not update wrapper: ${e.message}`);
+    console.log(`   You may need to run: doc-fetch (instead of doc-fetch-cli)`);
+  }
 }
 
-console.log('✨ DocFetch CLI installed successfully!\n');
+console.log('');
+console.log('✨ Installation complete!');
+console.log('');
 console.log('Usage:');
-console.log('   doc-fetch --url https://docs.example.com --output docs.md\n');
+console.log('   doc-fetch --url https://docs.example.com --output docs.md');
+console.log('');
 console.log('Pro tip: Use --llm-txt flag to generate AI-friendly index files!\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doc-fetch-cli",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Dynamic documentation fetching CLI that converts entire documentation sites to single markdown files for AI/LLM consumption",
   "bin": {
     "doc-fetch": "./bin/doc-fetch.js"