fix: switched to node-7z

fix: switched to bun spawn but with windowsVerbatimArguments
feat: Added ppsspp integration
feat: Added focusing controls for windows
feat: Added shortcut to kill emulators

src/bun/api/jobs/emulator-download-job.ts

@@ -6,7 +6,7 @@ import { Glob } from "bun";
 import { config } from "../app";
 import path from 'node:path';
 import { getOrCachedGithubRelease } from "../cache";
-import _7z from '7zip-min';
+import Seven from 'node-7z';
 import fs from "node:fs/promises";
 import { Downloader } from "@/bun/utils/downloader";
 import { move } from "fs-extra";
@@ -85,7 +85,13 @@ export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownload
                     if (await downloader.start() && destinationPaths[0])
                     {
                         let destinationPath = destinationPaths[0];
-                        await _7z.unpack(destinationPath, emulatorsFolder);
+                        await new Promise((resolve, reject) =>
+                        {
+                            const seven = Seven.extractFull(destinationPath, emulatorsFolder, { $bin: process.env.ZIP7_PATH, $progress: true });
+                            seven.on('progress', p => context.setProgress(p.percent, "extract"));
+                            seven.on('error', e => reject(e));
+                            seven.on('end', () => resolve(true));
+                        });
                         await fs.rm(destinationPath, { recursive: true });
 
                         // check if 1 root folder we need to get rid of

src/bun/api/jobs/install-job.ts

@@ -1,5 +1,4 @@
 import { IJob, JobContext } from "../task-queue";
-import { mkdir } from 'node:fs/promises';
 import { and, eq, or } from 'drizzle-orm';
 import fs from 'node:fs/promises';
 import * as schema from "@schema/app";
@@ -11,11 +10,10 @@ import * as igdb from 'ts-igdb-client';
 import secrets from "../secrets";
 import { simulateProgress } from "@/bun/utils";
 import { Downloader } from "@/bun/utils/downloader";
-import _7z from '7zip-min';
+import Seven from 'node-7z';
 import z from "zod";
 import { checkFiles } from "../games/services/utils";
 import { ensureDir } from "fs-extra";
-import { getAuthToken } from "@/clients/romm/core/auth.gen";
 
 interface JobConfig
 {
@@ -105,9 +103,19 @@ export class InstallJob implements IJob<never, InstallJobStates>
                 const downloadedFiles = await downloader.start();
                 if (info.extract_path && downloadedFiles)
                 {
+                    let progress = 0;
+                    const progressDelta = 1 / downloadedFiles.length;
                     for (const path of downloadedFiles)
                     {
-                        await _7z.unpack(path, info.extract_path);
+                        const extractPath = info.extract_path;
+                        await new Promise((resolve, reject) =>
+                        {
+                            const seven = Seven.extractFull(path, extractPath, { $bin: process.env.ZIP7_PATH, $progress: true });
+                            seven.on('progress', p => cx.setProgress(progress + p.percent * progressDelta, "extract"));
+                            seven.on('error', e => reject(e));
+                            seven.on('end', () => resolve(true));
+                        });
+                        progress += progressDelta * 100;
                     }
                 }
             }

src/bun/api/jobs/launch-game-job.ts

@@ -4,7 +4,8 @@ import { ActiveGameSchema, ActiveGameType } from "@/bun/types/typesc.schema";
 import { db, events, plugins } from "../app";
 import * as appSchema from "@schema/app";
 import { eq, sql } from "drizzle-orm";
-import { spawn } from 'node:child_process';
+import { ChildProcessWithoutNullStreams, spawn } from 'node:child_process';
+import { killBrowser } from "@/bun/utils/browser-spawner";
 
 export class LaunchGameJob implements IJob<z.infer<typeof LaunchGameJob.dataSchema>, "playing">
 {
@@ -39,26 +40,42 @@ export class LaunchGameJob implements IJob<z.infer<typeof LaunchGameJob.dataSche
             autoValidCommand: this.validCommand,
             game: { source: this.gameSource, id: this.gameId }
         });
-        const command = commandArgs ? this.validCommand.metadata.emulatorBin ?? this.validCommand.command : this.validCommand.command;
 
         await new Promise((resolve, reject) =>
         {
-            const game = spawn(command, commandArgs, {
-                shell: true,
-                cwd: this.validCommand.startDir,
-                signal: context.abortSignal
-            });
+            let game: Bun.Subprocess;
+            if (!commandArgs)
+            {
+                game = Bun.spawn(this.validCommand.command.split(' '), {
+                    cwd: this.validCommand.startDir,
+                    windowsVerbatimArguments: true,
+                    signal: context.abortSignal
+                });
 
-            game.stdout.on('data', data => console.log(data));
-            game.on('close', (code) =>
+                game.exited.then(resolve).catch(e =>
+                {
+                    console.error(e);
+                    reject(e);
+                });
+            }
+            else if (this.validCommand.metadata.emulatorBin)
             {
-                resolve(code);
-            });
-            game.on('error', e =>
+                game = Bun.spawn([this.validCommand.metadata.emulatorBin, ...commandArgs], {
+                    cwd: this.validCommand.startDir,
+                    windowsVerbatimArguments: true,
+                    signal: context.abortSignal
+                });
+
+                game.exited.then(resolve).catch(e =>
+                {
+                    console.error(e);
+                    reject(e);
+                });
+            } else
             {
-                console.error(e);
-                reject(e);
-            });
+                reject(new Error("No Emulator Bin"));
+                return;
+            }
 
             this.activeGame = {
                 process: game,