bare-buffer 3.1.3 → 3.2.0

package/binding.c

@@ -7,8 +7,6 @@
 #include <string.h>
 #include <utf.h>
 
-static js_type_tag_t bare_buffer__tag = {0xfea3e944b70b0812, 0xe53bb5c343c040b6};
-
 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);
@@ -23,7 +21,7 @@ bare_buffer__memcmp(void *a, size_t a_len, void *b, size_t b_len) {
 }
 
 static void
-bare_buffer__on_free_string(js_env_t *env, void *data, void *finalize_hint) {
+bare_buffer__on_finalize_string(js_env_t *env, void *data, void *finalize_hint) {
   free(data);
 }
 
@@ -39,8 +37,8 @@ bare_buffer_alloc(js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  uint32_t len;
-  err = js_get_value_uint32(env, argv[0], &len);
+  int64_t len;
+  err = js_get_value_int64(env, argv[0], &len);
   assert(err == 0);
 
   js_value_t *result;
@@ -62,8 +60,8 @@ bare_buffer_alloc_unsafe(js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  uint32_t len;
-  err = js_get_value_uint32(env, argv[0], &len);
+  int64_t len;
+  err = js_get_value_int64(env, argv[0], &len);
   assert(err == 0);
 
   js_value_t *result;
@@ -73,7 +71,7 @@ bare_buffer_alloc_unsafe(js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
-static uint32_t
+static int64_t
 bare_buffer_typed_byte_length_utf8(js_value_t *receiver, js_value_t *str, js_typed_callback_info_t *info) {
   int err;
 
@@ -85,7 +83,7 @@ bare_buffer_typed_byte_length_utf8(js_value_t *receiver, js_value_t *str, js_typ
   err = js_get_value_string_utf8(env, str, NULL, 0, &str_len);
   assert(err == 0);
 
-  return (uint32_t) str_len;
+  return str_len;
 }
 
 static js_value_t *
@@ -105,7 +103,7 @@ bare_buffer_byte_length_utf8(js_env_t *env, js_callback_info_t *info) {
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) str_len, &result);
+  err = js_create_int64(env, str_len, &result);
   assert(err == 0);
 
   return result;
@@ -115,76 +113,89 @@ static js_value_t *
 bare_buffer_to_string_utf8(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
+  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 == 1);
+  assert(argc == 3);
 
   utf8_t *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &buf, &buf_len, NULL, NULL);
+  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);
 
   js_value_t *result;
-  err = js_create_string_utf8(env, buf, buf_len, &result);
+  err = js_create_string_utf8(env, &buf[offset], len, &result);
   assert(err == 0);
 
   return result;
 }
 
-static uint32_t
-bare_buffer_typed_write_utf8(js_value_t *receiver, js_value_t *typedarray, js_value_t *string, js_typed_callback_info_t *info) {
+static int64_t
+bare_buffer_typed_write_utf8(
+  js_value_t *receiver,
+  js_value_t *handle,
+  int64_t offset,
+  int64_t len,
+  js_value_t *string,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   size_t str_len;
-  err = js_get_value_string_utf8(env, string, buf, buf_len, &str_len);
+  err = js_get_value_string_utf8(env, string, &buf[offset], len, &str_len);
   assert(err == 0);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-
-  return (uint32_t) str_len;
+  return str_len;
 }
 
 static js_value_t *
 bare_buffer_write_utf8(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 4);
+
+  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);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  int64_t len;
+  err = js_get_value_int64(env, argv[2], &len);
   assert(err == 0);
 
   size_t str_len;
-  err = js_get_value_string_utf8(env, argv[1], buf, buf_len, &str_len);
+  err = js_get_value_string_utf8(env, argv[3], &buf[offset], len, &str_len);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) str_len, &result);
+  err = js_create_int64(env, str_len, &result);
   assert(err == 0);
 
   return result;
@@ -194,86 +205,102 @@ static js_value_t *
 bare_buffer_to_string_utf16le(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
+  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 == 1);
+  assert(argc == 3);
 
   utf16_t *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &buf, &buf_len, NULL, NULL);
+  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);
 
-  buf_len /= sizeof(utf16_t);
+  offset /= sizeof(utf16_t);
+  len /= sizeof(utf16_t);
 
   js_value_t *result;
