@nm-logger/logger 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nm-logger/logger",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Express JSON logger with S3 upload, correlation IDs, and separate success/error/external daily logs.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -22,7 +22,8 @@
   "license": "MIT",
   "dependencies": {
     "@aws-sdk/client-s3": "^3.600.0",
-    "fs-extra": "^11.1.1"
+    "fs-extra": "^11.1.1",
+     "@nm-logger/logger": "^1.1.9"
   },
   "peerDependencies": {
     "express": ">=4.0.0"

package/src/DailyWatcher.js

@@ -40,16 +40,42 @@ class DailyWatcher {
           return;
         }
 
-        this.queue.add(async () => {
-          try {
-            console.log(`📤 Uploading [${category}] logs to S3:`, key);
-            await this.s3Uploader.upload(file, key);
-            console.log("✅ Uploaded. Deleting local file:", file);
-            await fs.remove(file);
-          } catch (err) {
-            console.error(`❌ Error uploading [${category}] logs to S3:`, err);
-          }
-        });
+       this.queue.add(async () => {
+  try {
+    const now = new Date();
+    const key = `${Y}/${M}/${D}/${fileName}`;
+
+    console.log(`📤 Uploading [${category}] logs to S3: ${key}`);
+
+    // Step 1 — Read local file
+    const localContent = JSON.parse(await fs.readFile(file, "utf8"));
+
+    // Step 2 — Try loading existing file from S3
+    let existing = { logs: [] };
+    try {
+      const s3Content = await this.s3Uploader.getObject(key);
+      if (s3Content) {
+        existing = JSON.parse(s3Content);
+      }
+    } catch (err) {
+      // File may not exist on first upload — ignore
+    }
+
+    // Step 3 — Append logs
+    const merged = {
+      logs: [...existing.logs, ...localContent.logs]
+    };
+
+    // Step 4 — Upload merged logs
+    await this.s3Uploader.putObject(key, JSON.stringify(merged, null, 2));
+
+    console.log("✅ Logs appended to S3 successfully");
+
+  } catch (err) {
+    console.error(`❌ Error uploading logs to S3:`, err);
+  }
+});
+
       });
     }, this.intervalMs);
   }

package/src/Logger.js

@@ -143,13 +143,11 @@ class Logger {
 requestLoggerMiddleware() {
   return (req, res, next) => {
     try {
-      // Prevent duplicate logging
-      if (req.__nm_logger_logged) {
-        return next();
-      }
+      if (req.__nm_logger_logged) return next();
       req.__nm_logger_logged = true;
 
-      let correlationId =
+      // correlation ID (no-crash)
+      const correlationId =
         req.headers["x-correlation-id"] ||
         req.headers["X-Correlation-ID"] ||
         req.correlationId ||
@@ -158,11 +156,17 @@ requestLoggerMiddleware() {
       req.correlationId = correlationId;
       res.setHeader("X-Correlation-ID", correlationId);
 
-      this.logRequest(req).catch((e) =>
-        console.error("Logger requestLoggerMiddleware error:", e)
-      );
-    } catch (e) {
-      console.error("Logger requestLoggerMiddleware outer error:", e);
+      // safe logging
+      try {
+        this.logRequest(req).catch(err => {
+          console.error("🔥 Error inside logRequest:", err);
+        });
+      } catch (inner) {
+        console.error("🔥 UNEXPECTED error inside requestLoggerMiddleware:", inner);
+      }
+
+    } catch (outer) {
+      console.error("🔥 requestLoggerMiddleware FATAL error:", outer);
     }
 
     next();

package/src/S3Uploader.js

@@ -1,8 +1,10 @@
 const fs = require("fs");
 const {
   S3Client,
-  PutObjectCommand
+  PutObjectCommand,
+  GetObjectCommand
 } = require("@aws-sdk/client-s3");
+const { streamToString } = require("./utils");
 
 class S3Uploader {
   constructor(config) {
@@ -17,16 +19,28 @@ class S3Uploader {
     this.bucket = config.bucket;
   }
 
-  async upload(filePath, s3Key) {
-    const fileData = fs.readFileSync(filePath);
-
-    const command = new PutObjectCommand({
-      Bucket: this.bucket,
-      Key: s3Key,
-      Body: fileData
-    });
+  async getObject(key) {
+    try {
+      const result = await this.client.send(
+        new GetObjectCommand({
+          Bucket: this.bucket,
+          Key: key
+        })
+      );
+      return await streamToString(result.Body);
+    } catch (err) {
+      return null; // file not found
+    }
+  }
 
-    await this.client.send(command);
+  async putObject(key, body) {
+    await this.client.send(
+      new PutObjectCommand({
+        Bucket: this.bucket,
+        Key: key,
+        Body: body
+      })
+    );
   }
 }
 

package/src/utils.js

@@ -89,3 +89,12 @@ exports.generateCorrelationId = () => {
   const ts = Date.now().toString(16);
   return `cid-${rand}-${ts}`;
 };
+
+exports.streamToString = async (stream) => {
+  return await new Promise((resolve, reject) => {
+    const chunks = [];
+    stream.on("data", (chunk) => chunks.push(chunk));
+    stream.on("error", reject);
+    stream.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
+  });
+};