Terminate workers in openpgp.destroyWorker()

openpgpjs · Jan 15, 2020 · 005a3c3 · 005a3c3
1 parent 1462aff
commit 005a3c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/openpgp.js b/src/openpgp.js
@@ -90,7 +90,12 @@ export function getWorker() {
  * Cleanup the current instance of the web worker.
  */
 export function destroyWorker() {
-  asyncProxy = undefined;
+  if (asyncProxy) {
+    asyncProxy.workers.forEach(worker => {
+      worker.terminate();
+    });
+    asyncProxy = undefined;
+  }
 }
 
 

diff --git a/test/general/openpgp.js b/test/general/openpgp.js
@@ -446,7 +446,8 @@ describe('OpenPGP.js public api tests', function() {
 
     it('should work', async function() {
       const workerStub = {
-        postMessage: function() {}
+        postMessage: function() {},
+        terminate: function() {}
       };
       await Promise.all([
         openpgp.initWorker({
@@ -600,7 +601,8 @@ describe('OpenPGP.js public api tests', function() {
 
     it('should delegate to async proxy', async function() {
       const workerStub = {
-        postMessage: function() {}
+        postMessage: function() {},
+        terminate: function() {}
       };
       await Promise.all([
         openpgp.initWorker({