refactor(node/buffer): update buffer to be cloudflare compat module

src/presets/cloudflare.ts

@@ -3,14 +3,15 @@ import type { Preset } from "../types";
 // Built-in APIs provided by workerd.
 // https://developers.cloudflare.com/workers/runtime-apis/nodejs/
 // https://github.com/cloudflare/workerd/tree/main/src/node
-// Last checked: 2024-05-11
+// Last checked: 2024-10-15
 const cloudflareNodeCompatModules = [
  "_stream_duplex",
  "_stream_passthrough",
  "_stream_readable",
  "_stream_transform",
  "_stream_writable",
  "assert",
+ "buffer",
  "diagnostics_channel",
  "events",
  "path",
@@ -19,6 +20,7 @@ const cloudflareNodeCompatModules = [
  "stream/promises",
  "stream/web",
  "string_decoder",
+ "sys",
  "util/types",
  "zlib",
 ];
@@ -28,7 +30,6 @@ const cloudflareNodeCompatModules = [
 const hybridNodeCompatModules = [
  "async_hooks",
  "console",
- "buffer",
  "crypto",
  "module",
  "process",
@@ -47,9 +48,6 @@ const cloudflarePreset: Preset = {
  // The `node:assert` implementation of workerd uses strict semantics by default
  "assert/strict": "node:assert",
  "node:assert/strict": "node:assert",
- // The `node:sys` module is just a deprecated alias for `node:util` which we implemented using a hybrid polyfill
- sys: "unenv/runtime/node/util/$cloudflare",
- "node:sys": "unenv/runtime/node/util/$cloudflare",
 
  // define aliases for hybrid modules
  ...Object.fromEntries(

src/runtime/node/buffer/index.ts

@@ -22,8 +22,8 @@ export const transcode = notImplemented("buffer.transcode");
 export const isUtf8 = notImplemented("buffer.isUtf8");
 export const isAscii = notImplemented("buffer.isAscii");
 
-export const btoa = global.btoa;
-export const atob = globalThis.atob;
+export const btoa = globalThis.btoa.bind(globalThis);
+export const atob = globalThis.atob.bind(globalThis);
 
 export const kStringMaxLength = 0; // TODO
 export const constants = {

test/workerd/tests.mjs

@@ -1,4 +1,5 @@
 import assert from "node:assert";
+import { createRequire } from "node:module";
 import process from "node:process";
 
 globalThis.process = process;
@@ -33,17 +34,32 @@ export const url_parse = {
 
 // --- node:buffer
 
-export const buffer_implements = {
+export const unenv_polyfills_buffer = {
  async test() {
- const encoder = new TextEncoder();
  const buffer = await import("unenv/runtime/node/buffer");
  const Buffer = buffer.Buffer;
+ assert.strictEqual(typeof buffer.isAscii, "function");
+ assert.strictEqual(typeof buffer.isUtf8, "function");
+ assert.strictEqual(buffer.btoa("hello"), "aGVsbG8=");
+ assert.strictEqual(buffer.atob("aGVsbG8="), "hello");
+ assert.strictEqual(typeof buffer.transcode, "function");
+ assert.strictEqual(typeof buffer.File, "function");
+ assert.strictEqual(typeof buffer.Blob, "function");
+ assert.strictEqual(typeof buffer.INSPECT_MAX_BYTES, "number");
+ assert.strictEqual(typeof buffer.resolveObjectURL, "function");
+ assert.strictEqual(typeof Buffer.from, "function");
+ },
+};
+
+export const workerd_implements_buffer = {
+ async test() {
+ const encoder = new TextEncoder();
+ const buffer = await import("node:buffer");
+ const Buffer = buffer.Buffer;
  assert.strictEqual(buffer.isAscii(encoder.encode("hello world")), true);
  assert.strictEqual(buffer.isUtf8(encoder.encode("Yağız")), true);
- // TODO: enable this once atob and btoa invalid this bug is resolved.
- // Ref: https://github.com/cloudflare/workerd/pull/2907
- // assert.strictEqual(buffer.btoa("hello"), "aGVsbG8=");
- // assert.strictEqual(buffer.atob("aGVsbG8="), "hello");
+ assert.strictEqual(buffer.btoa("hello"), "aGVsbG8=");
+ assert.strictEqual(buffer.atob("aGVsbG8="), "hello");
  {
  const dest = buffer.transcode(
  Buffer.from([
@@ -60,6 +76,20 @@ export const buffer_implements = {
  }
  assert.ok(new buffer.File([], "file"));
  assert.ok(new buffer.Blob([]));
+ assert.strictEqual(typeof buffer.INSPECT_MAX_BYTES, "number");
+ assert.strictEqual(typeof buffer.resolveObjectURL, "function");
+ },
+};
+
+// --- workerd modules
+
+export const workerd_modules = {
+ async test() {
+ const require = createRequire("/");
+ const modules = ["node:buffer", "node:sys"];
+ for (const m of modules) {
+ assert.strictEqual(await import(m), require(m));
+ }
  },
 };