Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit363e253

Browse files
authored
Merge pull request#1205 from streamich/copilot/fix-97ba9c15-6996-496b-a9a0-a4699dbcd7ac
fix: handle EEXIST error when creating directories in parallel with node-to-fsa adapter
2 parents5644415 +c23c521 commit363e253

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

‎src/node-to-fsa/NodeFileSystemDirectoryHandle.ts‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,29 @@ export class NodeFileSystemDirectoryHandle extends NodeFileSystemHandle implemen
9191
):Promise<IFileSystemDirectoryHandle>{
9292
assertName(name,'getDirectoryHandle','FileSystemDirectoryHandle');
9393
constfilename=this.__path+name;
94+
const{ fs}=this;
9495
try{
95-
conststats=awaitthis.fs.promises.stat(filename);
96+
conststats=awaitfs.promises.stat(filename);
9697
if(!stats.isDirectory())thrownewTypeMismatchError();
97-
returnnewNodeFileSystemDirectoryHandle(this.fs,filename,this.ctx);
98+
returnnewNodeFileSystemDirectoryHandle(fs,filename,this.ctx);
9899
}catch(error){
99100
if(errorinstanceofDOMException)throwerror;
100101
if(error&&typeoferror==='object'){
101102
switch(error.code){
102103
case'ENOENT':{
103104
if(options?.create){
104105
assertCanWrite(this.ctx.mode!);
105-
awaitthis.fs.promises.mkdir(filename);
106-
returnnewNodeFileSystemDirectoryHandle(this.fs,filename,this.ctx);
106+
try{
107+
awaitfs.promises.mkdir(filename);
108+
}catch(mkdirError){
109+
if(mkdirError&&typeofmkdirError==='object'&&mkdirError.code==='EEXIST'){
110+
conststats=awaitfs.promises.stat(filename);
111+
if(!stats.isDirectory())thrownewTypeMismatchError();
112+
returnnewNodeFileSystemDirectoryHandle(fs,filename,this.ctx);
113+
}
114+
throwmkdirError;
115+
}
116+
returnnewNodeFileSystemDirectoryHandle(fs,filename,this.ctx);
107117
}
108118
thrownewNotFoundError();
109119
}

‎src/node-to-fsa/__tests__/NodeFileSystemDirectoryHandle.test.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,23 @@ onlyOnNode20('NodeFileSystemDirectoryHandle', () => {
227227
expect(subdir.name).toBe('subdir');
228228
expect(subdir).toBeInstanceOf(NodeFileSystemDirectoryHandle);
229229
});
230+
231+
test('does not throw when creating the same folder in parallel',async()=>{
232+
const{ dir, fs}=setup({});
233+
expect(fs.existsSync('/test')).toBe(false);
234+
const[subdir1,subdir2]=awaitPromise.all([
235+
dir.getDirectoryHandle('test',{create:true}),
236+
dir.getDirectoryHandle('test',{create:true}),
237+
]);
238+
expect(fs.existsSync('/test')).toBe(true);
239+
expect(fs.statSync('/test').isDirectory()).toBe(true);
240+
expect(subdir1.kind).toBe('directory');
241+
expect(subdir1.name).toBe('test');
242+
expect(subdir2.kind).toBe('directory');
243+
expect(subdir2.name).toBe('test');
244+
expect(subdir1).toBeInstanceOf(NodeFileSystemDirectoryHandle);
245+
expect(subdir2).toBeInstanceOf(NodeFileSystemDirectoryHandle);
246+
});
230247
});
231248

232249
describe('.getFileHandle()',()=>{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp