sshifu 0.7.8-test.8 → 0.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sshifu",
-  "version": "0.7.8-test.8",
+  "version": "0.7.9",
   "description": "SSH authentication system with short-lived certificates and OAuth authentication (GitHub organizations)",
   "main": "bin/sshifu.js",
   "bin": {

package/scripts/install.js

@@ -90,28 +90,12 @@ async function main() {
   try {
     await download(archiveUrl, archivePath);
 
-    // Small delay to ensure file handle is released
-    await new Promise(resolve => setTimeout(resolve, 500));
-
     // Extract the archive
     console.log(`[sshifu] Extracting...`);
     const archiveBinName = `${PACKAGE_NAME}-${platform}${isWindows ? '.exe' : ''}`;
     const extractedPath = path.join(binDir, archiveBinName);
     if (isWindows) {
-      try {
-        // 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] Running: ${psCommand}`);
-        execSync(`powershell -Command "${psCommand}"`, { stdio: ['ignore', 'pipe', 'pipe'] });
-        console.log(`[sshifu] Extraction completed, checking files...`);
-        const afterExtract = fs.readdirSync(binDir);
-        console.log(`[sshifu] Files after extraction: ${afterExtract.join(', ')}`);
-      } catch (extractErr) {
-        console.error(`[sshifu] Extraction failed: ${extractErr.message}`);
-        console.error(`[sshifu] stderr: ${extractErr.stderr?.toString() || 'N/A'}`);
-        console.error(`[sshifu] stdout: ${extractErr.stdout?.toString() || 'N/A'}`);
-        throw extractErr;
-      }
+      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' });
     }
@@ -125,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] Binary not found at expected location, searching...`);
         const files = fs.readdirSync(binDir);
-        console.log(`[sshifu] 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] 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] Found ${foundFile}, renaming to ${binName}`);
-          fs.renameSync(foundFile, binPath);
-        } else {
-          throw new Error(`Could not find binary in ${binDir}`);
+        console.log(`[sshifu] Files in binDir: ${files.join(', ')}`);
+        const exeFile = files.find(f => f.endsWith('.exe') && f.startsWith(PACKAGE_NAME));
+        if (exeFile) {
+          console.log(`[sshifu] Found ${exeFile}, renaming to ${binName}`);
+          fs.renameSync(path.join(binDir, exeFile), binPath);
         }
       }
     }