Merge pull request #19 from rsscloud/pre-production-cleanup

andrewshell · web-flow · commit 43aff40d4392 · 2025-06-25T09:43:56.000-05:00
Pre-production cleanup for 2.2.0 release
diff --git a/.prettierrc b/.prettierrc
@@ -2,12 +2,12 @@
   "tabWidth": 4,
   "useTabs": false,
   "semi": true,
-  "singleQuote": false,
+  "singleQuote": true,
   "quoteProps": "as-needed",
-  "trailingComma": "es5",
+  "trailingComma": false,
   "bracketSpacing": true,
   "bracketSameLine": false,
   "arrowParens": "avoid",
   "printWidth": 80,
   "endOfLine": "lf"
-}
+}
diff --git a/app.js b/app.js
@@ -59,7 +59,7 @@ app.use(require('./controllers'));
 async function startServer() {
     await initializeDayjs();
     await mongodb.connect('rsscloud', config.mongodbUri);
-    
+
     server = app.listen(config.port, () => {
         app.locals.host = config.domain;
         app.locals.port = server.address().port;
diff --git a/client.js b/client.js
@@ -19,13 +19,13 @@ require('console-stamp')(console, 'HH:MM:ss.l');
 nconf
     .overrides({
         'APP_NAME': 'rssCloudClient',
-        'APP_VERSION': packageJson.version,
+        'APP_VERSION': packageJson.version
     })
     .argv()
     .env()
     .defaults({
-        "DOMAIN": "localhost",
-        "PORT": 9000
+        'DOMAIN': 'localhost',
+        'PORT': 9000
     });
 
 console.log(`${nconf.get('APP_NAME')} ${nconf.get('APP_VERSION')}`);
@@ -44,21 +44,15 @@ app.use(express.static('public', {
 }));
 
 app.post('/RPC2', textParser, (req, res) => {
-    console.log('rpc');
-    console.dir(req.body);
     res.send('');
 });
 
 app.get('/*', (req, res) => {
-    const challenge = req.query.challenge || "";
-    console.log('get');
-    console.dir(req.query);
+    const challenge = req.query.challenge || '';
     res.send(challenge);
 });
 
 app.post('/*', urlencodedParser, (req, res) => {
-    console.log('post');
-    console.dir(req.body);
     res.send('');
 });
 
diff --git a/config.js b/config.js
@@ -9,19 +9,19 @@ const nconf = require('nconf'),
 nconf
     .overrides({
         'APP_NAME': 'rssCloudServer',
-        'APP_VERSION': packageJson.version,
+        'APP_VERSION': packageJson.version
     })
     .argv()
     .env()
     .defaults({
-        "DOMAIN": "localhost",
-        "PORT": 5337,
-        "MONGODB_URI": "mongodb://localhost:27017/rsscloud",
-        "MAX_CONSECUTIVE_ERRORS": 3,
-        "MAX_RESOURCE_SIZE": 256000,
-        "CT_SECS_RESOURCE_EXPIRE": 90000,
-        "MIN_SECS_BETWEEN_PINGS": 0,
-        "REQUEST_TIMEOUT": 4000
+        'DOMAIN': 'localhost',
+        'PORT': 5337,
+        'MONGODB_URI': 'mongodb://localhost:27017/rsscloud',
+        'MAX_CONSECUTIVE_ERRORS': 3,
+        'MAX_RESOURCE_SIZE': 256000,
+        'CT_SECS_RESOURCE_EXPIRE': 90000,
+        'MIN_SECS_BETWEEN_PINGS': 0,
+        'REQUEST_TIMEOUT': 4000
     });
 
 module.exports = {
diff --git a/controllers/docs.js b/controllers/docs.js
@@ -6,10 +6,15 @@ const express = require('express'),
 router.get('/', (req, res) => {
     switch (req.accepts('html')) {
     case 'html': {
-        const vals = {
-            htmltext: md.render(fs.readFileSync('README.md', { encoding: 'utf8' }))
-        };
-        res.render('docs', vals);
+        try {
+            const vals = {
+                htmltext: md.render(fs.readFileSync('README.md', { encoding: 'utf8' }))
+            };
+            res.render('docs', vals);
+        } catch (err) {
+            console.error('Error reading README.md:', err.message);
+            res.status(500).send('Internal Server Error');
+        }
         break;
     }
     default:
diff --git a/controllers/please-notify.js b/controllers/please-notify.js
@@ -34,17 +34,20 @@ function handleError(req, res, err) {
     processResponse(req, res, errorResult(err.message));
 }
 
-router.post('/', urlencodedParser, function(req, res) {
-    const params = parseNotifyParams.rest(req);
-    pleaseNotify(
-        params.notifyProcedure,
-        params.apiurl,
-        params.protocol,
-        params.urlList,
-        params.diffDomain
-    )
-        .then(result => processResponse(req, res, result))
-        .catch(err => handleError(req, res, err));
+router.post('/', urlencodedParser, async function(req, res) {
+    try {
+        const params = parseNotifyParams.rest(req);
+        const result = await pleaseNotify(
+            params.notifyProcedure,
+            params.apiurl,
+            params.protocol,
+            params.urlList,
+            params.diffDomain
+        );
+        processResponse(req, res, result);
+    } catch (err) {
+        handleError(req, res, err);
+    }
 });
 
 module.exports = router;
diff --git a/controllers/rpc2.js b/controllers/rpc2.js
@@ -36,54 +36,59 @@ function handleError(req, res, err) {
 router.post('/', textParser, async function(req, res) {
     let params;
     const dayjs = await getDayjs();
-    parseRpcRequest(req)
-        .then(request => {
-            logEvent(
-                'XmlRpc',
-                request.methodName,
-                dayjs().format('x')
-            );
 
-            switch (request.methodName) {
-            case 'rssCloud.hello':
-                processResponse(req, res, rpcReturnSuccess(true));
-                break;
-            case 'rssCloud.pleaseNotify':
-                try {
-                    params = parseNotifyParams.rpc(req, request.params);
-                    pleaseNotify(
-                        params.notifyProcedure,
-                        params.apiurl,
-                        params.protocol,
-                        params.urlList,
-                        params.diffDomain
-                    )
-                        .then(result => processResponse(req, res, rpcReturnSuccess(result.success)))
-                        .catch(err => handleError(req, res, err));
-                } catch (err) {
-                    handleError(req, res, err);
-                }
-                break;
-            case 'rssCloud.ping':
+    try {
+        const request = await parseRpcRequest(req);
+
+        logEvent(
+            'XmlRpc',
+            request.methodName,
+            dayjs().format('x')
+        );
+
+        switch (request.methodName) {
+        case 'rssCloud.hello':
+            processResponse(req, res, rpcReturnSuccess(true));
+            break;
+        case 'rssCloud.pleaseNotify':
+            try {
+                params = parseNotifyParams.rpc(req, request.params);
+                const result = await pleaseNotify(
+                    params.notifyProcedure,
+                    params.apiurl,
+                    params.protocol,
+                    params.urlList,
+                    params.diffDomain
+                );
+                processResponse(req, res, rpcReturnSuccess(result.success));
+            } catch (err) {
+                handleError(req, res, err);
+            }
+            break;
+        case 'rssCloud.ping':
+            try {
+                params = parsePingParams.rpc(req, request.params);
+                // Dave's rssCloud server always returns true whether it succeeded or not
                 try {
-                    params = parsePingParams.rpc(req, request.params);
-                    // Dave's rssCloud server always returns true whether it succeeded or not
-                    ping(params.url)
-                        .then(result => processResponse(req, res, rpcReturnSuccess(result.success)))
-                        .catch(_err => processResponse(req, res, rpcReturnSuccess(true)));
-                } catch (err) {
-                    handleError(req, res, err);
+                    const result = await ping(params.url);
+                    processResponse(req, res, rpcReturnSuccess(result.success));
+                } catch {
+                    processResponse(req, res, rpcReturnSuccess(true));
                 }
-                break;
-            default:
-                handleError(
-                    req,
-                    res,
-                    new Error(`Can't make the call because "${request.methodName}" is not defined.`)
-                );
+            } catch (err) {
+                handleError(req, res, err);
             }
-        })
-        .catch(err => handleError(req, res, err));
+            break;
+        default:
+            handleError(
+                req,
+                res,
+                new Error(`Can't make the call because "${request.methodName}" is not defined.`)
+            );
+        }
+    } catch (err) {
+        handleError(req, res, err);
+    }
 });
 
 module.exports = router;
diff --git a/eslint.config.js b/eslint.config.js
@@ -45,7 +45,7 @@ module.exports = [
             'keyword-spacing': 'error',
             'space-infix-ops': 'error',
             'space-unary-ops': 'error',
-            
+
             // Code quality
             'no-unused-vars': ['error', { 'argsIgnorePattern': '^_' }],
             'no-console': 'off',
@@ -58,10 +58,10 @@ module.exports = [
             'no-extra-bind': 'error',
             'no-multi-spaces': 'error',
             'no-global-assign': 'error',
-            
+
             // Your custom overrides
             'no-underscore-dangle': 'off',
             'no-continue': 'off'
         }
     }
-];
+];
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "start": "nodemon --use_strict ./app.js",
     "client": "nodemon --use_strict ./client.js",
     "import-data": "node ./bin/import-data.js",
-    "lint": "eslint --fix controllers/ services/ test/",
+    "lint": "eslint --fix controllers/ services/ test/ *.js",
     "format": "prettier --write .",
     "test": "mocha",
     "test-api": "docker-compose up --build --abort-on-container-exit"
diff --git a/public/js/moment-with-locales.min.js b/public/js/moment-with-locales.min.js
diff --git a/services/mongodb.js b/services/mongodb.js
@@ -6,7 +6,7 @@ async function connect(name, uri) {
         return;
     }
 
-    const client = await MongoClient.connect(uri, { useUnifiedTopology: true });
+    const client = await MongoClient.connect(uri);
 
     state[name] = client;
 
diff --git a/services/notify-one-challenge.js b/services/notify-one-challenge.js
@@ -11,8 +11,6 @@ async function notifyOneChallengeRest(apiurl, resourceUrl) {
         'challenge': challenge
     });
 
-    console.log(`GET ${testUrl}`);
-
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), config.requestTimeout);
 
diff --git a/services/notify-one.js b/services/notify-one.js
@@ -59,7 +59,7 @@ async function notifyOneRpc(notifyProcedure, apiurl, resourceUrl) {
     }).end({ pretty: true });
 
     const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 4000);
+    const timeoutId = setTimeout(() => controller.abort(), config.requestTimeout);
 
     try {
         const res = await fetch(apiurl, {
diff --git a/services/notify-subscribers.js b/services/notify-subscribers.js
@@ -87,11 +87,8 @@ async function notifySubscribers(resourceUrl) {
 
     await Promise.all(validSubscriptions.map(notifyOneSubscriber.bind(null, resourceUrl)));
 
-    console.log('upserting subscriptions');
-
     await upsertSubscriptions(subscriptions);
 
-    console.log('upserted subscriptions');
 }
 
 module.exports = notifySubscribers;
diff --git a/services/please-notify.js b/services/please-notify.js
@@ -82,8 +82,7 @@ async function notifyApiUrl(notifyProcedure, apiurl, protocol, resourceUrl, diff
             sprintf(appMessages.log.subscription, apiurl, parts.host, resourceUrl, parts.protocol),
             startticks
         );
-    } catch (err) {
-        console.dir(err);
+    } catch {
         throw new ErrorResponse(appMessages.error.subscription.failedHandler);
     }
 }
@@ -93,19 +92,18 @@ async function pleaseNotify(notifyProcedure, apiurl, protocol, urlList, diffDoma
         throw new ErrorResponse(appMessages.error.subscription.noResources);
     }
 
-    let lastErr, resourceUrl;
-
-    for (resourceUrl of urlList) {
-        try {
+    const results = await Promise.allSettled(
+        urlList.map(async(resourceUrl) => {
             await checkresourceUrlStatusCode(resourceUrl);
             await notifyApiUrl(notifyProcedure, apiurl, protocol, resourceUrl, diffDomain);
-        } catch (err) {
-            lastErr = err;
-        }
-    }
-
-    if (lastErr) {
-        throw lastErr;
+        })
+    );
+
+    // Check if all operations failed
+    const rejectedResults = results.filter(result => result.status === 'rejected');
+    if (rejectedResults.length === results.length && rejectedResults.length > 0) {
+        // If all operations failed, throw the last error
+        throw rejectedResults[rejectedResults.length - 1].reason;
     }
 
     return {
