Merge branch 'dev'

.gitattributes

@@ -21,3 +21,4 @@
 *.dll           binary
 *.so            binary
 *.zip           binary
+*.bmp           binary

api/src/main/kotlin/nebulosa/api/cameras/CameraSerializer.kt

@@ -15,6 +15,8 @@ class CameraSerializer(private val capturesPath: Path) : StdSerializer<Camera>(C
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

api/src/main/kotlin/nebulosa/api/focusers/FocuserSerializer.kt

@@ -13,6 +13,8 @@ class FocuserSerializer : StdSerializer<Focuser>(Focuser::class.java) {
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

api/src/main/kotlin/nebulosa/api/guiding/GuideOutputEventAware.kt

@@ -4,5 +4,5 @@ import nebulosa.indi.device.guider.GuideOutputEvent
 
 fun interface GuideOutputEventAware {
 
-    fun handleGuideOutputEvent(event: GuideOutputEvent<*>)
+    fun handleGuideOutputEvent(event: GuideOutputEvent)
 }

api/src/main/kotlin/nebulosa/api/guiding/GuideOutputEventHub.kt

@@ -17,10 +17,10 @@ import org.springframework.stereotype.Component
 @Subscriber
 class GuideOutputEventHub(
     private val messageService: MessageService,
-) : DeviceEventHub<GuideOutput, GuideOutputEvent<*>>(DeviceType.GUIDE_OUTPUT), GuideOutputEventAware {
+) : DeviceEventHub<GuideOutput, GuideOutputEvent>(DeviceType.GUIDE_OUTPUT), GuideOutputEventAware {
 
     @Subscribe(threadMode = ThreadMode.ASYNC)
-    override fun handleGuideOutputEvent(event: GuideOutputEvent<*>) {
+    override fun handleGuideOutputEvent(event: GuideOutputEvent) {
         if (event.device.type == DeviceType.GUIDE_OUTPUT) {
             when (event) {
                 is PropertyChangedEvent -> if (event.device.canPulseGuide) onNext(event)

api/src/main/kotlin/nebulosa/api/guiding/GuideOutputSerializer.kt

@@ -13,6 +13,8 @@ class GuideOutputSerializer : StdSerializer<GuideOutput>(GuideOutput::class.java
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

api/src/main/kotlin/nebulosa/api/mounts/MountSerializer.kt

@@ -18,6 +18,8 @@ class MountSerializer : StdSerializer<Mount>(Mount::class.java) {
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

api/src/main/kotlin/nebulosa/api/rotators/RotatorSerializer.kt

@@ -13,6 +13,8 @@ class RotatorSerializer : StdSerializer<Rotator>(Rotator::class.java) {
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

api/src/main/kotlin/nebulosa/api/wheels/WheelSerializer.kt

@@ -13,6 +13,8 @@ class WheelSerializer : StdSerializer<FilterWheel>(FilterWheel::class.java) {
         gen.writeStartObject()
         gen.writeStringField("type", value.type.name)
         gen.writeStringField("sender", value.sender.id)
+        gen.writeStringField("driverName", value.driverName)
+        gen.writeStringField("driverVersion", value.driverVersion)
         gen.writeStringField("id", value.id)
         gen.writeStringField("name", value.name)
         gen.writeBooleanField("connected", value.connected)

desktop/electron-builder.json

@@ -20,7 +20,7 @@
 		"target": ["portable"]
 	},
 	"portable": {
-		"splashImage": "dist/assets/images/splash.png"
+		"splashImage": "dist/assets/images/splash.bmp"
 	},
 	"mac": {
 		"icon": "dist/assets/icons",

desktop/src/app/app.module.ts

@@ -48,6 +48,7 @@ import { CameraExposureComponent } from '../shared/components/camera-exposure/ca
 import { CameraInfoComponent } from '../shared/components/camera-info/camera-info.component'
 import { DeviceChooserComponent } from '../shared/components/device-chooser/device-chooser.component'
 import { DeviceListMenuComponent } from '../shared/components/device-list-menu/device-list-menu.component'
+import { DeviceNameComponent } from '../shared/components/device-name/device-name.component'
 import { DialogMenuComponent } from '../shared/components/dialog-menu/dialog-menu.component'
 import { HistogramComponent } from '../shared/components/histogram/histogram.component'
 import { LocationComponent } from '../shared/components/location/location.dialog'
@@ -117,6 +118,7 @@ import { StackerComponent } from './stacker/stacker.component'
 		CrossHairComponent,
 		DeviceChooserComponent,
 		DeviceListMenuComponent,
+		DeviceNameComponent,
 		DialogMenuComponent,
 		DropdownOptionsPipe,
 		EnumPipe,

desktop/src/app/camera/camera.component.html

@@ -1,14 +1,7 @@
 <div class="container px-4 pt-2 pb-1">
 	<div class="grid py-1 flex align-items-center">
 		<div class="col-8 align-items-center gap-2">
-			<p-floatLabel>
-				<input
-					pInputText
-					readonly
-					[value]="camera.name"
-					class="p-inputtext-sm border-0 w-full" />
-				<label>Camera</label>
-			</p-floatLabel>
+			<neb-device-name [device]="camera" />
 			<p-button
 				*ngIf="!camera || camera.connected"
 				[disabled]="!camera || running"

desktop/src/app/filterwheel/filterwheel.component.html

@@ -1,14 +1,7 @@
 <div class="container px-4 py-3">
 	<div class="grid flex align-items-center">
 		<div class="col-12 align-items-center gap-2">
-			<p-floatLabel>
-				<input
-					pInputText
-					readonly
-					[value]="wheel.name"
-					class="p-inputtext-sm border-0 w-full" />
-				<label>Filter Wheel</label>
-			</p-floatLabel>
+			<neb-device-name [device]="wheel" />
 			<p-button
 				*ngIf="wheel.connected"
 				[disabled]="!wheel || moving"

desktop/src/app/focuser/focuser.component.html

@@ -1,14 +1,7 @@
 <div class="container px-4 py-3">
 	<div class="grid flex align-items-center">
 		<div class="col-12 align-items-center gap-2">
-			<p-floatLabel>
-				<input
-					pInputText
-					readonly
-					[value]="focuser.name"
-					class="p-inputtext-sm border-0 w-full" />
-				<label>Focuser</label>
-			</p-floatLabel>
+			<neb-device-name [device]="focuser" />
 			<p-button
 				*ngIf="focuser.connected"
 				[disabled]="!focuser || focuser.moving"

desktop/src/app/mount/mount.component.html

@@ -1,14 +1,7 @@
 <div class="container px-4 py-3">
 	<div class="grid flex align-items-center">
 		<div class="col-8 align-items-center gap-2">
-			<p-floatLabel>
-				<input
-					pInputText
-					readonly
-					[value]="mount.name"
-					class="p-inputtext-sm border-0 w-full" />
-				<label>Mount</label>
-			</p-floatLabel>
+			<neb-device-name [device]="mount" />
 			<p-button
 				*ngIf="mount.connected"
 				[disabled]="mount.slewing || mount.parking"

desktop/src/app/rotator/rotator.component.html

@@ -1,14 +1,7 @@
 <div class="container px-4 py-3">
 	<div class="grid flex align-items-center">
 		<div class="col-12 align-items-center gap-2">
-			<p-floatLabel>
-				<input
-					pInputText
-					readonly
-					[value]="rotator.name"
-					class="p-inputtext-sm border-0 w-full" />
-				<label>Rotator</label>
-			</p-floatLabel>
+			<neb-device-name [device]="rotator" />
 			<p-button
 				*ngIf="rotator.connected"
 				[disabled]="rotator.moving"

desktop/src/shared/components/device-name/device-name.component.ts

@@ -0,0 +1,20 @@
+import { Component, Input, ViewEncapsulation } from '@angular/core'
+import type { Device } from '../../types/device.types'
+
+@Component({
+	selector: 'neb-device-name',
+	template: `
+		<div class="flex flex-column justify-content-center gap-0">
+			<span class=font-bold>{{ device.name }}</span>
+			<div class="flex flex-row align-items-center text-xs text-gray-400 gap-2">
+				<span>DRIVER: {{ device.driverName }}</span>
+				<span>VERSION: {{ device.driverVersion }}</span>
+			</div>
+		</div>
+	`,
+	encapsulation: ViewEncapsulation.None,
+})
+export class DeviceNameComponent {
+	@Input({ required: true })
+	readonly device!: Device
+}

desktop/src/shared/types/camera.types.ts

@@ -200,6 +200,8 @@ export interface CameraNamingFormatDialog {
 export const DEFAULT_CAMERA: Camera = {
 	type: 'CAMERA',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	exposuring: false,
 	hasCoolerControl: false,

desktop/src/shared/types/device.types.ts

@@ -15,6 +15,8 @@ export interface Device {
 	readonly sender: string
 	readonly id: string
 	readonly name: string
+	readonly driverName: string
+	readonly driverVersion: string
 	connected: boolean
 }
 

desktop/src/shared/types/focuser.types.ts

@@ -22,6 +22,8 @@ export interface FocuserPreference {
 export const DEFAULT_FOCUSER: Focuser = {
 	type: 'FOCUSER',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	moving: false,
 	position: 0,

desktop/src/shared/types/guider.types.ts

@@ -105,6 +105,8 @@ export interface GuiderChartInfo {
 export const DEFAULT_GUIDE_OUTPUT: GuideOutput = {
 	type: 'CAMERA',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	canPulseGuide: false,
 	pulseGuiding: false,

desktop/src/shared/types/mount.types.ts

@@ -79,6 +79,8 @@ export interface MountPreference {
 export const DEFAULT_MOUNT: Mount = {
 	type: 'MOUNT',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	slewing: false,
 	tracking: false,

desktop/src/shared/types/rotator.types.ts

@@ -20,6 +20,8 @@ export interface RotatorPreference {
 export const DEFAULT_ROTATOR: Rotator = {
 	type: 'ROTATOR',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	name: '',
 	moving: false,

desktop/src/shared/types/wheel.types.ts

@@ -58,6 +58,8 @@ export function makeFilter(wheel: Wheel, filters: Filter[], shutterPosition: num
 export const DEFAULT_WHEEL: Wheel = {
 	type: 'WHEEL',
 	sender: '',
+	driverName: '',
+	driverVersion: '',
 	id: '',
 	count: 0,
 	position: 0,

nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/INDIClient.kt

@@ -2,6 +2,7 @@ package nebulosa.indi.client
 
 import nebulosa.indi.client.connection.INDIProccessConnection
 import nebulosa.indi.client.connection.INDISocketConnection
+import nebulosa.indi.client.device.DriverInfo
 import nebulosa.indi.client.device.INDIDeviceProtocolHandler
 import nebulosa.indi.client.device.auxiliary.INDIGPS
 import nebulosa.indi.client.device.auxiliary.INDIGuideOutput
@@ -48,32 +49,32 @@ data class INDIClient(val connection: INDIConnection) : INDIDeviceProtocolHandle
     override val input
         get() = connection.input
 
-    override fun newCamera(name: String, executable: String): Camera {
-        return CAMERAS[executable]?.create(this, name) ?: INDICamera(this, name)
+    override fun newCamera(driverInfo: DriverInfo): Camera {
+        return CAMERAS[driverInfo.executable]?.create(this, driverInfo) ?: INDICamera(this, driverInfo)
     }
 
-    override fun newMount(name: String, executable: String): Mount {
-        return INDIMount(this, name)
+    override fun newMount(driverInfo: DriverInfo): Mount {
+        return INDIMount(this, driverInfo)
     }
 
-    override fun newFocuser(name: String, executable: String): Focuser {
-        return INDIFocuser(this, name)
+    override fun newFocuser(driverInfo: DriverInfo): Focuser {
+        return INDIFocuser(this, driverInfo)
     }
 
-    override fun newFilterWheel(name: String, executable: String): FilterWheel {
-        return INDIFilterWheel(this, name)
+    override fun newFilterWheel(driverInfo: DriverInfo): FilterWheel {
+        return INDIFilterWheel(this, driverInfo)
     }
 
-    override fun newRotator(name: String, executable: String): Rotator {
-        return INDIRotator(this, name)
+    override fun newRotator(driverInfo: DriverInfo): Rotator {
+        return INDIRotator(this, driverInfo)
     }
 
-    override fun newGPS(name: String, executable: String): GPS {
-        return INDIGPS(this, name)
+    override fun newGPS(driverInfo: DriverInfo): GPS {
+        return INDIGPS(this, driverInfo)
     }
 
-    override fun newGuideOutput(name: String, executable: String): GuideOutput {
-        return INDIGuideOutput(this, name)
+    override fun newGuideOutput(driverInfo: DriverInfo): GuideOutput {
+        return INDIGuideOutput(this, driverInfo)
     }
 
     override fun start() {
@@ -109,9 +110,9 @@ data class INDIClient(val connection: INDIConnection) : INDIDeviceProtocolHandle
         )
 
         @JvmStatic
-        private fun <T : Device> Class<out T>.create(handler: INDIClient, name: String): T {
-            return getConstructor(INDIClient::class.java, String::class.java)
-                .newInstance(handler, name)
+        private fun <T : Device> Class<out T>.create(handler: INDIClient, driverInfo: DriverInfo): T {
+            return getConstructor(INDIClient::class.java, DriverInfo::class.java)
+                .newInstance(handler, driverInfo)
         }
     }
 }

nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/DriverInfo.kt

@@ -0,0 +1,24 @@
+package nebulosa.indi.client.device
+
+import nebulosa.indi.protocol.TextVector
+
+data class DriverInfo(
+    @JvmField val name: String,
+    @JvmField val executable: String,
+    @JvmField val version: String,
+    @JvmField val interfaceType: Int,
+) {
+
+    companion object {
+
+        @JvmStatic
+        fun from(message: TextVector<*>): DriverInfo? {
+            return DriverInfo(
+                message.device,
+                message["DRIVER_EXEC"]?.value?.takeIf { it.isNotBlank() } ?: return null,
+                message["DRIVER_VERSION"]?.value?.takeIf { it.isNotBlank() } ?: return null,
+                message["DRIVER_INTERFACE"]?.value?.toIntOrNull() ?: return null,
+            )
+        }
+    }
+}

nebulosa-indi-client/src/main/kotlin/nebulosa/indi/client/device/INDIDevice.kt

@@ -11,15 +11,24 @@ internal abstract class INDIDevice : Device {
 
     abstract override val sender: INDIClient
 
-    override val properties = linkedMapOf<String, PropertyVector<*, *>>()
-    override val messages = LinkedList<String>()
+    abstract val driverInfo: DriverInfo
 
-    override val id by lazy { type.code + "." + name.encodeUtf8().md5().hex() }
+    final override val properties = linkedMapOf<String, PropertyVector<*, *>>()
+    final override val messages = LinkedList<String>()
+    final override val id by lazy { type.code + "." + name.encodeUtf8().md5().hex() }
+    final override val snoopedDevices = ArrayList<Device>(4)
+
+    override val name
+        get() = driverInfo.name
 
     @Volatile override var connected = false
         protected set
 
-    override val snoopedDevices = ArrayList<Device>(4)
+    final override val driverName
+        get() = driverInfo.executable
+
+    final override val driverVersion
+        get() = driverInfo.version
 
     private fun addMessageAndFireEvent(text: String) {
         synchronized(messages) {