update XVIZ workers to accept non-envelopped messages

aurora-opensource · Mar 29, 2021 · 9c92973 · 9c92973
1 parent e5c62e0
commit 9c92973
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/modules/io/src/common/xviz-data.js b/modules/io/src/common/xviz-data.js
@@ -35,15 +35,16 @@ import {XVIZ_FORMAT} from './constants';
 // - arraybuffer which is a JSON string
 // - JSON object
 // - arraybuffer which is a GLB
+// opts.messageType is the XVIZ Envelope 'type', i.e. one of ('xviz/state_update', 'xviz/metadata', etc.)
 export class XVIZData {
-  constructor(data) {
+  constructor(data, messageType = undefined) {
     this._data = data;
 
     // _dataFormat is an XVIZ_FORMAT for 'data'
     this._dataFormat = undefined;
 
     // _xvizType is the XVIZ Envelope 'type'
-    this._xvizType = undefined;
+    this._xvizType = messageType && { type: messageType };
 
     // _message is an XVIZMessage and has been fully parsed
     this._message = undefined;

diff --git a/modules/parser/src/parsers/parse-xviz-message-sync.js b/modules/parser/src/parsers/parse-xviz-message-sync.js
@@ -28,6 +28,7 @@ import parseTimesliceDataV2 from './parse-timeslice-data-v2';
 import {getXVIZConfig} from '../config/xviz-config';
 
 // Post processes a stream message to make it easy to use for JavaScript applications
+// opts.messageType is the XVIZ Envelope 'type', i.e. one of ('xviz/state_update', 'xviz/metadata', etc.)
 export function parseXVIZMessageSync(message, onResult, onError, opts) {
   // TODO(twojtasz): better message dispatching
   // here, not all arraybuffer may be image (packed point cloud)
@@ -38,14 +39,14 @@ export function parseXVIZMessageSync(message, onResult, onError, opts) {
   }
 
   try {
-    const xvizData = new XVIZData(message);
+    const xvizData = new XVIZData(message, opts.messageType);
     const xvizMsg = xvizData.message();
 
     // Non-xviz messages will return null
     if (xvizMsg) {
       const data = xvizMsg.data;
 
-      const v2Type = xvizMsg.type || undefined;
+      const v2Type = opts.messageType || xvizMsg.type || undefined;
 
       const result = parseXVIZData(data, {...opts, v2Type});
 

diff --git a/modules/parser/src/parsers/parse-xviz-message.js b/modules/parser/src/parsers/parse-xviz-message.js
@@ -30,7 +30,8 @@ export function parseXVIZMessage({
   // worker options
   worker = false,
   maxConcurrency = 4,
-  capacity = null
+  capacity = null,
+  opts = {}
 }) {
   if (worker) {
     if (!getWorkerFarm()) {
@@ -44,8 +45,8 @@ export function parseXVIZMessage({
     }
 
     const onMessage = data => onResult(postDeserialize(data));
-    workerFarm.process(message, onMessage, onError);
+    workerFarm.process(message, onMessage, onError, opts);
   } else {
-    parseXVIZMessageSync(message, onResult, onError);
+    parseXVIZMessageSync(message, onResult, onError, opts);
   }
 }
diff --git a/modules/parser/src/utils/worker-utils.js b/modules/parser/src/utils/worker-utils.js
@@ -164,8 +164,8 @@ export class WorkerFarm {
     }
   }
 
-  process(data, onResult, onError) {
-    this.queue.push({data, onResult, onError});
+  process(data, onResult, onError, opts = {}) {
+    this.queue.push({data, onResult, onError, opts});
     this.next();
   }
 }
diff --git a/modules/parser/src/workers/stream-data-worker.js b/modules/parser/src/workers/stream-data-worker.js
@@ -70,7 +70,7 @@ export default config => self => {
     if (e.data && e.data.xvizConfig) {
       setXVIZConfig(e.data.xvizConfig);
     } else if (e.data) {
-      parseXVIZMessageSync(e.data, onResult, onError);
+      parseXVIZMessageSync(e.data, onResult, onError, e.opts);
     }
   };
 };