Merge branch 'dev'

.editorconfig

@@ -29,3 +29,6 @@ ij_kotlin_continuation_indent_size = 8
 [*.py]
 ij_python_wrap_long_lines = false
 ij_python_method_parameters_wrap = off
+
+[{*.yml, *.yaml}]
+ij_yaml_indent_size = 2

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
-    open-pull-requests-limit: 16
+    open-pull-requests-limit: 64
     target-branch: "dev"
     commit-message:
       prefix: "[api]"
@@ -21,21 +21,21 @@ updates:
       netty:
         patterns:
           - "io.netty*"
-      retrofit:
-        patterns:
-          - "com.squareup.retrofit2*"
-      okhttp:
+      squareup:
         patterns:
-          - "com.squareup.okhttp3*"
+          - "com.squareup*"
       rx:
         patterns:
-          - "io.reactivex.rxjava3*"
-      jackson:
+          - "io.reactivex*"
+      fasterxml:
         patterns:
-          - "com.fasterxml.jackson*"
+          - "com.fasterxml*"
       kotlin:
         patterns:
           - "org.jetbrains.kotlin*"
+      apache:
+        patterns:
+          - "org.apache*"
 
   - package-ecosystem: "npm"
     directory: "/desktop"

.github/workflows/ci.yml

@@ -26,9 +26,6 @@ jobs:
           distribution: 'zulu'
           cache: gradle
 
-      - name: Install wcstools
-        run: sudo apt install -y wcstools
-
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

Makefile

@@ -0,0 +1,8 @@
+.PHONY: build install
+
+build:
+	./gradlew api:bootJar
+	cd desktop && npm run electron:build:deb
+
+install:
+	sudo dpkg -i desktop/release/nebulosa_0.1.0_amd64.deb

api/build.gradle.kts

@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
     kotlin("jvm")
-    id("org.springframework.boot") version "3.2.5"
+    id("org.springframework.boot") version "3.3.0"
     id("io.spring.dependency-management") version "1.1.5"
     kotlin("plugin.spring")
     kotlin("kapt")
