fix tests hanging again

MrBrax · Jun 22, 2023 · bb6f09b · bb6f09b
1 parent b337751
commit bb6f09b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 43 deletions.
diff --git a/server/src/Controllers/Channels.ts b/server/src/Controllers/Channels.ts
@@ -30,7 +30,7 @@ import { TwitchVODChapterJSON } from "../Storage/JSON";
 import { Job } from "../Core/Job";
 import { Exporter, GetExporter } from "./Exporter";
 import { ExporterOptions } from "@common/Exporter";
-import { KickChannel } from "Core/Providers/Kick/KickChannel";
+import { KickChannel } from "../Core/Providers/Kick/KickChannel";
 
 export async function ListChannels(req: express.Request, res: express.Response): Promise<void> {
 

diff --git a/server/src/Controllers/KickAPI.ts b/server/src/Controllers/KickAPI.ts
@@ -1,5 +1,5 @@
 import type { KickChannel, KickUser, KickChannelVideo, KickChannelLivestream, KickChannelLivestreamResponse } from "@common/KickAPI/Kick";
-import { GetUser } from "Providers/Kick";
+import { GetUser } from "../Providers/Kick";
 import express from "express";
 import { ApiErrorResponse } from "@common/Api/Api";
 

diff --git a/server/src/Core/LiveStreamDVR.ts b/server/src/Core/LiveStreamDVR.ts
@@ -432,7 +432,7 @@ export class LiveStreamDVR {
         return false;
     }
 
-    public static shutdown(reason: string) {
+    public static shutdown(reason: string, doNotActuallyShutdown?: boolean): void {
         this.shutting_down = true;
         console.log(chalk.red(`[${new Date().toISOString()}] Shutting down (${reason})...`));
 
@@ -445,17 +445,23 @@ export class LiveStreamDVR {
             });
         }
 
-        let timeout: NodeJS.Timeout | undefined = undefined;
-        // introduced in node 18.2
-        if ("closeAllConnections" in this.server) {
-            console.log("closeAllConnections is available, using it");
-            this.server.closeAllConnections();
-        } else {
-            // bad workaround
-            timeout = xTimeout(() => {
-                console.log(chalk.red("Force exiting server, 10 seconds have passed without close event."));
-                process.exit(1);
-            }, 10000);
+        if (this.server) {
+
+            // let timeout: NodeJS.Timeout | undefined = undefined;
+            // introduced in node 18.2
+            if ("closeAllConnections" in this.server) {
+                console.log("closeAllConnections is available, using it");
+                this.server.closeAllConnections();
+            } else {
+                console.error("closeAllConnections is not available");
+                // bad workaround
+                /*
+                timeout = xTimeout(() => {
+                    console.log(chalk.red("Force exiting server, 10 seconds have passed without close event."));
+                    if (!doNotActuallyShutdown) process.exit(1);
+                }, 10000);*/
+            }
+
         }
 
         if (this.debugConnectionInterval) {
@@ -465,32 +471,40 @@ export class LiveStreamDVR {
         clearAllTimeoutsAndIntervals();
 
         // this will not be called until all connections are closed
-        this.server.close(async (error) => {
-            if (error) {
-                console.log(chalk.red(error));
-            } else {
-                console.log(chalk.red("express server is now down"));
-            }
-            if (this.websocketServer) this.websocketServer.close();
-            Scheduler.removeAllJobs();
-            for (const c of LiveStreamDVR.getInstance().channels) {
-                await c.stopWatching();
-            }
-            for (const v of LiveStreamDVR.getInstance().vods) {
-                await v.stopWatching();
-            }
-            for (const j of Job.jobs) {
-                await j.kill();
-            }
-            ClientBroker.wss = undefined;
-            Config.getInstance().stopWatchingConfig();
-            TwitchHelper.removeAllEventWebsockets();
-            if (timeout !== undefined) clearTimeout(timeout);
-            if (LiveStreamDVR.getInstance().diskSpaceInterval) clearInterval(LiveStreamDVR.getInstance().diskSpaceInterval);
-            if (fs.existsSync(path.join(BaseConfigCacheFolder.cache, "is_running"))) fs.unlinkSync(path.join(BaseConfigCacheFolder.cache, "is_running"));
-            console.log(chalk.red("Finished tasks, bye bye."));
-            // process.exit(0);
-        });
+        if (this.server) {
+            this.server.close(async (error) => {
+                if (error) {
+                    console.log(chalk.red(error));
+                } else {
+                    console.log(chalk.red("express server is now down"));
+                }
+                await this.shutdownRest();
+            });
+        } else {
+            this.shutdownRest();
+        }
+    }
+
+    private static async shutdownRest(): Promise<void> {
+        if (this.websocketServer) this.websocketServer.close();
+        Scheduler.removeAllJobs();
+        for (const c of LiveStreamDVR.getInstance().channels) {
+            await c.stopWatching();
+        }
+        for (const v of LiveStreamDVR.getInstance().vods) {
+            await v.stopWatching();
+        }
+        for (const j of Job.jobs) {
+            await j.kill();
+        }
+        ClientBroker.wss = undefined;
+        Config.getInstance().stopWatchingConfig();
+        TwitchHelper.removeAllEventWebsockets();
+        // if (timeout !== undefined) clearTimeout(timeout);
+        if (LiveStreamDVR.getInstance().diskSpaceInterval) clearInterval(LiveStreamDVR.getInstance().diskSpaceInterval);
+        if (fs.existsSync(path.join(BaseConfigCacheFolder.cache, "is_running"))) fs.unlinkSync(path.join(BaseConfigCacheFolder.cache, "is_running"));
+        console.log(chalk.red("Finished tasks, bye bye."));
+        // process.exit(0);
     }
 
     /**

diff --git a/server/src/Core/Scheduler.ts b/server/src/Core/Scheduler.ts
@@ -22,7 +22,7 @@ export class Scheduler {
         if (this.hasJob(name)) {
             this.removeJob(name);
         }
-        const job = new cron.CronJob(cronTime, callback);
+        const job = new cron.CronJob(cronTime, callback, undefined, false);
         this.jobs[name] = job;
         job.start();
         Log.logAdvanced(Log.Level.INFO, "scheduler.schedule", `Scheduled job '${name}' with cronTime '${cronTime}'`);

diff --git a/server/tests/api.test.ts b/server/tests/api.test.ts
@@ -76,6 +76,7 @@ beforeAll(async () => {
 
 afterAll(() => {
     Config.destroyInstance();
+    LiveStreamDVR.shutdown("test", true);
     app = undefined;
     spy1?.mockRestore();
     jest.restoreAllMocks();

diff --git a/server/tests/scheduler.test.ts b/server/tests/scheduler.test.ts
@@ -9,9 +9,12 @@ jest.mock("../src/Controllers/Cron", () => {
     };
 });
 
-describe("Scheduler", () => {
-
+beforeAll(() => {
+    Config.getInstance().config = {};
     Scheduler.defaultJobs();
+});
+
+describe("Scheduler", () => {
     it("should run the function inside the schedule if the config is set to true", () => {
         const config = Config.getInstance();
         config.config = {};