ITStudio_OUC/OxideJS-New
0
1
Fork 0
mirror of https://github.com/pjh456/OxideJS.git synced 2026-10-23 18:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 损坏 sidecar 分支补删陈旧 socket 文件

Browse Source
This commit is contained in:
彭俊皓
2026-10-06 14:30:52 +00:00
parent afa2b25237
commit 196bb77516
3 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+18 -18
View File
@@ -1095,7 +1095,7 @@ dependencies = [
[[package]]
name = "oxide_builtins"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"chrono",
"fast-float",
@@ -1120,7 +1120,7 @@ dependencies = [
[[package]]
name = "oxide_bytecode"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"num-bigint",
"oxide_log",
@@ -1128,7 +1128,7 @@ dependencies = [
[[package]]
name = "oxide_cfg"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_emit",
@@ -1139,7 +1139,7 @@ dependencies = [
[[package]]
name = "oxide_cli"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"ansi_term",
"bumpalo",
@@ -1159,7 +1159,7 @@ dependencies = [
[[package]]
name = "oxide_code_cache"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"lru",
"oxide_bytecode",
@@ -1168,7 +1168,7 @@ dependencies = [
[[package]]
name = "oxide_compiler"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1187,7 +1187,7 @@ dependencies = [
[[package]]
name = "oxide_dce"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1201,7 +1201,7 @@ dependencies = [
[[package]]
name = "oxide_emit"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"num-bigint",
"oxc_allocator",
@@ -1216,7 +1216,7 @@ dependencies = [
[[package]]
name = "oxide_ir"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_log",
@@ -1225,7 +1225,7 @@ dependencies = [
[[package]]
name = "oxide_kernel"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"bumpalo",
"dashmap",
@@ -1240,7 +1240,7 @@ dependencies = [
[[package]]
name = "oxide_liveness"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1252,7 +1252,7 @@ dependencies = [
[[package]]
name = "oxide_log"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"tracing",
"tracing-appender",
@@ -1261,7 +1261,7 @@ dependencies = [
[[package]]
name = "oxide_parser"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxc_allocator",
"oxc_ast",
@@ -1276,7 +1276,7 @@ dependencies = [
[[package]]
name = "oxide_regalloc"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_cfg",
@@ -1292,7 +1292,7 @@ dependencies = [
[[package]]
name = "oxide_runtime_api"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"num-bigint",
"num-traits",
@@ -1304,7 +1304,7 @@ dependencies = [
[[package]]
name = "oxide_test262"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"oxide_bytecode",
"oxide_compiler",
@@ -1321,7 +1321,7 @@ dependencies = [
[[package]]
name = "oxide_types"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"bumpalo",
"hashbrown 0.14.5",
@@ -1333,7 +1333,7 @@ dependencies = [
[[package]]
name = "oxide_vm"
version = "0.8.26"
version = "0.8.27"
dependencies = [
"bumpalo",
"chrono",
Cargo.toml
+1 -1
View File
@@ -22,7 +22,7 @@ members = [
]
[workspace.package]
version = "0.8.26"
version = "0.8.27"
edition = "2021"
license = "MIT"
rust-version = "1.80"
crates/oxide_cli/src/server/sidecar.rs
+21 -4
View File
@@ -141,7 +141,7 @@ pub fn process_starttime(pid: u32) -> Option<u64> {
// 空格干扰字段计数。
let rest = text.rsplit(')').next()?;
// 剩余部分从 state（全文件第 3 字段）起，第 20 个字段即全文件第 22 字段。
rest.split_whitespace().skip(19).next()?.parse().ok()
rest.split_whitespace().nth(19)?.parse().ok()
}
/// 认领结果：注册入口的三态。
@@ -164,7 +164,7 @@ pub enum ClaimResult {
/// - 可解析且 PID 死：陈旧残留，删 sidecar 与 socket 文件后重建。
/// - 可解析且 PID 活：交叉核对启动时刻刻度，匹配则保守拒绝（server
/// 可能正在启动或 socket 被外部删除），失配则 PID 已复用，删除重建。
/// - 不可解析（损坏）：只删 sidecar（socket 路径未知不猜）后重建。
/// - 不可解析（损坏）：删 sidecar 与 socket 文件后重建。
///
/// # 边界与前提
/// - 启动顺序契约是「先写 sidecar 再 bind socket」，存活 server 必有 sidecar。
@@ -192,8 +192,9 @@ pub fn claim_sidecar(sidecar_path: &Path, socket_path: &Path) -> ClaimResult {
match read_identity(sidecar_path) {
Some(id) => claim_dead_socket(&id, sidecar_path, socket_path),
None => {
// 损坏文件：只删 sidecar（socket 路径未知不猜）后重建。
let _ = fs::remove_file(sidecar_path);
// 损坏文件：删 sidecar 与 socket 文件后重建（socket 探活已失败，
// 文件无监听者，不会误删存活 server 的 socket）。
remove_stale(sidecar_path, socket_path);
re_register(sidecar_path, socket_path)
}
}
@@ -390,6 +391,22 @@ mod tests {
assert_eq!(id.pid, std::process::id());
}
/// 认领分支：损坏文件加无监听者的陈旧 socket 文件判陈旧，两文件都删后重建。
#[test]
fn claim_corrupted_sidecar_stale_socket_rebuilt() {
let dir = TestDir::new();
let sidecar = dir.path("sidecar.json");
let socket = dir.path("server.sock");
// 损坏文件：非 JSON 内容。
fs::write(&sidecar, "not json at all").expect("写损坏文件应成功");
// 陈旧 socket 文件：文件存在但无监听者。
fs::write(&socket, b"stale").expect("写陈旧 socket 文件应成功");
assert_eq!(claim_sidecar(&sidecar, &socket), ClaimResult::Registered);
let id = read_identity(&sidecar).expect("重建 sidecar 应可读");
assert_eq!(id.pid, std::process::id(), "重建 sidecar 应为本进程身份");
assert!(!socket.exists(), "陈旧 socket 文件应被删除");
}
/// 认领分支：损坏文件加存活 socket 拒绝（socket 是存活事实源）。
#[test]
fn claim_corrupted_sidecar_live_socket_refused() {