bare-tty 5.0.3 → 5.1.1

package/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 4.0)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
 

package/index.d.ts

@@ -1,16 +1,11 @@
-import {
-  Readable,
-  ReadableOptions,
-  Writable,
-  WritableEvents,
-  WritableOptions
-} from 'bare-stream'
+import { Readable, ReadableOptions, Writable, WritableEvents, WritableOptions } from 'bare-stream'
+import constants from './lib/constants'
 
 interface ReadStream extends Readable {
+  readonly fd: number
   readonly isTTY: true
 
   setMode(mode: number): this
-
   setRawMode(mode: boolean): this
 }
 
@@ -22,8 +17,8 @@ interface WriteStreamEvents extends WritableEvents {
   resize: []
 }
 
-interface WriteStream<M extends WriteStreamEvents = WriteStreamEvents>
-  extends Writable<M> {
+interface WriteStream<M extends WriteStreamEvents = WriteStreamEvents> extends Writable<M> {
+  readonly fd: number
   readonly isTTY: true
   readonly columns: number
   readonly rows: number
@@ -31,17 +26,10 @@ interface WriteStream<M extends WriteStreamEvents = WriteStreamEvents>
   getWindowSize(): [width: number, height: number]
 }
 
-declare class WriteStream<
-  M extends WriteStreamEvents = WriteStreamEvents
-> extends Writable<M> {
+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

@@ -1,34 +1,29 @@
-/* global Bare */
 const { Readable, Writable } = require('bare-stream')
 const Signal = require('bare-signals')
 const binding = require('./binding')
 const constants = require('./lib/constants')
 
 const defaultReadBufferSize = 65536
+const empty = Buffer.alloc(0)
 
 exports.ReadStream = class TTYReadStream extends Readable {
   constructor(fd, opts = {}) {
     super()
 
-    const { readBufferSize = defaultReadBufferSize, allowHalfOpen = true } =
-      opts
+    const { readBufferSize = defaultReadBufferSize, allowHalfOpen = true } = opts
 
+    this._fd = fd
     this._state = 0
-
     this._allowHalfOpen = allowHalfOpen
+    this._buffer = Buffer.alloc(readBufferSize)
 
     this._pendingDestroy = null
 
-    this._buffer = Buffer.alloc(readBufferSize)
+    this._handle = binding.init(fd, this._buffer, this, noop, this._onread, this._onclose)
+  }
 
-    this._handle = binding.init(
-      fd,
-      this._buffer,
-      this,
-      noop,
-      this._onread,
-      this._onclose
-    )
+  get fd() {
+    return this._fd
   }
 
   get isTTY() {
@@ -47,6 +42,7 @@ exports.ReadStream = class TTYReadStream extends Readable {
   _read() {
     if ((this._state & constants.state.READING) === 0) {
       this._state |= constants.state.READING
+
       binding.resume(this._handle)
     }
   }
@@ -54,13 +50,16 @@ exports.ReadStream = class TTYReadStream extends Readable {
   _predestroy() {
     if (this._state & constants.state.CLOSING) return
     this._state |= constants.state.CLOSING
+
     binding.close(this._handle)
   }
 
   _destroy(err, cb) {
     if (this._state & constants.state.CLOSING) return cb(err)
     this._state |= constants.state.CLOSING
+
     this._pendingDestroy = cb
+
     binding.close(this._handle)
   }
 
@@ -88,12 +87,14 @@ exports.ReadStream = class TTYReadStream extends Readable {
 
     if (this.push(copy) === false && this.destroying === false) {
       this._state &= ~constants.state.READING
+
       binding.pause(this._handle)
     }
   }
 
   _onclose() {
     this._handle = null
+
     this._continueDestroy()
   }
 }
@@ -102,27 +103,27 @@ exports.WriteStream = class TTYWriteStream extends Writable {
   constructor(fd, opts = {}) {
     super()
 
+    this._fd = fd
     this._state = 0
     this._size = null
 
     this._pendingWrite = null
+    this._pendingWriteBatch = null
     this._pendingDestroy = null
 
-    this._handle = binding.init(
-      fd,
-      empty,
-      this,
-      this._onwrite,
-      noop,
-      this._onclose
-    )
+    this._handle = binding.init(fd, empty, this, this._onwrite, noop, this._onclose)
 
     this._size = this.getWindowSize()
 
     if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.start()
+
     TTYWriteStream._streams.add(this)
   }
 
+  get fd() {
+    return this._fd
+  }
+
   get isTTY() {
     return true
   }
@@ -140,34 +141,48 @@ exports.WriteStream = class TTYWriteStream extends Writable {
   }
 
   _writev(batch, cb) {
-    this._pendingWrite = [cb, batch]
-    binding.writev(
-      this._handle,
-      batch.map(({ chunk }) => chunk)
-    )
+    this._pendingWrite = cb
+    this._pendingWriteBatch = batch
+
+    try {
+      binding.writev(
+        this._handle,
+        batch.map(({ chunk }) => chunk)
+      )
+    } catch (err) {
+      this._continueWrite(err)
+    }
   }
 
   _predestroy() {
     if (this._state & constants.state.CLOSING) return
     this._state |= constants.state.CLOSING
+
     binding.close(this._handle)
+
     TTYWriteStream._streams.delete(this)
+
     if (TTYWriteStream._streams.size === 0) TTYWriteStream._resize.stop()
   }
 
   _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) {
     if (this._pendingWrite === null) return
-    const cb = this._pendingWrite[0]
+    const cb = this._pendingWrite
     this._pendingWrite = null
+    this._pendingWriteBatch = null
     cb(err)
   }
 
@@ -184,11 +199,13 @@ exports.WriteStream = class TTYWriteStream extends Writable {
 
   _onclose() {
     this._handle = null
+
     this._continueDestroy()
   }
 
   _onresize() {
     this._size = this.getWindowSize()
+
     this.emit('resize')
   }
 
@@ -211,6 +228,4 @@ exports.WriteStream._resize
   })
   .unref()
 
-const empty = Buffer.alloc(0)
-
 function noop() {}

package/lib/constants.d.ts

@@ -0,0 +1,6 @@
+declare const constants: {
+  mode: { NORMAL: number; RAW: number; IO: number }
+  state: { READING: number; CLOSING: number }
+}
+
+export = constants

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-tty",
-  "version": "5.0.3",
+  "version": "5.1.1",
   "description": "Native TTY streams for JavaScript",
   "exports": {
     ".": {
@@ -21,7 +21,9 @@
   ],
   "addon": true,
   "scripts": {
-    "test": "prettier . --check && bare test.js"
+    "format": "prettier --write . && lunte --fix",
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-bare --coverage test.js"
   },
   "repository": {
     "type": "git",
@@ -44,7 +46,8 @@
   "devDependencies": {
     "brittle": "^3.2.1",
     "cmake-bare": "^1.1.6",
+    "lunte": "^1.8.0",
     "prettier": "^3.4.1",
-    "prettier-config-standard": "^7.0.0"
+    "prettier-config-holepunch": "^2.0.0"
   }
 }