@fabbahiense/pulsar-pino-transport 0.1.1 → 0.2.0

package/dist/index.cjs

@@ -34,6 +34,45 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
+var GENERIC_HTTP_MSGS = /* @__PURE__ */ new Set([
+  "request completed",
+  "request errored",
+  "request aborted",
+  "response sent",
+  "incoming request",
+  "http request"
+]);
+function pickFirst(obj, keys) {
+  for (const k of keys) {
+    if (obj[k] !== void 0 && obj[k] !== null) return obj[k];
+  }
+  return void 0;
+}
+function isObj(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function extractPayloads(obj) {
+  const out = {};
+  const req = obj.req;
+  if (isObj(req)) {
+    const body = pickFirst(req, ["body", "requestBody", "reqBody", "payload", "input"]);
+    if (body !== void 0) out.requestBody = body;
+    const headers = pickFirst(req, ["headers", "requestHeaders", "reqHeaders"]);
+    if (isObj(headers)) out.requestHeaders = headers;
+    const query = pickFirst(req, ["query", "queryParams", "qs"]);
+    if (isObj(query)) out.query = query;
+    const params = pickFirst(req, ["params", "pathParams", "routeParams"]);
+    if (isObj(params)) out.params = params;
+  }
+  const res = obj.res;
+  if (isObj(res)) {
+    const body = pickFirst(res, ["body", "responseBody", "resBody", "response", "output", "result", "data"]);
+    if (body !== void 0) out.responseBody = body;
+    const headers = pickFirst(res, ["headers", "responseHeaders", "resHeaders"]);
+    if (isObj(headers)) out.responseHeaders = headers;
+  }
+  return out;
+}
 var LEVEL_MAP = {
   10: "trace",
   20: "debug",
@@ -115,19 +154,31 @@ async function index_default(options) {
   }
   return build(async function(stream) {
     for await (const obj of stream) {
+      const method = obj.req?.method || void 0;
+      const url2 = obj.req?.url || void 0;
+      const statusCode = obj.res?.statusCode || void 0;
+      let msg = obj.msg ?? "";
+      const lower = msg.toLowerCase().trim();
+      if (GENERIC_HTTP_MSGS.has(lower) && method && url2) {
+        msg = `${method.toUpperCase()} ${url2}${statusCode ? ` ${statusCode}` : ""}`;
+      }
+      const extracted = extractPayloads(obj);
+      const baseMeta = isObj(obj.metadata) ? obj.metadata : {};
+      const merged = { ...baseMeta, ...extracted };
+      const metadata = Object.keys(merged).length > 0 ? merged : null;
       buffer.push({
         level: LEVEL_MAP[obj.level] || "info",
-        msg: obj.msg,
+        msg,
         timestamp: parseTimestamp(obj.time),
         serviceName: resolvedSource,
         traceId: obj.traceId || obj.trace_id || obj.requestId || obj.req?.id || null,
-        method: obj.req?.method,
-        url: obj.req?.url,
-        statusCode: obj.res?.statusCode,
+        method,
+        url: url2,
+        statusCode,
         responseTime: obj.responseTime,
         errorMessage: obj.err?.message,
         errorStack: obj.err?.stack,
-        metadata: obj.metadata || null
+        metadata
       });
       if (buffer.length >= batchSize) {
         await flush();

package/dist/index.js

@@ -1,4 +1,43 @@
 // src/index.ts
+var GENERIC_HTTP_MSGS = /* @__PURE__ */ new Set([
+  "request completed",
+  "request errored",
+  "request aborted",
+  "response sent",
+  "incoming request",
+  "http request"
+]);
+function pickFirst(obj, keys) {
+  for (const k of keys) {
+    if (obj[k] !== void 0 && obj[k] !== null) return obj[k];
+  }
+  return void 0;
+}
+function isObj(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function extractPayloads(obj) {
+  const out = {};
+  const req = obj.req;
+  if (isObj(req)) {
+    const body = pickFirst(req, ["body", "requestBody", "reqBody", "payload", "input"]);
+    if (body !== void 0) out.requestBody = body;
+    const headers = pickFirst(req, ["headers", "requestHeaders", "reqHeaders"]);
+    if (isObj(headers)) out.requestHeaders = headers;
+    const query = pickFirst(req, ["query", "queryParams", "qs"]);
+    if (isObj(query)) out.query = query;
+    const params = pickFirst(req, ["params", "pathParams", "routeParams"]);
+    if (isObj(params)) out.params = params;
+  }
+  const res = obj.res;
+  if (isObj(res)) {
+    const body = pickFirst(res, ["body", "responseBody", "resBody", "response", "output", "result", "data"]);
+    if (body !== void 0) out.responseBody = body;
+    const headers = pickFirst(res, ["headers", "responseHeaders", "resHeaders"]);
+    if (isObj(headers)) out.responseHeaders = headers;
+  }
+  return out;
+}
 var LEVEL_MAP = {
   10: "trace",
   20: "debug",
@@ -80,19 +119,31 @@ async function index_default(options) {
   }
   return build(async function(stream) {
     for await (const obj of stream) {
+      const method = obj.req?.method || void 0;
+      const url2 = obj.req?.url || void 0;
+      const statusCode = obj.res?.statusCode || void 0;
+      let msg = obj.msg ?? "";
+      const lower = msg.toLowerCase().trim();
+      if (GENERIC_HTTP_MSGS.has(lower) && method && url2) {
+        msg = `${method.toUpperCase()} ${url2}${statusCode ? ` ${statusCode}` : ""}`;
+      }
+      const extracted = extractPayloads(obj);
+      const baseMeta = isObj(obj.metadata) ? obj.metadata : {};
+      const merged = { ...baseMeta, ...extracted };
+      const metadata = Object.keys(merged).length > 0 ? merged : null;
       buffer.push({
         level: LEVEL_MAP[obj.level] || "info",
-        msg: obj.msg,
+        msg,
         timestamp: parseTimestamp(obj.time),
         serviceName: resolvedSource,
         traceId: obj.traceId || obj.trace_id || obj.requestId || obj.req?.id || null,
-        method: obj.req?.method,
-        url: obj.req?.url,
-        statusCode: obj.res?.statusCode,
+        method,
+        url: url2,
+        statusCode,
         responseTime: obj.responseTime,
         errorMessage: obj.err?.message,
         errorStack: obj.err?.stack,
-        metadata: obj.metadata || null
+        metadata
       });
       if (buffer.length >= batchSize) {
         await flush();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabbahiense/pulsar-pino-transport",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Pino transport for Pulsar observability platform",
   "type": "module",
   "main": "./dist/index.cjs",