Merge pull request #29 from jrviz/master

Allow companion port configuration
josephdadams · Oct 6, 2022 · bd72ea8 · bd72ea8
2 parents c2e6d94 + 1d4900f
commit bd72ea8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/config.js b/config.js
@@ -16,6 +16,7 @@ module.exports = new Store({
 		midirelayPort: '4000',
 		midirelayMIDIPort: 'loopMIDI Port',
 		companionIP: '127.0.0.1',
+		companionPort: '51234',
 		plugin_midirelay: true,
 		plugin_vista: true,
 		plugin_http: true,

diff --git a/index.html b/index.html
@@ -222,6 +222,7 @@
 				$('#switchCompanion').prop('checked', config.get('plugin_companion'));
 				plugin_enable('companion')
 				$('#txtCompanionIP').val(config.get('companionIP'));
+				$('#txtCompanionPort').val(config.get('companionPort'));
 
 				$('#switchMdns').prop('checked', config.get('switch_mdns'));
 				$('#switchSettings').prop('checked', config.get('switch_settings'));
@@ -374,6 +375,7 @@
 				config.set('vistaMIDIPort', $('#txtVistaMIDIPort').val());
 
 				config.set('companionIP', $('#txtCompanionIP').val());
+				config.set('companionPort', $('#txtCompanionPort').val());
 			}
 
 			function mdnsRescan() {
@@ -594,14 +596,26 @@ <h2>Created by <a href="#" onclick="openAuthor();">techministry.blog</a></h2><h3
 							<label class="custom-control-label" for="switchCompanion"><b>Companion Buttons</b></label>
 							</div>
 					</div>
-					<div class='form-group col-md-4 collapse' id="companionSettings">
+				</div>
+				<div class='form-row collapse' id="companionSettings">
+					<div class='form-group col-md-4'>
+					</div>
+					<div class='form-group col-md-4'>
 						<div class="input-group input-group-sm">
 							<div class="input-group-prepend">
 								<label class="input-group-text" for="txtCompanionIP">IP</label>
 							</div>
 							<input type="text"  id='txtCompanionIP' class='form-control' minlength="7" maxlength="15" pattern="^((\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$">
 						</div>
 					</div>
+					<div class='form-group col-md-4'>
+						<div class="input-group input-group-sm">
+							<div class="input-group-prepend">
+								<label class="input-group-text" for="txtCompanionPort">Port</label>
+							</div>	
+							<input type='number' id='txtCompanionPort' class='form-control'/>
+						</div>
+					</div>
 				</div>
 			</section>
 			<section>

diff --git a/index.js b/index.js
@@ -987,7 +987,7 @@ function createCompanionConnection() {
 			companionClient.destroy()
 			companionClient = undefined
 		}
-		companionClient = new net.createConnection(51234, config.get('companionIP'));
+		companionClient = new net.createConnection(config.get('companionPort'), config.get('companionIP'));
 			console.log('Connecting to Companion.');
 
 		companionClient.on('connect', () => {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "presentationbridge-client",
 	"productName": "PresentationBridge Client",
-	"version": "1.0.14",
+	"version": "1.0.15",
 	"description": "Links data from your Presentation / lyrics software to other software.",
 	"license": "MIT",
 	"repository": "josephdadams/presentationbridge-client",