bare-buffer 2.5.10 → 2.6.0

package/CMakeLists.txt

@@ -1,20 +1,13 @@
 cmake_minimum_required(VERSION 3.25)
 
 find_package(cmake-bare REQUIRED PATHS node_modules/cmake-bare)
+find_package(cmake-fetch REQUIRED PATHS node_modules/cmake-fetch)
 
 project(bare_buffer C)
 
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-if(NOT TARGET base64)
-  add_subdirectory(vendor/libbase64 EXCLUDE_FROM_ALL)
-endif()
-
-if(NOT TARGET hex)
-  add_subdirectory(vendor/libhex EXCLUDE_FROM_ALL)
-endif()
+fetch_package("github:holepunchto/libutf#65b6ba0")
+fetch_package("github:holepunchto/libbase64#4cd8d8b")
+fetch_package("github:holepunchto/libhex#939999b")
 
 add_bare_module(bare_buffer)
 
@@ -27,9 +20,11 @@ target_sources(
 target_link_libraries(
   ${bare_buffer}
   PRIVATE
+    $<TARGET_OBJECTS:utf>
     $<TARGET_OBJECTS:base64>
     $<TARGET_OBJECTS:hex>
   PUBLIC
+    utf
     base64
     hex
 )

package/binding.c

@@ -38,17 +38,7 @@ bare_buffer_set_zero_fill_enabled (js_env_t *env, js_callback_info_t *info) {
 
 static uint32_t
 bare_buffer_byte_length_utf8_fast (js_ffi_receiver_t *receiver, js_ffi_string_t *str) {
-  const uint8_t *data = (const uint8_t *) str->data;
-
-  uint32_t len = 0;
-
-  for (uint32_t i = 0, n = str->len; i < n; i++) {
-    // The string data is latin1 so we add an additional byte count for all
-    // non-ASCII characters.
-    len += 1 + (data[i] >> 7);
-  }
-
-  return len;
+  return utf8_length_from_latin1((const latin1_t *) str->data, str->len);
 }
 
 static js_value_t *

package/index.js

@@ -6,11 +6,21 @@ const utf8 = require('./lib/utf8')
 const utf16le = require('./lib/utf16le')
 const binding = require('./binding')
 
+let poolSize = 0
+
 const Buffer = module.exports = exports = class Buffer extends Uint8Array {
   static {
     binding.tag(this)
   }
 
+  static get poolSize () {
+    return poolSize
+  }
+
+  static set poolSize (value) {
+    poolSize = Math.max(0, value)
+  }
+
   [Symbol.species] () {
     return Buffer
   }
@@ -225,169 +235,83 @@ const Buffer = module.exports = exports = class Buffer extends Uint8Array {
     return codecFor(encoding).write(buffer, string)
   }
 
-  writeUInt8 (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteoffset, this.bytelength)
-    view.setUint8(offset, value, true)
+  readBigInt64BE (offset = 0) { return viewOf(this).getBigInt64(offset, false) }
+  readBigInt64LE (offset = 0) { return viewOf(this).getBigInt64(offset, true) }
 
-    return offset + 1
-  }
+  readBigUint64BE (offset = 0) { return viewOf(this).getBigUint64(offset, false) }
+  readBigUint64LE (offset = 0) { return viewOf(this).getBigUint64(offset, true) }
 
-  writeUint8 (...args) {
-    return this.writeUInt8(...args)
-  }
+  readDoubleBE (offset = 0) { return viewOf(this).getFloat64(offset, false) }
+  readDoubleLE (offset = 0) { return viewOf(this).getFloat64(offset, true) }
 
-  writeInt8 (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteoffset, this.bytelength)
-    view.setInt8(offset, value)
+  readFloatBE (offset = 0) { return viewOf(this).getFloat32(offset, false) }
+  readFloatLE (offset = 0) { return viewOf(this).getFloat32(offset, true) }
 
-    return offset + 1
-  }
+  readInt8 (offset = 0) { return viewOf(this).getInt8(offset) }
 
-  writeDoubleLE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setFloat64(offset, value, true)
+  readInt16BE (offset = 0) { return viewOf(this).getInt16(offset, false) }
+  readInt16LE (offset = 0) { return viewOf(this).getInt16(offset, true) }
 
-    return offset + 8
-  }
+  readInt32BE (offset = 0) { return viewOf(this).getInt32(offset, false) }
+  readInt32LE (offset = 0) { return viewOf(this).getInt32(offset, true) }
 
