add configuration update callback for script plugins & update plugins to utilize
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
@ -6,15 +7,20 @@ using System.Threading.Tasks;
|
||||
using IW4MAdmin.Application.Configuration;
|
||||
using Jint;
|
||||
using Jint.Native;
|
||||
using Jint.Native.Json;
|
||||
using SharedLibraryCore.Interfaces;
|
||||
|
||||
namespace IW4MAdmin.Application.Plugin.Script;
|
||||
|
||||
public class ScriptPluginConfigurationWrapper
|
||||
{
|
||||
public event Action<JsValue, Delegate> ConfigurationUpdated;
|
||||
|
||||
private readonly ScriptPluginConfiguration _config;
|
||||
private readonly IConfigurationHandlerV2<ScriptPluginConfiguration> _configHandler;
|
||||
private readonly Engine _scriptEngine;
|
||||
private readonly JsonParser _engineParser;
|
||||
private readonly List<(string, Delegate)> _updateCallbackActions = new();
|
||||
private string _pluginName;
|
||||
|
||||
public ScriptPluginConfigurationWrapper(string pluginName, Engine scriptEngine, IConfigurationHandlerV2<ScriptPluginConfiguration> configHandler)
|
||||
@ -22,9 +28,16 @@ public class ScriptPluginConfigurationWrapper
|
||||
_pluginName = pluginName;
|
||||
_scriptEngine = scriptEngine;
|
||||
_configHandler = configHandler;
|
||||
_configHandler.Updated += OnConfigurationUpdated;
|
||||
_config = configHandler.Get("ScriptPluginSettings", new ScriptPluginConfiguration()).GetAwaiter().GetResult();
|
||||
_engineParser = new JsonParser(_scriptEngine);
|
||||
}
|
||||
|
||||
~ScriptPluginConfigurationWrapper()
|
||||
{
|
||||
_configHandler.Updated -= OnConfigurationUpdated;
|
||||
}
|
||||
|
||||
public void SetName(string name)
|
||||
{
|
||||
_pluginName = name;
|
||||
@ -63,8 +76,10 @@ public class ScriptPluginConfigurationWrapper
|
||||
|
||||
await _configHandler.Set(_config);
|
||||
}
|
||||
|
||||
public JsValue GetValue(string key) => GetValue(key, null);
|
||||
|
||||
public JsValue GetValue(string key)
|
||||
public JsValue GetValue(string key, Delegate updateCallback)
|
||||
{
|
||||
if (!_config.ContainsKey(_pluginName))
|
||||
{
|
||||
@ -83,6 +98,20 @@ public class ScriptPluginConfigurationWrapper
|
||||
item = jElem.Deserialize<List<dynamic>>();
|
||||
}
|
||||
|
||||
if (updateCallback is not null)
|
||||
{
|
||||
_updateCallbackActions.Add((key, updateCallback));
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
return _engineParser.Parse(item!.ToString()!);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignored
|
||||
}
|
||||
|
||||
return JsValue.FromObject(_scriptEngine, item);
|
||||
}
|
||||
|
||||
@ -90,4 +119,12 @@ public class ScriptPluginConfigurationWrapper
|
||||
{
|
||||
return int.TryParse(value.ToString(CultureInfo.InvariantCulture), out var parsed) ? parsed : null;
|
||||
}
|
||||
|
||||
private void OnConfigurationUpdated(ScriptPluginConfiguration config)
|
||||
{
|
||||
foreach (var callback in _updateCallbackActions)
|
||||
{
|
||||
ConfigurationUpdated?.Invoke(GetValue(callback.Item1), callback.Item2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -291,6 +291,15 @@ public class ScriptPluginV2 : IPluginV2
|
||||
_scriptPluginConfigurationWrapper =
|
||||
new ScriptPluginConfigurationWrapper(_fileName.Split(Path.DirectorySeparatorChar).Last(), ScriptEngine,
|
||||
_configHandler);
|
||||
|
||||
_scriptPluginConfigurationWrapper.ConfigurationUpdated += (configValue, callbackAction) =>
|
||||
{
|
||||
WrapJavaScriptErrorHandling(() =>
|
||||
{
|
||||
callbackAction.DynamicInvoke(JsValue.Undefined, new[] { configValue });
|
||||
return Task.CompletedTask;
|
||||
}, _logger, _fileName, _onProcessingScript);
|
||||
};
|
||||
}
|
||||
|
||||
private void UnregisterScriptEntities(IManager manager)
|
||||
|
Reference in New Issue
Block a user