fix: various fs support (bytecodealliance#267)

* fix: various fs support * lint fixes
manekinekko · Nov 21, 2023 · 1a9e5cd · 1a9e5cd
1 parent 839d8f3
commit 1a9e5cd
Show file tree

Hide file tree

Showing 114 changed files with 626 additions and 606 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ package-lock.json
 /docs/book
 /src/**/*.d.ts
 /src/**/*.d.ts.map
+/tests/rundir
diff --git a/crates/js-component-bindgen/src/function_bindgen.rs b/crates/js-component-bindgen/src/function_bindgen.rs
@@ -1038,7 +1038,7 @@ impl Bindgen for FunctionBindgen<'_> {
                     let to_result_string = self.intrinsic(Intrinsic::ToResultString);
                     uwriteln!(
                         self.src,
-                        "console.trace(`{prefix} return {}`);",
+                        "console.error(`{prefix} return {}`);",
                         if sig_results_length > 0 || !results.is_empty() {
                             format!("result=${{{to_result_string}(ret)}}")
                         } else {
@@ -1074,7 +1074,7 @@ impl Bindgen for FunctionBindgen<'_> {
                     let to_result_string = self.intrinsic(Intrinsic::ToResultString);
                     uwriteln!(
                         self.src,
-                        "console.trace(`{prefix} return {}`);",
+                        "console.error(`{prefix} return {}`);",
                         if results_length > 0 || !results.is_empty() {
                             format!("result=${{{to_result_string}(ret)}}")
                         } else {

diff --git a/crates/js-component-bindgen/src/transpile_bindgen.rs b/crates/js-component-bindgen/src/transpile_bindgen.rs
@@ -1269,7 +1269,7 @@ impl<'a> Instantiator<'a, '_> {
                 .collect::<Vec<String>>();
             uwriteln!(
                 self.src.js,
-                "console.trace(`{tracing_prefix} call {}`);",
+                "console.error(`{tracing_prefix} call {}`);",
                 event_fields.join(", ")
             );
         }

diff --git a/packages/preview2-shim/lib/io/worker-io.js b/packages/preview2-shim/lib/io/worker-io.js
@@ -48,7 +48,7 @@ if (DEBUG) {
       ret = e;
       throw ret;
     } finally {
-      console.trace(
+      process._rawDebug(
         (num & CALL_MASK) >> CALL_SHIFT,
         num & CALL_TYPE_MASK,
         id,

diff --git a/packages/preview2-shim/lib/io/worker-thread.js b/packages/preview2-shim/lib/io/worker-thread.js
@@ -1,6 +1,6 @@
 import { runAsWorker } from "../synckit/index.js";
 import { FILE, STDOUT, STDERR, STDIN } from "./stream-types.js";
-import { createReadStream } from "node:fs";
+import { createReadStream, createWriteStream } from "node:fs";
 import { Readable } from "node:stream";
 import { hrtime } from "node:process";
 import {
@@ -64,7 +64,6 @@ unfinishedStreams.set(++streamCnt, {
 });
 
 /**
- *
  * @param {number} streamId
  * @param {NodeJS.ReadableStream | NodeJS.WritableStream} stream
  */
@@ -79,7 +78,6 @@ function streamError(streamId, stream, err) {
 }
 
 /**
- *
  * @param {number} streamId
  * @returns {{ stream: NodeJS.ReadableStream | NodeJS.WritableStream, flushPromise: Promise<void> | null }}
  */
@@ -153,9 +151,21 @@ function handle(call, id, payload) {
       stream.on("end", () => void stream.emit("readable"));
       return streamCnt;
     }
-    case OUTPUT_STREAM_CREATE | FILE:
-      throw new Error("todo: file write");
-
+    case OUTPUT_STREAM_CREATE | FILE: {
+      const { fd, offset } = payload;
+      const stream = createWriteStream(null, {
+        fd,
+        autoClose: false,
+        emitClose: false,
+        highWaterMark: 64 * 1024,
+        start: Number(offset)
+      });
+      unfinishedStreams.set(++streamCnt, {
+        flushPromise: null,
+        stream,
+      });
+      return streamCnt;
+    }
     // Generic call implementations (streams + polls)
     default:
       switch (call & CALL_MASK) {
@@ -246,13 +256,12 @@ function handle(call, id, payload) {
               new Error("Cannot write more than permitted writable length")
             );
           }
-
           return new Promise((resolve, reject) => {
-            stream.write(payload, (err) =>
-              err
-                ? reject(streamError(id, stream, err))
-                : resolve(BigInt(payload.byteLength))
-            );
+            stream.write(payload, err => {
+              if (err)
+               return void reject(streamError(id, stream, err));
+              resolve(BigInt(payload.byteLength));
+            });
           });
         }
         case OUTPUT_STREAM_FLUSH: {