refactor: Major interpreter modularization and P2PBox enhancements

Major Interpreter Refactoring:
- Split core.rs (373 lines removed) into focused modules
- Split expressions/calls.rs (460 lines removed) into cleaner structure
- Added new modules: calls.rs, errors.rs, eval.rs, methods_dispatch.rs, state.rs
- Improved separation of concerns across interpreter components

P2PBox Enhancements:
- Added on_once() for one-time event handlers
- Added off() for handler deregistration
- Implemented handler flags with AtomicBool for thread-safe management
- Added loopback testing cache (last_from, last_intent_name)
- Improved Arc-based state sharing for transport and handlers

Plugin Loader Unification (In Progress):
- Created plugin_loader_unified.rs skeleton
- Created plugin_ffi_common.rs for shared FFI utilities
- Migration plan documented (2400 lines → 1100 lines target)

MIR & VM Improvements:
- Enhanced modularized MIR builder structure
- Added BoxCall dispatch improvements
- Better separation in builder modules

Documentation Updates:
- Added Phase 9.79a unified box dispatch plan
- Created plugin loader migration plan
- Updated CURRENT_TASK.md with latest progress

All tests passing (180 tests) - ready for next phase of refactoring

🤖 Generated with Claude Code

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
2025-08-26 19:13:57 +09:00
parent bec61e38c5
commit 22212aa314
46 changed files with 2383 additions and 1438 deletions

View File

