More PS5 stuff

## PS5
- New PS5 Port Checker
  - Checks almost all payload ports
  - Check a port manually
  - Refresh/Reload option
- The PKG Extractor can now be found in "PC - Windows Utilities" -> "PKG Extractor" instead inside the GP5 Project Creator
- The backup library now loads & shows more game information
  - MasterVersion
  - SDKVersion
  - PubToolsVersion
  - VersionFileURI (clickable)
- Fixed opening the context menu for the backup library
- Added new downloads
  - Dump Runner payload by Echo Stretch v0.01
- Fixed 'kstuff' payload download
- Replaced 'kstuff-toggle' zip download with payload
- Removed many old downloads, please update to the latest version of PS Multi Tools
- Added new main menu entry "Commands for shsrv"
  - Get console information
  - Get AuthID
  - More will be added later...
- Renamed menu entry "webMAN for websrv -> General" to "webMAN for websrv -> General Utilities"
- Added required server information in order to use "webMAN for websrv" and the new "Commands for shsrv" utilities
- The Payload Sender now resets the selected payload combobox item when sent

Author: SvenGDK

LatestBuild.txt

@@ -1 +1 @@
-15.5.0
+15.5.1

PS Multi Tools/Classes/PS5Game.vb

@@ -24,6 +24,10 @@
     Private _GameBackupType As String
     Private _GameLocation As Location
     Private _GameRootLocation As RootLocation
+    Private _GameMasterVersion As String
+    Private _GameSDKVersion As String
+    Private _GamePubToolVersion As String
+    Private _GameVersionFileURI As String
 
     Public Enum Location
         Remote
@@ -251,6 +255,42 @@
         End Set
     End Property
 
+    Public Property GameMasterVersion As String
+        Get
+            Return _GameMasterVersion
+        End Get
+        Set
+            _GameMasterVersion = Value
+        End Set
+    End Property
+
+    Public Property GameSDKVersion As String
+        Get
+            Return _GameSDKVersion
+        End Get
+        Set
+            _GameSDKVersion = Value
+        End Set
+    End Property
+
+    Public Property GamePubToolVersion As String
+        Get
+            Return _GamePubToolVersion
+        End Get
+        Set
+            _GamePubToolVersion = Value
+        End Set
+    End Property
+
+    Public Property GameVersionFileURI As String
+        Get
+            Return _GameVersionFileURI
+        End Get
+        Set
+            _GameVersionFileURI = Value
+        End Set
+    End Property
+
     Public Shared Function GetGameRegion(GameID As String) As String
         If GameID.StartsWith("PPSA") Then
             Return "NA / Europe"

PS Multi Tools/Classes/TelnetClient.vb

@@ -0,0 +1,47 @@
+Imports System.Net.Sockets
+Imports System.Text
+Imports System.Threading
+
+Public Class TelnetClient
+
+    Private TCPSocket As TcpClient
+
+    Private NewNetworkStream As NetworkStream
+
+    Public Sub New(HostName As String, Port As Integer)
+        TCPSocket = New TcpClient()
+        TCPSocket.Connect(HostName, Port)
+        NewNetworkStream = TCPSocket.GetStream()
+    End Sub
+
+    Public Sub Write(Command As String)
+        If NewNetworkStream Is Nothing Then Return
+
+        Dim CommandWithNewLine As String = Command & vbCrLf
+        Dim CommandBytes As Byte() = Encoding.ASCII.GetBytes(CommandWithNewLine)
+        NewNetworkStream.Write(commandBytes, 0, commandBytes.Length)
+        NewNetworkStream.Flush()
+    End Sub
+
+    Public Function Read() As String
+        If NewNetworkStream Is Nothing Then Return String.Empty
+
+        Dim ResponseBuilder As New StringBuilder()
+        Dim Buffer(1024) As Byte
+
+        While NewNetworkStream.DataAvailable
+            Dim BytesRead As Integer = NewNetworkStream.Read(Buffer, 0, Buffer.Length)
+            If bytesRead <= 0 Then Exit While
+            responseBuilder.Append(Encoding.ASCII.GetString(buffer, 0, bytesRead))
+            Thread.Sleep(50)
+        End While
+
+        Return responseBuilder.ToString()
+    End Function
+
+    Public Sub Close()
+        If NewNetworkStream IsNot Nothing Then NewNetworkStream.Close()
+        If TCPSocket IsNot Nothing Then TCPSocket.Close()
+    End Sub
+
+End Class

