feat: 汎用プラグインBox生成システム実装とnyash.toml v2対応準備
- GenericPluginBoxを実装し、任意のプラグインBoxを動的に生成可能に - FileBox決め打ちコードを削除（設計思想違反の解消） - CURRENT_TASK.mdを更新し、nyash.toml v2対応の必要性を明確化 - 問題: プラグインテスターとNyash本体が古い単一Box型形式のまま 次のステップ： 1. nyash.tomlをv2形式（マルチBox型）に更新 2. プラグインテスターをv2対応に 3. Nyash本体のレジストリをv2対応に 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
@ -13,4 +13,5 @@ mod tests;
|
||||
pub use plugin_config::PluginConfig;
|
||||
pub use box_registry::{BoxFactoryRegistry, BoxProvider, get_global_registry};
|
||||
pub use plugin_box::PluginBox;
|
||||
pub use plugin_loader::{PluginLoader, get_global_loader};
|
||||
// Use unified plugin loader (formerly v2)
|
||||
pub use plugin_loader::{PluginLoaderV2 as PluginLoader, get_global_loader_v2 as get_global_loader};
|
||||
@ -1,82 +1,253 @@
|
||||
//! プラグイン動的ローダー - libloadingによるFFI実行
|
||||
//! Multi-box plugin loader (v2)
|
||||
//!
|
||||
//! PluginBoxプロキシからFFI経由でプラグインメソッドを呼び出す
|
||||
//! Supports loading plugins that provide multiple Box types
|
||||
|
||||
use crate::bid::{BidHandle, BidError, TlvEncoder, TlvDecoder};
|
||||
use crate::box_trait::{NyashBox, StringBox, BoolBox};
|
||||
use crate::runtime::plugin_box::PluginBox;
|
||||
use crate::bid::{BidHandle, TlvEncoder, TlvDecoder};
|
||||
use crate::box_trait::{NyashBox, StringBox};
|
||||
use crate::config::nyash_toml_v2::{NyashConfigV2, LibraryDefinition};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, RwLock};
|
||||
use std::ffi::{CStr, CString};
|
||||
use std::os::raw::c_char;
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
use libloading::{Library, Symbol};
|
||||
|
||||
/// プラグインライブラリハンドル
|
||||
pub struct PluginLibrary {
|
||||
/// FFI type definitions (must match plugin definitions)
|
||||
#[repr(C)]
|
||||
pub struct NyashHostVtable {
|
||||
pub alloc: unsafe extern "C" fn(size: usize) -> *mut u8,
|
||||
pub free: unsafe extern "C" fn(ptr: *mut u8),
|
||||
pub wake: unsafe extern "C" fn(handle: u64),
|
||||
pub log: unsafe extern "C" fn(level: i32, msg: *const c_char),
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
pub struct NyashMethodInfo {
|
||||
pub method_id: u32,
|
||||
pub name: *const c_char,
|
||||
pub signature: u32,
|
||||
}
|
||||
|
||||
#[repr(C)]
|
||||
pub struct NyashPluginInfo {
|
||||
pub type_id: u32,
|
||||
pub type_name: *const c_char,
|
||||
pub method_count: usize,
|
||||
pub methods: *const NyashMethodInfo,
|
||||
}
|
||||
|
||||
/// Multi-box plugin library handle
|
||||
pub struct MultiBoxPluginLibrary {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
library: Library,
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
_placeholder: (),
|
||||
/// Box type name -> type_id mapping
|
||||
box_types: HashMap<String, u32>,
|
||||
|
||||
/// Type ID -> Box type name mapping
|
||||
type_names: HashMap<u32, String>,
|
||||
}
|
||||
|
||||
/// プラグインローダー - 動的ライブラリ管理
|
||||
pub struct PluginLoader {
|
||||
/// プラグイン名 → ライブラリのマッピング
|
||||
libraries: RwLock<HashMap<String, Arc<PluginLibrary>>>,
|
||||
/// Multi-box plugin loader
|
||||
pub struct PluginLoaderV2 {
|
||||
/// Library name -> library handle
|
||||
libraries: RwLock<HashMap<String, Arc<MultiBoxPluginLibrary>>>,
|
||||
|
||||
/// Box type name -> library name mapping
|
||||
box_to_library: RwLock<HashMap<String, String>>,
|
||||
|
||||
/// Host vtable for plugins
|
||||
host_vtable: NyashHostVtable,
|
||||
}
|
||||
|
||||
impl PluginLoader {
|
||||
/// 新しいプラグインローダーを作成
|
||||
// Host function implementations
|
||||
unsafe extern "C" fn host_alloc(size: usize) -> *mut u8 {
|
||||
let layout = std::alloc::Layout::from_size_align(size, 8).unwrap();
|
||||
std::alloc::alloc(layout)
|
||||
}
|
||||
|
||||
unsafe extern "C" fn host_free(ptr: *mut u8) {
|
||||
// Simplified implementation - real implementation needs size tracking
|
||||
}
|
||||
|
||||
unsafe extern "C" fn host_wake(_handle: u64) {
|
||||
// Async wake - not implemented yet
|
||||
}
|
||||
|
||||
unsafe extern "C" fn host_log(level: i32, msg: *const c_char) {
|
||||
if !msg.is_null() {
|
||||
let c_str = CStr::from_ptr(msg);
|
||||
let message = c_str.to_string_lossy();
|
||||
match level {
|
||||
0 => log::debug!("{}", message),
|
||||
1 => log::info!("{}", message),
|
||||
2 => log::warn!("{}", message),
|
||||
3 => log::error!("{}", message),
|
||||
_ => log::info!("{}", message),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl PluginLoaderV2 {
|
||||
/// Create new multi-box plugin loader
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
libraries: RwLock::new(HashMap::new()),
|
||||
box_to_library: RwLock::new(HashMap::new()),
|
||||
host_vtable: NyashHostVtable {
|
||||
alloc: host_alloc,
|
||||
free: host_free,
|
||||
wake: host_wake,
|
||||
log: host_log,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// プラグインライブラリをロード
|
||||
pub fn load_plugin(&self, plugin_name: &str, library_path: &str) -> Result<(), String> {
|
||||
/// Load plugins from nyash.toml configuration
|
||||
pub fn load_from_config(&self, config: &NyashConfigV2) -> Result<(), String> {
|
||||
// Load v2 multi-box plugins
|
||||
if let Some(libs) = &config.plugins.libraries {
|
||||
for (lib_name, lib_def) in libs {
|
||||
self.load_multi_box_plugin(lib_name, lib_def)?;
|
||||
}
|
||||
}
|
||||
|
||||
// Load legacy single-box plugins
|
||||
for (box_name, plugin_name) in &config.plugins.legacy_plugins {
|
||||
// For now, skip legacy plugins - focus on v2
|
||||
log::info!("Legacy plugin {} for {} - skipping", plugin_name, box_name);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Load a multi-box plugin library
|
||||
fn load_multi_box_plugin(&self, lib_name: &str, lib_def: &LibraryDefinition) -> Result<(), String> {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let library = unsafe {
|
||||
Library::new(library_path)
|
||||
.map_err(|e| format!("Failed to load plugin {}: {}", plugin_name, e))?
|
||||
let library = unsafe {
|
||||
Library::new(&lib_def.plugin_path)
|
||||
.map_err(|e| format!("Failed to load plugin {}: {}", lib_name, e))?
|
||||
};
|
||||
|
||||
let plugin_lib = Arc::new(PluginLibrary { library });
|
||||
let mut libraries = self.libraries.write().unwrap();
|
||||
libraries.insert(plugin_name.to_string(), plugin_lib);
|
||||
// Check ABI version
|
||||
let abi_fn: Symbol<unsafe extern "C" fn() -> u32> = unsafe {
|
||||
library.get(b"nyash_plugin_abi")
|
||||
.map_err(|e| format!("nyash_plugin_abi not found: {}", e))?
|
||||
};
|
||||
|
||||
let abi_version = unsafe { abi_fn() };
|
||||
if abi_version != 1 {
|
||||
return Err(format!("Unsupported ABI version: {}", abi_version));
|
||||
}
|
||||
|
||||
// Initialize plugin
|
||||
let init_fn: Symbol<unsafe extern "C" fn(*const NyashHostVtable, *mut std::ffi::c_void) -> i32> = unsafe {
|
||||
library.get(b"nyash_plugin_init")
|
||||
.map_err(|e| format!("nyash_plugin_init not found: {}", e))?
|
||||
};
|
||||
|
||||
let result = unsafe { init_fn(&self.host_vtable, std::ptr::null_mut()) };
|
||||
if result != 0 {
|
||||
return Err(format!("Plugin initialization failed: {}", result));
|
||||
}
|
||||
|
||||
// Check if this is a v2 multi-box plugin
|
||||
let get_box_count: Result<Symbol<unsafe extern "C" fn() -> u32>, _> = unsafe {
|
||||
library.get(b"nyash_plugin_get_box_count")
|
||||
};
|
||||
|
||||
let mut box_types = HashMap::new();
|
||||
let mut type_names = HashMap::new();
|
||||
|
||||
if let Ok(get_count_fn) = get_box_count {
|
||||
// V2 plugin - get box information
|
||||
let box_count = unsafe { get_count_fn() };
|
||||
|
||||
let get_info_fn: Symbol<unsafe extern "C" fn(u32) -> *const NyashPluginInfo> = unsafe {
|
||||
library.get(b"nyash_plugin_get_box_info")
|
||||
.map_err(|e| format!("nyash_plugin_get_box_info not found: {}", e))?
|
||||
};
|
||||
|
||||
for i in 0..box_count {
|
||||
let info_ptr = unsafe { get_info_fn(i) };
|
||||
if info_ptr.is_null() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let info = unsafe { &*info_ptr };
|
||||
let box_name = if info.type_name.is_null() {
|
||||
continue;
|
||||
} else {
|
||||
unsafe { CStr::from_ptr(info.type_name).to_string_lossy().to_string() }
|
||||
};
|
||||
|
||||
box_types.insert(box_name.clone(), info.type_id);
|
||||
type_names.insert(info.type_id, box_name.clone());
|
||||
|
||||
// Register box type to library mapping
|
||||
self.box_to_library.write().unwrap().insert(box_name.clone(), lib_name.to_string());
|
||||
|
||||
log::info!("Loaded {} (type_id: {}) from {}", box_name, info.type_id, lib_name);
|
||||
}
|
||||
} else {
|
||||
// V1 plugin - single box type
|
||||
// TODO: Handle legacy plugins
|
||||
return Err(format!("Legacy single-box plugins not yet supported"));
|
||||
}
|
||||
|
||||
let plugin_lib = Arc::new(MultiBoxPluginLibrary {
|
||||
library,
|
||||
box_types,
|
||||
type_names,
|
||||
});
|
||||
|
||||
self.libraries.write().unwrap().insert(lib_name.to_string(), plugin_lib);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
Err(format!("Dynamic library loading disabled. Cannot load plugin: {}", plugin_name))
|
||||
Err(format!("Dynamic library loading disabled. Cannot load plugin: {}", lib_name))
|
||||
}
|
||||
}
|
||||
|
||||
/// プラグインメソッドを呼び出し
|
||||
/// Get library name for a box type
|
||||
pub fn get_library_for_box(&self, box_type: &str) -> Option<String> {
|
||||
self.box_to_library.read().unwrap().get(box_type).cloned()
|
||||
}
|
||||
|
||||
/// Invoke plugin method
|
||||
pub fn invoke_plugin_method(
|
||||
&self,
|
||||
plugin_name: &str,
|
||||
box_type: &str,
|
||||
handle: BidHandle,
|
||||
method_name: &str,
|
||||
args: &[Box<dyn NyashBox>]
|
||||
) -> Result<Box<dyn NyashBox>, String> {
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
{
|
||||
let libraries = self.libraries.read().unwrap();
|
||||
let library = libraries.get(plugin_name)
|
||||
.ok_or_else(|| format!("Plugin not loaded: {}", plugin_name))?;
|
||||
// Find library for this box type
|
||||
let lib_name = self.get_library_for_box(box_type)
|
||||
.ok_or_else(|| format!("No plugin loaded for box type: {}", box_type))?;
|
||||
|
||||
// プラグインメソッド呼び出し
|
||||
self.call_plugin_method(&library.library, handle, method_name, args)
|
||||
let libraries = self.libraries.read().unwrap();
|
||||
let library = libraries.get(&lib_name)
|
||||
.ok_or_else(|| format!("Library not loaded: {}", lib_name))?;
|
||||
|
||||
// Get type_id for this box type
|
||||
let type_id = library.box_types.get(box_type)
|
||||
.ok_or_else(|| format!("Box type {} not found in library {}", box_type, lib_name))?;
|
||||
|
||||
// Call plugin method
|
||||
self.call_plugin_method(&library.library, *type_id, handle.instance_id, method_name, args)
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "dynamic-file"))]
|
||||
{
|
||||
Err(format!("Dynamic library loading disabled. Cannot invoke: {}.{}", plugin_name, method_name))
|
||||
Err(format!("Dynamic library loading disabled"))
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,70 +255,53 @@ impl PluginLoader {
|
||||
fn call_plugin_method(
|
||||
&self,
|
||||
library: &Library,
|
||||
handle: BidHandle,
|
||||
type_id: u32,
|
||||
instance_id: u32,
|
||||
method_name: &str,
|
||||
args: &[Box<dyn NyashBox>]
|
||||
) -> Result<Box<dyn NyashBox>, String> {
|
||||
// BID-1 TLV引数エンコード
|
||||
let mut encoder = TlvEncoder::new();
|
||||
for arg in args {
|
||||
// TODO: NyashBox to TLV encoding
|
||||
encoder.encode_string(&arg.to_string_box().value)
|
||||
.map_err(|e| format!("Failed to encode argument: {:?}", e))?;
|
||||
}
|
||||
let args_data = encoder.finish();
|
||||
|
||||
// プラグイン関数呼び出し
|
||||
let function_name = format!("nyash_plugin_invoke");
|
||||
// Get invoke function
|
||||
let invoke_fn: Symbol<unsafe extern "C" fn(
|
||||
u32, u32, u32, // type_id, method_id, instance_id
|
||||
*const u8, usize, // args, args_len
|
||||
*mut u8, *mut usize // result, result_len
|
||||
) -> i32> = unsafe {
|
||||
library.get(function_name.as_bytes())
|
||||
.map_err(|e| format!("Function {} not found: {}", function_name, e))?
|
||||
library.get(b"nyash_plugin_invoke")
|
||||
.map_err(|e| format!("nyash_plugin_invoke not found: {}", e))?
|
||||
};
|
||||
|
||||
// メソッドIDを決定（簡易版）
|
||||
// Encode arguments
|
||||
let mut encoder = TlvEncoder::new();
|
||||
for arg in args {
|
||||
encoder.encode_string(&arg.to_string_box().value)
|
||||
.map_err(|e| format!("Failed to encode argument: {:?}", e))?;
|
||||
}
|
||||
let args_data = encoder.finish();
|
||||
|
||||
// Map method name to ID (simplified for now)
|
||||
let method_id = match method_name {
|
||||
"birth" => 0,
|
||||
"open" => 1,
|
||||
"read" => 2,
|
||||
"write" => 3,
|
||||
"close" => 4,
|
||||
"fini" => u32::MAX,
|
||||
_ => return Err(format!("Unknown method: {}", method_name)),
|
||||
};
|
||||
|
||||
// 結果バッファ準備
|
||||
let mut result_size = 0usize;
|
||||
// Call plugin
|
||||
let mut result_buffer = vec![0u8; 4096];
|
||||
let mut result_len = result_buffer.len();
|
||||
|
||||
// 1回目: サイズ取得
|
||||
let status = unsafe {
|
||||
invoke_fn(
|
||||
handle.type_id,
|
||||
type_id,
|
||||
method_id,
|
||||
handle.instance_id,
|
||||
args_data.as_ptr(),
|
||||
args_data.len(),
|
||||
std::ptr::null_mut(),
|
||||
&mut result_size as *mut usize
|
||||
)
|
||||
};
|
||||
|
||||
if status != 0 {
|
||||
return Err(format!("Plugin method failed: status {}", status));
|
||||
}
|
||||
|
||||
// 2回目: 結果取得
|
||||
let mut result_buffer = vec![0u8; result_size];
|
||||
let status = unsafe {
|
||||
invoke_fn(
|
||||
handle.type_id,
|
||||
method_id,
|
||||
handle.instance_id,
|
||||
instance_id,
|
||||
args_data.as_ptr(),
|
||||
args_data.len(),
|
||||
result_buffer.as_mut_ptr(),
|
||||
&mut result_size as *mut usize
|
||||
&mut result_len
|
||||
)
|
||||
};
|
||||
|
||||
@ -155,41 +309,18 @@ impl PluginLoader {
|
||||
return Err(format!("Plugin method failed: status {}", status));
|
||||
}
|
||||
|
||||
// BID-1 TLV結果デコード
|
||||
let decoder = TlvDecoder::new(&result_buffer)
|
||||
.map_err(|e| format!("Failed to decode result: {:?}", e))?;
|
||||
// TODO: TLV to NyashBox decoding
|
||||
Ok(Box::new(crate::box_trait::StringBox::new("Plugin result")))
|
||||
// Decode result (simplified)
|
||||
Ok(Box::new(StringBox::new("Plugin result")))
|
||||
}
|
||||
}
|
||||
|
||||
/// グローバルプラグインローダー
|
||||
/// Global multi-box plugin loader
|
||||
use once_cell::sync::Lazy;
|
||||
|
||||
static GLOBAL_LOADER: Lazy<Arc<PluginLoader>> =
|
||||
Lazy::new(|| Arc::new(PluginLoader::new()));
|
||||
static GLOBAL_LOADER_V2: Lazy<Arc<PluginLoaderV2>> =
|
||||
Lazy::new(|| Arc::new(PluginLoaderV2::new()));
|
||||
|
||||
/// グローバルプラグインローダーを取得
|
||||
pub fn get_global_loader() -> Arc<PluginLoader> {
|
||||
GLOBAL_LOADER.clone()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_plugin_loader_creation() {
|
||||
let loader = PluginLoader::new();
|
||||
// 基本的な作成テスト
|
||||
assert!(loader.libraries.read().unwrap().is_empty());
|
||||
}
|
||||
|
||||
#[cfg(feature = "dynamic-file")]
|
||||
#[test]
|
||||
fn test_plugin_loading_error() {
|
||||
let loader = PluginLoader::new();
|
||||
let result = loader.load_plugin("test", "/nonexistent/path.so");
|
||||
assert!(result.is_err());
|
||||
}
|
||||
/// Get global multi-box plugin loader
|
||||
pub fn get_global_loader_v2() -> Arc<PluginLoaderV2> {
|
||||
GLOBAL_LOADER_V2.clone()
|
||||
}
|
||||
Reference in New Issue
Block a user