...

examples/core/dbfs/dbfs1.vsh

@@ -1,45 +0,0 @@
-#!/usr/bin/env -S v -n -w -gc none  -cc tcc -d use_openssl -enable-globals run
-
-import freeflowuniverse.herolib.data.dbfs
-import time
-import os
-
-data_dir := '/tmp/db'
-os.rmdir_all(data_dir) or {}
-mut dbcollection := dbfs.get(contextid: 1, dbpath: data_dir, secret: '123456')!
-
-mut db := dbcollection.db_create(name: 'db_a', encrypted: true, withkeys: true)!
-
-id := db.set(key: 'a', value: 'bbbb')!
-assert 'bbbb' == db.get(key: 'a')!
-
-id2 := db.set(key: 'a', value: 'bbbb2')!
-assert 'bbbb2' == db.get(key: 'a')!
-assert id == id2
-assert id == 1
-
-id3 := db.set(key: 'b', value: 'bbbb3')!
-assert 'bbbb3' == db.get(key: 'b')!
-assert id3 == id2 + 1
-
-assert db.exists(key: 'a')!
-assert db.exists(key: 'b')!
-assert db.exists(id: id2)!
-assert db.exists(id: id3)!
-id3_exsts := db.exists(id: id3 + 1)!
-println(id3 + 1)
-assert id3_exsts == false
-
-for i in 3 .. 100 {
-	id4 := db.set(key: 'a${i}', value: 'b${i}')!
-	println('${i} --> ${id4}')
-	assert i == id4
-}
-
-db.delete(key: 'a')!
-assert db.exists(key: 'a')! == false
-assert db.exists(id: id2)! == false
-
-db.delete(id: 50)!
-assert db.exists(key: 'a50')! == false
-assert db.exists(id: 50)! == false

examples/core/secrets_example.vsh

@@ -1,8 +0,0 @@
-#!/usr/bin/env -S v -n -w -gc none  -cc tcc -d use_openssl -enable-globals run
-
-import freeflowuniverse.herolib.crypt.secrets
-
-secrets.delete_passwd()!
-r := secrets.encrypt('aaa')!
-println(r)
-assert 'aaa' == secrets.decrypt(r)!

examples/installers/infra/.gitignore

@@ -0,0 +1,5 @@
+zinit_installer
+dify
+screen
+livekit
+gitea

lib/installers/db/cometbft/cometbft_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/db/meilisearch_installer/meilisearch_installer_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/db/postgresql/postgresql_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/db/qdrant_installer/qdrant_installer_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/db/zerodb/zerodb_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/db/zerofs/zerofs_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/infra/coredns/coredns_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/infra/gitea/gitea_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/infra/livekit/livekit_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/infra/livekit/livekit_model.v

@@ -5,7 +5,7 @@ import freeflowuniverse.herolib.core.pathlib
 import freeflowuniverse.herolib.ui.console
 import os
 
-pub const version = '1.7.2'
+pub const version = '1.9.0'
 const singleton = false
 const default = true
 

lib/installers/infra/livekit/readme.md

@@ -8,15 +8,13 @@ To get started
 
 
 
-import freeflowuniverse.herolib.installers.something. livekit
+import freeflowuniverse.herolib.installers.infra.livekit
 
 mut installer:= livekit.get()!
 
 installer.start()!
 
 
