From 228220a738b0c36a30bce821b4eac1c545863b5c Mon Sep 17 00:00:00 2001
From: d07riv <d07.riv@gmail.com>
Date: Sat, 3 Aug 2019 01:46:09 +0300
Subject: [PATCH] fix error reporting #14

---
 package-lock.json      | 2 +-
 package.json           | 2 +-
 src/App.js             | 2 +-
 src/api/game.worker.js | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6123a5d..6ea85b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "diabloweb",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7057cfe..066021e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diabloweb",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": true,
   "dependencies": {
     "@babel/core": "7.4.3",
diff --git a/src/App.js b/src/App.js
index 15e5a6c..4ac479f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,7 +13,7 @@ if (process.env.NODE_ENV === 'production') {
 }
 
 function reportLink(e, retail) {
-  const message = e.stack || e.message;
+  const message = e.stack || e.message || "Unknown error";
   const url = new URL("https://github.com/d07RiV/diabloweb/issues/new");
   url.searchParams.set("body",
 `**Description:**
diff --git a/src/api/game.worker.js b/src/api/game.worker.js
index a3c8d73..5089e43 100644
--- a/src/api/game.worker.js
+++ b/src/api/game.worker.js
@@ -191,7 +191,7 @@ function call_api(func, ...params) {
       audioTransfer = null;
     }
   } catch (e) {
-    worker.postMessage({action: "error", error: e.message, stack: e.stack});
+    worker.postMessage({action: "error", error: e.message || (e.constructor && e.constructor.name), stack: e.stack});
   }
 }
 
@@ -274,7 +274,7 @@ worker.addEventListener("message", ({data}) => {
     files = data.files;
     init_game(data.mpq, data.spawn, data.offscreen).then(
       () => worker.postMessage({action: "loaded"}),
-      e => worker.postMessage({action: "failed", error: e.message || e.name, stack: e.stack}));
+      e => worker.postMessage({action: "failed", error: e.message || e.name || (e.constructor && e.constructor.name), stack: e.stack}));
     break;
   case "event":
     call_api(data.func, ...data.params);