feat: adding online runtime behavior

Author: Frnd-me

.idea/codeStyles/Project.xml

@@ -0,0 +1,30 @@
+version: '3.7'
+configs:
+  telegraf_config:
+    file: ./telegraf.conf
+services:
+  influxdb:
+    image: "influxdb:2"
+    ports:
+      - "8086:8086"
+    environment:
+      - DOCKER_INFLUXDB_INIT_MODE=setup
+      - DOCKER_INFLUXDB_INIT_USERNAME=admin
+      - DOCKER_INFLUXDB_INIT_PASSWORD=adminadmin
+      - DOCKER_INFLUXDB_INIT_ORG=org
+      - DOCKER_INFLUXDB_INIT_BUCKET=bucket
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=bzO10KmR8x
+  telegraf:
+    image: "telegraf:latest"
+    ports:
+      - "4317:4317"
+    configs:
+      - source: telegraf_config
+        target: /etc/telegraf/telegraf.conf
+  nats:
+    image: "nats:latest"
+    command:
+      - "-js"
+    ports:
+      - "4222:4222"
+      - "6222:6222"

.idea/runConfigurations/cirrina__run_.xml

@@ -44,8 +44,10 @@ public void run() {
 
         logger.info("Starting runtime: {}", name);
 
-        // Run, will return when finished
-        //runtime.run();
+        runtime.startFromPath(
+          EnvironmentVariables.INSTANCE.getCsmPath().get(),
+          EnvironmentVariables.INSTANCE.getInstantiate().get()
+        );
 
         logger.info("Done running");
       }

compose.yaml

@@ -1,53 +1,74 @@
 package at.ac.uibk.dps.cirrina.cirrina
 
 enum class EventProvider {
-    NATS
+  NATS
 }
 
 enum class PersistentContextProvider {
-    NATS
+  NATS
 }
 
