mbkauthe 4.7.2 → 4.8.0

package/lib/utils/dbQueryLogger.js

@@ -1,103 +1,230 @@
-import path from "path";
+import path from "path";
 import { AsyncLocalStorage } from "async_hooks";
 
 const isDev = process.env.env === "dev" && process.env.dbLogs === "true";
 const requestContext = isDev ? new AsyncLocalStorage() : null;
 
-export const runWithRequestContext = (req, fn) => {
-  if (!isDev || !requestContext) return fn();
-  return requestContext.run({ req }, fn);
+const GLOBAL_MAX_QUERY_LOG_ENTRIES = 1000;
+const globalQueryState = {
+  totalCount: 0,
+  log: [],
 };
+let autoPoolId = 0;
 
-export const getRequestContext = () => {
-  if (!isDev || !requestContext) return undefined;
-  return requestContext.getStore();
-};
+const safeValue = (value, depth = 0, seen = new WeakSet()) => {
+  if (value == null) return value;
+  if (typeof value === "string") {
+    return value.length > 300 ? `${value.slice(0, 300)}...` : value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") return value;
+  if (typeof value === "bigint") return value.toString();
+  if (value instanceof Date) return value.toISOString();
+  if (Buffer.isBuffer(value)) return `[buffer:${value.length}]`;
+
+  if (Array.isArray(value)) {
+    if (depth >= 4) return `[array:${value.length}]`;
+    const sample = value.slice(0, 8).map((v) => safeValue(v, depth + 1, seen));
+    if (value.length > 8) sample.push(`...(${value.length - 8} more)`);
+    return sample;
+  }
 
-export const attachDevQueryLogger = (pool) => {
-  if (!isDev || !pool || pool.__mbkQueryLoggerInstalled) {
-    return;
+  if (typeof value === "object") {
+    if (seen.has(value)) return "[circular]";
+    seen.add(value);
+
+    const keys = Object.keys(value);
+    if (depth >= 4) {
+      const head = keys.slice(0, 5).join(", ");
+      return keys.length > 5 ? `[object:${head}, ...]` : `[object:${head}]`;
+    }
+
+    const out = {};
+    const entries = Object.entries(value).slice(0, 20);
+    for (const [k, v] of entries) {
+      out[k] = safeValue(v, depth + 1, seen);
+    }
+    if (keys.length > 20) {
+      out.__truncated = `${keys.length - 20} more keys`;
+    }
+
+    seen.delete(value);
+    return out;
   }
 
-  pool.__mbkQueryLoggerInstalled = true;
+  return String(value);
+};
 
-  // Simple counter for all DB requests made via this pool. This is intentionally lightweight.
-  let dbQueryCount = 0;
-  const dbQueryLog = [];
-  const MAX_QUERY_LOG_ENTRIES = 1000;
+const toWorkspacePath = (filePath) => {
+  const rel = path.relative(process.cwd(), filePath) || filePath;
+  return rel.replace(/\\/g, "/");
+};
 
-  const originalQuery = pool.query.bind(pool);
+const buildCallsite = () => {
+  try {
+    const stack = new Error().stack || "";
+    const lines = stack.split("\n").map((l) => l.trim());
+    const frame = lines.find(
+      (line) =>
+        line.startsWith("at ") &&
+        !line.includes("/lib/utils/dbQueryLogger.js") &&
+        !line.includes("node:internal") &&
+        !line.includes("internal/process")
+    );
+
+    if (!frame) return null;
+
+    const withFunc = /^at\s+([^\s(]+)\s+\((.+):([0-9]+):([0-9]+)\)$/.exec(frame);
+    const noFunc = /^at\s+(.+):([0-9]+):([0-9]+)$/.exec(frame);
 
-  const safeValue = (value, depth = 0, seen = new WeakSet()) => {
-    if (value == null) return value;
-    if (typeof value === "string") {
-      return value.length > 300 ? `${value.slice(0, 300)}...` : value;
+    if (withFunc) {
+      return {
+        function: withFunc[1],
+        file: toWorkspacePath(withFunc[2]),
+        line: Number(withFunc[3]),
+        column: Number(withFunc[4]),
+      };
     }
-    if (typeof value === "number" || typeof value === "boolean") return value;
-    if (typeof value === "bigint") return value.toString();
-    if (value instanceof Date) return value.toISOString();
-    if (Buffer.isBuffer(value)) return `[buffer:${value.length}]`;
-
-    if (Array.isArray(value)) {
-      if (depth >= 4) return `[array:${value.length}]`;
-      const sample = value.slice(0, 8).map((v) => safeValue(v, depth + 1, seen));
-      if (value.length > 8) sample.push(`...(${value.length - 8} more)`);
-      return sample;
+
+    if (noFunc) {
+      return {
+        function: null,
+        file: toWorkspacePath(noFunc[1]),
+        line: Number(noFunc[2]),
+        column: Number(noFunc[3]),
+      };
     }
+  } catch {
+    return null;
+  }
 
-    if (typeof value === "object") {
-      if (seen.has(value)) return "[circular]";
-      seen.add(value);
+  return null;
+};
 
-      const keys = Object.keys(value);
-      if (depth >= 4) {
-        const head = keys.slice(0, 5).join(", ");
-        return keys.length > 5 ? `[object:${head}, ...]` : `[object:${head}]`;
-      }
+const buildRequestContext = () => {
+  const store = getRequestContext();
+  const req = store?.req;
+  if (!req) return null;
+
+  const user = req.session?.user || null;
+  return {
+    method: req.method,
+    url: req.originalUrl || req.url,
+    ip: req.ip,
+    userId: user?.id || null,
+    username: user?.username || null,
+  };
+};
 
-      const out = {};
-      const entries = Object.entries(value).slice(0, 20);
-      for (const [k, v] of entries) {
-        out[k] = safeValue(v, depth + 1, seen);
-      }
-      if (keys.length > 20) {
-        out.__truncated = `${keys.length - 20} more keys`;
-      }
+const buildReturnValue = (result) => {
+  if (!result || typeof result !== "object") return undefined;
 
-      seen.delete(value);
-      return out;
+  const returnValue = {
+    command: result.command || undefined,
+    rowCount: typeof result.rowCount === "number" ? result.rowCount : undefined,
+  };
+
+  if (Array.isArray(result.rows)) {
+    const previewSize = 3;
+    returnValue.returnedRows = result.rows.length;
+    returnValue.rowsPreview = result.rows.slice(0, previewSize).map((row) => safeValue(row));
+    if (result.rows.length > previewSize) {
+      returnValue.rowsTruncated = true;
     }
+  }
 
-    return String(value);
-  };
+  return returnValue;
+};
 
-  const buildReturnValue = (result) => {
-    if (!result || typeof result !== "object") return undefined;
+const recordGlobalLog = (entry) => {
+  globalQueryState.totalCount += 1;
+  globalQueryState.log.push(entry);
+  if (globalQueryState.log.length > GLOBAL_MAX_QUERY_LOG_ENTRIES) {
+    globalQueryState.log.shift();
+  }
+};
 
-    const returnValue = {
-      command: result.command || undefined,
-      rowCount: typeof result.rowCount === "number" ? result.rowCount : undefined,
-    };
+export const getQueryCount = () => globalQueryState.totalCount;
+export const getQueryLog = (options = {}) => {
+  const { limit } = options;
+  if (typeof limit === "number") {
+    return globalQueryState.log.slice(-limit);
+  }
+  return [...globalQueryState.log];
+};
 
-    if (Array.isArray(result.rows)) {
-      const previewSize = 3;
-      returnValue.returnedRows = result.rows.length;
-      returnValue.rowsPreview = result.rows.slice(0, previewSize).map((row) => safeValue(row));
-      if (result.rows.length > previewSize) {
-        returnValue.rowsTruncated = true;
-      }
+export const resetQueryCount = () => {
+  globalQueryState.totalCount = 0;
+};
+
+export const resetQueryLog = () => {
+  globalQueryState.log.length = 0;
+};
+
+export const runWithRequestContext = (req, fn) => {
+  if (!isDev || !requestContext) return fn();
+  return requestContext.run({ req }, fn);
+};
+
+export const getRequestContext = () => {
+  if (!isDev || !requestContext) return undefined;
+  return requestContext.getStore();
+};
+
+const resolveLoggerPool = (item) => {
+  if (item && typeof item === 'object') {
+    if (item.pool && item.pool.query) {
+      return { pool: item.pool, name: item.name || item.pool.__mbkQueryLoggerName || item.pool.name };
+    }
+    if (item.query) {
+      // Don't force 'default' here; let getPoolName assign a non-default auto name.
+      return { pool: item, name: item.__mbkQueryLoggerName || item.name || item.options?.application_name || null };
+    }
+  }
+  return null;
+};
+
+const getPoolName = (pool, fallbackName) => {
+  if (fallbackName) return fallbackName;
+  if (pool.__mbkQueryLoggerName) return pool.__mbkQueryLoggerName;
+  if (pool.name) return pool.name;
+  if (pool.options && pool.options.application_name) return pool.options.application_name;
+  // never return "default"; always provide an actual pool name
+  autoPoolId += 1;
+  return `pool-${autoPoolId}`;
+};
+
+const attachSinglePool = (pool, poolName = null) => {
+  if (!pool) return;
+
+  if (pool.__mbkQueryLoggerInstalled) {
+    // Allow late explicit naming to override a previous auto name.
+    if (poolName && pool.__mbkQueryLoggerName !== poolName) {
+      pool.__mbkQueryLoggerName = poolName;
     }
+    return;
+  }
+
+  pool.__mbkQueryLoggerInstalled = true;
+  pool.__mbkQueryLoggerName = getPoolName(pool, poolName);
+
+  let dbQueryCount = 0;
+  const dbQueryLog = [];
+  const originalQuery = pool.query.bind(pool);
 
-    return returnValue;
+  const recordPoolLog = (entry) => {
+    dbQueryCount += 1;
+    dbQueryLog.push(entry);
+    if (dbQueryLog.length > GLOBAL_MAX_QUERY_LOG_ENTRIES) {
+      dbQueryLog.shift();
+    }
+    recordGlobalLog(entry);
   };
 
   pool.query = (...args) => {
-    dbQueryCount++;
-
-    // `pg` supports (text, values, callback) or (config, callback).
     let queryText = "";
     let queryName = "";
     let queryValues;
+
     try {
       if (typeof args[0] === "string") {
         queryText = args[0];
@@ -116,66 +243,6 @@ export const attachDevQueryLogger = (pool) => {
     }
 
     const startTime = process.hrtime.bigint();
-    const toWorkspacePath = (filePath) => {
-      const rel = path.relative(process.cwd(), filePath) || filePath;
-      return rel.replace(/\\/g, "/");
-    };
-
-    const buildCallsite = () => {
-      try {
-        const stack = new Error().stack || "";
-        const lines = stack.split("\n").map((l) => l.trim());
-        const frame = lines.find(
-          (line) =>
-            line.startsWith("at ") &&
-            !line.includes("/lib/utils/dbQueryLogger.js") &&
-            !line.includes("node:internal") &&
-            !line.includes("internal/process")
-        );
-
-        if (!frame) return null;
-
-        const withFunc = /^at\s+([^\s(]+)\s+\((.+):([0-9]+):([0-9]+)\)$/.exec(frame);
-        const noFunc = /^at\s+(.+):([0-9]+):([0-9]+)$/.exec(frame);
-
-        if (withFunc) {
-          return {
-            function: withFunc[1],
-            file: toWorkspacePath(withFunc[2]),
-            line: Number(withFunc[3]),
-            column: Number(withFunc[4]),
-          };
-        }
-
-        if (noFunc) {
-          return {
-            function: null,
-            file: toWorkspacePath(noFunc[1]),
-            line: Number(noFunc[2]),
-            column: Number(noFunc[3]),
-          };
-        }
-      } catch {
-        return null;
-      }
-      return null;
-    };
-
-    const buildRequestContext = () => {
-      const store = getRequestContext();
-      const req = store?.req;
-      if (!req) return null;
-
-      const user = req.session?.user || null;
-      return {
-        method: req.method,
-        url: req.originalUrl || req.url,
-        ip: req.ip,
-        userId: user?.id || null,
-        username: user?.username || null,
-      };
-    };
-
     const callsiteSnapshot = buildCallsite();
 
     const recordLog = (success, error, result) => {
@@ -183,7 +250,7 @@ export const attachDevQueryLogger = (pool) => {
       const request = buildRequestContext();
       const returnValue = buildReturnValue(result);
 
-      dbQueryLog.push({
+      const entry = {
         time: new Date().toISOString(),
         query: queryText,
         name: queryName || undefined,
@@ -194,16 +261,15 @@ export const attachDevQueryLogger = (pool) => {
         returnValue,
         request,
         pool: {
+          name: pool.__mbkQueryLoggerName,
           total: pool.totalCount,
           idle: pool.idleCount,
           waiting: pool.waitingCount,
         },
         callsite: callsiteSnapshot,
-      });
+      };
 
-      if (dbQueryLog.length > MAX_QUERY_LOG_ENTRIES) {
-        dbQueryLog.shift();
-      }
+      recordPoolLog(entry);
     };
 
     try {
@@ -245,3 +311,14 @@ export const attachDevQueryLogger = (pool) => {
     dbQueryLog.length = 0;
   };
 };
+
+export const attachDevQueryLogger = (poolOrPools) => {
+  if (!isDev || !poolOrPools) return;
+
+  const inputs = Array.isArray(poolOrPools) ? poolOrPools : [poolOrPools];
+  for (const item of inputs) {
+    const resolved = resolveLoggerPool(item);
+    if (!resolved) continue;
+    attachSinglePool(resolved.pool, resolved.name);
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mbkauthe",
-  "version": "4.7.2",
+  "version": "4.8.0",
   "description": "MBKTech's reusable authentication system for Node.js applications.",
   "main": "index.js",
   "type": "module",

package/test.spec.js

@@ -107,10 +107,22 @@ describe('mbkauthe Routes', () => {
       const response = await request(BASE_URL).get('/mbkauthe/test');
       expect([200, 302, 401, 403, 429]).toContain(response.status);
     });
+
+    test('GET /mbkauthe/test with curl UA returns JSON 401', async () => {
+      const response = await request(BASE_URL)
+        .get('/mbkauthe/test')
+        .set('User-Agent', 'curl/8.0.1')
+        .set('Accept', '*/*');
+
+      expect(response.status).toBe(401);
+      expect(response.headers['content-type']).toContain('application/json');
+      expect(response.body).toHaveProperty('success', false);
+      expect(response.body).toHaveProperty('errorCode');
+    });
   });
 
   describe('OAuth Routes', () => {
-    test('GET /mbkauthe/api/github/login handles GitHub OAuth', async () => {
+    test('GET /mbkauthe/api/github/login handles GitHub App flow', async () => {
       const response = await request(BASE_URL)
         .get('/mbkauthe/api/github/login')
         .redirects(0);
@@ -123,7 +135,7 @@ describe('mbkauthe Routes', () => {
       }
     });
 
-    test('GET /mbkauthe/api/github/login/callback handles callback', async () => {
+    test('GET /mbkauthe/api/github/login/callback handles GitHub App callback', async () => {
       const response = await request(BASE_URL).get('/mbkauthe/api/github/login/callback');
       expect([200, 302, 400, 401, 403, 429]).toContain(response.status);
     });

package/views/pages/dbLogs.handlebars

@@ -183,6 +183,16 @@
     padding: 0.1rem 0.45rem;
   }
 
+  .log-pool {
+    font-size: 0.75rem;
+    color: var(--text-light);
+    border: 1px solid var(--muted-border);
+    border-radius: 999px;
+    padding: 0.1rem 0.45rem;
+    background: color-mix(in srgb, var(--accent) 12%, transparent 88%);
+    margin: 0 0.25rem;
+  }
+
   .log-time {
     color: var(--text-light);
     font-size: 0.8rem;
@@ -402,6 +412,10 @@
           <input id="limit" name="limit" type="number" min="1" max="500" value="{{queryLimit}}" {{#unless isDev}}disabled{{/unless}} />
           <button type="submit" {{#unless isDev}}disabled{{/unless}}>Update</button>
         </form>
+        <label for="pool-filter">Pool</label>
+        <select id="pool-filter" {{#unless isDev}}disabled{{/unless}}>
+          <option value="">All Pools</option>
+        </select>
         <button id="reset-btn" type="button" {{#unless isDev}}disabled{{/unless}}>Reset</button>
         <button id="copy-btn" type="button" {{#unless isDev}}disabled{{/unless}}>Copy Logs</button>
       </div>
@@ -420,6 +434,7 @@
 
   <script>
       const limitInput = document.getElementById('limit');
+      const poolFilterEl = document.getElementById('pool-filter');
       const queryCountEl = document.getElementById('query-count');
       const queryLimitEl = document.getElementById('query-limit');
       const queryLogEl = document.getElementById('query-log');
@@ -428,6 +443,7 @@
       const resetNoticeEl = document.getElementById('reset-notice');
       const isDev = {{#if isDev}}true{{else}}false{{/if}};
       let latestQueryLog = [];
+      let currentPoolFilter = '';
 
       const showDisabledState = (message = 'DB logs are disabled.') => {
         queryCountEl.textContent = '-';
@@ -443,6 +459,35 @@
         .replace(/\|/g, '\\|')
         .replace(/\r?\n/g, '<br>');
 
+      const getUniquePoolNames = (log) => {
+        if (!Array.isArray(log)) return [];
+        const names = new Set();
+        for (const entry of log) {
+          const rawPoolName = entry?.pool?.name || 'default';
+          if (rawPoolName && rawPoolName !== 'default') {
+            names.add(rawPoolName);
+          }
+        }
+        return [...names].sort();
+      };
+
+      const renderPoolFilterOptions = (names) => {
+        if (!poolFilterEl) return;
+        const selected = poolFilterEl.value || '';
+        poolFilterEl.innerHTML = '<option value="">All Pools</option>' +
+          names.map((name) => `\n            <option value="${escapeHtml(name)}"${name === selected ? ' selected' : ''}>${escapeHtml(name)}</option>`).join('');
+      };
+
+      const getFilteredLog = (log) => {
+        if (!Array.isArray(log) || !currentPoolFilter) return log;
+        return log.filter((entry) => (entry?.pool?.name || 'default') === currentPoolFilter);
+      };
+
+      poolFilterEl?.addEventListener('change', () => {
+        currentPoolFilter = poolFilterEl.value || '';
+        buildTable(getFilteredLog(latestQueryLog));
+      });
+
       const formatParamValues = (values, pretty = false) => {
         if (!Array.isArray(values) || values.length === 0) return '';
 
@@ -495,8 +540,10 @@
               `\nuser: ${entry.request.username || entry.request.userId || 'anonymous'}` +
               `\nip: ${entry.request.ip || ''}`
             : '';
-          const poolText = entry.pool
-            ? `total:${entry.pool.total} idle:${entry.pool.idle} waiting:${entry.pool.waiting}`
+          const rawPoolName = entry.pool?.name || 'default';
+          const poolName = rawPoolName === 'default' ? '' : rawPoolName;
+          const poolText = entry.pool && poolName
+            ? `name:${poolName} total:${entry.pool.total} idle:${entry.pool.idle} waiting:${entry.pool.waiting}`
             : '';
           const callsiteText = entry.callsite
             ? `${entry.callsite.function || '(anonymous)'}\n${entry.callsite.file}:${entry.callsite.line}:${entry.callsite.column}`
@@ -545,8 +592,10 @@
               `\nuser: ${entry.request.username || entry.request.userId || 'anonymous'}` +
               `\nip: ${entry.request.ip || ''}`
             : '';
-          const poolText = entry.pool
-            ? `total:${entry.pool.total} idle:${entry.pool.idle} waiting:${entry.pool.waiting}`
+          const rawPoolName = entry.pool?.name || 'default';
+          const poolName = rawPoolName === 'default' ? '' : rawPoolName;
+          const poolText = entry.pool && poolName
+            ? `name:${poolName} total:${entry.pool.total} idle:${entry.pool.idle} waiting:${entry.pool.waiting}`
             : '';
 
           const detailBlocks = [
@@ -563,6 +612,7 @@
                 <div class="log-mainline">
                   <span class="log-index">#${idx + 1}</span>
                   ${statusBadge}
+                  ${poolName ? `<span class="log-pool">${escapeHtml(poolName)}</span>` : ''}
                   <span class="log-time">${escapeHtml(entry.time)}</span>
                 </div>
                 <button class="copy-row-btn" data-copy='${escapeHtml(JSON.stringify(entry))}'>Copy</button>
@@ -625,7 +675,8 @@
 
         queryCountEl.textContent = data.queryCount ?? '-';
         latestQueryLog = Array.isArray(data.queryLog) ? data.queryLog : [];
-        buildTable(data.queryLog);
+        renderPoolFilterOptions(getUniquePoolNames(latestQueryLog));
+        buildTable(getFilteredLog(latestQueryLog));
       };
 
       resetBtn.addEventListener('click', () => {

package/views/pages/loginmbkauthe.handlebars

@@ -396,12 +396,12 @@
 
         {{#if githubLoginEnabled }}
 
-        // GitHub login: Navigate directly to GitHub OAuth flow
+        // GitHub login: Navigate directly to GitHub App flow
         async function startGithubLogin() {
             const urlParams = new URLSearchParams(window.location.search);
             const redirect = urlParams.get('redirect') || '{{customURL}}';
 
-            // Navigate directly to the backend GET endpoint with redirect query
+            // Navigate directly to the backend GitHub App endpoint with redirect query
             window.location.href = `/mbkauthe/api/github/login?redirect=${encodeURIComponent(redirect)}`;
         }