-  err = js_create_string_utf16le(env, buf, buf_len, &result);
+  err = js_create_string_utf16le(env, &buf[offset], len, &result);
   assert(err == 0);
 
   return result;
 }
 
-static uint32_t
-bare_buffer_typed_write_utf16le(js_value_t *receiver, js_value_t *typedarray, js_value_t *string, js_typed_callback_info_t *info) {
+static int64_t
+bare_buffer_typed_write_utf16le(
+  js_value_t *receiver,
+  js_value_t *handle,
+  int64_t offset,
+  int64_t len,
+  js_value_t *string,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
+  utf16_t *buf;
+  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
-  buf_len /= sizeof(utf16_t);
+  offset /= sizeof(utf16_t);
+  len /= sizeof(utf16_t);
 
   size_t str_len;
-  err = js_get_value_string_utf16le(env, string, buf, buf_len, &str_len);
+  err = js_get_value_string_utf16le(env, string, &buf[offset], len, &str_len);
   assert(err == 0);
 
   str_len *= sizeof(utf16_t);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-
-  return (uint32_t) str_len;
+  return str_len;
 }
 
 static js_value_t *
 bare_buffer_write_utf16le(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 4);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  utf16_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);
 
-  buf_len /= sizeof(utf16_t);
+  offset /= sizeof(utf16_t);
+  len /= sizeof(utf16_t);
 
   size_t str_len;
-  err = js_get_value_string_utf16le(env, argv[1], buf, buf_len, &str_len);
+  err = js_get_value_string_utf16le(env, argv[3], &buf[offset], len, &str_len);
   assert(err == 0);
 
   str_len *= sizeof(utf16_t);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) str_len, &result);
+  err = js_create_int64(env, str_len, &result);
   assert(err == 0);
 
   return result;
@@ -283,76 +310,89 @@ static js_value_t *
 bare_buffer_to_string_latin1(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
+  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 == 1);
+  assert(argc == 3);
 
   latin1_t *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &buf, &buf_len, NULL, NULL);
+  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);
 
   js_value_t *result;
-  err = js_create_string_latin1(env, buf, buf_len, &result);
+  err = js_create_string_latin1(env, &buf[offset], len, &result);
   assert(err == 0);
 
   return result;
 }
 
-static uint32_t
-bare_buffer_typed_write_latin1(js_value_t *receiver, js_value_t *typedarray, js_value_t *string, js_typed_callback_info_t *info) {
+static int64_t
+bare_buffer_typed_write_latin1(
+  js_value_t *receiver,
+  js_value_t *handle,
+  int64_t offset,
+  int64_t len,
+  js_value_t *string,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
+  latin1_t *buf;
+  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   size_t str_len;
-  err = js_get_value_string_latin1(env, string, buf, buf_len, &str_len);
+  err = js_get_value_string_latin1(env, string, &buf[offset], len, &str_len);
   assert(err == 0);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-
-  return (uint32_t) str_len;
+  return str_len;
 }
 
 static js_value_t *
 bare_buffer_write_latin1(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 4);
+
+  latin1_t *buf;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  assert(err == 0);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  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 = js_get_value_string_latin1(env, argv[1], buf, buf_len, &str_len);
+  err = js_get_value_string_latin1(env, argv[3], &buf[offset], len, &str_len);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) str_len, &result);
+  err = js_create_int64(env, str_len, &result);
   assert(err == 0);
 
   return result;
@@ -362,49 +402,58 @@ static js_value_t *
 bare_buffer_to_string_base64(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
+  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 == 1);
+  assert(argc == 3);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  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 = base64_encode_utf8(buf, buf_len, NULL, &str_len);
+  err = base64_encode_utf8(&buf[offset], len, NULL, &str_len);
   assert(err == 0);
 
   utf8_t *str = malloc(str_len);
-  err = base64_encode_utf8(buf, buf_len, str, &str_len);
+  err = base64_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_free_string, NULL, &result, NULL);
+  err = js_create_external_string_latin1(env, str, str_len, bare_buffer__on_finalize_string, NULL, &result, NULL);
   assert(err == 0);
 
   return result;
 }
 