-data class EnvironmentVariable<T>(val name: String, val required: Boolean = false, val default: T? = null, val mapper: (String) -> T = {
+data class EnvironmentVariable<T>(
+  val name: String, val required: Boolean = false, val default: T? = null, val mapper: (String) -> T = {
     it as T
-}) {
-    fun get(): T? {
-        val value = System.getenv(name)
-        return when {
-            value != null -> mapper(value)
-            default != null -> default
-            required -> throw IllegalStateException("Missing required environment variable: $name")
-            else -> null
-        }
+  }
+) {
+  fun get(): T? {
+    val value = System.getenv(name)
+    return when {
+      value != null -> mapper(value)
+      default != null -> default
+      required -> throw IllegalStateException("Missing required environment variable: $name")
+      else -> null
     }
+  }
 }
 
 object EnvironmentVariables {
-    // NATS event handler-specific environment variables
-    val natsEventUrl = EnvironmentVariable<String>("NATS_EVENT_URL", default = "nats://localhost:4222/")
+  // NATS event handler-specific environment variables
+  val natsEventUrl = EnvironmentVariable<String>("NATS_EVENT_URL", default = "nats://localhost:4222/")
 
-    // NATS persistent context-specific environment variables
-    val natsPersistentContextUrl = EnvironmentVariable<String>("NATS_PERSISTENT_CONTEXT_URL", default = "nats://localhost:4222")
-    val natsPersistentContextBucket = EnvironmentVariable<String>("NATS_PERSISTENT_CONTEXT_BUCKET", default = "persistent")
+  // NATS persistent context-specific environment variables
+  val natsPersistentContextUrl = EnvironmentVariable<String>("NATS_PERSISTENT_CONTEXT_URL", default = "nats://localhost:4222")
+  val natsPersistentContextBucket = EnvironmentVariable<String>("NATS_PERSISTENT_CONTEXT_BUCKET", default = "persistent")
 
-    // General environment variables
-    val eventProvider = EnvironmentVariable<EventProvider>(name = "EVENT_PROVIDER", required = true, mapper = { value ->
+  // General environment variables
+  val csmPath = EnvironmentVariable<String>("CSM_PATH", required = true)
+  val instantiate =
+    EnvironmentVariable(
+      name = "INSTANTIATE",
+      default = emptyList(),
+      mapper = { value -> value.split(",").map { it.trim() }.filter { it.isNotEmpty() } },
+    )
+  val eventProvider =
+    EnvironmentVariable(
+      name = "EVENT_PROVIDER",
+      default = EventProvider.NATS,
+      mapper = { value ->
         try {
-            EventProvider.valueOf(value.uppercase())
-        } catch (e: IllegalArgumentException) {
-            throw IllegalStateException("Invalid EVENT_PROVIDER: '$value'. Allowed: ${EventProvider.entries}")
+          EventProvider.valueOf(value.uppercase())
+        } catch (_: IllegalArgumentException) {
+          throw IllegalStateException(
+            "Invalid EVENT_PROVIDER: '$value'. Allowed: ${EventProvider.entries}"
+          )
         }
-    })
-    val persistentContextProvider = EnvironmentVariable<PersistentContextProvider>(name = "PERSISTENT_CONTEXT_PROVIDER", required = true, mapper = { value ->
+      },
+    )
+  val persistentContextProvider =
+    EnvironmentVariable(
+      name = "PERSISTENT_CONTEXT_PROVIDER",
+      default = PersistentContextProvider.NATS,
+      mapper = { value ->
         try {
-            PersistentContextProvider.valueOf(value.uppercase())
-        } catch (e: IllegalArgumentException) {
-            throw IllegalStateException("Invalid PERSISTENT_CONTEXT_PROVIDER: '$value'. Allowed: ${PersistentContextProvider.entries}")
+          PersistentContextProvider.valueOf(value.uppercase())
+        } catch (_: IllegalArgumentException) {
+          throw IllegalStateException(
+            "Invalid PERSISTENT_CONTEXT_PROVIDER: '$value'. Allowed: ${PersistentContextProvider.entries}"
+          )
         }
-    })
-    val healthPort = EnvironmentVariable<Int>("HEALTH_PORT", default = 0xCAFE) {
-        it.toInt()
-    }
+      },
+    )
+  val healthPort = EnvironmentVariable("HEALTH_PORT", default = 0xCAFE) { it.toInt() }
 }
 
 

src/main/java/at/ac/uibk/dps/cirrina/cirrina/CirrinaRuntime.java

@@ -4,8 +4,7 @@
 import at.ac.uibk.dps.cirrina.classes.transition.OnTransitionClass;
 import at.ac.uibk.dps.cirrina.classes.transition.TransitionClass;
 import at.ac.uibk.dps.cirrina.csml.description.Csml.ContextDescription;
-import at.ac.uibk.dps.cirrina.execution.object.action.InvokeAction;
-import at.ac.uibk.dps.cirrina.execution.object.action.RaiseAction;
+import at.ac.uibk.dps.cirrina.execution.object.action.EventRaisingAction;
 import at.ac.uibk.dps.cirrina.execution.object.event.Event;
 import at.ac.uibk.dps.cirrina.io.plantuml.Exportable;
 import at.ac.uibk.dps.cirrina.io.plantuml.PlantUmlVisitor;
@@ -192,31 +191,21 @@ public List<String> getInputEvents() {
   }
 
   /**
-   * Returns the events that may be raised from this state.
+   * Returns the events that may be raised from this state machine.
    *
    * @return Output events.
    */
   public List<Event> getOutputEvents() {
     return Stream.concat(
-      // Raise action events
-      Stream.concat(
-        vertexSet()
-          .stream()
-          .flatMap(v -> v.getActionsOfType(RaiseAction.class).stream()),
-        edgeSet()
-          .stream()
-          .flatMap(e -> e.getActionsOfType(RaiseAction.class).stream())
-      ).map(RaiseAction::getEvent),
-      // Invoke action events
-      Stream.concat(
-        vertexSet()
-          .stream()
-          .flatMap(v -> v.getActionsOfType(InvokeAction.class).stream()),
-        edgeSet()
-          .stream()
-          .flatMap(e -> e.getActionsOfType(InvokeAction.class).stream())
-      ).flatMap(invokeAction -> invokeAction.getDone().stream())
-    ).toList();
+      vertexSet()
+        .stream()
+        .flatMap(v -> v.getActionsOfType(EventRaisingAction.class).stream()),
+      edgeSet()
+        .stream()
+        .flatMap(e -> e.getActionsOfType(EventRaisingAction.class).stream())
+    )
+      .flatMap(action -> action.raises().stream())
+      .toList();
   }
 
   /**

src/main/java/at/ac/uibk/dps/cirrina/cirrina/EnvironmentVariables.kt

@@ -17,7 +17,8 @@ public final class ActionTimeoutResetCommand extends ActionCommand {
 
   @Override
   public List<ActionCommand> execute() throws UnsupportedOperationException {
-    return List.of(this);
+    // Handled in StateMachine
+    return List.of();
   }
 
   public TimeoutResetAction getTimeoutResetAction() {

src/main/java/at/ac/uibk/dps/cirrina/classes/statemachine/StateMachineClass.java

@@ -0,0 +1,7 @@
+package at.ac.uibk.dps.cirrina.execution.`object`.action
+
+import at.ac.uibk.dps.cirrina.execution.`object`.event.Event
+
+interface EventRaisingAction {
+  fun raises(): List<Event>
+}

src/main/java/at/ac/uibk/dps/cirrina/execution/command/ActionTimeoutResetCommand.java

@@ -4,11 +4,12 @@
 import at.ac.uibk.dps.cirrina.execution.object.context.ContextVariable;
 import at.ac.uibk.dps.cirrina.execution.object.event.Event;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Invoke action, invokes a service type.
  */
-public final class InvokeAction extends Action {
+public final class InvokeAction extends Action implements EventRaisingAction {
 
   private final String serviceType;
 
@@ -48,6 +49,12 @@ public List<ContextVariableReferenceDescription> getOutput() {
     return output;
   }
 
+  @Override
+  @NotNull
+  public List<Event> raises() {
+    return done;
+  }
+
   public record Parameters(
     String serviceType,
     boolean isLocal,

src/main/java/at/ac/uibk/dps/cirrina/execution/object/action/EventRaisingAction.kt

@@ -1,9 +1,12 @@
 package at.ac.uibk.dps.cirrina.execution.object.action;
 
+import at.ac.uibk.dps.cirrina.execution.object.event.Event;
 import at.ac.uibk.dps.cirrina.execution.object.expression.Expression;
+import java.util.List;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
-public final class MatchAction extends Action {
+public final class MatchAction extends Action implements EventRaisingAction {
 
   private final Expression value;
 
@@ -22,5 +25,17 @@ public Map<Expression, Action> getCase() {
     return casee;
   }
 
+  @Override
+  @NotNull
+  public List<Event> raises() {
+    return casee
+      .values()
+      .stream()
+      .filter(a -> a instanceof EventRaisingAction)
+      .map(a -> (EventRaisingAction) a)
+      .flatMap(a -> a.raises().stream())
+      .toList();
+  }
+
   public record Parameters(Expression value, Map<Expression, Action> casee) {}
 }