bare-tty 5.0.0 → 5.0.2

package/binding.c

@@ -20,8 +20,10 @@ typedef struct {
   js_ref_t *on_read;
   js_ref_t *on_close;
 
-  js_deferred_teardown_t *teardown;
+  bool closing;
   bool exiting;
+
+  js_deferred_teardown_t *teardown;
 } bare_tty_t;
 
 static void
@@ -30,6 +32,8 @@ bare_tty__on_write(uv_write_t *req, int status) {
 
   bare_tty_t *tty = (bare_tty_t *) req->data;
 
+  if (tty->exiting) return;
+
   js_env_t *env = tty->env;
 
   js_handle_scope_t *scope;
@@ -77,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;
@@ -129,7 +135,7 @@ bare_tty__on_close(uv_handle_t *handle) {
 
   js_env_t *env = tty->env;
 
-  if (tty->exiting) goto finalize;
+  js_deferred_teardown_t *teardown = tty->teardown;
 
   js_handle_scope_t *scope;
   err = js_open_handle_scope(env, &scope);
@@ -143,15 +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_close_handle_scope(env, scope);
-  assert(err == 0);
-
-finalize:
-  err = js_finish_deferred_teardown_callback(tty->teardown);
-  assert(err == 0);
-
   err = js_delete_reference(env, tty->on_write);
   assert(err == 0);
 
@@ -163,6 +160,14 @@ finalize:
 
   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
@@ -171,6 +176,8 @@ bare_tty__on_teardown(js_deferred_teardown_t *handle, void *data) {
 
   tty->exiting = true;
 
+  if (tty->closing) return;
+
   uv_close((uv_handle_t *) &tty->handle, bare_tty__on_close);
 }
 
@@ -194,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;
 
@@ -219,6 +227,7 @@ 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);
@@ -266,16 +275,24 @@ bare_tty_writev(js_env_t *env, js_callback_info_t *info) {
 
   uv_buf_t *bufs = malloc(sizeof(uv_buf_t) * bufs_len);
 
+  js_value_t **elements = malloc(sizeof(js_value_t *) * bufs_len);
+
+  uint32_t fetched;
+  err = js_get_array_elements(env, arr, elements, bufs_len, 0, &fetched);
+  assert(err == 0);
+  assert(fetched == bufs_len);
+
+
   for (uint32_t i = 0; i < bufs_len; i++) {
-    js_value_t *item;
-    err = js_get_element(env, arr, i, &item);
-    assert(err == 0);
+    js_value_t *item = elements[i];
 
     uv_buf_t *buf = &bufs[i];
     err = js_get_typedarray_info(env, item, NULL, (void **) &buf->base, (size_t *) &buf->len, NULL, NULL);
     assert(err == 0);
   }
 
+  free(elements);
+
   uv_write_t *req = &tty->requests.write;
 
   req->data = tty;
@@ -366,6 +383,8 @@ 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;

package/index.d.ts

@@ -0,0 +1,47 @@
+import {
+  Readable,
+  ReadableOptions,
+  Writable,
+  WritableEvents,
+  WritableOptions
+} from 'bare-stream'
+
+interface ReadStream extends Readable {
+  readonly isTTY: true
+
+  setMode(mode: number): this
+
+  setRawMode(mode: boolean): this
+}
+
+declare class ReadStream extends Readable {
+  constructor(fd: number, opts?: ReadableOptions)
+}
+
+interface WriteStreamEvents extends WritableEvents {
+  resize: []
+}
+
+interface WriteStream<M extends WriteStreamEvents = WriteStreamEvents>
+  extends Writable<M> {
+  readonly isTTY: true
+  readonly columns: number
+  readonly rows: number
+
+  getWindowSize(): [width: number, height: number]
+}
+
+declare class WriteStream<
+  M extends WriteStreamEvents = WriteStreamEvents
+> extends Writable<M> {
+  constructor(fd: number, opts?: WritableOptions)
+}
+
+declare function isTTY(fd: number): boolean
+
+declare const constants: {
+  mode: { NORMAL: number; RAW: number; IO: number }
+  state: { READING: number; CLOSING: number }
+}
+
+export { ReadStream, WriteStream, isTTY, isTTY as isatty, constants }

package/index.js

@@ -40,8 +40,8 @@ exports.ReadStream = class TTYReadStream extends Readable {
     return this
   }
 
-  setRawMode(mode) {
-    return this.setMode(mode ? constants.mode.RAW : constants.mode.NORMAL)
+  setRawMode(enabled) {
+    return this.setMode(enabled ? constants.mode.RAW : constants.mode.NORMAL)
   }
 
   _read() {

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "bare-tty",
-  "version": "5.0.0",
+  "version": "5.0.2",
   "description": "Native TTY streams for JavaScript",
   "exports": {
-    ".": "./index.js",
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./index.js"
+    },
     "./package": "./package.json",
     "./constants": "./lib/constants.js"
   },
   "files": [
     "index.js",
+    "index.d.ts",
     "binding.c",
     "binding.js",
     "CMakeLists.txt",
@@ -30,7 +34,7 @@
   },
   "homepage": "https://github.com/holepunchto/bare-tty#readme",
   "engines": {
-    "bare": ">=1.7.0"
+    "bare": ">=1.16.0"
   },
   "dependencies": {
     "bare-events": "^2.2.0",