Buffer, refactor: use encoding.encode to build Bufer from string.

fibjs · Jun 19, 2023 · 2373c4c · 2373c4c
1 parent f7adbc0
commit 2373c4c
Show file tree

Hide file tree

Showing 2 changed files with 254 additions and 248 deletions.
diff --git a/fibjs/scripts/buffer.js b/fibjs/scripts/buffer.js
@@ -306,15 +306,19 @@ class Buffer extends Uint8Array {
                 super(allocPool, offset, bufferOrLength);
         }
         else if (typeof bufferOrLength === 'string') {
-            var byte_length = Buffer.byteLength(bufferOrLength, byte_offset);
-
-            let offset = getPool(byte_length);
-            if (offset === -1)
-                super(byte_length);
-            else
-                super(allocPool, offset, byte_length);
-
-            this.write(bufferOrLength, byte_offset);
+            var codec = byte_offset;
+            if (codec === undefined || codec === 'utf8' || codec === 'utf-8' || codec == 'ascii' || codec === 'binary') {
+                var byte_length = Buffer.byteLength(bufferOrLength, codec);
+
+                let offset = getPool(byte_length);
+                if (offset === -1)
+                    super(byte_length);
+                else
+                    super(allocPool, offset, byte_length);
+
+                this.write(bufferOrLength, codec);
+            } else
+                super(encoding.decode(bufferOrLength, codec).buffer);
         }
         else if (bufferOrLength instanceof Uint8Array || Array.isArray(bufferOrLength))
             super(bufferOrLength);