demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCar.kt

@@ -1,7 +1,9 @@
 package ru.mipt.npm.controls.demo.virtual_car
 
 import kotlinx.coroutines.launch
-import ru.mipt.npm.controls.properties.*
+import ru.mipt.npm.controls.spec.*
+import space.kscience.dataforge.context.Context
+import space.kscience.dataforge.context.Factory
 import space.kscience.dataforge.meta.Meta
 import space.kscience.dataforge.meta.double
 import space.kscience.dataforge.meta.get
@@ -12,18 +14,10 @@ import kotlin.time.ExperimentalTime
 
 data class Coordinates(val x: Double = 0.0, val y: Double = 0.0)
 
-class VirtualCar : DeviceBySpec<VirtualCar>(VirtualCar) {
+class VirtualCar(context: Context, meta: Meta) : DeviceBySpec<VirtualCar>(VirtualCar, context, meta) {
     private var speedState: Coordinates = Coordinates()
-    private fun updateAndGetSpeed(): Coordinates {
-        updateSpeedLocationTime()
-        return this.speedState
-    }
 
     private var locationState: Coordinates = Coordinates()
-    private fun updateAndGetLocation(): Coordinates {
-        updateSpeedLocationTime()
-        return this.locationState
-    }
 
     private var accelerationState: Coordinates = Coordinates()
     set(value) {
@@ -54,6 +48,24 @@ class VirtualCar : DeviceBySpec<VirtualCar>(VirtualCar) {
         )
     }
 
+    @OptIn(ExperimentalTime::class)
+    override suspend fun open() {
+        super.open()
+        launch {
+            doRecurring(Duration.seconds(1)) {
+                carProperties.read()
+            }
+        }
+        launch {
+            doRecurring(Duration.milliseconds(50)) {
+                updateSpeedLocationTime()
+                updateLogical(speed, this@VirtualCar.speedState)
+                updateLogical(acceleration, this@VirtualCar.accelerationState)
+                updateLogical(location, this@VirtualCar.locationState)
+            }
+        }
+    }
+
     object CoordinatesMetaConverter : MetaConverter<Coordinates> {
         override fun metaToObject(meta: Meta): Coordinates = Coordinates(
             meta["x"].double ?: 0.0,
@@ -66,10 +78,12 @@ class VirtualCar : DeviceBySpec<VirtualCar>(VirtualCar) {
         }
     }
 
-    companion object : DeviceSpec<VirtualCar>(::VirtualCar) {
+    companion object : DeviceSpec<VirtualCar>(), Factory<VirtualCar> {
-        val speed by property(CoordinatesMetaConverter) { this.updateAndGetSpeed() }
+        override fun invoke(meta: Meta, context: Context): VirtualCar = VirtualCar(context, meta)
 
-        val location by property(CoordinatesMetaConverter) { this.updateAndGetLocation() }
+        val speed by property(CoordinatesMetaConverter) { this.speedState }
+
+        val location by property(CoordinatesMetaConverter) { this.locationState }
 
         val acceleration by property(CoordinatesMetaConverter, VirtualCar::accelerationState)
 
@@ -82,17 +96,5 @@ class VirtualCar : DeviceBySpec<VirtualCar>(VirtualCar) {
                 "acceleration" put CoordinatesMetaConverter.objectToMeta(read(acceleration))
             }
         }
-
-        @OptIn(ExperimentalTime::class)
-        override fun VirtualCar.onStartup() {
-            launch {
-                speed.read()
-                acceleration.read()
-                location.read()
-            }
-            doRecurring(Duration.seconds(1)){
-                carProperties.read()
-            }
-        }
     }
 }

demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCarController.kt

@@ -7,16 +7,11 @@ import javafx.scene.control.TextField
 import javafx.scene.layout.Priority
 import javafx.stage.Stage
 import kotlinx.coroutines.launch
-import org.eclipse.milo.opcua.sdk.server.OpcUaServer
-import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText
 import ru.mipt.npm.controls.api.DeviceMessage
 import ru.mipt.npm.controls.client.connectToMagix
 import ru.mipt.npm.controls.controllers.DeviceManager
 import ru.mipt.npm.controls.controllers.install
 import ru.mipt.npm.controls.demo.virtual_car.VirtualCar.Companion.acceleration
-import ru.mipt.npm.controls.opcua.server.OpcUaServer
-import ru.mipt.npm.controls.opcua.server.endpoint
-import ru.mipt.npm.controls.opcua.server.serveDevices
 import ru.mipt.npm.magix.api.MagixEndpoint
 import ru.mipt.npm.magix.rsocket.rSocketWithTcp
 import ru.mipt.npm.magix.server.startMagixServer
@@ -27,13 +22,6 @@ class VirtualCarController : Controller(), ContextAware {
 
     var device: VirtualCar? = null
     var magixServer: ApplicationEngine? = null
-    var opcUaServer: OpcUaServer = OpcUaServer {
-        setApplicationName(LocalizedText.english("ru.mipt.npm.controls.opcua"))
-        endpoint {
-            setBindPort(9999)
-            //use default endpoint
-        }
-    }
 
     override val context = Context("demoDevice") {
         plugin(DeviceManager)
@@ -49,16 +37,11 @@ class VirtualCarController : Controller(), ContextAware {
             //Launch device client and connect it to the server
             val deviceEndpoint = MagixEndpoint.rSocketWithTcp("localhost", DeviceMessage.serializer())
             deviceManager.connectToMagix(deviceEndpoint)
-
-            opcUaServer.startup()
-            opcUaServer.serveDevices(deviceManager)
         }
     }
 
     fun shutdown() {
         logger.info { "Shutting down..." }
-        opcUaServer.shutdown()
-        logger.info { "OpcUa server stopped" }
         magixServer?.stop(1000, 5000)
         logger.info { "Magix server stopped" }
         device?.close()