mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 23:30:41 +09:00
Merge pull request #1128 from bbassie/remove-find-unused-name
Remove lib.findUnusedName
This commit is contained in:
4 files changed
+79
-103
No files matched your search
+66
-24
@@ -26,6 +26,37 @@ function checkRequestSaveName(name: string) {
|
||||
}
|
||||
}
|
||||
|
||||
async function copySaveExclusive(sourcePath: string, targetPath: string) {
|
||||
await fs.copyFile(
|
||||
sourcePath,
|
||||
targetPath,
|
||||
fs.constants.COPYFILE_EXCL | fs.constants.COPYFILE_FICLONE
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Move a file without overwriting an existing target, fails with EEXIST
|
||||
* if the target exists.
|
||||
*/
|
||||
async function moveSaveExclusive(sourcePath: string, targetPath: string) {
|
||||
try {
|
||||
await fs.link(sourcePath, targetPath);
|
||||
} catch (err: any) {
|
||||
// Hard links fail across filesystems and on some filesystems with
|
||||
// varying codes, the copy is still exclusive.
|
||||
if (err.code === "EEXIST") {
|
||||
throw err;
|
||||
}
|
||||
await copySaveExclusive(sourcePath, targetPath);
|
||||
}
|
||||
try {
|
||||
await fs.unlink(sourcePath);
|
||||
} catch (err: any) {
|
||||
await fs.unlink(targetPath).catch(() => {});
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks that no socket is bound to the given UDP port, on IPv4 or IPv6
|
||||
*
|
||||
@@ -498,8 +529,8 @@ export default class Host extends lib.Link {
|
||||
}
|
||||
|
||||
let instancesDir = this.config.get("host.instances_directory");
|
||||
for (let i = 0; i < 10; i++) { // Limit attempts in case this is somehow an infinite loop
|
||||
let candidateDir = path.join(instancesDir, await lib.findUnusedName(instancesDir, name));
|
||||
for (let i = 1; ; i++) {
|
||||
let candidateDir = path.join(instancesDir, i === 1 ? name : `${name}-${i}`);
|
||||
try {
|
||||
await fs.mkdir(candidateDir);
|
||||
} catch (err: any) {
|
||||
@@ -510,7 +541,6 @@ export default class Host extends lib.Link {
|
||||
}
|
||||
return candidateDir;
|
||||
}
|
||||
throw Error("Unable to create instance dir, retry threshold reached");
|
||||
}
|
||||
|
||||
async broadcastEventToInstance<T>(event: lib.Event<T>) {
|
||||
@@ -1025,13 +1055,10 @@ export default class Host extends lib.Link {
|
||||
checkRequestSaveName(newName);
|
||||
let instance = this.getRequestInstance(instanceId);
|
||||
try {
|
||||
// Link save in the new location.
|
||||
await fs.link(
|
||||
await moveSaveExclusive(
|
||||
path.join(instance.path, "saves", oldName),
|
||||
path.join(instance.path, "saves", newName),
|
||||
);
|
||||
// Unlink save in old location.
|
||||
await fs.unlink(path.join(instance.path, "saves", oldName));
|
||||
} catch (err: any) {
|
||||
if (err.code === "EEXIST") {
|
||||
throw new lib.RequestError(`${newName} already exists`);
|
||||
@@ -1064,6 +1091,25 @@ export default class Host extends lib.Link {
|
||||
await this.sendSaveListUpdate(instanceId, path.join(instance.path, "saves"));
|
||||
}
|
||||
|
||||
async _moveOrCopySave(sourcePath: string, targetPath: string, copy: boolean) {
|
||||
const { dir, name, ext } = path.parse(targetPath);
|
||||
for (let i = 1; ; i++) {
|
||||
targetPath = path.format({ dir, name: i === 1 ? name : `${name}-${i}`, ext });
|
||||
try {
|
||||
if (copy) {
|
||||
await copySaveExclusive(sourcePath, targetPath);
|
||||
} else {
|
||||
await moveSaveExclusive(sourcePath, targetPath);
|
||||
}
|
||||
return path.basename(targetPath);
|
||||
} catch (err: any) {
|
||||
if (err.code !== "EEXIST") {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async handleInstanceTransferSaveRequest(request: lib.InstanceTransferSaveRequest) {
|
||||
let { sourceName, targetName, copy, sourceInstanceId, targetInstanceId } = request;
|
||||
checkRequestSaveName(sourceName);
|
||||
@@ -1071,31 +1117,27 @@ export default class Host extends lib.Link {
|
||||
let sourceInstance = this.getRequestInstance(sourceInstanceId);
|
||||
let targetInstance = this.getRequestInstance(targetInstanceId);
|
||||
|
||||
if (!targetName.endsWith(".zip")) {
|
||||
targetName += ".zip";
|
||||
}
|
||||
|
||||
// For consistency with remote transfer initiated through pullSave the
|
||||
// target is renamed if it already exists.
|
||||
targetName = await lib.findUnusedName(
|
||||
path.join(targetInstance.path, "saves"), targetName, ".zip"
|
||||
);
|
||||
|
||||
const sourcePath = path.join(sourceInstance.path, "saves", sourceName);
|
||||
try {
|
||||
if (copy) {
|
||||
await fs.copyFile(
|
||||
path.join(sourceInstance.path, "saves", sourceName),
|
||||
path.join(targetInstance.path, "saves", targetName),
|
||||
fs.constants.COPYFILE_FICLONE
|
||||
);
|
||||
} else {
|
||||
await fs.rename(
|
||||
path.join(sourceInstance.path, "saves", sourceName),
|
||||
path.join(targetInstance.path, "saves", targetName),
|
||||
);
|
||||
}
|
||||
targetName = await this._moveOrCopySave(
|
||||
sourcePath,
|
||||
path.join(targetInstance.path, "saves", targetName),
|
||||
copy,
|
||||
);
|
||||
} catch (err: any) {
|
||||
if (err.code === "ENOENT") {
|
||||
// ENOENT may also come from a missing target saves folder.
|
||||
if (err.code === "ENOENT" && !await fs.access(sourcePath).then(() => true, () => false)) {
|
||||
throw new lib.RequestError(`${sourceName} does not exist`);
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
await this.sendSaveListUpdate(sourceInstanceId, path.join(sourceInstance.path, "saves"));
|
||||
await this.sendSaveListUpdate(targetInstanceId, path.join(targetInstance.path, "saves"));
|
||||
|
||||
|
||||
@@ -70,48 +70,7 @@ export async function directorySize(directory: string) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Modifies name in case it already exisist at the given directory
|
||||
*
|
||||
* Checks the directory passed if it already contains a file or folder with
|
||||
* the given name, if it does not returns name unmodified, otherwise it
|
||||
* returns a modified name that does not exist in the directory.
|
||||
*
|
||||
* Warning: this function should not be relied upon to be accurate for
|
||||
* security sensitive applications. The selection process is inherently
|
||||
* racy and a file or folder may have been created in the folder by the time
|
||||
* this function returns.
|
||||
*
|
||||
* @param directory - directory to check in.
|
||||
* @param name - file name to check for, may have extension.
|
||||
* @param extension - dot extension used for the file name.
|
||||
* @returns modified name with extension that likely does
|
||||
* not exist in the folder
|
||||
*/
|
||||
export async function findUnusedName(directory: string, name: string, extension = "") {
|
||||
if (extension && name.endsWith(extension)) {
|
||||
name = name.slice(0, -extension.length);
|
||||
}
|
||||
|
||||
while (true) {
|
||||
try {
|
||||
await fs.access(path.join(directory, `${name}${extension}`));
|
||||
} catch (err: any) {
|
||||
if (err.code === "ENOENT") {
|
||||
return `${name}${extension}`;
|
||||
}
|
||||
}
|
||||
|
||||
let match = /^(.*?)(-(\d+))?$/.exec(name)!;
|
||||
if (!match[2]) {
|
||||
name = `${match[1]}-2`;
|
||||
} else {
|
||||
name = `${match[1]}-${Number.parseInt(match[3], 10) + 1}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate collision resistante temporary file name
|
||||
* Generate collision resistant temporary file name
|
||||
*
|
||||
* Warning: this function should not be relied upon to be accurate for
|
||||
* security sensitive applications. The selection process is inherently
|
||||
@@ -125,8 +84,7 @@ export async function findUnusedName(directory: string, name: string, extension
|
||||
*/
|
||||
export async function getTempFile(prefix = "tmp.", suffix = "", tmpdir = "./") {
|
||||
let fileName = path.join(prefix + crypto.randomBytes(16).toString("hex") + suffix);
|
||||
let freeFile = await findUnusedName(tmpdir, fileName);
|
||||
let fullPath = path.join(tmpdir, freeFile);
|
||||
let fullPath = path.join(tmpdir, fileName);
|
||||
return fullPath;
|
||||
}
|
||||
|
||||
|
||||
@@ -1469,6 +1469,17 @@ describe("Integration of Clusterio", function() {
|
||||
await deleteSave(pri, "transfer.zip");
|
||||
await deleteSave(sec, "transfer.zip");
|
||||
});
|
||||
it("should auto-rename copy if target exists", async function() {
|
||||
await uploadSave(pri, "transfer.zip", "transfer.zip");
|
||||
await uploadSave(sec, "transfer.zip", "existing");
|
||||
await execCtlProcess(`instance save transfer ${pri} transfer.zip ${sec} --copy`);
|
||||
await assert.doesNotReject(fs.access(path.join(priSaves, "transfer.zip")), "save not at pri");
|
||||
assert.equal(await fs.readFile(path.join(secSaves, "transfer.zip"), "utf8"), "existing");
|
||||
assert.equal(await fs.readFile(path.join(secSaves, "transfer-2.zip"), "utf8"), "transfer.zip");
|
||||
await deleteSave(pri, "transfer.zip");
|
||||
await deleteSave(sec, "transfer.zip");
|
||||
await deleteSave(sec, "transfer-2.zip");
|
||||
});
|
||||
it("should fail if save does not exist", async function() {
|
||||
await assert.rejects(execCtl(`instance save transfer ${pri} not-here.zip ${sec}`));
|
||||
});
|
||||
|
||||
@@ -17,13 +17,6 @@ describe("lib/file_ops", function() {
|
||||
await fs.writeFile(path.join(baseDir, "test", "file.txt"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "test", "another file.txt"), "more contents");
|
||||
|
||||
await fs.mkdir(path.join(baseDir, "find"), { recursive: true });
|
||||
await fs.writeFile(path.join(baseDir, "find", "file"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "find", "file.txt"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "find", "foo-1"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "find", "foo-2"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "find", "bar-1.txt"), "contents");
|
||||
await fs.writeFile(path.join(baseDir, "find", "bar-2.txt"), "contents");
|
||||
}
|
||||
|
||||
before(setupTestingEnv);
|
||||
@@ -58,34 +51,6 @@ describe("lib/file_ops", function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe("findUnusedName()", function() {
|
||||
it("should return named unchanged if it does not exist", async function() {
|
||||
let cases = [
|
||||
[["file"], "file"],
|
||||
[["file", ".txt"], "file.txt"],
|
||||
[["file.txt", ".txt"], "file.txt"],
|
||||
];
|
||||
for (let [args, expected] of cases) {
|
||||
let actual = await lib.findUnusedName(path.join(baseDir, "test", "folder"), ...args);
|
||||
assert.equal(actual, expected);
|
||||
}
|
||||
});
|
||||
it("should return changed name if it does exist", async function() {
|
||||
let cases = [
|
||||
[["file"], "file-2"],
|
||||
[["file", ".txt"], "file-2.txt"],
|
||||
[["file.txt", ".txt"], "file-2.txt"],
|
||||
[["foo-1"], "foo-3"],
|
||||
[["bar-1", ".txt"], "bar-3.txt"],
|
||||
[["bar-1.txt", ".txt"], "bar-3.txt"],
|
||||
];
|
||||
for (let [args, expected] of cases) {
|
||||
let actual = await lib.findUnusedName(path.join(baseDir, "find"), ...args);
|
||||
assert.equal(actual, expected);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe("safeOutputFile()", function() {
|
||||
async function assertNoTemporary(target) {
|
||||
let { dir, name } = path.parse(target);
|
||||
|
||||
Reference in new issue
Block a user