refactor: rework fetching of source screenshots

grantjbutler · Mar 13, 2022 · 5c30216 · 5c30216
1 parent e977068
commit 5c30216
Showing 1 changed file with 39 additions and 13 deletions.
diff --git a/packages/main/src/obs.ts b/packages/main/src/obs.ts
@@ -238,20 +238,46 @@ export default class OBSSocket {
   }
 
   _screenshotSource(sourceName: string, quality: ImageQuality = ImageQuality.Best): Promise<string> {
-    const options: ScreenshotOptions = { sourceName };
-
-    switch (quality) {
-      case ImageQuality.Worst:
-        options.embedPictureFormat = 'jpeg';
-        options.compressionQuality = 1;
-        break;
-      case ImageQuality.Best:
-        options.embedPictureFormat = 'png';
-        break;
-    }
+    return this._screenshotSources([sourceName], quality)
+      .then(results => results[sourceName]);
+  }
 
-    return this._socket.send('TakeSourceScreenshot', options)
-      .then(screenshot => screenshot.img);
+  _screenshotSources(sourceNames: string[], quality: ImageQuality = ImageQuality.Best): Promise<{ [index: string]: string }> {
+    const requests = sourceNames.map(sourceName => {
+      const options: ScreenshotOptions = { sourceName };
+
+      switch (quality) {
+        case ImageQuality.Worst:
+          options.embedPictureFormat = 'jpeg';
+          options.compressionQuality = 1;
+          break;
+        case ImageQuality.Best:
+          options.embedPictureFormat = 'png';
+          break;
+      }
+
+      return {
+        ...options,
+        'request-type': 'TakeSourceScreenshot',
+        'message-id': `${sourceName}-screenshot`,
+      };
+    });
+
+    return this._socket.send('ExecuteBatch', { requests, abortOnFail: false })
+      .then(({ results }) => {
+        return results.reduce((images, result) => {
+          let sourceName: string;
+          if (result['message-id'] && result['message-id'].endsWith('-screenshot')) {
+            sourceName = result['message-id'].substring(0, result['message-id'].length - '-screenshot'.length);
+          } else {
+            return images;
+          }
+
+          images[sourceName] = result.img;
+
+          return images;
+        }, {} as { [index: string]: string });
+      });
   }
 
   _fetchCanvasSize(): Promise<void> {