From 393c87fdd7e9ea8442d140252dc8410b3ee7fd78 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Thu, 11 Jun 2026 08:20:25 +0100 Subject: [PATCH] Make Odin Rust dependencies deployable --- crates/muninn-daemon/Cargo.toml | 2 +- scripts/activate-muninn-raven-av-srt.ps1 | 21 +++++++++++++++++++-- scripts/restart-muninn.ps1 | 12 ++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/crates/muninn-daemon/Cargo.toml b/crates/muninn-daemon/Cargo.toml index 528a6d7..fa21c14 100644 --- a/crates/muninn-daemon/Cargo.toml +++ b/crates/muninn-daemon/Cargo.toml @@ -11,5 +11,5 @@ path = "src/main.rs" [dependencies] anyhow = "1" -cultmesh-rs = { path = "E:/Projects/EpiphanyAgent/vendor/cultmesh-rs" } +cultmesh-rs = { path = "../../vendor/cultmesh-rs" } odin-core = { path = "../odin-core" } diff --git a/scripts/activate-muninn-raven-av-srt.ps1 b/scripts/activate-muninn-raven-av-srt.ps1 index fd9f5d7..08364a1 100644 --- a/scripts/activate-muninn-raven-av-srt.ps1 +++ b/scripts/activate-muninn-raven-av-srt.ps1 @@ -30,20 +30,37 @@ Get-CimInstance Win32_Process | ForEach-Object { taskkill.exe /PID `$_.ProcessId /T /F | Out-Null } `$muninnDir = Split-Path -Parent "$MuninnExe" `$launcher = Join-Path `$muninnDir "activate-raven-av-srt.cmd" +`$psLauncher = Join-Path `$muninnDir "activate-raven-av-srt.ps1" +`$pidPath = Join-Path "$LogRoot" "muninn-activate.pid" `$obsArgs = "" if (-not [bool]::Parse("$($NoObsTarget.IsPresent)") -and -not ("$TargetHost" -eq "$ObsTargetHost" -and $Port -eq $ObsPort)) { `$obsArgs = " --obs-target-host ""$ObsTargetHost"" --obs-port $ObsPort" } else { `$obsArgs = " --no-obs-target" } +`$arguments = @("activate", "--store", "$StorePath", "--host", "raven", "--stream", "muninn.raven.av.srt", "--target-host", "$TargetHost", "--port", "$Port") +if (`$obsArgs -like " --no-obs-target") { + `$arguments += "--no-obs-target" +} else { + `$arguments += @("--obs-target-host", "$ObsTargetHost", "--obs-port", "$ObsPort") +} +`$arguments += @("--audio-device", "$AudioDevice", "--ffmpeg", "$Ffmpeg", "--loopback-script", "$LoopbackScript", "--log-root", "$LogRoot") +`$encodedArguments = (`$arguments | ConvertTo-Json -Compress) +`$psLines = @( + "`$ErrorActionPreference = ""Stop""", + "`$arguments = '$encodedArguments' | ConvertFrom-Json", + "`$process = Start-Process -FilePath ""$MuninnExe"" -ArgumentList `$arguments -WorkingDirectory ""`$muninnDir"" -WindowStyle Hidden -PassThru -RedirectStandardOutput ""$LogRoot\muninn-activate.out.log"" -RedirectStandardError ""$LogRoot\muninn-activate.err.log""", + "`$process.Id | Set-Content -Encoding ASCII -LiteralPath ""`$pidPath""" +) +Set-Content -LiteralPath `$psLauncher -Value `$psLines -Encoding ASCII `$lines = @( "@echo off", "cd /d ""`$muninnDir""", - """$MuninnExe"" activate --store ""$StorePath"" --host raven --stream muninn.raven.av.srt --target-host ""$TargetHost"" --port $Port`$obsArgs --audio-device ""$AudioDevice"" --ffmpeg ""$Ffmpeg"" --loopback-script ""$LoopbackScript"" --log-root ""$LogRoot"" 1>>""$LogRoot\muninn-activate.out.log"" 2>>""$LogRoot\muninn-activate.err.log""" + "powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File ""`$psLauncher""" ) Set-Content -LiteralPath `$launcher -Value `$lines -Encoding ASCII cmd /c "schtasks /Delete /TN GameCult-Muninn-Activate /F 2>NUL" -cmd /c schtasks /Create /TN GameCult-Muninn-Activate /SC ONCE /ST 23:59 /TR `$launcher /IT /RL HIGHEST /F +cmd /c schtasks /Create /TN GameCult-Muninn-Activate /SC ONCE /ST 23:59 /TR `$launcher /RL HIGHEST /F cmd /c schtasks /Run /TN GameCult-Muninn-Activate "@ diff --git a/scripts/restart-muninn.ps1 b/scripts/restart-muninn.ps1 index fbc5a56..29a4a1a 100644 --- a/scripts/restart-muninn.ps1 +++ b/scripts/restart-muninn.ps1 @@ -22,14 +22,22 @@ New-Item -ItemType Directory -Force -Path "$LogRoot" | Out-Null New-Item -ItemType Directory -Force -Path (Split-Path -Parent "$StorePath") | Out-Null `$muninnDir = Split-Path -Parent "$MuninnExe" `$launcher = Join-Path `$muninnDir "start-muninn-serve.cmd" +`$psLauncher = Join-Path `$muninnDir "start-muninn-serve.ps1" +`$pidPath = Join-Path "$LogRoot" "muninn-serve.pid" +`$psLines = @( + "`$ErrorActionPreference = ""Stop""", + "`$process = Start-Process -FilePath ""$MuninnExe"" -ArgumentList @(""serve"", ""--store"", ""$StorePath"", ""--log-root"", ""$LogRoot"", ""--host"", ""raven"", ""--interval-seconds"", ""15"") -WorkingDirectory ""`$muninnDir"" -WindowStyle Hidden -PassThru -RedirectStandardOutput ""$LogRoot\muninn-serve.out.log"" -RedirectStandardError ""$LogRoot\muninn-serve.err.log""", + "`$process.Id | Set-Content -Encoding ASCII -LiteralPath ""`$pidPath""" +) +Set-Content -LiteralPath `$psLauncher -Value `$psLines -Encoding ASCII `$lines = @( "@echo off", "cd /d ""`$muninnDir""", - """$MuninnExe"" serve --store ""$StorePath"" --log-root ""$LogRoot"" --host raven --interval-seconds 15 1>>""$LogRoot\muninn-serve.out.log"" 2>>""$LogRoot\muninn-serve.err.log""" + "powershell.exe -NoProfile -ExecutionPolicy Bypass -WindowStyle Hidden -File ""`$psLauncher""" ) Set-Content -LiteralPath `$launcher -Value `$lines -Encoding ASCII cmd /c "schtasks /Delete /TN GameCult-Muninn /F 2>NUL" -cmd /c schtasks /Create /TN GameCult-Muninn /SC ONCE /ST 23:59 /TR `$launcher /IT /RL HIGHEST /F +cmd /c schtasks /Create /TN GameCult-Muninn /SC ONCE /ST 23:59 /TR `$launcher /RL HIGHEST /F cmd /c schtasks /Run /TN GameCult-Muninn "@