bare-tty 4.0.2 → 5.0.1

package/binding.c

@@ -19,14 +19,21 @@ typedef struct {
   js_ref_t *on_write;
   js_ref_t *on_read;
   js_ref_t *on_close;
+
+  bool closing;
+  bool exiting;
+
+  js_deferred_teardown_t *teardown;
 } bare_tty_t;
 
 static void
-bare_tty__on_write (uv_write_t *req, int status) {
+bare_tty__on_write(uv_write_t *req, int status) {
   int err;
 
   bare_tty_t *tty = (bare_tty_t *) req->data;
 
+  if (tty->exiting) return;
+
   js_env_t *env = tty->env;
 
   js_handle_scope_t *scope;
@@ -66,7 +73,7 @@ bare_tty__on_write (uv_write_t *req, int status) {
 }
 
 static void
-bare_tty__on_read (uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
+bare_tty__on_read(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
   if (nread == UV_EOF) nread = 0;
   else if (nread == 0) return;
 
@@ -74,6 +81,8 @@ bare_tty__on_read (uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
 
   bare_tty_t *tty = (bare_tty_t *) stream;
 
+  if (tty->exiting) return;
+
   js_env_t *env = tty->env;
 
   js_handle_scope_t *scope;
@@ -119,13 +128,15 @@ bare_tty__on_read (uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
 }
 
 static void
-bare_tty__on_close (uv_handle_t *handle) {
+bare_tty__on_close(uv_handle_t *handle) {
   int err;
 
   bare_tty_t *tty = (bare_tty_t *) handle;
 
   js_env_t *env = tty->env;
 
+  js_deferred_teardown_t *teardown = tty->teardown;
+
   js_handle_scope_t *scope;
   err = js_open_handle_scope(env, &scope);
   assert(err == 0);
@@ -138,8 +149,6 @@ bare_tty__on_close (uv_handle_t *handle) {
   err = js_get_reference_value(env, tty->on_close, &callback);
   assert(err == 0);
 
-  js_call_function(env, ctx, callback, 0, NULL, NULL);
-
   err = js_delete_reference(env, tty->on_write);
   assert(err == 0);
 
@@ -152,19 +161,35 @@ bare_tty__on_close (uv_handle_t *handle) {
   err = js_delete_reference(env, tty->ctx);
   assert(err == 0);
 
+  if (!tty->exiting) js_call_function(env, ctx, callback, 0, NULL, NULL);
+
   err = js_close_handle_scope(env, scope);
   assert(err == 0);
+
+  err = js_finish_deferred_teardown_callback(teardown);
+  assert(err == 0);
+}
+
+static void
+bare_tty__on_teardown(js_deferred_teardown_t *handle, void *data) {
+  bare_tty_t *tty = (bare_tty_t *) data;
+
+  tty->exiting = true;
+
+  if (tty->closing) return;
+
+  uv_close((uv_handle_t *) &tty->handle, bare_tty__on_close);
 }
 
 static void
-bare_tty__on_alloc (uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
+bare_tty__on_alloc(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
   bare_tty_t *tty = (bare_tty_t *) handle;
 
   *buf = tty->read;
 }
 
 static js_value_t *
-bare_tty_init (js_env_t *env, js_callback_info_t *info) {
+bare_tty_init(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 6;
@@ -176,7 +201,8 @@ bare_tty_init (js_env_t *env, js_callback_info_t *info) {
   assert(argc == 6);
 
   uv_loop_t *loop;
-  js_get_env_loop(env, &loop);
+  err = js_get_env_loop(env, &loop);
+  assert(err == 0);
 
   js_value_t *handle;
 
@@ -201,6 +227,8 @@ bare_tty_init (js_env_t *env, js_callback_info_t *info) {
   (void) err;
 
   tty->env = env;
+  tty->closing = false;
+  tty->exiting = false;
 
   err = js_get_typedarray_info(env, argv[1], NULL, (void **) &tty->read.base, (size_t *) &tty->read.len, NULL, NULL);
   assert(err == 0);
@@ -217,11 +245,14 @@ bare_tty_init (js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[5], 1, &tty->on_close);
   assert(err == 0);
 
+  err = js_add_deferred_teardown_callback(env, bare_tty__on_teardown, (void *) tty, &tty->teardown);
+  assert(err == 0);
+
   return handle;
 }
 
 static js_value_t *
-bare_tty_writev (js_env_t *env, js_callback_info_t *info) {
+bare_tty_writev(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 2;
@@ -271,7 +302,7 @@ bare_tty_writev (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_resume (js_env_t *env, js_callback_info_t *info) {
+bare_tty_resume(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 1;
@@ -297,7 +328,7 @@ bare_tty_resume (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_pause (js_env_t *env, js_callback_info_t *info) {
+bare_tty_pause(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 1;
@@ -323,7 +354,7 @@ bare_tty_pause (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_close (js_env_t *env, js_callback_info_t *info) {
+bare_tty_close(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 1;
@@ -344,13 +375,15 @@ bare_tty_close (js_env_t *env, js_callback_info_t *info) {
   // close an output stream.
   (void) err;
 
+  tty->closing = true;
+
   uv_close((uv_handle_t *) &tty->handle, bare_tty__on_close);
 
   return NULL;
 }
 
 static js_value_t *
-bare_tty_set_mode (js_env_t *env, js_callback_info_t *info) {
+bare_tty_set_mode(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 2;
@@ -380,7 +413,7 @@ bare_tty_set_mode (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_get_window_size (js_env_t *env, js_callback_info_t *info) {
+bare_tty_get_window_size(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 1;
@@ -425,7 +458,7 @@ bare_tty_get_window_size (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_is_tty (js_env_t *env, js_callback_info_t *info) {
+bare_tty_is_tty(js_env_t *env, js_callback_info_t *info) {
   int err;
 
   size_t argc = 1;
@@ -448,7 +481,7 @@ bare_tty_is_tty (js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_tty_exports (js_env_t *env, js_value_t *exports) {
+bare_tty_exports(js_env_t *env, js_value_t *exports) {
   int err;
 
 #define V(name, fn) \

package/index.js

@@ -7,13 +7,11 @@ const constants = require('./lib/constants')
 const defaultReadBufferSize = 65536
 
 exports.ReadStream = class TTYReadStream extends Readable {
-  constructor (fd, opts = {}) {
+  constructor(fd, opts = {}) {
     super()
 
-    const {
-      readBufferSize = defaultReadBufferSize,
-      allowHalfOpen = true
-    } = opts
+    const { readBufferSize = defaultReadBufferSize, allowHalfOpen = true } =
+      opts
 
     this._state = 0
 
@@ -23,58 +21,57 @@ exports.ReadStream = class TTYReadStream extends Readable {
 
     this._buffer = Buffer.alloc(readBufferSize)
 
-    this._handle = binding.init(fd, this._buffer, this,
+    this._handle = binding.init(
+      fd,
+      this._buffer,
+      this,
       noop,
       this._onread,
       this._onclose
     )
-
-    TTYReadStream._streams.add(this)
   }
 
-  get isTTY () {
+  get isTTY() {
     return true
   }
 
-  setMode (mode) {
+  setMode(mode) {
     binding.setMode(this._handle, mode)
     return this
   }
 
-  setRawMode (mode) {
+  setRawMode(mode) {
     return this.setMode(mode ? constants.mode.RAW : constants.mode.NORMAL)
   }
 
-  _read () {
+  _read() {
     if ((this._state & constants.state.READING) === 0) {
       this._state |= constants.state.READING
       binding.resume(this._handle)
     }
   }
 
-  _predestroy () {
+  _predestroy() {
     if (this._state & constants.state.CLOSING) return
     this._state |= constants.state.CLOSING
     binding.close(this._handle)
-    TTYReadStream._streams.delete(this)
   }
 
-  _destroy (err, cb) {
+  _destroy(err, cb) {
     if (this._state & constants.state.CLOSING) return cb(err)
     this._state |= constants.state.CLOSING
     this._pendingDestroy = cb
     binding.close(this._handle)
-    TTYReadStream._streams.delete(this)
   }
 
-  _continueDestroy () {
+  _continueDestroy() {
     if (this._pendingDestroy === null) return
     const cb = this._pendingDestroy
     this._pendingDestroy = null
     cb(null)
   }
 
-  _onread (err, read) {
+  _onread(err, read) {
     if (err) {
       this.destroy(err)
       return
@@ -95,16 +92,14 @@ exports.ReadStream = class TTYReadStream extends Readable {
     }
   }
 
-  _onclose () {
+  _onclose() {
     this._handle = null
     this._continueDestroy()
   }
-
-  static _streams = new Set()
 }
 
 exports.WriteStream = class TTYWriteStream extends Writable {
-  constructor (fd, opts = {}) {
+  constructor(fd, opts = {}) {
     super()
 
     this._state = 0
@@ -113,7 +108,10 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     this._pendingWrite = null
     this._pendingDestroy = null
 
-    this._handle = binding.init(fd, empty, this,
+    this._handle = binding.init(
+      fd,
+      empty,
+      this,
       this._onwrite,
       noop,
       this._onclose
@@ -125,28 +123,31 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     TTYWriteStream._streams.add(this)
   }
 
-  get isTTY () {
+  get isTTY() {
     return true
   }
 
-  get columns () {
+  get columns() {
     return this._size[0]
   }
 
-  get rows () {
+  get rows() {
     return this._size[1]
   }
 
-  getWindowSize () {
+  getWindowSize() {
     return binding.getWindowSize(this._handle)
   }
 
-  _writev (batch, cb) {
+  _writev(batch, cb) {
     this._pendingWrite = [cb, batch]
-    binding.writev(this._handle, batch.map(({ chunk }) => chunk))
+    binding.writev(
+      this._handle,
+      batch.map(({ chunk }) => chunk)
+    )
   }
 
-  _predestroy () {
+  _predestroy() {
     if (this._state & constants.state.CLOSING) return
     this._state |= constants.state.CLOSING
     binding.close(this._handle)
@@ -154,7 +155,7 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.stop()
   }
 
-  _destroy (err, cb) {
+  _destroy(err, cb) {
     if (this._state & constants.state.CLOSING) return cb(err)
     this._state |= constants.state.CLOSING
     this._pendingDestroy = cb
@@ -163,30 +164,30 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.stop()
   }
 
-  _continueWrite (err) {
+  _continueWrite(err) {
     if (this._pendingWrite === null) return
     const cb = this._pendingWrite[0]
     this._pendingWrite = null
     cb(err)
   }
 
-  _continueDestroy () {
+  _continueDestroy() {
     if (this._pendingDestroy === null) return
     const cb = this._pendingDestroy
     this._pendingDestroy = null
     cb(null)
   }
 
-  _onwrite (err) {
+  _onwrite(err) {
     this._continueWrite(err)
   }
 
-  _onclose () {
+  _onclose() {
     this._handle = null
     this._continueDestroy()
   }
 
-  _onresize () {
+  _onresize() {
     this._size = this.getWindowSize()
     this.emit('resize')
   }
@@ -210,17 +211,6 @@ exports.WriteStream._resize
   })
   .unref()
 
-Bare
-  .on('exit', () => {
-    for (const stream of exports.ReadStream._streams) {
-      stream.destroy()
-    }
-
-    for (const stream of exports.WriteStream._streams) {
-      stream.destroy()
-    }
-  })
-
 const empty = Buffer.alloc(0)
 
-function noop () {}
+function noop() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-tty",
-  "version": "4.0.2",
+  "version": "5.0.1",
   "description": "Native TTY streams for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -17,7 +17,7 @@
   ],
   "addon": true,
   "scripts": {
-    "test": "standard && bare test.js"
+    "test": "prettier . --check && bare test.js"
   },
   "repository": {
     "type": "git",
@@ -29,14 +29,18 @@
     "url": "https://github.com/holepunchto/bare-tty/issues"
   },
   "homepage": "https://github.com/holepunchto/bare-tty#readme",
+  "engines": {
+    "bare": ">=1.7.0"
+  },
   "dependencies": {
     "bare-events": "^2.2.0",
-    "bare-signals": "^3.0.0",
+    "bare-signals": "^4.0.0",
     "bare-stream": "^2.0.0"
   },
   "devDependencies": {
     "brittle": "^3.2.1",
     "cmake-bare": "^1.1.6",
-    "standard": "^17.0.0"
+    "prettier": "^3.4.1",
+    "prettier-config-standard": "^7.0.0"
   }
 }