@cto.af/chex-cli 2.0.1 → 2.1.0

package/bin/chex.js

@@ -2,9 +2,10 @@
 /* eslint-disable no-console */
 
 import {Command, Option} from 'commander';
-import {Buffer} from 'node:buffer';
-import fs from 'node:fs/promises';
-import {hexDump} from '@cto.af/chex';
+import {HexDumpTransform} from '../lib/stream.js';
+import fs from 'node:fs';
+import {version as libVersion} from '@cto.af/chex/lib/version.js';
+import {version} from '../lib/version.js';
 
 const program = new Command();
 program
@@ -15,6 +16,7 @@ program
     '-s,--strings <encoding>',
     'try to decode strings in this encoding'
   ).choices(['utf8', 'utf-8']))
+  .version(`${version}, lib:${libVersion}`)
   .parse();
 
 const opts = program.opts();
@@ -23,29 +25,20 @@ if (args.length === 0) {
   args.push('-');
 }
 
-function readStdin() {
-  return new Promise((resolve, reject) => {
-    const bufs = [];
-    process.stdin.on('data', d => bufs.push(d));
-    process.stdin.on('end', () => resolve(new Uint8Array(Buffer.concat(bufs))));
-    process.stdin.on('error', reject);
-  });
-}
-
-async function main(argv) {
+function main(argv) {
   for (const fn of argv) {
     if (argv.length > 1) {
       console.log(fn);
     }
-    const buf = fn === '-' ?
-      await readStdin() :
-      new Uint8Array(await fs.readFile(fn));
-    console.log(hexDump(buf, {
+    const str = (fn === '-') ?
+      process.stdin :
+      fs.createReadStream(fn);
+    str.pipe(new HexDumpTransform({
       colors: opts.colors || process.stdout.isTTY,
       dots: opts.dots,
       decode: opts.strings,
-    }));
+    })).pipe(process.stdout);
   }
 }
 
-main(args).catch(console.error);
+main(args);

package/lib/stream.js

@@ -0,0 +1,77 @@
+import {Transform} from 'node:stream';
+import {hexDump} from '@cto.af/chex';
+
+/**
+ * @typedef {Partial<import('@cto.af/chex').HexOptions> &
+ *   import('node:stream').DuplexOptions} HexDumpStreamOptions
+ */
+
+export class HexDumpTransform extends Transform {
+  /** @type {HexDumpStreamOptions} */
+  #opts;
+  #buf = new Uint8Array(16);
+  #bufLen = 0;
+
+  /**
+   *
+   * @param {HexDumpStreamOptions} options
+   */
+  constructor(options = {}) {
+    super(options);
+    this.#opts = {
+      firstByte: 0,
+      ...options,
+      printLength: false,
+    };
+  }
+
+  /**
+   * Transform a chunk of bytes.
+   * @param {Uint8Array} chunk
+   * @param {BufferEncoding} _encoding Should be null
+   * @param {import('node:stream').TransformCallback} callback
+   */
+  _transform(chunk, _encoding, callback) {
+    let res = '';
+    if (this.#bufLen > 0) {
+      const front = Math.min(chunk.length, 16 - this.#bufLen);
+      if (front > 0) {
+        this.#buf.set(chunk.subarray(0, front), this.#bufLen);
+        this.#bufLen += front;
+        chunk = chunk.subarray(front);
+      }
+      if (this.#bufLen === 16) {
+        res += hexDump(this.#buf, this.#opts);
+        this.#opts.firstByte += 16;
+        this.#bufLen = 0;
+      }
+    }
+    if (chunk.length > 0) {
+      const tail = chunk.length % 16;
+      if (tail > 0) {
+        this.#buf.set(chunk.subarray(-tail), this.#bufLen);
+        this.#bufLen += tail;
+        chunk = chunk.subarray(0, -tail);
+      }
+      // Should be multiple of 16 now
+      if (chunk.length > 0) {
+        res += hexDump(chunk, this.#opts);
+        this.#opts.firstByte += chunk.length;
+      }
+    }
+    callback(null, res);
+  }
+
+  /**
+   * @param {import('node:stream').TransformCallback} callback
+   */
+  _flush(callback) {
+    callback(null, hexDump(this.#buf.subarray(0, this.#bufLen), {
+      ...this.#opts,
+      printLength: true,
+    }));
+  }
+}
+
+//
+// process.stdin.pipe(new HexDumpTransform()).pipe(process.stdout);

package/lib/version.js

@@ -0,0 +1,4 @@
+// Generated by package-extract v3.1.0
+// Do not modify by hand.
+
+export const version = '2.1.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cto.af/chex-cli",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "hexdump -C as a small JS library",
   "main": "lib/index.js",
   "type": "module",
@@ -21,7 +21,7 @@
   "author": "Joe Hildebrand <joe-github@cursive.net>",
   "license": "MIT",
   "dependencies": {
-    "@cto.af/chex": "2.0.1",
+    "@cto.af/chex": "2.1.0",
     "commander": "13.1.0"
   },
   "engines": {