azify-logger 1.0.49 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azify-logger",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Azify Logger Client - Centralized logging for OpenSearch",
   "main": "index.js",
   "types": "index.d.ts",
@@ -50,7 +50,7 @@
     "@opentelemetry/sdk-trace-base": "1.25.0",
     "@opentelemetry/semantic-conventions": "1.25.0",
     "adm-zip": "^0.5.16",
-    "archiver": "^6.0.1",
+    "archiver": "^7.0.1",
     "axios": "^1.7.9",
     "bull": "^4.16.5",
     "cors": "^2.8.5",
@@ -60,8 +60,8 @@
     "fastify-plugin": "^5.0.0",
     "import-in-the-middle": "^3.0.0",
     "js-yaml": "^4.1.0",
+    "openid-client": "^5.7.1",
     "passport": "^0.7.0",
-    "passport-azure-ad": "^4.3.5",
     "require-in-the-middle": "^7.4.0",
     "uuid": "^9.0.1"
   },
@@ -77,7 +77,8 @@
     "ioredis": "^5.8.2"
   },
   "overrides": {
-    "semver": "^7.5.2"
+    "semver": "^7.5.2",
+    "glob": "^13.0.0"
   },
   "engines": {
     "node": ">=20 <=22"
@@ -94,6 +95,7 @@
     "index.d.ts",
     "init.js",
     "register.js",
+    "register.d.ts",
     "store.js",
     "store.d.ts",
     "register-otel.js",

package/register.d.ts

@@ -0,0 +1,19 @@
+import { Logger } from 'bunyan';
+
+export interface RegisterOptions {
+  loggerUrl?: string;
+  serviceName?: string;
+  environment?: string;
+}
+
+/**
+ * Registers azify-logger with Bunyan
+ * @param logger - Bunyan logger instance
+ * @param options - Configuration options
+ * @example
+ * const register = require('azify-logger/register');
+ * register(myLogger, { loggerUrl: 'http://localhost:3001' });
+ */
+declare function register(logger: Logger, options?: RegisterOptions): void;
+
+export = register;

package/register.js

@@ -39,6 +39,17 @@ try {
   const loggerUrlString = loggerEndpoint.toString()
   let transport = null
   const MAX_PENDING_OUTBOUND = 2000
+  let requestResponseDirectHttpFailureAnnounced = false
+
+  function announceRequestResponseDirectHttpFailure(line) {
+    if (requestResponseDirectHttpFailureAnnounced) {
+      return
+    }
+    requestResponseDirectHttpFailureAnnounced = true
+    try {
+      process.stderr.write(line)
+    } catch (_) {}
+  }
 
   function sendRequestResponseDirectHttp(payload) {
     try {
@@ -57,17 +68,19 @@ try {
       const debug = process.env.AZIFY_LOGGER_DEBUG === '1'
       const req = lib.request(opts, function (res) {
         res.resume()
-        if (res.statusCode < 200 || res.statusCode >= 300) {
-          try {
-            process.stderr.write(`[azify-logger] REQUEST/RESPONSE log POST failed: server responded ${res.statusCode} (check log server at ${loggerUrlString})\n`)
-          } catch (_) {}
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          requestResponseDirectHttpFailureAnnounced = false
+        } else if (res.statusCode < 200 || res.statusCode >= 300) {
+          announceRequestResponseDirectHttpFailure(
+            `[azify-logger] REQUEST/RESPONSE log POST failed: server responded ${res.statusCode} (check log server at ${loggerUrlString})\n`,
+          )
           if (debug) try { process.stderr.write(`[azify-logger] direct HTTP log server responded ${res.statusCode}\n`) } catch (_) {}
         }
       })
       req.on('error', function (err) {
-        try {
-          process.stderr.write(`[azify-logger] REQUEST/RESPONSE log POST failed: ${err && err.message} (is log server running at ${loggerUrlString}?)\n`)
-        } catch (_) {}
+        announceRequestResponseDirectHttpFailure(
+          `[azify-logger] REQUEST/RESPONSE log POST failed: ${err && err.message} (is log server running at ${loggerUrlString}?)\n`,
+        )
         if (debug) try { process.stderr.write(`[azify-logger] direct HTTP to log server failed: ${err && err.message}\n`) } catch (_) {}
       })
       req.setTimeout(5000, function () { req.destroy() })

package/server.js

@@ -67,14 +67,13 @@ if (authEnabled) {
     console.error('[auth] ⚠️ Azure AD habilitado mas variáveis faltando. Defina AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_CLIENT_SECRET e AZURE_REDIRECT_URL em env/app.env')
     console.error('[auth] Variáveis atuais: AZURE_TENANT_ID=' + (tenantId ? '***' : 'VAZIO') + ', AZURE_CLIENT_ID=' + (clientId ? '***' : 'VAZIO') + ', AZURE_CLIENT_SECRET=' + (clientSecret ? '***' : 'VAZIO') + ', AZURE_REDIRECT_URL=' + (redirectUrl ? '***' : 'VAZIO'))
   } else {
-    const { setupAuth, setupAuthRoutes, ensureAuthenticated: _ensureAuth, ensureAdmin: _ensureAdmin } = require('./auth')
+    const { setupAuth, ensureAuthenticated: _ensureAuth, ensureAdmin: _ensureAdmin } = require('./auth')
     setupAuth(app)
-    setupAuthRoutes(app)
     ensureAuthenticated = _ensureAuth
     ensureAdmin = _ensureAdmin
   }
 }
-console.log('[startup] auth configured')
+console.log('[startup] auth session configured (OIDC routes registradas após init)')
 
 const IS_LOCAL = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'dev' || !process.env.NODE_ENV
 
@@ -2564,28 +2563,53 @@ app.use((err, req, res, next) => {
 
 const port = process.env.PORT || 3001
 
-app.listen(port, () => {
-  console.log('[startup] server listening on port', port, '- /health ready')
-  setTimeout(() => writeOtelCollectorConfigIfEnabled().catch(() => {}), 3000)
-  setTimeout(() => {
-    fetchGrafanaOrgs()
-      .then((orgs) => {
-        const toSetup = orgs.filter((o) => o.id !== 1 && o.name && o.name.toLowerCase() !== 'main org')
-        if (setupGrafanaForApp._cache) setupGrafanaForApp._cache.clear()
-        function runNext(i) {
-          if (i >= toSetup.length) {
-            if (toSetup.length) writeOtelCollectorConfigIfEnabled().catch(() => {})
-            return
+async function startServer() {
+  if (authEnabled) {
+    const tenantId = process.env.AZURE_TENANT_ID
+    const clientId = process.env.AZURE_CLIENT_ID
+    const clientSecret = process.env.AZURE_CLIENT_SECRET
+    const redirectUrl = process.env.AZURE_REDIRECT_URL
+    if (tenantId && clientId && clientSecret && redirectUrl) {
+      try {
+        const auth = require('./auth')
+        await auth.initializeAzureAuth()
+        auth.setupAuthRoutes(app)
+        console.log('[startup] Azure AD OIDC (openid-client) rotas /auth prontas')
+      } catch (e) {
+        console.error('[auth] Falha ao inicializar OIDC:', e?.message || e)
+        process.exit(1)
+      }
+    }
+  }
+
+  app.listen(port, () => {
+    console.log('[startup] server listening on port', port, '- /health ready')
+    setTimeout(() => writeOtelCollectorConfigIfEnabled().catch(() => {}), 3000)
+    setTimeout(() => {
+      fetchGrafanaOrgs()
+        .then((orgs) => {
+          const toSetup = orgs.filter((o) => o.id !== 1 && o.name && o.name.toLowerCase() !== 'main org')
+          if (setupGrafanaForApp._cache) setupGrafanaForApp._cache.clear()
+          function runNext(i) {
+            if (i >= toSetup.length) {
+              if (toSetup.length) writeOtelCollectorConfigIfEnabled().catch(() => {})
+              return
+            }
+            setImmediate(() => {
+              setupGrafanaForApp(toSetup[i].name).catch((e) => console.warn('[setupGrafana] Reaplicar Tempo para org', toSetup[i].name, ':', e?.message || e))
+                .finally(() => setTimeout(() => runNext(i + 1), 1000))
+            })
           }
-          setImmediate(() => {
-            setupGrafanaForApp(toSetup[i].name).catch((e) => console.warn('[setupGrafana] Reaplicar Tempo para org', toSetup[i].name, ':', e?.message || e))
-              .finally(() => setTimeout(() => runNext(i + 1), 1000))
-          })
-        }
-        runNext(0)
-      })
-      .catch((e) => console.warn('[setupGrafana] Reaplicar Tempo para todas as orgs:', e?.message || e))
-  }, 60000)
+          runNext(0)
+        })
+        .catch((e) => console.warn('[setupGrafana] Reaplicar Tempo para todas as orgs:', e?.message || e))
+    }, 60000)
+  })
+}
+
+startServer().catch((e) => {
+  console.error('[startup] erro fatal:', e)
+  process.exit(1)
 })
 
 process.on('SIGTERM', () => {

package/store.d.ts

@@ -25,6 +25,8 @@ export function captureOriginTraceMeta(): {
   originRequestId?: string
 }
 
+export function mergeOriginTraceIntoStructuredLog<T>(payload: T): T
+
 export function addCurrentTraceToBullJobPayload<T>(data: T): T
 
 export function traceAttachmentForBullJob(): Record<string, unknown>

package/store.js

@@ -82,6 +82,36 @@ function captureOriginTraceMeta() {
   }
 }
 
+function isPlainObjectForLog(v) {
+  return v != null && typeof v === 'object' && !Array.isArray(v)
+}
+
+function mergeOriginTraceIntoStructuredLog(payload) {
+  if (!isPlainObjectForLog(payload)) {
+    return payload
+  }
+  const origin = captureOriginTraceMeta()
+  const meta = payload.meta
+  if (isPlainObjectForLog(meta)) {
+    const mergedMeta = { ...meta }
+    if (origin.originTraceId != null && mergedMeta.originTraceId === undefined) {
+      mergedMeta.originTraceId = origin.originTraceId
+    }
+    if (origin.originRequestId != null && mergedMeta.originRequestId === undefined) {
+      mergedMeta.originRequestId = origin.originRequestId
+    }
+    return { ...payload, meta: mergedMeta }
+  }
+  const out = { ...payload }
+  if (origin.originTraceId != null && out.originTraceId === undefined) {
+    out.originTraceId = origin.originTraceId
+  }
+  if (origin.originRequestId != null && out.originRequestId === undefined) {
+    out.originRequestId = origin.originRequestId
+  }
+  return out
+}
+
 function mergeTraceIntoJobPayload(data, traceContext) {
   if (!traceContext || !traceContext.traceId) return data
   const base = data && typeof data === 'object' && !Array.isArray(data) ? data : {}
@@ -147,16 +177,42 @@ function attachTraceToBullJobData(data, traceRecord) {
   }
 }
 
+function mergeOriginTraceMetaIntoJobPayload(data) {
+  if (!data || typeof data !== 'object' || Array.isArray(data)) {
+    return data
+  }
+  const origin = captureOriginTraceMeta()
+  const hasOriginToApply =
+    (origin.originTraceId != null && data.originTraceId === undefined) ||
+    (origin.originRequestId != null && data.originRequestId === undefined)
+  if (!hasOriginToApply) {
+    return data
+  }
+  const base = { ...data }
+  if (origin.originTraceId != null && base.originTraceId === undefined) {
+    base.originTraceId = origin.originTraceId
+  }
+  if (origin.originRequestId != null && base.originRequestId === undefined) {
+    base.originRequestId = origin.originRequestId
+  }
+  return base
+}
+
 function addCurrentTraceToBullJobPayload(data) {
+  const withOrigin = mergeOriginTraceMetaIntoJobPayload(data)
   const trace = captureTraceForJobEnqueue()
-  if (!trace) return data
-  return attachTraceToBullJobData(data, trace)
+  if (!trace) return withOrigin
+  return attachTraceToBullJobData(withOrigin, trace)
 }
 
 function traceAttachmentForBullJob() {
   const trace = captureTraceForJobEnqueue()
-  if (!trace) return {}
-  return { [AZIFY_JOB_TRACE_FIELD]: trace }
+  const origin = captureOriginTraceMeta()
+  const out = { ...origin }
+  if (trace) {
+    out[AZIFY_JOB_TRACE_FIELD] = trace
+  }
+  return out
 }
 
 function prepareBullJobTraceContext(data) {
@@ -220,6 +276,7 @@ module.exports = {
   addCurrentTraceToBullJobPayload,
   traceAttachmentForBullJob,
   captureOriginTraceMeta,
+  mergeOriginTraceIntoStructuredLog,
   toTraceIdHex
 }