implement indi simulator

Author: tiagohm

src/alpaca.client.ts

@@ -10,7 +10,7 @@ import { handleDefNumberVector, handleDefSwitchVector, handleDefTextVector, hand
 import type { Camera, Client, Device, Focuser, Mount, Rotator, Wheel } from './indi.device'
 import type { DeviceProvider } from './indi.manager'
 // biome-ignore format: too long!
-import { type DefBlob, type DefBlobVector, type DefNumber, type DefNumberVector, type DefSwitch, type DefSwitchVector, type DefText, type DefTextVector, type DefVector, type EnableBlob, findOnSwitch, type GetProperties, type NewNumberVector, type NewSwitchVector, type NewTextVector, type OneBlob, type PropertyPermission, type PropertyState, type SetBlobVector, type SwitchRule, type ValueType, type VectorType } from './indi.types'
+import { type DefSwitchVector, type DefVector, type EnableBlob, findOnSwitch, type GetProperties, makeBlobVector, makeNumberVector, makeSwitchVector, makeTextVector, type NewNumberVector, type NewSwitchVector, type NewTextVector, type PropertyState, type ValueType, type VectorType } from './indi.types'
 import { roundToNthDecimal } from './math'
 import { formatTemporal, TIMEZONE } from './temporal'
 import { type Time, timeNow } from './time'
@@ -51,7 +51,7 @@ export class AlpacaClient implements Client {
 		if (command?.device) {
 			this.devices.get(command.device)?.sendProperties(command.name)
 		} else {
-			for (const [, device] of this.devices) device.sendProperties(command?.name)
+			for (const device of this.devices) device[1].sendProperties(command?.name)
 		}
 	}
 
@@ -111,15 +111,15 @@ export class AlpacaClient implements Client {
 	}
 
 	private update() {
-		for (const [, device] of this.devices) device.update()
+		for (const device of this.devices) device[1].update()
 	}
 
 	stop(server: boolean = false) {
 		if (this.timer) {
 			clearInterval(this.timer)
 			this.timer = undefined
 
-			for (const [, device] of this.devices) device.close()
+			for (const device of this.devices) device[1].close()
 			this.devices.clear()
 
 			this.options?.handler?.close?.(this, server)
@@ -1797,30 +1797,6 @@ function normalizeLongitude(angle: number) {
 	return angle
 }
 
-function makeSwitchVector(device: string, name: string, label: string, group: string, rule: SwitchRule, permission: PropertyPermission, ...properties: readonly [string, string, boolean][]): DefSwitchVector & { type: 'SWITCH' } {
-	const elements: Record<string, DefSwitch> = {}
-	for (const [name, label, value] of properties) elements[name] = { name, label, value }
-	return { type: 'SWITCH', device, name, label, group, permission, rule, state: 'Idle', timeout: 60, elements }
-}
-
-function makeNumberVector(device: string, name: string, label: string, group: string, permission: PropertyPermission, ...properties: readonly [string, string, number, number, number, number, string][]): DefNumberVector & { type: 'NUMBER' } {
-	const elements: Record<string, DefNumber> = {}
-	for (const [name, label, value, min, max, step, format] of properties) elements[name] = { name, label, value, min, max, step, format }
-	return { type: 'NUMBER', device, name, label, group, permission, state: 'Idle', timeout: 60, elements }
-}
-
-function makeTextVector(device: string, name: string, label: string, group: string, permission: PropertyPermission, ...properties: readonly [string, string, string][]): DefTextVector & { type: 'TEXT' } {
-	const elements: Record<string, DefText> = {}
-	for (const [name, label, value] of properties) elements[name] = { name, label, value }
-	return { type: 'TEXT', device, name, label, group, permission, state: 'Idle', timeout: 60, elements }
-}
-
-function makeBlobVector(device: string, name: string, label: string, group: string, permission: PropertyPermission, ...properties: readonly [string, string][]): Omit<DefBlobVector, 'elements'> & SetBlobVector & { type: 'BLOB' } {
-	const elements: Record<string, Omit<DefBlob, 'value'> & OneBlob> = {}
-	for (const [name, label] of properties) elements[name] = { name, label, size: '0', format: 'fits', value: '' }
-	return { type: 'BLOB', device, name, label, group, permission, state: 'Idle', timeout: 60, elements }
-}
-
 // https://github.com/ASCOMInitiative/ASCOMRemote/blob/main/Documentation/AlpacaImageBytes.pdf
 
 export function makeFitsFromImageBytes(data: ArrayBuffer, time?: Time, camera?: Camera, mount?: Mount, wheel?: Wheel, focuser?: Focuser, rotator?: Rotator, lastExposureDuration: number = 0) {

src/indi.client.ts

@@ -362,6 +362,92 @@ export class IndiClient implements Client {
 	}
 }
 
+export class IndiClientHandlerSet extends Set<IndiClientHandler> implements IndiClientHandler {
+	message(client: Client, message: Message) {
+		for (const handler of this) handler.message?.(client, message)
+	}
+
+	delProperty(client: Client, message: DelProperty) {
+		for (const handler of this) handler.delProperty?.(client, message)
+	}
+
+	vector(client: Client, message: DefVector | SetVector, tag: `def${VectorType}Vector` | `set${VectorType}Vector`) {
+		for (const handler of this) handler.vector?.(client, message, tag)
+	}
+
+	defTextVector(client: Client, message: DefTextVector) {
+		for (const handler of this) handler.defTextVector?.(client, message)
+	}
+
+	defNumberVector(client: Client, message: DefNumberVector) {
+		for (const handler of this) handler.defNumberVector?.(client, message)
+	}
+
+	defSwitchVector(client: Client, message: DefSwitchVector) {
+		for (const handler of this) handler.defSwitchVector?.(client, message)
+	}
+
+	defLightVector(client: Client, message: DefLightVector) {
+		for (const handler of this) handler.defLightVector?.(client, message)
+	}
+
+	defBlobVector(client: Client, message: DefBlobVector) {
+		for (const handler of this) handler.defBlobVector?.(client, message)
+	}
+
+	defVector(client: Client, message: DefVector, tag: `def${VectorType}Vector`) {
+		for (const handler of this) handler.defVector?.(client, message, tag)
+	}
+
+	setTextVector(client: Client, message: SetTextVector) {
+		for (const handler of this) handler.setTextVector?.(client, message)
+	}
+
+	setNumberVector(client: Client, message: SetNumberVector) {
+		for (const handler of this) handler.setNumberVector?.(client, message)
+	}
+
+	setSwitchVector(client: Client, message: SetSwitchVector) {
+		for (const handler of this) handler.setSwitchVector?.(client, message)
+	}
+
+	setLightVector(client: Client, message: SetLightVector) {
+		for (const handler of this) handler.setLightVector?.(client, message)
+	}
+
+	setBlobVector(client: Client, message: SetBlobVector) {
+		for (const handler of this) handler.setBlobVector?.(client, message)
+	}
+
+	setVector(client: Client, message: SetVector, tag: `set${VectorType}Vector`) {
+		for (const handler of this) handler.setVector?.(client, message, tag)
+	}
+
+	textVector(client: Client, message: DefTextVector | SetTextVector, tag: 'defTextVector' | 'setTextVector') {
+		for (const handler of this) handler.textVector?.(client, message, tag)
+	}
+
+	numberVector(client: Client, message: DefNumberVector | SetNumberVector, tag: 'defNumberVector' | 'setNumberVector') {
+		for (const handler of this) handler.numberVector?.(client, message, tag)
+	}
+
+	switchVector(client: Client, message: DefSwitchVector | SetSwitchVector, tag: 'defSwitchVector' | 'setSwitchVector') {
+		for (const handler of this) handler.switchVector?.(client, message, tag)
+	}
+
+	lightVector(client: Client, message: DefLightVector | SetLightVector, tag: 'defLightVector' | 'setLightVector') {
+		for (const handler of this) handler.lightVector?.(client, message, tag)
+	}
+
+	blobVector(client: Client, message: DefBlobVector | SetBlobVector, tag: 'defBLOBVector' | 'setBLOBVector') {
+		for (const handler of this) handler.blobVector?.(client, message, tag)
+	}
+
+	close(client: Client, server: boolean) {
+		for (const handler of this) handler.close?.(client, server)
+	}
+}
+
 export function handleDefVector(client: Client, handler: IndiClientHandler, message: DefVector, tag: `def${VectorType}Vector`) {
 	handler.defVector?.(client, message, tag)
 	handler.vector?.(client, message, tag)

src/indi.manager.ts

@@ -200,19 +200,19 @@ export abstract class DeviceManager<D extends Device> implements IndiClientHandl
 	}
 
 	added(device: D) {
-		this.handlers.forEach((e) => e.added(device))
+		for (const handler of this.handlers) handler.added(device)
 	}
 
 	updated(device: D, property: keyof D & string, state?: PropertyState) {
-		this.handlers.forEach((e) => e.updated?.(device, property, state))
+		for (const handler of this.handlers) handler.updated?.(device, property, state)
 	}
 
 	removed(device: D) {
-		this.handlers.forEach((e) => e.removed(device))
+		for (const handler of this.handlers) handler.removed(device)
 	}
 
 	blobReceived(device: D, data: string | Buffer<ArrayBuffer>) {
-		this.handlers.forEach((e) => e.blobReceived?.(device, data))
+		for (const handler of this.handlers) handler.blobReceived?.(device, data)
 	}
 
 	list(client?: Client | string) {
@@ -363,8 +363,8 @@ export abstract class DeviceManager<D extends Device> implements IndiClientHandl
 		const devices = this.devices.get(client)
 
 		if (devices) {
-			for (const [_, device] of devices) {
-				this.remove(device)
+			for (const device of devices) {
+				this.remove(device[1])
 			}
 		}
 
@@ -1094,11 +1094,11 @@ export class MountManager extends DeviceManager<Mount> {
 						this.updated(device, 'canHome', message.state)
 					}
 
-					if (handleSwitchValue(device, 'canHome', 'FIND' in elements)) {
+					if (handleSwitchValue(device, 'canFindHome', 'FIND' in elements)) {
 						this.updated(device, 'canFindHome', message.state)
 					}
 
-					if (handleSwitchValue(device, 'canHome', 'SET' in elements)) {
+					if (handleSwitchValue(device, 'canSetHome', 'SET' in elements)) {
 						this.updated(device, 'canSetHome', message.state)
 					}
 				}