@coderich/sandman 0.0.3 → 0.0.5

package/index.js

@@ -1 +1,5 @@
-module.exports = require('./src/app');
+const Sandman = require('./src/Sandman');
+
+module.exports = (configDir) => {
+  return new Sandman(configDir);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "main": "index.js",
   "publishConfig": {
     "access": "public"
@@ -18,6 +18,7 @@
     "@coderich/config": "2.2.4",
     "@coderich/util": "2.1.3",
     "chokidar": "4.0.3",
+    "lodash.clonedeep": "4.5.0",
     "lodash.merge": "4.6.2"
   },
   "devDependencies": {

package/src/ConfigClient.js

@@ -1,25 +1,30 @@
-const FS = require('fs');
-const Path = require('path');
+// const FS = require('fs');
+// const Path = require('path');
+const cloneDeep = require('lodash.clonedeep');
 const Config = require('@coderich/config');
 
 module.exports = class ConfigClient extends Config {
-  mergeConfigDir(dir) {
-    const ignored = (parsed) => {
-      if (parsed.name.startsWith('.')) return true;
-      const stat = FS.statSync(Path.join(parsed.dir, `${parsed.name}${parsed.ext}`));
-      if (stat?.isDirectory()) return false;
-      return !['.yml', '.yaml'].includes(parsed.ext.toLowerCase());
-    };
+  get(...args) {
+    return cloneDeep(super.get(...args));
+  }
 
-    const arr = Config.dirPaths(dir, ignored);
+  // mergeConfigDir(dir) {
+  //   const ignored = (parsed) => {
+  //     if (parsed.name.startsWith('.')) return true;
+  //     const stat = FS.statSync(Path.join(parsed.dir, `${parsed.name}${parsed.ext}`));
+  //     if (stat?.isDirectory()) return false;
+  //     return !['.yml', '.yaml'].includes(parsed.ext.toLowerCase());
+  //   };
 
-    const yaml = arr.reduce((prev, { paths, data }) => {
-      const path = paths.join('.');
-      if (!path.length) return prev.concat(data);
-      const indented = data.split('\n').map(line => (line.trim() ? `  ${line}` : line)).join('\n');
-      return prev.concat(`${path}:\n${indented}`);
-    }, '');
+  //   const arr = Config.dirPaths(dir, ignored);
 
-    return this.merge(Config.parseYaml(yaml));
-  }
+  //   const yaml = arr.reduce((prev, { paths, data }) => {
+  //     const path = paths.join('.');
+  //     if (!path.length) return prev.concat(data);
+  //     const indented = data.split('\n').map(line => (line.trim() ? `  ${line}` : line)).join('\n');
+  //     return prev.concat(`${path}:\n${indented}`);
+  //   }, '');
+
+  //   return this.merge(Config.parseYaml(yaml));
+  // }
 };

package/src/FetchService.js

@@ -1,52 +1,49 @@
 const Merge = require('lodash.merge');
 
-exports.fetch = (req) => {
-  return new Promise((resolve, reject) => {
-    const { url, ...params } = exports.normalizeRequest({ ...req });
-
-    fetch(url, params).then(async (res) => {
-      const ct = res.headers.get('content-type') || '';
-      const data = await (ct.includes('application/json') ? res.json() : res.text());
-      return { res, data };
-    }).then(resolve).catch(reject);
+function shq(s) { return `'${String(s).replace(/'/g, `'"'"'`)}'`; }
+
+exports.fetch = (request) => {
+  return fetch(request).then(async (response) => {
+    const ct = response.headers.get('content-type') || '';
+    const data = await (ct.includes('application/json') ? response.json() : response.text());
+    return { response, data };
   });
 };
 
 exports.normalizeRequest = (req) => {
-  req.path ??= '';
-  req.method ??= 'get'; req.headers ??= {}; req.params ??= {};
-  req.url += req.path;
-  req.url = Object.entries(req.params).reduce((url, [key, value]) => { url.searchParams.append(key, value); return url; }, new URL(req.url)).toString();
+  req.path ??= ''; req.method ??= 'get'; req.headers ??= {}; req.params ??= {};
+  req.url = Object.entries(req.params).reduce((url, [key, value]) => { url.searchParams.append(key, value); return url; }, new URL(`${req.url}${req.path}`)).toString();
   req.headers = Object.entries(req.headers).reduce((prev, [key, value]) => Object.assign(prev, { [key.toLowerCase()]: value }), {});
   const [contentType] = req.headers['content-type']?.split(';') || [];
-  const { data } = req; delete req.data;
-  if (data == null) return req;
 
-  switch (contentType) {
-    case 'application/json': {
-      req.body = JSON.stringify(data);
-      break;
-    }
-    case 'application/x-www-form-urlencoded': {
-      req.body = new URLSearchParams(data).toString();
-      break;
-    }
-    case 'multipart/form-data': {
-      delete req.headers['content-type'];
-      // req.duplex = 'half';
-      req.body = Object.entries(data).reduce((form, [key, value]) => {
-        form.append(key, value);
-        return form;
-      }, new FormData());
-      break;
-    }
-    default: {
-      req.body = data;
-      break;
+  if (req.data) {
+    switch (contentType) {
+      case 'application/json': {
+        req.body = JSON.stringify(req.data);
+        break;
+      }
+      case 'application/x-www-form-urlencoded': {
+        req.body = new URLSearchParams(req.data).toString();
+        break;
+      }
+      case 'multipart/form-data': {
+        delete req.headers['content-type'];
+        req.body = Object.entries(req.data).reduce((form, [key, value]) => {
+          form.append(key, value);
+          return form;
+        }, new FormData());
+        break;
+      }
+      default: {
+        req.body = req.data;
+        break;
+      }
     }
   }
 
-  return req;
+  delete req.data; delete req.params;
+  const { url, ...params } = req;
+  return new Request(url, params);
 };
 
 exports.decorateRequest = (mergeData, key, request) => {
@@ -57,3 +54,48 @@ exports.decorateRequest = (mergeData, key, request) => {
 
   return Merge({}, toMerge, request);
 };
+
+exports.toCURL = (request, { pretty = true, redactAuth = false } = {}) => {
+  if (!request) return '<no request>';
+
+  const { url, path, method, headers, params, data } = request;
+
+  const base = new URL(url);
+  const full = new URL(path || '', base);
+
+  // append query params
+  for (const [k, v] of Object.entries(params || {})) {
+    if (v == null) continue;
+    Array.isArray(v) ? v.forEach(x => full.searchParams.append(k, String(x))) : full.searchParams.append(k, String(v));
+  }
+
+  const parts = ['curl', '-sS'];
+  if (method) parts.push('-X', method.toUpperCase());
+
+  // headers
+  const hdrs = { ...headers };
+  for (const k of Object.keys(hdrs)) {
+    if (redactAuth && /^authorization$/i.test(k)) {
+      hdrs[k] = hdrs[k].replace(/(?<=^.{6}).+/, '***REDACTED***');
+    }
+    parts.push('-H', shq(`${k}: ${hdrs[k]}`));
+  }
+
+  // body (skip for GET)
+  if (data != null && !/^GET$/i.test(method)) {
+    if (typeof data === 'string') {
+      parts.push('--data-raw', shq(data));
+    } else if (data instanceof URLSearchParams) {
+      parts.push('-H', shq('Content-Type: application/x-www-form-urlencoded'));
+      parts.push('--data', shq(data.toString()));
+    } else if (typeof data === 'object') {
+      // JSON by default
+      const hasCT = Object.keys(hdrs).some(h => /^content-type$/i.test(h));
+      if (!hasCT) parts.push('-H', shq('Content-Type: application/json'));
+      parts.push('--data-raw', shq(JSON.stringify(data)));
+    }
+  }
+
+  parts.push(shq(full.toString()));
+  return pretty ? parts.join(' \\\n  ') : parts.join(' ');
+};

package/src/Sandman.js

@@ -10,8 +10,8 @@ const ConfigClient = require('./ConfigClient');
 const resolveSymbol = Symbol('resolve');
 
 module.exports = class Sandman extends EventEmitter {
-  #configClient; #configDir; #options; #watcher; #readline; #mergeData = {}; #cli;
-  #captureCandidates = false; #candidates = []; #tabCounter = 0; #candidateIndex = 0; #line; #lastToken;
+  #configClient; #configDir; #options; #watcher; #readline; #mergeData = {}; #cli; #cliCounter = 0;
+  #captureCandidates = false; #candidates = []; #tabCounter = 0; #candidateIndex; #line; #lastToken;
 
   constructor(configDir, options) {
     super();
@@ -37,7 +37,6 @@ module.exports = class Sandman extends EventEmitter {
       resolve: {
         value: (...args) => {
           this.#configClient.resolve(...args);
-          this.#prompt();
           return this.#cli;
         },
         configurable: true,
@@ -48,22 +47,24 @@ module.exports = class Sandman extends EventEmitter {
   #run(key) {
     const api = this.#get(key, {});
     if (!api?.request) return this.emit('error', { key, error: `Request "${key}" Not Found` });
-    this.emit('request', { key, api });
+    this.emit('api', { api, key });
+    const request = FetchService.normalizeRequest(api.request);
+    this.emit('request', { request, api, key });
 
-    return FetchService.fetch(api.request).then(({ res, data }) => {
-      this.emit('response', { key, api, res, data });
-      return { key, api, res, data };
+    return FetchService.fetch(request).then(({ response, data }) => {
+      this.emit('response', { response, api, key, data });
+      return { response, api, key, data };
     }).catch((error) => {
       this.emit('error', { key, api, error });
       return Promise.reject(error);
     }).then((results) => {
-      return results.res.ok ? results : Promise.reject(results);
+      return results.response.ok ? results : Promise.reject(results);
     });
   }
 
   #prompt() {
     this.#readline.setPrompt(this.#configClient.get('prompt'));
-    this.#readline.prompt();
+    this.#readline.prompt(true);
     return this;
   }
 
@@ -89,6 +90,7 @@ module.exports = class Sandman extends EventEmitter {
       get: (...args) => this.#get(...args),
       set: (key = '', value = null) => this.#configClient.set(key, value),
       del: (key = '') => this.#configClient.del(key),
+      curl: key => FetchService.toCURL(this.#get(key, {}).request),
       quit: () => process.exit(),
     }, {
       get(obj, prop, receiver) {
@@ -96,8 +98,12 @@ module.exports = class Sandman extends EventEmitter {
 
         if (typeof value === 'function') {
           return (...args) => {
-            const result = value(...args);
-            setImmediate(() => self.#prompt());
+            self.#cliCounter++;
+            self.#readline.pause();
+            const result = value.apply(this, args);
+            Promise.resolve(result).catch(() => null).finally(() => setImmediate(() => {
+              if (--self.#cliCounter === 0) self.#prompt();
+            }));
             return result;
           };
         }
@@ -154,7 +160,8 @@ module.exports = class Sandman extends EventEmitter {
         });
 
         const candidates = Array.from(new Set(startsWithCandidates.concat(requestKeyCandidates)));
-        if (this.#captureCandidates) { this.#candidates = candidates; this.#line = line; this.#lastToken = lastToken; }
+        if (this.#captureCandidates) { this.#candidates = candidates; this.#line = line; this.#lastToken = lastToken; this.#candidateIndex = -1; }
+        if (candidates.length === 1 && candidates[0] === lastToken) return [[], lastToken];
         return [candidates, lastToken];
       },
     });
@@ -169,14 +176,8 @@ module.exports = class Sandman extends EventEmitter {
         Readline.clearLine(process.stdout, 0);
         this.#readline.prompt();
       } else if (this.#tabCounter > 2 && this.#candidates.length) {
-        let value = this.#candidates.at(this.#candidateIndex++);
-
-        if (!value) {
-          this.#candidateIndex = 0;
-          value = this.#candidates.at(this.#candidateIndex++);
-        }
-
-        value = this.#line.replace(this.#lastToken, value);
+        const candidate = this.#candidates[this.#candidateIndex = ++this.#candidateIndex % this.#candidates.length];
+        const value = this.#line.replace(this.#lastToken, candidate);
         this.#readline.line = value;
         this.#readline.cursor = value.length;
         this.#readline.prompt(true);

package/src/app.js

@@ -1,5 +0,0 @@
-const Sandman = require('./Sandman');
-
-module.exports = (configDir) => {
-  return new Sandman(configDir);
-};