Fix a bug with Rust and move start-server

patrix87 · Sep 17, 2021 · 0d3397b · 0d3397b
1 parent 239e39c
commit 0d3397b
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 59 deletions.
diff --git a/configs/Place your configs here → configs/#Place your config.psm1 here b/configs/Place your configs here → configs/#Place your config.psm1 here
diff --git a/launchers/Copy and Edit run dot cmd → ...s/#Copy and Edit run.cmd for each servers b/launchers/Copy and Edit run dot cmd → ...s/#Copy and Edit run.cmd for each servers
diff --git a/main.ps1 b/main.ps1
@@ -228,9 +228,10 @@ if (-not ($FreshInstall)) {
 #Try to start the server, then if it's stable, set the priority and affinity then register the PID. Exit with Error if it fails.
 try {
     Write-ScriptMsg "Starting Server..."
-    $App = Start-Server
+    Start-ServerPrep
+    $App = Start-Process -FilePath $Server.Launcher -WorkingDirectory $Server.WorkingDirectory -ArgumentList $Server.ArgumentList -PassThru
     #Wait to see if the server is stable.
-    Start-Sleep -Seconds 10
+    Start-Sleep -Seconds $Server.StartupWaitTime
     if (-not ($App) -or $App.HasExited){
         Exit-WithError "Server Failed to launch."
     } else {
@@ -265,6 +266,4 @@ catch {
 
 Write-ServerMsg "Script successfully completed."
 
-Stop-Transcript
-
-Start-Sleep -Seconds 5
+Stop-Transcript
diff --git a/templates/7daystodie.psm1 b/templates/7daystodie.psm1
@@ -86,6 +86,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -173,13 +176,18 @@ foreach($Argument in $Arguments){
 $ArgumentList = $CleanedArguments -join ""
 
 #Server Launcher
-$Launcher = $Server.Exec
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : 26900 in TCP and 26900 to 26903 in UDP to $($Global.InternalIP)"
 
@@ -191,10 +199,7 @@ function Start-Server {
     If(-not (Test-Path -Path $Server.ConfigFile -PathType "leaf")){
         Copy-Item -Path "$($Server.Path)\serverconfig.xml" -Destination $Server.ConfigFile -Force
     }
-    #Start Server
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
 
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/insurgencysandstorm.psm1 b/templates/insurgencysandstorm.psm1
@@ -128,6 +128,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -231,20 +234,21 @@ if ($Server.EnableRcon){
 $ArgumentList = $CleanedArguments -join ""
 
 #Server Launcher
-$Launcher = $Server.Exec
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : $($server.Port) and $($server.QueryPort) in TCP and UDP to $($Global.InternalIP)"
 
-    #Start Server
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/killingfloor2.psm1 b/templates/killingfloor2.psm1
@@ -107,7 +107,10 @@ $ServerDetails = @{
     AppAffinity = 15
 
     #Should the server validate install after installation or update *(recommended)
-    Validate = $false
+    Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -198,21 +201,22 @@ foreach($Argument in $Arguments){
 $ArgumentList = $CleanedArguments -join ""
 
 #Server Launcher
-$Launcher = $Server.Exec
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : $($server.Port), $($server.QueryPort), 20560, 123 in UDP and $($server.WebAdminPort) in TCP to $($Global.InternalIP)"
     Write-ScriptMsg "Once Webadmin enabled, go to http://$($Global.InternalIP):$($server.WebAdminPort) to administer this server."
 
-    #Start Server
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/pixark.psm1 b/templates/pixark.psm1
@@ -136,6 +136,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -239,20 +242,21 @@ foreach($Argument in $Arguments){
 $ArgumentList = $CleanedArguments -join ""
 
 #Server Launcher
-$Launcher = $Server.Exec
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : $($server.Port), $($server.QueryPort) And $($server.CubePort) in TCP and UDP to $($Global.InternalIP)"
 
-    #Start Server
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/projectzomboid.psm1 b/templates/projectzomboid.psm1
@@ -107,6 +107,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -208,19 +211,22 @@ foreach($Argument in $Arguments){
 
 $ArgumentList = $CleanedArguments -join ""
 
-$Launcher = "$($Server.Path)\jre64\bin\java.exe"
+#Server Launcher
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : 16261, 8766 and 8767 in TCP and UDP to $($Global.InternalIP)"
 
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/rust.psm1 b/templates/rust.psm1
@@ -139,6 +139,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $false
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 0
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -251,18 +254,18 @@ $ArgumentList = $CleanedArguments -join ""
 $Launcher = $(Resolve-Path -Path $Server.Exec)
 $WorkingDirectory = $(Resolve-Path -Path $Server.Path)
 
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
+
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : $($server.Port), $($server.ManagementPort), $($Server.Port + 69) in TCP and UDP to $($Global.InternalIP)"
 
-    #Start Server
-    $App = Start-Process -FilePath "$Launcher" -WorkingDirectory "$WorkingDirectory" -ArgumentList "$ArgumentList" -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")
diff --git a/templates/valheim.psm1 b/templates/valheim.psm1
@@ -88,6 +88,9 @@ $ServerDetails = @{
 
     #Should the server validate install after installation or update *(recommended)
     Validate = $true
+
+    #How long should it wait to check if the server is stable
+    StartupWaitTime = 10
 }
 #Create the object
 $Server = New-Object -TypeName PsObject -Property $ServerDetails
@@ -176,20 +179,21 @@ foreach($Argument in $Arguments){
 $ArgumentList = $CleanedArguments -join ""
 
 #Server Launcher
-$Launcher = $Server.Exec
+$Launcher = $(Resolve-Path -Path $Server.Exec)
+$WorkingDirectory = $(Resolve-Path -Path $Server.Path)
+
+Add-Member -InputObject $Server -Name "ArgumentList" -Type NoteProperty -Value $ArgumentList
+Add-Member -InputObject $Server -Name "Launcher" -Type NoteProperty -Value $Launcher
+Add-Member -InputObject $Server -Name "WorkingDirectory" -Type NoteProperty -Value $WorkingDirectory
 
 #---------------------------------------------------------
-# Launch Function
+# Function that runs just before the server starts.
 #---------------------------------------------------------
 
-function Start-Server {
+function Start-ServerPrep {
 
     Write-ScriptMsg "Port Forward : $($server.Port) in TCP and UDP to $($Global.InternalIP)"
 
-    #Start Server
-    $App = Start-Process -FilePath $Launcher -WorkingDirectory $Server.Path -ArgumentList $ArgumentList -PassThru
-
-    return $App
 }
 
-Export-ModuleMember -Function Start-Server -Variable @("Server","Backups","Warnings")
+Export-ModuleMember -Function Start-ServerPrep -Variable @("Server","Backups","Warnings")