fix(nodecg-utility-obs): compensate for obs-websocket bug

obsproject/obs-websocket#346
nodecg · Jun 17, 2019 · 9e8ca41 · 9e8ca41
1 parent 0cac9f7
commit 9e8ca41
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/packages/nodecg-utility-obs/dist/index.d.ts b/packages/nodecg-utility-obs/dist/index.d.ts
@@ -48,7 +48,7 @@ export declare class OBSUtility extends OBSWebSocket {
         messageId: string;
         status: "ok";
         name: string;
-        sources: OBSWebSocket.Source[];
+        sources: OBSWebSocket.SceneItem[];
     }, void, void]>;
     /**
      * Attempt to reconnect to OBS, and keep re-trying every 5s until successful.
@@ -69,7 +69,7 @@ export declare class OBSUtility extends OBSWebSocket {
         messageId: string;
         status: "ok";
         name: string;
-        sources: OBSWebSocket.Source[];
+        sources: OBSWebSocket.SceneItem[];
     }, void, void]>;
     /**
      * Updates the sceneList replicant with the current value from OBS.
@@ -90,7 +90,7 @@ export declare class OBSUtility extends OBSWebSocket {
         messageId: string;
         status: "ok";
         name: string;
-        sources: OBSWebSocket.Source[];
+        sources: OBSWebSocket.SceneItem[];
     }>;
     /**
      * Updates the previewScene replicant with the current value from OBS.

diff --git a/packages/nodecg-utility-obs/dist/index.d.ts.map b/packages/nodecg-utility-obs/dist/index.d.ts.map
diff --git a/packages/nodecg-utility-obs/dist/index.js b/packages/nodecg-utility-obs/dist/index.js
diff --git a/packages/nodecg-utility-obs/dist/index.js.map b/packages/nodecg-utility-obs/dist/index.js.map
diff --git a/packages/nodecg-utility-obs/src/index.ts b/packages/nodecg-utility-obs/src/index.ts
@@ -392,10 +392,15 @@ export class OBSUtility extends OBSWebSocket {
 	 */
 	_updateProgramScene() {
 		return this.send('GetCurrentScene').then(res => {
-			this.replicants.programScene.value = {
-				name: res.name,
-				sources: res.sources
-			};
+			// This conditional is required because of this bug:
+			// https://github.com/Palakis/obs-websocket/issues/346
+			if (res.name && res.sources) {
+				this.replicants.programScene.value = {
+					name: res.name,
+					sources: res.sources
+				};
+			}
+
 			return res;
 		}).catch(err => {
 			this.log.error('Error updating program scene:', err);
@@ -407,10 +412,14 @@ export class OBSUtility extends OBSWebSocket {
 	 */
 	_updatePreviewScene() {
 		return this.send('GetPreviewScene').then(res => {
-			this.replicants.previewScene.value = {
-				name: res.name,
-				sources: res.sources
-			};
+			// This conditional is required because of this bug:
+			// https://github.com/Palakis/obs-websocket/issues/346
+			if (res.name && res.sources) {
+				this.replicants.previewScene.value = {
+					name: res.name,
+					sources: res.sources
+				};
+			}
 		}).catch(err => {
 			if (err.error === 'studio mode not enabled') {
 				this.replicants.previewScene.value = null;