fix auto-updates and crash handler restart

keen has thrown a bunch of new static ctors so factory patch cannot be revied :(

.gitignore

@@ -159,10 +159,6 @@ publish/
 
 # NuGet Packages
 *.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
 # NuGet v3's project.json files produces more ignoreable files

Torch.API/Torch.API.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="NuGet.Commands" Version="6.4.0" />
     <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.API/packages.lock.json

@@ -43,9 +43,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
+        "requested": "[1.202.48, )",
-        "resolved": "1.201.13",
+        "resolved": "1.202.48",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }

Torch.Server/Initializer.cs

@@ -30,7 +30,7 @@ namespace Torch.Server
         private const string STEAMCMD_DIR = "steamcmd";
         private const string STEAMCMD_ZIP = "temp.zip";
         private static readonly string STEAMCMD_EXE = "steamcmd.exe";
-        private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit";
+        private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 -beta automtatons-beta +quit";
         private TorchServer _server;
 
         internal Persistent<TorchConfig> ConfigPersistent { get; }
@@ -56,7 +56,7 @@ namespace Torch.Server
             Log.Debug("Debug logging enabled.");
 #endif
             
-            if (!configuration.GetValue("noupdate", false))
+            if (configuration.GetValue("getGameUpdates", true) && !configuration.GetValue("noupdate", false))
                 RunSteamCmd(configuration);
 
             var processPid = configuration.GetValue<int>("waitForPid");

Torch.Server/Torch.Server.csproj

@@ -51,7 +51,7 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Management" Version="7.0.0" />
     <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.Server/UnhandledExceptionHandler.cs

@@ -32,9 +32,25 @@ internal class UnhandledExceptionHandler
         {
             Console.WriteLine("Restarting in 5 seconds.");
             Thread.Sleep(5000);
+            
             var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
 
-            Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}");
+            var args = Environment.GetCommandLineArgs();
+
+            for (var i = 0; i < args.Length; i++)
+            {
+                if (args[i].Contains(' '))
+                    args[i] = $"\"{args[i]}\"";
+                    
+                if (!args[i].Contains("--tempAutostart", StringComparison.InvariantCultureIgnoreCase) &&
+                    !args[i].Contains("--waitForPid", StringComparison.InvariantCultureIgnoreCase)) 
+                    continue;
+                    
+                args[i] = string.Empty;
+                args[++i] = string.Empty;
+            }
+
+            Process.Start(exe, $"--waitForPid {Environment.ProcessId} --tempAutostart true {string.Join(" ", args)}");
         }
         else
         {

Torch.Server/packages.lock.json

@@ -122,9 +122,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
+        "requested": "[1.202.48, )",
-        "resolved": "1.201.13",
+        "resolved": "1.202.48",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }

Torch/Managers/FilesystemManager.cs

@@ -58,21 +58,18 @@ namespace Torch.Managers
             if (!File.Exists(source))
                 return;
 
-            var tempFilePath = Path.Combine(path, file + ".old");
+            try
-            if (File.Exists(tempFilePath))
+            {
-                File.Delete(tempFilePath);
+                File.Delete(source);
+            }
+            catch (IOException)
+            {
+                var tempFilePath = Path.Combine(path, file + ".old");
+                if (File.Exists(tempFilePath))
+                    File.Delete(tempFilePath);
 
-            var errorCode = Rename(source, tempFilePath);
+                File.Move(source, tempFilePath);
-            if (Marshal.GetExceptionForHR(errorCode) is { } exception)
+            }
-                throw exception;
         }
-        
-        [LibraryImport("msvcrt", SetLastError = true, EntryPoint = "rename")]
-        [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
-        private static partial int Rename(
-            [MarshalAs(UnmanagedType.LPWStr)]
-            string oldpath,
-            [MarshalAs(UnmanagedType.LPWStr)]
-            string newpath);
     }
 }

Torch/Packages/PackageManager.cs

