Merge pull request #2 from Realytics/dev

0.1.1

Author: piotr-oles

lib/cluster.js

@@ -1,42 +1,47 @@
-var cluster = require('cluster');
 var process = require('process');
+var childProcess = require('child_process');
 var path = require('path');
 
 var WorkResult = require('./WorkResult');
 var NormalizedMessage = require('./NormalizedMessage');
 
-// setup master
-cluster.setupMaster({
-  exec: path.join(__dirname, 'service.js'),
-  args: ['--max-old-space-size=' + process.env.MEMORY_LIMIT]
-});
-
 // fork workers...
 var division = parseInt(process.env.WORK_DIVISION);
+var workers = [];
 
-for (var i = 0; i < division; i++) {
-  cluster.fork({ WORK_NUMBER: i });
+for (var number = 0; number < division; number++) {
+  workers.push(
+    childProcess.fork(
+      path.resolve(__dirname, './service.js'),
+      [],
+      {
+        execArgv: ['--max-old-space-size=' + process.env.MEMORY_LIMIT],
+        env: Object.assign({}, process.env, { WORKER_NUMBER: number }),
+        stdio: ['inherit', 'inherit', 'inherit', 'ipc']
+      }
+    )
+  );
 }
 
-var workerIds = Object.keys(cluster.workers);
-var result = new WorkResult(workerIds);
+var pids = workers.map(function (worker) { return worker.pid; });
+var result = new WorkResult(pids);
 
 process.on('message', function (message) {
   // broadcast message to all workers
-  workerIds.forEach(function (workerId) {
-    cluster.workers[workerId].send(message);
+  workers.forEach(function (worker) {
+    worker.send(message);
   });
 
   // clear previous result set
   result.clear();
 });
 
 // listen to all workers
-workerIds.forEach(function (workerId) {
-  cluster.workers[workerId].on('message', function (message) {
+workers.forEach(function (worker) {
+  worker.on('message', function (message) {
     // set result from worker
     result.set(
-      workerId,
+      worker.pid,
       {
         diagnostics: message.diagnostics.map(NormalizedMessage.createFromJSON),
         lints: message.lints.map(NormalizedMessage.createFromJSON)
@@ -58,7 +63,26 @@ workerIds.forEach(function (workerId) {
       merged.diagnostics = NormalizedMessage.deduplicate(merged.diagnostics);
       merged.lints = NormalizedMessage.deduplicate(merged.lints);
 
-      process.send(merged);
+      try {
+        process.send(merged);
+      } catch (e) {
+        // channel closed...
+        process.exit();
+      }
     }
   });
 });
+
+process.on('SIGINT', function () {
+  process.exit();
+});
+
+process.on('exit', function () {
+  workers.forEach(function (worker) {
+    try {
+      worker.kill();
+    } catch (e) {
+      // do nothing...
+    }
+  });
+});

lib/index.js

@@ -16,6 +16,7 @@ var NormalizedMessage = require('./NormalizedMessage');
  * Options description in README.md
  */
 function ForkTsCheckerWebpackPlugin (options) {
+  this.options = Object.assign({}, options);
   this.tsconfig = options.tsconfig || './tsconfig.json';
   this.tslint = options.tslint === false ? false : options.tslint || './tslint.json';
   this.watch = isString(options.watch) ? [options.watch] : options.watch || [];
@@ -130,15 +131,11 @@ ForkTsCheckerWebpackPlugin.prototype.pluginStart = function () {
 
 ForkTsCheckerWebpackPlugin.prototype.pluginStop = function () {
   this.compiler.plugin('done', function () {
-    if (!this.isWatching && this.service) {
-      try {
-        this.service.kill();
-      } catch (e) {
-        if (this.logger && !this.silent) {
-          this.logger.error(e);
-        }
-      }
-    }
+    this.killService();
+  }.bind(this));
+
+  process.on('exit', function () {
+    this.killService(true);
   }.bind(this));
 };
 
@@ -230,8 +227,13 @@ ForkTsCheckerWebpackPlugin.prototype.spawnService = function () {
       'Using ' + this.colors.bold(this.workersNumber === 1 ? '1 worker' : this.workersNumber + ' workers') +
       ' with ' + this.colors.bold(this.memoryLimit + 'MB') + ' memory limit'
     );
-    var lines = [message, performance, this.colors.grey(this.tsconfigPath)];
-    if (this.tslint) {
+    var lines = [message, performance];
+    if (!this.options.tsconfig) {
+      // auto-detect tsconfig path - print to the user to be sure that it's proper file
+      lines.push(this.colors.grey(this.tsconfigPath));
+    }
+    if (this.tslint && !this.options.tslint) {
+      // auto-detect tslint path - print to the user to be sure that it's proper file
       lines.push(this.colors.grey(this.tslint));
     }
 
@@ -251,6 +253,23 @@ ForkTsCheckerWebpackPlugin.prototype.spawnService = function () {
   this.service.on('exit', this.handleServiceExit.bind(this));
 };
 
+ForkTsCheckerWebpackPlugin.prototype.killService = function (force) {
+  if ((force || !this.isWatching) && this.service) {
+    try {
+      if (this.cancellationToken) {
+        this.cancellationToken.requestCancellation();
+      }
+
+      this.service.kill();
+      this.service = undefined;
+    } catch (e) {
+      if (this.logger && !this.silent) {
+        this.logger.error(e);
+      }
+    }
+  }
+};
+
 ForkTsCheckerWebpackPlugin.prototype.handleServiceMessage = function (message) {
   if (this.cancellationToken) {
     this.cancellationToken.cleanupCancellation();

lib/service.js

@@ -11,10 +11,10 @@ var checker = new IncrementalChecker(
   parseInt(process.env.WORK_DIVISION, 10)
 );
 
-var diagnostics = [];
-var lints = [];
-
 function run (cancellationToken) {
+  var diagnostics = [];
+  var lints = [];
+
   checker.nextIteration();
 
   try {
@@ -31,13 +31,22 @@ function run (cancellationToken) {
   }
 
   if (!cancellationToken.isCancellationRequested()) {
-    process.send({
-      diagnostics: diagnostics,
-      lints: lints
-    });
+    try {
+      process.send({
+        diagnostics: diagnostics,
+        lints: lints
+      });
+    } catch (e) {
+      // channel closed...
+      process.exit();
+    }
   }
 }
 
 process.on('message', function (message) {
   run(CancellationToken.createFromJSON(message));
 });
+
+process.on('SIGINT', function () {
+  process.exit();
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fork-ts-checker-webpack-plugin",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Runs typescript type checker and linter on separate process.",
   "main": "lib/index.js",
   "scripts": {