-
-
 ```
 
 livekit once installed will have generated the secret keys

lib/installers/infra/screen/.heroscript

@@ -1,13 +0,0 @@
-
-!!hero_code.generate_installer
-    name:'screen'
-    classname:'Screen'
-    singleton:0
-    templates:0
-    default:1
-    title:''
-    supported_platforms:''
-    reset:0
-    startupmanager:0
-	hasconfig:0
-    build:0

lib/installers/infra/screen/readme.md

@@ -1,44 +0,0 @@
-# screen
-
-
-
-To get started
-
-```v
-
-
-import freeflowuniverse.herolib.installers.something.screen as screen_installer
-
-heroscript:="
-!!screen.configure name:'test'
-    password: '1234'
-    port: 7701
-
-!!screen.start name:'test' reset:1 
-"
-
-screen_installer.play(heroscript=heroscript)!
-
-//or we can call the default and do a start with reset
-//mut installer:= screen_installer.get()!
-//installer.start(reset:true)!
-
-
-
-
-```
-
-## example heroscript
-
-```hero
-!!screen.configure
-    homedir: '/home/user/screen'
-    username: 'admin'
-    password: 'secretpassword'
-    title: 'Some Title'
-    host: 'localhost'
-    port: 8888
-
-```
-
-

lib/installers/infra/screen/screen_actions.v

@@ -1,60 +0,0 @@
-module screen
-
-import freeflowuniverse.herolib.core
-import freeflowuniverse.herolib.ui.console
-import freeflowuniverse.herolib.installers.ulist
-import os
-
-// checks if a certain version or above is installed
-fn installed() !bool {
-	res := os.execute('screen --version')
-	if res.exit_code != 0 {
-		return false
-	}
-
-	return true
-}
-
-// get the Upload List of the files
-fn ulist_get() !ulist.UList {
-	// optionally build a UList which is all paths which are result of building, is then used e.g. in upload
-	return ulist.UList{}
-}
-
-// uploads to S3 server if configured
-fn upload() ! {}
-
-fn install() ! {
-	console.print_header('install screen')
-
-	if core.is_ubuntu()! {
-		res := os.execute('sudo apt install screen -y')
-		if res.exit_code != 0 {
-			return error('failed to install screen: ${res.output}')
-		}
-	} else if core.is_osx()! {
-		res := os.execute('sudo brew install screen')
-		if res.exit_code != 0 {
-			return error('failed to install screen: ${res.output}')
-		}
-	} else {
-		return error('unsupported platform: ${core.platform()!}')
-	}
-}
-
-fn destroy() ! {
-	console.print_header('uninstall screen')
-	if core.is_ubuntu()! {
-		res := os.execute('sudo apt remove screen -y')
-		if res.exit_code != 0 {
-			return error('failed to uninstall screen: ${res.output}')
-		}
-	} else if core.is_osx()! {
-		res := os.execute('sudo brew uninstall screen')
-		if res.exit_code != 0 {
-			return error('failed to uninstall screen: ${res.output}')
-		}
-	} else {
-		return error('unsupported platform: ${core.platform()!}')
-	}
-}

lib/installers/infra/screen/screen_factory_.v

@@ -1,79 +0,0 @@
-module screen
-
-import freeflowuniverse.herolib.core.playbook { PlayBook }
-import freeflowuniverse.herolib.ui.console
-import json
-import freeflowuniverse.herolib.osal.startupmanager
-
-__global (
-	screen_global  map[string]&Screen
-	screen_default string
-)
-
-/////////FACTORY
-
-@[params]
-pub struct ArgsGet {
-pub mut:
-	name string = 'default'
-}
-
-pub fn new(args ArgsGet) !&Screen {
-	return &Screen{}
-}
-
-pub fn get(args ArgsGet) !&Screen {
-	return new(args)!
-}
-
-pub fn play(mut plbook PlayBook) ! {
-	if !plbook.exists(filter: 'screen.') {
-		return
-	}
-	mut install_actions := plbook.find(filter: 'screen.configure')!
-	if install_actions.len > 0 {
-		return error("can't configure screen, because no configuration allowed for this installer.")
-	}
-	mut other_actions := plbook.find(filter: 'screen.')!
-	for other_action in other_actions {
-		if other_action.name in ['destroy', 'install', 'build'] {
-			mut p := other_action.params
-			reset := p.get_default_false('reset')
-			if other_action.name == 'destroy' || reset {
-				console.print_debug('install action screen.destroy')
-				destroy()!
-			}
-			if other_action.name == 'install' {
-				console.print_debug('install action screen.install')
-				install()!
-			}
-		}
-	}
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////# LIVE CYCLE MANAGEMENT FOR INSTALLERS ///////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-@[params]
-pub struct InstallArgs {
-pub mut:
-	reset bool
-}
-
-pub fn (mut self Screen) install(args InstallArgs) ! {
-	switch(self.name)
-	if args.reset || (!installed()!) {
-		install()!
-	}
-}
-
-pub fn (mut self Screen) destroy() ! {
-	switch(self.name)
-	destroy()!
-}
-
-// switch instance to be used for screen
-pub fn switch(name string) {
-	screen_default = name
-}

lib/installers/infra/screen/screen_model.v

@@ -1,36 +0,0 @@
-module screen
-
-import freeflowuniverse.herolib.data.encoderhero
-
-const singleton = false
-const default = true
-
-// THIS THE THE SOURCE OF THE INFORMATION OF THIS FILE, HERE WE HAVE THE CONFIG OBJECT CONFIGURED AND MODELLED
-@[heap]
-pub struct Screen {
-pub mut:
-	name string = 'default'
-}
-
-// your checking & initialization code if needed
-fn obj_init(obj_ Screen) !Screen {
-	// never call get here, only thing we can do here is work on object itself
-	mut obj := obj_
-	return obj
-}
-
-// called before start if done
-fn configure() ! {
-	// mut installer := get()!
-}
-
-/////////////NORMALLY NO NEED TO TOUCH
-
-pub fn heroscript_dumps(obj Screen) !string {
-	return encoderhero.encode[Screen](obj)!
-}
-
-pub fn heroscript_loads(heroscript string) !Screen {
-	mut obj := encoderhero.decode[Screen](heroscript)!
-	return obj
-}

lib/installers/infra/zinit_installer/zinit_installer_actions.v

@@ -16,7 +16,7 @@ fn startupcmd() ![]startupmanager.ZProcessNewArgs {
 	if core.is_linux()! {
 		res << startupmanager.ZProcessNewArgs{
 			name:        'zinit'
-			cmd:         '/usr/local/bin/zinit init ~/hero/cfg/zinit'
+			cmd:         '/usr/local/bin/zinit init ${os.home_dir()}/hero/cfg/zinit'
 			startuptype: .systemd
 			start:       true
 			restart:     true
@@ -24,11 +24,12 @@ fn startupcmd() ![]startupmanager.ZProcessNewArgs {
 	} else {
 		res << startupmanager.ZProcessNewArgs{
 			name:        'zinit'
-			cmd:         '~/hero/bin/zinit init --config ~/hero/cfg/zinit'
+			cmd:         '${os.home_dir()}/hero/bin/zinit init --config  ${os.home_dir()}/hero/cfg/zinit'
 			startuptype: .screen
 			start:       true
 		}
 	}
+	osal.dir_ensure(os.home_dir() + '/hero/cfg/zinit')!
 	return res
 }
 

lib/installers/infra/zinit_installer/zinit_installer_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/infra/zinit_installer/zinit_installer_model.v

@@ -2,7 +2,7 @@ module zinit_installer
 
 import freeflowuniverse.herolib.data.encoderhero
 
-pub const version = '0.2.25'
+pub const version = '0.2.27'
 const singleton = true
 const default = true
 

lib/installers/net/yggdrasil/yggdrasil_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/actrunner/actrunner_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/fungistor/fungistor_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/garage_s3/garage_s3_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/grafana/grafana_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/prometheus/prometheus_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/restic/restic_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/sysadmintools/s3/s3_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/virt/docker/docker_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/web/imagemagick/imagemagick_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/web/lighttpd/lighttpd_factory_.v

@@ -83,7 +83,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/installers/web/traefik/traefik_factory_.v

@@ -178,7 +178,7 @@ fn startupmanager_get(cat startupmanager.StartupManagerType) !startupmanager.Sta
 	// systemd
 	match cat {
 		.screen {
-			console.print_debug('startupmanager: zinit')
+			console.print_debug('startupmanager: screen')
 			return startupmanager.get(.screen)!
 		}
 		.zinit {

lib/osal/startupmanager/startupmanager.v

@@ -49,13 +49,14 @@ pub fn get(cat StartupManagerType) !StartupManager {
 // description string //not used in zinit
 //```
 pub fn (mut sm StartupManager) new(args ZProcessNewArgs) ! {
-	console.print_debug("startupmanager start:${args.name} cmd:'${args.cmd}' restart:${args.restart}")
+	console.print_debug("startupmanager new:${args.name} cmd:'${args.cmd}' restart:${args.restart}")
 	mut mycat := sm.cat
 	match mycat {
 		.screen {
 			mut scr := screen.new(reset: false)!
 			console.print_debug('screen startup manager ${args.name} cmd:${args.cmd}')
 			_ = scr.add(name: args.name, cmd: args.cmd, reset: args.restart)!
+			//because of how screen works the start is immediate
 		}
 		.systemd {
 			// console.print_debug('systemd start  ${args.name}')
@@ -69,7 +70,7 @@ pub fn (mut sm StartupManager) new(args ZProcessNewArgs) ! {
 			)!
 		}
 		.zinit {
-			console.print_debug('zinit start ${args.name} using clients.zinit')
+			console.print_debug('zinit start ${args.name}.')
 			// Get the Zinit RPC client instance.
 			// We assume it's properly configured (e.g., socket_path) via its factory setup.
 			mut zinit_client := zinit.get(create: true)!
@@ -90,27 +91,18 @@ pub fn (mut sm StartupManager) new(args ZProcessNewArgs) ! {
 			zinit_client.service_create(args.name, service_config) or {
 				return error('Failed to create zinit service ${args.name}: ${err}')
 			}		
-
-			// If 'start' is true, also monitor and start the service
-			if args.start {
-				// Monitor loads the config, if it's new it starts it.
-				// If the service is already managed, this will bring it back up.
-				zinit_client.service_monitor(args.name) or {
-					return error('Failed to monitor zinit service ${args.name}: ${err}')
-				}
-				// Explicitly start the service (useful for oneshot services or if not already active)
-				zinit_client.service_start(args.name) or {
-					return error('Failed to start zinit service ${args.name}: ${err}')
-				}
-			}
-		}
-		else {
+		} else {
 			panic('to implement, startup manager only support screen & systemd for now: ${mycat}')
 		}
 	}
+	// If 'start' is true, also monitor and start the service
+	if args.start {
+		sm.start(args.name)!
+	}		
 }
 
 pub fn (mut sm StartupManager) start(name string) ! {
+	println(sm)
 	$dbg;
 	match sm.cat {
 		.screen {
@@ -119,10 +111,12 @@ pub fn (mut sm StartupManager) start(name string) ! {
 		.systemd {
 			console.print_debug('systemd process start ${name}')
 			mut systemdfactory := systemd.new()!
+			$dbg;
 			if systemdfactory.exists(name) {
 				// console.print_header("*************")
 				mut systemdprocess := systemdfactory.get(name)!
 				systemdprocess.start()!
+				$dbg;
 			} else {
 				return error('process in systemd with name ${name} not found')
 			}
@@ -133,9 +127,15 @@ pub fn (mut sm StartupManager) start(name string) ! {
 			zinit_client.service_start(name) or {
 				return error('Failed to start zinit service ${name}: ${err}')
 			}
+			// Monitor loads the config, if it's new it starts it.
+			// If the service is already managed, this will bring it back up.
+			zinit_client.service_monitor(name) or {
+				return error('Failed to monitor zinit service ${name}: ${err}')
+			}
+
 		}
 		else {
-			panic('to implement, startup manager only support screen for now')
+			panic('to implement, startup manager only support screen, systemd and zinit for now')
 		}
 	}
 }

lib/osal/systemd/systemd_process.v

@@ -48,7 +48,6 @@ pub fn (mut self SystemdProcess) start() ! {
 	systemctl enable ${self.name}
 	systemctl start ${self.name}
 	' // console.print_debug(cmd)
-
 	_ = osal.execute_silent(cmd)!
 	self.refresh()!
 	console.print_header('started systemd process: ${self.name}')

lib/web/ui/server.v

@@ -24,7 +24,7 @@ pub struct FactoryArgs {
 pub mut:
 	name  string = 'default'
 	host  string = 'localhost'
-	port  int    = 8080
+	port  int    = 9999
 	title string = 'Admin'
 	menu  []MenuItem
 	open  bool