Skip to content

Commit

Permalink
Improved WebAccess handle kind checks
Browse files Browse the repository at this point in the history 
Added `DOM.AsyncIterable` TS lib
  • Loading branch information
@james-pre
james-pre committed Jan 7, 2025
1 parent 42fee6b commit 041a04c
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 39 deletions.
82 changes: 44 additions & 38 deletions src/access.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ function isResizable(buffer: ArrayBufferLike): boolean {
return false;
}

type HKindToType<T extends FileSystemHandleKind> = T extends 'directory' ? FileSystemDirectoryHandle : T extends 'file' ? FileSystemFileHandle : FileSystemHandle;

/**
* Since `FileSystemHandle.kind` doesn't have correct type support
*/
function isKind<const T extends FileSystemHandleKind>(handle: FileSystemHandle, kind: T): handle is HKindToType<T> {
return handle.kind == kind;
}

export class WebAccessFS extends Async(FileSystem) {
private _handles: Map<string, FileSystemHandle> = new Map();

Expand Down Expand Up @@ -44,7 +53,7 @@ export class WebAccessFS extends Async(FileSystem) {

public async rename(oldPath: string, newPath: string): Promise<void> {
const handle = await this.getHandle(oldPath, 'rename');
if (handle instanceof FileSystemDirectoryHandle) {
if (isKind(handle, 'directory')) {
const files = await this.readdir(oldPath);

await this.mkdir(newPath);
Expand All @@ -60,16 +69,16 @@ export class WebAccessFS extends Async(FileSystem) {

return;
}
if (!(handle instanceof FileSystemFileHandle)) {
if (!isKind(handle, 'file')) {
throw new ErrnoError(Errno.ENOTSUP, 'Not a file or directory handle', oldPath, 'rename');
}
const oldFile = await handle.getFile().catch((ex: ConvertException) => {
throw convertException(ex, oldPath, 'rename');
}),
destFolder = await this.getHandle(dirname(newPath), 'rename');
if (!(destFolder instanceof FileSystemDirectoryHandle)) {
return;
}
throw convertException(ex, oldPath, 'rename');
});
const destFolder = await this.getHandle(dirname(newPath), 'rename');

if (!isKind(destFolder, 'directory')) throw ErrnoError.With('ENOTDIR', dirname(newPath), 'rename');

const newFile = await destFolder.getFileHandle(basename(newPath), { create: true }).catch((ex: ConvertException) => {
throw convertException(ex, newPath, 'rename');
});
Expand All @@ -86,9 +95,8 @@ export class WebAccessFS extends Async(FileSystem) {
}

const handle = await this.getHandle(dirname(path), 'writeFile');
if (!(handle instanceof FileSystemDirectoryHandle)) {
return;
}

if (!isKind(handle, 'directory')) throw ErrnoError.With('ENOTDIR', dirname(path), 'writeFile');

const file = await handle.getFileHandle(basename(path), { create: true });
const writable = await file.createWritable();
Expand All @@ -103,13 +111,11 @@ export class WebAccessFS extends Async(FileSystem) {

public async stat(path: string): Promise<Stats> {
const handle = await this.getHandle(path, 'stat');
if (!handle) {
throw ErrnoError.With('ENOENT', path, 'stat');
}
if (handle instanceof FileSystemDirectoryHandle) {

if (isKind(handle, 'directory')) {
return new Stats({ mode: 0o777 | constants.S_IFDIR, size: 4096 });
}
if (handle instanceof FileSystemFileHandle) {
if (isKind(handle, 'file')) {
const { lastModified, size } = await handle.getFile();
return new Stats({ mode: 0o777 | constants.S_IFREG, size, mtimeMs: lastModified });
}
Expand All @@ -118,9 +124,9 @@ export class WebAccessFS extends Async(FileSystem) {

public async openFile(path: string, flag: string): Promise<PreloadFile<this>> {
const handle = await this.getHandle(path, 'openFile');
if (!(handle instanceof FileSystemFileHandle)) {
throw ErrnoError.With('EISDIR', path, 'openFile');
}

if (!isKind(handle, 'file')) throw ErrnoError.With('EISDIR', path, 'openFile');

const file = await handle.getFile().catch((ex: ConvertException) => {
throw convertException(ex, path, 'openFile');
});
Expand All @@ -131,7 +137,7 @@ export class WebAccessFS extends Async(FileSystem) {

public async unlink(path: string): Promise<void> {
const handle = await this.getHandle(dirname(path), 'unlink');
if (!(handle instanceof FileSystemDirectoryHandle)) {
if (!isKind(handle, 'directory')) {
throw ErrnoError.With('ENOTDIR', dirname(path), 'unlink');
}
await handle.removeEntry(basename(path), { recursive: true }).catch((ex: ConvertException) => {
Expand All @@ -149,25 +155,20 @@ export class WebAccessFS extends Async(FileSystem) {
}

public async mkdir(path: string, mode?: number, options?: CreationOptions): Promise<void> {

Check warning on line 157 in src/access.ts

View workflow job for this annotation

GitHub Actions / CI 

'mode' is defined but never used

Check warning on line 157 in src/access.ts

View workflow job for this annotation

GitHub Actions / CI 

'options' is defined but never used
const existingHandle = await this.getHandle(path, 'mkdir').catch((ex: ErrnoError) => {
if (ex.code != 'ENOENT') {
throw ex;
}
});
if (existingHandle) {
if (await this.exists(path)) {
throw ErrnoError.With('EEXIST', path, 'mkdir');
}

const handle = await this.getHandle(dirname(path), 'mkdir');
if (!(handle instanceof FileSystemDirectoryHandle)) {
if (!isKind(handle, 'directory')) {
throw ErrnoError.With('ENOTDIR', path, 'mkdir');
}
await handle.getDirectoryHandle(basename(path), { create: true });
}

public async readdir(path: string): Promise<string[]> {
const handle = await this.getHandle(path, 'readdir');
if (!(handle instanceof FileSystemDirectoryHandle)) {
if (!isKind(handle, 'directory')) {
throw ErrnoError.With('ENOTDIR', path, 'readdir');
}

Expand All @@ -178,7 +179,7 @@ export class WebAccessFS extends Async(FileSystem) {
return entries;
}

protected async getHandle(path: string, syscall: string): Promise<FileSystemHandle | undefined> {
protected async getHandle(path: string, syscall: string): Promise<FileSystemHandle> {
if (this._handles.has(path)) {
return this._handles.get(path)!;
}
Expand All @@ -187,24 +188,29 @@ export class WebAccessFS extends Async(FileSystem) {

for (const part of path.split('/').slice(1)) {
const handle = this._handles.get(walked);
if (!(handle instanceof FileSystemDirectoryHandle)) {
throw ErrnoError.With('ENOTDIR', walked, syscall);
}
if (!handle) throw ErrnoError.With('ENOENT', walked, syscall);
if (!isKind(handle, 'directory')) throw ErrnoError.With('ENOTDIR', walked, syscall);
walked = join(walked, part);

const child = await handle.getDirectoryHandle(part).catch((ex: DOMException) => {
try {
const child = await handle.getDirectoryHandle(part);
this._handles.set(walked, child);
} catch (_ex: unknown) {
const ex = _ex as DOMException;

switch (ex.name) {
case 'TypeMismatchError':
return handle.getFileHandle(part).catch((ex: ConvertException) => {
//throw convertException(ex, walked, syscall);
});
try {
return await handle.getFileHandle(part);
} catch (ex: any) {

Check warning on line 205 in src/access.ts

View workflow job for this annotation

GitHub Actions / CI 

Unexpected any. Specify a different type
throw convertException(ex, walked, syscall);
}
case 'TypeError':
throw new ErrnoError(Errno.ENOENT, ex.message, walked, syscall);
default:
throw convertException(ex, walked, syscall);
}
});
if (child) this._handles.set(walked, child);
}
}

return this._handles.get(path)!;
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"module": "NodeNext",
"target": "ES2020",
"outDir": "dist",
"lib": ["ESNext", "DOM"],
"lib": ["ESNext", "DOM", "DOM.AsyncIterable"],
"strict": true,
"moduleResolution": "NodeNext",
"declaration": true
Expand Down

0 comments on commit 041a04c

Please sign in to comment.