Merge pull request #159 from errsole/fix/stdout-done-callback

Fix/stdout done callback

Author: venki91

lib/main/logs/index.js

@@ -53,8 +53,14 @@ const logCollector = {
       process.stderr.write = this.originalStderrWrite;
     } else {
       console.log('Note: Terminal output will be disabled after initial logs.');
-      process.stdout.write = (chunk, encoding, done) => done();
-      process.stderr.write = (chunk, encoding, done) => done();
+      const swallowWrite = (chunk, encoding, cb) => {
+        if (typeof encoding === 'function') cb = encoding;
+        if (typeof cb === 'function') process.nextTick(() => cb(null));
+        return true;
+      };
+
+      process.stdout.write = swallowWrite;
+      process.stderr.write = swallowWrite;
     }
     if (this.collectLogs.includes(LogLevel.INFO)) {
       this.interceptLogs(LogLevel.INFO);
@@ -133,7 +139,7 @@ const logCollector = {
           Bun.write(Bun.stdout, `${args}\n`);
         };
       });
-    
+
       stderrMethods.forEach(method => {
         console[method] = (...args) => {
           const message = args.map(arg =>
@@ -147,17 +153,16 @@ const logCollector = {
             hostname: this.hostname,
             pid: this.pid
           };
-    
+
           this.logStream.write(logEntry);
           Bun.write(Bun.stderr, `${args}\n`);
         };
       });
-    
+
       return;
     }
 
-
-  logStream.write = (chunk, encoding, done) => {
+    logStream.write = (chunk, encoding, done) => {
       const cleanedChunk = stripAnsi(chunk.toString());
       const logEntry = {
         timestamp: new Date().toISOString(),

tests/Logging/logging.test.js

@@ -225,6 +225,16 @@ describe('logCollector', () => {
         process.stderr.write('', null, () => {});
       }).not.toThrow();
     });
+    test('logCustomMessage should write to stdout if enableConsoleOutput is true', () => {
+      logCollector.logStream = { write: jest.fn() };
+      logCollector.enableConsoleOutput = true;
+
+      const stdoutSpy = jest.spyOn(logCollector.originalStdoutWrite, 'call').mockImplementation(() => {});
+      logCollector.logCustomMessage('info', 'Test message');
+
+      expect(stdoutSpy).toHaveBeenCalled();
+      stdoutSpy.mockRestore();
+    });
   });
 
   describe('createLogStream', () => {
@@ -246,6 +256,14 @@ describe('logCollector', () => {
 
       logCollector.createEmptyLogStream();
 
+      expect(destroySpy).toHaveBeenCalled();
+    });
+    test('createEmptyLogStream should call destroy on existing logStream', () => {
+      const destroySpy = jest.fn();
+      logCollector.logStream = { destroy: destroySpy };
+
+      logCollector.createEmptyLogStream();
+
       expect(destroySpy).toHaveBeenCalled();
     });
   });
@@ -382,4 +400,59 @@ describe('logCollector', () => {
       expect(console.error).toHaveBeenCalledWith(error);
     });
   });
+
+  describe('resetConsoleOutput', () => {
+    test('should restore console output and uncork logStream', () => {
+      const uncorkSpy = jest.fn();
+      logCollector.logStream = {
+        uncork: uncorkSpy,
+        write: jest.fn()
+      };
+      logCollector.enableConsoleOutput = false;
+
+      const originalStdout = process.stdout.write;
+      const originalStderr = process.stderr.write;
+
+      logCollector.resetConsoleOutput();
+
+      expect(logCollector.enableConsoleOutput).toBe(true);
+      expect(process.stdout.write).toBe(logCollector.originalStdoutWrite);
+      expect(process.stderr.write).toBe(logCollector.originalStderrWrite);
+      expect(uncorkSpy).toHaveBeenCalled();
+
+      process.stdout.write = originalStdout;
+      process.stderr.write = originalStderr;
+    });
+  });
+
+  describe('setInitializationTimeout', () => {
+    test('should mark initialization failed and create empty log stream', () => {
+      jest.useFakeTimers();
+      const createEmptyLogStreamSpy = jest.spyOn(logCollector, 'createEmptyLogStream');
+
+      // ✅ Provide a mock logStream with a destroy() method
+      logCollector.logStream = { destroy: jest.fn() };
+
+      logCollector.setInitializationTimeout();
+      jest.runAllTimers();
+
+      expect(createEmptyLogStreamSpy).toHaveBeenCalled();
+      expect(logCollector.isInitializationFailed).toBe(true);
+      expect(console.error).toHaveBeenCalledWith('Error: Unable to initialize Errsole');
+
+      jest.useRealTimers();
+      createEmptyLogStreamSpy.mockRestore();
+    });
+  });
+
+  describe('initialize swallowWrite', () => {
+    test('should not throw when stdout.write is called without a callback', () => {
+      const options = { storage: storageMock, enableConsoleOutput: false };
+      logCollector.initialize(options);
+
+      expect(() => {
+        process.stdout.write('test message'); // no callback passed
+      }).not.toThrow();
+    });
+  });
 });