diff --git a/node.gyp b/node.gyp index dafb9ce20b0368..6a3a8c015e71c0 100644 --- a/node.gyp +++ b/node.gyp @@ -332,6 +332,7 @@ 'src/node_contextify.cc', 'src/node_debug_options.cc', 'src/node_domain.cc', + 'src/node_encoding.cc', 'src/node_errors.h', 'src/node_file.cc', 'src/node_http2.cc', diff --git a/src/node.cc b/src/node.cc index 5d9b611b336c60..69f44fc3fb7c78 100644 --- a/src/node.cc +++ b/src/node.cc @@ -769,129 +769,6 @@ Local MakeCallback(Isolate* isolate, .FromMaybe(Local())); } - -enum encoding ParseEncoding(const char* encoding, - enum encoding default_encoding) { - switch (encoding[0]) { - case 'u': - // utf8, utf16le - if (encoding[1] == 't' && encoding[2] == 'f') { - // Skip `-` - encoding += encoding[3] == '-' ? 4 : 3; - if (encoding[0] == '8' && encoding[1] == '\0') - return UTF8; - if (strncmp(encoding, "16le", 4) == 0) - return UCS2; - - // ucs2 - } else if (encoding[1] == 'c' && encoding[2] == 's') { - encoding += encoding[3] == '-' ? 4 : 3; - if (encoding[0] == '2' && encoding[1] == '\0') - return UCS2; - } - break; - case 'l': - // latin1 - if (encoding[1] == 'a') { - if (strncmp(encoding + 2, "tin1", 4) == 0) - return LATIN1; - } - break; - case 'b': - // binary - if (encoding[1] == 'i') { - if (strncmp(encoding + 2, "nary", 4) == 0) - return LATIN1; - - // buffer - } else if (encoding[1] == 'u') { - if (strncmp(encoding + 2, "ffer", 4) == 0) - return BUFFER; - } - break; - case '\0': - return default_encoding; - default: - break; - } - - if (StringEqualNoCase(encoding, "utf8")) { - return UTF8; - } else if (StringEqualNoCase(encoding, "utf-8")) { - return UTF8; - } else if (StringEqualNoCase(encoding, "ascii")) { - return ASCII; - } else if (StringEqualNoCase(encoding, "base64")) { - return BASE64; - } else if (StringEqualNoCase(encoding, "ucs2")) { - return UCS2; - } else if (StringEqualNoCase(encoding, "ucs-2")) { - return UCS2; - } else if (StringEqualNoCase(encoding, "utf16le")) { - return UCS2; - } else if (StringEqualNoCase(encoding, "utf-16le")) { - return UCS2; - } else if (StringEqualNoCase(encoding, "latin1")) { - return LATIN1; - } else if (StringEqualNoCase(encoding, "binary")) { - return LATIN1; // BINARY is a deprecated alias of LATIN1. - } else if (StringEqualNoCase(encoding, "buffer")) { - return BUFFER; - } else if (StringEqualNoCase(encoding, "hex")) { - return HEX; - } else { - return default_encoding; - } -} - - -enum encoding ParseEncoding(Isolate* isolate, - Local encoding_v, - enum encoding default_encoding) { - CHECK(!encoding_v.IsEmpty()); - - if (!encoding_v->IsString()) - return default_encoding; - - node::Utf8Value encoding(isolate, encoding_v); - - return ParseEncoding(*encoding, default_encoding); -} - -Local Encode(Isolate* isolate, - const char* buf, - size_t len, - enum encoding encoding) { - CHECK_NE(encoding, UCS2); - Local error; - return StringBytes::Encode(isolate, buf, len, encoding, &error) - .ToLocalChecked(); -} - -Local Encode(Isolate* isolate, const uint16_t* buf, size_t len) { - Local error; - return StringBytes::Encode(isolate, buf, len, &error) - .ToLocalChecked(); -} - -// Returns -1 if the handle was not valid for decoding -ssize_t DecodeBytes(Isolate* isolate, - Local val, - enum encoding encoding) { - HandleScope scope(isolate); - - return StringBytes::Size(isolate, val, encoding); -} - -// Returns number of bytes written. -ssize_t DecodeWrite(Isolate* isolate, - char* buf, - size_t buflen, - Local val, - enum encoding encoding) { - return StringBytes::Write(isolate, buf, buflen, val, encoding, nullptr); -} - bool IsExceptionDecorated(Environment* env, Local er) { if (!er.IsEmpty() && er->IsObject()) { Local err_obj = er.As(); diff --git a/src/node_encoding.cc b/src/node_encoding.cc new file mode 100644 index 00000000000000..467f04e24568cb --- /dev/null +++ b/src/node_encoding.cc @@ -0,0 +1,138 @@ +#include "node.h" +#include "env.h" +#include "env-inl.h" +#include "string_bytes.h" +#include "util.h" +#include "util-inl.h" +#include "v8.h" + +namespace node { + +using v8::HandleScope; +using v8::Isolate; +using v8::Local; +using v8::Value; + +enum encoding ParseEncoding(const char* encoding, + enum encoding default_encoding) { + switch (encoding[0]) { + case 'u': + // utf8, utf16le + if (encoding[1] == 't' && encoding[2] == 'f') { + // Skip `-` + encoding += encoding[3] == '-' ? 4 : 3; + if (encoding[0] == '8' && encoding[1] == '\0') + return UTF8; + if (strncmp(encoding, "16le", 4) == 0) + return UCS2; + + // ucs2 + } else if (encoding[1] == 'c' && encoding[2] == 's') { + encoding += encoding[3] == '-' ? 4 : 3; + if (encoding[0] == '2' && encoding[1] == '\0') + return UCS2; + } + break; + case 'l': + // latin1 + if (encoding[1] == 'a') { + if (strncmp(encoding + 2, "tin1", 4) == 0) + return LATIN1; + } + break; + case 'b': + // binary + if (encoding[1] == 'i') { + if (strncmp(encoding + 2, "nary", 4) == 0) + return LATIN1; + + // buffer + } else if (encoding[1] == 'u') { + if (strncmp(encoding + 2, "ffer", 4) == 0) + return BUFFER; + } + break; + case '\0': + return default_encoding; + default: + break; + } + + if (StringEqualNoCase(encoding, "utf8")) { + return UTF8; + } else if (StringEqualNoCase(encoding, "utf-8")) { + return UTF8; + } else if (StringEqualNoCase(encoding, "ascii")) { + return ASCII; + } else if (StringEqualNoCase(encoding, "base64")) { + return BASE64; + } else if (StringEqualNoCase(encoding, "ucs2")) { + return UCS2; + } else if (StringEqualNoCase(encoding, "ucs-2")) { + return UCS2; + } else if (StringEqualNoCase(encoding, "utf16le")) { + return UCS2; + } else if (StringEqualNoCase(encoding, "utf-16le")) { + return UCS2; + } else if (StringEqualNoCase(encoding, "latin1")) { + return LATIN1; + } else if (StringEqualNoCase(encoding, "binary")) { + return LATIN1; // BINARY is a deprecated alias of LATIN1. + } else if (StringEqualNoCase(encoding, "buffer")) { + return BUFFER; + } else if (StringEqualNoCase(encoding, "hex")) { + return HEX; + } else { + return default_encoding; + } +} + + +enum encoding ParseEncoding(Isolate* isolate, + Local encoding_v, + enum encoding default_encoding) { + CHECK(!encoding_v.IsEmpty()); + + if (!encoding_v->IsString()) + return default_encoding; + + Utf8Value encoding(isolate, encoding_v); + + return ParseEncoding(*encoding, default_encoding); +} + +Local Encode(Isolate* isolate, + const char* buf, + size_t len, + enum encoding encoding) { + CHECK_NE(encoding, UCS2); + Local error; + return StringBytes::Encode(isolate, buf, len, encoding, &error) + .ToLocalChecked(); +} + +Local Encode(Isolate* isolate, const uint16_t* buf, size_t len) { + Local error; + return StringBytes::Encode(isolate, buf, len, &error) + .ToLocalChecked(); +} + +// Returns -1 if the handle was not valid for decoding +ssize_t DecodeBytes(Isolate* isolate, + Local val, + enum encoding encoding) { + HandleScope scope(isolate); + + return StringBytes::Size(isolate, val, encoding); +} + +// Returns number of bytes written. +ssize_t DecodeWrite(Isolate* isolate, + char* buf, + size_t buflen, + Local val, + enum encoding encoding) { + return StringBytes::Write(isolate, buf, buflen, val, encoding, nullptr); +} + +} // namespace node