sshifu 0.7.7 → 0.7.8-test.11

package/package.json

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

package/scripts/install.js

@@ -95,7 +95,45 @@ async function main() {
     const archiveBinName = `${PACKAGE_NAME}-${platform}${isWindows ? '.exe' : ''}`;
     const extractedPath = path.join(binDir, archiveBinName);
     if (isWindows) {
-      execSync(`powershell -Command "Expand-Archive -Path '${archivePath.replace(/'/g, "''")}' -DestinationPath '${binDir.replace(/'/g, "''")}' -Force"`, { stdio: 'ignore' });
+      // On Windows, copy zip to temp location first to avoid file lock issues
+      const tempZip = path.join(binDir, 'temp_' + Date.now() + '.zip');
+      fs.copyFileSync(archivePath, tempZip);
+      
+      const tempDir = path.join(binDir, 'tmp_extract_' + Date.now());
+      fs.mkdirSync(tempDir, { recursive: true });
+      
+      try {
+        const psCommand = `Expand-Archive -Path '${tempZip.replace(/'/g, "''")}' -DestinationPath '${tempDir.replace(/'/g, "''")}' -Force -ErrorAction Stop`;
+        console.log(`[sshifu] Running: ${psCommand}`);
+        execSync(`powershell -Command "${psCommand}"`, { stdio: ['ignore', 'pipe', 'pipe'] });
+        
+        // Find the extracted binary
+        const tempFiles = fs.readdirSync(tempDir);
+        console.log(`[sshifu] Extracted files: ${tempFiles.join(', ')}`);
+        
+        const extractedBin = tempFiles.find(f => f.endsWith('.exe') || !f.includes('.'));
+        if (!extractedBin) {
+          throw new Error(`No binary found in temp directory. Files: ${tempFiles.join(', ')}`);
+        }
+        
+        // Move to final location
+        const tempBinPath = path.join(tempDir, extractedBin);
+        fs.renameSync(tempBinPath, binPath);
+        
+        // Cleanup
+        fs.unlinkSync(tempZip);
+        fs.rmSync(tempDir, { recursive: true, force: true });
+        fs.unlinkSync(archivePath);
+        
+        console.log(`[sshifu] Binary installed successfully!`);
+      } catch (extractErr) {
+        // Cleanup temp files on error
+        try { fs.unlinkSync(tempZip); } catch (e) {}
+        try { fs.rmSync(tempDir, { recursive: true, force: true }); } catch (e) {}
+        console.error(`[sshifu] Extraction failed: ${extractErr.message}`);
+        console.error(`[sshifu] stderr: ${extractErr.stderr?.toString() || 'N/A'}`);
+        throw extractErr;
+      }
     } else {
       execSync(`tar -xzf "${archivePath}" -C "${binDir}"`, { stdio: 'ignore' });
     }
@@ -109,12 +147,35 @@ 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: ${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);
+        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}`);
         }
       }
     }