feat: queue manager

.docker/druid-install-command.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
 #check if first argument is there, set CHANNEL to it, otherwise default to latest
-if [ -z "$1" ]; then
-    CHANNEL="$CHANNEL/download"
+if [ -z "$CHANNEL" ]; then
+    URL_PATH="latest/download"
 else
-    CHANNEL=download/$1
+    URL_PATH=download/$CHANNEL
 fi
 
-wget -O /app/resources/druid https://github.com/highcard-dev/druid-cli/releases/$CHANNEL/druid
-wget -O /app/resources/druid_rcon https://github.com/highcard-dev/druid-cli/releases/$CHANNEL/druid_rcon 
-wget -O /app/resources/druid_rcon_web https://github.com/highcard-dev/druid-cli/releases/$CHANNEL/druid_rcon_web
-wget -O /app/resources/entrypoint.sh https://github.com/highcard-dev/druid-cli/releases/$CHANNEL/entrypoint.sh 
+wget -O /app/resources/druid https://github.com/highcard-dev/druid-cli/releases/$URL_PATH/druid
+wget -O /app/resources/druid_rcon https://github.com/highcard-dev/druid-cli/releases/$URL_PATH/druid_rcon 
+wget -O /app/resources/druid_rcon_web https://github.com/highcard-dev/druid-cli/releases/$URL_PATH/druid_rcon_web
+wget -O /app/resources/entrypoint.sh https://github.com/highcard-dev/druid-cli/releases/$URL_PATH/entrypoint.sh 
 chmod +x /app/resources/druid /app/resources/druid_rcon /app/resources/druid_rcon_web
 
 # Modify the PATH variable to prioritize /app/resources
 export PATH=/app/resources:$PATH
 
-bash /app/resources/entrypoint.sh
+bash /app/resources/entrypoint.sh $@

.vscode/launch.json

@@ -151,6 +151,16 @@
             "trace": "verbose",
             "debugAdapter": "legacy"
 
-        }
+        },
+        {
+            "name": "Test Current File",
+            "type": "go",
+            "request": "launch",
+            "mode": "test",
+            "program": "${file}",
+            "env": {},
+            "args": [],
+            "showLog": true
+        }       
     ]
 }

cmd/run.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/highcard-dev/daemon/internal/core/services"
 	"github.com/highcard-dev/daemon/internal/core/services/registry"
@@ -33,6 +32,8 @@ var RunCmd = &cobra.Command{
 		}
 		processLauncher := services.NewProcedureLauncher(client, processManager, services.NewPluginManager(), consoleService, logManager, scrollService)
 
+		queueManager := services.NewQueueManager(scrollService, processLauncher)
+
 		if !scrollService.LockExists() {
 			scrollService.WriteNewScrollLock()
 			logger.Log().Info("Lock file created")
@@ -55,11 +56,9 @@ var RunCmd = &cobra.Command{
 			return err
 		}
 
-		parts := strings.Split(args[0], ".")
-
-		command := strings.TrimPrefix(args[0], parts[0]+".")
+		command := args[0]
 
-		err = processLauncher.RunNew(command, parts[0], false)
+		err = queueManager.AddItem(command, false)
 		return err
 	},
 }

cmd/serve.go

@@ -88,7 +88,9 @@ to interact and monitor the Scroll Application`,
 
 		processLauncher := services.NewProcedureLauncher(client, processManager, pluginManager, consoleService, logManager, scrollService)
 
-		scrollHandler := handler.NewScrollHandler(scrollService, pluginManager, processLauncher)
+		queueManager := services.NewQueueManager(scrollService, processLauncher)
+
+		scrollHandler := handler.NewScrollHandler(scrollService, pluginManager, processLauncher, queueManager)
 		processHandler := handler.NewProcessHandler(processManager)
 		scrollLogHandler := handler.NewScrollLogHandler(scrollService, logManager, processManager)
 		scrollMetricHandler := handler.NewScrollMetricHandler(scrollService, processMonitor)
@@ -105,7 +107,7 @@ to interact and monitor the Scroll Application`,
 
 		a := s.Initialize()
 
-		signals.SetupSignals(processLauncher, processManager, a, shutdownWait)
+		signals.SetupSignals(queueManager, processManager, a, shutdownWait)
 
 		currentScroll, lock, err := scrollService.Bootstrap(ignoreVersionCheck)
 		if err != nil {
@@ -122,12 +124,6 @@ to interact and monitor the Scroll Application`,
 			//important to launch plugins, after the templates are rendered, sothat templates can provide for plugins
 			err = processLauncher.LaunchPlugins()
 
-			if err != nil {
-				return err
-			}
-			//run if something is there
-			err = processLauncher.StartLockfile(lock)
-
 			if err != nil {
 				return err
 			}
@@ -152,17 +148,28 @@ to interact and monitor the Scroll Application`,
 			}
 			//start scroll.init process
 			//initialize if nothing is there
-			err = processLauncher.Initalize(lock)
+			err = queueManager.AddItem(currentScroll.Init, false)
 			if err != nil {
 				return err
 			}
