Merge pull request #9 from phillipivan/main

fix socket checks, update dev dependencies, update yarn, lint

.gitignore

@@ -1,4 +1,5 @@
 .vscode/
+.yarn/
 node_modules/
 package-lock.json
 /pkg

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

eslint.config.mjs

@@ -0,0 +1,14 @@
+import { generateEslintConfig } from '@companion-module/tools/eslint/config.mjs'
+
+const baseConfig = await generateEslintConfig({})
+
+const customConfig = [
+	...baseConfig,
+	{
+		languageOptions: {
+			sourceType: 'module',
+		},
+	},
+]
+
+export default customConfig

package.json

@@ -1,11 +1,13 @@
 {
 	"name": "sennheiser-digital6000",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"main": "src/main.js",
 	"type": "module",
 	"scripts": {
 		"format": "prettier -w .",
-		"package": "companion-module-build"
+		"package": "companion-module-build",
+		"lint:raw": "eslint",
+		"lint": "yarn lint:raw ."
 	},
 	"license": "MIT",
 	"repository": {
@@ -17,7 +19,10 @@
 		"companion-module-utils": "~0.5.0"
 	},
 	"devDependencies": {
-		"@companion-module/tools": "^1.5.1"
+		"@companion-module/tools": "^2.0.4",
+		"eslint": "^9.11.0",
+		"prettier": "~3.3.3"
 	},
-	"prettier": "@companion-module/tools/.prettierrc.json"
+	"prettier": "@companion-module/tools/.prettierrc.json",
+	"packageManager": "yarn@4.5.0"
 }

src/actions.js

@@ -29,7 +29,7 @@ export default function (self) {
 				}
 				self.addCmdtoQueue(msg)
 			},
