bare-tty 3.3.0 → 3.4.0

package/index.js

@@ -1,5 +1,6 @@
 /* global Bare */
-const { Readable, Writable } = require('streamx')
+const { Readable, Writable } = require('bare-stream')
+const Signal = require('bare-signals')
 const binding = require('./binding')
 const constants = require('./lib/constants')
 
@@ -37,19 +38,18 @@ exports.ReadStream = class TTYReadStream extends Readable {
 
   setMode (mode) {
     binding.setMode(this._handle, mode)
+    return this
   }
 
   setRawMode (mode) {
-    this.setMode(mode ? constants.mode.RAW : constants.mode.NORMAL)
+    return this.setMode(mode ? constants.mode.RAW : constants.mode.NORMAL)
   }
 
-  _read (cb) {
+  _read () {
     if ((this._state & constants.state.READING) === 0) {
       this._state |= constants.state.READING
       binding.resume(this._handle)
     }
-
-    cb(null)
   }
 
   _predestroy () {
@@ -59,8 +59,8 @@ exports.ReadStream = class TTYReadStream extends Readable {
     TTYReadStream._streams.delete(this)
   }
 
-  _destroy (cb) {
-    if (this._state & constants.state.CLOSING) return cb(null)
+  _destroy (err, cb) {
+    if (this._state & constants.state.CLOSING) return cb(err)
     this._state |= constants.state.CLOSING
     this._pendingDestroy = cb
     binding.close(this._handle)
@@ -105,9 +105,10 @@ exports.ReadStream = class TTYReadStream extends Readable {
 
 exports.WriteStream = class TTYWriteStream extends Writable {
   constructor (fd, opts = {}) {
-    super({ mapWritable })
+    super()
 
     this._state = 0
+    this._size = null
 
     this._pendingWrite = null
     this._pendingDestroy = null
@@ -118,6 +119,9 @@ exports.WriteStream = class TTYWriteStream extends Writable {
       this._onclose
     )
 
+    this._size = this.getWindowSize()
+
+    if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.start()
     TTYWriteStream._streams.add(this)
   }
 
@@ -125,13 +129,21 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     return true
   }
 
+  get columns () {
+    return this._size[0]
+  }
+
+  get rows () {
+    return this._size[1]
+  }
+
   getWindowSize () {
     return binding.getWindowSize(this._handle)
   }
 
-  _writev (datas, cb) {
-    this._pendingWrite = [cb, datas]
-    binding.writev(this._handle, datas)
+  _writev (batch, cb) {
+    this._pendingWrite = [cb, batch]
+    binding.writev(this._handle, batch.map(({ chunk }) => chunk))
   }
 
   _predestroy () {
@@ -139,14 +151,16 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     this._state |= constants.state.CLOSING
     binding.close(this._handle)
     TTYWriteStream._streams.delete(this)
+    if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.stop()
   }
 
-  _destroy (cb) {
-    if (this._state & constants.state.CLOSING) return cb(null)
+  _destroy (err, cb) {
+    if (this._state & constants.state.CLOSING) return cb(err)
     this._state |= constants.state.CLOSING
     this._pendingDestroy = cb
     binding.close(this._handle)
     TTYWriteStream._streams.delete(this)
+    if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.stop()
   }
 
   _continueWrite (err) {
@@ -172,13 +186,30 @@ exports.WriteStream = class TTYWriteStream extends Writable {
     this._continueDestroy()
   }
 
+  _onresize () {
+    this._size = this.getWindowSize()
+    this.emit('resize')
+  }
+
   static _streams = new Set()
+
+  static _resize = new Signal('SIGWINCH')
 }
 
 exports.constants = constants
 
 exports.isTTY = binding.isTTY
 
+exports.isatty = exports.isTTY // For Node.js compatibility
+
+exports.WriteStream._resize
+  .on('signal', () => {
+    for (const stream of exports.WriteStream._streams) {
+      stream._onresize()
+    }
+  })
+  .unref()
+
 Bare
   .on('exit', () => {
     for (const stream of exports.ReadStream._streams) {
@@ -193,7 +224,3 @@ Bare
 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": "3.3.0",
+  "version": "3.4.0",
   "description": "Native TTY streams for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -31,7 +31,8 @@
   "homepage": "https://github.com/holepunchto/bare-tty#readme",
   "dependencies": {
     "bare-events": "^2.2.0",
-    "streamx": "^2.13.2"
+    "bare-signals": "^2.2.0",
+    "bare-stream": "^2.0.0"
   },
   "devDependencies": {
     "brittle": "^3.2.1",