npm - @aimeloic/monkey-tester - Versions diffs - 3.0.4 → 3.0.6 - Mend

@aimeloic/monkey-tester 3.0.4 → 3.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/htmlTemplate.js CHANGED Viewed

@@ -8,7 +8,7 @@ function getHtmlTemplate(endpoints) {
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>Monkey Tester — API Sandbox</title>
+<title>Monkey Tester &mdash; API Sandbox</title>
 <link href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;700&family=DM+Mono:wght@400;500&family=DM+Sans:wght@300;400;500&display=swap" rel="stylesheet">
 <style>
   :root {
@@ -153,7 +153,7 @@ function getHtmlTemplate(endpoints) {
 <div id="__monkey_data__" data-payload="${safeJsonString}" style="display:none;"></div>
 <header>
-  <div class="logo">🐒 Monkey Tester <span>API Sandbox</span></div>
+  <div class="logo">&#x1F412; Monkey Tester <span>API Sandbox</span></div>
   <div class="header-right">
     <div class="base-url-wrap">
       <label>TARGET HOST</label>
@@ -174,7 +174,7 @@ function getHtmlTemplate(endpoints) {
   <div class="response-panel">
     <div class="response-header">
       <span class="response-header-title">Response</span>
-      <span id="status-badge" class="status-badge status-idle">—</span>
+      <span id="status-badge" class="status-badge status-idle">&mdash;</span>
     </div>
     <div class="response-body empty" id="response-body">Execute a request to see the response</div>
   </div>
@@ -265,7 +265,7 @@ function getHtmlTemplate(endpoints) {
   function showEmptyState() {
     document.getElementById('main-panel').innerHTML =
-      '<div class="empty-state"><div class="monkey">🐒</div>' +
+      '<div class="empty-state"><div class="monkey">&#x1F412;</div>' +
       '<h2>No endpoints found</h2>' +
       '<p>Make sure <code>app.use(endtesterExpress())</code> is added after your routes.</p></div>';
   }
@@ -278,7 +278,7 @@ function getHtmlTemplate(endpoints) {
       for (var i = 0; i < ep.params.length; i++) {
         var p = ep.params[i];
         var val = (document.getElementById('param-' + p.name) || {}).value || '';
-        if (!val.trim()) { showToast('⚠ Path param "' + p.label + '" is required'); return; }
+        if (!val.trim()) { showToast('[!] Path param "' + p.label + '" is required'); return; }
         path = path.replace(':' + p.name, encodeURIComponent(val.trim()));
       }
     }
@@ -293,18 +293,18 @@ function getHtmlTemplate(endpoints) {
     if (['POST', 'PUT', 'PATCH'].includes(ep.method) && ep.fields && ep.fields.length) {
       var payload = {};
       var hasData = false;
       ep.fields.forEach(function(f) {
         var el = document.getElementById('field-' + f.name);
         if (!el) return;
         var v = el.value.trim();
         if (v === '') return;
         if (f.type === 'number') v = Number(v);
         payload[f.name] = v;
         hasData = true;
       });
       if (hasData) body = JSON.stringify(payload);
     }
@@ -329,14 +329,14 @@ function getHtmlTemplate(endpoints) {
     if (state === 'loading') {
       badge.className = 'status-badge status-idle';
-      badge.textContent = '…';
+      badge.textContent = '...';
       body.className = 'response-body empty';
-      body.textContent = 'Sending…';
+      body.textContent = 'Sending...';
       return;
     }
     badge.className = 'status-badge ' + (state === 'ok' ? 'status-ok' : 'status-err');
-    badge.textContent = status + ' · ' + ms + 'ms';
+    badge.textContent = status + ' \u00b7 ' + ms + 'ms';
     body.className = 'response-body';
     var str = typeof data === 'string' ? data : JSON.stringify(data, null, 2);
     body.innerHTML = '<pre class="json-render-block">' + highlight(str) + '</pre>';
@@ -344,7 +344,7 @@ function getHtmlTemplate(endpoints) {
   function clearResponse() {
     document.getElementById('status-badge').className = 'status-badge status-idle';
-    document.getElementById('status-badge').textContent = '—';
+    document.getElementById('status-badge').textContent = '\u2014';
     var body = document.getElementById('response-body');
     body.className = 'response-body empty';
     body.textContent = 'Execute a request to see the response';

package/monkey.js CHANGED Viewed

@@ -85,20 +85,27 @@ function fallbackFields(path) {
 // ─── Extract router prefix safely from Express layer ─────────────────────────
 function extractRouterPrefix(layer) {
+  // Prefer explicit path if available
+  if (layer.path && typeof layer.path === 'string') {
+    return layer.path === '/' ? '' : layer.path;
+  }
   if (!layer.regexp) return '';
-  if (layer.path) return layer.path; // If explicit paths exist
-  let src = layer.regexp.source;
-  // Strip out boilerplate generated patterns from default express mounting structures
-  src = src
-    .replace('^\\/', '/')
-    .replace('\\/?(?=\\/|$)', '')
-    .replace('(?:\\/(?=$))?(?=\\/|$)', '')
-    .replace('\\/', '/');
-  const cleanPath = src.split('(?')[0].replace(/\\/g, '');
-  return cleanPath === '/' ? '' : cleanPath;
+  // Convert the regexp back to a path prefix by looking at the regexp source
+  // Express generates regexps like: /^\/api\/v1\/?(?=\/|$)/i
+  const src = layer.regexp.source;
+  // Extract the literal path segment before any optional/lookahead parts
+  // Match from start: ^\/ then literal segments
+  const match = src.match(/^\^((?:\\\/[^\\(?[*+{}|$^]+)+)/);
+  if (!match) return '';
+  // Unescape the extracted path
+  const raw = match[1].replace(/\\\//g, '/');
+  // Remove trailing slash if present
+  return raw.replace(/\/$/, '') || '';
 }
 // ─── Walk the Express router stack recursively ────────────────────────────────
@@ -114,6 +121,7 @@ function parseStack(stack, detectedEndpoints, prefix = '') {
       const fullPath = (prefix + rawPath).replace(/\/+/g, '/') || '/';
+      // Skip the tester route itself
       if (fullPath.startsWith('/api/tester')) continue;
       const methods = Object.keys(layer.route.methods || {});
@@ -122,7 +130,7 @@ function parseStack(stack, detectedEndpoints, prefix = '') {
         const httpMethod = method.toUpperCase();
         const key = `${httpMethod}::${fullPath}`;
-        // ── Path params (:id, :slug …) safely parsed using matchAll ─────────
+        // ── Path params (:id, :slug …) ────────────────────────────────────
         const pathParams = [];
         const paramRe = /:([a-zA-Z_$][a-zA-Z0-9_$]*)/g;
         const matches = [...fullPath.matchAll(paramRe)];
@@ -135,13 +143,14 @@ function parseStack(stack, detectedEndpoints, prefix = '') {
           });
         }
-        // ── Body fields ────────────────────────────────────────────────────
+        // ── Body fields ──────────────────────────────────────────────────
         let bodyFields = [];
         if (['POST', 'PUT', 'PATCH'].includes(httpMethod)) {
           const handlers = (layer.route.stack || []).map(sl => sl.handle).filter(Boolean);
           for (const handler of handlers) {
             bodyFields.push(...extractBodyFields(handler));
           }
+          // Deduplicate
           const seen = new Map();
           bodyFields = bodyFields.filter(f => {
             if (seen.has(f.name)) return false;
@@ -165,7 +174,7 @@ function parseStack(stack, detectedEndpoints, prefix = '') {
     }
     // ── Nested router (app.use('/prefix', router)) ───────────────────────────
-    else if (layer.name === 'router' && layer.handle && layer.handle.stack) {
+    else if (layer.handle && typeof layer.handle === 'function' && layer.handle.stack) {
       const routerPrefix = extractRouterPrefix(layer);
       parseStack(layer.handle.stack, detectedEndpoints, prefix + routerPrefix);
     }
@@ -173,19 +182,19 @@ function parseStack(stack, detectedEndpoints, prefix = '') {
 }
 // ─── Middleware ───────────────────────────────────────────────────────────────
-// ─── Middleware in monkey.js ──────────────────────────────────────────────────
 function endtesterExpress() {
   return function monkeyTesterMiddleware(req, res, next) {
-    // Standard structural path cleaning
-    const normalPath = req.path.replace(/\/$/, ''); // removes trailing slash
-    if (normalPath !== '/api/tester') {
+    // Normalize path: strip trailing slash, handle both req.path and req.url
+    const rawPath = (req.path || req.url || '').split('?')[0].replace(/\/+$/, '');
+    if (rawPath !== '/api/tester') {
       return next();
     }
     const app = req.app;
-    // CRITICAL FIX: Reset the detected endpoints on each call to prevent stale empty states
+    // Wait a tick to ensure all routes are registered before scanning
+    // (handles edge cases where middleware is mounted before some routes)
     const detectedEndpoints = {};
     const rootStack =
@@ -193,12 +202,10 @@ function endtesterExpress() {
       (app.router  && app.router.stack)  ||   // Express 5
       [];
-    // Scan the live compiled routing stack
     parseStack(rootStack, detectedEndpoints);
-    // Render page template
     const html = getHtmlTemplate(detectedEndpoints);
-    res.setHeader('Content-Type', 'text/html');
+    res.setHeader('Content-Type', 'text/html; charset=utf-8');
     return res.send(html);
   };
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@aimeloic/monkey-tester",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Auto route scanning visual runner dashboard.",
   "main": "index.js",
   "type": "module",