bare-tty 2.1.3 → 2.1.5

package/binding.c

@@ -243,13 +243,6 @@ 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);
@@ -423,10 +416,9 @@ bare_tty_close (js_env_t *env, js_callback_info_t *info) {
 
   err = uv_tty_set_mode(&tty->handle, UV_TTY_MODE_NORMAL);
 
-  if (err < 0) {
-    js_throw_error(env, uv_err_name(err), uv_strerror(err));
-    return NULL;
-  }
+  // Resetting the mode won't always work, in particular on Windows when we
+  // close an output stream.
+  (void) err;
 
   uv_close((uv_handle_t *) &tty->handle, on_close);
 

package/index.js

@@ -15,6 +15,7 @@ exports.ReadStream = class TTYReadStream extends Readable {
     this._pendingDestroy = null
 
     this._reading = false
+    this._closing = false
     this._allowHalfOpen = allowHalfOpen
 
     this._buffer = Buffer.alloc(readBufferSize)
@@ -46,13 +47,15 @@ exports.ReadStream = class TTYReadStream extends Readable {
   }
 
   _predestroy () {
-    if (this._handle === null) return
+    if (this._closing) return
+    this._closing = true
     binding.close(this._handle)
     TTYReadStream._streams.delete(this)
   }
 
   _destroy (cb) {
-    if (this._handle === null) return cb(null)
+    if (this._closing) return cb(null)
+    this._closing = true
     this._pendingDestroy = cb
     binding.close(this._handle)
     TTYReadStream._streams.delete(this)
@@ -102,6 +105,8 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     this._pendingFinal = null
     this._pendingDestroy = null
 
+    this._closing = false
+
     this._handle = binding.init(fd, empty, this,
       this._onwrite,
       this._onfinal,
@@ -131,13 +136,15 @@ exports.WriteStream = class TTYWriteStream extends Writable {
   }
 
   _predestroy () {
-    if (this._handle === null) return
+    if (this._closing) return
+    this._closing = true
     binding.close(this._handle)
     TTYWriteStream._streams.delete(this)
   }
 
   _destroy (cb) {
-    if (this._handle === null) return cb(null)
+    if (this._closing) return cb(null)
+    this._closing = true
     this._pendingDestroy = cb
     binding.close(this._handle)
     TTYWriteStream._streams.delete(this)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-tty",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "Native TTY streams for JavaScript",
   "main": "index.js",
   "files": [
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/holepunchto/bare-tty.git"
+    "url": "git+https://github.com/holepunchto/bare-tty.git"
   },
   "author": "Holepunch",
   "license": "Apache-2.0",