@codearcade/subtitle-generator 1.0.0 → 1.0.2

package/init/index.js

@@ -92,49 +92,98 @@ const init = async () => {
     // Windows Setup
     const binaryDest = path.join(whisperDir, "whisper-cli.exe");
     if (!fs.existsSync(binaryDest)) {
-      // Using latest pre-built x64 binaries from ggml-org
-      const zipUrl =
-        "https://github.com/ggerganov/whisper.cpp/releases/latest/download/whisper-bin-x64.zip";
+      console.log("Detecting Windows architecture...");
+      const arch = os.arch(); // Usually 'x64', 'ia32', or 'arm64'
+
+      let zipName;
+
+      if (arch === "x64") {
+        zipName = "whisper-bin-x64.zip";
+      } else if (arch === "ia32") {
+        zipName = "whisper-bin-Win32.zip";
+      } else if (arch === "arm64") {
+        // Windows ARM can emulate x64 executables
+        console.log(
+          "ARM64 architecture detected. Using x64 binary via Windows emulation...",
+        );
+        zipName = "whisper-bin-x64.zip";
+      } else {
+        throw new Error(
+          `Unsupported Windows architecture: ${arch}. Whisper.cpp does not provide pre-compiled binaries for this system.`,
+        );
+      }
+
+      const zipUrl = `https://github.com/ggml-org/whisper.cpp/releases/download/v1.8.4/${zipName}`;
       const zipPath = path.join(whisperDir, "whisper.zip");
 
-      await downloadFile(zipUrl, zipPath, "Whisper Windows Binary");
+      await downloadFile(zipUrl, zipPath, `Whisper Windows Binary (${arch})`);
 
       console.log("Extracting binary...");
-      // Windows 10+ has native tar for unzipping
-      execSync(`tar -xf "${zipPath}" -C "${whisperDir}"`);
 
-      // 1. Move everything out of the "Release" folder (or any other subfolder the zip might use)
-      const possibleReleaseDir = path.join(whisperDir, "Release");
+      let extractionSuccess = false;
+      let maxRetries = 5;
+      let retryDelay = 1000; // 1 second
 
-      if (fs.existsSync(possibleReleaseDir)) {
-        // Read all files inside the Release folder
-        const files = fs.readdirSync(possibleReleaseDir);
-
-        // Move them up one level into the main whisperDir
-        for (const file of files) {
-          fs.renameSync(
-            path.join(possibleReleaseDir, file),
-            path.join(whisperDir, file),
+      // 1. The Retry Loop for safe extraction
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          execSync(
+            `powershell -command "Expand-Archive -Force -LiteralPath '${zipPath}' -DestinationPath '${whisperDir}'"`,
+            { stdio: "inherit" },
+          );
+          extractionSuccess = true;
+          break; // It worked! Break out of the loop.
+        } catch (error) {
+          if (attempt === maxRetries) {
+            console.error(
+              `\nExtraction failed after ${maxRetries} attempts. File might be permanently locked or corrupted.`,
+            );
+            throw error;
+          }
+          console.log(
+            `\nFile locked by Windows (likely Antivirus). Retrying in 1 second... (Attempt ${attempt} of ${maxRetries})`,
           );
+          await new Promise((resolve) => setTimeout(resolve, retryDelay));
         }
-        // Delete the now-empty Release folder
-        fs.rmdirSync(possibleReleaseDir);
       }
 
-      // 2. Rename extracted main.exe to match our wrapper expectations
-      const extractedMain = path.join(whisperDir, "main.exe");
-      if (fs.existsSync(extractedMain)) {
-        fs.renameSync(extractedMain, binaryDest);
-      } else {
-        console.error("Warning: Could not find main.exe after extraction.");
-      }
+      // 2. The Cleanup Phase (Only runs if extraction worked)
+      if (extractionSuccess) {
+        try {
+          // Move everything out of the "Release" folder
+          const possibleReleaseDir = path.join(whisperDir, "Release");
+
+          if (fs.existsSync(possibleReleaseDir)) {
+            const files = fs.readdirSync(possibleReleaseDir);
+
+            for (const file of files) {
+              fs.renameSync(
+                path.join(possibleReleaseDir, file),
+                path.join(whisperDir, file),
+              );
+            }
+            // Delete the now-empty Release folder
+            fs.rmdirSync(possibleReleaseDir);
+          }
 
-      // 3. Clean up the zip file so it doesn't clutter the folder
-      if (fs.existsSync(zipPath)) {
-        fs.unlinkSync(zipPath);
-      }
+          // Rename extracted main.exe to match our wrapper expectations
+          const extractedMain = path.join(whisperDir, "main.exe");
+          if (fs.existsSync(extractedMain)) {
+            fs.renameSync(extractedMain, binaryDest);
+          } else {
+            console.error("Warning: Could not find main.exe after extraction.");
+          }
 
-      console.log("Whisper binary setup complete for Windows.");
+          // Clean up the zip file
+          if (fs.existsSync(zipPath)) {
+            fs.unlinkSync(zipPath);
+          }
+
+          console.log(`Whisper binary setup complete for Windows (${arch}).`);
+        } catch (error) {
+          console.error("Error during binary cleanup/renaming:", error.message);
+        }
+      }
     } else {
       console.log("Whisper binary already exists for Windows.");
     }
@@ -151,7 +200,7 @@ const init = async () => {
       if (!fs.existsSync(repoDir)) {
         // Shallow clone to save time and bandwidth
         execSync(
-          `git clone --depth 1 https://github.com/ggerganov/whisper.cpp.git "${repoDir}"`,
+          `git clone --depth 1 https://github.com/ggml-org/whisper.cpp.git "${repoDir}"`,
           { stdio: "inherit" },
         );
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codearcade/subtitle-generator",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "index.js",
   "type": "module",
   "module": "./dist/index.js",