Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

draft: implement bufferToString #45562

Closed
wants to merge 9 commits into from
Closed

draft: implement bufferToString #45562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7106dc3
src: implement bufferToString
kiliczsh Nov 21, 2022
ab2c5b4
src: update bufferToString
kiliczsh Nov 21, 2022
48798ef
src: bufferToString argument checks
kiliczsh Nov 21, 2022
698f5e2
src: add string case for bufferToString
kiliczsh Nov 21, 2022
0be4196
src: fix errors for bufferToString
kiliczsh Nov 21, 2022
d84a7d4
src: add string case
kiliczsh Nov 21, 2022
bb557ae
src: fix check error and add string case
kiliczsh Nov 22, 2022
778ec39
src: add IsSharedArrayBuffer
kiliczsh Nov 22, 2022
b8cd296
src: fix for string
kiliczsh Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const {

const {
byteLengthUtf8,
bufferToString,
compare: _compare,
compareOffset,
createFromString,
Expand Down Expand Up @@ -1237,8 +1238,7 @@ function btoa(input) {
if (input[n].charCodeAt(0) > 0xff)
throw lazyDOMException('Invalid character', 'InvalidCharacterError');
}
const buf = Buffer.from(input, 'latin1');
return buf.toString('base64');
return bufferToString(input, 'latin1', 'base64');
}

// Refs: https://infra.spec.whatwg.org/#forgiving-base64-decode
Expand Down
38 changes: 38 additions & 0 deletions src/node_buffer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,42 @@ MaybeLocal<Object> New(Environment* env,

namespace {

// TODO(kiliczsh): Buffer.from(buf, fromEnc).toString(buf, toEnc)
void BufferToString(const FunctionCallbackInfo<Value>& args) {
CHECK_GE(args.Length(), 3);
CHECK(args[0]->IsString() || args[0]->IsArrayBuffer() ||
args[0]->IsSharedArrayBuffer() || args[0]->IsArrayBufferView());
CHECK(args[1]->IsString());
CHECK(args[2]->IsString());

Environment* env = Environment::GetCurrent(args);
Isolate* isolate = env->isolate();

enum encoding from_encoding = ParseEncoding(isolate, args[1], UTF8);
enum encoding to_encoding = ParseEncoding(isolate, args[2], UTF8);

Local<Value> error;
Local<Value> ret;
MaybeLocal<Value> maybe_ret;

if (args[0]->IsArrayBuffer() || args[0]->IsSharedArrayBuffer() ||
args[0]->IsArrayBufferView()) {
ArrayBufferViewContents<char> buffer(args[0]);
if (buffer.length() == 0) { return args.GetReturnValue().SetEmptyString(); }
maybe_ret = StringBytes::Encode(isolate, buffer.data(), buffer.length(), from_encoding, &error);
} else if (args[0]->IsString()) {
String::Utf8Value value(isolate, args[0].As<String>());
char* str(*value);
maybe_ret = StringBytes::Encode(isolate, str, to_encoding, &error);
}
if (!maybe_ret.ToLocal(&ret)) {
CHECK(!error.IsEmpty());
isolate->ThrowException(error);
return;
}
args.GetReturnValue().Set(ret);
}

void CreateFromString(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsString());
CHECK(args[1]->IsInt32());
Expand Down Expand Up @@ -1325,6 +1361,7 @@ void Initialize(Local<Object> target,

SetMethod(context, target, "setBufferPrototype", SetBufferPrototype);
SetMethodNoSideEffect(context, target, "createFromString", CreateFromString);
SetMethodNoSideEffect(context, target, "bufferToString", BufferToString);
SetMethodNoSideEffect(context, target, "decodeUTF8", DecodeUTF8);

SetMethodNoSideEffect(context, target, "byteLengthUtf8", ByteLengthUtf8);
Expand Down Expand Up @@ -1382,6 +1419,7 @@ void Initialize(Local<Object> target,

void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(SetBufferPrototype);
registry->Register(BufferToString);
registry->Register(CreateFromString);
registry->Register(DecodeUTF8);

Expand Down