From 9e8ca41fea755cf48e07a9db73ecd429e20880c1 Mon Sep 17 00:00:00 2001 From: Alex Van Camp Date: Sun, 16 Jun 2019 22:25:59 -0500 Subject: [PATCH] fix(nodecg-utility-obs): compensate for obs-websocket bug https://github.com/Palakis/obs-websocket/issues/346 --- packages/nodecg-utility-obs/dist/index.d.ts | 6 ++--- .../nodecg-utility-obs/dist/index.d.ts.map | 2 +- packages/nodecg-utility-obs/dist/index.js | 24 ++++++++++++------ packages/nodecg-utility-obs/dist/index.js.map | 2 +- packages/nodecg-utility-obs/src/index.ts | 25 +++++++++++++------ 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/packages/nodecg-utility-obs/dist/index.d.ts b/packages/nodecg-utility-obs/dist/index.d.ts index 2061fcd..493f38a 100644 --- 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 index 68873e4..6ba3371 100644 --- a/packages/nodecg-utility-obs/dist/index.d.ts.map +++ b/packages/nodecg-utility-obs/dist/index.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAGvD,UAAU,iBAAiB;IAC1B,iBAAiB,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,CAAA;CACD;AAED,MAAM,WAAW,KAAK;IACrB,aAAa,CAAC,cAAc,EAAE,iBAAiB,GAC9C,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACtE;AAID,qBAAa,UAAW,SAAQ,YAAY;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACtB,UAAU,EAAE;QACX,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAChC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QACtC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QACtC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAChC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QACxC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;KAClC,CAAC;IACF,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,6BAA6B,CAAS;IAC9C,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,UAAU,CAAU;gBAEhB,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAM;IAyQnF;;;;OAIG;IACH,aAAa;;;;;;;;;;;IAoBb;;;OAGG;IACH,eAAe;IAkBf;;;;OAIG;IACH,WAAW;;;;;;;;;;;IASX;;;;OAIG;IACH,iBAAiB;;;;;;IASjB;;;OAGG;IACH,mBAAmB;;;;;;IAYnB;;OAEG;IACH,mBAAmB;IAgBnB;;;;OAIG;IACH,iBAAiB;IAQjB;;;;;;;;;;OAUG;IACG,WAAW,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;IA+CtE;;;;;OAKG;IACH,MAAM,CAAC,oBAAoB;CAG3B"} \ No newline at end of file +{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAGvD,UAAU,iBAAiB;IAC1B,iBAAiB,EAAE;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;KAClB,CAAA;CACD;AAED,MAAM,WAAW,KAAK;IACrB,aAAa,CAAC,cAAc,EAAE,iBAAiB,GAC9C,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACtE;AAID,qBAAa,UAAW,SAAQ,YAAY;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACtB,UAAU,EAAE;QACX,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAChC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QACtC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QACtC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QAChC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QACxC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;KAClC,CAAC;IACF,GAAG,EAAE,MAAM,CAAC;IAEZ,OAAO,CAAC,6BAA6B,CAAS;IAC9C,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,UAAU,CAAU;gBAEhB,MAAM,EAAE,MAAM,EAAE,IAAI,GAAE;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAM;IAyQnF;;;;OAIG;IACH,aAAa;;;;;;;;;;;IAoBb;;;OAGG;IACH,eAAe;IAkBf;;;;OAIG;IACH,WAAW;;;;;;;;;;;IASX;;;;OAIG;IACH,iBAAiB;;;;;;IASjB;;;OAGG;IACH,mBAAmB;;;;;;IAiBnB;;OAEG;IACH,mBAAmB;IAoBnB;;;;OAIG;IACH,iBAAiB;IAQjB;;;;;;;;;;OAUG;IACG,WAAW,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;IA+CtE;;;;;OAKG;IACH,MAAM,CAAC,oBAAoB;CAG3B"} \ No newline at end of file diff --git a/packages/nodecg-utility-obs/dist/index.js b/packages/nodecg-utility-obs/dist/index.js index 5587135..82dc20f 100644 --- a/packages/nodecg-utility-obs/dist/index.js +++ b/packages/nodecg-utility-obs/dist/index.js @@ -323,10 +323,14 @@ 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); @@ -337,10 +341,14 @@ 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; diff --git a/packages/nodecg-utility-obs/dist/index.js.map b/packages/nodecg-utility-obs/dist/index.js.map index 4e048dc..c2e0331 100644 --- a/packages/nodecg-utility-obs/dist/index.js.map +++ b/packages/nodecg-utility-obs/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,SAAS;AACT,6BAA8B;AAE9B,WAAW;AACX,+BAA+B;AAC/B,iDAAiD;AAsBjD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;AAEjC,MAAa,UAAW,SAAQ,YAAY;IAiB3C,YAAY,MAAc,EAAE,OAAqD,EAAE;QAClF,KAAK,EAAE,CAAC;QALD,kCAA6B,GAAG,KAAK,CAAC;QACtC,uBAAkB,GAA0B,IAAI,CAAC;QAKxD,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;YACjC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;SAC3B;QAED,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,cAAc,SAAS,+DAA+D,CAAC,CAAC;SACxG;QAED,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,MAAM,mBAAmB,GAAG,MAAM,CAAC,SAAS,CAAa,iBAAiB,EAAE;YAC3E,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC;YACzC,UAAU,EAAE,KAAK;SACjB,CAAC,CAAC;QACH,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE1C,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CAAY,GAAG,SAAS,YAAY,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC;QAC1H,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAe,GAAG,SAAS,eAAe,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,cAAc,CAAC,EAAC,CAAC,CAAC;QAChI,MAAM,YAAY,GAAG,MAAM,CAAC,SAAS,CAAe,GAAG,SAAS,eAAe,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,cAAc,CAAC,EAAC,CAAC,CAAC;QAChI,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAY,GAAG,SAAS,YAAY,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC;QACpH,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAgB,GAAG,SAAS,gBAAgB,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,eAAe,CAAC,EAAC,CAAC,CAAC;QACpI,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAa,GAAG,SAAS,aAAa,EAAE,EAAC,UAAU,EAAE,eAAe,CAAC,YAAY,CAAC,EAAC,CAAC,CAAC;QACxH,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS,EAAE,CAAC,CAAC;QAEnE,kDAAkD;QAClD,2EAA2E;QAC3E,gEAAgE;QAChE,wDAAwD;QACxD,IAAI,CAAC,UAAU,GAAG;YACjB,SAAS,EAAE,eAAe;YAC1B,YAAY;YACZ,YAAY;YACZ,SAAS;YACT,aAAa;YACb,UAAU;SACV,CAAC;QACF,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAE9B,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACvC,4DAA4D;YAC5D,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE;gBACpE,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;gBAC5C,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;oBACtC,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;gBACxC,CAAC,CAAC,CAAC;aACH;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC7D,IAAI,CAAC,6BAA6B,GAAG,KAAK,CAAC;YAC3C,aAAa,CAAC,IAAI,CAAC,kBAAmB,CAAC,CAAC;YACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,eAAe,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;YACrC,eAAe,CAAC,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACvD,eAAe,CAAC,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjD,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC9B,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAClC,QAAQ,EAAE,CAAC;iBACX;YACF,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACd,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC;gBACvC,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;gBAErC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,OAAO,EAAE;oBAClC,OAAO;iBACP;gBAED,4FAA4F;gBAC5F,IAAI,GAAG,CAAC,KAAK,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,EAAE;oBAC/C,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACpB;qBAAM,IAAI,GAAG,CAAC,OAAO,EAAE;oBACvB,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBACtB;qBAAM,IAAI,GAAG,CAAC,IAAI,EAAE;oBACpB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;iBACnB;qBAAM;oBACN,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACd;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,aAAa,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC/D,IAAI,CAAC,6BAA6B,GAAG,IAAI,CAAC;YAC1C,aAAa,CAAC,IAAI,CAAC,kBAAmB,CAAC,CAAC;YACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC;YAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAE3C,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAClC,QAAQ,EAAE,CAAC;aACX;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC3E,IAAI;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,YAAY,EAAE,SAAS,EAAC,CAAC,CAAC;gBAC9D,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAClC,QAAQ,EAAE,CAAC;iBACX;aACD;YAAC,OAAO,KAAK,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;gBACjD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBAChB;aACD;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,aAAa,EAAE,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,EAAE;YAChG,IAAI,UAAU,CAAC,KAAK,EAAE;gBACrB,sEAAsE;gBAEtE,IAAI,SAAS,EAAE;oBACd,IAAI;wBACH,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,YAAY,EAAE,SAAS,EAAC,CAAC,CAAC;qBAC9D;oBAAC,OAAO,KAAK,EAAE;wBACf,GAAG,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;wBAChE,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;4BAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;yBAChB;wBACD,OAAO;qBACP;iBACD;gBAED,IAAI;oBACH,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;iBACvC;gBAAC,OAAO,KAAK,EAAE;oBACf,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;oBACzC,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;wBAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBAChB;oBACD,OAAO;iBACP;aACD;iBAAM;gBACN,0EAA0E;gBAE1E,IAAI,IAAI,EAAE;oBACT,IAAI;wBACH,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;qBACrE;oBAAC,OAAO,KAAK,EAAE;wBACf,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;wBACtD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;4BAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;yBAChB;wBACD,OAAO;qBACP;iBACD;gBAED,IAAI,QAAQ,EAAE;oBACb,IAAI;wBACH,MAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;qBACjE;oBAAC,OAAO,KAAK,EAAE;wBACf,GAAG,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;wBACvD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;4BAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;yBAChB;wBACD,OAAO;qBACP;iBACD;gBAED,IAAI;oBACH,8EAA8E;oBAC9E,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,GAAG,IAAI,CAAC;oBAC3C,MAAM,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAC,YAAY,EAAE,SAAS,EAAC,CAAC,CAAC;iBAC9D;gBAAC,OAAO,KAAK,EAAE;oBACf,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;oBAC5C,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,CAAC,CAAC;oBACxD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;wBAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;qBAChB;oBACD,OAAO;iBACP;aACD;YAED,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAClC,QAAQ,EAAE,CAAC;aACX;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,iBAAiB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACnE,IAAI;gBACH,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;aAChC;YAAC,OAAO,KAAK,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAClD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBAChB;gBACD,OAAO;aACP;YAED,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAClC,QAAQ,EAAE,CAAC;aACX;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClE,IAAI;gBACH,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC3B;YAAC,OAAO,KAAK,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAClD,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAClC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBAChB;gBACD,OAAO;aACP;YAED,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAClC,QAAQ,EAAE,CAAC;aACX;QACF,CAAC,CAAC,CAAC;QAEF,IAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;YAC1C,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjB,IAAI,CAAC,eAAe,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAChC,IAAI,CAAC,eAAe,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;YAC5B,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;YAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE;YACrC,YAAY,CAAC,KAAK,GAAG;gBACpB,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC;gBACxB,OAAO,EAAE,IAAI,CAAC,OAAO;aACrB,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE;YACjC,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,gBAAgB,kBAC9C,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EACnE,OAAO,IACJ,IAAI,EACN,CAAC;YACH,aAAa,CAAC,KAAK,GAAG,IAAI,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;YACpC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,GAAG,EAAE;YAChB,IAAI,eAAe,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC9F,GAAG,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;gBAChG,aAAa,CAAC,IAAI,CAAC,kBAAmB,CAAC,CAAC;gBACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAC/B,IAAI,CAAC,eAAe,EAAE,CAAC;aACvB;QACF,CAAC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAED;;;;OAIG;IACH,aAAa;QACZ,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAClD,IAAI,eAAe,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE;YACjD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;SACxE;QAED,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;QAE5C,OAAO,IAAI,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE;YACpE,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ;SACxC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC5B,aAAa,CAAC,IAAI,CAAC,kBAAmB,CAAC,CAAC;YACxC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAC/B,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC;YAC3C,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,eAAe;QACd,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC5B,OAAO;SACP;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;QAClD,IAAI,IAAI,CAAC,6BAA6B,EAAE;YACvC,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC;YAC9C,OAAO;SACP;QAED,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;QAC/E,IAAI,CAAC,kBAAkB,GAAG,WAAW,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,0BAA0B,CAAA,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,yDAAyD;QAC1H,CAAC,EAAE,IAAI,CAAC,CAAC;IACV,CAAC;IAED;;;;OAIG;IACH,WAAW;QACV,OAAO,OAAO,CAAC,GAAG,CAAC;YAClB,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,CAAC,mBAAmB,EAAE;YAC1B,IAAI,CAAC,iBAAiB,EAAE;SACxB,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,iBAAiB;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC3C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACtE,OAAO,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,mBAAmB;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC9C,oDAAoD;YACpD,sDAAsD;YACtD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,GAAG;oBACpC,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;iBACpB,CAAC;aACF;YAED,OAAO,GAAG,CAAC;QACZ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,mBAAmB;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC9C,oDAAoD;YACpD,sDAAsD;YACtD,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,GAAG;oBACpC,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;iBACpB,CAAC;aACF;QACF,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,GAAG,CAAC,KAAK,KAAK,yBAAyB,EAAE;gBAC5C,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;gBAC1C,OAAO;aACP;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,iBAAiB;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAClD,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,WAAW,CAAC,cAAuB,EAAE,kBAA2B;QACrE,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE;YAC3D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAC/D;QAED,MAAM,gBAAgB,GAAG;YACxB,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,SAAS;SAInB,CAAC;QAEF,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE;YAC3C,gBAAgB,CAAC,QAAQ,GAAG,kBAAkB,CAAC;SAC/C;QAED,IAAI,cAAc,GAAG;YACpB,iBAAiB,EAAE,gBAAgB;SACnC,CAAC;QAEF,8EAA8E;QAC9E,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,GAAG,IAAI,CAAC;QAE3C,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,KAAK,UAAU,EAAE;YACnD,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YACrF,IAAI,sBAAsB,EAAE;gBAC3B,cAAc,GAAG,sBAAsB,CAAC;aACxC;SACD;QAED,IAAI;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACX,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;YAE5C,+FAA+F;YAC/F,qCAAqC;YACrC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC;gBAClE,OAAO,cAAc,KAAK,QAAQ,IAAI,OAAO,cAAc,CAAC,iBAAiB,CAAC,KAAK,QAAQ,EAAE;gBAC7F,CAAC,CAAC,IAAI,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;gBAChD,CAAC,CAAC,QAAQ,GAAG,cAAc,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC;aACxD;YACD,MAAM,CAAC,CAAC;SACR;IACF,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,oBAAoB;QAC1B,OAAO,cAAc,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACD;AAjeD,gCAieC;AAED;;GAEG;AACH,SAAS,eAAe,CAAC,UAAkB;IAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AACxF,CAAC"} \ No newline at end of file diff --git a/packages/nodecg-utility-obs/src/index.ts b/packages/nodecg-utility-obs/src/index.ts index d23ec89..d2c7469 100644 --- 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;