@d-zero/dealer 1.6.1 → 1.6.2

package/dist/display.js

@@ -1,7 +1,6 @@
-import c from 'ansi-colors';
 import { countDownFunctionParser } from './count-down-function-parser.js';
 import { riffle } from './riffle.js';
-const RESET = c.reset('');
+const RESET = '\u001B[0m';
 const CURSOR_UP = (n) => `\u001B[${n}A`;
 const CURSOR_TO_COL0 = '\u001B[G';
 const ERASE_DOWN = '\u001B[0J';
@@ -14,10 +13,13 @@ const animationPresets = {
 };
 export class Display {
     #animations;
+    #closed = false;
     #coundDownMap = new Map();
     #debugMessages = [];
     #frameInterval;
     #lastWroteLineNum = 0;
+    #resizeHandler = null;
+    #sigintHandler = null;
     #stack = null;
     #startTime = Date.now();
     #timer = null;
@@ -30,19 +32,33 @@ export class Display {
         const fps = options?.fps ?? 30;
         this.#frameInterval = 1000 / fps;
         this.#verbose = options?.verbose ?? false;
-        process.stdout.on('resize', () => this.#resize());
+        this.#resizeHandler = () => this.#resize();
+        process.stdout.on('resize', this.#resizeHandler);
+        if (!this.#verbose) {
+            this.#sigintHandler = () => {
+                this.close();
+                process.exit(130);
+            };
+            process.on('SIGINT', this.#sigintHandler);
+        }
     }
     close() {
-        if (this.#verbose) {
+        if (this.#verbose || this.#closed) {
             return;
         }
+        this.#closed = true;
         if (this.#timer) {
             clearTimeout(this.#timer);
             this.#timer = null;
         }
         this.#write();
-        if (process.stdin.isTTY) {
-            process.stdin.setRawMode(false);
+        if (this.#resizeHandler) {
+            process.stdout.off('resize', this.#resizeHandler);
+            this.#resizeHandler = null;
+        }
+        if (this.#sigintHandler) {
+            process.off('SIGINT', this.#sigintHandler);
+            this.#sigintHandler = null;
         }
         this.#lastWroteLineNum = 0;
         this.#stack = null;

package/dist/lanes.js

@@ -1,4 +1,5 @@
 import { Display } from './display.js';
+const RESET = '\u001B[0m';
 export class Lanes {
     #display;
     #header;
@@ -45,7 +46,7 @@ export class Lanes {
     }
     update(id, log) {
         if (this.#verbose) {
-            this.#display.write(this.#header + ' ' + log);
+            this.#display.write(`${RESET}${this.#header}${RESET} ${log}`);
             return;
         }
         this.#logs.set(id, log);
@@ -59,7 +60,7 @@ export class Lanes {
         logs.sort(this.#sort);
         const messages = logs.map(([, message]) => `${this.#indent}${message}`);
         if (this.#header) {
-            messages.unshift(...this.#header.split('\n'));
+            messages.unshift(...this.#header.split('\n').map((line) => `${RESET}${line}${RESET}`));
         }
         this.#display.write(...messages);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/dealer",
-	"version": "1.6.1",
+	"version": "1.6.2",
 	"description": "A tool that provides an API and CLI for parallel processing of collections and sequential logging to standard output",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -23,8 +23,8 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/shared": "0.19.0",
+		"@d-zero/shared": "0.20.0",
 		"ansi-colors": "4.1.3"
 	},
-	"gitHead": "7f90e8c637c40b9abee652eac927a3ca257ef29f"
+	"gitHead": "1830747a6fee6194c897d54966c25ada5237645e"
 }