372b7a2772
This commit represents a major refactoring of our Rhai scripting system, transforming it from a factory-based approach to a more robust system-based architecture with improved hot reloading capabilities. Key Changes: - Renamed package from rhai_factory to rhai_system to better reflect its purpose - Renamed system_factory.rs to factory.rs for consistency and clarity - Implemented support for multiple script files in hot reloading - Added cross-script function calls, allowing functions in one script to call functions in another - Improved file watching to monitor all script files for changes - Enhanced error handling for script compilation failures - Simplified the API with a cleaner create_hot_reloadable_system function - Removed unused modules (error.rs, factory.rs, hot_reload_old.rs, module_cache.rs, relative_resolver.rs) - Updated all tests to work with the new architecture The new architecture: - Uses a System struct that holds references to script paths and provides a clean API - Compiles and merges multiple Rhai script files into a single AST - Automatically detects changes to any script file and recompiles them - Maintains thread safety with proper synchronization primitives - Provides better error messages when scripts fail to compile This refactoring aligns with our BasePathModuleResolver approach for module imports, making the resolution process more predictable and consistent. The hot reload example has been updated to demonstrate the new capabilities, showing how to: 1. Load and execute multiple script files 2. Watch for changes to these files 3. Automatically reload scripts when they change 4. Call functions across different script files All tests are passing, and the example demonstrates the improved functionality.
126 lines
3.9 KiB
Rust
126 lines
3.9 KiB
Rust
use std::fs;
|
|
use std::sync::{Arc, RwLock};
|
|
|
|
use rhai::Engine;
|
|
use rhai_system::{System, hot_reload_callback};
|
|
|
|
#[test]
|
|
fn test_hot_reload_callback() {
|
|
// Create temporary script files
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
let script_path = temp_dir.path().join("test_script.rhai");
|
|
|
|
// Write initial script content
|
|
let initial_script = r#"
|
|
fn greet(name) {
|
|
"Hello, " + name + "! This is the original script."
|
|
}
|
|
|
|
fn add(a, b) {
|
|
a + b
|
|
}
|
|
"#;
|
|
fs::write(&script_path, initial_script).unwrap();
|
|
|
|
// Create engine and compile initial script
|
|
let engine = Engine::new();
|
|
let ast = engine.compile_file(script_path.clone()).unwrap();
|
|
let shared_ast = Arc::new(RwLock::new(ast));
|
|
|
|
// Create a system with the initial script
|
|
let script_paths = vec![script_path.clone()];
|
|
let system = System::new(engine, shared_ast, script_paths);
|
|
|
|
// Test initial script functionality
|
|
let result: String = system.call_fn("greet", ("User",)).unwrap();
|
|
assert_eq!(result, "Hello, User! This is the original script.");
|
|
|
|
let add_result: i32 = system.call_fn("add", (40, 2)).unwrap();
|
|
assert_eq!(add_result, 42);
|
|
|
|
// Write modified script content with new functions
|
|
let modified_script = r#"
|
|
fn greet(name) {
|
|
"Hello, " + name + "! This is the MODIFIED script!"
|
|
}
|
|
|
|
fn add(a, b) {
|
|
a + b
|
|
}
|
|
|
|
fn multiply(a, b) {
|
|
a * b
|
|
}
|
|
"#;
|
|
fs::write(&script_path, modified_script).unwrap();
|
|
|
|
// Call the hot reload callback
|
|
hot_reload_callback(&system, script_path.to_str().unwrap()).unwrap();
|
|
|
|
// Test that the script was updated
|
|
let result: String = system.call_fn("greet", ("User",)).unwrap();
|
|
assert_eq!(result, "Hello, User! This is the MODIFIED script!");
|
|
|
|
// Test that the new function is available
|
|
let multiply_result: i32 = system.call_fn("multiply", (6, 7)).unwrap();
|
|
assert_eq!(multiply_result, 42);
|
|
}
|
|
|
|
#[test]
|
|
fn test_hot_reload_callback_with_syntax_error() {
|
|
// Create temporary script files
|
|
let temp_dir = tempfile::tempdir().unwrap();
|
|
let script_path = temp_dir.path().join("test_script.rhai");
|
|
|
|
// Write initial script content
|
|
let initial_script = r#"
|
|
fn greet(name) {
|
|
"Hello, " + name + "! This is the original script."
|
|
}
|
|
|
|
fn add(a, b) {
|
|
a + b
|
|
}
|
|
"#;
|
|
fs::write(&script_path, initial_script).unwrap();
|
|
|
|
// Create engine and compile initial script
|
|
let engine = Engine::new();
|
|
let ast = engine.compile_file(script_path.clone()).unwrap();
|
|
let shared_ast = Arc::new(RwLock::new(ast));
|
|
|
|
// Create a system with the initial script
|
|
let script_paths = vec![script_path.clone()];
|
|
let system = System::new(engine, shared_ast, script_paths);
|
|
|
|
// Test initial script functionality
|
|
let result: String = system.call_fn("greet", ("User",)).unwrap();
|
|
assert_eq!(result, "Hello, User! This is the original script.");
|
|
|
|
// Write modified script content with syntax error
|
|
let modified_script = r#"
|
|
fn greet(name) {
|
|
"Hello, " + name + "! This is the MODIFIED script!"
|
|
}
|
|
|
|
fn add(a, b) {
|
|
a + b
|
|
}
|
|
|
|
fn syntax_error() {
|
|
// Missing closing brace
|
|
if (true) {
|
|
"This will cause a syntax error"
|
|
}
|
|
"#;
|
|
fs::write(&script_path, modified_script).unwrap();
|
|
|
|
// Call the hot reload callback - it should return an error
|
|
let result = hot_reload_callback(&system, script_path.to_str().unwrap());
|
|
assert!(result.is_err());
|
|
|
|
// Test that the original script functionality is still available
|
|
let result: String = system.call_fn("greet", ("User",)).unwrap();
|
|
assert_eq!(result, "Hello, User! This is the original script.");
|
|
}
|