-			subscribe: ({ options }) => {
+			subscribe: () => {
 				const msg = {
 					sys: {
 						booster: query,
@@ -61,7 +61,7 @@ export default function (self) {
 				}
 				self.addCmdtoQueue(msg)
 			},
-			subscribe: ({ options }) => {
+			subscribe: () => {
 				const msg = {
 					sys: {
 						brightness: query,
@@ -239,8 +239,7 @@ export default function (self) {
 			callback: async ({ options }) => {
 				const channel = parseInt(await self.parseVariablesInString(options.channel))
 				if (isNaN(channel) || channel > limits.active_bank_channel.max || channel < limits.active_bank_channel.min) {
-					const channel = parseInt(await self.parseVariablesInString(options.channel))
-					self.log('warn', `rxActiveBankChannel passed an invalid variable ${carrier}. `)
+					self.log('warn', `rxActiveBankChannel passed an invalid variable ${options.channel}:${channel}. `)
 					return undefined
 				}
 				const msg = {

src/buildEM6000icon.js

@@ -80,59 +80,60 @@ async function buildIcons(orientation, image, meters, iconOptions) {
 		iconOptions.includes('mute') && iconOptions.includes('encryption')
 			? iconDims.mute.x + iconDims.encrypt.x + 2 * bar.space
 			: iconOptions.includes('mute')
-			? iconDims.mute.x + bar.space
-			: iconOptions.includes('encryption')
-			? iconDims.encrypt.x + bar.space
-			: 0
+				? iconDims.mute.x + bar.space
+				: iconOptions.includes('encryption')
+					? iconDims.encrypt.x + bar.space
+					: 0
 	const xOffsetEncrypt = iconOptions.includes('mute') ? iconDims.mute.x + bar.space : 0
 	const iconOffset = {
 		battery: {
 			x:
 				orientation === 'left'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetBat
 					: orientation === 'top'
-					? image.width - (bar.lengthOffset - bar.offsetBase + xOffsetBat + iconDims.battery.x)
-					: orientation === 'bottom'
-					? bar.offsetBase + xOffsetBat
-					: image.width - (mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetBat + iconDims.battery.x),
+						? image.width - (bar.lengthOffset - bar.offsetBase + xOffsetBat + iconDims.battery.x)
+						: orientation === 'bottom'
+							? bar.offsetBase + xOffsetBat
+							: image.width - (mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetBat + iconDims.battery.x),
 			y:
 				orientation === 'top'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide
 					: orientation === 'bottom'
-					? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.battery.y)
-					: image.height - (bar.offsetBase + iconDims.battery.y),
+						? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.battery.y)
+						: image.height - (bar.offsetBase + iconDims.battery.y),
 		},
 		mute: {
 			x:
 				orientation === 'left'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide
 					: orientation === 'top'
-					? image.width - (bar.lengthOffset - bar.offsetBase + iconDims.mute.x)
-					: orientation === 'bottom'
-					? bar.offsetBase
-					: image.width - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.mute.x),
+						? image.width - (bar.lengthOffset - bar.offsetBase + iconDims.mute.x)
+						: orientation === 'bottom'
+							? bar.offsetBase
+							: image.width - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.mute.x),
 			y:
 				orientation === 'top'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide
 					: orientation === 'bottom'
-					? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.mute.y)
-					: image.height - (bar.offsetBase + iconDims.mute.y),
+						? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.mute.y)
+						: image.height - (bar.offsetBase + iconDims.mute.y),
 		},
 		encrypt: {
 			x:
 				orientation === 'left'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetEncrypt
 					: orientation === 'top'
-					? image.width - (bar.lengthOffset - bar.offsetBase + xOffsetEncrypt + iconDims.encrypt.x)
-					: orientation === 'bottom'
-					? bar.offsetBase + xOffsetEncrypt
-					: image.width - (mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetEncrypt + iconDims.encrypt.x),
+						? image.width - (bar.lengthOffset - bar.offsetBase + xOffsetEncrypt + iconDims.encrypt.x)
+						: orientation === 'bottom'
+							? bar.offsetBase + xOffsetEncrypt
+							: image.width -
+								(mtrCount * (bar.width + bar.space) + bar.offsetSide + xOffsetEncrypt + iconDims.encrypt.x),
 			y:
 				orientation === 'top'
 					? mtrCount * (bar.width + bar.space) + bar.offsetSide
 					: orientation === 'bottom'
-					? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.encrypt.y)
-					: image.height - (bar.offsetBase + iconDims.encrypt.y),
+						? image.height - (mtrCount * (bar.width + bar.space) + bar.offsetSide + iconDims.encrypt.y)
+						: image.height - (bar.offsetBase + iconDims.encrypt.y),
 		},
 	}
 	const commonIconProps = {

src/feedbackChecks.js

@@ -24,7 +24,7 @@ export function startFeedbackChecks(interval) {
 			this.statusCheck(InstanceStatus.ConnectionFailure, `No data`)
 			this.log(
 				'warn',
-				`UDP Socket listening. No data recieved for at least ${this.quietPeriod * this.config.interval} ms`
+				`UDP Socket listening. No data recieved for at least ${this.quietPeriod * this.config.interval} ms`,
 			)
 		}
 	}

src/feedbacks.js

@@ -136,7 +136,7 @@ export default async function (self) {
 					feedback.image,
 					options.meters,
 					options.icons,
-					options.orientation
+					options.orientation,
 				)
 
 				if (iBuffer !== null) {

src/parseResponse.js

@@ -13,7 +13,7 @@ export function parseResponse(msg) {
 		} else if (data.osc.xid !== undefined) {
 			this.log(
 				'warn',
-				`Message recieved with unexpected xid. Expected ${this.id} Recieved ${data.osc.xid}\nFrom ${msg.toString()}`
+				`Message recieved with unexpected xid. Expected ${this.id} Recieved ${data.osc.xid}\nFrom ${msg.toString()}`,
 			)
 			return
 		}

src/subscriptions.js

@@ -176,9 +176,12 @@ export function setupInitialSubscriptions(device, interval) {
 		},
 	}
 	this.addCmdtoQueue(sub)
-	this.subscriptionTimer = setTimeout(() => {
-		this.setupInitialSubscriptions(device, interval)
-	}, (subscriptions.lifetime - 1) * 1000)
+	this.subscriptionTimer = setTimeout(
+		() => {
+			this.setupInitialSubscriptions(device, interval)
+		},
+		(subscriptions.lifetime - 1) * 1000,
+	)
 }
 
 export async function cancelSubscriptions(device) {

src/udp.js

@@ -5,7 +5,7 @@ export async function sendCommand(msg) {
 		if (msg.osc === undefined) {
 			msg.osc = { xid: this.id }
 		}
-		if (this.socket !== undefined && !this.socket.isDestoryed) {
+		if (this.socket !== undefined && !this.socket.isDestroyed) {
 			await this.socket
 				.send(JSON.stringify(msg))
 				.then(() => {

src/utils.js

@@ -22,6 +22,6 @@ export function convert_LQI_to_percent(lqi) {
 }
 
 export function safeName(dirtyName) {
-	const regexpName = new RegExp(/[()[\]{}~`!@%&_\\\^:'".?]/g)
+	const regexpName = new RegExp(/[()[\]{}~`!@%&_\\^:'".?]/g)
 	return dirtyName.trim().replaceAll(regexpName, '').slice(0, 8)
 }

src/variables.js

@@ -24,15 +24,15 @@ export default async function (self) {
 				{ variableId: `skx${i}_gain`, name: `SKX${i} Gain (dB)` },
 				{ variableId: `skx${i}_capsule`, name: `SKX${i} Capsule` },
 				{ variableId: `skx${i}_battery_percent`, name: `SKX${i} Battery (%)` },
-				{ variableId: `skx${i}_battery_time`, name: `SKX${i} Battery Time` }
+				{ variableId: `skx${i}_battery_time`, name: `SKX${i} Battery Time` },
 			)
 		}
 		variableDefinitions.push(
 			{ variableId: 'device_version', name: 'Device Version' },
 			{ variableId: 'device_name', name: 'Device Name' },
 			{ variableId: 'sys_brightness', name: 'System Brightness' },
 			{ variableId: 'sys_clock', name: 'System Clock' },
-			{ variableId: 'sys_clock_frequency', name: 'System Clock Frequency' }
+			{ variableId: 'sys_clock_frequency', name: 'System Clock Frequency' },
 		)
 	} else if (self.config.device === choices.devices[2].id) {
 		//set L6000 variables
@@ -56,13 +56,13 @@ export default async function (self) {
 					{ variableId: `slot${i}_${j}_battery_cycle_count`, name: `Slot ${i}/${j} Battery Cycle Count` },
 					{ variableId: `slot${i}_${j}_battery_state_of_health`, name: `Slot ${i}/${j} State Of Health (%)` },
 					{ variableId: `slot${i}_${j}_battery_time_to_full_h`, name: `Slot ${i}/${j} Time to Full (H)` },
-					{ variableId: `slot${i}_${j}_battery_time_to_full_min`, name: `Slot ${i}/${j} Time to Full (Min)` }
+					{ variableId: `slot${i}_${j}_battery_time_to_full_min`, name: `Slot ${i}/${j} Time to Full (Min)` },
 				)
 			}
 		}
 		variableDefinitions.push(
 			{ variableId: 'device_version', name: 'Device Version' },
-			{ variableId: 'device_name', name: 'Device Name' }
+			{ variableId: 'device_name', name: 'Device Name' },
 		)
 	}