Skip to content

feat(node): complete Node 24 stdlib M1 filesystem and CJS loader #1728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NathanFlurry wants to merge 1 commit into from
Closed

feat(node): complete Node 24 stdlib M1 filesystem and CJS loader #1728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion crates/bridge/bridge-contract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"returnType": "unknown",
"names": [
"_fsReadFile",
"_fsReadFileRaw",
"_fsWriteFile",
"_fsReadFileBinary",
"_fsWriteFileBinary",
Expand All @@ -143,11 +144,17 @@
"fs.closeSync",
"fs.readSync",
"_fsReadRaw",
"_fsReadIntoRaw",
"fs.writeSync",
"_fsWriteRaw",
"_fsWritevRaw",
"fs.fstatSync",
"fs.futimesSync"
"fs.futimesSync",
"fs.fchmodSync",
"fs.fchownSync",
"fs.ftruncateSync",
"fs.fsyncSync",
"fs.fdatasyncSync"
]
},
{
Expand Down Expand Up @@ -217,6 +224,7 @@
"process.memoryUsage",
"process.resourceUsage",
"process.versions",
"_compileFunctionForCJSLoader",
"_vmCreateContext",
"_vmRunInContext",
"_vmRunInThisContext",
Expand Down Expand Up @@ -614,6 +622,10 @@
"method": "fs.readFileSync",
"translateArgs": false
},
"_fsReadFileRaw": {
"method": "fs.readFileSync",
"translateArgs": false
},
"_fsReadFileAsync": {
"method": "fs.promises.readFile",
"translateArgs": false
Expand Down Expand Up @@ -1062,6 +1074,26 @@
"method": "fs.fstatSync",
"translateArgs": false
},
"fs.fchmodSync": {
"method": "fs.fchmodSync",
"translateArgs": false
},
"fs.fchownSync": {
"method": "fs.fchownSync",
"translateArgs": false
},
"fs.ftruncateSync": {
"method": "fs.ftruncateSync",
"translateArgs": false
},
"fs.fsyncSync": {
"method": "fs.fsyncSync",
"translateArgs": false
},
"fs.fdatasyncSync": {
"method": "fs.fdatasyncSync",
"translateArgs": false
},
"fs.futimesSync": {
"method": "fs.futimesSync",
"translateArgs": false
Expand All @@ -1078,6 +1110,10 @@
"method": "fs.readSync",
"translateArgs": false
},
"_fsReadIntoRaw": {
"method": "fs.readSync",
"translateArgs": false
},
"fs.writeSync": {
"method": "fs.writeSync",
"translateArgs": false
Expand Down
5 changes: 4 additions & 1 deletion crates/execution/src/javascript.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3393,7 +3393,10 @@ fn spawn_v8_event_bridge(
raw_bytes_args.insert(1, bytes);
}
}
if method == "_fsReadRaw" {
if matches!(
method.as_str(),
"_fsReadRaw" | "_fsReadIntoRaw" | "_fsReadFileRaw"
) {
raw_bytes_args.insert(usize::MAX, Vec::new());
}
record_sync_bridge_phase(
Expand Down
11 changes: 9 additions & 2 deletions crates/native-sidecar/src/execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ use agentos_vm_config as vm_config;

use crate::filesystem::{
handle_python_vfs_rpc_request as filesystem_handle_python_vfs_rpc_request,
service_javascript_fs_read_sync_rpc, service_javascript_fs_readdir_raw_sync_rpc,
service_javascript_fs_sync_rpc, service_javascript_module_sync_rpc,
service_javascript_fs_read_file_raw_sync_rpc, service_javascript_fs_read_sync_rpc,
service_javascript_fs_readdir_raw_sync_rpc, service_javascript_fs_sync_rpc,
service_javascript_module_sync_rpc,
};
use crate::protocol::{
CloseStdinRequest, EventFrame, EventPayload, ExecuteRequest, FindBoundUdpRequest,
Expand Down Expand Up @@ -16715,6 +16716,12 @@ where
let bytes = service_javascript_fs_read_sync_rpc(kernel, process, kernel_pid, request)?;
return Ok(JavascriptSyncRpcServiceResponse::Raw(bytes));
}
if request.raw_bytes_args.contains_key(&usize::MAX) && request.method == "fs.readFileSync" {
let kernel_pid = process.kernel_pid;
let bytes =
service_javascript_fs_read_file_raw_sync_rpc(kernel, process, kernel_pid, request)?;
return Ok(JavascriptSyncRpcServiceResponse::Raw(bytes));
}
if request.method == "fs.readdirSync" {
let kernel_pid = process.kernel_pid;
let bytes =
Expand Down
Loading