WasmFS JS API: Change open to return an object (#19542)

This PR changes open to return an object with a fd property to match the legacy
JS API. close and read were updated to take in an object from open instead of an
fd, matching the JS API. Tests were also modified to remove ifdefs.

Author: jameshu15869

src/library_wasmfs.js

@@ -121,13 +121,14 @@ FS.createPreloadedFile = FS_createPreloadedFile;
       mode = typeof mode == 'undefined' ? 438 /* 0666 */ : mode;
       return withStackSave(() => {
         var buffer = stringToUTF8OnStack(path);
-        return FS.handleError(__wasmfs_open({{{ to64('buffer') }}}, flags, mode));
-      })
+        var fd = FS.handleError(__wasmfs_open({{{ to64('buffer') }}}, flags, mode));
+        return { fd : fd };
+      });
     },
     // TODO: create
     // TODO: close
-    close: (fd) => {
-      return FS.handleError(-__wasmfs_close(fd));
+    close: (stream) => {
+      return FS.handleError(-__wasmfs_close(stream.fd));
     },
     unlink: (path) => {
       return withStackSave(() => {
@@ -142,16 +143,16 @@ FS.createPreloadedFile = FS_createPreloadedFile;
       });
     },
     // TODO: read
-    read: (fd, buffer, offset, length, position) => {
+    read: (stream, buffer, offset, length, position) => {
       var seeking = typeof position != 'undefined';
 
       var dataBuffer = _malloc(length);
 
       var bytesRead;
       if (seeking) {
-        bytesRead = __wasmfs_pread(fd, dataBuffer, length, position);
+        bytesRead = __wasmfs_pread(stream.fd, dataBuffer, length, position);
       } else {
-        bytesRead = __wasmfs_read(fd, dataBuffer, length);
+        bytesRead = __wasmfs_read(stream.fd, dataBuffer, length);
       }
       bytesRead = FS.handleError(bytesRead);
 

test/fs/test_fs_js_api.c

@@ -9,17 +9,11 @@ int main() {
         var writeStream = FS.open('testfile', 'w');
         var writePlusStream = FS.open('testfile', 'w+');
         var appendStream = FS.open('testfile', 'a');
-#if WASMFS
-        assert(readStream >= 0);
-        assert(writeStream >= 0);
-        assert(writePlusStream >= 0);
-        assert(appendStream >= 0);
-#else
+
         assert(readStream && readStream.fd >= 0);
         assert(writeStream && writeStream.fd >= 0);
         assert(writePlusStream && writePlusStream.fd >= 0);
         assert(appendStream && appendStream.fd >= 0);
-#endif
 
         var ex;
         try {
@@ -30,11 +24,8 @@ int main() {
         assert(ex.name === "ErrnoError" && ex.errno === 44 /* ENOENT */);
 
         var createFileNotHere = FS.open('filenothere', 'w+');
-#if WASMFS
-        assert(createFileNotHere >= 0);
-#else
+
         assert(createFileNotHere && createFileNotHere.fd >= 0);
-#endif
     );
 
     /********** test FS.rename() **********/

test/unistd/access.c

@@ -73,11 +73,7 @@ int main() {
 
   EM_ASM(
     var fchmodstream = FS.open("fchmodtest", "r");
-#if WASMFS
-    FS.fchmod(fchmodstream, 0777);
-#else
     FS.fchmod(fchmodstream.fd, 0777);
-#endif
   );
   stat("fchmodtest", &fileStats);
   assert(fileStats.st_mode & 0777);