Merge pull request #35 from phillipivan/main

Add bonjour device discovery

companion/manifest.json

@@ -26,5 +26,13 @@
 	},
 	"manufacturer": "Generic",
 	"products": ["Ember+"],
-	"keywords": ["ember", "emberplus"]
+	"keywords": ["ember", "emberplus"],
+	"bonjourQueries": {
+		"bonjourHost": [
+			{
+				"type": "ember",
+				"protocol": "tcp"
+			}
+		]
+	}
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "generic-emberplus",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"main": "dist/index.js",
 	"scripts": {
 		"prepare": "husky",

src/config.ts

@@ -4,6 +4,7 @@ import type { SomeCompanionConfigField } from '@companion-module/base'
 export const portDefault = 9000
 
 export interface EmberPlusConfig {
+	bonjourHost?: string
 	host?: string
 	port?: number
 	take?: boolean
@@ -15,13 +16,28 @@ export interface EmberPlusConfig {
 
 export function GetConfigFields(): SomeCompanionConfigField[] {
 	return [
+		{
+			type: 'bonjour-device',
+			id: 'bonjourHost',
+			label: 'Device',
+			width: 6,
+		},
 		{
 			type: 'textinput',
 			id: 'host',
 			label: 'Target IP',
 			tooltip: 'The IP of the ember+ provider',
 			width: 6,
 			regex: Regex.IP,
+			isVisible: (options) => !options['bonjourHost'],
+		},
+		{
+			type: 'static-text',
+			id: 'host-filler',
+			width: 6,
+			label: '',
+			isVisible: (options) => !!options['bonjourHost'],
+			value: '',
 		},
 		{
 			type: 'number',
@@ -33,6 +49,15 @@ export function GetConfigFields(): SomeCompanionConfigField[] {
 			max: 0xffff,
 			step: 1,
 			default: portDefault,
+			isVisible: (options) => !options['bonjourHost'],
+		},
+		{
+			type: 'static-text',
+			id: 'port-filler',
+			width: 6,
+			label: '',
+			isVisible: (options) => !!options['bonjourHost'],
+			value: '',
 		},
 		{
 			type: 'checkbox',

src/index.ts

@@ -35,6 +35,10 @@ class EmberPlusInstance extends InstanceBase<EmberPlusConfig> {
 	 */
 	public async init(config: EmberPlusConfig): Promise<void> {
 		this.config = config
+		if (this.config.bonjourHost) {
+			this.config.host = config.bonjourHost?.split(':')[0]
+			this.config.port = Number(config.bonjourHost?.split(':')[1])
+		}
 		this.state = new EmberPlusState()
 		this.emberQueue = new PQueue({ concurrency: 1 })
 		this.setupEmberConnection()
@@ -49,7 +53,10 @@ class EmberPlusInstance extends InstanceBase<EmberPlusConfig> {
 	 */
 	public async configUpdated(config: EmberPlusConfig): Promise<void> {
 		this.config = config
-
+		if (this.config.bonjourHost) {
+			this.config.host = config.bonjourHost?.split(':')[0]
+			this.config.port = Number(config.bonjourHost?.split(':')[1])
+		}
 		//this.emberClient.discard()
 		//this.emberClient.removeAllListeners()