Refactor getStyles and getEvents

Add new function fetchFromWorker with callback to allow fetch the response from worker Add callbacks to getStyles and getEvents functions
libass · Feb 18, 2022 · 93a9827 · 93a9827
1 parent 9391c33
commit 93a9827
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 13 deletions.
diff --git a/src/post-worker.js b/src/post-worker.js
@@ -594,6 +594,7 @@ function onMessageFromMainEmscriptenThread(message) {
             for (var i = 0; i < self.octObj.getEventCount(); i++) {
                 var evnt_ptr = self.octObj.track.get_events(i);
                 var event = {
+                    _index: i,
                     Start: evnt_ptr.get_Start(),
                     Duration: evnt_ptr.get_Duration(),
                     ReadOrder: evnt_ptr.get_ReadOrder(),
@@ -636,6 +637,7 @@ function onMessageFromMainEmscriptenThread(message) {
             for (var i = 0; i < self.octObj.getStyleCount(); i++) {
                 var styl_ptr = self.octObj.track.get_styles(i);
                 var style = {
+                    _index: i,
                     Name: styl_ptr.get_Name(),
                     FontName: styl_ptr.get_FontName(),
                     FontSize: styl_ptr.get_FontSize(),

diff --git a/src/subtitles-octopus.js b/src/subtitles-octopus.js
@@ -91,8 +91,8 @@ var SubtitlesOctopus = function (options) {
         // Worker
         if (!self.worker) {
             self.worker = new Worker(self.workerUrl);
-            self.worker.onmessage = self.onWorkerMessage;
-            self.worker.onerror = self.workerError;
+            self.worker.addEventListener('message', self.onWorkerMessage);
+            self.worker.addEventListener('error', self.workerError);
         }
         self.workerActive = false;
         self.createCanvas();
@@ -390,13 +390,9 @@ var SubtitlesOctopus = function (options) {
                 break;
             }
             case 'get-events': {
-                console.log(data.target);
-                console.log(data.events);
                 break;
             }
             case 'get-styles': {
-                console.log(data.target);
-                console.log(data.styles);
                 break;
             }
             case 'ready': {
@@ -558,17 +554,52 @@ var SubtitlesOctopus = function (options) {
         }
     };
 
+    self.fetchFromWorker = function (workerOptions, onSuccess, onError) {
+        try {
+            var target = workerOptions['target']
+
+            var timeout = setTimeout(function() {
+                reject(Error('Error: Timeout while try to fetch ' + target))
+            }, 5000)
+
+            var resolve = function (event) {
+                if (event.data.target == target) {
+                    onSuccess(event.data)
+                    self.worker.removeEventListener('message', resolve)
+                    self.worker.removeEventListener('error', reject)
+                    clearTimeout(timeout)
+                }
+            }
+
+            var reject = function (event) {
+                onError(event)
+                self.worker.removeEventListener('message', resolve)
+                self.worker.removeEventListener('error', reject)
+                clearTimeout(timeout)
+            }
+
+            self.worker.addEventListener('message', resolve)
+            self.worker.addEventListener('error', reject)
+
+            self.worker.postMessage(workerOptions)
+        } catch (error) {
+            onError(error)
+        }
+    }
+
     self.createEvent = function (event) {
         self.worker.postMessage({
             target: 'create-event',
             event: event
         });
     };
 
-    self.getEvents = function () {
-        self.worker.postMessage({
+    self.getEvents = function (onSuccess, onError) {
+        self.fetchFromWorker({
             target: 'get-events'
-        });
+        }, function(data) {
+            onSuccess(data.events)
+        }, onError);
     };
 
     self.setEvent = function (event, index) {
@@ -592,11 +623,13 @@ var SubtitlesOctopus = function (options) {
             style: style
         });
     };
-
-    self.getStyles = function () {
-        self.worker.postMessage({
+    
+    self.getStyles = function (onSuccess, onError) {
+        self.fetchFromWorker({
             target: 'get-styles'
-        });
+        }, function(data) {
+            onSuccess(data.styles)
+        }, onError);
     };
 
     self.setStyle = function (style, index) {