Changed vpncmd param HUB to ADMINHUB

Added hub commands hubStatus and hubUserList

modules/softEther.js

@@ -24,6 +24,9 @@ const csvParseOptions_object = {
 
 
 var softEther = {
+ /*
+ * SERVER COMMANDS
+ */
  about: function () {
  return this.executeHeaderlessCommand('About');
  },
@@ -100,6 +103,20 @@ var softEther = {
  return this.executeCSVCommand('VpnAzureGetStatus');
  },
 
+ /*
+ * HUB COMMANDS
+ */
+ hubStatus: function (name) {
+ return this.executeCSVCommand('StatusGet', null, name, 0, 0, csvParseOptions_flat, true);
+ },
+ hubUserList: function (name) {
+ return this.executeCSVCommand('UserList', null, name);
+ },
+
+ /*
+ * HELPER FUNCTIONS
+ */
+
  flattenData: function (data) {
  var retData = {};
  data.forEach(element => {
@@ -192,7 +209,8 @@ var softEther = {
  }
  // select the hub
  if (hubName) {
- command += ' /HUB:' + hubName;
+ //command += ' /HUB:' + hubName; // this would require the hub password, and we only have the server pwd
+ command += ' /ADMINHUB:' + hubName;
  }
  // the command to execute on the server
  command += ' /CMD ' + softEtherCommand;

routes/hub.js

@@ -2,11 +2,39 @@ var express = require('express');
 var router = express.Router();
 var cache = require('../modules/cache');
 var cors = require('cors');
+var softEther = require('../modules/softEther');
 
 router.use(cors());
 
-router.get('/', function (req, res) {
- res.send('hub');
+router.get('/:hubName/status', cache(10), function (req, res) {
+ handleResponse(softEther.hubStatus(getHubName(req)), res);
 });
+router.get('/:hubName/userList', cache(10), function (req, res) {
+ handleResponse(softEther.hubUserList(getHubName(req)), res);
+});
+
+function getHubName(req) {
+ return req.params['hubName'];
+}
+
+function handleResponse(promise, res) {
+ promise
+ .then(function (data) {
+ sendResult(res, data);
+ })
+ .catch(function (err) {
+ handleError(res, err);
+ });
+}
+
+function sendResult(res, data) {
+ console.log(data);
+ res.status(200).send(data);
+}
+
+function handleError(res, err) {
+ console.log(err); 
+ res.status(500);
+}
 
 module.exports = router;