Core - Removed scripting providers

Meta - Updated packages

src/Artemis.Core/Services/CoreRenderer.cs

@@ -1,4 +1,3 @@
-using Artemis.Core.ScriptingProviders;
 using Artemis.Core.Services.Core;
 using SkiaSharp;
 
@@ -7,22 +6,17 @@ namespace Artemis.Core.Services;
 internal class CoreRenderer : IRenderer
 {
     private readonly IModuleService _moduleService;
-    private readonly IScriptingService _scriptingService;
     private readonly IProfileService _profileService;
 
-    public CoreRenderer(IModuleService moduleService, IScriptingService scriptingService, IProfileService profileService)
+    public CoreRenderer(IModuleService moduleService, IProfileService profileService)
     {
         _moduleService = moduleService;
-        _scriptingService = scriptingService;
         _profileService = profileService;
     }
 
     /// <inheritdoc />
     public void Render(SKCanvas canvas, double delta)
     {
-        foreach (GlobalScript scriptingServiceGlobalScript in _scriptingService.GlobalScripts)
-            scriptingServiceGlobalScript.OnCoreUpdating(delta);
-        
         _moduleService.UpdateActiveModules(delta);
 
         if (!_profileService.ProfileRenderingDisabled)
@@ -30,9 +24,6 @@ internal class CoreRenderer : IRenderer
             _profileService.UpdateProfiles(delta);
             _profileService.RenderProfiles(canvas);
         }
-
-        foreach (GlobalScript scriptingServiceGlobalScript in _scriptingService.GlobalScripts)
-            scriptingServiceGlobalScript.OnCoreUpdated(delta);
     }
 
     /// <inheritdoc />

src/Artemis.Core/Services/CoreService.cs

@@ -1,17 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Artemis.Core.DryIoc.Factories;
-using Artemis.Core.ScriptingProviders;
-using Artemis.Storage;
 using DryIoc;
 using HidSharp;
-using RGB.NET.Core;
 using Serilog;
 using Serilog.Events;
-using SkiaSharp;
 
 namespace Artemis.Core.Services;
 
@@ -33,7 +28,6 @@ internal class CoreService : ICoreService
         IPluginManagementService pluginManagementService,
         IProfileService profileService,
         IModuleService moduleService,