PS Multi Tools/Images/move.png

@@ -20,9 +20,11 @@
             <MenuItem Header="Payload Builder" x:Name="PayloadBuilderMenuItem"/>
             <MenuItem Header="Payload &amp; Mast1c0re PS2 Game Sender" x:Name="SenderMenuItem"/>
             <MenuItem Header="PKG Builder" x:Name="OpenPKGBuilderMenuItem"/>
+            <MenuItem Header="PKG Extractor" x:Name="OpenPKGExtractorMenuItem"/>
             <MenuItem Header="PKG Merger" x:Name="OpenPKGMergerMenuItem"/>
             <MenuItem Header="PKG Reader (Viewer)" x:Name="OpenPKGReaderMenuItem"/>
             <MenuItem Header="PKG Sender" x:Name="OpenPKGSenderMenuItem"/>
+            <MenuItem Header="Port Checker" x:Name="OpenPortCheckerMenuItem"/>
             <MenuItem Header="PS Classics fPKG Builder" x:Name="OpenPSClassicsfPKGBuilderMenuItem"/>
             <MenuItem Header="SELF Decrypter" x:Name="OpenSELFDecrypterMenuItem"/>
             <MenuItem Header="Simple Shortcut PKG Creator" x:Name="OpenShortcutPKGCreatorMenuItem"/>
@@ -119,16 +121,21 @@
         </MenuItem>
     </MenuItem>
     <MenuItem x:Name="WebManMenuItem" Header="webMAN for websrv">
-        <MenuItem Header="General">
-            <MenuItem Header="Open PS5 WebSrv Interface" x:Name="OpenPS5WebSrvInterface"/>
-            <MenuItem Header="Browse PS5 File System" x:Name="BrowsePS5FileSystem"/>
-            <MenuItem Header="Install or Remove Homebrew" x:Name="ManagePS5Homebrew"/>
-        </MenuItem>
-        <MenuItem Header="Game Utilities">
+        <TextBlock Text="Requires WebSrv running" FontWeight="Bold" TextDecorations="Underline"></TextBlock>
+        <MenuItem Header="Emulator Utilities">
             <MenuItem Header="Manage ROMs of Homebrew Emulators" x:Name="ManagePS5GameROMs"/>
         </MenuItem>
-        <MenuItem Header="Temperature Monitoring">
-            <MenuItem Header="Show system info on PS5" x:Name="ShowSystemInfoOnPS5"/>
+        <MenuItem Header="General Utilities">
+            <MenuItem Header="Open PS5 WebServer Interface" x:Name="OpenPS5WebSrvInterface"/>
+            <MenuItem Header="Browse PS5 File System" x:Name="BrowsePS5FileSystem"/>
+            <MenuItem Header="Manage installed Homebrew" x:Name="ManagePS5Homebrew"/>
+        </MenuItem>
+    </MenuItem>
+    <MenuItem x:Name="TelnetMenuItem" Header="Commands for shsrv">
+        <TextBlock Text="Requires ShSrv running" FontWeight="Bold" TextDecorations="Underline"></TextBlock>
+        <MenuItem Header="Read Console Information">
+            <MenuItem Header="Get Model, Serial Number, Software Version &amp; Temperatures" x:Name="GetConsoleInfo"/>
+            <MenuItem Header="Get AuthID" x:Name="GetAuthID"/>
         </MenuItem>
     </MenuItem>
     <MenuItem x:Name="DownloadsMenuItem" Header="Downloads">
@@ -236,6 +243,13 @@
         </MenuItem>
 
         <MenuItem Header="Payloads">
+            <MenuItem Header="Dump Runner by Echo Stretch">
+                <MenuItem Header="Download v0.01" x:Name="DownloadDumpRunner">
+                    <MenuItem.Icon>
+                        <Image Source="/Images/download.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
             <MenuItem Header="ELFLdr by john-tornblom">
                 <MenuItem Header="Download v0.19" x:Name="DownloadELFLdr">
                     <MenuItem.Icon>
