Usable port for wallet-service

main.js

@@ -256,6 +256,17 @@ function storeNodeList(pnodes) {
 
     let validNodes = [];
     pnodes.forEach(node => {
+        if(node.hasOwnProperty('cache')) {
+            if (!config.remoteNodeCacheSupported && true === node.cache) {
+                return;
+            }
+        }
+        if(node.hasOwnProperty('ssl')) {
+            if (!config.remoteNodeSslSupported && true === node.ssl) {
+                return;
+            }
+        }
+
         let item = `${node.url}:${node.port}`;
         validNodes.push(item);
     });

src/js/ws_manager.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
+const net = require('net');
 const childProcess = require('child_process');
 const log = require('electron-log');
 const Store = require('electron-store');
@@ -20,6 +21,7 @@ const SERVICE_LOG_DEBUG = wsession.get('debug');
 const SERVICE_LOG_LEVEL_DEFAULT = 0;
 const SERVICE_LOG_LEVEL_DEBUG = 5;
 const SERVICE_LOG_LEVEL = (SERVICE_LOG_DEBUG ? SERVICE_LOG_LEVEL_DEBUG : SERVICE_LOG_LEVEL_DEFAULT);
+const SERVICE_MIN_LISTEN_PORT = 10101;
 
 const ERROR_WALLET_EXEC = `Failed to start ${config.walletServiceBinaryFilename}. Set the path to ${config.walletServiceBinaryFilename} properly in the settings tab.`;
 const ERROR_WALLET_PASSWORD = 'Failed to load your wallet, please check your password';
@@ -54,16 +56,32 @@ var PlenteumWalletManager = function () {
     this.fusionTxHash = [];
 };
 
+PlenteumWalletManager.prototype.getUnusedPort = function() {
+    let port = SERVICE_MIN_LISTEN_PORT;
+    const server = net.createServer();
+    return new Promise((resolve, reject) => server
+        .on('error', error => error.code === 'EADDRINUSE' ? server.listen(++port) : reject(error))
+        .on('listening', () => server.close(() => resolve(port)))
+        .listen(port));
+};
+
 PlenteumWalletManager.prototype.init = function () {
     this._getSettings();
     if (this.serviceApi !== null) return;
 
-    let cfg = {
-        service_host: this.serviceHost,
-        service_port: this.servicePort,
-        service_password: this.servicePassword
-    };
-    this.serviceApi = new PlenteumWalletApi(cfg);
+    this.getUnusedPort().then(port => {
+        console.log(`${port} is available`);
+        this.servicePort = port;
+        let cfg = {
+            service_host: this.serviceHost,
+            service_port: this.servicePort,
+            service_password: this.servicePassword
+        };
+        this.serviceApi = new PlenteumWalletApi(cfg);
+    }).catch((err) => {
+        log.error("Unable to find a port to listen to, please check your firewall settings");
+        log.error(err.message);
+    });
 };
 
 PlenteumWalletManager.prototype._getSettings = function () {
@@ -164,6 +182,7 @@ PlenteumWalletManager.prototype.startService = function (walletFile, password, o
     let serviceArgs = this.serviceArgsDefault.concat([
         '-w', walletFile,
         '-p', password,
+        '--bind-port', this.servicePort,
         '--log-level', 0,
         '--log-file', path.join(remote.app.getPath('temp'), 'ts.log'), // macOS failed without this
         '--address'
@@ -216,11 +235,13 @@ PlenteumWalletManager.prototype._spawnService = function (walletFile, password,
     let serviceArgs = this.serviceArgsDefault.concat([
         '--container-file', walletFile,
         '--container-password', password,
+        '--bind-port', this.servicePort,
         '--enable-cors', '*',
         '--daemon-address', this.daemonHost,
         '--daemon-port', this.daemonPort,
         '--log-level', SERVICE_LOG_LEVEL,
-        '--log-file', logFile
+        '--log-file', logFile,
+        '--init-timeout', timeout
     ]);
 
 

src/js/wsui_main.js

@@ -1482,6 +1482,7 @@ function handleWalletOpen() {
             wsutil.showToast('Network connectivity problem detected, node list update can not be performed');
             return;
         }
+
         if (!confirm("Refreshing node list may take a while to complete, are you sure?")) return;
         fetchNodeInfo(true);
     });
@@ -2562,6 +2563,10 @@ function initHandlers() {
         };
 
         if (dialogType === 'saveFile') {
+            dialogOpts.defaultPath = path.join(
+                recentDir,
+                `new_wallet_${(new Date()).getTime()}.${config.walletFileDefaultExt}`
+            );
             dialogOpts.title = `Select directory to store your ${targetName}, and give it a filename.`;
             dialogOpts.buttonLabel = 'OK';
 
@@ -2991,6 +2996,7 @@ document.addEventListener('DOMContentLoaded', () => {
             setTimeout(() => initNodeSelection, 500);
         }
     } else {
+        walletOpenRefreshNodes.classList.add('hidden');
         fetchFromRaw();
     }
 }, false);