-        IScriptingService scriptingService,
         IRenderService renderService)
     {
         Constants.CorePlugin.Container = container;

src/Artemis.Core/Services/Interfaces/IScriptingService.cs

@@ -1,46 +0,0 @@
-using System.Collections.ObjectModel;
-using Artemis.Core.ScriptingProviders;
-
-namespace Artemis.Core.Services;
-
-/// <summary>
-///     A service that allows you to manage various types of <see cref="NodeScript" /> instances
-/// </summary>
-public interface IScriptingService : IArtemisService
-{
-    /// <summary>
-    ///     Gets a list of all available scripting providers
-    /// </summary>
-    ReadOnlyCollection<ScriptingProvider> ScriptingProviders { get; }
-
-    /// <summary>
-    ///     Gets a list of all currently active global scripts
-    /// </summary>
-    ReadOnlyCollection<GlobalScript> GlobalScripts { get; }
-
-    /// <summary>
-    ///     Adds a script by the provided script configuration to the provided profile and instantiates it.
-    /// </summary>
-    /// <param name="scriptConfiguration">The script configuration whose script to add.</param>
-    /// <param name="profile">The profile to add the script to.</param>
-    ProfileScript AddScript(ScriptConfiguration scriptConfiguration, Profile profile);
-
-    /// <summary>
-    ///     Removes a script by the provided script configuration from the provided profile and disposes it.
-    /// </summary>
-    /// <param name="scriptConfiguration">The script configuration whose script to remove.</param>
-    /// <param name="profile">The profile to remove the script from.</param>
-    void RemoveScript(ScriptConfiguration scriptConfiguration, Profile profile);
-
-    /// <summary>
-    ///     Adds a script by the provided script configuration to the global collection and instantiates it.
-    /// </summary>
-    /// <param name="scriptConfiguration">The script configuration whose script to add.</param>
-    GlobalScript AddScript(ScriptConfiguration scriptConfiguration);
-
-    /// <summary>
-    ///     Removes a script by the provided script configuration from the global collection and disposes it.
-    /// </summary>
-    /// <param name="scriptConfiguration">The script configuration whose script to remove.</param>
-    void RemoveScript(ScriptConfiguration scriptConfiguration);
-}

src/Artemis.Core/Services/ScriptingService.cs

@@ -1,165 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Artemis.Core.ScriptingProviders;
-
-namespace Artemis.Core.Services;
-
-internal class ScriptingService : IScriptingService
-{
-    private readonly List<GlobalScript> _globalScripts;
-    private readonly IPluginManagementService _pluginManagementService;
-    private readonly IProfileService _profileService;
-    private readonly List<ScriptingProvider> _scriptingProviders;
-
-    public ScriptingService(IPluginManagementService pluginManagementService, IProfileService profileService)
-    {
-        _pluginManagementService = pluginManagementService;
-        _profileService = profileService;
-
-        _pluginManagementService.PluginFeatureEnabled += PluginManagementServiceOnPluginFeatureToggled;
-        _pluginManagementService.PluginFeatureDisabled += PluginManagementServiceOnPluginFeatureToggled;
-        _scriptingProviders = _pluginManagementService.GetFeaturesOfType<ScriptingProvider>();
-        _globalScripts = new List<GlobalScript>();
-
-        ScriptingProviders = new ReadOnlyCollection<ScriptingProvider>(_scriptingProviders);
-        GlobalScripts = new ReadOnlyCollection<GlobalScript>(_globalScripts);
-
-        // No need to sub to Deactivated, scripts will deactivate themselves
-        profileService.ProfileActivated += ProfileServiceOnProfileActivated;
-
-        foreach (ProfileCategory profileCategory in _profileService.ProfileCategories)
-        {
-            foreach (ProfileConfiguration profileConfiguration in profileCategory.ProfileConfigurations)
-            {
-                if (profileConfiguration.Profile != null)
-                    InitializeProfileScripts(profileConfiguration.Profile);
-            }
-        }
-    }
-
-    private GlobalScript CreateScriptInstance(ScriptConfiguration scriptConfiguration)
-    {
-        GlobalScript? script = null;
-        try
-        {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
-
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
-                throw new ArtemisCoreException($"Can't create script instance as there is no matching scripting provider found for the script ({scriptConfiguration.ScriptingProviderId}).");
-
-            script = (GlobalScript) provider.Plugin.Resolve(provider.GlobalScriptType, scriptConfiguration);
-            script.ScriptingProvider = provider;
-            script.ScriptingService = this;
-            scriptConfiguration.Script = script;
-            provider.InternalScripts.Add(script);
-
-            return script;
-        }
-        catch (Exception e)
-        {
-            script?.Dispose();
-            throw new ArtemisCoreException("Failed to initialize global script", e);
-        }
-    }
-
-    private ProfileScript CreateScriptInstance(ScriptConfiguration scriptConfiguration, Profile profile)
-    {
-        ProfileScript? script = null;
-        try
-        {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
-
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
-                throw new ArtemisCoreException($"Can't create script instance as there is no matching scripting provider found for the script ({scriptConfiguration.ScriptingProviderId}).");
-
-            script = (ProfileScript) provider.Plugin.Resolve(provider.ProfileScriptType, profile, scriptConfiguration);
-            script.ScriptingProvider = provider;
-            scriptConfiguration.Script = script;
-            provider.InternalScripts.Add(script);
-            lock (profile)
-            {
-                profile.AddScript(script);
-            }
-
-            return script;
-        }
-        catch (Exception e)
-        {
-            // If something went wrong but the script was created, clean up as best we can
-            if (script != null)
-            {
-                if (profile.Scripts.Contains(script))
-                    profile.RemoveScript(script);
-                else
-                    script.Dispose();
-            }
-
-            throw new ArtemisCoreException("Failed to initialize profile script", e);
-        }
-    }
-
-    private void InitializeProfileScripts(Profile profile)
-    {
-        // Initialize the scripts on the profile
-        foreach (ScriptConfiguration scriptConfiguration in profile.ScriptConfigurations.Where(c => c.Script == null && _scriptingProviders.Any(p => p.Id == c.ScriptingProviderId)))
-            CreateScriptInstance(scriptConfiguration, profile);
-    }
-
-    private void PluginManagementServiceOnPluginFeatureToggled(object? sender, PluginFeatureEventArgs e)
-    {
-        _scriptingProviders.Clear();
-        _scriptingProviders.AddRange(_pluginManagementService.GetFeaturesOfType<ScriptingProvider>());
-        
-        foreach (ProfileCategory profileCategory in _profileService.ProfileCategories)
-        {
-            foreach (ProfileConfiguration profileConfiguration in profileCategory.ProfileConfigurations)
-            {
-                if (profileConfiguration.Profile != null)
-                    InitializeProfileScripts(profileConfiguration.Profile);
-            }
-        }
-    }
-
-    private void ProfileServiceOnProfileActivated(object? sender, ProfileConfigurationEventArgs e)
-    {
-        if (e.ProfileConfiguration.Profile != null)
-            InitializeProfileScripts(e.ProfileConfiguration.Profile);
-    }
-
-    /// <inheritdoc />
-    public ReadOnlyCollection<ScriptingProvider> ScriptingProviders { get; }
-
-    /// <inheritdoc />
-    public ReadOnlyCollection<GlobalScript> GlobalScripts { get; }
-
-    /// <inheritdoc />
-    public ProfileScript AddScript(ScriptConfiguration scriptConfiguration, Profile profile)
-    {
-        profile.AddScriptConfiguration(scriptConfiguration);
-        return CreateScriptInstance(scriptConfiguration, profile);
-    }
-
-    /// <inheritdoc />
-    public void RemoveScript(ScriptConfiguration scriptConfiguration, Profile profile)
-    {
-        profile.RemoveScriptConfiguration(scriptConfiguration);
-    }
-
-    /// <inheritdoc />
-    public GlobalScript AddScript(ScriptConfiguration scriptConfiguration)
-    {
-        throw new NotImplementedException("Global scripts are not yet implemented.");
-    }
-
-    /// <inheritdoc />
-    public void RemoveScript(ScriptConfiguration scriptConfiguration)
-    {
-        throw new NotImplementedException("Global scripts are not yet implemented.");
-    }
-}