@@ -0,0 +1,162 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using NLog;
+using Torch.API;
+using Torch.API.Managers;
+using Torch.API.WebAPI.Plugins;
+using Torch.Managers;
+using Torch.Utils;
+
+namespace Torch.Packages;
+
+public class PackageManager : Manager, IPackageManager
+{
+    private readonly PluginManager _pluginManager;
+    private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
+
+    private IPackageResolver? _packageResolver;
+
+    public PackageManager(ITorchBase torchInstance, PluginManager pluginManager) : base(torchInstance)
+    {
+        _pluginManager = pluginManager;
+    }
+
+    private AssemblyLoadContext? _loadContext;
+
+    private ImmutableHashSet<Package> _packages = ImmutableHashSet<Package>.Empty;
+    private ImmutableDictionary<Package,Assembly[]> _packageAssemblies = ImmutableDictionary<Package, Assembly[]>.Empty;
+    private DirectoryInfo? _packagesDirectory;
+    public IReadOnlySet<Package> Packages => _packages;
+    
+    public bool TryGetPackageAssemblies(Package package, out Assembly[]? assemblies)
+    {
+        if (!Packages.Contains(package))
+            throw new InvalidOperationException($"Package {package.Name} does not exist");
+        
+        return _packageAssemblies.TryGetValue(package, out assemblies);
+    }
+
+    internal async void LoadAsync(SemaphoreSlim semaphore)
+    {
+        _packagesDirectory = Directory.CreateDirectory(Path.Combine(Torch.InstancePath, "Packages"));
+        _packageResolver = new PackageResolver(new[]
+        { // TODO make this configurable
+            new PackageSource("nuget", "https://api.nuget.org/v3/index.json", new[] { "*" }, PackageSourceType.NuGet)
+        }, _packagesDirectory);
+        
+        try
+        {
+            var packages =
+                Torch.Config.Packages.ToImmutableDictionary(b => b[..b.IndexOf(':')], b => b[(b.IndexOf(':') + 1)..]);
+            await ResolvePackagesAsync(packages);
+
+            var resolvedPackages = await _packages.ToAsyncEnumerable()
+                                                  .SelectAwait(async b =>
+                                                  {
+                                                      var reader = await _packageResolver!.GetPackageAsync(b);
+                                                      var items = await reader.GetItemsAsync();
+
+                                                      return (b, items);
+                                                  }).ToDictionaryAsync(b => b.b.Name, b => b,
+                                                                       StringComparer.OrdinalIgnoreCase);
+
+            var dependencies = new Dictionary<PackageDependency, IEnumerable<IPackageItem>>(
+                resolvedPackages.Values.SelectMany(b => b.items.Dependencies)
+                                .Where(b => !resolvedPackages.ContainsKey(b.Key.Name))
+                                .GroupBy(b => b.Key.Name)
+                                .Select(b => b.MaxBy(c => c.Key.Version)));
+
+            _loadContext = new("PackageManager Context");
+
+            var dependencyAssemblies = await dependencies.ToAsyncEnumerable().SelectAwait(async pair =>
+            {
+                var (dep, items) = pair;
+                var assemblies = await LoadAssembliesFromItems(items);
+
+                return (dep, assemblies);
+            }).ToDictionaryAsync(b => b.dep, b => b.assemblies);
+
+            var packageAssemblies = await resolvedPackages.Values.ToAsyncEnumerable().SelectAwait(async b =>
+            {
+                var assemblies = await LoadAssembliesFromItems(b.items.Root);
+
+                return (b.b, assemblies);
+            }).ToDictionaryAsync(b => b.b, b => b.assemblies);
+
+            foreach (var assembly in dependencyAssemblies.Values.Concat(packageAssemblies.Values).SelectMany(b => b))
+            {
+                TorchLauncher.RegisterAssembly(assembly);
+            }
+
+            foreach (var (package, assemblies) in packageAssemblies)
+            {
+                using var hash = MD5.Create();
+                hash.Initialize();
+                var guid = new Guid(hash.ComputeHash(Encoding.UTF8.GetBytes(package.Name)));
+                
+                _pluginManager.InstantiatePlugin(new()
+                {
+                    Name = package.Name,
+                    Version = package.Version.ToString(),
+                    Guid = guid
+                }, assemblies);
+            }
+
+            _packageAssemblies = packageAssemblies.ToImmutableDictionary();
+        }
+        finally
+        {
+            semaphore.Release();
+        }
+    }
+
+    private async Task<Assembly[]> LoadAssembliesFromItems(IEnumerable<IPackageItem> items)
+    {
+        var dictionary = items.ToImmutableDictionary(b => b.FileName, StringComparer.OrdinalIgnoreCase);
+
+        var assemblies = await dictionary
+                               .Where(b => Path.GetExtension(b.Key)
+                                               .Equals("dll", StringComparison.OrdinalIgnoreCase))
+                               .ToAsyncEnumerable()
+                               .SelectAwait(async b =>
+                               {
+                                   dictionary.TryGetValue(
+                                       Path.ChangeExtension(b.Key, "pdb"), out var pdbItem);
+                                   return await LoadFromStream(b.Key, b.Value, pdbItem);
+                               }).ToArrayAsync();
+        return assemblies;
+    }
+
+    private async ValueTask<Assembly> LoadFromStream(string key, IPackageItem dllItem, IPackageItem? pdbItem)
+    {
+        if (_loadContext is null)
+            throw new InvalidOperationException("Load Context should be initialized before calling the method");
+
+        Log.Trace("Loading {0}", key);
+        await using var dll = await dllItem.OpenFileAsync();
+        if (pdbItem is null)
+            return _loadContext.LoadFromStream(dll);
+
+        await using var pdb = await pdbItem.OpenFileAsync();
+        return _loadContext.LoadFromStream(dll, pdb);
+    }
+
+    private async Task ResolvePackagesAsync(IReadOnlyDictionary<string, string> requestedPackages)
+    {
+        Log.Info("Resolving packages");
+        var packages = await _packageResolver!.ResolvePackagesAsync(requestedPackages);
+
+        _packages = packages.ToImmutableHashSet();
+        Log.Info("Got {0} packages", _packages.Count);
+    }
+}

