Fix buffer encoding bug

2 files changed, 17 insertions, 4 deletions

diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig
index 79e2c0618..e7f76c018 100644
--- a/src/bun.js/node/types.zig
+++ b/src/bun.js/node/types.zig
@@ -221,6 +221,10 @@ pub const StringOrBuffer = union(Tag) {
     }
 
     pub fn fromJS(global: *JSC.JSGlobalObject, allocator: std.mem.Allocator, value: JSC.JSValue, exception: JSC.C.ExceptionRef) ?StringOrBuffer {
+        if (!value.isCell()) {
+            var zig_str = value.toSlice(global, allocator);
+            return StringOrBuffer{ .string = zig_str.slice() };
+        }
         return switch (value.jsType()) {
             JSC.JSValue.JSType.String, JSC.JSValue.JSType.StringObject, JSC.JSValue.JSType.DerivedStringObject, JSC.JSValue.JSType.Object => {
                 var zig_str = value.toSlice(global, allocator);
@@ -418,7 +422,7 @@ pub const SliceOrBuffer = union(Tag) {
         }
 
         const out = brk: {
-            if (zig_str.is16Bit()) {
+            if (!zig_str.is16Bit()) {
                 const buf = zig_str.slice();
                 break :brk switch (encoding) {
                     Encoding.utf8 => JSC.WebCore.Encoder.constructFromU8(buf.ptr, buf.len, .utf8),
diff --git a/test/bun.js/node-crypto.test.js b/test/bun.js/node-crypto.test.js
index edd6f6e3d..227368760 100644
--- a/test/bun.js/node-crypto.test.js
+++ b/test/bun.js/node-crypto.test.js
@@ -1,8 +1,17 @@
 import { it, expect } from "bun:test";
 
-const nodeCrypto = require("node:crypto");
+import crypto from "node:crypto";
 
 it("crypto.randomBytes should return a Buffer", () => {
-  expect(nodeCrypto.randomBytes(1) instanceof Buffer).toBe(true);
-  expect(Buffer.isBuffer(nodeCrypto.randomBytes(1))).toBe(true);
+  expect(crypto.randomBytes(1) instanceof Buffer).toBe(true);
+  expect(Buffer.isBuffer(crypto.randomBytes(1))).toBe(true);
+});
+
+// https://github.com/oven-sh/bun/issues/1839
+it("crypto.createHash ", () => {
+  function fn() {
+    crypto.createHash("sha1").update(Math.random(), "ascii").digest("base64");
+  }
+
+  for (let i = 0; i < 10; i++) fn();
 });