@canmingir/link-express 1.7.3 → 1.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canmingir/link-express",
-  "version": "1.7.3",
+  "version": "1.7.6",
   "description": "",
   "main": "index.ts",
   "types": "index.ts",

package/src/event/client/eventManager.ts

@@ -4,6 +4,7 @@ import { EventMetrics, PushgatewayConfig } from "./metrics";
 import { KafkaAdapter } from "./adapters/KafkaAdapter";
 import { SocketAdapter } from "./adapters/SocketAdapter";
 import { TxEventQAdapter } from "./adapters/TxEventQAdapter";
+import { logEvent } from "../eventLogger";
 
 const TOPICS = [
   "KNOWLEDGE_CREATED",
@@ -90,6 +91,9 @@ export class EventManager {
     const type = args.slice(0, -1) as string[];
     const mergedType = type.join("_");
     this.validateEventType(mergedType);
+
+    logEvent("publish", mergedType, payload);
+
     const payloadSize = JSON.stringify(payload).length;
     const endTimer = this.metrics.recordPublish(mergedType, payloadSize);
     try {
@@ -107,6 +111,8 @@ export class EventManager {
     type: string,
     callback: Callback<T>
   ): Promise<() => void> {
+    logEvent("subscribe", type);
+
     if (!this.callbacks.has(type)) {
       this.callbacks.set(type, new Set());
     }

package/src/event/eventLogger.ts

@@ -0,0 +1,74 @@
+import { ecsFormat } from "@elastic/ecs-pino-format";
+import pino from "pino";
+import pinoElastic from "pino-elasticsearch";
+import { getConfig } from "../config";
+
+let logger: pino.Logger | null = null;
+let isElasticsearchConfigured = false;
+
+function getLogger(): pino.Logger | null {
+  const { logger: loggerConfig, project } = getConfig();
+
+  if (!loggerConfig || !project) {
+    isElasticsearchConfigured = false;
+    return null;
+  }
+
+  if (!logger || !isElasticsearchConfigured) {
+    const streams: pino.StreamEntry[] = [{ stream: process.stdout }];
+
+    const eventsIndex = `${loggerConfig.elasticsearch.index}-events`;
+
+    const streamToElastic = pinoElastic({
+      index: eventsIndex,
+      node: loggerConfig.elasticsearch.node,
+      esVersion: loggerConfig.elasticsearch.esVersion || 8,
+      flushBytes: loggerConfig.elasticsearch.flushBytes || 1000,
+    } as Parameters<typeof pinoElastic>[0]);
+
+    streamToElastic.on("error", (err: Error) => {
+      console.error("[EventLogger] Elasticsearch error:", err.message);
+    });
+
+    streamToElastic.on("insertError", (err: Error) => {
+      console.error("[EventLogger] Elasticsearch insert error:", err);
+    });
+
+    streams.push({ stream: streamToElastic });
+
+    logger = pino(
+      {
+        ...ecsFormat(),
+        base: {
+          service: {
+            name: project.name,
+            version: project.version,
+          },
+        },
+      },
+      pino.multistream(streams)
+    );
+
+    isElasticsearchConfigured = true;
+  }
+
+  return logger;
+}
+
+export function logEvent(
+  action: "publish" | "subscribe",
+  topic: string,
+  payload?: any
+) {
+  const log = getLogger();
+
+  if (log) {
+    log.info({
+      action,
+      topic,
+      event_payload: payload ? JSON.stringify(payload) : undefined,
+    });
+  } else {
+    console.log(`[Event] ${action}:`, topic, payload || "");
+  }
+}

package/src/event/src/Event.ts

@@ -1,5 +1,6 @@
 import client from "prom-client";
 import { v4 as uuid } from "uuid";
+import { logEvent } from "../eventLogger";
 
 const subscriptions = {};
 const messages = new Map();
@@ -102,7 +103,7 @@ const subscribe = (...args) => {
   const type = args.join(".");
   const id = uuid();
 
-  console.debug("node-event", "subscribe", type, id);
+  logEvent("subscribe", type);
 
   if (type === "__proto__" || type === "constructor" || type === "prototype") {
     throw new Error("Invalid subscription type");
@@ -116,7 +117,6 @@ const subscribe = (...args) => {
     type,
     callback,
     unsubscribe: () => {
-      console.debug("node-event", "unsubscribe", type, id);
       delete subscriptions[type][id];
 
       // Track unsubscription
@@ -152,7 +152,7 @@ const publish = (...args) => {
   const payload = args.pop();
   const type = args.join(".");
 
-  console.log("node-event", "publish", type, payload);
+  logEvent("publish", type, payload);
   messages.set(type, payload);
 
   if (type === "__proto__" || type === "constructor" || type === "prototype") {
@@ -178,7 +178,6 @@ const publish = (...args) => {
         registry.callback(payload, registry);
         eventThroughput.labels(type).inc();
       } catch (err) {
-        console.error("node-event", "error", type, err);
         const errorName = err instanceof Error ? err.name : "UnknownError";
         eventPublishErrors.labels(type, errorName).inc();
       } finally {

package/src/routes/oauth.ts

@@ -1,10 +1,11 @@
-import Joi from "joi";
+import { AuthenticationError, AuthorizationError } from "../error";
 import express, { Request, Response } from "express";
-import jwt from "jsonwebtoken";
+
+import Joi from "joi";
+import Permission from "../models/Permission.model";
 import axios from "axios";
 import config from "../config";
-import { AuthenticationError, AuthorizationError } from "../error";
-import Permission from "../models/Permission.model";
+import jwt from "jsonwebtoken";
 
 const router = express.Router();
 
@@ -17,33 +18,39 @@ if (!project) {
 router.post(
   "/",
   async (req: Request, res: Response): Promise<Response | void> => {
-    const { appId, projectId, code, refreshToken, redirectUri, provider } =
-      Joi.attempt(
-        req.body,
-        Joi.object({
-          appId: Joi.string().required(),
-          projectId: Joi.string().optional(),
-          code: Joi.string().optional(),
-          refreshToken: Joi.string().optional(),
-          redirectUri: Joi.string().optional(),
-          provider: Joi.string().required(),
-        })
-          .required()
-          .options({ stripUnknown: true })
-      ) as {
-        appId: string;
-        projectId?: string;
-        code?: string;
-        refreshToken?: string;
-        redirectUri?: string;
-        provider: string;
-      };
+    const {
+      appId,
+      projectId,
+      code,
+      refreshToken,
+      redirectUri,
+      identityProvider,
+    } = Joi.attempt(
+      req.body,
+      Joi.object({
+        appId: Joi.string().required(),
+        projectId: Joi.string().optional(),
+        code: Joi.string().optional(),
+        refreshToken: Joi.string().optional(),
+        redirectUri: Joi.string().optional(),
+        identityProvider: Joi.string().required(),
+      })
+        .required()
+        .options({ stripUnknown: true })
+    ) as {
+      appId: string;
+      projectId?: string;
+      code?: string;
+      refreshToken?: string;
+      redirectUri?: string;
+      identityProvider: string;
+    };
 
     if (!code && !refreshToken) {
       return res.status(400).send("Missing OAuth Code and Refresh Token");
     }
 
-    const providerConfig = project.oauth?.providers[provider] as {
+    const providerConfig = project.oauth?.providers[identityProvider] as {
       clientId: string;
       tokenUrl: string;
       userUrl: string;
@@ -68,7 +75,7 @@ router.post(
       params.append("client_id", providerConfig.clientId);
       params.append(
         "client_secret",
-        process.env[`${provider.toUpperCase()}_CLIENT_SECRET`] as string
+        process.env[`${identityProvider.toUpperCase()}_CLIENT_SECRET`] as string
       );
       params.append("code", code);
       params.append("redirect_uri", redirectUri);
@@ -136,7 +143,7 @@ router.post(
         fallbackField: project.oauth?.jwt.identifier,
       });
       throw new Error(
-        `Cannot find user identifier in ${provider} OAuth response`
+        `Cannot find user identifier in ${identityProvider} OAuth response`
       );
     }
 
@@ -153,7 +160,7 @@ router.post(
             sub: userId,
             iss: "nuc",
             aid: appId,
-            provider: provider,
+            identityProvider: identityProvider,
             iat: Math.floor(Date.now() / 1000),
           },
           process.env.JWT_SECRET as string,
@@ -168,7 +175,7 @@ router.post(
             oid: permissions[0].organizationId,
             aid: appId,
             rls: permissions.map((permission) => permission.role),
-            provider: provider,
+            identityProvider: identityProvider,
             iat: Math.floor(Date.now() / 1000),
           },
           process.env.JWT_SECRET as string,
@@ -181,7 +188,7 @@ router.post(
           sub: userId,
           iss: "nuc",
           aid: appId,
-          provider: provider,
+          identityProvider: identityProvider,
           iat: Math.floor(Date.now() / 1000),
         },
         process.env.JWT_SECRET as string,
@@ -214,16 +221,16 @@ router.get("/user", async (req: Request, res: Response): Promise<Response> => {
 
   const decoded = jwt.verify(token, process.env.JWT_SECRET as string) as {
     sub: string;
-    provider: string;
+    identityProvider: string;
   };
   const userId = decoded.sub;
-  const provider = decoded.provider;
+  const identityProvider = decoded.identityProvider;
 
-  if (!userId || !provider) {
+  if (!userId || !identityProvider) {
     return res.status(401).end();
   }
 
-  const providerConfig = project.oauth?.providers[provider] as {
+  const providerConfig = project.oauth?.providers[identityProvider] as {
     userUrl: string;
     userFields: {
       name: string;
@@ -250,7 +257,7 @@ router.get("/user", async (req: Request, res: Response): Promise<Response> => {
   const userFieldMapping = providerConfig.userFields;
   const userDetails = {
     id: userId,
-    provider: provider,
+    identityProvider: identityProvider,
     name: (userResponse.data[userFieldMapping.name] as string) || null,
     displayName:
       (userResponse.data[userFieldMapping.displayName] as string) || null,