bare-buffer 3.0.0-0 → 3.0.0

package/CMakeLists.txt

@@ -5,9 +5,9 @@ find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_buffer C)
 
-fetch_package("github:holepunchto/libutf#65b6ba0")
-fetch_package("github:holepunchto/libbase64#4cd8d8b")
-fetch_package("github:holepunchto/libhex#939999b")
+fetch_package("github:holepunchto/libutf#9509b28")
+fetch_package("github:holepunchto/libbase64#cded073")
+fetch_package("github:holepunchto/libhex#1dfad95")
 
 add_bare_module(bare_buffer)
 

package/binding.c

@@ -3,13 +3,30 @@
 #include <base64.h>
 #include <hex.h>
 #include <js.h>
-#include <js/ffi.h>
 #include <stdlib.h>
 #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);
+
+  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 void
+bare_buffer__on_free_string (js_env_t *env, void *data, void *finalize_hint) {
+  free(data);
+}
+
 static js_value_t *
 bare_buffer_alloc (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -56,6 +73,21 @@ bare_buffer_alloc_unsafe (js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
+static uint32_t
+bare_buffer_typed_byte_length_utf8 (js_value_t *receiver, js_value_t *str, js_typed_callback_info_t *info) {
+  int err;
+
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
+
+  size_t str_len;
+  err = js_get_value_string_utf8(env, str, NULL, 0, &str_len);
+  assert(err == 0);
+
+  return (uint32_t) str_len;
+}
+
 static js_value_t *
 bare_buffer_byte_length_utf8 (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -91,18 +123,43 @@ bare_buffer_to_string_utf8 (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  size_t str_len;
-  utf8_t *str;
-  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &str, &str_len, NULL, NULL);
+  utf8_t *buf;
+  size_t buf_len;
+  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_string_utf8(env, str, str_len, &result);
+  err = js_create_string_utf8(env, buf, buf_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) {
+  int err;
+
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
+
+  void *buf;
+  size_t buf_len;
+
+  js_typedarray_view_t *buf_view;
+  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  assert(err == 0);
+
+  size_t str_len;
+  err = js_get_value_string_utf8(env, string, buf, buf_len, &str_len);
+  assert(err == 0);
+
+  err = js_release_typedarray_view(env, buf_view);
+  assert(err == 0);
+
+  return (uint32_t) str_len;
+}
+
 static js_value_t *
 bare_buffer_write_utf8 (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -115,8 +172,8 @@ bare_buffer_write_utf8 (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 2);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
@@ -143,20 +200,49 @@ bare_buffer_to_string_utf16le (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  size_t str_len;
-  utf16_t *str;
-  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &str, &str_len, NULL, NULL);
+  utf16_t *buf;
+  size_t buf_len;
+  err = js_get_typedarray_info(env, argv[0], NULL, (void **) &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
-  str_len /= sizeof(utf16_t);
+  buf_len /= sizeof(utf16_t);
 
   js_value_t *result;
-  err = js_create_string_utf16le(env, str, str_len, &result);
+  err = js_create_string_utf16le(env, buf, buf_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) {
+  int err;
+
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
+
+  void *buf;
+  size_t buf_len;
+
+  js_typedarray_view_t *buf_view;
+  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  assert(err == 0);
+
+  buf_len /= sizeof(utf16_t);
+
+  size_t str_len;
+  err = js_get_value_string_utf16le(env, string, buf, buf_len, &str_len);
+  assert(err == 0);
+
+  str_len *= sizeof(utf16_t);
+
+  err = js_release_typedarray_view(env, buf_view);
+  assert(err == 0);
+
+  return (uint32_t) str_len;
+}
+
 static js_value_t *
 bare_buffer_write_utf16le (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -169,8 +255,8 @@ bare_buffer_write_utf16le (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 2);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
@@ -201,28 +287,66 @@ bare_buffer_to_string_base64 (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   size_t str_len;
-  err = base64_encode(buf, buf_len, NULL, &str_len);
+  err = base64_encode_utf8(buf, buf_len, NULL, &str_len);
   assert(err == 0);
 
   utf8_t *str = malloc(str_len);
-  err = base64_encode(buf, buf_len, str, &str_len);
+  err = base64_encode_utf8(buf, buf_len, str, &str_len);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_string_utf8(env, str, str_len, &result);
+  err = js_create_external_string_latin1(env, str, str_len, bare_buffer__on_free_string, NULL, &result, NULL);
   assert(err == 0);
 
-  free(str);
-
   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) {
+  int err;
+
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
+
+  void *buf;
+  size_t buf_len;
+
+  js_typedarray_view_t *buf_view;
+  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  assert(err == 0);
+
+  js_string_encoding_t encoding;
+  const void *str;
+  size_t str_len;
+
+  js_string_view_t *str_view;
+  err = js_get_string_view(env, string, &encoding, &str, &str_len, &str_view);
+  assert(err == 0);
+
+  if (encoding == js_utf16le) {
+    err = base64_decode_utf16le(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  } else {
+    err = base64_decode_utf8(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  }
+
+  err = js_release_string_view(env, str_view);
+  assert(err == 0);
+
+  err = js_release_typedarray_view(env, buf_view);
+  assert(err == 0);
+
+  return buf_len;
+}
+
 static js_value_t *
 bare_buffer_write_base64 (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -235,23 +359,29 @@ bare_buffer_write_base64 (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 2);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
+  js_string_encoding_t encoding;
+  const void *str;
   size_t str_len;
-  err = js_get_value_string_utf8(env, argv[1], NULL, 0, &str_len);
-  assert(err == 0);
 
-  utf8_t *str = malloc(str_len);
-  err = js_get_value_string_utf8(env, argv[1], str, str_len, NULL);
+  js_string_view_t *str_view;
+  err = js_get_string_view(env, argv[1], &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
-  err = base64_decode(str, str_len, buf, &buf_len);
-  assert(err == 0);
+  if (encoding == js_utf16le) {
+    err = base64_decode_utf16le(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  } else {
+    err = base64_decode_utf8(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  }
 
-  free(str);
+  err = js_release_string_view(env, str_view);
+  assert(err == 0);
 
   js_value_t *result;
   err = js_create_uint32(env, (uint32_t) buf_len, &result);
@@ -272,28 +402,66 @@ bare_buffer_to_string_hex (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   size_t str_len;
-  err = hex_encode(buf, buf_len, NULL, &str_len);
+  err = hex_encode_utf8(buf, buf_len, NULL, &str_len);
   assert(err == 0);
 
   utf8_t *str = malloc(str_len);
-  err = hex_encode(buf, buf_len, str, &str_len);
+  err = hex_encode_utf8(buf, buf_len, str, &str_len);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_string_utf8(env, str, str_len, &result);
+  err = js_create_external_string_latin1(env, str, str_len, bare_buffer__on_free_string, NULL, &result, NULL);
   assert(err == 0);
 
-  free(str);
-
   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) {
+  int err;
+
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
+
+  void *buf;
+  size_t buf_len;
+
+  js_typedarray_view_t *buf_view;
+  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  assert(err == 0);
+
+  js_string_encoding_t encoding;
+  const void *str;
+  size_t str_len;
+
+  js_string_view_t *str_view;
+  err = js_get_string_view(env, string, &encoding, &str, &str_len, &str_view);
+  assert(err == 0);
+
+  if (encoding == js_utf16le) {
+    err = hex_decode_utf16le(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  } else {
+    err = hex_decode_utf8(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  }
+
+  err = js_release_string_view(env, str_view);
+  assert(err == 0);
+
+  err = js_release_typedarray_view(env, buf_view);
+  assert(err == 0);
+
+  return buf_len;
+}
+
 static js_value_t *
 bare_buffer_write_hex (js_env_t *env, js_callback_info_t *info) {
   int err;
@@ -306,23 +474,29 @@ bare_buffer_write_hex (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 2);
 
-  size_t buf_len;
   void *buf;
+  size_t buf_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
+  js_string_encoding_t encoding;
+  const void *str;
   size_t str_len;
-  err = js_get_value_string_utf8(env, argv[1], NULL, 0, &str_len);
-  assert(err == 0);
 
-  utf8_t *str = malloc(str_len);
-  err = js_get_value_string_utf8(env, argv[1], str, str_len, NULL);
+  js_string_view_t *str_view;
+  err = js_get_string_view(env, argv[1], &encoding, &str, &str_len, &str_view);
   assert(err == 0);
 
-  err = hex_decode(str, str_len, buf, &buf_len);
-  assert(err == 0);
+  if (encoding == js_utf16le) {
+    err = hex_decode_utf16le(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  } else {
+    err = hex_decode_utf8(str, str_len, buf, &buf_len);
+    assert(err == 0);
+  }
 
-  free(str);
+  err = js_release_string_view(env, str_view);
+  assert(err == 0);
 
   js_value_t *result;
   err = js_create_uint32(env, (uint32_t) buf_len, &result);
@@ -331,17 +505,25 @@ bare_buffer_write_hex (js_env_t *env, js_callback_info_t *info) {
   return result;
 }
 
-static inline int
-bare_buffer__compare (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);
+static int32_t
+bare_buffer_typed_compare (js_value_t *receiver, js_value_t *source, js_value_t *target, js_typed_callback_info_t *info) {
+  int err;
 
-  if (r == 0) {
-    if (a_len < b_len) return -1;
-    if (a_len > b_len) return 1;
-    return 0;
-  }
+  js_env_t *env;
+  err = js_get_typed_callback_info(info, &env, NULL);
+  assert(err == 0);
 
-  return r < 0 ? -1 : 1;
+  void *a;
+  size_t a_len;
+  err = js_get_typedarray_info(env, source, NULL, &a, &a_len, NULL, NULL);
+  assert(err == 0);
+
+  void *b;
+  size_t b_len;
+  err = js_get_typedarray_info(env, target, NULL, &b, &b_len, NULL, NULL);
+  assert(err == 0);
+
+  return bare_buffer__memcmp(a, a_len, b, b_len);
 }
 
 static js_value_t *
@@ -356,18 +538,18 @@ bare_buffer_compare (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 2);
 
-  size_t a_len;
   void *a;
+  size_t a_len;
   err = js_get_typedarray_info(env, argv[0], NULL, &a, &a_len, NULL, NULL);
   assert(err == 0);
 
-  size_t b_len;
   void *b;
+  size_t b_len;
   err = js_get_typedarray_info(env, argv[1], NULL, &b, &b_len, NULL, NULL);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_create_int32(env, bare_buffer__compare(a, a_len, b, b_len), &result);
+  err = js_create_int32(env, bare_buffer__memcmp(a, a_len, b, b_len), &result);
   assert(err == 0);
 
   return result;
@@ -403,12 +585,12 @@ bare_buffer_is_tagged (js_env_t *env, js_callback_info_t *info) {
 
   assert(argc == 1);
 
-  bool is_buffer;
-  err = js_check_type_tag(env, argv[0], &bare_buffer__tag, &is_buffer);
+  bool is_tagged;
+  err = js_check_type_tag(env, argv[0], &bare_buffer__tag, &is_tagged);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_get_boolean(env, is_buffer, &result);
+  err = js_get_boolean(env, is_tagged, &result);
   assert(err == 0);
 
   return result;
@@ -418,34 +600,130 @@ static js_value_t *
 bare_buffer_exports (js_env_t *env, js_value_t *exports) {
   int err;
 
-#define V(name, fn) \
+#define V(name, untyped, signature, typed) \
   { \
     js_value_t *val; \
-    err = js_create_function(env, name, -1, fn, NULL, &val); \
-    assert(err == 0); \
+    if (signature) { \
+      err = js_create_typed_function(env, name, -1, untyped, signature, typed, NULL, &val); \
+      assert(err == 0); \
+    } else { \
+      err = js_create_function(env, name, -1, untyped, NULL, &val); \
+      assert(err == 0); \
+    } \
     err = js_set_named_property(env, exports, name, val); \
     assert(err == 0); \
   }
 
-  V("alloc", bare_buffer_alloc);
-  V("allocUnsafe", bare_buffer_alloc_unsafe);
-
-  V("byteLengthUTF8", bare_buffer_byte_length_utf8);
-  V("toStringUTF8", bare_buffer_to_string_utf8);
-  V("writeUTF8", bare_buffer_write_utf8);
-
-  V("toStringUTF16LE", bare_buffer_to_string_utf16le);
-  V("writeUTF16LE", bare_buffer_write_utf16le);
-
-  V("toStringBase64", bare_buffer_to_string_base64);
-  V("writeBase64", bare_buffer_write_base64);
-
-  V("toStringHex", bare_buffer_to_string_hex);
-  V("writeHex", bare_buffer_write_hex);
-
-  V("compare", bare_buffer_compare);
-  V("tag", bare_buffer_tag);
-  V("isTagged", bare_buffer_is_tagged);
+  V("alloc", bare_buffer_alloc, NULL, NULL);
+
+  V("allocUnsafe", bare_buffer_alloc_unsafe, NULL, NULL);
+
+  V(
+    "byteLengthUTF8",
+    bare_buffer_byte_length_utf8,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_uint32,
+      .args_len = 2,
+      .args = (int[]) {
+        js_object,
+        js_string,
+      }
+    }),
+    bare_buffer_typed_byte_length_utf8
+  );
+
+  V("toStringUTF8", bare_buffer_to_string_utf8, NULL, NULL);
+
+  V(
+    "writeUTF8",
+    bare_buffer_write_utf8,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_uint32,
+      .args_len = 3,
+      .args = (int[]) {
+        js_object,
+        js_object,
+        js_string,
+      }
+    }),
+    bare_buffer_typed_write_utf8
+  );
+
+  V("toStringUTF16LE", bare_buffer_to_string_utf16le, NULL, NULL);
+
+  V(
+    "writeUTF16LE",
+    bare_buffer_write_utf16le,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_uint32,
+      .args_len = 3,
+      .args = (int[]) {
+        js_object,
+        js_object,
+        js_string,
+      }
+    }),
+    bare_buffer_typed_write_utf16le
+  );
+
+  V("toStringBase64", bare_buffer_to_string_base64, NULL, NULL);
+
+  V(
+    "writeBase64",
+    bare_buffer_write_base64,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_uint32,
+      .args_len = 3,
+      .args = (int[]) {
+        js_object,
+        js_object,
+        js_string,
+      }
+    }),
+    bare_buffer_typed_write_base64
+  );
+
+  V("toStringHex", bare_buffer_to_string_hex, NULL, NULL);
+
+  V(
+    "writeHex",
+    bare_buffer_write_hex,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_uint32,
+      .args_len = 3,
+      .args = (int[]) {
+        js_object,
+        js_object,
+        js_string,
+      }
+    }),
+    bare_buffer_typed_write_hex
+  );
+
+  V(
+    "compare",
+    bare_buffer_compare,
+    &((js_callback_signature_t) {
+      .version = 0,
+      .result = js_int32,
+      .args_len = 3,
+      .args = (int[]) {
+        js_object,
+        js_object,
+        js_object,
+      }
+    }),
+    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.d.ts

@@ -136,7 +136,7 @@ declare class Buffer extends Uint8Array {
 }
 
 declare namespace Buffer {
-  export { Buffer }
+  export { Buffer, BufferEncoding }
 
   export let poolSize: number
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "3.0.0-0",
+  "version": "3.0.0",
   "description": "Native buffers for JavaScript",
   "exports": {
     ".": {