Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions src/Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -773,8 +773,16 @@ export class Client {
* @protected
*/
protected async _openDir(dirName: string) {
await this.sendIgnoringError("MKD " + dirName)
await this.cd(dirName)
const creation = await this.sendIgnoringError("MKD " + dirName)
try {
await this.cd(dirName)
}
catch (err) {
if (err instanceof FTPError && creation.code >= 400) {
throw new FTPError(creation)
}
throw err
}
}

/**
Expand Down
52 changes: 52 additions & 0 deletions test/commandSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,58 @@ describe("Simple commands", () => {
})
})

describe("ensureDir", () => {
it("reports the failed creation when the directory cannot be entered", async () => {
server.addHandlers({
mkd: () => "550 Access is denied.",
cwd: () => "550 The system cannot find the file specified."
})
await assert.rejects(() => client.ensureDir("a/b"), {
name: "FTPError", code: 550, message: "550 Access is denied."
})
assert.deepEqual(server.receivedCommands.slice(-2), ["MKD a", "CWD a"])
})

it("can enter an existing directory when creation is refused", async () => {
server.addHandlers({
mkd: () => "550 Directory already exists.",
cwd: () => "250 Directory changed."
})
await client.ensureDir("a/b")
assert.deepEqual(server.receivedCommands.slice(-4), ["MKD a", "CWD a", "MKD b", "CWD b"])
})

it("keeps the change-directory error after successful creation", async () => {
server.addHandlers({
mkd: () => '257 "a" created.',
cwd: () => "550 Directory cannot be entered."
})
await assert.rejects(() => client.ensureDir("a"), {
name: "FTPError", code: 550, message: "550 Directory cannot be entered."
})
})

it("does not replace a lost connection with a creation error", async () => {
server.addHandlers({
mkd: () => "550 Directory already exists.",
cwd: () => server.ctrlConn.destroy()
})
await assert.rejects(() => client.ensureDir("a"), {
name: "Error", message: "Server sent FIN packet unexpectedly, closing connection."
})
assert.strictEqual(client.closed, true)
})

it("creates and enters every component of an absolute path", async () => {
server.addHandlers({
mkd: () => '257 "directory" created.',
cwd: () => "250 Directory changed."
})
await client.ensureDir("/a//b/")
assert.deepEqual(server.receivedCommands.slice(-5), ["CWD /", "MKD a", "CWD a", "MKD b", "CWD b"])
})
})

it.todo("can remove a file")
it.todo("can change directory")
it.todo("can get the current working directory")
Expand Down
Loading