Added shutdown signal handling

Author: ablomer

Dockerfile

@@ -39,4 +39,4 @@ ENV NODE_ENV=production
 ENV RSS_WATCHER_DATA_DIR=/app/data
 
 # Start the application
-CMD ["npm", "start"]
+CMD ["node", "dist/server/index.js"]

server/src/feedMonitor.ts

@@ -151,12 +151,12 @@ export class FeedMonitor {
   private async sendNotification(item: FeedItem) {
     const config = this.configManager.getConfig();
     const ntfyUrl = `${config.ntfyServerAddress}/${config.ntfyTopic}`;
-    // console.log(`Sending notification for ${item.title}`);
+    const sanitizedTitle = item.title.replace(/[^\x20-\x7E]/g, '');
 
     try {
       // Sanitize the title by removing any characters
       // that aren't in the ASCII printable range (0x20 to 0x7E)
-      const sanitizedTitle = item.title.replace(/[^\x20-\x7E]/g, '');
+      console.log(`Sending notification for ${sanitizedTitle}`);
       await fetch(ntfyUrl, {
         method: 'POST',
         body: item.description,
@@ -166,7 +166,7 @@ export class FeedMonitor {
         }
       });
     } catch (error) {
-      console.error(`Error sending notification for ${item.title}:`, error);
+      console.error(`Error sending notification for ${sanitizedTitle}:`, error);
     }
   }
 

server/src/index.ts

@@ -1,9 +1,24 @@
 import './bootstrap.js';
 import { Server } from './server.js';
 
+let server: Server;
+
 async function startApp() {
-  const server = new Server();
+  server = new Server();
   await server.start(3000);
 }
 
+async function shutdown(signal: string) {
+  console.log(`\nReceived ${signal}, starting graceful shutdown...`);
+  if (server) {
+    await server.stop();
+    console.log('Server stopped successfully');
+  }
+  process.exit(0);
+}
+
+// Handle shutdown signals
+process.on('SIGTERM', () => shutdown('SIGTERM'));
+process.on('SIGINT', () => shutdown('SIGINT'));
+
 startApp().catch(console.error); 

server/src/server.ts

@@ -12,6 +12,7 @@ export class Server {
   private app: express.Application;
   private configManager: ConfigManager;
   private feedMonitor: FeedMonitor;
+  private server?: ReturnType<typeof express.application.listen>;
 
   constructor() {
     this.app = express();
@@ -122,12 +123,36 @@ export class Server {
 
   public async start(port: number = 3000) {
     await this.setupVite();
-    this.app.listen(port, () => {
-      console.log(`Server running on port ${port}`);
+    this.server = this.app.listen(port, () => {
+      console.log(`
+╔═══════════════════════════════════════════╗
+║                RSS Watcher                ║
+╚═══════════════════════════════════════════╝
+🚀 Server is running on port ${port}
+📡 Mode: ${process.env.NODE_ENV || 'production'}
+
+Monitoring your feeds! 📰
+`);
     });
   }
 
-  public stop() {
+  public async stop() {
+    console.log('Stopping feed monitor...');
     this.feedMonitor.stop();
+    
+    if (this.server) {
+      console.log('Closing HTTP server...');
+      return new Promise<void>((resolve, reject) => {
+        this.server!.close((err) => {
+          if (err) {
+            console.error('Error while closing HTTP server:', err);
+            reject(err);
+          } else {
+            console.log('HTTP server closed successfully');
+            resolve();
+          }
+        });
+      });
+    }
   }
 }