@@ -254,16 +268,6 @@
                         <Image Source="/Images/download.png"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="Download v2.0b" x:Name="DownloadetaHEN">
-                    <MenuItem.Icon>
-                        <Image Source="/Images/download.png"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Download v2.0b (No Toolbox)" x:Name="DownloadetaHENNoToolbox">
-                    <MenuItem.Icon>
-                        <Image Source="/Images/download.png"/>
-                    </MenuItem.Icon>
-                </MenuItem>
                 <MenuItem Header="Download v2.0b IPV6 BD-J ISO" x:Name="DownloadetaHENBDJB">
                     <MenuItem.Icon>
                         <Image Source="/Images/download.png"/>

PS Multi Tools/Menus/PS5Menu.xaml

@@ -2,6 +2,7 @@
 Imports System.Net
 Imports System.Net.Sockets
 Imports System.Security.Authentication
+Imports System.Threading
 Imports FluentFTP
 Imports Microsoft.Web.WebView2.Core
 Imports Newtonsoft.Json
@@ -200,7 +201,7 @@ Public Class PS5Menu
     End Sub
 
     Private Sub OpenGP5ManagerMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenGP5ManagerMenuItem.Click
-        Dim NewGP5Creator As New GP5Creator() With {.PubToolsPath = Environment.CurrentDirectory + "\Tools\PS5\prospero-pub-cmd.exe", .ShowActivated = True}
+        Dim NewGP5Creator As New GP5Creator() With {.ShowActivated = True}
         NewGP5Creator.Show()
     End Sub
 
@@ -220,20 +221,17 @@ Public Class PS5Menu
     End Sub
 
     Private Sub OpenPKGBuilderMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenPKGBuilderMenuItem.Click
-        Dim NewPKGBuilder As New PS5PKGBuilder() With {.PubToolsPath = Environment.CurrentDirectory + "\Tools\PS5\prospero-pub-cmd.exe", .ShowActivated = True}
+        Dim NewPKGBuilder As New PS5PKGBuilder() With {.ShowActivated = True}
         NewPKGBuilder.Show()
     End Sub
 
+    Private Sub OpenPKGExtractorMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenPKGExtractorMenuItem.Click
+        Dim NewPS5PKGExtractor As New PS5PKGExtractor() With {.ShowActivated = True}
+        NewPS5PKGExtractor.Show()
+    End Sub
+
     Private Sub OpenAudioConverterMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenAudioConverterMenuItem.Click
         Dim NewAudioConverter As New PS5AT9Converter() With {.ShowActivated = True}
-
-        If File.Exists(Environment.CurrentDirectory + "\Tools\PS5\at9tool.exe") Then
-            NewAudioConverter.AT9Tool = Environment.CurrentDirectory + "\Tools\PS5\at9tool.exe"
-        Else
-            NewAudioConverter.IsEnabled = False
-            MsgBox("Could not find the at9tool." + vbCrLf + "Please add it inside the 'Tools\PS5' folder inside PS Multi Tools.", MsgBoxStyle.Information, "at9tool not available")
-        End If
-
         NewAudioConverter.Show()
     End Sub
 
@@ -301,6 +299,11 @@ Public Class PS5Menu
         End If
     End Sub
 
+    Private Sub OpenPortCheckerMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenPortCheckerMenuItem.Click
+        Dim NewPS5PortChecker As New PS5PortChecker() With {.ShowActivated = True, .PS5Host = SharedIPAddress}
+        NewPS5PortChecker.Show()
+    End Sub
+
     Private Sub OpenPSClassicsfPKGBuilderMenuItem_Click(sender As Object, e As RoutedEventArgs) Handles OpenPSClassicsfPKGBuilderMenuItem.Click
         Dim NewPSClassicsfPKGBuilder As New PSClassicsfPKGBuilder() With {.ShowActivated = True}
         NewPSClassicsfPKGBuilder.Show()
@@ -466,6 +469,15 @@ Public Class PS5Menu
 
 #Region "Homebrew"
 
