meswork/wasm-simulator
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参考所有分组，完成尽量多的内容。禁止顺手扩功能 smoke

Browse Source 
结论：按 align-linuxcnc 约束收窄 OPFS removeFile 和 LinuxCNC 参数 .new/.bak 清理为文件专用语义，避免把同名目录递归删除。依据 ../linuxcnc/src/emc/rs274ngc/rs274ngc_pre.cc save_parameters() 的 fopen(filename.new)、unlink(filename.bak)、link、rename 行为。

验证：./test-native.sh 通过；./test-linuxcnc-source-link.sh 通过。
This commit is contained in:
cnc
2026-06-03 13:28:15 +08:00
parent 5481ab3bff
commit 0d4e248811
3 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web/src/wasm-core.js
View File

@@ -318,6 +318,21 @@ function removeWasmPath(module, path, recursive) {
}
}
function removeWasmFilePath(module, path) {
let mode;
try {
mode = module.FS.stat(path).mode;
} catch (error) {
if (error?.errno !== 44) {
throw error;
}
return;
}
if (module.FS.isFile(mode)) {
module.FS.unlink(path);
}
}
function wasmPathExists(module, path) {
try {
module.FS.stat(path);
@@ -505,9 +520,12 @@ function installOpfsWorkspace(module, options) {
throw new Error("LinuxCNC parameter file was not produced by the interpreter");
}
await writeOpfsFile(workspacePath, path, data);
await removeOpfsEntry(workspacePath, `${path}.new`, false);
removeWasmPath(module, `${LINUXCNC_DEFAULT_PARAMETER_FILE}.new`, false);
removeWasmPath(module, `/${LINUXCNC_DEFAULT_PARAMETER_FILE}.new`, false);
// LinuxCNC source basis: rs274ngc_pre.cc save_parameters()
// creates filename + ".new" with fopen() and later renames that
// file; OPFS cleanup must not remove a directory at that path.
await removeOpfsFileEntry(workspacePath, `${path}.new`);
removeWasmFilePath(module, `${LINUXCNC_DEFAULT_PARAMETER_FILE}.new`);
removeWasmFilePath(module, `/${LINUXCNC_DEFAULT_PARAMETER_FILE}.new`);
const backupPath = `${LINUXCNC_DEFAULT_PARAMETER_FILE}.bak`;
const backupData = readFirstExistingWasmFile(module, [backupPath, `/${backupPath}`]);
if (backupData !== null) {
@@ -518,8 +536,11 @@ function installOpfsWorkspace(module, options) {
return data;
},
async removeFile(path) {
await removeOpfsEntry(workspacePath, path, false);
removeWasmPath(module, this.resolvePath(path), false);
// LinuxCNC source basis: rs274ngc_pre.cc save_parameters() uses
// unlink() for backup files, so the browser bridge keeps file-only
// removal separate from recursive directory cleanup.
await removeOpfsFileEntry(workspacePath, path);
removeWasmFilePath(module, this.resolvePath(path));
},
async removeDirectory(path) {
await removeOpfsEntry(workspacePath, path, true);

16
web/test-browser-wasm-smoke-opfs-directory-sections.js
View File

@@ -171,4 +171,20 @@ export async function runBrowserOpfsDirectorySections(context, simulator) {
"OPFS removeDirectory did not remove the WASM mirror",
);
});
await runSection("opfs file removal preserves directories", async () => {
await simulator.fs.opfs.writeFile("parameters/remove-file-keeps-directory.var.new/stale.ngc", "G21 G90\n");
const staleDirectoryPath = simulator.fs.opfs.resolvePath("parameters/remove-file-keeps-directory.var.new");
await simulator.fs.opfs.readDirectory("parameters/remove-file-keeps-directory.var.new");
await simulator.fs.opfs.removeFile("parameters/remove-file-keeps-directory.var.new");
const staleDirectoryStat = await simulator.fs.opfs.stat("parameters/remove-file-keeps-directory.var.new");
if (staleDirectoryStat.kind !== "directory" || staleDirectoryStat.size !== null) {
throw new Error("OPFS removeFile removed a directory instead of preserving file-only semantics");
}
const staleDirectoryMode = simulator.fs.module.FS.stat(staleDirectoryPath).mode;
if (!simulator.fs.module.FS.isDir(staleDirectoryMode)) {
throw new Error("OPFS removeFile removed a WASM mirror directory instead of preserving file-only semantics");
}
await simulator.fs.opfs.removeDirectory("parameters/remove-file-keeps-directory.var.new");
});
}