Consolidated ping tests, started pleaseNotify tests, fixed bugs in services

Author: andrewshell

DEVNOTES.md

@@ -1,14 +1,10 @@
 # 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:
+## OPML Editor fails ping with a bad domain
 
 ```xml
 <?xml version="1.0"?>
@@ -17,6 +13,10 @@ Just because one fails doesn't mean the others aren't good. The response from Da
 
 I should make sure I return the same response if possible.
 
-## Is there a way to create mock a server with https in docker?
+## OPML Editor fails pleaseNotify if missing parameters
+
+```xml
+<?xml version="1.0"?>
+<notifyResult success="false" msg="The following parameters were missing from the request body: notifyProcedure, port, path, protocol." />
+```
 
-I'm adding https-post as an option and would like to make sure to test it.

docker-compose.yml

@@ -31,9 +31,8 @@ services:
     environment:
       APP_URL: http://rsscloud:5337
       MONGODB_URI: mongodb://mongodb:27017/rsscloud
-      MOCK_SERVER_URL: http://rsscloud-tests:8002
+      MOCK_SERVER_DOMAIN: rsscloud-tests
       MOCK_SERVER_PORT: 8002
-      SECURE_MOCK_SERVER_URL: https://rsscloud-tests:8003
       SECURE_MOCK_SERVER_PORT: 8003
     volumes:
       - ./xunit:/app/xunit

services/notify-one.js

@@ -23,25 +23,25 @@
 
     async function notifyOneRpc(notifyProcedure, apiurl, resourceUrl) {
         const xmldoc = builder.create({
-                methodCall: {
-                    methodName: notifyProcedure,
-                    params: {
-                        param: [
-                            { value: resourceUrl }
-                        ]
-                    }
+            methodCall: {
+                methodName: notifyProcedure,
+                params: {
+                    param: [
+                        { value: resourceUrl }
+                    ]
                 }
-            }).end({ pretty: true }),
-
-            res = await request({
-                method: 'POST',
-                uri: apiurl,
-                body: xmldoc,
-                resolveWithFullResponse: true,
-                headers: {
-                    'content-type': 'text/xml'
-                }
-            });
+            }
+        }).end({ pretty: true });
+
+        let res = await request({
+            method: 'POST',
+            uri: apiurl,
+            body: xmldoc,
+            resolveWithFullResponse: true,
+            headers: {
+                'content-type': 'text/xml'
+            }
+        });
 
         if (res.statusCode < 200 || res.statusCode > 299) {
             throw new Error('Notification Failed');

services/parse-notify-params.js

@@ -84,7 +84,7 @@
         }
 
         if (0 === s.length) {
-            parts.scheme = 'https-post' === parts.protocol ? 'https' : 'http';
+            parts.scheme = 'https-post' === params.protocol ? 'https' : 'http';
             parts.port = req.body.port;
             parts.path = req.body.path;
 

services/ping.js

@@ -31,7 +31,10 @@
 
         try {
             res = await request({
+                method: 'GET',
                 uri: resourceUrl,
+                followRedirect: true,
+                maxRedirects: 3,
                 resolveWithFullResponse: true
             });
         } catch (err) {

services/please-notify.js

@@ -15,9 +15,10 @@
 
     async function checkresourceUrlStatusCode(resourceUrl) {
         return request({
-            method: 'HEAD',
+            method: 'GET',
             uri: resourceUrl,
-            followRedirect: false,
+            followRedirect: true,
+            maxRedirects: 3,
             resolveWithFullResponse: true
         })
             .then(res => {

test/mock.js

@@ -1,25 +1,27 @@
-const https = require('https');
-const fs = require('fs');
-const express = require("express");
-const bodyParser = require("body-parser"),
+const https = require('https'),
+    fs = require('fs'),
+    express = require('express'),
+    bodyParser = require('body-parser'),
     textParser = bodyParser.text({ type: '*/xml'}),
-    urlencodedParser = bodyParser.urlencoded({ extended: false });
-const parseRpcRequest = require('../services/parse-rpc-request'),
+    urlencodedParser = bodyParser.urlencoded({ extended: false }),
+    parseRpcRequest = require('../services/parse-rpc-request'),
+    MOCK_SERVER_DOMAIN = process.env.MOCK_SERVER_DOMAIN,
     MOCK_SERVER_PORT = process.env.MOCK_SERVER_PORT || 8002,
-    MOCK_SERVER_URL = process.env.MOCK_SERVER_URL || `http://localhost:${MOCK_SERVER_PORT}`,
+    MOCK_SERVER_URL = process.env.MOCK_SERVER_URL || `http://${MOCK_SERVER_DOMAIN}:${MOCK_SERVER_PORT}`,
     SECURE_MOCK_SERVER_PORT = process.env.SECURE_MOCK_SERVER_PORT || 8003,
-    SECURE_MOCK_SERVER_URL = process.env.SECURE_MOCK_SERVER_URL || `http://localhost:${SECURE_MOCK_SERVER_PORT}`;
-const rpcReturnFault = require('../services/rpc-return-fault');
+    SECURE_MOCK_SERVER_URL = process.env.SECURE_MOCK_SERVER_URL || `https://${MOCK_SERVER_DOMAIN}:${SECURE_MOCK_SERVER_PORT}`,
+    rpcReturnFault = require('../services/rpc-return-fault');
 
 function restController(req, res) {
     const method = req.method,
         path = req.path;
 
-    if (this.routes[method][path]) {
+    if (this.routes[method] && this.routes[method][path]) {
         this.requests[method][path].push(req);
+        let responseBody = this.routes[method][path].responseBody;
         res
             .status(this.routes[method][path].status)
-            .send(this.routes[method][path].responseBody);
+            .send(typeof responseBody === 'function' ? responseBody(req) : responseBody);
     } else {
         res
             .status(501)
@@ -52,8 +54,11 @@ function rpcController(req, res) {
 module.exports = {
     app: express(),
     server: null,
+    serverDomain: MOCK_SERVER_DOMAIN,
+    serverPort: MOCK_SERVER_PORT,
     serverUrl: MOCK_SERVER_URL,
     secureServer: null,
+    secureServerPort: SECURE_MOCK_SERVER_PORT,
     secureServerUrl: SECURE_MOCK_SERVER_URL,
     requests: {
         'GET': {},