+    Private Async Sub DownloadDumpRunner_Click(sender As Object, e As RoutedEventArgs) Handles DownloadDumpRunner.Click
+        Dim NewDownloader As New Downloader() With {.ShowActivated = True}
+        NewDownloader.Show()
+        If Await NewDownloader.CreateNewDownload("http://X.X.X.X/ps5/hb/dump_runner.elf") = False Then
+            MsgBox("Could not download the selected file.", MsgBoxStyle.Critical)
+            NewDownloader.Close()
+        End If
+    End Sub
+
     Private Async Sub DownloadAvatarChanger_Click(sender As Object, e As RoutedEventArgs) Handles DownloadAvatarChanger.Click
         Dim NewDownloader As New Downloader() With {.ShowActivated = True}
         NewDownloader.Show()
@@ -550,7 +562,7 @@ Public Class PS5Menu
     Private Async Sub DownloadNewKStuff_Click(sender As Object, e As RoutedEventArgs) Handles DownloadNewKStuff.Click
         Dim NewDownloader As New Downloader() With {.ShowActivated = True, .PackageConsole = "PS5"}
         NewDownloader.Show()
-        If Await NewDownloader.CreateNewDownload("http://X.X.X.X/ps5/hb/kstuff_3xx-7xx_v1.5.elf") = False Then
+        If Await NewDownloader.CreateNewDownload("http://X.X.X.X/ps5/hb/kstuff_v1.5.elf") = False Then
             MsgBox("Could not download the selected file.", MsgBoxStyle.Critical)
             NewDownloader.Close()
         End If
@@ -559,7 +571,7 @@ Public Class PS5Menu
     Private Async Sub DownloadKStuffToggle_Click(sender As Object, e As RoutedEventArgs) Handles DownloadKStuffToggle.Click
         Dim NewDownloader As New Downloader() With {.ShowActivated = True, .PackageConsole = "PS5"}
         NewDownloader.Show()
-        If Await NewDownloader.CreateNewDownload("http://X.X.X.X/ps5/hb/kstuff-toggle-0.2Beta.zip") = False Then
+        If Await NewDownloader.CreateNewDownload("http://X.X.X.X/ps5/hb/kstuff-toggle.elf") = False Then
             MsgBox("Could not download the selected file.", MsgBoxStyle.Critical)
             NewDownloader.Close()
         End If
@@ -574,24 +586,6 @@ Public Class PS5Menu
         End If
     End Sub
 
-    Private Async Sub DownloadetaHEN_Click(sender As Object, e As RoutedEventArgs) Handles DownloadetaHEN.Click
-        Dim NewDownloader As New Downloader() With {.ShowActivated = True, .PackageConsole = "PS5"}
-        NewDownloader.Show()
-        If Await NewDownloader.CreateNewDownload("https://github.com/etaHEN/etaHEN/releases/download/2.0b/etaHEN-2.0b.bin") = False Then
-            MsgBox("Could not download the selected file.", MsgBoxStyle.Critical)
-            NewDownloader.Close()
-        End If
-    End Sub
-
-    Private Async Sub DownloadetaHENNoToolbox_Click(sender As Object, e As RoutedEventArgs) Handles DownloadetaHENNoToolbox.Click
-        Dim NewDownloader As New Downloader() With {.ShowActivated = True, .PackageConsole = "PS5"}
-        NewDownloader.Show()
-        If Await NewDownloader.CreateNewDownload("https://github.com/etaHEN/etaHEN/releases/download/2.0b/Payload.zip") = False Then
-            MsgBox("Could not download the selected file.", MsgBoxStyle.Critical)
-            NewDownloader.Close()
-        End If
-    End Sub
-
     Private Async Sub DownloadetaHENBDJB_Click(sender As Object, e As RoutedEventArgs) Handles DownloadetaHENBDJB.Click
         Dim NewDownloader As New Downloader() With {.ShowActivated = True, .PackageConsole = "PS5"}
         NewDownloader.Show()
@@ -1052,10 +1046,6 @@ Public Class PS5Menu
         End If
     End Sub
 
-    Private Sub ShowSystemInfoOnPS5_Click(sender As Object, e As RoutedEventArgs) Handles ShowSystemInfoOnPS5.Click
-        MsgBox("Not ready yet.", MsgBoxStyle.Information)
-    End Sub
-
     Private Sub OpenPS5WebSrvInterface_Click(sender As Object, e As RoutedEventArgs) Handles OpenPS5WebSrvInterface.Click
         If Not String.IsNullOrEmpty(SharedIPAddress) Then
             Dim NewwebMANMODWebGUI As New PS5webMANBrowser() With {.ShowActivated = True, .WebMANWebSrvAddress = "http://" & SharedIPAddress + ":8080"}
