Merge pull request #4 from tebexio/1.0.0-beta

1.0.0 beta

.gitignore

@@ -5,6 +5,9 @@
 
 .DS_STORE
 .idea/
+deploy/linux/
+deploy/windows/
+deploy/osx/
 
 # User-specific files
 *.rsuser

Tebex-RCON/Program.cs

@@ -163,13 +163,30 @@
 // Handle bad plugin type selection
 if (pluginType == null)
 {
-    Console.WriteLine($"No plugin for game '{startupGame}', please provide your desired plugin as a launch argument: ");
+    Console.WriteLine($"No plugin for game '{startupGame}', please provide your desired plugin as a launch argument or enter it below: ");
     Console.WriteLine("Available plugins: ");
     foreach (var plugName in pluginsAvailable)
     {
         Console.WriteLine($" - '{plugName}'");
     }
-    return;
+
+    Console.WriteLine("Enter which plugin you want to run: ");
+
+    while (true) // Ask the user which plugin to run until they quit.
+    {
+        Console.Write("Tebex> ");
+        var desiredPlugin = Console.ReadLine();
+        if (desiredPlugin != null && pluginsAvailable.Contains(desiredPlugin))
+        {
+            startupGame = desiredPlugin;
+            break;
+        }
+
+        if (desiredPlugin != null && desiredPlugin.Equals("exit"))
+        {
+            return;
+        }
+    }
 }
 
 // Check command line flags

Tebex-RCON/RCON/TebexRconAdapter.cs

@@ -1,5 +1,10 @@
-using System.Reflection;
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Reflection;
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Tebex.API;
 using Tebex.RCON.Protocol;
@@ -10,7 +15,7 @@ namespace Tebex.Adapters
     /** Provides logic that implements some RCON protocol */
     public class TebexRconAdapter : BaseTebexAdapter
     {
-        public const string Version = "1.0.0-alpha.5";
+        public const string Version = "1.0.0";
         private const string ConfigFilePath = "./tebex-config.json";
 
         private Type? _pluginType;
@@ -44,15 +49,17 @@ private TebexConfig ReadConfig()
         public override void Init()
         {
             // Setup log
-            var currentPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            if (currentPath.Contains(":")) // linux service path separator 
+            var currentPath = AppContext.BaseDirectory;
+            char pathSeparator = Path.PathSeparator;
+            if (pathSeparator == ':')
             {
-                currentPath = currentPath.Replace(":", "/");
+                pathSeparator = '/';
             }
-
+            
             var logName = $"TebexRcon-{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.log";
-            _logger = new StreamWriter(logName, true);
-            LogInfo($"Log file is being saved to '{currentPath}{Path.PathSeparator}{logName}'");
+            var logPath = currentPath + pathSeparator + logName;
+            _logger = new StreamWriter(logPath, true);
+            LogInfo($"Log file is being saved to '{currentPath}{pathSeparator}{logName}'");
 
             LogInfo($"Tebex RCON Adapter Client {Version} | https://tebex.io/");
 

Tebex-RCON/Tebex-RCON.csproj

@@ -6,8 +6,8 @@
         <TargetFramework>net7.0</TargetFramework>
         <RootNamespace>Tebex_RCON</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
-        <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
-        <PublishSingleFile>false</PublishSingleFile>
+        <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
+        <PublishSingleFile>true</PublishSingleFile>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 

Tebex-RCON/Tebex/BaseTebexAdapter.cs

@@ -490,6 +490,7 @@ public void ProcessCommandQueue(bool ignoreWaitCheck = false)
 
                             LogInfo($"Executing offline command: `{parsedCommand}`");
                             ExecuteOfflineCommand(command, commandName, args.ToArray());
+                            ExecutedCommands.Add(command);
                         }
                     }, (error) =>
                     {

build.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+rm -rf ./Tebex-RCON/bin
+rm -rf ./Tebex-RCON/obj
+rm -rf ./deploy/windows
+rm -rf ./deploy/linux
+
+dotnet publish -c Release -r win-x64 --self-contained true -p:PublishSingleFile=false .
+dotnet publish -c Release -r linux-x64 --self-contained true -p:PublishSingleFile=false .
+dotnet publish -c Release -r osx-x64 --self-contained true -p:PublishSingleFile=false .
+
+mkdir -p ./deploy/windows
+mkdir -p ./deploy/linux
+mkdir -p ./deploy/osx
+
+cp ./Tebex-RCON/bin/Release/net7.0/win-x64/publish/* ./deploy/windows/
+cp ./Tebex-RCON/bin/Release/net7.0/linux-x64/publish/* ./deploy/linux/
+cp ./Tebex-RCON/bin/Release/net7.0/osx-x64/publish/* ./deploy/osx/

deploy/linux/pack.sh → deploy/linux-digitalocean/pack.sh

@@ -2,10 +2,10 @@
 # Sync the Linux release to a remote server, to build a snapshot image of a basic RCON adapter
 
 SNAPSHOT_SYSTEM="root@addr"
-VERSION="1.0.0-alpha.5"
+VERSION="1.0.0"
 
 # Sync distribution files to the server used for snapshots
-rsync -rv ../../Tebex-RCON/bin/Release/net7.0/linux-x64 $SNAPSHOT_SYSTEM:/root/Tebex-RCONAdapter/
-rsync -v ./Tebex-RCONAdapter.service $SNAPSHOT_SYSTEM:/etc/systemd/Tebex-RCONAdapter.service
+rsync -rv ../linux/ $SNAPSHOT_SYSTEM:/root/Tebex-RCONAdapter/linux-x64/
+rsync -v ./Tebex-RCONAdapter.service $SNAPSHOT_SYSTEM:/etc/systemd/system/Tebex-RCONAdapter.service
 rsync -v ./etc/motd $SNAPSHOT_SYSTEM:/etc/motd
 rsync -rv ./root/* $SNAPSHOT_SYSTEM:/root/

deploy/linux-digitalocean/root/stop.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+systemctl stop Tebex-RCONAdapter
+sleep 1
+systemctl status Tebex-RCONAdapter
+
+echo "Stopped RCON Adapter."