lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-05 12:40:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(plugin): auto-decode JSON config values by type in PluginManager

Browse Source
This commit is contained in:
xboard
2025-10-20 18:56:44 +08:00
parent 7377460ba0
commit e3c746d314
2 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Plugin/AbstractPlugin.php
View File

@@ -2,8 +2,6 @@
namespace App\Services\Plugin;
use Illuminate\Support\Facades\View;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\Response;

73
app/Services/Plugin/PluginManager.php
View File

@@ -17,6 +17,7 @@ class PluginManager
protected string $pluginPath;
protected array $loadedPlugins = [];
protected bool $pluginsInitialized = false;
protected array $configTypesCache = [];
public function __construct()
{
@@ -319,7 +320,9 @@ class PluginManager
->first();
if ($dbPlugin && !empty($dbPlugin->config)) {
$plugin->setConfig(json_decode($dbPlugin->config, true));
$values = json_decode($dbPlugin->config, true) ?: [];
$values = $this->castConfigValuesByType($pluginCode, $values);
$plugin->setConfig($values);
}
// 注册服务提供者
@@ -453,13 +456,15 @@ class PluginManager
$this->runMigrations($pluginCode);
$plugin = $this->loadPlugin($pluginCode);
if ($plugin) {
if (!empty($dbPlugin->config)) {
$plugin->setConfig(json_decode($dbPlugin->config, true));
}
if ($plugin) {
if (!empty($dbPlugin->config)) {
$values = json_decode($dbPlugin->config, true) ?: [];
$values = $this->castConfigValuesByType($pluginCode, $values);
$plugin->setConfig($values);
}
$plugin->update($oldVersion, $newVersion);
}
$plugin->update($oldVersion, $newVersion);
}
$dbPlugin->update([
'version' => $newVersion,
@@ -567,7 +572,9 @@ class PluginManager
}
if (!empty($dbPlugin->config)) {
$pluginInstance->setConfig(json_decode($dbPlugin->config, true));
$values = json_decode($dbPlugin->config, true) ?: [];
$values = $this->castConfigValuesByType($pluginCode, $values);
$pluginInstance->setConfig($values);
}
$this->registerServiceProvider($pluginCode);
@@ -603,7 +610,9 @@ class PluginManager
return;
}
if (!empty($dbPlugin->config)) {
$pluginInstance->setConfig(json_decode($dbPlugin->config, true));
$values = json_decode($dbPlugin->config, true) ?: [];
$values = $this->castConfigValuesByType($dbPlugin->code, $values);
$pluginInstance->setConfig($values);
}
$pluginInstance->schedule($schedule);
@@ -669,4 +678,50 @@ class PluginManager
}
}
}
/**
* 根据 config.json 的类型信息对配置值进行类型转换（仅处理 type=json 键）。
*/
protected function castConfigValuesByType(string $pluginCode, array $values): array
{
$types = $this->getConfigTypes($pluginCode);
foreach ($values as $key => $value) {
$type = $types[$key] ?? null;
if ($type === 'json') {
if (is_array($value)) {
continue;
}
if (is_string($value) && $value !== '') {
$decoded = json_decode($value, true);
if (json_last_error() === JSON_ERROR_NONE) {
$values[$key] = $decoded;
}
}
}
}
return $values;
}
/**
* 读取并缓存插件 config.json 中的键类型映射。
*/
protected function getConfigTypes(string $pluginCode): array
{
if (isset($this->configTypesCache[$pluginCode])) {
return $this->configTypesCache[$pluginCode];
}
$types = [];
$configFile = $this->getPluginPath($pluginCode) . '/config.json';
if (File::exists($configFile)) {
$config = json_decode(File::get($configFile), true);
$fields = $config['config'] ?? [];
foreach ($fields as $key => $meta) {
$types[$key] = is_array($meta) ? ($meta['type'] ?? 'string') : 'string';
}
}
$this->configTypesCache[$pluginCode] = $types;
return $types;
}
}