Finished tests for ping

Author: andrewshell

.eslintrc.json

@@ -5,7 +5,8 @@
     "extends": "crockford",
     "env": {
     	"node": true,
-    	"es6": true
+    	"es6": true,
+        "mocha": true
     },
     "rules": {
         "no-underscore-dangle": "off",

DEVNOTES.md

@@ -0,0 +1,22 @@
+# Developer Notes
+
+## Can I test pleaseNotify without domain? Docker might not allow.
+
+Please notify verifies a reader differently whether or not there is a domain specified. I need to make sure I test both cases.
+
+## Make sure I test pleaseNotify with multiple urls including where one url fails.
+
+Just because one fails doesn't mean the others aren't good. The response from Dave's server is a pass or fail so I'll stick with that and show a failure even if only one fails.  This is probably an edge case.
+
+## If I ping Dave's server with a bad domain I get the following error:
+
+```xml
+<?xml version="1.0"?>
+<result success="false" msg="Can&apos;t open named stream because TCP/IP error code 11001 - Host not found. (DNS error)." />
+```
+
+I should make sure I return the same response if possible.
+
+## Is there a way to create mock a server with https in docker?
+
+I'm adding https-post as an option and would like to make sure to test it.

bin/import-data.js

@@ -36,7 +36,7 @@ async function doImport() {
                         subscription.protocol = 'http-post';
                         return subscription;
                     })
-                }
+                };
                 return {
                     replaceOne: {
                         filter: { _id: id },

controllers/rpc2.js

@@ -36,33 +36,33 @@
         parseRpcRequest(req)
             .then(request => {
                 switch (request.methodName) {
-                    case 'rssCloud.hello':
-                        console.log(request.params[0]);
-                        processResponse(req, res, rpcReturnSuccess(true));
-                        break;
-                    case 'rssCloud.pleaseNotify':
-                        const 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));
-                        break;
-                    case 'rssCloud.ping':
-                        ping(request.params[0])
-                            .then(result => processResponse(req, res, rpcReturnSuccess(result.success)))
-                            .catch(err => handleError(req, res, err));
-                        break;
-                    default:
-                        handleError(
-                            req,
-                            res,
-                            new Error(`Can't make the call because "${request.methodName}" is not defined.`)
-                        )
+                case 'rssCloud.hello':
+                    console.log(request.params[0]);
+                    processResponse(req, res, rpcReturnSuccess(true));
+                    break;
+                case 'rssCloud.pleaseNotify':
+                    const 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));
+                    break;
+                case 'rssCloud.ping':
+                    ping(request.params[0])
+                        .then(result => processResponse(req, res, rpcReturnSuccess(result.success)))
+                        .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));

controllers/view-log.js

@@ -9,15 +9,15 @@
 
     async function fetchVals(db, callback) {
         const vals = {
-            'eventlog': []
-        };
+                'eventlog': []
+            },
 
-        const res = await mongodb.get('rsscloud')
-            .collection('events')
-            .find()
-            .sort({ time: -1 })
-            .limit(1000)
-            .toArray();
+            res = await mongodb.get('rsscloud')
+                .collection('events')
+                .find()
+                .sort({ time: -1 })
+                .limit(1000)
+                .toArray();
 
         vals.eventlog = res.map(item => {
             item.id = item._id.toHexString();
@@ -46,7 +46,7 @@
         }
     }
 
-    function handleError(req, res, errorMessage) {
+    function handleError(req, res, err) {
         console.error(err);
         processResponse(req, res, errorResult(err.message));
     }

docker-compose.yml

@@ -17,6 +17,7 @@ services:
       DOMAIN: rsscloud
       PORT: 5337
       MONGODB_URI: mongodb://mongodb:27017/rsscloud
+      NODE_TLS_REJECT_UNAUTHORIZED: 0
     expose:
       - 5337
     depends_on:
@@ -32,8 +33,11 @@ services:
       MONGODB_URI: mongodb://mongodb:27017/rsscloud
       MOCK_SERVER_URL: http://rsscloud-tests:8002
       MOCK_SERVER_PORT: 8002
+      SECURE_MOCK_SERVER_URL: https://rsscloud-tests:8003
+      SECURE_MOCK_SERVER_PORT: 8003
     expose:
       - 8002
+      - 8003
     depends_on:
       - mongodb
       - rsscloud

package-lock.json

@@ -7,9 +7,9 @@
     "start": "nodemon --use_strict ./app.js",
     "client": "nodemon --use_strict ./client.js",
     "import-data": "node ./bin/import-data.js",
-    "jshint": "echo '=> linting' && jshint ./**/*.js",
-    "eslint": "echo '=> sniffing' && eslint controllers/ services/",
-    "test": "mocha --timeout 10000 --bail",
+    "jshint": "jshint ./**/*.js",
+    "eslint": "eslint --fix controllers/ services/ test/",
+    "test": "mocha --timeout 10000",
     "test-api": "docker-compose up --build --abort-on-container-exit"
   },
   "engines": {
@@ -48,6 +48,7 @@
     "chai-xml": "^0.3.2",
     "eslint": "^7.9.0",
     "eslint-config-crockford": "^2.0.0",
+    "https": "^1.0.0",
     "jshint": "^2.12.0",
     "mocha": "^8.1.3",
     "nodemon": "2.0.4",

package.json

@@ -5,14 +5,14 @@
 
     function initResource(resource) {
         const defaultResource = {
-                flDirty: true,
-                lastSize: 0,
-                lastHash: '',
-                ctChecks: 0,
-                whenLastCheck: moment.utc('0', 'x').format(),
-                ctUpdates: 0,
-                whenLastUpdate: moment.utc('0', 'x').format()
-            };
+            flDirty: true,
+            lastSize: 0,
+            lastHash: '',
+            ctChecks: 0,
+            whenLastCheck: moment.utc('0', 'x').format(),
+            ctUpdates: 0,
+            whenLastUpdate: moment.utc('0', 'x').format()
+        };
 
         return Object.assign({}, defaultResource, resource);
     }

services/init-resource.js

@@ -6,20 +6,20 @@
 
     function initSubscription(subscriptions, notifyProcedure, apiurl, protocol) {
         const defaultSubscription = {
-            ctUpdates: 0,
-            whenLastUpdate: moment.utc('0', 'x').format(),
-            ctErrors: 0,
-            ctConsecutiveErrors: 0,
-            whenLastError: moment.utc('0', 'x').format(),
-            whenExpires: moment().utc().add(config.ctSecsResourceExpire, 'seconds').format(),
-            url: apiurl,
-            notifyProcedure,
-            protocol
-        };
+                ctUpdates: 0,
+                whenLastUpdate: moment.utc('0', 'x').format(),
+                ctErrors: 0,
+                ctConsecutiveErrors: 0,
+                whenLastError: moment.utc('0', 'x').format(),
+                whenExpires: moment().utc().add(config.ctSecsResourceExpire, 'seconds').format(),
+                url: apiurl,
+                notifyProcedure,
+                protocol
+            },
 
-        const index = subscriptions.pleaseNotify.findIndex(subscription => {
-            return subscription.url === apiurl;
-        });
+            index = subscriptions.pleaseNotify.findIndex(subscription => {
+                return subscription.url === apiurl;
+            });
 
         if (-1 === index) {
             subscriptions.pleaseNotify.push(defaultSubscription);