@@ -1086,6 +1076,80 @@ Public Class PS5Menu
         NewWebSrvHomebrewManager.Show()
     End Sub
 
+    Private Sub GetAuthID_Click(sender As Object, e As RoutedEventArgs) Handles GetAuthID.Click
+        Try
+            Dim NewTelnetClient As New TelnetClient(SharedIPAddress, 2323)
+
+            Thread.Sleep(20000) 'Wait 20sec until connected
+
+            'Get welcome message to check if connected successfully
+            Dim WelcomeMesssage As String = NewTelnetClient.Read()
+            If Not String.IsNullOrEmpty(WelcomeMesssage) Then
+
+                NewTelnetClient.Write("authid")
+
+                Thread.Sleep(500)
+
+                Dim RetrievedAuthID As String = NewTelnetClient.Read()
+                MsgBox("AuthID: ")
+            Else
+                MsgBox("ShSrv took to long to respond.", MsgBoxStyle.Critical, "Error reading output")
+                NewTelnetClient.Close()
+            End If
+
+            'Disconnect
+            NewTelnetClient.Close()
+        Catch ex As Exception
+            MsgBox("An error occurred: " & ex.Message)
+        End Try
+    End Sub
+
+    Private Sub GetConsoleInfo_Click(sender As Object, e As RoutedEventArgs) Handles GetConsoleInfo.Click
+        Try
+            Dim NewTelnetClient As New TelnetClient(SharedIPAddress, 2323)
+
+            Thread.Sleep(20000) 'Wait 20sec until connected
+
+            'Get welcome message and split console information output to values
+            Dim WelcomeMesssage As String = NewTelnetClient.Read()
+            If Not String.IsNullOrEmpty(WelcomeMesssage) Then
+                Dim WelcomeData As New Dictionary(Of String, String)()
+                Dim SplittedLines() As String = WelcomeMesssage.Split(New String() {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries)
+
+                For Each Line As String In SplittedLines
+                    Dim LineParts() As String = Line.Split(":"c)
+                    If LineParts.Length >= 2 Then
+                        Dim DictKey As String = LineParts(0).Trim()
+                        Dim DictValue As String = LineParts(1).Trim()
+                        WelcomeData(DictKey) = DictValue
+                    End If
+                Next
+
+                Dim ConsoleModel As String = If(WelcomeData.ContainsKey("Model"), WelcomeData("Model"), String.Empty)
+                Dim ConsoleSerialNumber As String = If(WelcomeData.ContainsKey("S/N"), WelcomeData("S/N"), String.Empty)
+                Dim ConsoleSoftwareVersion As String = If(WelcomeData.ContainsKey("S/W"), WelcomeData("S/W"), String.Empty)
+                Dim ConsoleSoCTemp As String = If(WelcomeData.ContainsKey("SoC temp"), WelcomeData("SoC temp"), String.Empty)
+                Dim ConsoleCPUTemp As String = If(WelcomeData.ContainsKey("CPU temp"), WelcomeData("CPU temp"), String.Empty)
+                Dim ConsoleCPUFreq As String = If(WelcomeData.ContainsKey("CPU freq"), WelcomeData("CPU freq"), String.Empty)
+
+                MsgBox("Model Number: " & ConsoleModel & vbCrLf &
+                       "Serial Number: " & ConsoleSerialNumber & vbCrLf &
+                       "Software Version: " & ConsoleSoftwareVersion & vbCrLf &
+                       "SoC Temperature: " & ConsoleSoCTemp & vbCrLf &
+                       "CPU Temperature: " & ConsoleCPUTemp & vbCrLf &
+                       "CPU Frequency: " & ConsoleCPUFreq)
+            Else
+                MsgBox("ShSrv took to long to respond.", MsgBoxStyle.Critical, "Error reading output")
+                NewTelnetClient.Close()
+            End If
+
+            'Disconnect
+            NewTelnetClient.Close()
+        Catch ex As Exception
+            MsgBox("An error occurred: " & ex.Message)
+        End Try
+    End Sub
+
 #End Region
 
 End Class