feat: add extraction progress tracking and UI updates

src/main/services/7zip.ts

@@ -1,5 +1,5 @@
 import { app } from "electron";
-import cp from "node:child_process";
+import Seven, { CommandLineSwitches } from "node-7z";
 import path from "node:path";
 import { logger } from "./logger";
 
@@ -9,6 +9,17 @@ export const binaryName = {
   win32: "7z.exe",
 };
 
+export interface ExtractionProgress {
+  percent: number;
+  fileCount: number;
+  file: string;
+}
+
+export interface ExtractionResult {
+  success: boolean;
+  extractedFiles: string[];
+}
+
 export class SevenZip {
   private static readonly binaryPath = app.isPackaged
     ? path.join(process.resourcesPath, binaryName[process.platform])
@@ -32,43 +43,109 @@ export class SevenZip {
       cwd?: string;
       passwords?: string[];
     },
-    successCb: () => void,
-    errorCb: () => void
-  ) {
-    const tryPassword = (index = -1) => {
-      const password = passwords[index] ?? "";
-      logger.info(`Trying password ${password} on ${filePath}`);
+    onProgress?: (progress: ExtractionProgress) => void
+  ): Promise<ExtractionResult> {
+    return new Promise((resolve, reject) => {
+      const tryPassword = (index = -1) => {
+        const password = passwords[index] ?? "";
+        logger.info(
+          `Trying password "${password || "(empty)"}" on ${filePath}`
+        );
 
-      const args = ["x", filePath, "-y", "-p" + password];
+        const extractedFiles: string[] = [];
+        let fileCount = 0;
 
-      if (outputPath) {
-        args.push("-o" + outputPath);
-      }
+        const options: CommandLineSwitches = {
+          $bin: this.binaryPath,
+          $progress: true,
+          yes: true,
+          password: password || undefined,
+        };
 
-      const child = cp.execFile(this.binaryPath, args, {
-        cwd,
-      });
-
-      child.once("exit", (code) => {
-        if (code === 0) {
-          successCb();
-          return;
+        if (outputPath) {
+          options.outputDir = outputPath;
         }
 
-        if (index < passwords.length - 1) {
+        const stream = Seven.extractFull(filePath, outputPath || cwd || ".", {
+          ...options,
+          $spawnOptions: cwd ? { cwd } : undefined,
+        });
+
+        stream.on("progress", (progress) => {
+          if (onProgress) {
+            onProgress({
+              percent: progress.percent,
+              fileCount: fileCount,
+              file: progress.fileCount?.toString() || "",
+            });
+          }
+        });
+
+        stream.on("data", (data) => {
+          if (data.file) {
+            extractedFiles.push(data.file);
+            fileCount++;
+          }
+        });
+
+        stream.on("end", () => {
           logger.info(
-            `Failed to extract file: ${filePath} with password: ${password}. Trying next password...`
+            `Successfully extracted ${filePath} (${extractedFiles.length} files)`
           );
+          resolve({
+            success: true,
+            extractedFiles,
+          });
+        });
 
-          tryPassword(index + 1);
-        } else {
-          logger.info(`Failed to extract file: ${filePath}`);
+        stream.on("error", (err) => {
+          logger.error(`Extraction error for ${filePath}:`, err);
 
-          errorCb();
+          if (index < passwords.length - 1) {
+            logger.info(
+              `Failed to extract file: ${filePath} with password: "${password}". Trying next password...`
+            );
+            tryPassword(index + 1);
+          } else {
+            logger.error(
+              `Failed to extract file: ${filePath} after trying all passwords`
+            );
+            reject(new Error(`Failed to extract file: ${filePath}`));
+          }
+        });
+      };
+
+      tryPassword();
+    });
+  }
+
+  public static listFiles(
+    filePath: string,
+    password?: string
+  ): Promise<string[]> {
+    return new Promise((resolve, reject) => {
+      const files: string[] = [];
+
+      const options: CommandLineSwitches = {
+        $bin: this.binaryPath,
+        password: password || undefined,
+      };
+
+      const stream = Seven.list(filePath, options);
+
+      stream.on("data", (data) => {
+        if (data.file) {
+          files.push(data.file);
         }
       });
-    };
 
-    tryPassword();
+      stream.on("end", () => {
+        resolve(files);
+      });
+
+      stream.on("error", (err) => {
+        reject(err);
+      });
+    });
   }
 }

src/main/services/download/download-manager.ts

@@ -126,21 +126,10 @@ export class DownloadManager {
         }
       );
 
-      if (WindowManager.mainWindow && download) {
-        WindowManager.mainWindow.setProgressBar(progress === 1 ? -1 : progress);
-        WindowManager.mainWindow.webContents.send(
-          "on-download-progress",
-          JSON.parse(
-            JSON.stringify({
-              ...status,
-              game,
-            })
-          )
-        );
-      }
-
       const shouldExtract = download.automaticallyExtract;
 
+      // Handle download completion BEFORE sending progress to renderer
+      // This ensures extraction starts and DB is updated before UI reacts
       if (progress === 1 && download) {
         publishDownloadCompleteNotification(game);
 
@@ -154,6 +143,7 @@ export class DownloadManager {
             shouldSeed: true,
             queued: false,
             extracting: shouldExtract,
+            extractionProgress: shouldExtract ? 0 : download.extractionProgress,
           });
         } else {
           await downloadsSublevel.put(gameId, {
@@ -162,12 +152,22 @@ export class DownloadManager {
             shouldSeed: false,
             queued: false,
             extracting: shouldExtract,
+            extractionProgress: shouldExtract ? 0 : download.extractionProgress,
           });
 
           this.cancelDownload(gameId);
         }
 
         if (shouldExtract) {
+          // Send initial extraction progress BEFORE download progress
+          // This ensures the UI shows extraction immediately
+          WindowManager.mainWindow?.webContents.send(
+            "on-extraction-progress",
+            game.shop,
+            game.objectId,
+            0
+          );
+
           const gameFilesManager = new GameFilesManager(
             game.shop,
             game.objectId
@@ -209,6 +209,18 @@ export class DownloadManager {
           this.downloadingGameId = null;
         }
       }
+
+      // Send progress to renderer after completion handling
+      if (WindowManager.mainWindow && download) {
+        WindowManager.mainWindow.setProgressBar(progress === 1 ? -1 : progress);
+        WindowManager.mainWindow.webContents.send(
+          "on-download-progress",
+          structuredClone({
+            ...status,
+            game,
+          })
+        );
+      }
     }
   }
 

src/main/services/game-files-manager.ts

@@ -3,24 +3,58 @@ import fs from "node:fs";
 import type { GameShop } from "@types";
 import { downloadsSublevel, gamesSublevel, levelKeys } from "@main/level";
 import { FILE_EXTENSIONS_TO_EXTRACT } from "@shared";
-import { SevenZip } from "./7zip";
+import { SevenZip, ExtractionProgress } from "./7zip";
 import { WindowManager } from "./window-manager";
 import { publishExtractionCompleteNotification } from "./notifications";
 import { logger } from "./logger";
 
+const PROGRESS_THROTTLE_MS = 1000;
+
 export class GameFilesManager {
+  private lastProgressUpdate = 0;
+
   constructor(
     private readonly shop: GameShop,
     private readonly objectId: string
   ) {}
 
-  private async clearExtractionState() {
-    const gameKey = levelKeys.game(this.shop, this.objectId);
-    const download = await downloadsSublevel.get(gameKey);
+  private get gameKey() {
+    return levelKeys.game(this.shop, this.objectId);
+  }
 
-    await downloadsSublevel.put(gameKey, {
-      ...download!,
+  private async updateExtractionProgress(progress: number, force = false) {
+    const now = Date.now();
+
+    if (!force && now - this.lastProgressUpdate < PROGRESS_THROTTLE_MS) {
+      return;
+    }
+
+    this.lastProgressUpdate = now;
+
+    const download = await downloadsSublevel.get(this.gameKey);
+    if (!download) return;
+
+    await downloadsSublevel.put(this.gameKey, {
+      ...download,
+      extractionProgress: progress,
+    });
+
+    WindowManager.mainWindow?.webContents.send(
+      "on-extraction-progress",
+      this.shop,
+      this.objectId,
+      progress
+    );
+  }
+
+  private async clearExtractionState() {
+    const download = await downloadsSublevel.get(this.gameKey);
+    if (!download) return;
+
+    await downloadsSublevel.put(this.gameKey, {
+      ...download,
       extracting: false,
+      extractionProgress: 0,
     });
 
     WindowManager.mainWindow?.webContents.send(
@@ -30,6 +64,10 @@ export class GameFilesManager {
     );
   }
 
+  private readonly handleProgress = (progress: ExtractionProgress) => {
+    this.updateExtractionProgress(progress.percent / 100);
+  };
+
   async extractFilesInDirectory(directoryPath: string) {
     if (!fs.existsSync(directoryPath)) return;
     const files = await fs.promises.readdir(directoryPath);
@@ -42,53 +80,68 @@ export class GameFilesManager {
       (file) => /part1\.rar$/i.test(file) || !/part\d+\.rar$/i.test(file)
     );
 
-    await Promise.all(
-      filesToExtract.map((file) => {
-        return new Promise((resolve, reject) => {
-          SevenZip.extractFile(
-            {
-              filePath: path.join(directoryPath, file),
-              cwd: directoryPath,
-              passwords: ["online-fix.me", "steamrip.com"],
-            },
-            () => {
-              resolve(true);
-            },
-            () => {
-              reject(new Error(`Failed to extract file: ${file}`));
-              this.clearExtractionState();
-            }
-          );
-        });
-      })
-    );
+    if (filesToExtract.length === 0) return;
 
-    compressedFiles.forEach((file) => {
+    await this.updateExtractionProgress(0, true);
+
+    const totalFiles = filesToExtract.length;
+    let completedFiles = 0;
+
+    for (const file of filesToExtract) {
+      try {
+        const result = await SevenZip.extractFile(
+          {
+            filePath: path.join(directoryPath, file),
+            cwd: directoryPath,
+            passwords: ["online-fix.me", "steamrip.com"],
+          },
+          (progress) => {
+            const overallProgress =
+              (completedFiles + progress.percent / 100) / totalFiles;
+            this.updateExtractionProgress(overallProgress);
+          }
+        );
+
+        if (result.success) {
+          completedFiles++;
+          await this.updateExtractionProgress(
+            completedFiles / totalFiles,
+            true
+          );
+        }
+      } catch (err) {
+        logger.error(`Failed to extract file: ${file}`, err);
+        await this.clearExtractionState();
+        return;
+      }
+    }
+
+    for (const file of compressedFiles) {
       const extractionPath = path.join(directoryPath, file);
 
-      if (fs.existsSync(extractionPath)) {
-        fs.unlink(extractionPath, (err) => {
-          if (err) {
-            logger.error(`Failed to delete file: ${file}`, err);
-
-            this.clearExtractionState();
-          }
-        });
+      try {
+        if (fs.existsSync(extractionPath)) {
+          await fs.promises.unlink(extractionPath);
+          logger.info(`Deleted archive: ${file}`);
+        }
+      } catch (err) {
+        logger.error(`Failed to delete file: ${file}`, err);
       }
-    });
+    }
   }
 
   async setExtractionComplete(publishNotification = true) {
-    const gameKey = levelKeys.game(this.shop, this.objectId);
-
     const [download, game] = await Promise.all([
-      downloadsSublevel.get(gameKey),
-      gamesSublevel.get(gameKey),
+      downloadsSublevel.get(this.gameKey),
+      gamesSublevel.get(this.gameKey),
     ]);
 
-    await downloadsSublevel.put(gameKey, {
-      ...download!,
+    if (!download) return;
+
+    await downloadsSublevel.put(this.gameKey, {
+      ...download,
       extracting: false,
+      extractionProgress: 0,
     });
 
     WindowManager.mainWindow?.webContents.send(
@@ -97,17 +150,15 @@ export class GameFilesManager {
       this.objectId
     );
 
-    if (publishNotification) {
-      publishExtractionCompleteNotification(game!);
+    if (publishNotification && game) {
+      publishExtractionCompleteNotification(game);
     }
   }
 
   async extractDownloadedFile() {
-    const gameKey = levelKeys.game(this.shop, this.objectId);
-
     const [download, game] = await Promise.all([
-      downloadsSublevel.get(gameKey),
-      gamesSublevel.get(gameKey),
+      downloadsSublevel.get(this.gameKey),
+      gamesSublevel.get(this.gameKey),
     ]);
 
     if (!download || !game) return false;
@@ -119,39 +170,41 @@ export class GameFilesManager {
       path.parse(download.folderName!).name
     );
 
-    SevenZip.extractFile(
-      {
-        filePath,
-        outputPath: extractionPath,
-        passwords: ["online-fix.me", "steamrip.com"],
-      },
-      async () => {
+    await this.updateExtractionProgress(0, true);
+
+    try {
+      const result = await SevenZip.extractFile(
+        {
+          filePath,
+          outputPath: extractionPath,
+          passwords: ["online-fix.me", "steamrip.com"],
+        },
+        this.handleProgress
+      );
+
+      if (result.success) {
         await this.extractFilesInDirectory(extractionPath);
 
         if (fs.existsSync(extractionPath) && fs.existsSync(filePath)) {
-          fs.unlink(filePath, (err) => {
-            if (err) {
-              logger.error(
-                `Failed to delete file: ${download.folderName}`,
-                err
-              );
-
-              this.clearExtractionState();
-            }
-          });
+          try {
+            await fs.promises.unlink(filePath);
+            logger.info(`Deleted archive: ${download.folderName}`);
+          } catch (err) {
+            logger.error(`Failed to delete file: ${download.folderName}`, err);
+          }
         }
 
-        await downloadsSublevel.put(gameKey, {
-          ...download!,
+        await downloadsSublevel.put(this.gameKey, {
+          ...download,
           folderName: path.parse(download.folderName!).name,
         });
 
-        this.setExtractionComplete();
-      },
-      () => {
-        this.clearExtractionState();
+        await this.setExtractionComplete();
       }
-    );
+    } catch (err) {
+      logger.error(`Failed to extract downloaded file: ${filePath}`, err);
+      await this.clearExtractionState();
+    }
 
     return true;
   }

src/main/services/node-7z.d.ts

@@ -0,0 +1,87 @@
+declare module "node-7z" {
+  import { ChildProcess } from "node:child_process";
+  import { EventEmitter } from "node:events";
+
+  export interface CommandLineSwitches {
+    $bin?: string;
+    $progress?: boolean;
+    $spawnOptions?: {
+      cwd?: string;
+    };
+    outputDir?: string;
+    yes?: boolean;
+    password?: string;
+    [key: string]: unknown;
+  }
+
+  export interface ProgressInfo {
+    percent: number;
+    fileCount?: number;
+  }
+
+  export interface FileInfo {
+    file?: string;
+    [key: string]: unknown;
+  }
+
+  export interface ZipStream extends EventEmitter {
+    on(event: "progress", listener: (progress: ProgressInfo) => void): this;
+    on(event: "data", listener: (data: FileInfo) => void): this;
+    on(event: "end", listener: () => void): this;
+    on(event: "error", listener: (err: Error) => void): this;
+    info: Map<string, unknown>;
+    _childProcess?: ChildProcess;
+  }
+
+  export function extractFull(
+    archive: string,
+    output: string,
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function extract(
+    archive: string,
+    output: string,
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function list(
+    archive: string,
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function add(
+    archive: string,
+    files: string | string[],
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function update(
+    archive: string,
+    files: string | string[],
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function deleteFiles(
+    archive: string,
+    files: string | string[],
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  export function test(
+    archive: string,
+    options?: CommandLineSwitches
+  ): ZipStream;
+
+  const Seven: {
+    extractFull: typeof extractFull;
+    extract: typeof extract;
+    list: typeof list;
+    add: typeof add;
+    update: typeof update;
+    delete: typeof deleteFiles;
+    test: typeof test;
+  };
+
+  export default Seven;
+}