[IMP] fixup

Author: ThanhDodeurOdoo

src/models/channel.ts

@@ -13,7 +13,7 @@ import {
     type SessionInfo
 } from "#src/models/session.ts";
 import { Recorder } from "#src/models/recorder.ts";
-import { getWorker, type RtcWorker } from "#src/services/rtc.ts";
+import { getWorker, type RtcWorker } from "#src/services/resources.ts";
 
 const logger = new Logger("CHANNEL");
 

src/models/ffmpeg.ts

@@ -0,0 +1,8 @@
+import { EventEmitter } from "node:events";
+
+export class FFMPEG extends EventEmitter {
+
+    constructor() {
+        super();
+    }
+}

src/models/recorder.ts

@@ -1,13 +1,19 @@
-import {EventEmitter} from "node:events";
+import { EventEmitter } from "node:events";
 import type { Channel } from "./channel";
-import {Logger} from "#src/utils/utils.ts";
+import { getFolder } from "#src/services/resources";
+import { Logger } from "#src/utils/utils.ts";
 
+export enum RECORDER_STATE {
+    STARTED = "started",
+    STOPPED = "stopped",
+}
 const logger = new Logger("RECORDER");
 
 export class Recorder extends EventEmitter {
     channel: Channel;
-    state: "started" | "stopped" = "stopped";
+    state: RECORDER_STATE = RECORDER_STATE.STOPPED;
     ffmpeg = null;
+    destPath: string | undefined;
     /** Path to which the final recording will be uploaded to */
     recordingAddress: string;
 
@@ -18,16 +24,28 @@ export class Recorder extends EventEmitter {
     }
 
     async start() {
-        this.state = "started";
-        logger.trace("TO IMPLEMENT");
-        // TODO ffmpeg instance creation, start
+        if (this.state === RECORDER_STATE.STOPPED) {
+            const { path, sealFolder }  = getFolder();
+            this.destPath = path;
+            this.once("stopped", sealFolder);
+            this.state = RECORDER_STATE.STARTED;
+             logger.trace("TO IMPLEMENT");
+             // TODO ffmpeg instance creation for recording to destPath with proper name, start, build timestamps object
+        }
+
         return { state: this.state };
     }
 
     async stop() {
-        this.state = "stopped";
-        logger.trace("TO IMPLEMENT");
-        // TODO ffmpeg instance stop, cleanup, save,...
+        if (this.state === RECORDER_STATE.STARTED) {
+
+            logger.trace("TO IMPLEMENT");
+            this.emit("stopped");
+            // TODO ffmpeg instance stop, cleanup,
+            // only resolve promise and switch state when completely ready to start a new recording.
+            this.state = RECORDER_STATE.STOPPED;
+        }
+
         return { state: this.state };
     }
 }

src/server.ts

@@ -1,4 +1,4 @@
-import * as rtc from "#src/services/rtc.ts";
+import * as resources from "#src/services/resources.ts";
 import * as http from "#src/services/http.ts";
 import * as auth from "#src/services/auth.ts";
 import { Logger } from "#src/utils/utils.ts";
@@ -8,15 +8,15 @@ const logger = new Logger("SERVER", { logLevel: "all" });
 
 async function run(): Promise<void> {
     auth.start();
-    await rtc.start();
+    await resources.start();
     await http.start();
     logger.info(`ready - PID: ${process.pid}`);
 }
 
 function cleanup(): void {
     Channel.closeAll();
     http.close();
-    rtc.close();
+    resources.close();
     logger.info("cleanup complete");
 }
 

src/services/rtc.ts renamed to src/services/resources.ts

@@ -10,7 +10,7 @@ export interface RtcWorker extends mediasoup.types.Worker {
     };
 }
 
-const logger = new Logger("RTC");
+const logger = new Logger("RESOURCES");
 const workers = new Set<RtcWorker>();
 
 export async function start(): Promise<void> {
@@ -76,3 +76,20 @@ export async function getWorker(): Promise<mediasoup.types.Worker> {
     logger.debug(`worker ${leastUsedWorker!.pid} with ${lowestUsage} ru_maxrss was selected`);
     return leastUsedWorker;
 }
+
+export function getFolder() {
+    // create a temp folder at a path, returns the path and a function to seal the folder
+    return {
+        path: "",
+        sealFolder: () => {
+            // move the content into a permanent folder location so it can easily be retrieved for processing later
+            // or directly forward for transcription
+        },
+    }
+}
+
+export function getPort() {
+}
+
+export function releasePort(port: number) {
+}

tests/models.test.ts

@@ -1,17 +1,17 @@
 import { describe, beforeEach, afterEach, expect, jest } from "@jest/globals";
 
-import * as rtc from "#src/services/rtc";
+import * as resources from "#src/services/resources";
 import { Channel } from "#src/models/channel";
 import { timeouts, CHANNEL_SIZE } from "#src/config";
 import { OvercrowdedError } from "#src/utils/errors";
 
 describe("Models", () => {
     beforeEach(async () => {
-        await rtc.start();
+        await resources.start();
     });
     afterEach(() => {
         Channel.closeAll();
-        rtc.close();
+        resources.close();
     });
     test("Create channel and session", async () => {
         const channel = await Channel.create("testRemote", "testIssuer");

tests/rtc.test.ts

@@ -1,19 +1,19 @@
 import { afterEach, beforeEach, describe, expect } from "@jest/globals";
 
-import * as rtc from "#src/services/rtc";
+import * as resources from "#src/services/resources";
 import * as config from "#src/config";
 
 describe("rtc service", () => {
     beforeEach(async () => {
-        await rtc.start();
+        await resources.start();
     });
     afterEach(() => {
-        rtc.close();
+        resources.close();
     });
     test("worker load should be evenly distributed", async () => {
         const usedWorkers = new Set();
         for (let i = 0; i < config.NUM_WORKERS; ++i) {
-            const worker = await rtc.getWorker();
+            const worker = await resources.getWorker();
             const router = await worker.createRouter({});
             const webRtcServer = await worker.createWebRtcServer(config.rtc.rtcServerOptions);
             const promises = [];

tests/utils/network.ts

@@ -5,7 +5,7 @@ import * as fakeParameters from "mediasoup-client/lib/test/fakeParameters";
 
 import * as auth from "#src/services/auth";
 import * as http from "#src/services/http";
-import * as rtc from "#src/services/rtc";
+import * as resources from "#src/services/resources";
 import { SfuClient, SfuClientState } from "#src/client";
 import { Channel } from "#src/models/channel";
 import type { Session } from "#src/models/session";
@@ -69,7 +69,7 @@ export class LocalNetwork {
         this.port = port;
 
         // Start all services in correct order
-        await rtc.start();
+        await resources.start();
         await http.start({ httpInterface: hostname, port });
         await auth.start(HMAC_B64_KEY);
     }
@@ -217,7 +217,7 @@ export class LocalNetwork {
         // Stop all services
         auth.close();
         http.close();
-        rtc.close();
+        resources.close();
 
         // Clear network info
         this.hostname = undefined;