Merge pull request #16 from rsscloud/replace-moment-with-dayjs

Replace moment.js with Day.js for date/time operations

Author: andrewshell

app.js

@@ -4,12 +4,12 @@ const config = require('./config'),
     cors = require('cors'),
     express = require('express'),
     exphbs = require('express-handlebars'),
-    moment = require('moment'),
+    getDayjs = require('./services/dayjs-wrapper'),
     mongodb = require('./services/mongodb'),
     morgan = require('morgan');
     // removeExpiredSubscriptions = require('./services/remove-expired-subscriptions');
 
-let app, hbs, server;
+let app, hbs, server, dayjs;
 
 require('console-stamp')(console, 'HH:MM:ss.l');
 
@@ -22,18 +22,23 @@ morgan.format('mydate', () => {
     return df(new Date(), 'HH:MM:ss.l');
 });
 
+// Initialize dayjs at startup
+async function initializeDayjs() {
+    dayjs = await getDayjs();
+}
+
 app = express();
 require('express-ws')(app);
 
 app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
 
 app.use(cors());
 
-// Configure handlebars template engine to work with moment
+// Configure handlebars template engine to work with dayjs
 hbs = exphbs.create({
     helpers: {
         formatDate: (datetime, format) => {
-            return moment(datetime).format(format);
+            return dayjs(datetime).format(format);
         }
     }
 });
@@ -52,25 +57,29 @@ app.use(express.static('public', {
 app.use(require('./controllers'));
 
 // Start server
-mongodb.connect('rsscloud', config.mongodbUri)
-    .then(() => {
-        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 + ']';
+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;
+
+        if (app.locals.host.indexOf(':') > -1) {
+            app.locals.host = '[' + app.locals.host + ']';
+        }
+
+        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);
             }
+        });
+}
 
-            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);
-                }
-            });
-    });
+startServer().catch(console.error);

controllers/rpc2.js

@@ -2,8 +2,8 @@
 const bodyParser = require('body-parser'),
     ErrorResponse = require('../services/error-response'),
     express = require('express'),
+    getDayjs = require('../services/dayjs-wrapper'),
     logEvent = require('../services/log-event'),
-    moment = require('moment'),
     parseRpcRequest = require('../services/parse-rpc-request'),
     parseNotifyParams = require('../services/parse-notify-params'),
     parsePingParams = require('../services/parse-ping-params'),
@@ -33,14 +33,15 @@ function handleError(req, res, err) {
     processResponse(req, res, rpcReturnFault(4, err.message));
 }
 