-  writeFloatLE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setFloat32(offset, value, true)
+  readUint8 (offset = 0) { return viewOf(this).getUint8(offset) }
 
-    return offset + 4
-  }
+  readUint16BE (offset = 0) { return viewOf(this).getUint16(offset, false) }
+  readUint16LE (offset = 0) { return viewOf(this).getUint16(offset, true) }
 
-  writeUInt16LE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setUint16(offset, value, true)
+  readUint32BE (offset = 0) { return viewOf(this).getUint32(offset, false) }
+  readUint32LE (offset = 0) { return viewOf(this).getUint32(offset, true) }
 
-    return offset + 2
-  }
+  readBigUInt64BE (...args) { return this.readBigUint64BE(...args) }
+  readBigUInt64LE (...args) { return this.readBigUint64LE(...args) }
 
-  writeUInt32LE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setUint32(offset, value, true)
+  readUInt8 (...args) { return this.readUint8(...args) }
 
-    return offset + 4
-  }
+  readUInt16BE (...args) { return this.readUint16BE(...args) }
+  readUInt16LE (...args) { return this.readUint16LE(...args) }
 
-  writeInt32LE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setInt32(offset, value, true)
+  readUInt32BE (...args) { return this.readUint32BE(...args) }
+  readUInt32LE (...args) { return this.readUint32LE(...args) }
 
-    return offset + 4
-  }
+  writeBigInt64BE (value, offset = 0) { viewOf(this).setBigInt64(offset, value, false); return offset + 8 }
+  writeBigInt64LE (value, offset = 0) { viewOf(this).setBigInt64(offset, value, true); return offset + 8 }
 
-  readInt8 (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
+  writeBigUint64BE (value, offset = 0) { viewOf(this).setBigUint64(offset, value, false); return offset + 8 }
+  writeBigUint64LE (value, offset = 0) { viewOf(this).setBigUint64(offset, value, true); return offset + 8 }
 
-    return view.getInt8(offset)
-  }
+  writeDoubleBE (value, offset = 0) { viewOf(this).setFloat64(offset, value, false); return offset + 8 }
+  writeDoubleLE (value, offset = 0) { viewOf(this).setFloat64(offset, value, true); return offset + 8 }
 
-  readUInt8 (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
+  writeFloatBE (value, offset = 0) { viewOf(this).setFloat32(offset, value, false); return offset + 4 }
+  writeFloatLE (value, offset = 0) { viewOf(this).setFloat32(offset, value, true); return offset + 4 }
 
-    return view.getUint8(offset)
-  }
+  writeInt8 (value, offset = 0) { viewOf(this).setInt8(offset, value); return offset + 1 }
 
-  readUint8 (...args) {
-    return this.readUInt8(...args)
-  }
-
-  readDoubleLE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getFloat64(offset, true)
-  }
-
-  readFloatLE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getFloat32(offset, true)
-  }
+  writeInt16BE (value, offset = 0) { viewOf(this).setInt16(offset, value, false); return offset + 2 }
+  writeInt16LE (value, offset = 0) { viewOf(this).setInt16(offset, value, true); return offset + 2 }
 
-  readUInt16LE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
+  writeInt32BE (value, offset = 0) { viewOf(this).setInt32(offset, value, false); return offset + 4 }
+  writeInt32LE (value, offset = 0) { viewOf(this).setInt32(offset, value, true); return offset + 4 }
 
-    return view.getUint16(offset, true)
-  }
+  writeUint8 (value, offset = 0) { viewOf(this).setUint8(offset, value, true); return offset + 1 }
 
-  readUInt32LE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
+  writeUint16BE (value, offset = 0) { viewOf(this).setUint16(offset, value, false); return offset + 2 }
+  writeUint16LE (value, offset = 0) { viewOf(this).setUint16(offset, value, true); return offset + 2 }
 
-    return view.getUint32(offset, true)
-  }
+  writeUint32LE (value, offset = 0) { viewOf(this).setUint32(offset, value, true); return offset + 4 }
+  writeUint32BE (value, offset = 0) { viewOf(this).setUint32(offset, value, false); return offset + 4 }
 
-  readInt32LE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
+  writeBigUInt64BE (...args) { return this.writeBigUint64BE(...args) }
+  writeBigUInt64LE (...args) { return this.writeBigUint64LE(...args) }
 
-    return view.getInt32(offset, true)
-  }
+  writeUInt8 (...args) { return this.writeUint8(...args) }
 