-static uint32_t
-bare_buffer_typed_write_base64(js_value_t *receiver, js_value_t *typedarray, js_value_t *string, js_typed_callback_info_t *info) {
+static int64_t
+bare_buffer_typed_write_base64(
+  js_value_t *receiver,
+  js_value_t *handle,
+  int64_t offset,
+  int64_t len,
+  js_value_t *string,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -415,38 +464,44 @@ bare_buffer_typed_write_base64(js_value_t *receiver, js_value_t *typedarray, js_
   err = js_get_string_view(env, string, &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
+  size_t written = len;
+
   if (encoding == js_utf16le) {
-    err = base64_decode_utf16le(str, str_len, buf, &buf_len);
+    err = base64_decode_utf16le(str, str_len, &buf[offset], &written);
     assert(err == 0);
   } else {
-    err = base64_decode_utf8(str, str_len, buf, &buf_len);
+    err = base64_decode_utf8(str, str_len, &buf[offset], &written);
     assert(err == 0);
   }
 
   err = js_release_string_view(env, str_view);
   assert(err == 0);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-
-  return buf_len;
+  return written;
 }
 
 static js_value_t *
 bare_buffer_write_base64(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 4);
+
+  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);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  int64_t len;
+  err = js_get_value_int64(env, argv[2], &len);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -454,14 +509,16 @@ bare_buffer_write_base64(js_env_t *env, js_callback_info_t *info) {
   size_t str_len;
 
   js_string_view_t *str_view;
-  err = js_get_string_view(env, argv[1], &encoding, &str, &str_len, &str_view);
+  err = js_get_string_view(env, argv[3], &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
+  size_t written = len;
+
   if (encoding == js_utf16le) {
-    err = base64_decode_utf16le(str, str_len, buf, &buf_len);
+    err = base64_decode_utf16le(str, str_len, &buf[offset], &written);
     assert(err == 0);
   } else {
-    err = base64_decode_utf8(str, str_len, buf, &buf_len);
+    err = base64_decode_utf8(str, str_len, &buf[offset], &written);
     assert(err == 0);
   }
 
@@ -469,7 +526,7 @@ bare_buffer_write_base64(js_env_t *env, js_callback_info_t *info) {
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) buf_len, &result);
+  err = js_create_int64(env, written, &result);
   assert(err == 0);
 
   return result;
@@ -479,49 +536,58 @@ static js_value_t *
 bare_buffer_to_string_hex(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
+  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 == 1);
+  assert(argc == 3);
+
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  assert(err == 0);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  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 = hex_encode_utf8(buf, buf_len, NULL, &str_len);
+  err = hex_encode_utf8(&buf[offset], len, NULL, &str_len);
   assert(err == 0);
 
   utf8_t *str = malloc(str_len);
-  err = hex_encode_utf8(buf, buf_len, str, &str_len);
+  err = hex_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_free_string, NULL, &result, NULL);
+  err = js_create_external_string_latin1(env, str, str_len, bare_buffer__on_finalize_string, NULL, &result, NULL);
   assert(err == 0);
 
   return result;
 }
 
-static uint32_t
-bare_buffer_typed_write_hex(js_value_t *receiver, js_value_t *typedarray, js_value_t *string, js_typed_callback_info_t *info) {
+static int64_t
+bare_buffer_typed_write_hex(
+  js_value_t *receiver,
+  js_value_t *handle,
+  int64_t offset,
+  int64_t len,
+  js_value_t *string,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  js_handle_scope_t *scope;
-  err = js_open_handle_scope(env, &scope);
-  assert(err == 0);
-
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, handle, (void **) &buf, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -532,38 +598,44 @@ bare_buffer_typed_write_hex(js_value_t *receiver, js_value_t *typedarray, js_val
   err = js_get_string_view(env, string, &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
+  size_t written = len;
+
   if (encoding == js_utf16le) {
-    err = hex_decode_utf16le(str, str_len, buf, &buf_len);
+    err = hex_decode_utf16le(str, str_len, &buf[offset], &written);
     assert(err == 0);
   } else {
-    err = hex_decode_utf8(str, str_len, buf, &buf_len);
+    err = hex_decode_utf8(str, str_len, &buf[offset], &written);
     assert(err == 0);
   }
 
   err = js_release_string_view(env, str_view);
   assert(err == 0);
 
-  err = js_close_handle_scope(env, scope);
-  assert(err == 0);
-
-  return buf_len;
+  return written;
 }
 
 static js_value_t *
 bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 4;
+  js_value_t *argv[4];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 4);
+
+  utf8_t *buf;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &buf, NULL);
+  assert(err == 0);
 
-  void *buf;
-  size_t buf_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
+  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);
 
   js_string_encoding_t encoding;
@@ -571,14 +643,16 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
   size_t str_len;
 
   js_string_view_t *str_view;
-  err = js_get_string_view(env, argv[1], &encoding, &str, &str_len, &str_view);
+  err = js_get_string_view(env, argv[3], &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
+  size_t written = len;
+
   if (encoding == js_utf16le) {
-    err = hex_decode_utf16le(str, str_len, buf, &buf_len);
+    err = hex_decode_utf16le(str, str_len, &buf[offset], &written);
     assert(err == 0);
   } else {
-    err = hex_decode_utf8(str, str_len, buf, &buf_len);
+    err = hex_decode_utf8(str, str_len, &buf[offset], &written);
     assert(err == 0);
   }
 
@@ -586,7 +660,7 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_uint32(env, (uint32_t) buf_len, &result);
+  err = js_create_int64(env, written, &result);
   assert(err == 0);
 
   return result;
@@ -596,11 +670,11 @@ static int32_t
 bare_buffer_typed_compare(
   js_value_t *receiver,
   js_value_t *a_handle,
-  uint32_t a_offset,
-  uint32_t a_len,
+  int64_t a_offset,
+  int64_t a_len,
   js_value_t *b_handle,
-  uint32_t b_offset,
-  uint32_t b_len,
+  int64_t b_offset,
+  int64_t b_len,
   js_typed_callback_info_t *info
 ) {
   int err;
@@ -609,12 +683,12 @@ bare_buffer_typed_compare(
   err = js_get_typed_callback_info(info, &env, NULL);
   assert(err == 0);
 
-  void *a;
-  err = js_get_arraybuffer_info(env, a_handle, &a, NULL);
+  uint8_t *a;
+  err = js_get_arraybuffer_info(env, a_handle, (void **) &a, NULL);
   assert(err == 0);
 
-  void *b;
-  err = js_get_arraybuffer_info(env, b_handle, &b, NULL);
+  uint8_t *b;
+  err = js_get_arraybuffer_info(env, b_handle, (void **) &b, NULL);
   assert(err == 0);
 
   return bare_buffer__memcmp(&a[a_offset], a_len, &b[b_offset], b_len);
@@ -632,28 +706,28 @@ bare_buffer_compare(js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 6);
 
-  void *a;
-  err = js_get_arraybuffer_info(env, argv[0], &a, NULL);
+  uint8_t *a;
+  err = js_get_arraybuffer_info(env, argv[0], (void **) &a, NULL);
   assert(err == 0);
 
-  uint32_t a_offset;
-  err = js_get_value_uint32(env, argv[1], &a_offset);
+  int64_t a_offset;
+  err = js_get_value_int64(env, argv[1], &a_offset);
   assert(err == 0);
 
-  uint32_t a_len;
-  err = js_get_value_uint32(env, argv[2], &a_len);
+  int64_t a_len;
+  err = js_get_value_int64(env, argv[2], &a_len);
   assert(err == 0);
 
-  void *b;
-  err = js_get_arraybuffer_info(env, argv[3], &b, NULL);
+  uint8_t *b;
+  err = js_get_arraybuffer_info(env, argv[3], (void **) &b, NULL);
   assert(err == 0);
 
-  uint32_t b_offset;
-  err = js_get_value_uint32(env, argv[4], &b_offset);
+  int64_t b_offset;
+  err = js_get_value_int64(env, argv[4], &b_offset);
   assert(err == 0);
 
-  uint32_t b_len;
-  err = js_get_value_uint32(env, argv[5], &b_len);
+  int64_t b_len;
+  err = js_get_value_int64(env, argv[5], &b_len);
   assert(err == 0);
 
   js_value_t *result;
@@ -664,49 +738,39 @@ bare_buffer_compare(js_env_t *env, js_callback_info_t *info) {
 }
 
 static js_value_t *
-bare_buffer_tag(js_env_t *env, js_callback_info_t *info) {
+bare_buffer_exports(js_env_t *env, js_value_t *exports) {
   int err;
 
-  size_t argc = 1;
-  js_value_t *argv[1];
-
-  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  js_value_t *constants;
+  err = js_create_object(env, &constants);
   assert(err == 0);
 
-  assert(argc == 1);
-
-  err = js_add_type_tag(env, argv[0], &bare_buffer__tag);
+  err = js_set_named_property(env, exports, "constants", constants);
   assert(err == 0);
 
-  return NULL;
-}
-
-static js_value_t *
-bare_buffer_is_tagged(js_env_t *env, js_callback_info_t *info) {
-  int err;
-
-  size_t argc = 1;
-  js_value_t *argv[1];
-
-  err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
+  js_platform_t *platform;
+  err = js_get_env_platform(env, &platform);
   assert(err == 0);
 
-  assert(argc == 1);
-
-  bool is_tagged;
-  err = js_check_type_tag(env, argv[0], &bare_buffer__tag, &is_tagged);
-  assert(err == 0);
+  js_platform_limits_t limits = {
+    .version = 0,
+  };
 
-  js_value_t *result;
-  err = js_get_boolean(env, is_tagged, &result);
+  err = js_get_platform_limits(platform, &limits);
   assert(err == 0);
 
-  return result;
-}
+#define V(name, value) \
+  { \
+    js_value_t *val; \
+    err = js_create_int64(env, value, &val); \
+    assert(err == 0); \
+    err = js_set_named_property(env, constants, name, val); \
+    assert(err == 0); \
+  }
 
-static js_value_t *
-bare_buffer_exports(js_env_t *env, js_value_t *exports) {
-  int err;
+  V("MAX_LENGTH", limits.arraybuffer_length);
+  V("MAX_STRING_LENGTH", limits.string_length);
+#undef V
 
 #define V(name, untyped, signature, typed) \
   { \
@@ -731,7 +795,7 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_byte_length_utf8,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
+      .result = js_int64,
       .args_len = 2,
       .args = (int[]) {
         js_object,
@@ -748,11 +812,13 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_write_utf8,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
-      .args_len = 3,
+      .result = js_int64,
+      .args_len = 5,
       .args = (int[]) {
         js_object,
         js_object,
+        js_int64,
+        js_int64,
         js_string,
       }
     }),
@@ -766,7 +832,7 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_write_utf16le,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
+      .result = js_int64,
       .args_len = 3,
       .args = (int[]) {
         js_object,
@@ -784,11 +850,13 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_write_latin1,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
-      .args_len = 3,
+      .result = js_int64,
+      .args_len = 5,
       .args = (int[]) {
         js_object,
         js_object,
+        js_int64,
+        js_int64,
         js_string,
       }
     }),
@@ -802,11 +870,13 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_write_base64,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
-      .args_len = 3,
+      .result = js_int64,
+      .args_len = 5,
       .args = (int[]) {
         js_object,
         js_object,
+        js_int64,
+        js_int64,
         js_string,
       }
     }),
@@ -820,11 +890,13 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     bare_buffer_write_hex,
     &((js_callback_signature_t) {
       .version = 0,
-      .result = js_uint32,
-      .args_len = 3,
+      .result = js_int64,
+      .args_len = 5,
       .args = (int[]) {
         js_object,
         js_object,
+        js_int64,
+        js_int64,
         js_string,
       }
     }),
@@ -841,19 +913,15 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
       .args = (int[]) {
         js_object,
         js_object,
-        js_uint32,
-        js_uint32,
+        js_int64,
+        js_int64,
         js_object,
-        js_uint32,
-        js_uint32,
+        js_int64,
+        js_int64,
       }
     }),
     bare_buffer_typed_compare
   );
