Continuing to implement xml-rpc

andrewshell · andrewshell · commit 6dd2defa5cdf · 2020-01-31T15:38:05.000-06:00
diff --git a/bin/import-data.js b/bin/import-data.js
@@ -27,6 +27,8 @@ async function doImport() {
                     pleaseNotify: Object.keys(data.subscriptions[id]).map(sid => {
                         const subscription = data.subscriptions[id][sid];
                         subscription.url = sid;
+                        subscription.notifyProcedure = false;
+                        subscription.protocol = 'http-post';
                         return subscription;
                     })
                 }
diff --git a/client.js b/client.js
@@ -41,15 +41,13 @@ app = express();
 
 app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
 
-app.use(urlencodedParser);
-
 app.use(express.static('public', {
     dotfiles: 'ignore',
     maxAge: '1d'
 }));
 
 app.post('/RPC2', textParser, function (req, res) {
-    console.log('post');
+    console.log('rpc');
     console.dir(req.body);
     res.send('');
 })
@@ -61,7 +59,7 @@ app.get('/*', function (req, res) {
     res.send(challenge);
 });
 
-app.post('/*', function (req, res) {
+app.post('/*', urlencodedParser, function (req, res) {
     console.log('post');
     console.dir(req.body);
     res.send('');
diff --git a/controllers/rpc2.js b/controllers/rpc2.js
@@ -33,6 +33,10 @@
         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(
@@ -42,12 +46,12 @@
                             params.urlList,
                             params.diffDomain
                         )
-                            .then(result => processResponse(req, res, rpcReturnSuccess(result.success, result.msg)))
+                            .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, result.msg)))
+                            .then(result => processResponse(req, res, rpcReturnSuccess(result.success)))
                             .catch(err => handleError(req, res, err));
                         break;
                     default:
diff --git a/services/init-subscription.js b/services/init-subscription.js
@@ -4,15 +4,17 @@
     const config = require('../config'),
         moment = require('moment');
 
-    function initSubscription(subscriptions, apiurl) {
+    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
+            url: apiurl,
+            notifyProcedure,
+            protocol
         };
 
         const index = subscriptions.pleaseNotify.findIndex(subscription => {
diff --git a/services/notify-one.js b/services/notify-one.js
@@ -1,13 +1,14 @@
 (function () {
     "use strict";
 
-    const request = require('request-promise-native');
+    const builder = require('xmlbuilder'),
+        request = require('request-promise-native');
 
-    async function notifyOne(resourceUrl, apiurl) {
+    async function notifyOneRest(apiurl, resourceUrl) {
         const res = await request({
             method: 'POST',
             uri: apiurl,
-            data: {
+            form: {
                 'url': resourceUrl
             },
             resolveWithFullResponse: true
@@ -20,5 +21,42 @@
         return true;
     }
 
+    async function notifyOneRpc(notifyProcedure, apiurl, resourceUrl) {
+        const xmldoc = builder.create({
+            methodCall: {
+                methodName: notifyProcedure,
+                params: {
+                    param: [
+                        { value: resourceUrl }
+                    ]
+                }
+            }
+        });
+
+        const 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');
+        }
+
+        return true;
+    }
+
+    function notifyOne(notifyProcedure, apiurl, protocol, resourceUrl) {
+        if ('xml-rpc' === protocol) {
+            return notifyOneRpc(notifyProcedure, apiurl, resourceUrl);
+        }
+
+        return notifyOneRest(apiurl, resourceUrl);
+    }
+
     module.exports = notifyOne;
 }());
diff --git a/services/parse-notify-params.js b/services/parse-notify-params.js
@@ -4,7 +4,7 @@
     const appMessages = require('./app-messages'),
         sprintf = require('sprintf-js').sprintf;
 
-    function validateProtocol(protocol) {
+    function validProtocol(protocol) {
         switch (protocol) {
         case 'http-post':
         case 'https-post':
@@ -126,9 +126,9 @@
             params.notifyProcedure = false;
         }
 
-        parts.scheme = 'https-post' === parts.protocol ? 'https' : 'http';
-        parts.port = req.body.port;
-        parts.path = req.body.path;
+        parts.scheme = 'http';
+        parts.port = rpcParams[1];
+        parts.path = rpcParams[2];
 
         params.apiurl = glueUrlParts(
             parts.scheme,
diff --git a/services/parse-rpc-request.js b/services/parse-rpc-request.js
@@ -39,7 +39,11 @@
 					}, {});
 					break;
 				case 'array':
-					returnedValue = ((value[tag].data || {}).value || []).map(parseRpcParam);
+                    let values = (value[tag].data || {}).value || [];
+                    if (!Array.isArray(values)) {
+                        values = [values];
+                    }
+					returnedValue = values.map(parseRpcParam);
 					break;
     		}
     	}
diff --git a/services/please-notify.js b/services/please-notify.js
@@ -50,18 +50,18 @@
             );
     }
 
-    async function notifyApiUrl(resourceUrl, apiurl, diffDomain) {
+    async function notifyApiUrl(notifyProcedure, apiurl, protocol, resourceUrl, diffDomain) {
         const subscriptions = await fetchSubscriptions(resourceUrl),
             startticks = moment().format('x'),
             parts = url.parse(apiurl);
 
-        initSubscription(subscriptions, apiurl);
+        initSubscription(subscriptions, notifyProcedure, apiurl, protocol);
 
         try {
             if (diffDomain) {
                 await notifyOneChallenge(resourceUrl, apiurl);
             } else {
-                await notifyOne(resourceUrl, apiurl);
+                await notifyOne(notifyProcedure, apiurl, protocol, resourceUrl);
             }
 
             const index = subscriptions.pleaseNotify.findIndex(subscription => {
@@ -96,7 +96,7 @@
         for (resourceUrl of urlList) {
             try {
                 await checkresourceUrlStatusCode(resourceUrl);
-                await notifyApiUrl(resourceUrl, apiurl, diffDomain);
+                await notifyApiUrl(notifyProcedure, apiurl, protocol, resourceUrl, diffDomain);
             } catch (err) {
                 lastErr = err;
             }
diff --git a/services/rpc-return-success.js b/services/rpc-return-success.js
@@ -3,7 +3,7 @@
 
     const builder = require('xmlbuilder');
 
-    function rpcReturnSuccess(success, message) {
+    function rpcReturnSuccess(success) {
         return builder.create({
         	methodResponse: {
         		params: {
@@ -12,12 +12,7 @@
 	        				value: {
 		        				boolean: success ? 1 : 0
 		        			}
-		        		},
-	        			{
-	        				value: {
-		        				string: message
-		        			}
-		        		},
+		        		}
 	        		]
 	        	}
         	}
diff --git a/test.js b/test.js

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ async function doImport() {`
`27`	`27`	`pleaseNotify: Object.keys(data.subscriptions[id]).map(sid => {`
`28`	`28`	`const subscription = data.subscriptions[id][sid];`
`29`	`29`	`subscription.url = sid;`
	`30`	`+ subscription.notifyProcedure = false;`
	`31`	`+ subscription.protocol = 'http-post';`
`30`	`32`	`return subscription;`
`31`	`33`	`})`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@`
`39`	`39`	`}, {});`
`40`	`40`	`break;`
`41`	`41`	`case 'array':`
`42`		`- returnedValue = ((value[tag].data \|\| {}).value \|\| []).map(parseRpcParam);`
	`42`	`+ let values = (value[tag].data \|\| {}).value \|\| [];`
	`43`	`+ if (!Array.isArray(values)) {`
	`44`	`+ values = [values];`
	`45`	`+ }`
	`46`	`+ returnedValue = values.map(parseRpcParam);`
`43`	`47`	`break;`
`44`	`48`	`}`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`const builder = require('xmlbuilder');`
`5`	`5`
`6`		`- function rpcReturnSuccess(success, message) {`
	`6`	`+ function rpcReturnSuccess(success) {`
`7`	`7`	`return builder.create({`
`8`	`8`	`methodResponse: {`
`9`	`9`	`params: {`
`@@ -12,12 +12,7 @@`
`12`	`12`	`value: {`
`13`	`13`	`boolean: success ? 1 : 0`
`14`	`14`	`}`
`15`		`- },`
`16`		`- {`
`17`		`- value: {`
`18`		`- string: message`
`19`		`- }`
`20`		`- },`
	`15`	`+ }`
`21`	`16`	`]`
`22`	`17`	`}`
`23`	`18`	`}`