Remove JSON stringification (not a big enough performance difference to matter, and JSON vs structured clone is an annoying difference) and restore error reporting

Author: dumbmatter

index.js

@@ -10,14 +10,6 @@ function isPromise(obj) {
   return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
 }
 
-function parseJsonSafely(str) {
-  try {
-    return JSON.parse(str);
-  } catch (e) {
-    return false;
-  }
-}
-
 function tryCatchFunc(callback, message) {
   try {
     return {res: callback(message)};
@@ -43,9 +35,9 @@ PromiseWorker.prototype.register = function (cb) {
 
 PromiseWorker.prototype._postMessageBi = function (obj) {
   if (this._worker) {
-    this._worker.postMessage(JSON.stringify(obj));
+    this._worker.postMessage(obj);
   } else {
-    self.postMessage(JSON.stringify(obj));
+    self.postMessage(obj);
   }
 };
 
@@ -68,12 +60,12 @@ PromiseWorker.prototype.postMessage = function (userMessage) {
 PromiseWorker.prototype._postResponse = function (messageId, error, result) {
   if (error) {
     /* istanbul ignore else */
-    /*if (typeof console !== 'undefined' && 'error' in console) {
+    if (typeof console !== 'undefined' && 'error' in console) {
       // This is to make errors easier to debug. I think it's important
       // enough to just leave here without giving the user an option
       // to silence it.
-      console.error('Worker caught an error:', error);
-    }*/
+      console.error('Error when generating response:', error);
+    }
     this._postMessageBi([MSGTYPE_RESPONSE, messageId, {
       message: error.message
     }]);
@@ -99,8 +91,8 @@ PromiseWorker.prototype._handleQuery = function (messageId, query) {
 };
 
 PromiseWorker.prototype._onMessage = function (e) {
-  var message = parseJsonSafely(e.data);
-  if (!message) {
+  var message = e.data;
+  if (!Array.isArray(message) || message.length < 3 || message.length > 4) {
     // Ignore - this message is not for us.
     return;
   }

test/test.js

@@ -147,7 +147,7 @@ describe('host -> worker', function () {
           worker.removeEventListener('error', onError);
         }
         function onMessage(e) {
-          if (typeof e.data === 'string') {
+          if (Array.isArray(e.data)) {
             return;
           }
           cleanup();
@@ -424,7 +424,7 @@ describe('worker -> host', function () {
     });
 
     worker.addEventListener('message', function (e) {
-      if (typeof e.data !== 'string') { // custom message
+      if (!Array.isArray(e.data)) { // custom message
         worker.postMessage(e.data);
       }
     });

test/worker-echo-custom.js

@@ -7,7 +7,7 @@ promiseWorker.register(function (msg) {
 });
 
 self.addEventListener('message', function (e) {
-  if (typeof e.data !== 'string') { // custom message
+  if (!Array.isArray(e.data)) { // custom message
     self.postMessage(e.data);
   }
 });

test/worker-host-echo-custom.js

@@ -8,7 +8,7 @@ promiseWorker.postMessage('ping'),
 
 new Promise(function (resolve, reject) {
     function onMessage(e) {
-      if (typeof e.data === 'string') {
+      if (Array.isArray(e.data)) {
         return;
       }
       resolve(e.data);