-
-  V("tag", bare_buffer_tag, NULL, NULL);
-
-  V("isTagged", bare_buffer_is_tagged, NULL, NULL);
 #undef V
 
   return exports;

package/index.js

@@ -7,11 +7,13 @@ const utf16le = require('./lib/utf16le')
 const latin1 = require('./lib/latin1')
 const binding = require('./binding')
 
+const kind = Symbol.for('bare.buffer.kind')
+
 let poolSize = 0
 
 module.exports = exports = class Buffer extends Uint8Array {
-  static {
-    binding.tag(this)
+  static get [kind]() {
+    return 0 // Compatibility version
   }
 
   static get poolSize() {
@@ -60,8 +62,8 @@ module.exports = exports = class Buffer extends Uint8Array {
     super(arrayBuffer, offset, length)
   }
 
-  [Symbol.species]() {
-    return Buffer
+  get [kind]() {
+    return Buffer[kind]
   }
 
   copy(target, targetStart = 0, sourceStart = 0, sourceEnd = this.byteLength) {
@@ -562,17 +564,10 @@ function viewOf(buffer) {
 
 exports.isBuffer = function isBuffer(value) {
   if (value instanceof Buffer) return true
-  if (typeof value !== 'object' || value === null) return false
-
-  let constructor = value.constructor
-
-  while (typeof constructor === 'function') {
-    if (binding.isTagged(constructor)) return true
 
-    constructor = Reflect.getPrototypeOf(constructor)
-  }
-
-  return false
+  return (
+    typeof value === 'object' && value !== null && value[kind] === Buffer[kind]
+  )
 }
 
 exports.isEncoding = function isEncoding(encoding) {

package/lib/base64.js

@@ -9,6 +9,19 @@ exports.byteLength = function byteLength(string) {
   return (len * 3) >>> 2
 }
 
-exports.toString = binding.toStringBase64
+exports.toString = function toString(buffer) {
+  return binding.toStringBase64(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
 
-exports.write = binding.writeBase64
+exports.write = function write(buffer, string) {
+  return binding.writeBase64(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/lib/constants.js

@@ -1,4 +1,3 @@
-module.exports = {
-  MAX_LENGTH: 2 ** 32 - 1, // 4 GiB
-  MAX_STRING_LENGTH: 2 ** 28 - 16 // ~512 MiB, lowest common limit
-}
+const binding = require('../binding')
+
+module.exports = binding.constants

package/lib/hex.js

@@ -4,6 +4,19 @@ exports.byteLength = function byteLength(string) {
   return string.length >>> 1
 }
 
-exports.toString = binding.toStringHex
+exports.toString = function toString(buffer) {
+  return binding.toStringHex(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
 
-exports.write = binding.writeHex
+exports.write = function write(buffer, string) {
+  return binding.writeHex(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/lib/latin1.js

@@ -4,6 +4,19 @@ exports.byteLength = function byteLength(string) {
   return string.length
 }
 
-exports.toString = binding.toStringLatin1
+exports.toString = function toString(buffer) {
+  return binding.toStringLatin1(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
 
-exports.write = binding.writeLatin1
+exports.write = function write(buffer, string) {
+  return binding.writeLatin1(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/lib/utf16le.js

@@ -4,6 +4,19 @@ exports.byteLength = function byteLength(string) {
   return string.length * 2
 }
 
-exports.toString = binding.toStringUTF16LE
+exports.toString = function toString(buffer) {
+  return binding.toStringUTF16LE(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
 
-exports.write = binding.writeUTF16LE
+exports.write = function write(buffer, string) {
+  return binding.writeUTF16LE(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/lib/utf8.js

@@ -1,7 +1,22 @@
 const binding = require('../binding')
 
-exports.byteLength = binding.byteLengthUTF8
+exports.byteLength = function byteLength(string) {
+  return binding.byteLengthUTF8(string)
+}
 
-exports.toString = binding.toStringUTF8
+exports.toString = function toString(buffer) {
+  return binding.toStringUTF8(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  )
+}
 
-exports.write = binding.writeUTF8
+exports.write = function write(buffer, string) {
+  return binding.writeUTF8(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength,
+    string
+  )
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "description": "Native buffers for JavaScript",
   "exports": {
     "./package": "./package.json",
@@ -43,7 +43,7 @@
   },
   "homepage": "https://github.com/holepunchto/bare-buffer#readme",
   "engines": {
-    "bare": ">=1.13.0"
+    "bare": ">=1.20.0"
   },
   "devDependencies": {
     "brittle": "^3.1.1",