bare-buffer 3.2.0 → 3.3.1

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

@@ -7,22 +7,26 @@
 #include <string.h>
 #include <utf.h>
 
+static void
+bare_buffer__on_finalize_string(js_env_t *env, void *data, void *finalize_hint) {
+  free(data);
+}
+
 static inline int
-bare_buffer__memcmp(void *a, size_t a_len, void *b, size_t b_len) {
-  int r = memcmp(a, b, a_len < b_len ? a_len : b_len);
+bare_buffer__get_info(js_env_t *env, js_value_t *buffer, void **data, size_t *len) {
+  int err;
 
-  if (r == 0) {
-    if (a_len < b_len) return -1;
-    if (a_len > b_len) return 1;
-    return 0;
-  }
+  bool is_shared;
+  err = js_is_sharedarraybuffer(env, buffer, &is_shared);
+  if (err < 0) return err;
 
-  return r < 0 ? -1 : 1;
-}
+  if (is_shared) {
+    err = js_get_sharedarraybuffer_info(env, buffer, data, len);
+  } else {
+    err = js_get_arraybuffer_info(env, buffer, data, len);
+  }
 
-static void
-bare_buffer__on_finalize_string(js_env_t *env, void *data, void *finalize_hint) {
-  free(data);
+  return err;
 }
 
 static js_value_t *
@@ -122,7 +126,7 @@ bare_buffer_to_string_utf8(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 3);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -156,7 +160,7 @@ bare_buffer_typed_write_utf8(
   assert(err == 0);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   size_t str_len;
@@ -179,7 +183,7 @@ bare_buffer_write_utf8(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 4);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -214,7 +218,7 @@ bare_buffer_to_string_utf16le(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 3);
 
   utf16_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -251,7 +255,7 @@ bare_buffer_typed_write_utf16le(
   assert(err == 0);
 
   utf16_t *buf;
-  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   offset /= sizeof(utf16_t);
@@ -279,7 +283,7 @@ bare_buffer_write_utf16le(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 4);
 
   utf16_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -319,7 +323,7 @@ bare_buffer_to_string_latin1(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 3);
 
   latin1_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -353,7 +357,7 @@ bare_buffer_typed_write_latin1(
   assert(err == 0);
 
   latin1_t *buf;
-  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   size_t str_len;
@@ -376,7 +380,7 @@ bare_buffer_write_latin1(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 4);
 
   latin1_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -411,7 +415,7 @@ bare_buffer_to_string_base64(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 3);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -437,6 +441,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 = bare_buffer__get_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,
@@ -453,7 +496,7 @@ bare_buffer_typed_write_base64(
   assert(err == 0);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -468,10 +511,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);
@@ -493,7 +544,7 @@ bare_buffer_write_base64(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 4);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -516,10 +567,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);
@@ -545,7 +604,7 @@ bare_buffer_to_string_hex(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 3);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -587,7 +646,7 @@ bare_buffer_typed_write_hex(
   assert(err == 0);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -602,10 +661,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);
@@ -627,7 +694,7 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 4);
 
   utf8_t *buf;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &buf, NULL);
   assert(err == 0);
 
   int64_t offset;
@@ -650,10 +717,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);
@@ -666,6 +741,19 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
+static inline int
+bare_buffer__memcmp(void *a, size_t a_len, void *b, size_t b_len) {
+  int r = memcmp(a, b, a_len < b_len ? a_len : b_len);
+
+  if (r == 0) {
+    if (a_len < b_len) return -1;
+    if (a_len > b_len) return 1;
+    return 0;
+  }
+
+  return r < 0 ? -1 : 1;
+}
+
 static int32_t
 bare_buffer_typed_compare(
   js_value_t *receiver,
@@ -684,11 +772,11 @@ bare_buffer_typed_compare(
   assert(err == 0);
 
   uint8_t *a;
-  err = js_get_arraybuffer_info(env, a_handle, (void **) &a, NULL);
+  err = bare_buffer__get_info(env, a_handle, (void **) &a, NULL);
   assert(err == 0);
 
   uint8_t *b;
-  err = js_get_arraybuffer_info(env, b_handle, (void **) &b, NULL);
+  err = bare_buffer__get_info(env, b_handle, (void **) &b, NULL);
   assert(err == 0);
 
   return bare_buffer__memcmp(&a[a_offset], a_len, &b[b_offset], b_len);
@@ -707,7 +795,7 @@ bare_buffer_compare(js_env_t *env, js_callback_info_t *info) {
   assert(argc == 6);
 
   uint8_t *a;
-  err = js_get_arraybuffer_info(env, argv[0], (void **) &a, NULL);
+  err = bare_buffer__get_info(env, argv[0], (void **) &a, NULL);
   assert(err == 0);
 
   int64_t a_offset;
@@ -719,7 +807,7 @@ bare_buffer_compare(js_env_t *env, js_callback_info_t *info) {
   assert(err == 0);
 
   uint8_t *b;
-  err = js_get_arraybuffer_info(env, argv[3], (void **) &b, NULL);
+  err = bare_buffer__get_info(env, argv[3], (void **) &b, NULL);
   assert(err == 0);
 
   int64_t b_offset;
@@ -864,6 +952,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/global.d.ts

@@ -6,4 +6,7 @@ declare global {
   type Buffer = buffer.Buffer
 
   const Buffer: BufferConstructor
+
+  const atob: typeof buffer.atob
+  const atob: typeof buffer.btoa
 }

package/global.js

@@ -1 +1,6 @@
-global.Buffer = require('.')
+const Buffer = require('.')
+
+global.Buffer = Buffer
+
+global.atob = Buffer.atob
+global.btoa = Buffer.btoa

package/index.d.ts

@@ -181,6 +181,9 @@ declare namespace Buffer {
     length?: number
   ): Buffer
 
+  export function atob(data: unknown): string
+  export function btoa(data: unknown): string
+
   export { Buffer, type BufferEncoding, constants }
 }
 

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()
@@ -740,3 +742,13 @@ function swap(buffer, n, m) {
   buffer[n] = buffer[m]
   buffer[m] = i
 }
+
+exports.atob = function atob(data) {
+  return Buffer.from(data, 'base64').toString('latin1')
+}
+
+exports.btoa = function btoa(data) {
+  if (typeof data !== 'string') data = String(data)
+
+  return Buffer.from(data, 'latin1').toString('base64')
+}

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.1",
   "description": "Native buffers for JavaScript",
   "exports": {
     "./package": "./package.json",