Merge branch '2.2.x' for 2.2.0 release

Author: andrewshell

.eslintrc.json

@@ -1 +1 @@
-16
+22

.node-version

@@ -0,0 +1,23 @@
+# Dependencies
+node_modules/
+package-lock.json
+
+# Build output
+dist/
+build/
+
+# Third-party libraries
+public/js/
+
+# Logs
+*.log
+
+# Database
+data/
+
+# Docker
+Dockerfile
+docker-compose.yml
+
+# Documentation that should preserve formatting
+DEVNOTES.md

.prettierignore

@@ -0,0 +1,13 @@
+{
+  "tabWidth": 4,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "quoteProps": "as-needed",
+  "trailingComma": false,
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "arrowParens": "avoid",
+  "printWidth": 80,
+  "endOfLine": "lf"
+}

.prettierrc

@@ -0,0 +1,68 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+This is an rssCloud Server v2 implementation in Node.js - a notification protocol server that allows RSS feeds to notify subscribers when they are updated. The server handles subscription management and real-time notifications for RSS/feed updates.
+
+## Development Commands
+
+### Start Development
+
+- `npm start` - Start server with nodemon (auto-reload on changes)
+- `npm run client` - Start client with nodemon
+
+### Testing & Quality
+
+- `npm test` - Run Mocha test suite (called by test-api)
+- `npm run test-api` - Run full API tests using Docker containers (MacOS tested)
+- `npm run lint` - Run ESLint with auto-fix on controllers/, services/, test/
+
+### Data Management
+
+- `npm run import-data` - Import data using bin/import-data.js
+
+## Architecture
+
+### Core Application Structure
+
+- **app.js** - Main Express application entry point, sets up middleware, MongoDB connection, and starts server
+- **config.js** - Configuration management using nconf (env vars, CLI args, defaults)
+- **controllers/** - Express route handlers for API endpoints
+- **services/** - Business logic modules for core functionality
+- **views/** - Handlebars templates for web interface
+
+### Key Services
+
+- **services/mongodb.js** - MongoDB connection management with graceful shutdown
+- **services/notify-\*.js** - Notification system for subscribers
+- **services/ping.js** - RSS feed update detection and processing
+- **services/please-notify.js** - Subscription management
+
+### API Endpoints (defined in controllers/index.js)
+
+- `/pleaseNotify` - Subscribe to RSS feed notifications
+- `/ping` - Notify server of RSS feed updates
+- `/viewLog` - Event log viewer for debugging
+- `/RPC2` - XML-RPC endpoint
+- Web forms available at `/pleaseNotifyForm` and `/pingForm`
+
+### Configuration
+
+Environment variables (with defaults in config.js):
+
+- `MONGODB_URI` (default: mongodb://localhost:27017/rsscloud)
+- `DOMAIN` (default: localhost)
+- `PORT` (default: 5337)
+- Resource limits: MAX_RESOURCE_SIZE, REQUEST_TIMEOUT, etc.
+
+### Database
+
+Uses MongoDB for storing subscriptions and resource state. Connection handled through services/mongodb.js with proper cleanup on shutdown.
+
+### Testing
+
+- Unit tests in test/ directory using Mocha/Chai
+- Docker-based API testing with mock endpoints
+- Test fixtures and SSL certificates in test/keys/

CLAUDE.md

@@ -1,4 +1,4 @@
-FROM node:14 AS base
+FROM node:22 AS base
 
 # Dockerize is needed to sync containers startup
 ENV DOCKERIZE_VERSION v0.6.1

Dockerfile

@@ -1,84 +1,103 @@
-(function () {
-    "use strict";
-
-    require('dotenv').config();
-
-    const config = require('./config'),
-        cors = require('cors'),
-        express = require('express'),
-        exphbs = require('express-handlebars'),
-        fs = require('fs'),
-        moment = require('moment'),
-        mongodb = require('./services/mongodb'),
-        morgan = require('morgan'),
-        removeExpiredSubscriptions = require('./services/remove-expired-subscriptions');
-
-    let app,
-        expressWs,
-        hbs,
-        server;
-
-    require('console-stamp')(console, 'HH:MM:ss.l');
+require('dotenv').config();
+
+const config = require('./config'),
+    cors = require('cors'),
+    express = require('express'),
+    exphbs = require('express-handlebars'),
+    getDayjs = require('./services/dayjs-wrapper'),
+    mongodb = require('./services/mongodb'),
+    morgan = require('morgan'),
+    { setupLogRetention } = require('./services/log-cleanup'),
+    removeExpiredSubscriptions = require('./services/remove-expired-subscriptions');
+
+let app, hbs, server, dayjs;
+
+console.log(`${config.appName} ${config.appVersion}`);
+
+// Schedule cleanup tasks
+function scheduleCleanupTasks() {
+    // Run subscription cleanup every 24 hours
+    setInterval(async() => {
+        try {
+            console.log('Running scheduled subscription cleanup...');
+            await removeExpiredSubscriptions();
+        } catch (error) {
+            console.error('Error in scheduled subscription cleanup:', error);
+        }
+    }, 24 * 60 * 60 * 1000); // 24 hours in milliseconds
+}
 
-    console.log(`${config.appName} ${config.appVersion}`);
+morgan.format('mydate', () => {
+    return new Date().toLocaleTimeString('en-US', { hour12: false, fractionalSecondDigits: 3 }).replace(/:/g, ':');
+});
 
-    // TODO: Every 24 hours run removeExpiredSubscriptions(data);
+// Initialize dayjs at startup
+async function initializeDayjs() {
+    dayjs = await getDayjs();
+}
 
-    morgan.format('mydate', function() {
-        var df = require('dateformat');
-        return df(new Date(), 'HH:MM:ss.l');
-    });
+app = express();
 
-    app = express();
-    expressWs = require('express-ws')(app);
+app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
 
-    app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
+app.use(cors());
 
-    app.use(cors());
+// Configure handlebars template engine to work with dayjs
+hbs = exphbs.create({
+    helpers: {
+        formatDate: (datetime, format) => {
+            return dayjs(datetime).format(format);
+        }
+    }
+});
+
+// Configure express to use handlebars
+app.engine('handlebars', hbs.engine);
+app.set('view engine', 'handlebars');
+
+// Handle static files in public directory
+app.use(express.static('public', {
+    dotfiles: 'ignore',
+    maxAge: '1d'
+}));
+
+// Load controllers
+app.use(require('./controllers'));
+
+// Start server
+async function startServer() {
+    await initializeDayjs();
+    await mongodb.connect('rsscloud', config.mongodbUri);
+
+    // Setup log retention TTL index
+    try {
+        await setupLogRetention();
+    } catch (error) {
+        console.error('Failed to setup log retention, continuing without it:', error);
+    }
+
+    // Start cleanup scheduling
+    scheduleCleanupTasks();
+
+    server = app.listen(config.port, () => {
+        app.locals.host = config.domain;
+        app.locals.port = server.address().port;
+
+        if (app.locals.host.indexOf(':') > -1) {
+            app.locals.host = '[' + app.locals.host + ']';
+        }
 
-    // Configure handlebars template engine to work with moment
-    hbs = exphbs.create({
-        helpers: {
-            formatDate: function (datetime, format) {
-                return moment(datetime).format(format);
+        console.log(`Listening at http://${app.locals.host}:${app.locals.port}`);
+    })
+        .on('error', (error) => {
+            switch (error.code) {
+            case 'EADDRINUSE':
+                console.log(`Error: Port ${config.port} is already in use.`);
+                break;
+            default:
+                console.log(error.code);
             }
-        }
-    });
-
-    // Configure express to use handlebars
-    app.engine('handlebars', hbs.engine);
-    app.set('view engine', 'handlebars');
-
-    // Handle static files in public directory
-    app.use(express.static('public', {
-        dotfiles: 'ignore',
-        maxAge: '1d'
-    }));
-
-    // Load controllers
-    app.use(require('./controllers'));
-
-    // Start server
-    mongodb.connect('rsscloud', config.mongodbUri)
-        .then(() => {
-            server = app.listen(config.port, function () {
-                app.locals.host = config.domain;
-                app.locals.port = server.address().port;
-
-                if (app.locals.host.indexOf(':') > -1) {
-                    app.locals.host = '[' + app.locals.host + ']';
-                }
-
-                console.log('Listening at http://%s:%s', app.locals.host, app.locals.port);
-            })
-                .on('error', function (error) {
-                    switch (error.code) {
-                    case 'EADDRINUSE':
-                        console.log(`Error: Port ${config.port} is already in use.`);
-                        break;
-                    default:
-                        console.log(error.code);
-                    }
-                });
         });
-}());
+}
+
+startServer().catch(console.error);