bare-buffer 2.4.1 → 2.4.2

package/binding.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include <utf.h>
 
+static js_type_tag_t bare_buffer__tag = {0xfea3e944b70b0812, 0xe53bb5c343c040b6};
+
 static void
 bare_buffer_set_zero_fill_enabled_fast (js_ffi_receiver_t *receiver, uint32_t enabled) {
   js_set_arraybuffer_zero_fill_enabled(enabled != 0);
@@ -371,104 +373,152 @@ bare_buffer_compare (js_env_t *env, js_callback_info_t *info) {
   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);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  err = js_add_type_tag(env, argv[0], &bare_buffer__tag);
+  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);
+  assert(err == 0);
+
+  assert(argc == 1);
+
+  bool is_buffer;
+  err = js_check_type_tag(env, argv[0], &bare_buffer__tag, &is_buffer);
+  assert(err == 0);
+
+  js_value_t *result;
+  err = js_get_boolean(env, is_buffer, &result);
+  assert(err == 0);
+
+  return result;
+}
+
 static js_value_t *
 bare_buffer_exports (js_env_t *env, js_value_t *exports) {
+  int err;
+
+#define V(name, fn, ffi) \
+  { \
+    js_value_t *val; \
+    if (ffi) { \
+      err = js_create_function_with_ffi(env, name, -1, fn, NULL, ffi, &val); \
+    } else { \
+      err = js_create_function(env, name, -1, fn, NULL, &val); \
+    } \
+    assert(err == 0); \
+    err = js_set_named_property(env, exports, name, val); \
+    assert(err == 0); \
+  }
+
   {
     js_ffi_type_info_t *return_info;
-    js_ffi_create_type_info(js_ffi_void, &return_info);
+    err = js_ffi_create_type_info(js_ffi_void, &return_info);
+    assert(err == 0);
 
     js_ffi_type_info_t *arg_info[2];
-    js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
-    js_ffi_create_type_info(js_ffi_uint32, &arg_info[1]);
+
+    err = js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
+    assert(err == 0);
+
+    err = js_ffi_create_type_info(js_ffi_uint32, &arg_info[1]);
+    assert(err == 0);
 
     js_ffi_function_info_t *function_info;
-    js_ffi_create_function_info(return_info, arg_info, 2, &function_info);
+    err = js_ffi_create_function_info(return_info, arg_info, 2, &function_info);
+    assert(err == 0);
 
     js_ffi_function_t *ffi;
-    js_ffi_create_function(bare_buffer_set_zero_fill_enabled_fast, function_info, &ffi);
+    err = js_ffi_create_function(bare_buffer_set_zero_fill_enabled_fast, function_info, &ffi);
+    assert(err == 0);
 
-    js_value_t *val;
-    js_create_function_with_ffi(env, "setZeroFillEnabled", -1, bare_buffer_set_zero_fill_enabled, NULL, ffi, &val);
-    js_set_named_property(env, exports, "setZeroFillEnabled", val);
+    V("setZeroFillEnabled", bare_buffer_set_zero_fill_enabled, ffi);
   }
+
   {
     js_ffi_type_info_t *return_info;
-    js_ffi_create_type_info(js_ffi_int32, &return_info);
+    err = js_ffi_create_type_info(js_ffi_int32, &return_info);
+    assert(err == 0);
 
     js_ffi_type_info_t *arg_info[2];
-    js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
-    js_ffi_create_type_info(js_ffi_string, &arg_info[1]);
+
+    err = js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
+    assert(err == 0);
+
+    err = js_ffi_create_type_info(js_ffi_string, &arg_info[1]);
+    assert(err == 0);
 
     js_ffi_function_info_t *function_info;
-    js_ffi_create_function_info(return_info, arg_info, 2, &function_info);
+    err = js_ffi_create_function_info(return_info, arg_info, 2, &function_info);
+    assert(err == 0);
 
     js_ffi_function_t *ffi;
-    js_ffi_create_function(bare_buffer_byte_length_utf8_fast, function_info, &ffi);
+    err = js_ffi_create_function(bare_buffer_byte_length_utf8_fast, function_info, &ffi);
+    assert(err == 0);
 
-    js_value_t *val;
-    js_create_function_with_ffi(env, "byteLengthUTF8", -1, bare_buffer_byte_length_utf8, NULL, ffi, &val);
-    js_set_named_property(env, exports, "byteLengthUTF8", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "toStringUTF8", -1, bare_buffer_to_string_utf8, NULL, &val);
-    js_set_named_property(env, exports, "toStringUTF8", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "writeUTF8", -1, bare_buffer_write_utf8, NULL, &val);
-    js_set_named_property(env, exports, "writeUTF8", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "toStringUTF16LE", -1, bare_buffer_to_string_utf16le, NULL, &val);
-    js_set_named_property(env, exports, "toStringUTF16LE", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "writeUTF16LE", -1, bare_buffer_write_utf16le, NULL, &val);
-    js_set_named_property(env, exports, "writeUTF16LE", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "toStringBase64", -1, bare_buffer_to_string_base64, NULL, &val);
-    js_set_named_property(env, exports, "toStringBase64", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "writeBase64", -1, bare_buffer_write_base64, NULL, &val);
-    js_set_named_property(env, exports, "writeBase64", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "toStringHex", -1, bare_buffer_to_string_hex, NULL, &val);
-    js_set_named_property(env, exports, "toStringHex", val);
-  }
-  {
-    js_value_t *val;
-    js_create_function(env, "writeHex", -1, bare_buffer_write_hex, NULL, &val);
-    js_set_named_property(env, exports, "writeHex", val);
+    V("byteLengthUTF8", bare_buffer_byte_length_utf8, ffi);
   }
+
+  V("toStringUTF8", bare_buffer_to_string_utf8, NULL);
+  V("writeUTF8", bare_buffer_write_utf8, NULL);
+  V("toStringUTF16LE", bare_buffer_to_string_utf16le, NULL);
+  V("writeUTF16LE", bare_buffer_write_utf16le, NULL);
+  V("toStringBase64", bare_buffer_to_string_base64, NULL);
+  V("writeBase64", bare_buffer_write_base64, NULL);
+  V("toStringHex", bare_buffer_to_string_hex, NULL);
+  V("writeHex", bare_buffer_write_hex, NULL);
+
   {
     js_ffi_type_info_t *return_info;
-    js_ffi_create_type_info(js_ffi_int32, &return_info);
+    err = js_ffi_create_type_info(js_ffi_int32, &return_info);
+    assert(err == 0);
 
     js_ffi_type_info_t *arg_info[3];
-    js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
-    js_ffi_create_type_info(js_ffi_uint8array, &arg_info[1]);
-    js_ffi_create_type_info(js_ffi_uint8array, &arg_info[2]);
+
+    err = js_ffi_create_type_info(js_ffi_receiver, &arg_info[0]);
+    assert(err == 0);
+
+    err = js_ffi_create_type_info(js_ffi_uint8array, &arg_info[1]);
+    assert(err == 0);
+
+    err = js_ffi_create_type_info(js_ffi_uint8array, &arg_info[2]);
+    assert(err == 0);
 
     js_ffi_function_info_t *function_info;
-    js_ffi_create_function_info(return_info, arg_info, 3, &function_info);
+    err = js_ffi_create_function_info(return_info, arg_info, 3, &function_info);
+    assert(err == 0);
 
     js_ffi_function_t *ffi;
-    js_ffi_create_function(bare_buffer_compare_fast, function_info, &ffi);
+    err = js_ffi_create_function(bare_buffer_compare_fast, function_info, &ffi);
+    assert(err == 0);
 
-    js_value_t *val;
-    js_create_function_with_ffi(env, "compare", -1, bare_buffer_compare, NULL, ffi, &val);
-    js_set_named_property(env, exports, "compare", val);
+    V("compare", bare_buffer_compare, ffi);
   }
 
+  V("tag", bare_buffer_tag, NULL)
+  V("isTagged", bare_buffer_is_tagged, NULL)
+#undef V
+
   return exports;
 }
 

package/index.js

@@ -7,6 +7,10 @@ const utf16le = require('./lib/utf16le')
 const binding = require('./binding')
 
 const Buffer = module.exports = exports = class Buffer extends Uint8Array {
+  static {
+    binding.tag(this)
+  }
+
   [Symbol.species] () {
     return Buffer
   }
@@ -375,7 +379,17 @@ function codecFor (encoding = 'utf8') {
 }
 
 exports.isBuffer = function isBuffer (value) {
-  return value instanceof Buffer
+  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
 }
 
 exports.isEncoding = function isEncoding (encoding) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Native buffers for JavaScript",
   "exports": {
     ".": "./index.js",