Use JS timeout instead of Ruby timeout

Closes #54

Author: rhys-vdw

README.md

@@ -99,7 +99,7 @@ Can be configured with [UseEntry#options](https://webpack.js.org/configuration/m
 | `dependenciesRoot` | `"app"` | The root of your Rails project, relative to webpack's working directory. |
 | `engine` | `"erb"` | ERB Template engine, `"erubi"`, `"erubis"` and `"erb"` are supported. |
 | `runner` | `"./bin/rails runner"` | Command to run Ruby scripts, relative to webpack's working directory. |
-| `timeout` | `0` | Timeout for the runner task in seconds. `0` is no timeout. Set this if you want a hanging runner to error out the build.
+| `timeoutMs` | `0` | Timeout for the runner task in milliseconds. `0` is no timeout. Set this if you want a hanging runner to error out the build. |
 
 For example, if your webpack process is running in a subdirectory of your Rails project:
 

erb_transformer.rb

@@ -1,8 +1,5 @@
-require 'timeout'
-
-delimiter, engine, timeout = ARGV
-timeout = Float(timeout)
-
+delimiter = ARGV[0]
+engine = ARGV[1]
 handler = case engine
   when 'erubi'
     require 'erubi'
@@ -16,16 +13,8 @@
   else raise "Unknown templating engine `#{engine}`"
 end
 
-begin
-  Timeout.timeout(timeout) do
-    source = STDIN.read
-
-    if engine == 'erubi'
-      puts "#{delimiter}#{eval(handler.new(source).src)}#{delimiter}"
-    else
-      puts "#{delimiter}#{handler.new(source).result}#{delimiter}"
-    end
-  end
-rescue Timeout::Error
-  raise "rails-erb-loader took longer than the specified #{timeout} second timeout"
+if engine == 'erubi'
+  puts "#{delimiter}#{eval(handler.new(STDIN.read).src)}#{delimiter}"
+else
+  puts "#{delimiter}#{handler.new(STDIN.read).result}#{delimiter}"
 end

index.js

@@ -3,6 +3,7 @@ var execFile = require('child_process').execFile
 var path = require('path')
 var getOptions = require('loader-utils').getOptions
 var defaults = require('lodash.defaults')
+var util = require('util')
 
 function pushAll (dest, src) {
   Array.prototype.push.apply(dest, src)
@@ -74,16 +75,27 @@ function transformSource (runner, config, source, map, callback) {
     runner.arguments.concat(
       runnerPath,
       ioDelimiter,
-      config.engine,
-      config.timeout
+      config.engine
     ),
+    { timeout: config.timeoutMs },
     function (error, stdout, stderr) {
       // Output is delimited to filter out unwanted warnings or other output
       // that we don't want in our files.
       var sourceRegex = new RegExp(ioDelimiter + '([\\s\\S]+)' + ioDelimiter)
       var matches = stdout.match(sourceRegex)
       var transformedSource = matches && matches[1]
-      callback(error, transformedSource, map)
+      if (error && error.signal === 'SIGTERM') {
+        if (config.timeoutMs) {
+          callback(new Error(
+            'rails-erb-loader took longer than the specified ' + config.timeoutMs +
+            'ms timeout'
+          ))
+        } else {
+          callback(error)
+        }
+      } else {
+        callback(error, transformedSource, map)
+      }
     }
   )
   child.stdin.on('error', function (error) {
@@ -132,6 +144,17 @@ function addDependencies (loader, paths, callback) {
   })
 }
 
+var setTimeoutMsFromTimeoutInPlace = util.deprecate(function (config) {
+  if (config.timeoutMs != null) {
+    throw new TypeError(
+      'Both options `timeout` and `timeoutMs` were set -- please just use ' +
+      '`timeoutMs`'
+    )
+  }
+  config.timeoutMs = config.timeout * 1000
+  delete config.timeout
+}, 'rails-erb-loader `timeout` option is deprecated in favor of `timeoutMs`')
+
 module.exports = function railsErbLoader (source, map) {
   var loader = this
 
@@ -144,10 +167,13 @@ module.exports = function railsErbLoader (source, map) {
   var config = defaults({}, getOptions(loader), {
     dependenciesRoot: 'app',
     runner: './bin/rails runner',
-    engine: 'erb',
-    timeout: 0
+    engine: 'erb'
   })
 
+  if (config.timeout !== undefined) {
+    setTimeoutMsFromTimeoutInPlace(config)
+  }
+
   // Dependencies are only useful in development, so don't bother searching the
   // file for them otherwise.
   var dependencies = process.env.NODE_ENV === 'development'