bare-buffer 3.1.2 → 3.1.4

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);
@@ -143,18 +141,20 @@ bare_buffer_typed_write_utf8(js_value_t *receiver, js_value_t *typedarray, js_va
   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;
-
-  js_typedarray_view_t *buf_view;
-  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
   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);
+  err = js_close_handle_scope(env, scope);
   assert(err == 0);
 
   return (uint32_t) str_len;
@@ -222,11 +222,13 @@ bare_buffer_typed_write_utf16le(js_value_t *receiver, js_value_t *typedarray, js
   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;
-
-  js_typedarray_view_t *buf_view;
-  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   buf_len /= sizeof(utf16_t);
@@ -237,7 +239,7 @@ bare_buffer_typed_write_utf16le(js_value_t *receiver, js_value_t *typedarray, js
 
   str_len *= sizeof(utf16_t);
 
-  err = js_release_typedarray_view(env, buf_view);
+  err = js_close_handle_scope(env, scope);
   assert(err == 0);
 
   return (uint32_t) str_len;
@@ -307,18 +309,20 @@ bare_buffer_typed_write_latin1(js_value_t *receiver, js_value_t *typedarray, js_
   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;
-
-  js_typedarray_view_t *buf_view;
-  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   size_t str_len;
   err = js_get_value_string_latin1(env, string, buf, buf_len, &str_len);
   assert(err == 0);
 
-  err = js_release_typedarray_view(env, buf_view);
+  err = js_close_handle_scope(env, scope);
   assert(err == 0);
 
   return (uint32_t) str_len;
@@ -392,11 +396,13 @@ bare_buffer_typed_write_base64(js_value_t *receiver, js_value_t *typedarray, js_
   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;
-
-  js_typedarray_view_t *buf_view;
-  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -418,7 +424,7 @@ bare_buffer_typed_write_base64(js_value_t *receiver, js_value_t *typedarray, js_
   err = js_release_string_view(env, str_view);
   assert(err == 0);
 
-  err = js_release_typedarray_view(env, buf_view);
+  err = js_close_handle_scope(env, scope);
   assert(err == 0);
 
   return buf_len;
@@ -507,11 +513,13 @@ bare_buffer_typed_write_hex(js_value_t *receiver, js_value_t *typedarray, js_val
   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;
-
-  js_typedarray_view_t *buf_view;
-  err = js_get_typedarray_view(env, typedarray, NULL, &buf, &buf_len, &buf_view);
+  err = js_get_typedarray_info(env, typedarray, NULL, &buf, &buf_len, NULL, NULL);
   assert(err == 0);
 
   js_string_encoding_t encoding;
@@ -533,7 +541,7 @@ bare_buffer_typed_write_hex(js_value_t *receiver, js_value_t *typedarray, js_val
   err = js_release_string_view(env, str_view);
   assert(err == 0);
 
-  err = js_release_typedarray_view(env, buf_view);
+  err = js_close_handle_scope(env, scope);
   assert(err == 0);
 
   return buf_len;
@@ -583,7 +591,16 @@ bare_buffer_write_hex(js_env_t *env, js_callback_info_t *info) {
 }
 
 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) {
+bare_buffer_typed_compare(
+  js_value_t *receiver,
+  js_value_t *a_handle,
+  uint32_t a_offset,
+  uint32_t a_len,
+  js_value_t *b_handle,
+  uint32_t b_offset,
+  uint32_t b_len,
+  js_typed_callback_info_t *info
+) {
   int err;
 
   js_env_t *env;
@@ -591,95 +608,54 @@ bare_buffer_typed_compare(js_value_t *receiver, js_value_t *source, js_value_t *
   assert(err == 0);
 
   void *a;
-  size_t a_len;
-
-  js_typedarray_view_t *a_view;
-  err = js_get_typedarray_view(env, source, NULL, &a, &a_len, &a_view);
+  err = js_get_arraybuffer_info(env, a_handle, &a, NULL);
   assert(err == 0);
 
   void *b;
-  size_t b_len;
-
-  js_typedarray_view_t *b_view;
-  err = js_get_typedarray_view(env, target, NULL, &b, &b_len, &b_view);
-  assert(err == 0);
-
-  int result = bare_buffer__memcmp(a, a_len, b, b_len);
-
-  err = js_release_typedarray_view(env, a_view);
-  assert(err == 0);
-
-  err = js_release_typedarray_view(env, b_view);
+  err = js_get_arraybuffer_info(env, b_handle, &b, NULL);
   assert(err == 0);
 
-  return result;
+  return bare_buffer__memcmp(&a[a_offset], a_len, &b[b_offset], b_len);
 }
 
 static js_value_t *
 bare_buffer_compare(js_env_t *env, js_callback_info_t *info) {
   int err;
 
-  size_t argc = 2;
-  js_value_t *argv[2];
+  size_t argc = 6;
+  js_value_t *argv[6];
 
   err = js_get_callback_info(env, info, &argc, argv, NULL, NULL);
   assert(err == 0);
 
-  assert(argc == 2);
+  assert(argc == 6);
 
   void *a;
-  size_t a_len;
-  err = js_get_typedarray_info(env, argv[0], NULL, &a, &a_len, NULL, NULL);
-  assert(err == 0);
-
-  void *b;
-  size_t b_len;
-  err = js_get_typedarray_info(env, argv[1], NULL, &b, &b_len, NULL, NULL);
+  err = js_get_arraybuffer_info(env, argv[0], &a, NULL);
   assert(err == 0);
 
-  js_value_t *result;
-  err = js_create_int32(env, bare_buffer__memcmp(a, a_len, b, b_len), &result);
+  uint32_t a_offset;
+  err = js_get_value_uint32(env, argv[1], &a_offset);
   assert(err == 0);
 
-  return result;
-}
-
-static js_value_t *
-bare_buffer_tag(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);
+  uint32_t a_len;
+  err = js_get_value_uint32(env, argv[2], &a_len);
   assert(err == 0);
 
-  assert(argc == 1);
-
-  err = js_add_type_tag(env, argv[0], &bare_buffer__tag);
+  void *b;
+  err = js_get_arraybuffer_info(env, argv[3], &b, NULL);
   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);
+  uint32_t b_offset;
+  err = js_get_value_uint32(env, argv[4], &b_offset);
   assert(err == 0);
 
-  assert(argc == 1);
-
-  bool is_tagged;
-  err = js_check_type_tag(env, argv[0], &bare_buffer__tag, &is_tagged);
+  uint32_t b_len;
+  err = js_get_value_uint32(env, argv[5], &b_len);
   assert(err == 0);
 
   js_value_t *result;
-  err = js_get_boolean(env, is_tagged, &result);
+  err = js_create_int32(env, bare_buffer__memcmp(&a[a_offset], a_len, &b[b_offset], b_len), &result);
   assert(err == 0);
 
   return result;
@@ -818,19 +794,19 @@ bare_buffer_exports(js_env_t *env, js_value_t *exports) {
     &((js_callback_signature_t) {
       .version = 0,
       .result = js_int32,
-      .args_len = 3,
+      .args_len = 7,
       .args = (int[]) {
         js_object,
         js_object,
+        js_uint32,
+        js_uint32,
         js_object,
+        js_uint32,
+        js_uint32,
       }
     }),
     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) {
@@ -104,7 +106,16 @@ module.exports = exports = class Buffer extends Uint8Array {
 
     if (source.byteLength !== target.byteLength) return false
 
-    return binding.compare(source, target) === 0
+    return (
+      binding.compare(
+        source.buffer,
+        source.byteOffset,
+        source.byteLength,
+        target.buffer,
+        target.byteOffset,
+        target.byteLength
+      ) === 0
+    )
   }
 
   compare(
@@ -118,29 +129,36 @@ module.exports = exports = class Buffer extends Uint8Array {
 
     if (source === target) return 0
 
-    if (arguments.length === 1) return binding.compare(source, target)
+    if (arguments.length > 1) {
+      if (targetStart < 0) targetStart = 0
+      if (targetStart > target.byteLength) targetStart = target.byteLength
 
-    if (targetStart < 0) targetStart = 0
-    if (targetStart > target.byteLength) targetStart = target.byteLength
+      if (targetEnd < targetStart) targetEnd = targetStart
+      if (targetEnd > target.byteLength) targetEnd = target.byteLength
 
-    if (targetEnd < targetStart) targetEnd = targetStart
-    if (targetEnd > target.byteLength) targetEnd = target.byteLength
+      if (sourceStart < 0) sourceStart = 0
+      if (sourceStart > source.byteLength) sourceStart = source.byteLength
 
-    if (sourceStart < 0) sourceStart = 0
-    if (sourceStart > source.byteLength) sourceStart = source.byteLength
+      if (sourceEnd < sourceStart) sourceEnd = sourceStart
+      if (sourceEnd > source.byteLength) sourceEnd = source.byteLength
 
-    if (sourceEnd < sourceStart) sourceEnd = sourceStart
-    if (sourceEnd > source.byteLength) sourceEnd = source.byteLength
-
-    if (sourceStart !== 0 || sourceEnd !== source.byteLength) {
-      source = source.subarray(sourceStart, sourceEnd)
-    }
+      if (sourceStart !== 0 || sourceEnd !== source.byteLength) {
+        source = source.subarray(sourceStart, sourceEnd)
+      }
 
-    if (targetStart !== 0 || targetEnd !== target.byteLength) {
-      target = target.subarray(targetStart, targetEnd)
+      if (targetStart !== 0 || targetEnd !== target.byteLength) {
+        target = target.subarray(targetStart, targetEnd)
+      }
     }
 
-    return binding.compare(source, target)
+    return binding.compare(
+      source.buffer,
+      source.byteOffset,
+      source.byteLength,
+      target.buffer,
+      target.byteOffset,
+      target.byteLength
+    )
   }
 
   fill(value, offset = 0, end = this.byteLength, encoding = 'utf8') {
@@ -545,17 +563,11 @@ function viewOf(buffer) {
 }
 
 exports.isBuffer = function isBuffer(value) {
-  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)
-  }
+  if (value instanceof Buffer) return true
 
-  return false
+  return (
+    typeof value === 'object' && value !== null && value[kind] === Buffer[kind]
+  )
 }
 
 exports.isEncoding = function isEncoding(encoding) {
@@ -590,7 +602,14 @@ exports.byteLength = function byteLength(string, encoding) {
 }
 
 exports.compare = function compare(a, b) {
-  return binding.compare(a, b)
+  return binding.compare(
+    a.buffer,
+    a.byteOffset,
+    a.byteLength,
+    b.buffer,
+    b.byteOffset,
+    b.byteLength
+  )
 }
 
 exports.concat = function concat(buffers, length) {

package/package.json

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