switch everything to node and dont use O_NONBLOCK

.github/workflows/CI.yml

@@ -22,42 +22,27 @@ permissions:
   pull_request: null
 
 jobs:
-  build:
+  build-test:
     strategy:
       fail-fast: false
       matrix:
         settings:
           - host: macos-14-large
             target: x86_64-apple-darwin
-            architecture: x64
-            build: |-
-              set -e &&
-              bun run build --target x86_64-apple-darwin &&
-              strip -x *.node
+          - host: macos-latest
+            target: aarch64-apple-darwin
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
-            build: |-
-              set -e &&
-              npm install -g bun &&
-              bun run build --target x86_64-unknown-linux-gnu &&
-              strip *.node
-    name: Build on ${{ matrix.settings.target }}
+    name: Build and test on ${{ matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.6
       - name: Setup node
         uses: actions/setup-node@v4
-        if: ${{ !matrix.settings.docker }}
         with:
           node-version: 20
       - name: Install
         uses: dtolnay/rust-toolchain@stable
-        if: ${{ !matrix.settings.docker }}
         with:
           toolchain: stable
           targets: ${{ matrix.settings.target }}
@@ -71,126 +56,43 @@ jobs:
             .cargo-cache
             target/
           key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
-      - uses: goto-bus-stop/setup-zig@v2
-        if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' }}
-        with:
-          version: 0.11.0
-      - name: Setup toolchain
-        run: ${{ matrix.settings.setup }}
-        if: ${{ matrix.settings.setup }}
-        shell: bash
       - name: Install dependencies
-        run: bun install
-      - name: Build in docker
-        uses: addnab/docker-run-action@v3
-        if: ${{ matrix.settings.docker }}
-        with:
-          image: ${{ matrix.settings.docker }}
-          options: '--user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build'
-          run: ${{ matrix.settings.build }}
+        run: npm ci
       - name: Build
-        run: ${{ matrix.settings.build }}
-        if: ${{ !matrix.settings.docker }}
+        run: |-
+          set -e &&
+          npm run build &&
+          strip -x *.node
         shell: bash
+      - name: Test bindings
+        run: npm run test
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: bindings-${{ matrix.settings.target }}
           path: ${{ env.APP_NAME }}.*.node
           if-no-files-found: error
 
-  test-macos-binding:
-    name: Test on ${{ matrix.settings.target }}
-    needs:
-      - build
-    strategy:
-      matrix:
-        settings:
-          - host: macos-14-large
-            target: x86_64-apple-darwin
-            architecture: x64
-    runs-on: ${{ matrix.settings.host }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.6
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          architecture: ${{ matrix.settings.architecture }}
-      - name: Install dependencies
-        run: bun install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-${{ matrix.settings.target }}
-          path: .
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Test bindings
-        run: npm run test:darwin
-
-  test-linux-binding:
-    name: Test on ${{ matrix.settings.target }}
-    needs:
-      - build
-    strategy:
-      matrix:
-        settings:
-          - host: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-    runs-on: ${{ matrix.settings.host }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.6
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install dependencies
-        run: bun install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-${{ matrix.settings.target }}
-          path: .
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Test bindings
-        run: docker run --rm -v $(pwd):/build -w /build oven/bun:1.1.6 bun test:linux
-
   publish:
     name: Publish
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'
     needs:
-      - test-macos-binding
-      - test-linux-binding
+      - build-test
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.6
       - name: Setup node
         uses: actions/setup-node@v4
         with:
           node-version: 20
       - name: Install dependencies
-        run: bun install
+        run: npm ci 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Move artifacts
-        run: bun run artifacts
+        run: npm run artifacts
       - name: List packages
         run: ls -R ./npm
         shell: bash

.replit

@@ -1,5 +1,5 @@
-run = "bun run build:debug && bun test"
-modules = ["bun-1.0:v17-20240117-0bd73cd", "nodejs-20:v24-20240117-0bd73cd", "rust-stable:v4-20240117-0bd73cd"]
+run = "npm run build && npm test"
+modules = ["rust-stable", "nodejs-20", "nix"]
 
 disableGuessImports = true
 disableInstallBeforeRun = true

Cargo.toml

@@ -12,8 +12,7 @@ libc = "0.2.152"
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 napi = { version = "2.12.2", default-features = false, features = ["napi4"] }
 napi-derive = "2.12.2"
-rustix = { version = "0.38.30", features = ["event"] }
-rustix-openpty = "0.1.1"
+nix = { version = "0.29.0", features = ["fs", "term", "poll"] }
 
 [build-dependencies]
 napi-build = "2.0.1"

README.md

@@ -1,18 +1,15 @@
-# `@replit/ruspty` - PTY for Bun (and Node) through Rust FFI
+# `@replit/ruspty` - PTY for JavaScript through Rust FFI
 
 Running:
 
-- `bun install`
-- `bun run build` / `bun run build:debug`
-- `bun test:linux` on Linux
-- `npm run test:darwin` on macOS
+- `npm install`
+- `npm run build`
+- `npm run test`
 
-The code mainly targets Bun on Linux.
+The code mainly targets Node on Linux.
 
 The biggest difference from existing PTY libraries is that this one works with Bun, and doesn't cross the FFI bridge for every input/output instead requiring the consumer to deal with the `fd` of the PTY.
 
-**WARNING**: as of 2024-05-06 there's a [bug in Bun](https://github.com/oven-sh/bun/issues/9907) which prevents us from using `fd` with Bun, and a temporary workaround with `onData` handler was introduced in `v2.0.1`. Check out Linux tests for usage.
-
 ## Publishing
 
 Following ["Publish It" section from `napi-rs` docs](https://napi.rs/docs/introduction/simple-package#publish-it):

index.d.ts

@@ -11,78 +11,20 @@ export interface PtyOptions {
   dir?: string
   size?: Size
   onExit: (err: null | Error, exitCode: number) => void
-  onData?: (err: null | Error, data: Buffer) => void
 }
 /** A size struct to pass to resize. */
 export interface Size {
   cols: number
   rows: number
 }
-/**
- * A very thin wrapper around PTYs and processes. The caller is responsible for calling `.close()`
- * when all streams have been closed. We hold onto both ends of the PTY (controller and user) to
- * prevent reads from erroring out with EIO.
- *
- * This is the recommended usage:
- *
- * ```
- * const { Pty } = require('@replit/ruspy');
- * const fs = require('fs');
- *
- * const pty = new Pty({
- *   command: 'sh',
- *   args: [],
- *   envs: ENV,
- *   dir: CWD,
- *   size: { rows: 24, cols: 80 },
- *   onExit: (...result) => {
- *     pty.close();
- *     // TODO: Handle process exit.
- *   },
- * });
- *
- * const read = new fs.createReadStream('', {
- *   fd: pty.fd(),
- *   start: 0,
- *   highWaterMark: 16 * 1024,
- *   autoClose: true,
- * });
- * const write = new fs.createWriteStream('', {
- *   fd: pty.fd(),
- *   autoClose: true,
- * });
- *
- * read.on('data', (chunk) => {
- *   // TODO: Handle data.
- * });
- * read.on('error', (err) => {
- *   if (err.code && err.code.indexOf('EIO') !== -1) {
- *     // This is expected to happen when the process exits.
- *     return;
- *   }
- *   // TODO: Handle the error.
- * });
- * write.on('error', (err) => {
- *   if (err.code && err.code.indexOf('EIO') !== -1) {
- *     // This is expected to happen when the process exits.
- *     return;
- *   }
- *   // TODO: Handle the error.
- * });
- * ```
- */
 export class Pty {
   /** The pid of the forked process. */
   pid: number
   constructor(opts: PtyOptions)
   /** Resize the terminal. */
   resize(size: Size): void
   /**
-   * Returns a file descriptor for the PTY controller. If running under node, it will dup the file
-   * descriptor, but under bun it will return the same file desciptor, since bun does not close
-   * the streams by itself. Maybe that is a bug in bun, so we should confirm the new behavior
-   * after we upgrade.
-   *
+   * Returns a file descriptor for the PTY controller.
    * See the docstring of the class for an usage example.
    */
   fd(): c_int

npm/darwin-arm64/README.md

@@ -0,0 +1,3 @@
+# `@replit/ruspty-darwin-arm64`
+
+This is the **aarch64-apple-darwin** binary for `@replit/ruspty`

npm/darwin-arm64/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@replit/ruspty-darwin-arm64",
+  "version": "3.0.0",
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "arm64"
+  ],
+  "main": "ruspty.darwin-arm64.node",
+  "files": [
+    "ruspty.darwin-arm64.node"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  }
+}

npm/darwin-x64/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@replit/ruspty-darwin-x64",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "os": [
     "darwin"
   ],

npm/linux-x64-gnu/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@replit/ruspty-linux-x64-gnu",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "os": [
     "linux"
   ],