sshifu-trust 0.7.8-test.9 → 0.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sshifu-trust",
-  "version": "0.7.8-test.9",
+  "version": "0.7.9",
   "description": "Configure SSH servers to trust sshifu certificate authority",
   "main": "bin/sshifu-trust.js",
   "bin": {

package/scripts/install.js

@@ -95,43 +95,7 @@ async function main() {
     const archiveBinName = `${PACKAGE_NAME}-${platform}${isWindows ? '.exe' : ''}`;
     const extractedPath = path.join(binDir, archiveBinName);
     if (isWindows) {
-      // Retry extraction to handle file lock issues on Windows
-      const maxRetries = 5;
-      let lastErr;
-      for (let attempt = 1; attempt <= maxRetries; attempt++) {
-        try {
-          // Small delay before each attempt to ensure file handle is released
-          if (attempt > 1) {
-            console.log(`[sshifu-trust] Retry attempt ${attempt}/${maxRetries}...`);
-            await new Promise(resolve => setTimeout(resolve, attempt * 500));
-          }
-          
-          // Use PowerShell with explicit error action and output redirection
-          const psCommand = `Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${binDir.replace(/'/g, "''")}' -Force -ErrorAction Stop`;
-          console.log(`[sshifu-trust] Running: ${psCommand}`);
-          execSync(`powershell -Command "${psCommand}"`, { stdio: ['ignore', 'pipe', 'pipe'] });
-          console.log(`[sshifu-trust] Extraction completed, checking files...`);
-          const afterExtract = fs.readdirSync(binDir);
-          console.log(`[sshifu-trust] Files after extraction: ${afterExtract.join(', ')}`);
-          lastErr = null;
-          break;
-        } catch (extractErr) {
-          lastErr = extractErr;
-          console.error(`[sshifu-trust] Extraction attempt ${attempt} failed: ${extractErr.message}`);
-          if (extractErr.message.includes('being used by another process')) {
-            console.log(`[sshifu-trust] File locked, will retry...`);
-            continue;
-          }
-          // Non-retryable error
-          break;
-        }
-      }
-      if (lastErr) {
-        console.error(`[sshifu-trust] All extraction attempts failed`);
-        console.error(`[sshifu-trust] stderr: ${lastErr.stderr?.toString() || 'N/A'}`);
-        console.error(`[sshifu-trust] stdout: ${lastErr.stdout?.toString() || 'N/A'}`);
-        throw lastErr;
-      }
+      execSync(`powershell -Command "Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${binDir.replace(/'/g, "''")}' -Force"`, { stdio: 'ignore' });
     } else {
       execSync(`tar -xzf "${archivePath}" -C "${binDir}"`, { stdio: 'ignore' });
     }
@@ -145,35 +109,12 @@ async function main() {
         fs.renameSync(extractedPath, binPath);
       } else {
         // Try to find the extracted file (in case of path issues)
-        console.log(`[sshifu-trust] Binary not found at expected location, searching...`);
         const files = fs.readdirSync(binDir);
-        console.log(`[sshifu-trust] Files in binDir (top level): ${files.join(', ')}`);
-        
-        // Look for .exe file in binDir or any subdirectory
-        let foundFile = null;
-        for (const file of files) {
-          const filePath = path.join(binDir, file);
-          const stat = fs.statSync(filePath);
-          if (stat.isDirectory()) {
-            // Check subdirectory
-            const subFiles = fs.readdirSync(filePath);
-            console.log(`[sshifu-trust] Files in ${file}/: ${subFiles.join(', ')}`);
-            const exeInSubdir = subFiles.find(f => f.endsWith('.exe') && f.startsWith(PACKAGE_NAME));
-            if (exeInSubdir) {
-              foundFile = path.join(filePath, exeInSubdir);
-              break;
-            }
-          } else if (file.endsWith('.exe') && file.startsWith(PACKAGE_NAME)) {
-            foundFile = filePath;
-            break;
-          }
-        }
-        
-        if (foundFile) {
-          console.log(`[sshifu-trust] Found ${foundFile}, renaming to ${binName}`);
-          fs.renameSync(foundFile, binPath);
-        } else {
-          throw new Error(`Could not find binary in ${binDir}`);
+        console.log(`[sshifu-trust] Files in binDir: ${files.join(', ')}`);
+        const exeFile = files.find(f => f.endsWith('.exe') && f.startsWith(PACKAGE_NAME));
+        if (exeFile) {
+          console.log(`[sshifu-trust] Found ${exeFile}, renaming to ${binName}`);
+          fs.renameSync(path.join(binDir, exeFile), binPath);
         }
       }
     }