-  writeDoubleBE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setFloat64(offset, value, false)
+  writeUInt16BE (...args) { return this.writeUint16BE(...args) }
+  writeUInt16LE (...args) { return this.writeUint16LE(...args) }
 
-    return offset + 8
-  }
-
-  writeFloatBE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setFloat32(offset, value, false)
-
-    return offset + 4
-  }
-
-  writeUInt16BE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setUint16(offset, value, false)
-
-    return offset + 2
-  }
-
-  writeUInt32BE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setUint32(offset, value, false)
-
-    return offset + 4
-  }
-
-  writeInt32BE (value, offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-    view.setInt32(offset, value, false)
-
-    return offset + 4
-  }
-
-  readDoubleBE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getFloat64(offset, false)
-  }
-
-  readFloatBE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getFloat32(offset, false)
-  }
-
-  readUInt16BE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getUint16(offset, false)
-  }
-
-  readUInt32BE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getUint32(offset, false)
-  }
-
-  readInt32BE (offset = 0) {
-    const view = new DataView(this.buffer, this.byteOffset, this.byteLength)
-
-    return view.getInt32(offset, false)
-  }
+  writeUInt32BE (...args) { return this.writeUint32BE(...args) }
+  writeUInt32LE (...args) { return this.writeUint32LE(...args) }
 }
 
 exports.Buffer = exports
@@ -412,6 +336,17 @@ function codecFor (encoding = 'utf8') {
   throw new Error(`Unknown encoding: ${encoding}`)
 }
 
+const views = new WeakMap()
+
+function viewOf (buffer) {
+  let view = views.get(buffer)
+  if (view === undefined) {
+    view = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength)
+    views.set(buffer, view)
+  }
+  return view
+}
+
 exports.isBuffer = function isBuffer (value) {
   if (typeof value !== 'object' || value === null) return false
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-buffer",
-  "version": "2.5.10",
+  "version": "2.6.0",
   "description": "Native buffers for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -13,13 +13,7 @@
     "binding.js",
     "CMakeLists.txt",
     "lib",
-    "prebuilds",
-    "vendor/libbase64/include",
-    "vendor/libbase64/src",
-    "vendor/libhex/include",
-    "vendor/libhex/src",
-    "vendor/libutf/include",
-    "vendor/libutf/src"
+    "prebuilds"
   ],
   "addon": true,
   "scripts": {
@@ -38,6 +32,7 @@
   "devDependencies": {
     "brittle": "^3.1.1",
     "cmake-bare": "^1.1.6",
+    "cmake-fetch": "^1.0.0",
     "standard": "^17.0.0"
   }
 }

package/vendor/libbase64/CMakeLists.txt

