tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Correct HttpRequestBox method_id mapping in nyash.toml

Browse Source 
Fixed the method ID order in HttpRequestBox configuration to match plugin implementation:
- path: method_id 1 (was incorrectly 2)
- readBody: method_id 2 (was incorrectly 3)
- respond: method_id 3 (was incorrectly 1)

This resolves the 45-day debugging issue where req.respond(resp) was calling
the wrong plugin method, causing HTTP responses to have empty bodies.

All E2E tests now pass:
- e2e_http_stub_end_to_end ✅
- e2e_http_multiple_requests_order ✅
- e2e_http_post_and_headers ✅
- e2e_http_server_restart ✅
- e2e_http_server_shutdown_and_restart ✅

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Moe Charm
2025-08-22 12:09:06 +09:00
parent 0915815340
commit 080458d4d4
24 changed files with 694 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/vm.rs
View File

@ -535,7 +535,7 @@ impl VM {
// Prepare VMValue args: me + evaluated arguments
let mut vm_args: Vec<VMValue> = Vec::new();
vm_args.push(VMValue::from_nyash_box(box_nyash.clone_box()));
vm_args.push(VMValue::from_nyash_box(box_nyash.clone_or_share()));
for arg_id in args {
let arg_vm_value = self.get_value(*arg_id)?;
vm_args.push(arg_vm_value);
@ -589,7 +589,7 @@ impl VM {
let func_name = format!("{}.{}{}", class_name, method, format!("/{}", args.len()));
// Prepare VMValue args: me + evaluated arguments (use original VM args for value-level fidelity)
let mut vm_args: Vec<VMValue> = Vec::new();
vm_args.push(VMValue::from_nyash_box(box_nyash.clone_box()));
vm_args.push(VMValue::from_nyash_box(box_nyash.clone_or_share()));
for arg_id in args {
let arg_vm_value = self.get_value(*arg_id)?;
vm_args.push(arg_vm_value);

10
src/box_trait.rs
View File

@ -109,6 +109,14 @@ pub trait NyashBox: BoxCore + Debug {
/// Share this box (state-preserving reference sharing)
fn share_box(&self) -> Box<dyn NyashBox>;
/// Identity hint: boxes that wrap external/stateful handles should override to return true.
fn is_identity(&self) -> bool { false }
/// Helper: pick share or clone based on identity semantics.
fn clone_or_share(&self) -> Box<dyn NyashBox> {
if self.is_identity() { self.share_box() } else { self.clone_box() }
}
/// Arc参照を返す新しいcloneメソッド（参照共有）
fn clone_arc(&self) -> SharedNyashBox {
Arc::from(self.clone_box())
@ -941,4 +949,4 @@ mod tests {
assert_eq!(v.type_name(), "VoidBox");
assert_eq!(v.to_string_box().value, "void");
}
}
}

18
src/boxes/result/mod.rs
View File

@ -39,14 +39,17 @@ impl NyashResultBox {
impl NyashBox for NyashResultBox {
fn clone_box(&self) -> Box<dyn NyashBox> {
match self {
NyashResultBox::Ok(val) => Box::new(NyashResultBox::Ok(val.clone_box())),
NyashResultBox::Err(err) => Box::new(NyashResultBox::Err(err.clone_box())),
NyashResultBox::Ok(val) => Box::new(NyashResultBox::Ok(val.clone_or_share())),
NyashResultBox::Err(err) => Box::new(NyashResultBox::Err(err.clone_or_share())),
}
}
/// 仮実装: clone_boxと同じ（後で修正）
fn share_box(&self) -> Box<dyn NyashBox> {
self.clone_box()
match self {
NyashResultBox::Ok(val) => Box::new(NyashResultBox::Ok(val.share_box())),
NyashResultBox::Err(err) => Box::new(NyashResultBox::Err(err.share_box())),
}
}
fn to_string_box(&self) -> StringBox {
@ -126,7 +129,14 @@ impl ResultBox {
/// getValue()の実装 - Ok値を取得
pub fn get_value(&self) -> Box<dyn NyashBox> {
match self {
NyashResultBox::Ok(val) => val.clone_box(),
NyashResultBox::Ok(val) => {
// Preserve identity for plugin-backed boxes
if val.as_any().downcast_ref::<crate::runtime::plugin_loader_v2::PluginBoxV2>().is_some() {
val.share_box()
} else {
val.clone_box()
}
}
NyashResultBox::Err(_) => Box::new(StringBox::new("Error: Result is Err")),
}
}

6
src/environment.rs
View File

@ -81,7 +81,7 @@ impl Environment {
pub fn get(&self, name: &str) -> Result<Box<dyn NyashBox>, EnvironmentError> {
// 現在のスコープから検索
if let Some(value) = self.bindings.lock().unwrap().get(name) {
return Ok(value.clone_box());
return Ok(value.clone_or_share());
}
// 親スコープから検索
@ -107,7 +107,7 @@ impl Environment {
// 親スコープで再帰的に検索・設定
if let Some(parent) = &self.parent {
match parent.lock().unwrap().set(&name, value.clone_box()) {
match parent.lock().unwrap().set(&name, value.clone_or_share()) {
Ok(()) => return Ok(()),
Err(EnvironmentError::UndefinedVariable { .. }) => {
// 親にもない場合は現在のスコープに新規定義
@ -356,4 +356,4 @@ mod tests {
_ => panic!("Expected UndefinedVariable error"),
}
}
}
}

2
src/interpreter/core.rs
View File

@ -882,7 +882,7 @@ impl NyashInterpreter {
};
// 🌍 this変数をバインドしてstatic初期化実行（me構文のため）
self.declare_local_variable("me", (*static_instance).clone_box());
self.declare_local_variable("me", (*static_instance).clone_or_share());
for stmt in init_statements {
self.execute_statement(stmt)?;

10
src/interpreter/delegation.rs
View File

@ -126,11 +126,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// 'me'を現在のインスタンスに設定（重要：現在のインスタンスを維持）
self.declare_local_variable("me", current_instance_val.clone_box());
self.declare_local_variable("me", current_instance_val.clone_or_share());
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// 親メソッドの本体を実行
@ -199,11 +199,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// 'me'を現在のインスタンスに設定
self.declare_local_variable("me", current_instance.clone_box());
self.declare_local_variable("me", current_instance.clone_or_share());
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// 親コンストラクタの本体を実行
@ -356,4 +356,4 @@ impl NyashInterpreter {
}
}
}
}
}

4
src/interpreter/expressions/access.rs
View File

@ -89,7 +89,7 @@ impl NyashInterpreter {
// Convert back to Box<dyn NyashBox> for now
if let Ok(box_value) = weak_value.to_box() {
if let Ok(inner_box) = box_value.try_lock() {
return Ok(Arc::from(inner_box.clone_box()));
return Ok(Arc::from(inner_box.clone_or_share()));
}
}
}
@ -149,7 +149,7 @@ impl NyashInterpreter {
})?;
// Convert Arc to Box for compatibility
Ok((*shared_field).clone_box())
Ok((*shared_field).clone_or_share())
}

18
src/interpreter/expressions/calls.rs
View File

@ -65,7 +65,7 @@ impl NyashInterpreter {
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// static関数の本体を実行
@ -194,7 +194,7 @@ impl NyashInterpreter {
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// メソッドの本体を実行
@ -542,7 +542,7 @@ impl NyashInterpreter {
self.local_vars.clear();
// thisをlocal変数として設定
self.declare_local_variable("me", obj_value.clone_box());
self.declare_local_variable("me", obj_value.clone_or_share());
// fini()メソッドの本体を実行
let mut _result = Box::new(VoidBox::new()) as Box<dyn NyashBox>;
@ -600,11 +600,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// thisをlocal変数として設定
self.declare_local_variable("me", obj_value.clone_box());
self.declare_local_variable("me", obj_value.clone_or_share());
// パラメータをlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// メソッド本体を実行
@ -880,11 +880,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// 'me'を現在のインスタンスに設定（重要：現在のインスタンスを維持）
self.declare_local_variable("me", current_instance_val.clone_box());
self.declare_local_variable("me", current_instance_val.clone_or_share());
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// 親メソッドの本体を実行
@ -956,11 +956,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// 'me'を現在のインスタンスに設定
self.declare_local_variable("me", current_instance.clone_box());
self.declare_local_variable("me", current_instance.clone_or_share());
// 引数をlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// 親コンストラクタの本体を実行

12
src/interpreter/expressions/mod.rs
View File

@ -55,7 +55,7 @@ impl NyashInterpreter {
ASTNode::FieldAccess { object, field, .. } => {
let shared_result = self.execute_field_access(object, field)?;
Ok((*shared_result).clone_box()) // Convert Arc to Box for external interface
Ok((*shared_result).clone_or_share())
}
ASTNode::New { class, arguments, type_arguments, .. } => {
@ -68,7 +68,7 @@ impl NyashInterpreter {
.map_err(|_| RuntimeError::InvalidOperation {
message: "'this' is only available inside methods".to_string(),
})?;
Ok((*shared_this).clone_box()) // Convert for external interface
Ok((*shared_this).clone_or_share())
}
ASTNode::Me { .. } => {
@ -79,7 +79,7 @@ impl NyashInterpreter {
message: "'me' is only available inside methods".to_string(),
})?;
Ok((*shared_me).clone_box()) // Convert for external interface
Ok((*shared_me).clone_or_share())
}
ASTNode::ThisField { field, .. } => {
@ -94,7 +94,7 @@ impl NyashInterpreter {
.ok_or_else(|| RuntimeError::InvalidOperation {
message: format!("Field '{}' not found on this", field)
})?;
Ok((*shared_field).clone_box()) // Convert for external interface
Ok((*shared_field).clone_or_share())
} else {
Err(RuntimeError::TypeError {
message: "'this' is not an instance".to_string(),
@ -114,7 +114,7 @@ impl NyashInterpreter {
.ok_or_else(|| RuntimeError::InvalidOperation {
message: format!("Field '{}' not found on me", field)
})?;
Ok((*shared_field).clone_box()) // Convert for external interface
Ok((*shared_field).clone_or_share())
} else {
Err(RuntimeError::TypeError {
message: "'this' is not an instance".to_string(),
@ -202,4 +202,4 @@ impl NyashInterpreter {
// }
}
}

4
src/interpreter/field_access.rs
View File

@ -48,7 +48,7 @@ impl NyashInterpreter {
message: format!("Field '{}' not found in static box '{}'", field, box_name),
})?;
Ok((*field_value).clone_box())
Ok((*field_value).clone_or_share())
} else {
Err(RuntimeError::InvalidOperation {
message: format!("Static box '{}' not found", box_name),
@ -125,4 +125,4 @@ impl NyashInterpreter {
let static_boxes = self.shared.static_boxes.read().unwrap();
static_boxes.contains_key(name)
}
}
}

4
src/interpreter/functions.rs
View File

@ -51,7 +51,7 @@ impl NyashInterpreter {
// パラメータをlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// 関数本体を実行
@ -94,4 +94,4 @@ impl NyashInterpreter {
eprintln!("Warning: Failed to register global function: {}", err);
});
}
}
}

11
src/interpreter/methods/io_methods.rs
View File

@ -8,7 +8,8 @@
*/
use super::super::*;
use crate::box_trait::{ResultBox, StringBox, NyashBox};
use crate::boxes::ResultBox;
use crate::box_trait::{StringBox, NyashBox};
use crate::boxes::FileBox;
// use crate::bid::plugin_box::PluginFileBox; // legacy - FileBox専用
@ -77,7 +78,7 @@ impl NyashInterpreter {
pub(in crate::interpreter) fn execute_result_method(&mut self, result_box: &ResultBox, method: &str, arguments: &[ASTNode])
-> Result<Box<dyn NyashBox>, RuntimeError> {
match method {
"isOk" => {
"isOk" | "is_ok" => {
if !arguments.is_empty() {
return Err(RuntimeError::InvalidOperation {
message: format!("isOk() expects 0 arguments, got {}", arguments.len()),
@ -85,7 +86,7 @@ impl NyashInterpreter {
}
Ok(result_box.is_ok())
}
"getValue" => {
"getValue" | "get_value" => {
if !arguments.is_empty() {
return Err(RuntimeError::InvalidOperation {
message: format!("getValue() expects 0 arguments, got {}", arguments.len()),
@ -93,7 +94,7 @@ impl NyashInterpreter {
}
Ok(result_box.get_value())
}
"getError" => {
"getError" | "get_error" => {
if !arguments.is_empty() {
return Err(RuntimeError::InvalidOperation {
message: format!("getError() expects 0 arguments, got {}", arguments.len()),
@ -343,4 +344,4 @@ impl NyashInterpreter {
self.execute_plugin_method_generic(plugin_file_box, method, arguments)
}
*/
}
}

4
src/interpreter/objects.rs
View File

@ -941,11 +941,11 @@ impl NyashInterpreter {
// パラメータをlocal変数として設定
for (param, value) in params.iter().zip(arg_values.iter()) {
self.declare_local_variable(param, value.clone_box());
self.declare_local_variable(param, value.clone_or_share());
}
// this（me）をlocal変数として設定
self.declare_local_variable("me", instance.clone_box());
self.declare_local_variable("me", instance.clone_or_share());
// コンストラクタコンテキストを設定
let old_context = self.current_constructor_context.clone();

6
src/interpreter/special_methods.rs
View File

@ -183,11 +183,11 @@ impl NyashInterpreter {
self.local_vars.clear();
// meをlocal変数として設定（インスタンス自体）
self.declare_local_variable("me", instance.clone_box());
self.declare_local_variable("me", instance.clone_or_share());
// パラメータをlocal変数として設定
for (param, arg) in params.iter().zip(args.iter()) {
self.declare_local_variable(param, arg.clone_box());
self.declare_local_variable(param, arg.clone_or_share());
}
// メソッド本体を実行
@ -218,4 +218,4 @@ impl NyashInterpreter {
})
}
}
}
}

2
src/interpreter/statements.rs
View File

@ -158,7 +158,7 @@ impl NyashInterpreter {
ASTNode::GlobalVar { name, value, .. } => {
let val = self.execute_expression(value)?;
// 🌍 革命的グローバル変数：GlobalBoxのフィールドとして設定
self.set_variable(name, val.clone_box())?;
self.set_variable(name, val.clone_or_share())?;
Ok(Box::new(VoidBox::new()))
}

26
src/runtime/plugin_loader_v2.rs
View File

@ -121,6 +121,7 @@ mod enabled {
}
impl NyashBox for PluginBoxV2 {
fn is_identity(&self) -> bool { true }
fn type_name(&self) -> &'static str {
// Return the actual box type name for proper method dispatch
match self.box_type.as_str() {
@ -131,12 +132,11 @@ mod enabled {
fn clone_box(&self) -> Box<dyn NyashBox> {
eprintln!("🔍 DEBUG: PluginBoxV2::clone_box called for {} (id={})", self.box_type, self.inner.instance_id);
// Clone means creating a new instance by calling birth()
// Clone means creating a new instance by calling birth() on the plugin
let mut output_buffer = vec![0u8; 1024];
let mut output_len = output_buffer.len();
let tlv_args = vec![1u8, 0, 0, 0]; // version=1, argc=0
let tlv_args = [1u8, 0, 0, 0]; // version=1, argc=0
let result = unsafe {
(self.inner.invoke_fn)(
self.inner.type_id,
@ -148,17 +148,12 @@ mod enabled {
&mut output_len,
)
};
if result == 0 && output_len >= 4 {
// Extract new instance_id from output
let new_instance_id = u32::from_le_bytes([
output_buffer[0], output_buffer[1],
output_buffer[2], output_buffer[3]
output_buffer[0], output_buffer[1], output_buffer[2], output_buffer[3]
]);
eprintln!("🎉 clone_box success: created new {} instance_id={}", self.box_type, new_instance_id);
// Return new PluginBoxV2 with new instance_id (separate inner handle)
Box::new(PluginBoxV2 {
box_type: self.box_type.clone(),
inner: std::sync::Arc::new(PluginHandleInner {
@ -171,7 +166,6 @@ mod enabled {
})
} else {
eprintln!("❌ clone_box failed: birth() returned error code {}", result);
// Fallback: return error message as StringBox
Box::new(StringBox::new(format!("Clone failed for {}", self.box_type)))
}
}
@ -485,6 +479,7 @@ impl PluginBoxV2 {
}
buf
};
eprintln!("[VM→Plugin] call {}.{} recv_id={} returns_result={}", box_type, method_name, instance_id, returns_result);
let mut out = vec![0u8; 1024];
let mut out_len: usize = out.len();
let rc = unsafe {
@ -536,6 +531,7 @@ impl PluginBoxV2 {
let mut i = [0u8;4]; i.copy_from_slice(&payload[4..8]);
let r_type = u32::from_le_bytes(t);
let r_inst = u32::from_le_bytes(i);
eprintln!("[Plugin→VM] return handle type_id={} inst={} (returns_result={})", r_type, r_inst, returns_result);
// Map type_id -> (lib_name, box_name)
if let Some((ret_lib, ret_box)) = self.find_box_by_type_id(config, &toml_value, r_type) {
// Get plugin for ret_lib
@ -568,14 +564,17 @@ impl PluginBoxV2 {
2 if size == 4 => { // I32
let mut b = [0u8;4]; b.copy_from_slice(payload);
let val: Box<dyn NyashBox> = Box::new(IntegerBox::new(i32::from_le_bytes(b) as i64));
eprintln!("[Plugin→VM] return i32 value={} (returns_result={})", i32::from_le_bytes(b), returns_result);
if returns_result { Some(Box::new(crate::boxes::result::NyashResultBox::new_ok(val)) as Box<dyn NyashBox>) } else { Some(val) }
}
6 | 7 => { // String/Bytes
let s = String::from_utf8_lossy(payload).to_string();
let val: Box<dyn NyashBox> = Box::new(StringBox::new(s));
eprintln!("[Plugin→VM] return str/bytes len={} (returns_result={})", size, returns_result);
if returns_result { Some(Box::new(crate::boxes::result::NyashResultBox::new_ok(val)) as Box<dyn NyashBox>) } else { Some(val) }
}
9 => {
eprintln!("[Plugin→VM] return void (returns_result={})", returns_result);
if returns_result { Some(Box::new(crate::boxes::result::NyashResultBox::new_ok(Box::new(crate::box_trait::VoidBox::new()))) as Box<dyn NyashBox>) } else { None }
},
_ => None,
@ -623,10 +622,13 @@ impl PluginBoxV2 {
// Call init if available
if let Some(init) = init_fn {
let result = unsafe { init() };
eprintln!("[PluginLoaderV2] nyash_plugin_init rc={} for {}", result, lib_name);
if result != 0 {
eprintln!("Plugin init failed with code: {}", result);
return Err(BidError::PluginError);
}
} else {
eprintln!("[PluginLoaderV2] nyash_plugin_init not found for {} (optional)", lib_name);
}
// Store plugin with Arc-wrapped library