Size optimizations for error propagation

developit · May 25, 2018 · 2a5c1c2 · 2a5c1c2
1 parent 62bc83f
commit 2a5c1c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/rpc-worker-loader.js b/src/rpc-worker-loader.js
@@ -13,10 +13,12 @@ function workerSetup() {
 			p.then(result => {
 					postMessage({ type: 'RPC', id, result });
 				})
-				.catch(error => {
-					if (error.stack) {
-						postMessage({ type: 'RPC', id, error: { name: error.name, message: error.message, stack: error.stack } });
-						return;
+				.catch(e => {
+					let error = { message: e};
+					if (e.stack) {
+						error.message = e.message;
+						error.stack = e.stack;
+						error.name = e.name;
 					}
 					postMessage({ type: 'RPC', id, error });
 				});

diff --git a/src/rpc-wrapper.js b/src/rpc-wrapper.js
@@ -9,12 +9,11 @@ export default function addMethods(worker, methods) {
 			if (f) {
 				delete callbacks[d.id];
 				if (d.error) {
-					let workerError = Error(d.error && d.error.message ? d.error.message : 'Error in worker');
-					if (d.error && d.error.stack) workerError.stack = d.error.stack;
-					if (d.error && d.error.name) workerError.name = d.error.name;
-					f[1](workerError);
+					f[1](Object.assign(Error(d.error.message), d.error));
+				}
+				else {
+					f[0](d.result);
 				}
-				else f[0](d.result);
 			}
 		}
 		else {

diff --git a/test/src/index.test.js b/test/src/index.test.js
@@ -21,9 +21,10 @@ describe('worker', () => {
 
 	it('worker.throwError() should pass the Error back to the application context', async () => {
 		try {
-			let out = await worker.throwError();
-		} catch (e) {
-			expect(e).toEqual(new Error('Error in worker.js'));
+			await worker.throwError();
+		}
+		catch (e) {
+			expect(e).toEqual(Error('Error in worker.js'));
 		}
 	});