fix: set pipe timeout

Author: wenli.lw

README.md

@@ -16,7 +16,12 @@ $ fire ./test.js arg1 arg2
 
 [Example](./examples.md)
 
-### As a cli
+
+### Fire remote js
+
+> curl https://raw.githubusercontent.com/lwdgit/node-fire/dev/examples/calc.js | fire add 1 2
+
+### Fire local
 ```
 //test.js
 module.exports = function(arg1, arg2) {
@@ -105,7 +110,7 @@ wrap(calc)(process.argv)
 node ./wrap.js 3 4
 ```
 
-### As a npm scripts
+### As a npm scripts runner
 
 ```
 //package.json

bin/index.js

@@ -23,6 +23,7 @@ const start = function () {
 
  silent = argv.silent
  return vm().then(function (ret) {
+ log(ret)
  return require('../index.js')(argv, ret)
  })
 }

bin/vm.js

@@ -1,22 +1,29 @@
-const { isTTY } = process.stdin
+const stdin = process.stdin
 
-const isPipe = !isTTY && 'start' in process.stdin
+const isPipe = !stdin.isTTY
 
 const check = function () {
  return new Promise(function (resolve) {
  if (isPipe) {
  const data = []
- process.stdin.on('readable', function () {
+ // if not get readable data after 30s, give up
+ let tick = setTimeout(function () {
+ stdin.end && stdin.end()
+ resolve()
+ }, 30000)
+
+ stdin.on('readable', function () {
+ clearTimeout(tick)
  let chunk = ''
  while ((chunk = this.read(), chunk)) {
  data.push(chunk)
  }
  })
- process.stdin.once('end', function () {
+ stdin.on('end', function () {
  resolve(run(data.join('')))
  })
  } else {
- resolve(undefined)
+ resolve()
  }
  })
 }

libs/util/log.js

@@ -1,5 +1,5 @@
 const callerId = require('caller-id')
-module.exports = process.env.DEBUG ? function (...args) {
+module.exports = process.env.DEBUG === 'log' ? function (...args) {
  let data = callerId.getData()
  console.log(`${data.filePath} > ${data.functionName}:${data.lineNumber}`.blue, '\n', ...args, '\n----------------'.blue)
 } : function () {}

libs/wrap.js

@@ -59,10 +59,6 @@ function * execute (fn, args, opts) {
  fnLen = tmpArg.length
  }
 
- // if (args.length < fnLen) {
- // concat(args, new Array(fnLen - args.length));
- // }
-
  log('args', args)
 
  log(args.slice(0, fnLen))

package.json

@@ -1,6 +1,6 @@
 {
  "name": "node-fire",
- "version": "0.2.4",
+ "version": "0.2.5",
  "description": "Run a js object or a function by command line directly.",
  "bin": {
  "fire": "./bin/index.js"
@@ -18,7 +18,6 @@
  "debug": "^2.6.1",
  "rc": "^1.1.7",
  "resolve": "^1.3.2",
- "xargs": "^1.1.3",
  "yargs": "^6.6.0"
  },
  "devDependencies": {

test/pipe.js

@@ -1,8 +1,15 @@
 const test = require('ava')
 const exec = require('./_exec')
-test('calc', (t) => {
+test('pipe', (t) => {
  t.is(exec('< examples/calc.js add 3 4'), '7')
  t.is(exec('< examples/calc.js multiply 3 4'), '12')
  t.is(exec('< examples/calc.js pow 3'), '9')
  t.is(exec('< examples/calc.js div 8 0 --b 2'), '4')
 })
+
+test('pipe2', (t) => {
+ t.is(exec('cat examples/calc.js | node ./bin/index add 3 4', ''), '7')
+ t.is(exec('cat examples/calc.js | node ./bin/index multiply 3 4', ''), '12')
+ t.is(exec('cat examples/calc.js | node ./bin/index pow 3', ''), '9')
+ t.is(exec('cat examples/calc.js | node ./bin/index div 8 0 --b 2', ''), '4')
+})