...

lib/installers/net/mycelium_installer/mycelium_installer_actions.v

@@ -8,26 +8,26 @@ import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.installers.infra.zinit_installer
 import freeflowuniverse.herolib.clients.mycelium
 import freeflowuniverse.herolib.develop.gittools
-import freeflowuniverse.herolib.osal.zinit
+import freeflowuniverse.herolib.osal.startupmanager
 import freeflowuniverse.herolib.installers.ulist
 import freeflowuniverse.herolib.installers.lang.rust
 import os
 
-fn startupcmd() ![]zinit.ZProcessNewArgs {
+fn startupcmd() ![]startupmanager.ZProcessNewArgs {
 	mut installer := get()!
-	mut res := []zinit.ZProcessNewArgs{}
+	mut res := []startupmanager.ZProcessNewArgs{}
 
 	mut peers_str := installer.peers.join(' ')
 	mut tun_name := 'tun${installer.tun_nr}'
 
-	res << zinit.ZProcessNewArgs{
+	res << startupmanager.ZProcessNewArgs
+	{
 		name:        'mycelium'
 		startuptype: .zinit
 		cmd:         'mycelium --key-file ${osal.hero_path()!}/cfg/priv_key.bin --peers ${peers_str} --tun-name ${tun_name}'
-		env:         {
-			'HOME': '/root'
+		env: {
+			'HOME':         os.home_dir()
 		}
-	}
 
 	return res
 }

lib/installers/net/mycelium_installer/mycelium_installer_factory_.v

@@ -3,8 +3,8 @@ module mycelium_installer
 import freeflowuniverse.herolib.core.base
 import freeflowuniverse.herolib.core.playbook { PlayBook }
 import freeflowuniverse.herolib.ui.console
+import json
 import freeflowuniverse.herolib.osal.startupmanager
-import freeflowuniverse.herolib.osal.zinit
 import time
 
 __global (
@@ -17,61 +17,97 @@ __global (
 @[params]
 pub struct ArgsGet {
 pub mut:
-	name string
+	name   string = 'default'
+	fromdb bool // will load from filesystem
+	create bool // default will not create if not exist
 }
 
-fn args_get(args_ ArgsGet) ArgsGet {
-	mut args := args_
-	if args.name == '' {
-		args.name = 'default'
-	}
-	return args
-}
-
-pub fn get(args_ ArgsGet) !&MyceliumInstaller {
-	mut context := base.context()!
-	mut args := args_get(args_)
+pub fn new(args ArgsGet) !&MyceliumInstaller {
 	mut obj := MyceliumInstaller{
 		name: args.name
 	}
-	if args.name !in mycelium_installer_global {
-		if !exists(args)! {
-			set(obj)!
+	set(obj)!
+	return &obj
+}
+
+pub fn get(args ArgsGet) !&MyceliumInstaller {
+	mut context := base.context()!
+	mycelium_installer_default = args.name
+	if args.fromdb || args.name !in mycelium_installer_global {
+		mut r := context.redis()!
+		if r.hexists('context:mycelium_installer', args.name)! {
+			data := r.hget('context:mycelium_installer', args.name)!
+			if data.len == 0 {
+				return error('MyceliumInstaller with name: mycelium_installer does not exist, prob bug.')
+			}
+			mut obj := json.decode(MyceliumInstaller, data)!
+			set_in_mem(obj)!
 		} else {
-			heroscript := context.hero_config_get('mycelium_installer', args.name)!
-			mut obj_ := heroscript_loads(heroscript)!
-			set_in_mem(obj_)!
+			if args.create {
+				new(args)!
+			} else {
+				return error("MyceliumInstaller with name 'mycelium_installer' does not exist")
+			}
 		}
+		return get(name: args.name)! // no longer from db nor create
 	}
 	return mycelium_installer_global[args.name] or {
-		println(mycelium_installer_global)
-		// bug if we get here because should be in globals
-		panic('could not get config for mycelium_installer with name, is bug:${args.name}')
+		return error('could not get config for mycelium_installer with name:mycelium_installer')
 	}
 }
 
 // register the config for the future
 pub fn set(o MyceliumInstaller) ! {
 	set_in_mem(o)!
+	mycelium_installer_default = o.name
 	mut context := base.context()!
-	heroscript := heroscript_dumps(o)!
-	context.hero_config_set('mycelium_installer', o.name, heroscript)!
+	mut r := context.redis()!
+	r.hset('context:mycelium_installer', o.name, json.encode(o))!
 }
 
 // does the config exists?
-pub fn exists(args_ ArgsGet) !bool {
+pub fn exists(args ArgsGet) !bool {
 	mut context := base.context()!
-	mut args := args_get(args_)
-	return context.hero_config_exists('mycelium_installer', args.name)
+	mut r := context.redis()!
+	return r.hexists('context:mycelium_installer', args.name)!
 }
 
-pub fn delete(args_ ArgsGet) ! {
-	mut args := args_get(args_)
+pub fn delete(args ArgsGet) ! {
 	mut context := base.context()!
-	context.hero_config_delete('mycelium_installer', args.name)!
-	if args.name in mycelium_installer_global {
-		// del mycelium_installer_global[args.name]
+	mut r := context.redis()!
+	r.hdel('context:mycelium_installer', args.name)!
+}
+
+@[params]
+pub struct ArgsList {
+pub mut:
+	fromdb bool // will load from filesystem
+}
+
+// if fromdb set: load from filesystem, and not from mem, will also reset what is in mem
+pub fn list(args ArgsList) ![]&MyceliumInstaller {
+	mut res := []&MyceliumInstaller{}
+	mut context := base.context()!
+	if args.fromdb {
+		// reset what is in mem
+		mycelium_installer_global = map[string]&MyceliumInstaller{}
+		mycelium_installer_default = ''
 	}
+	if args.fromdb {
+		mut r := context.redis()!
+		mut l := r.hkeys('context:mycelium_installer')!
+
+		for name in l {
+			res << get(name: name, fromdb: true)!
+		}
+		return res
+	} else {
+		// load from memory
+		for _, client in mycelium_installer_global {
+			res << client
+		}
+	}
+	return res
 }
 
 // only sets in mem, does not set as config
@@ -82,6 +118,9 @@ fn set_in_mem(o MyceliumInstaller) ! {
 }
 
 pub fn play(mut plbook PlayBook) ! {
+	if !plbook.exists(filter: 'mycelium_installer.') {
+		return
+	}
 	mut install_actions := plbook.find(filter: 'mycelium_installer.configure')!
 	if install_actions.len > 0 {
 		for install_action in install_actions {
@@ -90,7 +129,6 @@ pub fn play(mut plbook PlayBook) ! {
 			set(obj2)!
 		}
 	}
-
 	mut other_actions := plbook.find(filter: 'mycelium_installer.')!
 	for other_action in other_actions {
 		if other_action.name in ['destroy', 'install', 'build'] {
@@ -131,24 +169,28 @@ pub fn play(mut plbook PlayBook) ! {
 //////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-fn startupmanager_get(cat zinit.StartupManagerType) !startupmanager.StartupManager {
+fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.StartupManager {
 	// unknown
 	// screen
 	// zinit
 	// tmux
 	// systemd
 	match cat {
+		.screen {
+			console.print_debug('startupmanager: zinit')
+			return startupmanager.get(.screen)!
+		}
 		.zinit {
 			console.print_debug('startupmanager: zinit')
-			return startupmanager.get(cat: .zinit)!
+			return startupmanager.get(.zinit)!
 		}
 		.systemd {
 			console.print_debug('startupmanager: systemd')
-			return startupmanager.get(cat: .systemd)!
+			return startupmanager.get(.systemd)!
 		}
 		else {
 			console.print_debug('startupmanager: auto')
-			return startupmanager.get()!
+			return startupmanager.get(.auto)!
 		}
 	}
 }
@@ -223,10 +265,12 @@ pub fn (mut self MyceliumInstaller) running() !bool {
 
 	// walk over the generic processes, if not running return
 	for zprocess in startupcmd()! {
-		mut sm := startupmanager_get(zprocess.startuptype)!
-		r := sm.running(zprocess.name)!
-		if r == false {
-			return false
+		if zprocess.startuptype != .screen {
+			mut sm := startupmanager_get(zprocess.startuptype)!
+			r := sm.running(zprocess.name)!
+			if r == false {
+				return false
+			}
 		}
 	}
 	return running()!
@@ -260,10 +304,3 @@ pub fn (mut self MyceliumInstaller) destroy() ! {
 pub fn switch(name string) {
 	mycelium_installer_default = name
 }
-
-// helpers
-
-@[params]
-pub struct DefaultConfigArgs {
-	instance string = 'default'
-}

lib/installers/net/wireguard_installer/wireguard_installer_factory_.v

@@ -2,8 +2,8 @@ module wireguard_installer
 
 import freeflowuniverse.herolib.core.playbook { PlayBook }
 import freeflowuniverse.herolib.ui.console
+import json
 import freeflowuniverse.herolib.osal.startupmanager
-import freeflowuniverse.herolib.osal.zinit
 
 __global (
 	wireguard_installer_global  map[string]&WireGuard
@@ -15,14 +15,25 @@ __global (
 @[params]
 pub struct ArgsGet {
 pub mut:
-	name string
+	name string = 'default'
 }
 
-pub fn get(args_ ArgsGet) !&WireGuard {
+pub fn new(args ArgsGet) !&WireGuard {
 	return &WireGuard{}
 }
 
+pub fn get(args ArgsGet) !&WireGuard {
+	return new(args)!
+}
+
 pub fn play(mut plbook PlayBook) ! {
+	if !plbook.exists(filter: 'wireguard_installer.') {
+		return
+	}
+	mut install_actions := plbook.find(filter: 'wireguard_installer.configure')!
+	if install_actions.len > 0 {
+		return error("can't configure wireguard_installer, because no configuration allowed for this installer.")
+	}
 	mut other_actions := plbook.find(filter: 'wireguard_installer.')!
 	for other_action in other_actions {
 		if other_action.name in ['destroy', 'install', 'build'] {
@@ -44,28 +55,6 @@ pub fn play(mut plbook PlayBook) ! {
 //////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-fn startupmanager_get(cat zinit.StartupManagerType) !startupmanager.StartupManager {
-	// unknown
-	// screen
-	// zinit
-	// tmux
-	// systemd
-	match cat {
-		.zinit {
-			console.print_debug('startupmanager: zinit')
-			return startupmanager.get(cat: .zinit)!
-		}
-		.systemd {
-			console.print_debug('startupmanager: systemd')
-			return startupmanager.get(cat: .systemd)!
-		}
-		else {
-			console.print_debug('startupmanager: auto')
-			return startupmanager.get()!
-		}
-	}
-}
-
 @[params]
 pub struct InstallArgs {
 pub mut:
@@ -88,10 +77,3 @@ pub fn (mut self WireGuard) destroy() ! {
 pub fn switch(name string) {
 	wireguard_installer_default = name
 }
-
-// helpers
-
-@[params]
-pub struct DefaultConfigArgs {
-	instance string = 'default'
-}

lib/installers/net/yggdrasil/yggdrasil_actions.v

@@ -5,18 +5,18 @@ import freeflowuniverse.herolib.ui.console
 import freeflowuniverse.herolib.core.texttools
 import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.osal.systemd
-import freeflowuniverse.herolib.osal.zinit
+import freeflowuniverse.herolib.osal.startupmanager
 import freeflowuniverse.herolib.installers.ulist
 import freeflowuniverse.herolib.installers.lang.golang
 import freeflowuniverse.herolib.installers.lang.rust
 import freeflowuniverse.herolib.installers.lang.python
 import os
 
-fn startupcmd() ![]zinit.ZProcessNewArgs {
+fn startupcmd() ![]startupmanager.ZProcessNewArgs {
 	mut installer := get()!
-	mut res := []zinit.ZProcessNewArgs{}
+	mut res := []startupmanager.ZProcessNewArgs{}
 	// THIS IS EXAMPLE CODEAND NEEDS TO BE CHANGED
-	// res << zinit.ZProcessNewArgs{
+	// res << startupmanager.ZProcessNewArgs{
 	//     name: 'yggdrasil'
 	//     cmd: 'yggdrasil server'
 	//     env: {

lib/installers/net/yggdrasil/yggdrasil_factory_.v

@@ -2,28 +2,34 @@ module yggdrasil
 
 import freeflowuniverse.herolib.core.playbook { PlayBook }
 import freeflowuniverse.herolib.ui.console
+import json
 import freeflowuniverse.herolib.osal.startupmanager
-import freeflowuniverse.herolib.osal.zinit
 import time
 
-__global (
-	yggdrasil_global  map[string]&YggdrasilInstaller
-	yggdrasil_default string
-)
-
 /////////FACTORY
 
 @[params]
 pub struct ArgsGet {
 pub mut:
-	name string
+	name string = 'default'
 }
 
-pub fn get(args_ ArgsGet) !&YggdrasilInstaller {
+pub fn new(args ArgsGet) !&YggdrasilInstaller {
 	return &YggdrasilInstaller{}
 }
 
+pub fn get(args ArgsGet) !&YggdrasilInstaller {
+	return new(args)!
+}
+
 pub fn play(mut plbook PlayBook) ! {
+	if !plbook.exists(filter: 'yggdrasil.') {
+		return
+	}
+	mut install_actions := plbook.find(filter: 'yggdrasil.configure')!
+	if install_actions.len > 0 {
+		return error("can't configure yggdrasil, because no configuration allowed for this installer.")
+	}
 	mut other_actions := plbook.find(filter: 'yggdrasil.')!
 	for other_action in other_actions {
 		if other_action.name in ['destroy', 'install', 'build'] {
@@ -64,30 +70,33 @@ pub fn play(mut plbook PlayBook) ! {
 //////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-fn startupmanager_get(cat zinit.StartupManagerType) !startupmanager.StartupManager {
+fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.StartupManager {
 	// unknown
 	// screen
 	// zinit
 	// tmux
 	// systemd
 	match cat {
+		.screen {
+			console.print_debug('startupmanager: zinit')
+			return startupmanager.get(.screen)!
+		}
 		.zinit {
 			console.print_debug('startupmanager: zinit')
-			return startupmanager.get(cat: .zinit)!
+			return startupmanager.get(.zinit)!
 		}
 		.systemd {
 			console.print_debug('startupmanager: systemd')
-			return startupmanager.get(cat: .systemd)!
+			return startupmanager.get(.systemd)!
 		}
 		else {
 			console.print_debug('startupmanager: auto')
-			return startupmanager.get()!
+			return startupmanager.get(.auto)!
 		}
 	}
 }
 
 pub fn (mut self YggdrasilInstaller) start() ! {
-	switch(self.name)
 	if self.running()! {
 		return
 	}
@@ -150,10 +159,12 @@ pub fn (mut self YggdrasilInstaller) running() !bool {
 
 	// walk over the generic processes, if not running return
 	for zprocess in startupcmd()! {
-		mut sm := startupmanager_get(zprocess.startuptype)!
-		r := sm.running(zprocess.name)!
-		if r == false {
-			return false
+		if zprocess.startuptype != .screen {
+			mut sm := startupmanager_get(zprocess.startuptype)!
+			r := sm.running(zprocess.name)!
+			if r == false {
+				return false
+			}
 		}
 	}
 	return running()!
@@ -185,12 +196,4 @@ pub fn (mut self YggdrasilInstaller) destroy() ! {
 
 // switch instance to be used for yggdrasil
 pub fn switch(name string) {
-	yggdrasil_default = name
-}
-
-// helpers
-
-@[params]
-pub struct DefaultConfigArgs {
-	instance string = 'default'
 }