Added the ability to provide a password for the Cluster (Leave blank for old-behaviour)

Author: int2001

docker-compose.yaml

@@ -7,12 +7,13 @@ services:
     environment:
       MAXCACHE: 100	# Max Spots to cache
       WEBPORT: 8192	# Port the App should listen on for Requests (see ports here)
-      WAVELOG_URL: https://[my_wavelog_instance]/index.php/api/lookup	# Wavelog-API-Endpoint for looking up DXCC
+      WAVELOG_URL: http[s]://[my_wavelog_instance]/index.php/api/lookup	# Wavelog-API-Endpoint for looking up DXCC
       WEBURL: /t	# sub-url. e.g. if "/t" the application can be reached via "http://[ip]/t/stats" etc.
       WAVELOG_KEY: clxyz1234567	# Key from wavelog-api
       DXHOST: dxfun.com	# DNS of DXCluster upstream
       DXPORT: 8000	# Port of DXCluster upstream
       DXCALL: [my_call]	# Login-Call for Cluster
+      DXPASSWORD: [my_password]	# Login-Passwort for Cluster (in most of all cases leave this blank!!
     ports:
       - 8192:8192	# Exposed port - see WEBPORT above
     restart: unless-stopped

dxcluster/index.js

@@ -10,6 +10,7 @@ module.exports = class DXCluster extends events.EventEmitter {
     this.status = {
       connected: false,
       awaiting_login: false,
+      awaiting_password: false,
     }
     this.regex = {
       deline: /^(DX de) +([A-Z0-9/\-#]{3,}):? *(\d*.\d{1,2}) *([A-Z0-9/\-#]{3,}) +(.*\S)? +(\d{4}){1}Z *(\w{2}\d{2})?/g,
@@ -33,14 +34,16 @@ module.exports = class DXCluster extends events.EventEmitter {
       this.port = opts.port || 23
 
       this.socket = net.createConnection({
-        host: this.host || 'w6cua.no-ip.org',
+        host: this.host,
         port: this.port || 7300
       }, () => {
-        this.status.connected = this.status.awaiting_login = true
+        this.status.connected = this.status.awaiting_login = true;
+	if ((opts.password || '') !== '') { this.status.awaiting_password = true; }
         resolve(this.socket);
       })
 
-      let loginPrompt = opts.loginPrompt || 'Please enter your call:'
+      let loginPrompt = opts.loginPrompt || 'Please enter your call:';
+      let passPrompt = opts.passPrompt || 'password:';
 
       this.socket.on('data', (data) => {
         if(this.status.awaiting_login) {
@@ -50,6 +53,13 @@ module.exports = class DXCluster extends events.EventEmitter {
             }
           }
         }
+        if(this.status.awaiting_password) {
+          if(data.toString('utf8').indexOf(passPrompt) != -1) {
+            if(this.write(opts.password)) {
+              this.status.awaiting_password = false
+            }
+          }
+        }
         this._parseDX(data.toString('utf8'))
       })
 

index.js

@@ -14,7 +14,7 @@ if (process.env.WEBPORT === undefined) {
 	config = require("./config.js");
 } else {
 	config={maxcache: process.env.MAXCACHE, webport: process.env.WEBPORT, baseUrl: process.env.WEBURL, dxcc_lookup_wavelog_url: process.env.WAVELOG_URL, dxcc_lookup_wavelog_key: process.env.WAVELOG_KEY };
-	config.dxc={ host: process.env.DXHOST, port: process.env.DXPORT, loginPrompt: 'login:', call: process.env.DXCALL };
+	config.dxc={ host: process.env.DXHOST, port: process.env.DXPORT, loginPrompt: 'login:', call: process.env.DXCALL, password: process.env.DXPASSWORD };
 }
 
 morgan.token('remote-addr', function (req, res) {