Merge pull request #3 from AceCentre/persistentId-changes

Persistent id changes
AceCentre · Nov 8, 2024 · c2181d5 · c2181d5
2 parents d3dbfe4 + 90dfb7f
commit c2181d5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/nodejs/sender-monitor/main.js b/nodejs/sender-monitor/main.js
@@ -1,7 +1,7 @@
 const { app, Tray, Menu, shell, clipboard, BrowserWindow, ipcMain, screen} = require("electron");
 const path = require("path");
 const fs = require("fs");
-const webrtc = require("./webrtc");
+const WebRTCConnection = require("./webrtc");
 const QRCode = require("qrcode");
 const { Monitor } = require("node-screenshots");
 const { performOCR } = require("./ocr");
@@ -32,7 +32,7 @@ if (app.isPackaged && !fs.existsSync(configFilePath)) {
 }
 
 let config = JSON.parse(fs.readFileSync(configFilePath, "utf-8"));
-
+const webrtc = new WebRTCConnection(config);
 
 ipcMain.on("close-qr-window", () => {
     if (qrWindow) {
@@ -121,6 +121,9 @@ async function createQRWindow(qrDataUrl) {
 function reloadConfig() {
     try {
         config = JSON.parse(fs.readFileSync(configFilePath, "utf-8"));
+        if (config.sessionId !== webrtc.sessionId) {
+            webrtc.updateConfig(config);
+        }
         console.log("Configuration reloaded.");
         logMessage("Configuration reloaded from config.json.");
 

diff --git a/nodejs/sender-monitor/webrtc.js b/nodejs/sender-monitor/webrtc.js
@@ -5,32 +5,50 @@ const faker = require("@faker-js/faker").faker;
 const iceServers = require("./iceServers");
 
 const WEBSOCKET_URL = "wss://owd.acecentre.net";
+//const WEBSOCKET_URL = "ws://localhost:3000";
 
 class WebRTCConnection extends EventEmitter {
-    constructor() {
+    constructor(config) {
         super();
         this.peerConnections = {};
         this.dataChannels = {};
-        this.sessionId = this.generateSessionId();
+        this.config;
+        this.sessionId = this.getSessionId();
         this.socket = io(WEBSOCKET_URL, { transports: ["websocket"], withCredentials: true });
         this.setupSocketListeners();
     }
 
+    updateConfig(newConfig) {
+        this.config = newConfig;
+        this.sessionId = this.getSessionId();
+    }
+
     generateSessionId() {
         const word1 = faker.word.adjective();
         const word2 = faker.word.adjective();
         const word3 = faker.word.noun();
         return `${word1}-${word2}-${word3}`;
     }
 
+    getSessionId() {
+        if (this.config && this.config.sessionId) {
+            this.sessionPersistent = true;
+            return this.config.sessionId;
+        } else {
+            this.sessionPersistent = false;
+            return this.generateSessionId();
+        }
+    }
+
     startSession() {
         console.log(`Session ID: ${this.sessionId}`);
         return this.sessionId;
     }
 
     setupSocketListeners() {
+        this.getSessionId()
         this.socket.on("connect", () => {
-            this.socket.emit("joinSession", this.sessionId);
+            this.socket.emit("joinSession", this.sessionId, this.sessionPersistent);
             this.emit("connected"); // Emit connected event
         });
 
@@ -137,4 +155,4 @@ class WebRTCConnection extends EventEmitter {
     }
 }
 
-module.exports = new WebRTCConnection();
+module.exports = WebRTCConnection;