bare-tty 1.0.6 → 2.0.0

package/README.md

@@ -9,9 +9,9 @@ npm install bare-tty
 ## Usage
 
 ```js
-const TTY = require('bare-tty')
+const tty = require('bare-tty')
 
-const stdout = new TTY(1)
+const stdout = new tty.WriteStream(1)
 
 stdout.write('Hello world!\n')
 ```

package/binding.c

@@ -243,6 +243,13 @@ bare_tty_init (js_env_t *env, js_callback_info_t *info) {
     return NULL;
   }
 
+  err = uv_stream_set_blocking((uv_stream_t *) &tty->handle, true);
+
+  if (err < 0) {
+    js_throw_error(env, uv_err_name(err), uv_strerror(err));
+    return NULL;
+  }
+
   tty->env = env;
 
   err = js_get_typedarray_info(env, argv[1], NULL, (void **) &tty->read.base, &tty->read.len, NULL, NULL);
@@ -362,8 +369,6 @@ bare_tty_resume (js_env_t *env, js_callback_info_t *info) {
   err = js_get_arraybuffer_info(env, argv[0], (void **) &tty, NULL);
   assert(err == 0);
 
-  if (!uv_is_readable((uv_stream_t *) &tty->handle)) return NULL;
-
   err = uv_read_start((uv_stream_t *) &tty->handle, on_alloc, on_read);
 
   if (err < 0) {
@@ -390,8 +395,6 @@ bare_tty_pause (js_env_t *env, js_callback_info_t *info) {
   err = js_get_arraybuffer_info(env, argv[0], (void **) &tty, NULL);
   assert(err == 0);
 
-  if (!uv_is_readable((uv_stream_t *) &tty->handle)) return NULL;
-
   err = uv_read_stop((uv_stream_t *) &tty->handle);
 
   if (err < 0) {

package/index.js

@@ -1,73 +1,142 @@
-const { Duplex } = require('streamx')
+const { Readable, Writable } = require('streamx')
 const binding = require('./binding')
 
 const DEFAULT_READ_BUFFER = 65536
 
 process.on('exit', () => binding.reset())
 
-module.exports = exports = class TTY extends Duplex {
+exports.ReadStream = class TTYReadStream extends Readable {
   constructor (fd, opts = {}) {
-    super({ mapWritable })
+    super()
 
     const {
       readBufferSize = DEFAULT_READ_BUFFER,
       allowHalfOpen = true
     } = opts
 
-    this._writeCallback = null
-    this._finalCallback = null
-    this._destroyCallback = null
+    this._pendingDestroy = null
 
+    this._reading = false
     this._allowHalfOpen = allowHalfOpen
 
     this._buffer = Buffer.alloc(readBufferSize)
 
     this._handle = binding.init(fd, this._buffer, this,
-      this._onwrite,
-      this._onfinal,
+      noop,
+      noop,
       this._onread,
       this._onclose
     )
   }
 
-  _open (cb) {
-    binding.resume(this._handle)
+  get isTTY () {
+    return true
+  }
+
+  setMode (mode) {
+    binding.setMode(this._handle, mode)
+  }
+
+  _read (cb) {
+    if (!this._reading) {
+      this._reading = true
+      binding.resume(this._handle)
+    }
     cb(null)
   }
 
+  _destroy (cb) {
+    this._pendingDestroy = cb
+    binding.close(this._handle)
+  }
+
+  _continueDestroy () {
+    if (this._pendingDestroy === null) return
+    const cb = this._pendingDestroy
+    this._pendingDestroy = null
+    cb(null)
+  }
+
+  _onread (err, read) {
+    if (err) {
+      this.destroy(err)
+      return
+    }
+
+    if (read === 0) {
+      this.push(null)
+      if (this._allowHalfOpen === false) this.end()
+      return
+    }
+
+    const copy = Buffer.allocUnsafe(read)
+    copy.set(this._buffer.subarray(0, read))
+
+    if (this.push(copy) === false && this.destroying === false) {
+      this._reading = false
+      binding.pause(this._handle)
+    }
+  }
+
+  _onclose () {
+    this._handle = null
+    this._continueDestroy()
+  }
+}
+
+exports.WriteStream = class TTYWriteStream extends Writable {
+  constructor (fd, opts = {}) {
+    super({ mapWritable })
+
+    this._pendingWrite = null
+    this._pendingFinal = null
+    this._pendingDestroy = null
+
+    this._handle = binding.init(fd, empty, this,
+      this._onwrite,
+      this._onfinal,
+      noop,
+      this._onclose
+    )
+  }
+
+  get isTTY () {
+    return true
+  }
+
   _writev (datas, cb) {
-    this._writeCallback = cb
+    this._pendingWrite = cb
     binding.writev(this._handle, datas)
   }
 
   _final (cb) {
-    this._finalCallback = cb
+    this._pendingFinal = cb
     binding.end(this._handle)
   }
 
   _destroy (cb) {
-    this._destroyCallback = cb
+    this._pendingDestroy = cb
     binding.close(this._handle)
   }
 
   _continueWrite (err) {
-    if (this._writeCallback === null) return
-    const cb = this._writeCallback
-    this._writeCallback = null
+    if (this._pendingWrite === null) return
+    const cb = this._pendingWrite
+    this._pendingWrite = null
     cb(err)
   }
 
   _continueFinal (err) {
-    if (this._finalCallback === null) return
-    const cb = this._finalCallback
-    this._finalCallback = null
+    if (this._pendingFinal === null) return
+    const cb = this._pendingFinal
+    this._pendingFinal = null
     cb(err)
   }
 
   _continueDestroy () {
-    if (this._destroyCallback === null) return
-    const cb = this._destroyCallback
-    this._destroyCallback = null
+    if (this._pendingDestroy === null) return
+    const cb = this._pendingDestroy
+    this._pendingDestroy = null
     cb(null)
   }
 
@@ -90,7 +159,10 @@ module.exports = exports = class TTY extends Duplex {
     const copy = Buffer.allocUnsafe(read)
     copy.set(this._buffer.subarray(0, read))
 
-    this.push(copy)
+    if (this.push(copy) === false && this.destroying === false) {
+      this._reading = false
+      binding.pause(this._handle)
+    }
   }
 
   _onfinal (err) {
@@ -101,10 +173,6 @@ module.exports = exports = class TTY extends Duplex {
     this._handle = null
     this._continueDestroy()
   }
-
-  setMode (mode) {
-    binding.setMode(this._handle, mode)
-  }
 }
 
 exports.constants = {
@@ -113,6 +181,10 @@ exports.constants = {
   MODE_IO: binding.MODE_IO || 0
 }
 
+const empty = Buffer.alloc(0)
+
+function noop () {}
+
 function mapWritable (buf) {
   return typeof buf === 'string' ? Buffer.from(buf) : buf
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-tty",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "description": "Native TTY streams for JavaScript",
   "main": "index.js",
   "files": [