+
+			scrollService.WriteNewScrollLock()
+
 			logger.Log().Info("Bootstrapping done")
 		}
 
+		err = queueManager.QueueLockFile()
+		if err != nil {
+			return err
+		}
+
+		//run if something is there
+		go queueManager.Work()
+
 		//schedule crons
 		logger.Log().Info("Schedule crons")
 
-		cronManager := services.NewCronManager(currentScroll.Cronjobs, processLauncher)
+		cronManager := services.NewCronManager(currentScroll.Cronjobs, queueManager)
 		err = cronManager.Init()
 
 		if err != nil {

examples/minecraft/.scroll/scroll-lock.json

@@ -1 +1 @@
-{"statuses":{"main.install":"done","main.start":"running"},"scroll_version":"0.0.1","scroll_name":"registry-1.docker.io/highcard/scroll-minecraft-spigot"}
+{"statuses":{"install":"done","start":"running"},"scroll_version":"0.0.1","scroll_name":"registry-1.docker.io/highcard/scroll-minecraft-spigot"}

examples/minecraft/.scroll/scroll.yaml

@@ -2,39 +2,37 @@ name: registry-1.docker.io/highcard/scroll-minecraft-spigot
 desc: Minecraft Spigot
 version: 0.0.1
 app_version: 1.20.4
-init: "main.start"
-processes:
-  main:
-    commands:
-      start:
-        needs: [main.install]
-        run: restart
-        procedures:
-          - mode: exec
-            data:
-              - java
-              - -Xmx1024M
-              - -Xms1024M
-              - -jar
-              - spigot.jar
-              - nogui
-      stop:
-        procedures:
-          - mode: stdin
-            data:
-              - main.start
-              - stop
-      install:
-        run: once
-        procedures:
-          - mode: exec
-            data:
-              - wget
-              - -O
-              - spigot.jar
-              - https://s3.eu-central-1.wasabisys.com/druid-scroll-artifacts/minecraft/spigot/spigot-1.20.4.jar
-          - mode: exec
-            data:
-              - bash
-              - -c
-              - echo eula=true > eula.txt
+init: "start"
+commands:
+  start:
+    needs: [install]
+    run: restart
+    procedures:
+      - mode: exec
+        data:
+          - java
+          - -Xmx1024M
+          - -Xms1024M
+          - -jar
+          - spigot.jar
+          - nogui
+  stop:
+    procedures:
+      - mode: stdin
+        data:
+          - start
+          - stop
+  install:
+    run: once
+    procedures:
+      - mode: exec
+        data:
+          - wget
+          - -O
+          - spigot.jar
+          - https://s3.eu-central-1.wasabisys.com/druid-scroll-artifacts/minecraft/spigot/spigot-1.20.4.jar
+      - mode: exec
+        data:
+          - bash
+          - -c
+          - echo eula=true > eula.txt

examples/nginx/.scroll/scroll-lock.json

@@ -1 +1,5 @@
-{"statuses":{"main.start":"running"},"scroll_version":"0.0.1","scroll_name":"registry-1.docker.io/highcard/scroll-nginx"}
+{
+  "statuses": { "start": "running" },
+  "scroll_version": "0.0.1",
+  "scroll_name": "registry-1.docker.io/highcard/scroll-nginx"
+}

examples/nginx/.scroll/scroll.yaml

@@ -2,20 +2,18 @@ name: registry-1.docker.io/highcard/scroll-nginx
 desc: Nginx server
 version: 0.0.1
 app_version: latest
-init: "main.start"
-processes:
-  main:
-    commands:
-      start:
-        run: restart
-        procedures:
-          - mode: exec
-            data:
-              - nginx
-      stop:
-        procedures:
-          - mode: exec
-            data:
-              - nginx
-              - -s
-              - stop
+init: "start"
+commands:
+  start:
+    run: restart
+    procedures:
+      - mode: exec
+        data:
+          - nginx
+  stop:
+    procedures:
+      - mode: exec
+        data:
+          - nginx
+          - -s
+          - stop

internal/core/domain/scroll.go

@@ -26,14 +26,14 @@ type Cronjob struct {
 }
 
 type File struct {
-	Name       string                       `yaml:"name" json:"name"`
-	Desc       string                       `yaml:"desc" json:"desc"`
-	Version    *semver.Version              `yaml:"version" json:"version"`
-	AppVersion string                       `yaml:"app_version" json:"app_version"` //don't make this a semver, it's not allways
-	Init       string                       `yaml:"init" json:"init"`
-	Processes  map[string]*ProcessCommand   `yaml:"processes" json:"processes"`
-	Plugins    map[string]map[string]string `yaml:"plugins" json:"plugins"`
-	Cronjobs   []*Cronjob                   `yaml:"cronjobs" json:"cronjobs"`
+	Name       string                            `yaml:"name" json:"name"`
+	Desc       string                            `yaml:"desc" json:"desc"`
+	Version    *semver.Version                   `yaml:"version" json:"version"`
+	AppVersion string                            `yaml:"app_version" json:"app_version"` //don't make this a semver, it's not allways
+	Init       string                            `yaml:"init" json:"init"`
+	Commands   map[string]*CommandInstructionSet `yaml:"commands" json:"commands"`
+	Plugins    map[string]map[string]string      `yaml:"plugins" json:"plugins"`
+	Cronjobs   []*Cronjob                        `yaml:"cronjobs" json:"cronjobs"`
 } // @name ScrollFile
 
 type Scroll struct {
@@ -60,10 +60,6 @@ type CommandInstructionSet struct {
 	Run        RunMode      `yaml:"run,omitempty" json:"run,omitempty"`
 } // @name CommandInstructionSet
 
-type ProcessCommand struct {
-	Commands map[string]CommandInstructionSet `yaml:"commands" json:"commands"`
-} // @name ProcessCommand
-
 var ErrScrollDoesNotExist = fmt.Errorf("scroll does not exist")
 
 func NewScroll(scrollDir string) (*Scroll, error) {

internal/core/domain/scroll_lock.go

@@ -53,11 +53,11 @@ func WriteNewScrollLock(path string) *ScrollLock {
 	return lock
 }
 
-func (scrollLock *ScrollLock) GetStatus(process string, command string) ScrollLockStatus {
-	return scrollLock.Statuses[process+"."+command]
+func (scrollLock *ScrollLock) GetStatus(command string) ScrollLockStatus {
+	return scrollLock.Statuses[command]
 }
 
-func (scrollLock *ScrollLock) SetStatus(process string, command string, status ScrollLockStatus) {
-	scrollLock.Statuses[process+"."+command] = status
+func (scrollLock *ScrollLock) SetStatus(command string, status ScrollLockStatus) {
+	scrollLock.Statuses[command] = status
 	scrollLock.Write()
 }

internal/core/ports/services_ports.go

@@ -25,12 +25,13 @@ type ScrollServiceInterface interface {
 	GetCwd() string
 	WriteNewScrollLock() *domain.ScrollLock
 	GetLock() (*domain.ScrollLock, error)
-	GetCommand(cmd string, processId string) (*domain.CommandInstructionSet, error)
+	GetCommand(cmd string) (*domain.CommandInstructionSet, error)
 }
 
 type ProcedureLauchnerInterface interface {
-	RunNew(commandId string, processId string, changeStatus bool) error
-	RunProcedure(*domain.Procedure, string, string) (string, *int, error)
+	LaunchPlugins() error
+	RunProcedure(*domain.Procedure, string) (string, *int, error)
+	Run(cmd string) error
 }
 
 type PluginManagerInterface interface {
@@ -48,9 +49,9 @@ type LogManagerInterface interface {
 
 type ProcessManagerInterface interface {
 	GetRunningProcesses() map[string]*domain.Process
-	GetRunningProcess(process string, commandName string) *domain.Process
-	Run(process string, commandName string, command []string, dir string) (*int, error)
-	RunTty(process string, comandName string, command []string, dir string) (*int, error)
+	GetRunningProcess(commandName string) *domain.Process
+	Run(commandName string, command []string, dir string) (*int, error)
+	RunTty(comandName string, command []string, dir string) (*int, error)
 	WriteStdin(process *domain.Process, data string) error
 }
 
@@ -94,3 +95,7 @@ type OciRegistryInterface interface {
 type CronManagerInterface interface {
 	Init()
 }
+
+type QueueManagerInterface interface {
+	AddItem(cmd string, changeStatus bool) error
+}

internal/core/services/cron_manager.go

@@ -1,7 +1,6 @@
 package services
 
 import (
-	"strings"
 	"time"
 
 	"github.com/go-co-op/gocron"
@@ -12,14 +11,14 @@ import (
 )
 
 type CronManager struct {
-	crons           []*domain.Cronjob
-	processLauncher ports.ProcedureLauchnerInterface
+	crons        []*domain.Cronjob
+	queueManager ports.QueueManagerInterface
 }
 
-func NewCronManager(cronjobs []*domain.Cronjob, processLauncher ports.ProcedureLauchnerInterface) *CronManager {
+func NewCronManager(cronjobs []*domain.Cronjob, queueManager ports.QueueManagerInterface) *CronManager {
 	return &CronManager{
-		crons:           cronjobs,
-		processLauncher: processLauncher,
+		crons:        cronjobs,
+		queueManager: queueManager,
 	}
 }
 
@@ -30,13 +29,9 @@ func (c *CronManager) Init() error {
 		_, err := scheduler.Cron(cron.Schedule).Do(func() {
 			logger.Log().Info("Cronjob started", zap.String("name", cron.Name))
 
-			//parse cron.Command e.g. main.start
-			//split by dot
-			parts := strings.Split(cron.Command, ".")
-			process := parts[0]
-			command := parts[1]
+			//run cron.Command e.g. main.start
 
-			err := c.processLauncher.RunNew(command, process, false)
+			err := c.queueManager.AddItem(cron.Command, false)
 
 			if err != nil {
 				logger.Log().Error("error running cronjob", zap.String("name", cron.Name), zap.Error(err))