bare-buffer 3.2.0 → 3.3.0

package/CMakeLists.txt

@@ -6,7 +6,7 @@ find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 project(bare_buffer C)
 
 fetch_package("github:holepunchto/libutf#9509b28")
-fetch_package("github:holepunchto/libbase64#cded073")
+fetch_package("github:holepunchto/libbase64#86afd29")
 fetch_package("github:holepunchto/libhex#1dfad95")
 
 add_bare_module(bare_buffer)

package/binding.c

@@ -437,6 +437,45 @@ bare_buffer_to_string_base64(js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
+static js_value_t *
+bare_buffer_to_string_base64url(js_env_t *env, js_callback_info_t *info) {
+  int err;
+
+  size_t argc = 3;
+  js_value_t *argv[3];
+
+  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  assert(err == 0);
+
+  assert(argc == 3);
+
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  assert(err == 0);
+
+  int64_t offset;
+  err = js_get_value_int64(env, argv[1], &offset);
+  assert(err == 0);
+
+  int64_t len;
+  err = js_get_value_int64(env, argv[2], &len);
+  assert(err == 0);
+
+  size_t str_len;
+  err = base64url_encode_utf8(&buf[offset], len, NULL, &str_len);
+  assert(err == 0);
+
+  utf8_t *str = malloc(str_len);
+  err = base64url_encode_utf8(&buf[offset], len, str, &str_len);
+  assert(err == 0);
+
+  js_value_t *result;
+  err = js_create_external_string_latin1(env, str, str_len, bare_buffer__on_finalize_string, NULL, &result, NULL);
+  assert(err == 0);
+
+  return result;
+}
+
 static int64_t
 bare_buffer_typed_write_base64(
   js_value_t *receiver,
@@ -468,10 +507,18 @@ bare_buffer_typed_write_base64(
 
   if (encoding == js_utf16le) {
     err = base64_decode_utf16le(str, str_len, &buf[offset], &written);
-    assert(err == 0);
   } else {
     err = base64_decode_utf8(str, str_len, &buf[offset], &written);
+  }
+
+  if (err != 0) {
+    err = js_throw_error(env, NULL, "Invalid input");
     assert(err == 0);
+
+    err = js_release_string_view(env, str_view);
+    assert(err == 0);
+
+    return 0;
   }
 
   err = js_release_string_view(env, str_view);
@@ -516,10 +563,18 @@ bare_buffer_write_base64(js_env_t *env, js_callback_info_t *info) {
 
   if (encoding == js_utf16le) {
     err = base64_decode_utf16le(str, str_len, &buf[offset], &written);
-    assert(err == 0);
   } else {
     err = base64_decode_utf8(str, str_len, &buf[offset], &written);
+  }
+
+  if (err != 0) {
+    err = js_throw_error(env, NULL, "Invalid input");
     assert(err == 0);
+
+    err = js_release_string_view(env, str_view);
+    assert(err == 0);
+
+    return NULL;
   }
 
   err = js_release_string_view(env, str_view);
@@ -602,10 +657,18 @@ bare_buffer_typed_write_hex(
 
   if (encoding == js_utf16le) {
     err = hex_decode_utf16le(str, str_len, &buf[offset], &written);
-    assert(err == 0);
   } else {
     err = hex_decode_utf8(str, str_len, &buf[offset], &written);
+  }
+
+  if (err != 0) {
+    err = js_throw_error(env, NULL, "Invalid input");
+    assert(err == 0);
+
+    err = js_release_string_view(env, str_view);
     assert(err == 0);
+
+    return 0;
   }
 
   err = js_release_string_view(env, str_view);
@@ -650,10 +713,18 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
 
   if (encoding == js_utf16le) {
     err = hex_decode_utf16le(str, str_len, &buf[offset], &written);
-    assert(err == 0);
   } else {
     err = hex_decode_utf8(str, str_len, &buf[offset], &written);
+  }
+
+  if (err != 0) {
+    err = js_throw_error(env, NULL, "Invalid input");
     assert(err == 0);
+
+    err = js_release_string_view(env, str_view);
+    assert(err == 0);
+
+    return NULL;
   }
 
   err = js_release_string_view(env, str_view);
@@ -864,6 +935,7 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
   );
 
   V("toStringBase64", bare_buffer_to_string_base64, NULL, NULL);
+  V("toStringBase64URL", bare_buffer_to_string_base64url, NULL, NULL);
 
   V(
     "writeBase64",

package/index.js

@@ -1,6 +1,7 @@
 const constants = require('./lib/constants')
 const ascii = require('./lib/ascii')
 const base64 = require('./lib/base64')
+const base64url = require('./lib/base64url')
 const hex = require('./lib/hex')
 const utf8 = require('./lib/utf8')
 const utf16le = require('./lib/utf16le')
@@ -536,6 +537,7 @@ const codecs = Object.create(null)
 
 codecs.ascii = ascii
 codecs.base64 = base64
+codecs.base64url = base64url
 codecs.hex = hex
 codecs.utf8 = codecs['utf-8'] = utf8
 codecs.utf16le = codecs.ucs2 = codecs['utf-16le'] = codecs['ucs-2'] = utf16le
@@ -548,7 +550,7 @@ function codecFor(encoding = 'utf8') {
 
   if (encoding in codecs) return codecs[encoding]
 
-  throw new Error(`Unknown encoding: ${encoding}`)
+  throw new Error(`Unknown encoding '${encoding}'`)
 }
 
 const views = new WeakMap()

package/lib/base64url.js

@@ -0,0 +1,27 @@
+const binding = require('../binding')
+
+exports.byteLength = function byteLength(string) {
+  let len = string.length
+
+  if (string.charCodeAt(len - 1) === 0x3d) len--
+  if (len > 1 && string.charCodeAt(len - 1) === 0x3d) len--
+
+  return (len * 3) >>> 2
+}
+
+exports.toString = function toString(buffer) {
+  return binding.toStringBase64URL(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
+
+exports.write = function write(buffer, string) {
+  return binding.writeBase64(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Native buffers for JavaScript",
   "exports": {
     "./package": "./package.json",