Torch/Patches/ObjectFactoryInitPatch.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using Sandbox;
-using Sandbox.Game.Entities;
-using Torch.Utils;
-using VRage.Game.Common;
-using VRage.Game.Components;
-using VRage.Game.Entity;
-using VRage.ObjectBuilders;
-using VRage.Plugins;
-using VRage.Utils;
-
-namespace Torch.Patches
-{
-
-    /// <summary>
-    /// There are places in static ctors where the registered assembly depends on the <see cref="Assembly.GetCallingAssembly"/>
-    /// or <see cref="MyPlugins"/>.  Here we force those registrations with the proper assemblies to ensure they work correctly.
-    /// </summary>
-    internal static class ObjectFactoryInitPatch
-    {
-#pragma warning disable 649
-        [ReflectedGetter(Name = "m_objectFactory", TypeName = "Sandbox.Game.Entities.MyEntityFactory, Sandbox.Game")]
-        private static Func<MyObjectFactory<MyEntityTypeAttribute, MyEntity>> EntityFactoryObjectFactory;
-#pragma warning restore 649
-
-        internal static void ForceRegisterAssemblies()
-        {
-            var userAssemblies = MyPlugins.UserAssemblies;
-            // static MyEntities() called by MySandboxGame.ForceStaticCtor
-            RuntimeHelpers.RunClassConstructor(typeof(MyEntities).TypeHandle);
-            {
-                MyObjectFactory<MyEntityTypeAttribute, MyEntity> factory = EntityFactoryObjectFactory();
-                ObjectFactory_RegisterFromAssemblySafe(factory, typeof(MySandboxGame).Assembly); // calling assembly
-                ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.GameAssembly);
-                ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.SandboxAssembly);
-                //ObjectFactory_RegisterFromAssemblySafe(factory, MyPlugins.UserAssembly);
-                if (userAssemblies != null)
-                {
-                    foreach (var assembly in userAssemblies)
-                    {
-                        ObjectFactory_RegisterFromAssemblySafe(factory, assembly);
-                    }
-                }
-            }
-
-            // static MyGuiManager():
-            // MyGuiControlsFactory.RegisterDescriptorsFromAssembly();
-
-            // static MyComponentTypeFactory() called by MyComponentContainer.Add
-            RuntimeHelpers.RunClassConstructor(typeof(MyComponentTypeFactory).TypeHandle);
-            {
-                ComponentTypeFactory_RegisterFromAssemblySafe(typeof(MyComponentContainer).Assembly); // calling assembly
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxAssembly);
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.GameAssembly);
-                ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.SandboxGameAssembly);
-                //ComponentTypeFactory_RegisterFromAssemblySafe(MyPlugins.UserAssembly);
-                if (userAssemblies != null)
-                {
-                    foreach (var assembly in userAssemblies)
-                    {
-                        ComponentTypeFactory_RegisterFromAssemblySafe(assembly);
-                    }
-                }
-            }
-
-            MyEntities.Orchestrator = new MyParallelEntityUpdateOrchestrator();
-
-            // static MyObjectPoolManager()
-            // Render, so should be fine.
-        }
-
-        #region MyObjectFactory Adders
-        private static void ObjectFactory_RegisterDescriptorSafe<TAttribute, TCreatedObjectBase>(
-            MyObjectFactory<TAttribute, TCreatedObjectBase> factory, TAttribute descriptor, Type type) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
-        {
-            if (factory.Attributes.TryGetValue(type, out _))
-                return;
-            if (descriptor.ObjectBuilderType != null && factory.TryGetProducedType(descriptor.ObjectBuilderType) != null)
-                return;
-            if (typeof(MyObjectBuilder_Base).IsAssignableFrom(descriptor.ProducedType) &&
-                factory.TryGetProducedType(descriptor.ProducedType) != null)
-                return;
-            factory.RegisterDescriptor(descriptor, type);
-        }
-
-        private static void ObjectFactory_RegisterFromAssemblySafe<TAttribute, TCreatedObjectBase>(MyObjectFactory<TAttribute, TCreatedObjectBase> factory, Assembly assembly) where TAttribute : MyFactoryTagAttribute where TCreatedObjectBase : class
-        {
-            if (assembly == null)
-            {
-                return;
-            }
-            foreach (Type type in assembly.GetTypes())
-            {
-                foreach (TAttribute descriptor in type.GetCustomAttributes<TAttribute>())
-                {
-                    ObjectFactory_RegisterDescriptorSafe(factory, descriptor, type);
-                }
-            }
-        }
-        #endregion
-        #region MyComponentTypeFactory Adders
-
-        [ReflectedGetter(Name = "m_idToType", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<MyStringId, Type>> ComponentTypeFactoryIdToType = null!;
-        [ReflectedGetter(Name = "m_typeToId", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<Type, MyStringId>> ComponentTypeFactoryTypeToId = null!;
-        [ReflectedGetter(Name = "m_typeToContainerComponentType", Type = typeof(MyComponentTypeFactory))]
-        private static Func<Dictionary<Type, Type>> ComponentTypeFactoryContainerComponentType = null!;
-
-        private static void ComponentTypeFactory_RegisterFromAssemblySafe(Assembly assembly)
-        {
-            if (assembly == null)
-                return;
-            foreach (Type type in assembly.GetTypes())
-                if (typeof(MyComponentBase).IsAssignableFrom(type))
-                {
-                    ComponentTypeFactory_AddIdSafe(type, MyStringId.GetOrCompute(type.Name));
-                    ComponentTypeFactory_RegisterComponentTypeAttributeSafe(type);
-                }
-        }
-
-        private static void ComponentTypeFactory_RegisterComponentTypeAttributeSafe(Type type)
-        {
-            Type componentType = type.GetCustomAttribute<MyComponentTypeAttribute>(true)?.ComponentType;
-            if (componentType != null)
-                ComponentTypeFactoryContainerComponentType()[type] = componentType;
-        }
-
-        private static void ComponentTypeFactory_AddIdSafe(Type type, MyStringId id)
-        {
-            ComponentTypeFactoryIdToType()[id] = type;
-            ComponentTypeFactoryTypeToId()[type] = id;
-        }
-        #endregion
-    }
-}

Torch/Plugins/PluginManager.cs

@@ -386,11 +386,7 @@ namespace Torch.Managers
             }
 
             var harmonyAssembly = assemblies.FirstOrDefault(b => b.FullName?.StartsWith("0Harmony") == true);
-            if (harmonyAssembly is { })
+            if (harmonyAssembly is { }) assemblies.Remove(harmonyAssembly);
-            {
-                _log.Warn($"Plugin {item.Manifest.Name} is using harmony library, logic collision between plugins could be encountered!");
-                assemblies.Remove(harmonyAssembly);
-            }
 
             RegisterAllAssemblies(assemblies);
             InstantiatePlugin(item.Manifest, assemblies);

Torch/Torch.csproj

@@ -35,7 +35,7 @@
     <PackageReference Include="protobuf-net" Version="3.1.26" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch/TorchBase.cs

@@ -133,13 +133,7 @@ namespace Torch
             GameStateChanged += (game, state) =>
             {
                 if (state == TorchGameState.Created) 
-                {
-                    // If the attached assemblies change (MySandboxGame.ctor => MySandboxGame.ParseArgs => MyPlugins.RegisterFromArgs)
-                    // attach assemblies to object factories again.
-                    ObjectFactoryInitPatch.ForceRegisterAssemblies();
-                    // safe to commit here; all important static ctors have run
                     PatchManager.CommitInternal();
-                }
             };
 
             var harmonyLog = LogManager.GetLogger("HarmonyX");
@@ -259,7 +253,6 @@ namespace Torch
         public virtual void Init()
         {
             Debug.Assert(!_init, "Torch instance is already initialized.");
-            ObjectFactoryInitPatch.ForceRegisterAssemblies();
             VRageGame.SetupVersionInfo();
 
             Debug.Assert(MyPerGameSettings.BasicGameInfo.GameVersion != null, "MyPerGameSettings.BasicGameInfo.GameVersion != null");

Torch/packages.lock.json

@@ -102,9 +102,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.201.13, )",
+        "requested": "[1.202.48, )",
-        "resolved": "1.201.13",
+        "resolved": "1.202.48",
-        "contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
+        "contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }