Merge pull request bjorn3#86 from kateinoigakukun/yt/issue-ino

Return unique ino for each node for `Filestat` and `Dirent`

Author: bjorn3

src/fd.ts

@@ -117,6 +117,21 @@ export abstract class Fd {
 }
 
 export abstract class Inode {
+  ino: bigint;
+
+  constructor() {
+    this.ino = Inode.issue_ino();
+  }
+
+  // NOTE: ino 0 is reserved for the root directory
+  private static next_ino: bigint = 1n;
+  static issue_ino(): bigint {
+    return Inode.next_ino++;
+  }
+  static root_ino(): bigint {
+    return 0n;
+  }
+
   abstract path_open(
     oflags: number,
     fs_rights_base: bigint,

src/fs_mem.ts

@@ -159,12 +159,17 @@ export class OpenDirectory extends Fd {
     if (cookie == 0n) {
       return {
         ret: wasi.ERRNO_SUCCESS,
-        dirent: new wasi.Dirent(1n, ".", wasi.FILETYPE_DIRECTORY),
+        dirent: new wasi.Dirent(1n, this.dir.ino, ".", wasi.FILETYPE_DIRECTORY),
       };
     } else if (cookie == 1n) {
       return {
         ret: wasi.ERRNO_SUCCESS,
-        dirent: new wasi.Dirent(2n, "..", wasi.FILETYPE_DIRECTORY),
+        dirent: new wasi.Dirent(
+          2n,
+          this.dir.parent_ino(),
+          "..",
+          wasi.FILETYPE_DIRECTORY,
+        ),
       };
     }
 
@@ -178,7 +183,12 @@ export class OpenDirectory extends Fd {
 
     return {
       ret: 0,
-      dirent: new wasi.Dirent(cookie + 1n, name, entry.stat().filetype),
+      dirent: new wasi.Dirent(
+        cookie + 1n,
+        entry.ino,
+        name,
+        entry.stat().filetype,
+      ),
     };
   }
 
@@ -501,7 +511,7 @@ export class File extends Inode {
   }
 
   stat(): wasi.Filestat {
-    return new wasi.Filestat(wasi.FILETYPE_REGULAR_FILE, this.size);
+    return new wasi.Filestat(this.ino, wasi.FILETYPE_REGULAR_FILE, this.size);
   }
 }
 
@@ -547,6 +557,7 @@ class Path {
 
 export class Directory extends Inode {
   contents: Map<string, Inode>;
+  private parent: Directory | null = null;
 
   constructor(contents: Map<string, Inode> | [string, Inode][]) {
     super();
@@ -555,6 +566,19 @@ export class Directory extends Inode {
     } else {
       this.contents = contents;
     }
+
+    for (const entry of this.contents.values()) {
+      if (entry instanceof Directory) {
+        entry.parent = this;
+      }
+    }
+  }
+
+  parent_ino(): bigint {
+    if (this.parent == null) {
+      return Inode.root_ino();
+    }
+    return this.parent.ino;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -563,7 +587,7 @@ export class Directory extends Inode {
   }
 
   stat(): wasi.Filestat {
-    return new wasi.Filestat(wasi.FILETYPE_DIRECTORY, 0n);
+    return new wasi.Filestat(this.ino, wasi.FILETYPE_DIRECTORY, 0n);
   }
 
   get_entry_for_path(path: Path): { ret: number; entry: Inode | null } {
@@ -697,15 +721,18 @@ export class Directory extends Inode {
 }
 
 export class ConsoleStdout extends Fd {
+  private ino: bigint;
   write: (buffer: Uint8Array) => void;
 
   constructor(write: (buffer: Uint8Array) => void) {
     super();
+    this.ino = Inode.issue_ino();
     this.write = write;
   }
 
   fd_filestat_get(): { ret: number; filestat: wasi.Filestat } {
     const filestat = new wasi.Filestat(
+      this.ino,
       wasi.FILETYPE_CHARACTER_DEVICE,
       BigInt(0),
     );

src/fs_opfs.ts

@@ -58,17 +58,19 @@ export class SyncOPFSFile extends Inode {
   }
 
   stat(): wasi.Filestat {
-    return new wasi.Filestat(wasi.FILETYPE_REGULAR_FILE, this.size);
+    return new wasi.Filestat(this.ino, wasi.FILETYPE_REGULAR_FILE, this.size);
   }
 }
 
 export class OpenSyncOPFSFile extends Fd {
   file: SyncOPFSFile;
   position: bigint = 0n;
+  ino: bigint;
 
   constructor(file: SyncOPFSFile) {
     super();
     this.file = file;
+    this.ino = Inode.issue_ino();
   }
 
   fd_allocate(offset: bigint, len: bigint): number {
@@ -89,6 +91,7 @@ export class OpenSyncOPFSFile extends Fd {
     return {
       ret: 0,
       filestat: new wasi.Filestat(
+        this.ino,
         wasi.FILETYPE_REGULAR_FILE,
         BigInt(this.file.handle.getSize()),
       ),

src/wasi_defs.ts

@@ -184,15 +184,16 @@ export const FILETYPE_SYMBOLIC_LINK = 7;
 
 export class Dirent {
   d_next: bigint;
-  d_ino: bigint = 0n;
+  d_ino: bigint;
   d_namlen: number;
   d_type: number;
   dir_name: Uint8Array;
 
-  constructor(next_cookie: bigint, name: string, type: number) {
+  constructor(next_cookie: bigint, d_ino: bigint, name: string, type: number) {
     const encoded_name = new TextEncoder().encode(name);
 
     this.d_next = next_cookie;
+    this.d_ino = d_ino;
     this.d_namlen = encoded_name.byteLength;
     this.d_type = type;
     this.dir_name = encoded_name;
@@ -265,15 +266,16 @@ export const OFLAGS_TRUNC = 1 << 3;
 
 export class Filestat {
   dev: bigint = 0n;
-  ino: bigint = 0n;
+  ino: bigint;
   filetype: number;
   nlink: bigint = 0n;
   size: bigint;
   atim: bigint = 0n;
   mtim: bigint = 0n;
   ctim: bigint = 0n;
 
-  constructor(filetype: number, size: bigint) {
+  constructor(ino: bigint, filetype: number, size: bigint) {
+    this.ino = ino;
     this.filetype = filetype;
     this.size = size;
   }

test/adapters/node/run-wasi.mjs

@@ -1,18 +1,20 @@
 #!/usr/bin/env node
 
 import fs from 'fs/promises';
-import { WASI, wasi, strace, OpenFile, File, Directory, PreopenDirectory, Fd } from "../../../dist/index.js"
+import { WASI, wasi, strace, OpenFile, File, Directory, PreopenDirectory, Fd, Inode } from "../../../dist/index.js"
 import { parseArgs } from "../shared/parseArgs.mjs"
 import { walkFs } from "../shared/walkFs.mjs"
 
 class NodeStdout extends Fd {
   constructor(out) {
     super();
     this.out = out;
+    this.ino = Inode.issue_ino();
   }
 
   fd_filestat_get() {
     const filestat = new wasi.Filestat(
+      this.ino,
       wasi.FILETYPE_CHARACTER_DEVICE,
       BigInt(0),
     );

threads/src/shared_array_buffer/ref.ts

@@ -521,9 +521,8 @@ export class WASIFarmRefUseArrayBuffer extends WASIFarmRef {
 
     this.release_fd(fd);
 
-    const file_stat = new wasi.Filestat(fs_filetype, fs_size);
+    const file_stat = new wasi.Filestat(fs_ino, fs_filetype, fs_size);
     file_stat.dev = fs_dev;
-    file_stat.ino = fs_ino;
     file_stat.nlink = fs_nlink;
     file_stat.atim = fs_atim;
     file_stat.mtim = fs_mtim;
@@ -1092,9 +1091,8 @@ export class WASIFarmRefUseArrayBuffer extends WASIFarmRef {
 
     this.release_fd(fd);
 
-    const file_stat = new wasi.Filestat(fs_filetype, fs_size);
+    const file_stat = new wasi.Filestat(fs_ino, fs_filetype, fs_size);
     file_stat.dev = fs_dev;
-    file_stat.ino = fs_ino;
     file_stat.nlink = fs_nlink;
     file_stat.atim = fs_atim;
     file_stat.mtim = fs_mtim;