Merge pull request matrix-org#758 from matrix-org/bwindels/betteridbe…

…rrors throw error with same name and message over idb worker boundary
FabricLabs · Oct 9, 2018 · 92fbf58 · 92fbf58
2 parents a4b2cc8 + caba350
commit 92fbf58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/store/indexeddb-remote-backend.js b/src/store/indexeddb-remote-backend.js
@@ -184,7 +184,9 @@ RemoteIndexedDBStoreBackend.prototype = {
             if (msg.command == 'cmd_success') {
                 def.resolve(msg.result);
             } else {
-                def.reject(msg.error);
+                const error = new Error(msg.error.message);
+                error.name = msg.error.name;
+                def.reject(error);
             }
         } else {
             console.warn("Unrecognised message from worker: " + msg);

diff --git a/src/store/indexeddb-store-worker.js b/src/store/indexeddb-store-worker.js
@@ -135,7 +135,10 @@ class IndexedDBStoreWorker {
                 command: 'cmd_fail',
                 seq: msg.seq,
                 // Just send a string because Error objects aren't cloneable
-                error: "Error running command",
+                error: {
+                    message: err.message,
+                    name: err.name,
+                },
             });
         });
     }