fix invalid this errors on node:buffer

cloudflare · Oct 11, 2024 · 820cc96 · 820cc96
1 parent d0d4af1
commit 820cc96
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/node/buffer.ts b/src/node/buffer.ts
@@ -13,8 +13,8 @@ import {
   transcode,
 } from 'node-internal:internal_buffer';
 
-const atob = globalThis.atob;
-const btoa = globalThis.btoa;
+const atob = globalThis.atob.bind(globalThis);
+const btoa = globalThis.btoa.bind(globalThis);
 const Blob = globalThis.Blob;
 const File = globalThis.File;
 

diff --git a/src/workerd/api/node/tests/buffer-nodejs-test.js b/src/workerd/api/node/tests/buffer-nodejs-test.js
@@ -6157,3 +6157,15 @@ export const sliceOffsetLimits = {
     strictEqual(Buffer.from('abcd').utf8Slice(1, 0).toString(), '');
   },
 };
+
+// Ref: https://github.com/unjs/unenv/pull/325
+// Without `.bind(globalThis)` the following tests fail.
+export const invalidThisTests = {
+  async test() {
+    const bufferModule = await import('node:buffer');
+    strictEqual(bufferModule.btoa("hello"), "aGVsbG8=");
+    strictEqual(bufferModule.atob("aGVsbG8="), "hello");
+    ok(new bufferModule.File([], "file"));
+    ok(new bufferModule.Blob([]));
+  },
+};
diff --git a/src/workerd/api/node/tests/node-compat-v2-test.js b/src/workerd/api/node/tests/node-compat-v2-test.js
@@ -83,9 +83,11 @@ export const nodeJsBufferExports = {
     // Expected node:buffer exports should be present
     const { atob, btoa, Blob } = await import('node:buffer');
     assert.notEqual(atob, undefined);
-    assert.strictEqual(atob, globalThis.atob);
     assert.notEqual(btoa, undefined);
-    assert.strictEqual(btoa, globalThis.btoa);
+    // We cannot do strictEqual with atob and globalThis.atob
+    // since, buffer module exports them with `.bind(globalThis)`
+    assert.strictEqual(typeof atob, 'function');
+    assert.strictEqual(typeof btoa, 'function');
     assert.notEqual(Blob, undefined);
     assert.strictEqual(Blob, globalThis.Blob);
   },