fixes #10

Author: andrewshell

services/init-resource.js

@@ -9,9 +9,9 @@
             lastSize: 0,
             lastHash: '',
             ctChecks: 0,
-            whenLastCheck: moment.utc('0', 'x').format(),
+            whenLastCheck: new Date(moment.utc('0', 'x').format()),
             ctUpdates: 0,
-            whenLastUpdate: moment.utc('0', 'x').format()
+            whenLastUpdate: new Date(moment.utc('0', 'x').format())
         };
 
         return Object.assign({}, defaultResource, resource);

services/init-subscription.js

@@ -7,11 +7,11 @@
     function initSubscription(subscriptions, notifyProcedure, apiurl, protocol) {
         const defaultSubscription = {
                 ctUpdates: 0,
-                whenLastUpdate: moment.utc('0', 'x').format(),
+                whenLastUpdate: new Date(moment.utc('0', 'x').format()),
                 ctErrors: 0,
                 ctConsecutiveErrors: 0,
-                whenLastError: moment.utc('0', 'x').format(),
-                whenExpires: moment().utc().add(config.ctSecsResourceExpire, 'seconds').format(),
+                whenLastError: new Date(moment.utc('0', 'x').format()),
+                whenExpires: new Date(moment().utc().add(config.ctSecsResourceExpire, 'seconds').format()),
                 url: apiurl,
                 notifyProcedure,
                 protocol

services/notify-one-challenge.js

@@ -2,6 +2,7 @@
     "use strict";
 
     const config = require('../config'),
+        ErrorResponse = require('./error-response'),
         notifyOne = require('./notify-one'),
         getRandomPassword = require('./get-random-password'),
         querystring = require('querystring'),
@@ -14,13 +15,16 @@
                 'challenge': challenge
             }),
             res = await request({
+                method: 'GET',
+                followRedirect: true,
+                maxRedirects: 3,
                 uri: testUrl,
                 timeout: config.requestTimeout,
                 resolveWithFullResponse: true
             });
 
         if (res.statusCode < 200 || res.statusCode > 299 || res.body !== challenge) {
-            throw new Error('Notification Failed');
+            throw new ErrorResponse('Notification Failed');
         }
     }
 

services/notify-one.js

@@ -9,6 +9,8 @@
     async function notifyOneRest(apiurl, resourceUrl) {
         const res = await request({
             method: 'POST',
+            followRedirect: true,
+            maxRedirects: 3,
             uri: apiurl,
             timeout: config.requestTimeout,
             form: {

services/notify-subscribers.js

@@ -42,7 +42,7 @@
 
             subscription.ctUpdates += 1;
             subscription.ctConsecutiveErrors = 0;
-            subscription.whenLastUpdate = moment().utc().format();
+            subscription.whenLastUpdate = new Date(moment().utc().format());
 
             await logEvent(
                 'Notify',
@@ -54,7 +54,7 @@
 
             subscription.ctErrors += 1;
             subscription.ctConsecutiveErrors += 1;
-            subscription.whenLastError = moment().utc().format();
+            subscription.whenLastError = new Date(moment().utc().format());
 
             await logEvent(
                 'NotifyFailed',

services/ping.js

@@ -44,7 +44,7 @@
         }
 
         resource.ctChecks += 1;
-        resource.whenLastCheck = moment().utc().format();
+        resource.whenLastCheck = new Date(moment().utc().format());
 
         if (res.statusCode < 200 || res.statusCode > 299) {
             throw new ErrorResponse(sprintf(appMessage.error.ping.readResource, resourceUrl));
@@ -93,7 +93,7 @@
     async function notifySubscribersIfDirty(resource, resourceUrl) {
         if (resource.flDirty) {
             resource.ctUpdates += 1;
-            resource.whenLastUpdate = moment().utc().format();
+            resource.whenLastUpdate = new Date(moment().utc().format());
             return await notifySubscribers(resourceUrl);
         }
     }

services/please-notify.js

@@ -73,7 +73,7 @@
 
             subscriptions.pleaseNotify[index].ctUpdates += 1;
             subscriptions.pleaseNotify[index].ctConsecutiveErrors = 0;
-            subscriptions.pleaseNotify[index].whenLastUpdate = moment().utc().format();
+            subscriptions.pleaseNotify[index].whenLastUpdate = new Date(moment().utc().format());
             subscriptions.pleaseNotify[index].whenExpires = moment().utc().add(config.ctSecsResourceExpire, 'seconds').format();
 
             await upsertSubscriptions(subscriptions);