@@ -1,70 +0,0 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(base64 C)
-
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-add_library(base64 OBJECT)
-
-set_target_properties(
-  base64
-  PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  base64
-  INTERFACE
-    include/base64.h
-  PRIVATE
-    src/base64.c
-)
-
-target_include_directories(
-  base64
-  PUBLIC
-    include
-    $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-add_library(base64_shared SHARED)
-
-set_target_properties(
-  base64_shared
-  PROPERTIES
-  OUTPUT_NAME base64
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  base64_shared
-  PUBLIC
-    base64
-)
-
-add_library(base64_static STATIC)
-
-set_target_properties(
-  base64_static
-  PROPERTIES
-  OUTPUT_NAME base64
-  PREFIX lib
-)
-
-target_link_libraries(
-  base64_static
-  PUBLIC
-    base64
-)
-
-install(TARGETS base64_shared base64_static)
-
-install(FILES include/base64.h DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-  add_subdirectory(test)
-endif()

package/vendor/libbase64/include/base64.h

@@ -1,128 +0,0 @@
-#ifndef BASE64_H
-#define BASE64_H
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <utf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static const char base64__alphabet[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static const char base64__inverse_alphabet[256] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
-
-static inline int
-base64__encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  size_t len = 4 * ((buffer_len + 2) / 3);
-
-  if (string == NULL) {
-    *string_len = len;
-    return 0;
-  }
-
-  if (*string_len < len) return -1;
-
-  bool terminate = *string_len > len;
-
-  *string_len = len;
-
-  size_t k = 0, i = 0, n = buffer_len;
-
-  uint8_t a, b, c;
-
-  for (; i + 2 < n; i += 3) {
-    a = buffer[i];
-    b = buffer[i + 1];
-    c = buffer[i + 2];
-
-    string[k++] = base64__alphabet[a >> 2];
-    string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
-    string[k++] = base64__alphabet[((b & 0x0f) << 2) | (c >> 6)];
-    string[k++] = base64__alphabet[c & 0x3f];
-  }
-
-  if (i < n) {
-    a = buffer[i];
-
-    string[k++] = base64__alphabet[a >> 2];
-
-    if (i + 1 < n) {
-      b = buffer[i + 1];
-
-      string[k++] = base64__alphabet[((a & 0x03) << 4) | (b >> 4)];
-      string[k++] = base64__alphabet[(b & 0x0f) << 2];
-    } else {
-      string[k++] = base64__alphabet[(a & 0x03) << 4];
-      string[k++] = '=';
-    }
-
-    string[k++] = '=';
-  }
-
-  if (terminate) string[k] = '\0';
-
-  return 0;
-}
-
-static inline int
-base64__decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  if (string_len % 4 != 0) return -1;
-
-  if (string_len == 0) {
-    *buffer_len = 0;
-    return 0;
-  }
-
-  size_t len = string_len / 4 * 3;
-
-  if (string[string_len - 1] == '=') len--;
-  if (string[string_len - 2] == '=') len--;
-
-  if (buffer == NULL) {
-    *buffer_len = len;
-    return 0;
-  }
-
-  if (*buffer_len < len) return -1;
-
-  *buffer_len = len;
-
-  size_t k = 0;
-
-  for (size_t i = 0, n = string_len; i < n; i += 4) {
-    char chunk[4];
-
-    for (size_t j = 0; j < 4; j++) {
-      chunk[j] = string[i + j] == '=' ? 0 : base64__inverse_alphabet[string[i + j]];
-
-      if (chunk[j] == (char) -1) return -1;
-    }
-
-    uint32_t triple = (chunk[0] << 3 * 6) + (chunk[1] << 2 * 6) + (chunk[2] << 1 * 6) + (chunk[3] << 0 * 6);
-
-    if (k < len) buffer[k++] = (triple >> 2 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 1 * 8) & 0xFF;
-    if (k < len) buffer[k++] = (triple >> 0 * 8) & 0xFF;
-  }
-
-  return 0;
-}
-
-inline int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len) {
-  return base64__encode(buffer, buffer_len, string, string_len);
-}
-
-inline int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len) {
-  return base64__decode(string, string_len, buffer, buffer_len);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // BASE64_H

package/vendor/libbase64/src/base64.c

@@ -1,10 +0,0 @@
-#include <stdint.h>
-#include <utf.h>
-
-#include "../include/base64.h"
-
-extern int
-base64_encode (const uint8_t *buffer, size_t buffer_len, utf8_t *string, size_t *string_len);
-
-extern int
-base64_decode (const utf8_t *string, size_t string_len, uint8_t *buffer, size_t *buffer_len);

package/vendor/libhex/CMakeLists.txt

@@ -1,71 +0,0 @@
-cmake_minimum_required(VERSION 3.22)
-
-project(hex C)
-
-if(NOT TARGET utf)
-  add_subdirectory(vendor/libutf EXCLUDE_FROM_ALL)
-endif()
-
-add_library(hex OBJECT)
-
-set_target_properties(
-  hex
-  PROPERTIES
-  C_STANDARD 99
-  POSITION_INDEPENDENT_CODE ON
-)
-
-target_sources(
-  hex
-  INTERFACE
-    include/hex.h
-  PRIVATE
-    src/hex.c
-)
-
-target_include_directories(
-  hex
-  PUBLIC
-    include
-    $<TARGET_PROPERTY:utf,INTERFACE_INCLUDE_DIRECTORIES>
-)
-
-add_library(hex_shared SHARED)
-
-set_target_properties(
-  hex_shared
-  PROPERTIES
-  OUTPUT_NAME hex
-  WINDOWS_EXPORT_ALL_SYMBOLS ON
-)
-
-target_link_libraries(
-  hex_shared
-  PUBLIC
-    hex
-)
-
-add_library(hex_static STATIC)
-
-set_target_properties(
-  hex_static
-  PROPERTIES
-  OUTPUT_NAME hex
-  PREFIX lib
-)
-
-target_link_libraries(
-  hex_static
-  PUBLIC
-    hex
-)
-
-install(TARGETS hex_shared hex_static)
-
-install(FILES include/hex.h DESTINATION include)
-
-if(PROJECT_IS_TOP_LEVEL)
-  enable_testing()
-
-  add_subdirectory(test)
-endif()