azify-logger 1.0.54-test-1 → 1.0.54-test-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.54-test-1",
+  "version": "1.0.54-test-3",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",

package/register-http-client-early.js

@@ -28,13 +28,70 @@ try {
   const MAX_EARLY_LOG_QUEUE = 2000
   const earlyLogQueue = []
 
+  function normalizePathEarly(p) {
+    if (!p) return '/'
+    const trimmed = String(p).replace(/\/+$/, '')
+    return trimmed === '' ? '/' : trimmed
+  }
+
+  /** Ignora esquema (http vs https): undici muitas vezes resolve como https e AZIFY_LOGGER_URL é http em dev. */
   function isLoggerUrl(urlStr) {
-    const loggerUrl = process.env.AZIFY_LOGGER_URL
-    if (!loggerUrl || typeof urlStr !== 'string' || !urlStr.trim()) return false
-    const a = String(urlStr).trim().toLowerCase().replace(/\/+$/, '')
-    const b = String(loggerUrl).trim().toLowerCase().replace(/\/+$/, '')
-    if (!b) return false
-    return a === b || a.startsWith(b + '/')
+    const loggerUrlRaw = process.env.AZIFY_LOGGER_URL || 'http://localhost:3001/log'
+    if (typeof urlStr !== 'string' || !urlStr.trim()) return false
+    try {
+      const base = new URL(String(loggerUrlRaw).trim())
+      const cand = new URL(String(urlStr).trim())
+      if (base.hostname.toLowerCase() !== cand.hostname.toLowerCase()) return false
+      const portBase = base.port || (base.protocol === 'https:' ? '443' : '80')
+      const portCand = cand.port || (cand.protocol === 'https:' ? '443' : '80')
+      if (String(portBase) !== String(portCand)) return false
+      const lp = normalizePathEarly(base.pathname)
+      const tp = normalizePathEarly(cand.pathname)
+      return tp === lp || tp.startsWith(lp + '/')
+    } catch (_) {
+      return false
+    }
+  }
+
+  /** undici.request(url, opts) / request(opts) — muitas chamadas não trazem origin; path pode ser URL absoluta ou só path + hostname. */
+  function resolveUrlStrFromUndiciRequestArgs(url, options) {
+    const opts = (typeof url === 'object' && url !== null && !(url instanceof URL)) ? url : options
+    const urlArg = (typeof url === 'string' || (url && (url.href || url instanceof URL))) ? url : (opts && (opts.url || opts.uri))
+    if (typeof urlArg === 'string') return urlArg
+    if (urlArg && typeof urlArg.href === 'string') return urlArg.href
+    if (urlArg && typeof urlArg.toString === 'function') return urlArg.toString()
+    if (opts && typeof opts.origin === 'string' && opts.path != null) {
+      return opts.origin + (String(opts.path).startsWith('/') ? '' : '/') + String(opts.path)
+    }
+    if (opts && typeof opts.path === 'string' && /^https?:\/\//i.test(opts.path)) {
+      return opts.path
+    }
+    if (opts && (opts.hostname || opts.host)) {
+      const h = String(opts.hostname || String(opts.host || '').split(':')[0]).trim()
+      if (h) {
+        const hl = h.toLowerCase()
+        const isLocal = hl === 'localhost' || hl === '127.0.0.1' || hl === '::1'
+        const proto = (opts.protocol && String(opts.protocol).replace(/:$/, '')) || (isLocal ? 'http' : 'https')
+        const pnum = opts.port != null && opts.port !== '' ? Number(opts.port) : NaN
+        const port = !Number.isNaN(pnum) && pnum !== 80 && pnum !== 443 ? ':' + pnum : ''
+        const p = opts.path != null ? String(opts.path) : '/'
+        return proto + '://' + h + port + (p.startsWith('/') ? p : '/' + p)
+      }
+    }
+    return 'unknown'
+  }
+
+  function resolveUrlStrFromDispatcherOpts(opts) {
+    if (!opts || typeof opts !== 'object') return 'unknown'
+    const origin = (opts.origin) || ''
+    const pathPart = opts.path != null ? opts.path : '/'
+    const pathStr = String(pathPart)
+    if (/^https?:\/\//i.test(pathStr)) return pathStr
+    if (origin) return origin + (pathStr.startsWith('/') ? pathStr : '/' + pathStr)
+    if (opts.hostname || opts.host) {
+      return resolveUrlStrFromUndiciRequestArgs(null, opts)
+    }
+    return 'unknown'
   }
 
   function send(level, message, meta) {
@@ -118,12 +175,7 @@ try {
     exports.request = function (url, options, callback) {
       const opts = (typeof url === 'object' && url !== null && !(url instanceof URL)) ? url : options
       const method = ((opts && opts.method) || 'GET').toUpperCase()
-      let urlStr = 'unknown'
-      const urlArg = (typeof url === 'string' || (url && (url.href || url instanceof URL))) ? url : (opts && (opts.url || opts.uri))
-      if (typeof urlArg === 'string') urlStr = urlArg
-      else if (urlArg && typeof urlArg.href === 'string') urlStr = urlArg.href
-      else if (urlArg && typeof urlArg.toString === 'function') urlStr = urlArg.toString()
-      else if (opts && typeof opts.origin === 'string' && opts.path != null) urlStr = opts.origin + (String(opts.path).startsWith('/') ? '' : '/') + String(opts.path)
+      const urlStr = resolveUrlStrFromUndiciRequestArgs(url, options)
       if (process.env.AZIFY_LOGGER_DEBUG === '1') { try { process.stderr.write('[AZIFY-PATCH] undici.request ' + method + ' ' + urlStr.slice(0, 80) + '\n') } catch (_) {} }
       const _ep = process.env.AZIFY_DEBUG_LOG_PATH
       if (_ep) { try { require('fs').appendFileSync(_ep, new Date().toISOString() + ' [AZIFY] WRAPPER exports.request ' + method + ' ' + urlStr.slice(0, 100) + '\n') } catch (_) {} }
@@ -174,9 +226,7 @@ try {
       const origDisp = proto.request
       proto.request = function (opts, callback) {
         const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-        const origin = (opts && opts.origin) || ''
-        const path = (opts && opts.path) != null ? opts.path : '/'
-        const urlStr = origin ? (origin + (path.startsWith('/') ? path : '/' + path)) : 'unknown'
+        const urlStr = resolveUrlStrFromDispatcherOpts(opts)
         httpLog('WRAPPER Dispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 80))
         const ctx = getRequestContext() || getLastJobContext()
         const otelCtx = getOtelTraceContext()
@@ -255,9 +305,7 @@ try {
         if (typeof origReq !== 'function') return d
         d.request = function (opts, callback) {
           const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-          const origin = (opts && opts.origin) || ''
-          const pathPart = (opts && opts.path) != null ? opts.path : '/'
-          const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
+          const urlStr = resolveUrlStrFromDispatcherOpts(opts)
           httpLog('WRAPPER getGlobalDispatcher().request ' + methodStr + ' ' + urlStr.slice(0, 80))
           const ctx = getRequestContext ? getRequestContext() : (getLastJobContext ? getLastJobContext() : null)
           const otelCtx = getOtelTraceContext()
@@ -333,9 +381,7 @@ try {
       const HTTP_CLIENT_MODE = deps ? deps.HTTP_CLIENT_MODE : 'all'
       d.request = function (opts, callback) {
         const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-        const origin = (opts && opts.origin) || ''
-        const pathPart = (opts && opts.path) != null ? opts.path : '/'
-        const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
+        const urlStr = resolveUrlStrFromDispatcherOpts(opts)
         httpLog('WRAPPER globalThis.dispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 80))
         const _dp = process.env.AZIFY_DEBUG_LOG_PATH
         if (_dp) { try { require('fs').appendFileSync(_dp, new Date().toISOString() + ' [AZIFY] WRAPPER globalDispatcher.request ' + methodStr + ' ' + urlStr.slice(0, 100) + '\n') } catch (_) {} }
@@ -608,14 +654,12 @@ try {
             const RequestHandler = mod.exports.RequestHandler
             mod.exports = function wrappedApiRequest(opts, callback) {
               const methodStr = String((opts && opts.method) || 'GET').toUpperCase()
-              const urlPart = (opts && opts.origin) ? String(opts.origin).slice(0, 80) : (opts && opts.path) || ''
+              const urlStr = resolveUrlStrFromDispatcherOpts(opts)
+              const urlPart = urlStr !== 'unknown' ? urlStr.slice(0, 80) : ((opts && opts.origin) ? String(opts.origin).slice(0, 80) : (opts && opts.path) || '')
               if (HTTP_DEBUG) try { process.stderr.write('[AZIFY-PATCH] api-request ' + methodStr + ' ' + urlPart + '\n') } catch (_) {}
               if (HTTP_VERBOSE || HTTP_DEBUG) {
                 try { process.stderr.write('[AZIFY] HTTP wrapper api-request ' + methodStr + ' ' + urlPart + '\n') } catch (_) {}
               }
-              const origin = (opts && opts.origin) || ''
-              const pathPart = (opts && opts.path) != null ? opts.path : '/'
-              const urlStr = origin ? (origin + (pathPart.startsWith('/') ? pathPart : '/' + pathPart)) : 'unknown'
               httpLog('WRAPPER api-request ' + methodStr + ' ' + urlStr.slice(0, 80))
               const ctx = getRequestContext() || getLastJobContext()
               const otelCtx = getOtelTraceContext()

package/register.js

@@ -377,9 +377,16 @@ try {
 
     try {
       const target = new URL(candidate, normalizedLoggerOrigin)
-      const targetOrigin = `${target.protocol}//${target.host}`
+      if (loggerEndpoint.hostname.toLowerCase() !== target.hostname.toLowerCase()) {
+        return false
+      }
+      const portLogger = loggerEndpoint.port || (loggerEndpoint.protocol === 'https:' ? '443' : '80')
+      const portTarget = target.port || (target.protocol === 'https:' ? '443' : '80')
+      if (String(portLogger) !== String(portTarget)) {
+        return false
+      }
       const targetPath = normalizePath(target.pathname)
-      return targetOrigin === normalizedLoggerOrigin && targetPath === normalizedLoggerPath
+      return targetPath === normalizedLoggerPath || targetPath.startsWith(normalizedLoggerPath + '/')
     } catch (_) {
       if (typeof candidate === 'string') {
         const relativePath = normalizePath(candidate)