@coderich/sandman 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coderich/sandman",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "main": "index.js",
   "publishConfig": {
     "access": "public"

package/src/CURLService.js

@@ -0,0 +1,155 @@
+exports.shq = s => `'${String(s).replace(/'/g, "'\\''")}'`;
+
+exports.toCURL = function toCURL(request, { pretty = true, redactAuth = false } = {}) {
+  if (!request) return '<no request>';
+
+  const {
+    url,
+    path = '',
+    method: rawMethod = 'GET',
+    headers = undefined,
+    params = undefined,
+    data = undefined,
+  } = request;
+
+  // Build URL (require a base url; mirror original behavior)
+  const base = new URL(url);
+  const full = new URL(path || '', base);
+
+  // Append query params (supports object, Map, URLSearchParams, string)
+  if (params) {
+    const append = (k, v) => {
+      if (v == null) return;
+      if (Array.isArray(v) || v instanceof Set) {
+        for (const x of v) full.searchParams.append(k, String(x));
+      } else {
+        full.searchParams.append(k, String(v));
+      }
+    };
+
+    if (typeof params === 'string') {
+      for (const [k, v] of new URLSearchParams(params)) append(k, v);
+    } else if (params instanceof URLSearchParams) {
+      for (const [k, v] of params.entries()) append(k, v);
+    } else if (params instanceof Map) {
+      for (const [k, v] of params.entries()) append(k, v);
+    } else if (typeof params === 'object') {
+      for (const [k, v] of Object.entries(params)) append(k, v);
+    }
+  }
+
+  const method = String(rawMethod || 'GET').toUpperCase();
+  const parts = ['curl', '-sS'];
+
+  // Only add -X when not GET for cleaner output
+  if (method !== 'GET') parts.push('-X', method);
+
+  // Normalize headers input into flat [name, value] pairs
+  const collectHeaders = (hdrs) => {
+    const out = [];
+    if (!hdrs) return out;
+
+    const push = (k, v) => {
+      if (v == null) return;
+      if (Array.isArray(v)) {
+        for (const vv of v) if (vv != null) out.push([k, String(vv)]);
+      } else {
+        out.push([k, String(v)]);
+      }
+    };
+
+    if (typeof Headers !== 'undefined' && hdrs instanceof Headers) {
+      hdrs.forEach((v, k) => push(k, v));
+      return out;
+    }
+
+    if (hdrs instanceof Map) {
+      for (const [k, v] of hdrs.entries()) push(k, v);
+      return out;
+    }
+
+    if (Array.isArray(hdrs)) {
+      for (const item of hdrs) {
+        if (!item) 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);
+        }
+      }
+      return out;
+    }
+
+    if (typeof hdrs === 'object') {
+      for (const [k, v] of Object.entries(hdrs)) push(k, v);
+    }
+
+    return out;
+  };
+
+  const hdrPairs = collectHeaders(headers);
+  const seenHeaderNames = new Set(hdrPairs.map(([k]) => k.toLowerCase()));
+
+  const redactAuthValue = (val) => {
+    if (!redactAuth) return val;
+    const s = String(val);
+    // Preserve scheme if present (e.g., "Bearer") but redact the token
+    const m = s.match(/^(\S+)\s+(.+)$/);
+    return m ? `${m[1]} ***REDACTED***` : '***REDACTED***';
+  };
+
+  for (const [k, v] of hdrPairs) {
+    const isAuth = /^authorization$/i.test(k);
+    const value = isAuth ? redactAuthValue(v) : v;
+    parts.push('-H', exports.shq(`${k}: ${value}`));
+  }
+
+  // Body (skip for GET/HEAD)
+  const canHaveBody = method !== 'GET' && method !== 'HEAD';
+
+  const ensureHeader = (name, value) => {
+    const n = name.toLowerCase();
+    if (seenHeaderNames.has(n)) return;
+    seenHeaderNames.add(n);
+    parts.push('-H', exports.shq(`${name}: ${value}`));
+  };
+
+  if (canHaveBody && data != null) {
+    // FormData (Node 18+/WHATWG)
+    const hasGlobalFD = typeof FormData !== 'undefined';
+    const hasGlobalFile = typeof File !== 'undefined';
+    const isFormData = hasGlobalFD && (data instanceof FormData || (data && data[Symbol.toStringTag] === 'FormData'));
+
+    if (isFormData) {
+      // Use -F for each entry; if File, use @filename (best-effort)
+      // Note: this assumes filename points to a local file if provided.
+      for (const [name, val] of data.entries()) {
+        if (hasGlobalFile && val instanceof File) {
+          const fileName = val.name || 'file';
+          parts.push('--form', exports.shq(`${name}=@${fileName}`));
+        } else {
+          parts.push('--form', exports.shq(`${name}=${String(val)}`));
+        }
+      }
+    } else if (data instanceof URLSearchParams) {
+      ensureHeader('Content-Type', 'application/x-www-form-urlencoded');
+      parts.push('--data', exports.shq(data.toString()));
+    } else if (typeof data === 'string') {
+      parts.push('--data-raw', exports.shq(data));
+    } else if (typeof Blob !== 'undefined' && data instanceof Blob) {
+      // Best-effort for binary blobs
+      ensureHeader('Content-Type', data.type || 'application/octet-stream');
+      parts.push('--data-binary', exports.shq('[binary blob]'));
+    } else if (typeof ArrayBuffer !== 'undefined' && (data instanceof ArrayBuffer || ArrayBuffer.isView?.(data))) {
+      ensureHeader('Content-Type', 'application/octet-stream');
+      const len = data.byteLength ?? (data.buffer && data.buffer.byteLength) ?? 0;
+      parts.push('--data-binary', exports.shq(`[binary ${len} bytes]`));
+    } else if (typeof data === 'object') {
+      ensureHeader('Content-Type', 'application/json');
+      parts.push('--data-raw', exports.shq(JSON.stringify(data)));
+    }
+  }
+
+  parts.push(exports.shq(full.toString()));
+
+  return pretty ? parts.join(' \\\n  ') : parts.join(' ');
+};

