Overlay index fetch issue

src/backends/index/index.ts

@@ -55,20 +55,6 @@ export class Index extends Map<string, Stats> {
 		return JSON.stringify(this.toJSON());
 	}
 
-	/**
-	 * Returns the files in the directory `dir`.
-	 * This is expensive so it is only called once per directory.
-	 */
-	protected dirEntries(dir: string): string[] {
-		const entries = [];
-		for (const entry of this.keys()) {
-			if (dirname(entry) == dir) {
-				entries.push(basename(entry));
-			}
-		}
-		return entries;
-	}
-
 	/**
 	 * Loads the index from JSON data
 	 */
@@ -82,7 +68,12 @@ export class Index extends Map<string, Stats> {
 		for (const [path, data] of Object.entries(json.entries)) {
 			const stats = new Stats(data);
 			if (stats.isDirectory()) {
-				stats.fileData = encode(JSON.stringify(this.dirEntries(path)));
+				const reImmediateSubdirs = new RegExp(`^${path}/[^/]+$`);
+				const immediateSubdirs = Object.keys(json.entries)
+					.filter(item => reImmediateSubdirs.test(item))
+					.map(item => basename(item));
+				immediateSubdirs.splice(immediateSubdirs.indexOf(path), 1);
+				stats.fileData = encode(JSON.stringify(immediateSubdirs));
 			}
 			this.set(path, stats);
 		}

src/backends/locked.ts

@@ -27,7 +27,7 @@
 	/**
 	 * The current locks
 	 */
-	private locks: Map<string, MutexLock> = new Map();
+	private locks: Map<string, [MutexLock]> = new Map();
 
 	protected addLock(path: string): MutexLock {
 		const lock: MutexLock = {
@@ -36,7 +36,11 @@
 				this.unlock(path);
 			},
 		};
-		this.locks.set(path, lock);
+		if (this.locks.has(path)) {
+			this.locks.get(path)!.push(lock);
+		} else {
+			this.locks.set(path, [lock]);
+		}
 		return lock;
 	}
 
@@ -48,7 +52,8 @@
 	public async lock(path: string): Promise<MutexLock> {
 		if (this.locks.has(path)) {
 			// Non-null assertion: we already checked locks has path
-			await this.locks.get(path)!.promise;
+			const promise = this.locks.get(path)!.at(-1);
+			await promise;
 		}
 
 		return this.addLock(path);
@@ -84,8 +89,8 @@
 		}
 
 		// Non-null assertion: we already checked locks has path
-		this.locks.get(path)!.resolve();
-		this.locks.delete(path);
+		const res = this.locks.get(path)!.shift();
+		res!.resolve();
 		return true;
 	}
 
@@ -94,7 +99,7 @@
 	 * @internal
 	 */
 	public isLocked(path: string): boolean {
-		return this.locks.has(path);
+		return this.locks.has(path) && this.locks.get(path)!.length > 0;
 	}
 
 	public async ready(): Promise<void> {