@@ -15,6 +15,7 @@ dependencies {
     implementation(project(":nebulosa-astrometrynet"))
     implementation(project(":nebulosa-alpaca-indi"))
     implementation(project(":nebulosa-common"))
+    implementation(project(":nebulosa-curve-fitting"))
     implementation(project(":nebulosa-guiding-phd2"))
     implementation(project(":nebulosa-hips2fits"))
     implementation(project(":nebulosa-horizons"))
@@ -26,7 +27,6 @@ dependencies {
     implementation(project(":nebulosa-sbd"))
     implementation(project(":nebulosa-simbad"))
     implementation(project(":nebulosa-stellarium-protocol"))
-    implementation(project(":nebulosa-watney"))
     implementation(project(":nebulosa-wcs"))
     implementation(project(":nebulosa-xisf"))
     implementation(libs.rx)
@@ -46,7 +46,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-undertow")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    kapt("org.springframework:spring-context-indexer:6.1.7")
+    kapt("org.springframework:spring-context-indexer:6.1.8")
     testImplementation(project(":nebulosa-astrobin-api"))
     testImplementation(project(":nebulosa-skycatalog-stellarium"))
     testImplementation(project(":nebulosa-test"))

api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVExecutor.kt

@@ -2,6 +2,7 @@ package nebulosa.api.alignment.polar.darv
 
 import io.reactivex.rxjava3.functions.Consumer
 import nebulosa.api.beans.annotations.Subscriber
+import nebulosa.api.cameras.CameraEventAware
 import nebulosa.api.messages.MessageEvent
 import nebulosa.api.messages.MessageService
 import nebulosa.indi.device.camera.Camera
@@ -21,7 +22,7 @@ import java.util.concurrent.ConcurrentHashMap
 class DARVExecutor(
     private val messageService: MessageService,
     private val threadPoolTaskExecutor: ThreadPoolTaskExecutor,
-) : Consumer<MessageEvent> {
+) : Consumer<MessageEvent>, CameraEventAware {
 
     private val jobs = ConcurrentHashMap.newKeySet<DARVJob>(1)
 
@@ -30,7 +31,7 @@ class DARVExecutor(
     }
 
     @Subscribe(threadMode = ThreadMode.ASYNC)
-    fun onCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         jobs.find { it.task.camera === event.device }?.handleCameraEvent(event)
     }
 

api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVJob.kt

@@ -1,13 +1,14 @@
 package nebulosa.api.alignment.polar.darv
 
+import nebulosa.api.cameras.CameraEventAware
 import nebulosa.api.tasks.Job
 import nebulosa.indi.device.camera.CameraEvent
 
-data class DARVJob(override val task: DARVTask) : Job() {
+data class DARVJob(override val task: DARVTask) : Job(), CameraEventAware {
 
     override val name = "${task.camera.name} DARV Job"
 
-    fun handleCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         task.handleCameraEvent(event)
     }
 }

api/src/main/kotlin/nebulosa/api/alignment/polar/darv/DARVTask.kt

@@ -1,10 +1,7 @@
 package nebulosa.api.alignment.polar.darv
 
 import io.reactivex.rxjava3.functions.Consumer
-import nebulosa.api.cameras.AutoSubFolderMode
-import nebulosa.api.cameras.CameraCaptureEvent
-import nebulosa.api.cameras.CameraCaptureState
-import nebulosa.api.cameras.CameraCaptureTask
+import nebulosa.api.cameras.*
 import nebulosa.api.guiding.GuidePulseEvent
 import nebulosa.api.guiding.GuidePulseRequest
 import nebulosa.api.guiding.GuidePulseTask
@@ -30,11 +27,11 @@ data class DARVTask(
     @JvmField val guideOutput: GuideOutput,
     @JvmField val request: DARVStartRequest,
     private val executor: Executor,
-) : AbstractTask<MessageEvent>(), Consumer<Any> {
+) : AbstractTask<MessageEvent>(), Consumer<Any>, CameraEventAware {
 
     @JvmField val cameraRequest = request.capture.copy(
         exposureTime = request.capture.exposureTime + request.capture.exposureDelay,
-        savePath = Files.createTempDirectory("darv"),
+        savePath = CAPTURE_SAVE_PATH,
         exposureAmount = 1, exposureDelay = Duration.ZERO,
         frameType = FrameType.LIGHT, autoSave = false, autoSubFolderMode = AutoSubFolderMode.OFF
     )
@@ -60,7 +57,7 @@ data class DARVTask(
         backwardGuidePulseTask.subscribe(this)
     }
 
-    fun handleCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         cameraCaptureTask.handleCameraEvent(event)
     }
 
@@ -126,5 +123,6 @@ data class DARVTask(
     companion object {
 
         @JvmStatic private val LOG = loggerFor<DARVTask>()
+        @JvmStatic private val CAPTURE_SAVE_PATH = Files.createTempDirectory("darv-")
     }
 }

api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAExecutor.kt

@@ -2,12 +2,13 @@ package nebulosa.api.alignment.polar.tppa
 
 import io.reactivex.rxjava3.functions.Consumer
 import nebulosa.api.beans.annotations.Subscriber
+import nebulosa.api.cameras.CameraEventAware
 import nebulosa.api.messages.MessageEvent
 import nebulosa.api.messages.MessageService
-import nebulosa.api.solver.PlateSolverService
 import nebulosa.indi.device.camera.Camera
 import nebulosa.indi.device.camera.CameraEvent
 import nebulosa.indi.device.mount.Mount
+import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.springframework.stereotype.Component
@@ -17,8 +18,8 @@ import java.util.concurrent.ConcurrentHashMap
 @Subscriber
 class TPPAExecutor(
     private val messageService: MessageService,
-    private val plateSolverService: PlateSolverService,
-) : Consumer<MessageEvent> {
+    private val httpClient: OkHttpClient,
+) : Consumer<MessageEvent>, CameraEventAware {
 
     private val jobs = ConcurrentHashMap.newKeySet<TPPAJob>(1)
 
@@ -27,7 +28,7 @@ class TPPAExecutor(
     }
 
     @Subscribe(threadMode = ThreadMode.ASYNC)
-    fun onCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         jobs.find { it.task.camera === event.device }?.handleCameraEvent(event)
     }
 
@@ -38,7 +39,7 @@ class TPPAExecutor(
         check(jobs.none { it.task.camera === camera }) { "${camera.name} TPPA Job is already in progress" }
         check(jobs.none { it.task.mount === mount }) { "${camera.name} TPPA Job is already in progress" }
 
-        val solver = plateSolverService.solverFor(request.plateSolver)
+        val solver = request.plateSolver.get(httpClient)
         val task = TPPATask(camera, solver, request, mount)
         task.subscribe(this)
 

api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPAJob.kt

@@ -1,13 +1,14 @@
 package nebulosa.api.alignment.polar.tppa
 
+import nebulosa.api.cameras.CameraEventAware
 import nebulosa.api.tasks.Job
 import nebulosa.indi.device.camera.CameraEvent
 
-data class TPPAJob(override val task: TPPATask) : Job() {
+data class TPPAJob(override val task: TPPATask) : Job(), CameraEventAware {
 
     override val name = "${task.camera.name} TPPA Job"
 
-    fun handleCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         task.handleCameraEvent(event)
     }
 }

api/src/main/kotlin/nebulosa/api/alignment/polar/tppa/TPPATask.kt

@@ -3,10 +3,7 @@ package nebulosa.api.alignment.polar.tppa
 import io.reactivex.rxjava3.functions.Consumer
 import nebulosa.alignment.polar.point.three.ThreePointPolarAlignment
 import nebulosa.alignment.polar.point.three.ThreePointPolarAlignmentResult
-import nebulosa.api.cameras.AutoSubFolderMode
-import nebulosa.api.cameras.CameraCaptureEvent
-import nebulosa.api.cameras.CameraCaptureState
-import nebulosa.api.cameras.CameraCaptureTask
+import nebulosa.api.cameras.*
 import nebulosa.api.messages.MessageEvent
 import nebulosa.api.mounts.MountMoveRequest
 import nebulosa.api.mounts.MountMoveTask
@@ -38,12 +35,12 @@ data class TPPATask(
     @JvmField val mount: Mount? = null,
     @JvmField val longitude: Angle = mount!!.longitude,
     @JvmField val latitude: Angle = mount!!.latitude,
-) : AbstractTask<MessageEvent>(), Consumer<Any>, PauseListener {
+) : AbstractTask<MessageEvent>(), Consumer<Any>, PauseListener, CameraEventAware {
 
     @JvmField val mountMoveRequest = MountMoveRequest(request.stepDirection, request.stepDuration, request.stepSpeed)
 
     @JvmField val cameraRequest = request.capture.copy(
-        savePath = Files.createTempDirectory("tppa"),
+        savePath = CAPTURE_SAVE_PATH,
         exposureAmount = 0, exposureDelay = Duration.ZERO,
         exposureTime = maxOf(request.capture.exposureTime, MIN_EXPOSURE_TIME),
         frameType = FrameType.LIGHT, autoSave = false, autoSubFolderMode = AutoSubFolderMode.OFF
@@ -73,7 +70,7 @@ data class TPPATask(
         settleDelayTask.subscribe(this)
     }
 
-    fun handleCameraEvent(event: CameraEvent) {
+    override fun handleCameraEvent(event: CameraEvent) {
         if (camera === event.device) {
             cameraCaptureTask.handleCameraEvent(event)
         }
@@ -117,14 +114,14 @@ data class TPPATask(
 
         cancellationToken.listenToPause(this)
 
-        while (!cancellationToken.isDone) {
+        while (!cancellationToken.isCancelled) {
             if (cancellationToken.isPaused) {
                 pausing.set(false)
                 sendEvent(TPPAState.PAUSED)
                 cancellationToken.waitForPause()
             }
 
-            if (cancellationToken.isDone) break
+            if (cancellationToken.isCancelled) break
 
             mount?.tracking(true)
 
@@ -137,7 +134,7 @@ data class TPPATask(
                         mountMoveState[alignment.state.ordinal] = true
                     }
 
-                    if (cancellationToken.isDone) break
+                    if (cancellationToken.isCancelled) break
 
                     rightAscension = mount.rightAscension
                     declination = mount.declination
@@ -149,14 +146,14 @@ data class TPPATask(
                 }
             }
 
-            if (cancellationToken.isDone) break
+            if (cancellationToken.isCancelled) break
 
             sendEvent(TPPAState.EXPOSURING)
 
             // CAPTURE.
             cameraCaptureTask.execute(cancellationToken)
 
-            if (cancellationToken.isDone || savedImage == null) {
+            if (cancellationToken.isCancelled || savedImage == null) {
                 break
             }
 
@@ -180,7 +177,7 @@ data class TPPATask(
 
             LOG.info("TPPA alignment completed. result=$result")
 
-            if (cancellationToken.isDone) break
+            if (cancellationToken.isCancelled) break
 
             when (result) {
                 is ThreePointPolarAlignmentResult.NeedMoreMeasurement -> {
@@ -313,6 +310,7 @@ data class TPPATask(
 
         @JvmStatic private val MIN_EXPOSURE_TIME = Duration.ofSeconds(1L)
         @JvmStatic private val SETTLE_TIME = Duration.ofSeconds(5)
+        @JvmStatic private val CAPTURE_SAVE_PATH = Files.createTempDirectory("tppa-")
         @JvmStatic private val LOG = loggerFor<TPPATask>()
 
         const val MAX_ATTEMPTS = 30

api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusController.kt

@@ -0,0 +1,22 @@
+package nebulosa.api.autofocus
+
+import nebulosa.indi.device.camera.Camera
+import nebulosa.indi.device.focuser.Focuser
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("auto-focus")
+class AutoFocusController(private val autoFocusService: AutoFocusService) {
+
+    @PutMapping("{camera}/{focuser}/start")
+    fun start(
+        camera: Camera, focuser: Focuser,
+        @RequestBody body: AutoFocusRequest,
+    ) = autoFocusService.start(camera, focuser, body)
+
+    @PutMapping("{camera}/stop")
+    fun stop(camera: Camera) = autoFocusService.stop(camera)
+
+    @GetMapping("{camera}/status")
+    fun status(camera: Camera) = autoFocusService.status(camera)
+}

api/src/main/kotlin/nebulosa/api/autofocus/AutoFocusEvent.kt

@@ -0,0 +1,32 @@
+package nebulosa.api.autofocus
+
+import nebulosa.api.cameras.CameraCaptureEvent
+import nebulosa.api.messages.MessageEvent
+import nebulosa.curve.fitting.CurvePoint
+import nebulosa.curve.fitting.HyperbolicFitting
+import nebulosa.curve.fitting.QuadraticFitting
+import nebulosa.curve.fitting.TrendLineFitting
+
+data class AutoFocusEvent(
+    @JvmField val state: AutoFocusState = AutoFocusState.IDLE,
+    @JvmField val focusPoint: CurvePoint? = null,
+    @JvmField val determinedFocusPoint: CurvePoint? = null,
+    @JvmField val starCount: Int = 0,
+    @JvmField val starHFD: Double = 0.0,
+    @JvmField val chart: Chart? = null,
+    @JvmField val capture: CameraCaptureEvent? = null,
+) : MessageEvent {
+
+    data class Chart(
+        @JvmField val predictedFocusPoint: CurvePoint? = null,
+        @JvmField val minX: Double = 0.0,
+        @JvmField val minY: Double = 0.0,
+        @JvmField val maxX: Double = 0.0,
+        @JvmField val maxY: Double = 0.0,
+        @JvmField val trendLine: TrendLineFitting.Curve? = null,
+        @JvmField val parabolic: QuadraticFitting.Curve? = null,
+        @JvmField val hyperbolic: HyperbolicFitting.Curve? = null,
+    )
+
+    override val eventName = "AUTO_FOCUS.ELAPSED"
+}