rework obs connection

danilopolani · Sep 13, 2023 · c3c82d5 · c3c82d5
1 parent 48861bf
commit c3c82d5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
@@ -90,7 +90,7 @@ app
     HttpServer.init();
     WorkflowQueue.init();
     Twitch.init(process.env.TWITCH_CLIENT_ID!, process.env.TWITCH_CLIENT_SECRET!).connect();
-    OBSWebSocket;
+    OBSWebSocket.init();
 
     // Auto updater
     if (import.meta.env.PROD) {

diff --git a/packages/main/src/workers/OBSWebSocket.ts b/packages/main/src/workers/OBSWebSocket.ts
@@ -17,6 +17,18 @@ export const OBSWebSocket = new class {
 
   constructor() {
     this.obs = new OBSWebSocketLib();
+  }
+
+  async init() {
+    this.settings = (await this.getSettings()) || undefined;
+
+    if (!this.settings) {
+      tellRenderer({
+        subject: ObsWebSocketSubject.Connection,
+        message: IntegrationConnectionStatus.ObsConnectionToConfigure,
+        details: 'Connection needs configuration',
+      });
+    }
 
     // Refresh app status check from time to time
     setInterval(() => this.verifyObsOpen(), 1000);
@@ -26,9 +38,9 @@ export const OBSWebSocket = new class {
    * Connect OBS WebSocket.
    */
   async connect(shouldNotifyError = true): Promise<string | undefined> {
-    this.settings = (await (Setting<ObsWebSocketSettings>).findByPk(SettingName.ObsAuth)) || undefined;
+    this.settings = (await this.getSettings()) || undefined;
 
-    if (!this.settings?.value.shouldConnect) {
+    if (!this.settings) {
       tellRenderer({
         subject: ObsWebSocketSubject.Connection,
         message: IntegrationConnectionStatus.ObsConnectionToConfigure,
@@ -94,6 +106,10 @@ export const OBSWebSocket = new class {
     await this.obs.call('SetInputMute', { inputName: source, inputMuted: false });
   }
 
+  async getSettings() {
+    return (Setting<ObsWebSocketSettings>).findByPk(SettingName.ObsAuth);
+  }
+
   private async verifyObsOpen() {
     // Avoid issues when this file is minified in actual workers such as WorkflowQueue
     if (inWorkerContext()) {
@@ -109,7 +125,7 @@ export const OBSWebSocket = new class {
     const isOpen = res.find((item) => item.name.toLocaleLowerCase().includes('obs')) !== undefined;
 
     // If app was closed and now is open, retrying connection
-    if (!this.isObsOpen && isOpen) {
+    if (!this.isObsOpen && isOpen && this.settings) {
       this.connect();
     }
 

diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
@@ -27,10 +27,7 @@ export async function generalUpdateSettings(data: GeneralSettings): Promise<void
 }
 
 export async function obsConnect(settings: ObsWebSocketConnection): Promise<string | undefined> {
-  return ipcRenderer.invoke('obs:connect', {
-    ...settings,
-    shouldConnect: true, // Force connection
-  } as ObsWebSocketSettings);
+  return ipcRenderer.invoke('obs:connect', settings);
 }
 
 export async function obsRetryConnection(): Promise<void> {

diff --git a/packages/shared/ObsWebSocketSettings.ts b/packages/shared/ObsWebSocketSettings.ts
@@ -1,5 +1,4 @@
 export type ObsWebSocketSettings = {
-  shouldConnect: boolean
   host: string
   port: string
   password: string
@@ -8,7 +7,6 @@ export type ObsWebSocketSettings = {
 export type ObsWebSocketConnection = Pick<ObsWebSocketSettings, 'host' | 'port' | 'password'>;
 
 export const ObsWebSocketSettingsDefaults: ObsWebSocketSettings = {
-  shouldConnect: false,
   host: '127.0.0.1',
   port: '4455',
   password: '',