package/src/FetchService.js

@@ -39,49 +39,3 @@ exports.normalizeRequest = (req) => {
   const { url, ...params } = req;
   return new Request(url, params);
 };
-
-exports.shq = s => `'${String(s).replace(/'/g, "'\\''")}'`;
-
-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', exports.shq(`${k}: ${hdrs[k]}`));
-  }
-
-  // body (skip for GET)
-  if (data != null && !/^GET$/i.test(method)) {
-    if (typeof data === 'string') {
-      parts.push('--data-raw', exports.shq(data));
-    } else if (data instanceof URLSearchParams) {
-      parts.push('-H', exports.shq('Content-Type: application/x-www-form-urlencoded'));
-      parts.push('--data', exports.shq(data.toString()));
-    } else if (typeof data === 'object') {
-      const hasCT = Object.keys(hdrs).some(h => /^content-type$/i.test(h));
-      if (!hasCT) parts.push('-H', exports.shq('Content-Type: application/json'));
-      parts.push('--data-raw', exports.shq(JSON.stringify(data)));
-    }
-  }
-
-  parts.push(exports.shq(full.toString()));
-  return pretty ? parts.join(' \\\n  ') : parts.join(' ');
-};

package/src/Sandman.js

@@ -3,6 +3,7 @@ const EventEmitter = require('events');
 const { spawn } = require('child_process');
 const ReadlineService = require('./ReadlineService');
 const UtilService = require('./UtilService');
+const CURLService = require('./CURLService');
 const FetchService = require('./FetchService');
 const ConfigClient = require('./ConfigClient');
 
@@ -39,18 +40,23 @@ module.exports = class Sandman extends EventEmitter {
     return this;
   }
 
-  #run(key) {
+  #run(key, opts = { emit: true }) {
     const api = this.#configClient.get(key, {});
-    if (!api?.request) return this.emit('error', { key, error: `Request "${key}" Not Found` });
-    this.emit('api', { api, key });
+
+    if (!api?.request) {
+      if (opts.emit) this.emit('error', { key, error: `Request "${key}" Not Found` });
+      return Promise.reject(new Error(`Request "${key}" Not Found`));
+    }
+
+    if (opts.emit) this.emit('api', { api, key });
     const request = FetchService.normalizeRequest(api.request);
-    this.emit('request', { request, api, key });
+    if (opts.emit) this.emit('request', { request, api, key });
 
     return FetchService.fetch(request).then(({ response, data }) => {
-      this.emit('response', { response, api, key, data });
+      if (opts.emit) this.emit('response', { response, api, key, data });
       return { response, api, key, data };
     }).catch((error) => {
-      this.emit('error', { key, api, error });
+      if (opts.emit) this.emit('error', { key, api, error });
       return Promise.reject(error);
     }).then((results) => {
       return results.response.ok ? results : Promise.reject(results);
@@ -72,7 +78,7 @@ module.exports = class Sandman extends EventEmitter {
         $: this.#configClient.raw(key),
         [key]: this.#configClient.get(key),
       }),
-      curl: key => FetchService.toCURL(this.#configClient.get(key, {}).request),
+      curl: key => CURLService.toCURL(this.#configClient.get(key, {}).request),
       quit: () => process.exit(),
     }, {
       get(obj, prop, receiver) {