bare-tty 3.1.2 → 3.2.1

package/binding.c

@@ -17,7 +17,6 @@ typedef struct {
   js_env_t *env;
   js_ref_t *ctx;
   js_ref_t *on_write;
-  js_ref_t *on_end;
   js_ref_t *on_read;
   js_ref_t *on_close;
 } bare_tty_t;
@@ -66,50 +65,6 @@ on_write (uv_write_t *req, int status) {
   assert(err == 0);
 }
 
-static void
-on_shutdown (uv_shutdown_t *req, int status) {
-  int err;
-
-  bare_tty_t *tty = (bare_tty_t *) req->data;
-
-  js_env_t *env = tty->env;
-
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  js_value_t *ctx;
-  err = js_get_reference_value(env, tty->ctx, &ctx);
-  assert(err == 0);
-
-  js_value_t *on_end;
-  err = js_get_reference_value(env, tty->on_end, &on_end);
-  assert(err == 0);
-
-  js_value_t *argv[1];
-
-  if (status < 0) {
-    js_value_t *code;
-    err = js_create_string_utf8(env, (utf8_t *) uv_err_name(status), -1, &code);
-    assert(err == 0);
-
-    js_value_t *message;
-    err = js_create_string_utf8(env, (utf8_t *) uv_strerror(status), -1, &message);
-    assert(err == 0);
-
-    err = js_create_error(env, code, message, &argv[0]);
-    assert(err == 0);
-  } else {
-    err = js_get_null(env, &argv[0]);
-    assert(err == 0);
-  }
-
-  js_call_function(env, ctx, on_end, 1, argv, NULL);
-
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-}
-
 static void
 on_read (uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
   if (nread == UV_EOF) nread = 0;
@@ -188,9 +143,6 @@ on_close (uv_handle_t *handle) {
   err = js_delete_reference(env, tty->on_write);
   assert(err == 0);
 
-  err = js_delete_reference(env, tty->on_end);
-  assert(err == 0);
-
   err = js_delete_reference(env, tty->on_read);
   assert(err == 0);
 
@@ -215,13 +167,13 @@ static js_value_t *
 bare_tty_init (js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 7;
-  js_value_t *argv[7];
+  size_t argc = 6;
+  js_value_t *argv[6];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 7);
+  assert(argc == 6);
 
   uv_loop_t *loop;
   js_get_env_loop(env, &loop);
@@ -259,13 +211,10 @@ bare_tty_init (js_env_t *env, js_callback_info_t *info) {
   err = js_create_reference(env, argv[3], 1, &tty->on_write);
   assert(err == 0);
 
-  err = js_create_reference(env, argv[4], 1, &tty->on_end);
+  err = js_create_reference(env, argv[4], 1, &tty->on_read);
   assert(err == 0);
 
-  err = js_create_reference(env, argv[5], 1, &tty->on_read);
-  assert(err == 0);
-
-  err = js_create_reference(env, argv[6], 1, &tty->on_close);
+  err = js_create_reference(env, argv[5], 1, &tty->on_close);
   assert(err == 0);
 
   return handle;
@@ -321,36 +270,6 @@ bare_tty_writev (js_env_t *env, js_callback_info_t *info) {
   return NULL;
 }
 
-static js_value_t *
-bare_tty_end (js_env_t *env, js_callback_info_t *info) {
-  int err;
-
-  size_t argc = 1;
-  js_value_t *argv[1];
-
-  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
-  assert(err == 0);
-
-  assert(argc == 1);
-
-  bare_tty_t *tty;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &tty, NULL);
-  assert(err == 0);
-
-  uv_shutdown_t *req = &tty->requests.shutdown;
-
-  req->data = tty;
-
-  err = uv_shutdown(req, (uv_stream_t *) &tty->handle, on_shutdown);
-
-  if (err < 0) {
-    js_throw_error(env, uv_err_name(err), uv_strerror(err));
-    return NULL;
-  }
-
-  return NULL;
-}
-
 static js_value_t *
 bare_tty_resume (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -540,11 +459,6 @@ init (js_env_t *env, js_value_t *exports) {
     js_create_function(env, "writev", -1, bare_tty_writev, NULL, &fn);
     js_set_named_property(env, exports, "writev", fn);
   }
-  {
-    js_value_t *fn;
-    js_create_function(env, "end", -1, bare_tty_end, NULL, &fn);
-    js_set_named_property(env, exports, "end", fn);
-  }
   {
     js_value_t *fn;
     js_create_function(env, "resume", -1, bare_tty_resume, NULL, &fn);

package/index.js

@@ -22,7 +22,6 @@ exports.ReadStream = class TTYReadStream extends Readable {
     this._buffer = Buffer.alloc(readBufferSize)
 
     this._handle = binding.init(fd, this._buffer, this,
-      noop,
       noop,
       this._onread,
       this._onclose
@@ -39,6 +38,10 @@ exports.ReadStream = class TTYReadStream extends Readable {
     binding.setMode(this._handle, mode)
   }
 
+  setRawMode (mode) {
+    this.setMode(mode ? constants.MODE_RAW : constants.MODE_NORMAL)
+  }
+
   _read (cb) {
     if (!this._reading) {
       this._reading = true
@@ -103,14 +106,12 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     super({ mapWritable })
 
     this._pendingWrite = null
-    this._pendingFinal = null
     this._pendingDestroy = null
 
     this._closing = false
 
     this._handle = binding.init(fd, empty, this,
       this._onwrite,
-      this._onfinal,
       noop,
       this._onclose
     )
@@ -131,11 +132,6 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     binding.writev(this._handle, datas)
   }
 
-  _final (cb) {
-    this._pendingFinal = cb
-    binding.end(this._handle)
-  }
-
   _predestroy () {
     if (this._closing) return
     this._closing = true
@@ -158,13 +154,6 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     cb(err)
   }
 
-  _continueFinal (err) {
-    if (this._pendingFinal === null) return
-    const cb = this._pendingFinal
-    this._pendingFinal = null
-    cb(err)
-  }
-
   _continueDestroy () {
     if (this._pendingDestroy === null) return
     const cb = this._pendingDestroy
@@ -197,10 +186,6 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     }
   }
 
-  _onfinal (err) {
-    this._continueFinal(err)
-  }
-
   _onclose () {
     this._handle = null
     this._continueDestroy()
@@ -211,7 +196,7 @@ exports.WriteStream = class TTYWriteStream extends Writable {
 
 exports.isTTY = binding.isTTY
 
-exports.constants = {
+const constants = exports.constants = {
   MODE_NORMAL: binding.MODE_NORMAL,
   MODE_RAW: binding.MODE_RAW,
   MODE_IO: binding.MODE_IO || 0

package/package.json

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