-router.post('/', textParser, function(req, res) {
+router.post('/', textParser, async function(req, res) {
     let params;
+    const dayjs = await getDayjs();
     parseRpcRequest(req)
         .then(request => {
             logEvent(
                 'XmlRpc',
                 request.methodName,
-                moment().format('x')
+                dayjs().format('x')
             );
 
             switch (request.methodName) {

package-lock.json

@@ -27,7 +27,7 @@
     "express-handlebars": "^5.3.3",
     "express-ws": "^5.0.2",
     "markdown-it": "^14.1.0",
-    "moment": "^2.30.1",
+    "dayjs": "^1.11.13",
     "mongodb": "6.17.0",
     "morgan": "^1.10.0",
     "nconf": "^0.13.0",

package.json

@@ -0,0 +1,20 @@
+let dayjs;
+
+async function getDayjs() {
+    if (!dayjs) {
+        const dayjsModule = await import('dayjs');
+        const utc = await import('dayjs/plugin/utc.js');
+        const advancedFormat = await import('dayjs/plugin/advancedFormat.js');
+        const duration = await import('dayjs/plugin/duration.js');
+        const customParseFormat = await import('dayjs/plugin/customParseFormat.js');
+        
+        dayjs = dayjsModule.default;
+        dayjs.extend(utc.default);
+        dayjs.extend(advancedFormat.default);
+        dayjs.extend(duration.default);
+        dayjs.extend(customParseFormat.default);
+    }
+    return dayjs;
+}
+
+module.exports = getDayjs;

services/dayjs-wrapper.js

@@ -1,14 +1,15 @@
-const moment = require('moment');
+const getDayjs = require('./dayjs-wrapper');
 
-function initResource(resource) {
+async function initResource(resource) {
+    const dayjs = await getDayjs();
     const defaultResource = {
         flDirty: true,
         lastSize: 0,
         lastHash: '',
         ctChecks: 0,
-        whenLastCheck: new Date(moment.utc('0', 'x').format()),
+        whenLastCheck: new Date(dayjs.utc('0', 'x').format()),
         ctUpdates: 0,
-        whenLastUpdate: new Date(moment.utc('0', 'x').format())
+        whenLastUpdate: new Date(dayjs.utc('0', 'x').format())
     };
 
     return Object.assign({}, defaultResource, resource);

services/init-resource.js

@@ -1,14 +1,15 @@
 const config = require('../config'),
-    moment = require('moment');
+    getDayjs = require('./dayjs-wrapper');
 
-function initSubscription(subscriptions, notifyProcedure, apiurl, protocol) {
+async function initSubscription(subscriptions, notifyProcedure, apiurl, protocol) {
+    const dayjs = await getDayjs();
     const defaultSubscription = {
             ctUpdates: 0,
-            whenLastUpdate: new Date(moment.utc('0', 'x').format()),
+            whenLastUpdate: new Date(dayjs.utc('0', 'x').format()),
             ctErrors: 0,
             ctConsecutiveErrors: 0,
-            whenLastError: new Date(moment.utc('0', 'x').format()),
-            whenExpires: new Date(moment().utc().add(config.ctSecsResourceExpire, 'seconds').format()),
+            whenLastError: new Date(dayjs.utc('0', 'x').format()),
+            whenExpires: new Date(dayjs().utc().add(config.ctSecsResourceExpire, 'seconds').format()),
             url: apiurl,
             notifyProcedure,
             protocol

services/init-subscription.js

@@ -1,11 +1,12 @@
-const logEmitter = require('./log-emitter'),
-    moment = require('moment'),
+const getDayjs = require('./dayjs-wrapper'),
+    logEmitter = require('./log-emitter'),
     mongodb = require('./mongodb');
 
 async function logEvent(eventtype, htmltext, startticks, req) {
+    const dayjs = await getDayjs();
     let secs, time;
 
-    time = moment();
+    time = dayjs();
     secs = (parseInt(time.format('x'), 10) - parseInt(startticks, 10)) / 1000;
 
     if (undefined === req) {

services/log-event.js

@@ -1,7 +1,7 @@
 const appMessages = require('./app-messages'),
     config = require('../config'),
+    getDayjs = require('./dayjs-wrapper'),
     logEvent = require('./log-event'),
-    moment = require('moment'),
     mongodb = require('./mongodb'),
     notifyOne = require('./notify-one'),
     sprintf = require('sprintf-js').sprintf,
@@ -28,8 +28,9 @@ async function upsertSubscriptions(subscriptions) {
 }
 
 async function notifyOneSubscriber(resourceUrl, subscription) {
+    const dayjs = await getDayjs();
     const apiurl = subscription.url,
-        startticks = moment().format('x'),
+        startticks = dayjs().format('x'),
         parts = url.parse(apiurl),
         notifyProcedure = subscription.notifyProcedure,
         protocol = subscription.protocol;
@@ -39,7 +40,7 @@ async function notifyOneSubscriber(resourceUrl, subscription) {
 
         subscription.ctUpdates += 1;
         subscription.ctConsecutiveErrors = 0;
-        subscription.whenLastUpdate = new Date(moment().utc().format());
+        subscription.whenLastUpdate = new Date(dayjs().utc().format());
 
         await logEvent(
             'Notify',
@@ -51,7 +52,7 @@ async function notifyOneSubscriber(resourceUrl, subscription) {
 
         subscription.ctErrors += 1;
         subscription.ctConsecutiveErrors += 1;
-        subscription.whenLastError = new Date(moment().utc().format());
+        subscription.whenLastError = new Date(dayjs().utc().format());
 
         await logEvent(
             'NotifyFailed',
@@ -61,8 +62,9 @@ async function notifyOneSubscriber(resourceUrl, subscription) {
     }
 }
 
-function filterSubscribers(subscription) {
-    if (moment().isAfter(subscription.whenExpires)) {
+async function filterSubscribers(subscription) {
+    const dayjs = await getDayjs();
+    if (dayjs().isAfter(subscription.whenExpires)) {
         return false;
     }
 
@@ -76,7 +78,14 @@ function filterSubscribers(subscription) {
 async function notifySubscribers(resourceUrl) {
     const subscriptions = await fetchSubscriptions(resourceUrl);
 
-    await Promise.all(subscriptions.pleaseNotify.filter(filterSubscribers).map(notifyOneSubscriber.bind(null, resourceUrl)));
+    const validSubscriptions = [];
+    for (const subscription of subscriptions.pleaseNotify) {
+        if (await filterSubscribers(subscription)) {
+            validSubscriptions.push(subscription);
+        }
+    }
+
+    await Promise.all(validSubscriptions.map(notifyOneSubscriber.bind(null, resourceUrl)));
 
     console.log('upserting subscriptions');