@aimeloic/monkey-tester 3.0.4 → 3.0.5

package/monkey.js

@@ -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

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