@ -37,9 +37,12 @@
use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase};
use crate::boxes::IntentBox;
use crate::method_box::MethodBox;
use crate::boxes::result::{ResultBox, NyashResultBox};
use crate::transport::{Transport, InProcessTransport};
use std::any::Any;
use std::sync::RwLock;
use std::sync::{RwLock, Arc};
use std::sync::atomic::{AtomicBool, Ordering};
use std::collections::HashMap;
/// P2PBox - P2P通信ード (RwLock pattern)
@ -47,8 +50,12 @@ use std::collections::HashMap;
pub struct P2PBox {
base: BoxBase,
node_id: RwLock<String>,
transport: RwLock<Box<dyn Transport>>,
handlers: RwLock<HashMap<String, Box<dyn NyashBox>>>,
transport: Arc<RwLock<Box<dyn Transport>>>,
handlers: Arc<RwLock<HashMap<String, Box<dyn NyashBox>>>>,
handler_flags: Arc<RwLock<HashMap<String, Vec<Arc<AtomicBool>>>>>,
// Minimal receive cache for loopback smoke tests
last_from: Arc<RwLock<Option<String>>>,
last_intent_name: Arc<RwLock<Option<String>>>,
}
impl Clone for P2PBox {
@ -62,12 +69,17 @@ impl Clone for P2PBox {
TransportKind::InProcess => Box::new(InProcessTransport::new(node_id_val.clone())),
};
let handlers_val = HashMap::new(); // Start fresh for cloned instance
let last_from_val = self.last_from.read().unwrap().clone();
let last_intent_val = self.last_intent_name.read().unwrap().clone();
Self {
base: BoxBase::new(), // New unique ID for clone
node_id: RwLock::new(node_id_val),
transport: RwLock::new(new_transport),
handlers: RwLock::new(handlers_val),
transport: Arc::new(RwLock::new(new_transport)),
handlers: Arc::new(RwLock::new(handlers_val)),
handler_flags: Arc::new(RwLock::new(HashMap::new())),
last_from: Arc::new(RwLock::new(last_from_val)),
last_intent_name: Arc::new(RwLock::new(last_intent_val)),
}
}
}
@ -91,16 +103,30 @@ impl std::str::FromStr for TransportKind {
impl P2PBox {
/// 新しいP2PBoxを作成
pub fn new(node_id: String, transport_kind: TransportKind) -> Self {
let transport: Box<dyn Transport> = match transport_kind {
TransportKind::InProcess => Box::new(InProcessTransport::new(node_id.clone())),
// Create transport and attach receive callback before boxing
let (transport_boxed, attach_cb): (Box<dyn Transport>, bool) = match transport_kind {
TransportKind::InProcess => {
let mut t = InProcessTransport::new(node_id.clone());
// We'll attach callback below after P2PBox struct is created
(Box::new(t), true)
}
};
P2PBox {
let p2p = P2PBox {
base: BoxBase::new(),
node_id: RwLock::new(node_id),
transport: RwLock::new(transport),
handlers: RwLock::new(HashMap::new()),
}
transport: Arc::new(RwLock::new(transport_boxed)),
handlers: Arc::new(RwLock::new(HashMap::new())),
handler_flags: Arc::new(RwLock::new(HashMap::new())),
last_from: Arc::new(RwLock::new(None)),
last_intent_name: Arc::new(RwLock::new(None)),
};
// Note: InProcess callback registration is postponed until a unified
// Transport subscription API is provided. For now, loopback tracing is
// handled in send() when sending to self.
p2p
}
/// ードIDを取得
@ -117,23 +143,83 @@ impl P2PBox {
if let Some(intent_box) = intent.as_any().downcast_ref::<IntentBox>() {
let transport = self.transport.read().unwrap();
match transport.send(&to_str, intent_box.clone(), Default::default()) {
Ok(()) => Box::new(BoolBox::new(true)),
Err(_) => Box::new(BoolBox::new(false)),
Ok(()) => {
// Minimal loopback trace without relying on transport callbacks
let self_id = self.node_id.read().unwrap().clone();
if to_str == self_id {
if let Ok(mut lf) = self.last_from.write() { *lf = Some(self_id.clone()); }
if let Ok(mut li) = self.last_intent_name.write() { *li = Some(intent_box.get_name().to_string_box().value); }
}
Box::new(ResultBox::new_ok(Box::new(BoolBox::new(true))))
},
Err(e) => Box::new(ResultBox::new_err(Box::new(StringBox::new(format!("{:?}", e))))),
}
} else {
Box::new(BoolBox::new(false))
Box::new(ResultBox::new_err(Box::new(StringBox::new("Second argument must be IntentBox"))))
}
}
/// イベントハンドラーを登録
fn register_handler_internal(&self, intent_str: &str, handler: &Box<dyn NyashBox>, once: bool) -> Box<dyn NyashBox> {
// 保存
{
let mut handlers = self.handlers.write().unwrap();
handlers.insert(intent_str.to_string(), handler.clone_box());
}
// フラグ登録
let flag = Arc::new(AtomicBool::new(true));
{
let mut flags = self.handler_flags.write().unwrap();
flags.entry(intent_str.to_string()).or_default().push(flag.clone());
}
// 可能ならTransportにハンドラ登録InProcessなど
if let Ok(mut t) = self.transport.write() {
if let Some(method_box) = handler.as_any().downcast_ref::<MethodBox>() {
let method_clone = method_box.clone();
let intent_name = intent_str.to_string();
t.register_intent_handler(&intent_name, Box::new(move |env| {
// flagがtrueのときのみ実行
if flag.load(Ordering::SeqCst) {
let _ = method_clone.invoke(vec![
Box::new(env.intent.clone()),
Box::new(StringBox::new(env.from.clone())),
]);
if once {
flag.store(false, Ordering::SeqCst);
}
}
}));
}
}
Box::new(ResultBox::new_ok(Box::new(BoolBox::new(true))))
}
/// イベントハンドラーを登録
pub fn on(&self, intent_name: Box<dyn NyashBox>, handler: Box<dyn NyashBox>) -> Box<dyn NyashBox> {
let intent_str = intent_name.to_string_box().value;
// For now, we'll store a simplified handler representation
// In a full implementation, this would need proper IntentHandler integration
let mut handlers = self.handlers.write().unwrap();
handlers.insert(intent_str, handler);
Box::new(BoolBox::new(true))
self.register_handler_internal(&intent_str, &handler, false)
}
/// 一度だけのハンドラー登録
pub fn on_once(&self, intent_name: Box<dyn NyashBox>, handler: Box<dyn NyashBox>) -> Box<dyn NyashBox> {
let intent_str = intent_name.to_string_box().value;
self.register_handler_internal(&intent_str, &handler, true)
}
/// ハンドラー解除intentの全ハンドラー無効化
pub fn off(&self, intent_name: Box<dyn NyashBox>) -> Box<dyn NyashBox> {
let intent_str = intent_name.to_string_box().value;
if let Ok(mut flags) = self.handler_flags.write() {
if let Some(v) = flags.get_mut(&intent_str) {
for f in v.iter() { f.store(false, Ordering::SeqCst); }
v.clear();
}
}
// 登録ハンドラ保存も削除
let _ = self.handlers.write().unwrap().remove(&intent_str);
Box::new(ResultBox::new_ok(Box::new(BoolBox::new(true))))
}
/// ノードが到達可能かチェック
pub fn is_reachable(&self, node_id: Box<dyn NyashBox>) -> Box<dyn NyashBox> {
@ -147,6 +233,37 @@ impl P2PBox {
let transport = self.transport.read().unwrap();
Box::new(StringBox::new(transport.transport_type().to_string()))
}
/// デバッグ: 既知ード一覧InProcessのみ対応
pub fn debug_nodes(&self) -> Box<dyn NyashBox> {
let transport = self.transport.read().unwrap();
if let Some(list) = transport.debug_list_nodes() {
Box::new(StringBox::new(list.join(",")))
} else {
Box::new(StringBox::new("<unsupported>"))
}
}
pub fn debug_bus_id(&self) -> Box<dyn NyashBox> {
let transport = self.transport.read().unwrap();
if let Some(id) = transport.debug_bus_id() {
Box::new(StringBox::new(id))
} else {
Box::new(StringBox::new("<unsupported>"))
}
}
/// 最後に受信したfromを取得ループバック検証用
pub fn get_last_from(&self) -> Box<dyn NyashBox> {
let v = self.last_from.read().unwrap().clone().unwrap_or_default();
Box::new(StringBox::new(v))
}
/// 最後に受信したIntent名を取得ループバック検証用
pub fn get_last_intent_name(&self) -> Box<dyn NyashBox> {
let v = self.last_intent_name.read().unwrap().clone().unwrap_or_default();
Box::new(StringBox::new(v))
}
}
@ -156,9 +273,18 @@ impl NyashBox for P2PBox {
Box::new(self.clone())
}
/// 仮実装: clone_boxと同じ後で修正
fn share_box(&self) -> Box<dyn NyashBox> {
self.clone_box()
// Share underlying transport and state via Arc clones
let node_id_val = self.node_id.read().unwrap().clone();
Box::new(P2PBox {
base: BoxBase::new(),
node_id: RwLock::new(node_id_val),
transport: Arc::clone(&self.transport),
handlers: Arc::clone(&self.handlers),
handler_flags: Arc::clone(&self.handler_flags),
last_from: Arc::clone(&self.last_from),
last_intent_name: Arc::clone(&self.last_intent_name),
})
}
fn to_string_box(&self) -> StringBox {
@ -209,3 +335,23 @@ impl std::fmt::Display for P2PBox {
self.fmt_box(f)
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn self_ping_sets_last_fields() {
let p = P2PBox::new("alice".to_string(), TransportKind::InProcess);
let intent = IntentBox::new("ping".to_string(), serde_json::json!({}));
let res = p.send(Box::new(StringBox::new("alice".to_string())), Box::new(intent));
// Ensure Ok
if let Some(r) = res.as_any().downcast_ref::<ResultBox>() {
assert!(matches!(r, ResultBox::Ok(_)));
} else {
panic!("send did not return ResultBox");
}
assert_eq!(p.get_last_from().to_string_box().value, "alice".to_string());
assert_eq!(p.get_last_intent_name().to_string_box().value, "ping".to_string());
}
}