@coderich/sandman 0.0.17 → 0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.17",
+  "version": "0.1.0",
   "main": "index.js",
   "publishConfig": {
     "access": "public"
@@ -15,12 +15,12 @@
     "dev": "coderich-dev"
   },
   "dependencies": {
-    "@coderich/config": "2.2.7",
-    "@coderich/util": "2.1.5",
+    "@coderich/config": "2.3.0",
+    "@coderich/util": "2.2.3",
     "chokidar": "4.0.3"
   },
   "devDependencies": {
-    "@coderich/dev": "0.6.1"
+    "@coderich/dev": "0.6.4"
   },
   "repository": {
     "type": "git",

package/src/CURLService.js

@@ -70,7 +70,7 @@ exports.toCURL = function toCURL(request, { pretty = true, redactAuth = false }
 
     if (Array.isArray(hdrs)) {
       for (const item of hdrs) {
-        if (!item) continue;
+        if (!item) continue; // eslint-disable-line no-continue
         if (Array.isArray(item) && item.length >= 2) push(item[0], item[1]);
         else if (typeof item === 'object') {
           for (const [k, v] of Object.entries(item)) push(k, v);

package/src/ConfigClient.js

@@ -1,5 +1,5 @@
-const FS = require('fs');
-const Path = require('path');
+const FS = require('node:fs');
+const Path = require('node:path');
 const Chokidar = require('chokidar');
 const Config = require('@coderich/config');
 const Util = require('@coderich/util');

package/src/ReadlineService.js

@@ -1,4 +1,4 @@
-const Readline = require('readline');
+const Readline = require('node:readline');
 const Util = require('@coderich/util');
 const UtilService = require('./UtilService');
 

package/src/Sandman.js

@@ -1,6 +1,6 @@
-const Path = require('path');
-const EventEmitter = require('events');
-const { spawn } = require('child_process');
+const Path = require('node:path');
+const EventEmitter = require('node:events');
+const { spawn } = require('node:child_process');
 const ReadlineService = require('./ReadlineService');
 const UtilService = require('./UtilService');
 const CURLService = require('./CURLService');
@@ -21,15 +21,21 @@ module.exports = class Sandman extends EventEmitter {
     this.#readline = ReadlineService.createInterface(this.#cli, this.#configClient);
     this.#configClient.watch(this.#configDir, event => this.emit('save', event));
 
-    this.#readline.on('line', async (line) => {
+    this.#readline.on('line', (line) => {
       if (!line) return this.prompt();
       const [cmd, key, ...args] = UtilService.parseArgs(line.trim());
       const $cmd = Object.keys(this.#cli).includes(cmd) ? cmd : cmdNotFound;
-      const value = await Promise.resolve(this.#cli[$cmd](key, ...args)).catch(e => e);
-      return this.emit($cmd, value);
+      return this.#cli[$cmd](key, ...args)
+        .then(value => this.emit($cmd, value))
+        .catch(error => this.emit('error', { key: $cmd, error }));
     });
   }
 
+  emit(event, ...args) {
+    if (event === 'error' && !this.listenerCount('error')) return false;
+    return super.emit(event, ...args);
+  }
+
   cli() {
     return this.#cli;
   }
@@ -86,10 +92,13 @@ module.exports = class Sandman extends EventEmitter {
 
         if (typeof value === 'function') {
           return (...args) => {
+            const result = new Promise((resolve) => { resolve(value.apply(this, args)); });
+
+            if (self.#cliCounter > 0) return result;
+
             self.#cliCounter++;
             self.#readline.pause();
-            const result = value.apply(this, args);
-            Promise.resolve(result).catch(() => null).finally(() => setImmediate(() => {
+            result.catch(() => null).finally(() => setImmediate(() => {
               if (--self.#cliCounter === 0) self.prompt();
             }));
             return result;

package/src/UtilService.js

@@ -3,6 +3,7 @@ exports.parseArgs = (line) => {
   const args = [];
   let match;
 
+  // eslint-disable-next-line no-cond-assign
   while ((match = regex.exec(line)) !== null) {
     if (match[1] !== undefined) {
       args.push(match[1]); // double-quoted