Merge pull request #14 from rsscloud/update-packages-and-modernize

Upgrade packages and modernize JavaScript for Node.js 22

Author: andrewshell

.eslintrc.json

@@ -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": false,
+  "quoteProps": "as-needed",
+  "trailingComma": "es5",
+  "bracketSpacing": true,
+  "bracketSameLine": false,
+  "arrowParens": "avoid",
+  "printWidth": 80,
+  "endOfLine": "lf"
+}

.prettierrc

@@ -9,51 +9,61 @@ This is an rssCloud Server v2 implementation in Node.js - a notification protoco
 ## 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
+
+- `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 jshint` - Run JSHint linter
 - `npm run eslint` - 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/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/
+- 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

@@ -4,30 +4,26 @@ 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');
+    morgan = require('morgan');
+    // removeExpiredSubscriptions = require('./services/remove-expired-subscriptions');
 
-let app,
-    expressWs,
-    hbs,
-    server;
+let app, hbs, server;
 
 require('console-stamp')(console, 'HH:MM:ss.l');
 
 console.log(`${config.appName} ${config.appVersion}`);
 
 // TODO: Every 24 hours run removeExpiredSubscriptions(data);
 
-morgan.format('mydate', function() {
-    var df = require('dateformat');
+morgan.format('mydate', () => {
+    const df = require('dateformat');
     return df(new Date(), 'HH:MM:ss.l');
 });
 
 app = express();
-expressWs = require('express-ws')(app);
+require('express-ws')(app);
 
 app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
 
@@ -36,7 +32,7 @@ app.use(cors());
 // Configure handlebars template engine to work with moment
 hbs = exphbs.create({
     helpers: {
-        formatDate: function (datetime, format) {
+        formatDate: (datetime, format) => {
             return moment(datetime).format(format);
         }
     }
@@ -58,17 +54,17 @@ app.use(require('./controllers'));
 // Start server
 mongodb.connect('rsscloud', config.mongodbUri)
     .then(() => {
-        server = app.listen(config.port, function () {
+        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 + ']';
             }
 
-            console.log('Listening at http://%s:%s', app.locals.host, app.locals.port);
+            console.log(`Listening at http://${app.locals.host}:${app.locals.port}`);
         })
-            .on('error', function (error) {
+            .on('error', (error) => {
                 switch (error.code) {
                 case 'EADDRINUSE':
                     console.log(`Error: Port ${config.port} is already in use.`);

app.js

@@ -1,13 +1,13 @@
-var app,
-    bodyParser = require('body-parser'),
+const bodyParser = require('body-parser'),
     express = require('express'),
     morgan = require('morgan'),
     nconf = require('nconf'),
     packageJson = require('./package.json'),
-    server,
     textParser = bodyParser.text({ type: '*/xml'}),
     urlencodedParser = bodyParser.urlencoded({ extended: false });
 
+let app, server;
+
 require('console-stamp')(console, 'HH:MM:ss.l');
 
 // Setup nconf to use (in-order):
@@ -28,10 +28,10 @@ nconf
         "PORT": 9000
     });
 
-console.log(nconf.get('APP_NAME') + ' ' + nconf.get('APP_VERSION'));
+console.log(`${nconf.get('APP_NAME')} ${nconf.get('APP_VERSION')}`);
 
-morgan.format('mydate', function() {
-    var df = require('dateformat');
+morgan.format('mydate', () => {
+    const df = require('dateformat');
     return df(new Date(), 'HH:MM:ss.l');
 });
 
@@ -44,35 +44,35 @@ app.use(express.static('public', {
     maxAge: '1d'
 }));
 
-app.post('/RPC2', textParser, function (req, res) {
+app.post('/RPC2', textParser, (req, res) => {
     console.log('rpc');
     console.dir(req.body);
     res.send('');
-})
+});
 
-app.get('/*', function (req, res) {
-    var challenge = req.query.challenge || "";
+app.get('/*', (req, res) => {
+    const challenge = req.query.challenge || "";
     console.log('get');
     console.dir(req.query);
     res.send(challenge);
 });
 
-app.post('/*', urlencodedParser, function (req, res) {
+app.post('/*', urlencodedParser, (req, res) => {
     console.log('post');
     console.dir(req.body);
     res.send('');
 });
 
-server = app.listen(nconf.get('PORT'), function () {
-    var host = nconf.get('DOMAIN'),
+server = app.listen(nconf.get('PORT'), () => {
+    const host = nconf.get('DOMAIN'),
         port = server.address().port;
 
-    console.log('Listening at http://%s:%s', host, port);
+    console.log(`Listening at http://${host}:${port}`);
 })
-    .on('error', function (error) {
+    .on('error', (error) => {
         switch (error.code) {
         case 'EADDRINUSE':
-            console.log('Error: Port ' + nconf.get('PORT') + ' is already in use.');
+            console.log(`Error: Port ${nconf.get('PORT')} is already in use.`);
             break;
         default:
             console.log(error.code);

client.js

@@ -3,14 +3,15 @@ const express = require('express'),
     md = require('markdown-it')(),
     fs = require('fs');
 
-router.get('/', function (req, res) {
+router.get('/', (req, res) => {
     switch (req.accepts('html')) {
-    case 'html':
+    case 'html': {
         const vals = {
             htmltext: md.render(fs.readFileSync('README.md', { encoding: 'utf8' }))
         };
         res.render('docs', vals);
         break;
+    }
     default:
         res.status(406).send('Not Acceptable');
         break;

controllers/docs.js

@@ -1,7 +1,7 @@
 const express = require('express'),
     router = new express.Router();
 
-router.get('/', function (req, res) {
+router.get('/', function(req, res) {
     switch (req.accepts('html')) {
     case 'html':
         res.render('home');

controllers/home.js

@@ -1,7 +1,7 @@
 const express = require('express'),
     router = new express.Router();
 
-router.get('/', function (req, res) {
+router.get('/', function(req, res) {
     switch (req.accepts('html')) {
     case 'html':
         res.render('ping-form');