Merge pull request #19779 from danielpetri1/PR-19707

fix(bbb-export-annotations): Flag to force CairoSVG to embed images

bbb-export-annotations/config/settings.json

@@ -20,7 +20,8 @@
       "maxImageHeight": 1080,
       "textScaleFactor": 2,
       "pointsPerInch": 72,
-      "pixelsPerInch": 96
+      "pixelsPerInch": 96,
+      "cairoSVGUnsafeFlag": false
     },
     "notifier": {
       "pod_id": "DEFAULT_PRESENTATION_POD",

bbb-export-annotations/master.js

@@ -11,9 +11,11 @@ logger.info('Running bbb-export-annotations');
 
 (async () => {
   const client = redis.createClient({
-    host: config.redis.host,
-    port: config.redis.port,
     password: config.redis.password,
+    socket: {
+        host: config.redis.host,
+        port: config.redis.port
+    }
   });
 
   await client.connect();

bbb-export-annotations/workers/collector.js

@@ -25,9 +25,11 @@ const jobType = exportJob.jobType;
 
 async function collectAnnotationsFromRedis() {
   const client = redis.createClient({
-    host: config.redis.host,
-    port: config.redis.port,
     password: config.redis.password,
+    socket: {
+        host: config.redis.host,
+        port: config.redis.port
+    }
   });
 
   client.on('error', (err) => logger.info('Redis Client Error', err));

bbb-export-annotations/workers/notifier.js

@@ -20,9 +20,11 @@ const exportJob = JSON.parse(job);
  * sending a message through Redis PubSub */
 async function notifyMeetingActor() {
   const client = redis.createClient({
-    host: config.redis.host,
-    port: config.redis.port,
     password: config.redis.password,
+    socket: {
+        host: config.redis.host,
+        port: config.redis.port
+    }
   });
 
   await client.connect();

bbb-export-annotations/workers/process.js

@@ -794,9 +794,11 @@ function overlay_annotations(svg, currentSlideAnnotations) {
 // Process the presentation pages and annotations into a PDF file
 async function process_presentation_annotations() {
   const client = redis.createClient({
-    host: config.redis.host,
-    port: config.redis.port,
     password: config.redis.password,
+    socket: {
+        host: config.redis.host,
+        port: config.redis.port
+    }
   });
 
   await client.connect();
@@ -868,11 +870,18 @@ async function process_presentation_annotations() {
       }
     });
 
-    // Scale slide back to its original size
+/**
+ * Constructs the command arguments for converting an annotated slide from SVG to PDF format.
+ * `cairoSVGUnsafeFlag` should be enabled (true) for CairoSVG versions >= 2.7.0
+ * to allow external resources, such as presentation slides, to be loaded.
+ *
+ * @const {string[]} convertAnnotatedSlide - The command arguments for the conversion process.
+ */
     const convertAnnotatedSlide = [
       SVGfile,
       '--output-width', to_px(slideWidth),
       '--output-height', to_px(slideHeight),
+      ...(config.process.cairoSVGUnsafeFlag ? ['-u'] : []),
       '-o', PDFfile,
     ];