fix: build hang (#53)

webpack-contrib · Dec 20, 2018 · fa02b60 · fa02b60
1 parent f564c1c
commit fa02b60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/WorkerPool.js b/src/WorkerPool.js
@@ -93,15 +93,17 @@ class PoolWorker {
   }
 
   writeJson(data) {
-    const lengthBuffer = new Buffer(4);
-    const messageBuffer = new Buffer(JSON.stringify(data), 'utf-8');
+    const lengthBuffer = Buffer.alloc(4);
+    const messageBuffer = Buffer.from(JSON.stringify(data), 'utf-8');
     lengthBuffer.writeInt32BE(messageBuffer.length, 0);
     this.writePipe.write(lengthBuffer);
     this.writePipe.write(messageBuffer);
   }
 
   writeEnd() {
-    this.writePipe.write(Buffer.alloc(0));
+    const lengthBuffer = Buffer.alloc(4);
+    lengthBuffer.writeInt32BE(0, 0);
+    this.writePipe.write(lengthBuffer);
   }
 
   readNextMessage() {
@@ -261,26 +263,26 @@ export default class WorkerPool {
     this.setupLifeCycle();
   }
 
-  terminate() {
+  terminate(force) {
     if (!this.terminated) {
       this.terminated = true;
 
       this.poolQueue.kill();
-      this.disposeWorkers();
+      this.disposeWorkers(force);
     }
   }
 
   setupLifeCycle() {
     process.on('SIGTERM', () => {
-      this.terminate();
+      this.terminate(true);
     });
 
     process.on('SIGINT', () => {
-      this.terminate();
+      this.terminate(true);
     });
 
     process.on('exit', () => {
-      this.terminate();
+      this.terminate(true);
     });
   }
 
@@ -332,8 +334,8 @@ export default class WorkerPool {
     }
   }
 
-  disposeWorkers() {
-    if (this.activeJobs === 0) {
+  disposeWorkers(force) {
+    if (this.activeJobs === 0 || force) {
       for (const worker of this.workers) {
         worker.dispose();
       }

diff --git a/src/worker.js b/src/worker.js
@@ -55,7 +55,6 @@ function writePipeUncork() {
 
 function terminateRead() {
   terminated = true;
-  this.writePipe.write(Buffer.alloc(0));
   readPipe.removeAllListeners();
 }
 
@@ -167,7 +166,7 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
           };
         }
         if (typeof item === 'string') {
-          const stringBuffer = new Buffer(item, 'utf-8');
+          const stringBuffer = Buffer.from(item, 'utf-8');
           buffersToSend.push(stringBuffer);
           return {
             buffer: true,