test: made tests work in windows

src/bun/api/app.ts

@@ -41,8 +41,8 @@ export let taskQueue: TaskQueue;
 export let plugins: PluginManager;
 export let events: EventEmitter<AppEventMap>;
 let controlsHandle: { cleanup: () => void; };
-let api: any;
-let bunServer: { stop: () => void; } | undefined;
+let api: { cleanup: () => Promise<void>; };
+let bunServer: { cleanup: () => Promise<void>; } | undefined;
 
 export async function load ()
 {
@@ -97,13 +97,16 @@ export async function load ()
 export async function cleanup ()
 {
     console.log("Cleaning Up");
-    bunServer?.stop();
-    await api.apiServer.stop(true);
+    await bunServer?.cleanup();
     await api.cleanup();
     await taskQueue.close();
+    await plugins.cleanup();
     controlsHandle.cleanup();
-    sqlite.close();
+    cacheSqlite.close();
     emulatorsSqlite.close();
+    sqlite.close();
+    config._closeWatcher();
+    customEmulators._closeWatcher();
     console.log("Finished Cleaning Up");
 }
 
@@ -117,7 +120,7 @@ export async function reloadDatabase ()
     db = drizzle(sqlite, { schema });
     cache = drizzle(cacheSqlite, { schema: cacheSchema });
     migrate(db!, { migrationsFolder: appPath("./drizzle") });
-    cache.run(`
+    await cache.run(`
         CREATE TABLE IF NOT EXISTS item_cache (
             key TEXT PRIMARY KEY,
             data TEXT NOT NULL,

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

@@ -11,6 +11,7 @@ import fs from "node:fs/promises";
 import { Downloader } from "@/bun/utils/downloader";
 import { ensureDir, move } from "fs-extra";
 import { simulateProgress } from "@/bun/utils";
+import { path7za } from "7zip-bin";
 
 type EmulatorDownloadStates = "download" | "extract";
 
@@ -97,7 +98,7 @@ export class EmulatorDownloadJob implements IJob<z.infer<typeof EmulatorDownload
                         let destinationPath = destinationPaths[0];
                         await new Promise((resolve, reject) =>
                         {
-                            const seven = Seven.extractFull(destinationPath, emulatorsFolder, { $bin: process.env.ZIP7_PATH, $progress: true });
+                            const seven = Seven.extractFull(destinationPath, emulatorsFolder, { $bin: process.env.ZIP7_PATH ?? path7za, $progress: true, noRootDuplication: true });
                             seven.on('progress', p => context.setProgress(p.percent, "extract"));
                             seven.on('error', e => reject(e));
                             seven.on('end', () => resolve(true));

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

@@ -14,6 +14,7 @@ import Seven from 'node-7z';
 import z from "zod";
 import { checkFiles } from "../games/services/utils";
 import { ensureDir } from "fs-extra";
+import { path7za } from "7zip-bin";
 
 interface JobConfig
 {
@@ -45,7 +46,7 @@ export class InstallJob implements IJob<never, InstallJobStates>
     public async start (cx: JobContext<InstallJob, never, InstallJobStates>)
     {
         cx.setProgress(0, 'download');
-        fs.mkdir(config.get('downloadPath'), { recursive: true });
+        await fs.mkdir(config.get('downloadPath'), { recursive: true });
 
         const downloadPath = config.get('downloadPath');
         let info: DownloadInfo | undefined;
@@ -111,7 +112,7 @@ export class InstallJob implements IJob<never, InstallJobStates>
                         const extractPath = path.join(config.get('downloadPath'), info.extract_path);
                         await new Promise((resolve, reject) =>
                         {
-                            const seven = Seven.extractFull(filePath, extractPath, { $bin: process.env.ZIP7_PATH, $progress: true });
+                            const seven = Seven.extractFull(filePath, extractPath, { $bin: process.env.ZIP7_PATH ?? path7za, $progress: true });
                             seven.on('progress', p =>
                             {
                                 cx.setProgress(progress + p.percent * progressDelta, "extract");

src/bun/api/rpc.ts

@@ -42,7 +42,7 @@ export async function RunAPIServer ()
         apiServer: api,
         async cleanup ()
         {
-            await api.stop();
+            await api.stop(true);
         }
     };
 }

src/bun/api/task-queue.ts

@@ -105,7 +105,7 @@ export class TaskQueue
     {
         this.queue = [];
         this.activeQueue.forEach(c => c.abort());
-        return Promise.all(this.activeQueue.map(c => c.promise));
+        return Promise.all(this.activeQueue.map(c => c.promise.promise));
     }
 }
 

src/bun/server.ts

@@ -4,7 +4,7 @@ import { appPath } from "./utils";
 import Elysia from "elysia";
 import cors from "@elysiajs/cors";
 
-export function RunBunServer ()
+export async function RunBunServer ()
 {
   console.log("Launching Server on port ", SERVER_PORT);
   const server = new Elysia()
@@ -24,11 +24,21 @@ export function RunBunServer ()
     })
     .get("/*", ({ params }) => Bun.file(appPath(`./dist/${params["*"]}`)));
 
-  return new Promise<typeof server>((resolve) =>
+
+  await new Promise<typeof server>((resolve) =>
   {
     server.listen({ port: SERVER_PORT, hostname: host, development: true }, async ({ hostname, port }) =>
     {
       resolve(server);
     });
   });
+
+  await server.modules;
+
+  return {
+    cleanup: async () =>
+    {
+      await server.stop(true);
+    }
+  };
 }

src/bun/utils/downloader.ts

@@ -191,6 +191,7 @@ export class Downloader
                         return;
                     }
 
+                    reader.cancel();
                     console.log("Aborting Download: ", this.signal.reason);
                     break;
                 }
@@ -203,7 +204,8 @@ export class Downloader
 
             await new Promise((resolve, reject) =>
             {
-                stream.end(() => resolve(undefined));
+                stream.end();
+                stream.on("close", () => resolve(false));
                 stream.on("error", reject);
             });
         }

src/tests/downloads.test.ts

@@ -136,6 +136,12 @@ describe("Download Tests", () =>
                         type: "direct",
                         url: `${server.url.href}download/zip_file_with_single_file.zip?root=test`
                     }
+                ],
+                "win32:x64": [
+                    {
+                        type: "direct",
+                        url: `${server.url.href}download/zip_file_with_single_file.zip?root=test`
+                    }
                 ]
             },
             keywords: [

src/tests/preload.ts

@@ -2,6 +2,7 @@ import { afterAll, beforeAll, beforeEach, afterEach } from 'bun:test';
 import { resolve } from 'node:path';
 import * as app from '@/bun/api/app';
 import { remove } from 'fs-extra';
+import { spawnSync } from "child_process";
 
 export async function LoadApp ()
 {
@@ -12,7 +13,7 @@ export async function LoadApp ()
 export async function CleanupApp ()
 {
     console.log("Cleaning Up App");
-    app.cleanup();
+    await app.cleanup();
 }
 
 beforeAll(async () =>
@@ -22,12 +23,25 @@ beforeAll(async () =>
     process.env.DEFAULT_DOWNLOAD_PATH = resolve('./src/tests/mock-roms');
 });
 
+async function FileCleanup ()
+{
+    try
+    {
+        await remove(resolve('./src/tests/mock-config'));
+        await remove(resolve('./src/tests/mock-store'));
+        await remove(resolve('./src/tests/mock-roms'));
+    } catch
+    {
+        //TODO: Bun doesn't close DB correctly and it gets locked so it doesn't get removed
+    }
+}
+
+beforeEach(FileCleanup);
+
 afterEach(async () =>
 {
-    await remove(resolve('./src/tests/mock-config'));
-    await remove(resolve('./src/tests/mock-roms'));
-    await remove(resolve('./src/tests/mock-store'));
+    await CleanupApp();
+    await FileCleanup();
 });
 
-beforeEach(LoadApp, { timeout: 30000 });
-afterEach(CleanupApp);
+beforeEach(LoadApp);