bare-buffer 3.3.1 → 3.4.0

package/index.d.ts

@@ -73,6 +73,9 @@ interface Buffer extends Uint8Array {
   readInt32BE(offset?: number): number
   readInt32LE(offset?: number): number
 
+  readIntBE(offset: number, byteLength: number): number
+  readIntLE(offset: number, byteLength: number): number
+
   readBigInt64BE(offset?: number): bigint
   readBigInt64LE(offset?: number): bigint
 
@@ -89,6 +92,11 @@ interface Buffer extends Uint8Array {
   readUInt32LE(offset?: number): number
   readUint32LE(offset?: number): number
 
+  readUIntBE(offset: number, byteLength: number): number
+  readUintBE(offset: number, byteLength: number): number
+  readUIntLE(offset: number, byteLength: number): number
+  readUintLE(offset: number, byteLength: number): number
+
   readBigUInt64BE(offset?: number): bigint
   readBigUint64BE(offset?: number): bigint
   readBigUInt64LE(offset?: number): bigint
@@ -117,6 +125,9 @@ interface Buffer extends Uint8Array {
   writeInt32BE(value: number, offset?: number): number
   writeInt32LE(value: number, offset?: number): number
 
+  writeIntBE(value: number, offset: number, byteLength: number): number
+  writeIntLE(value: number, offset: number, byteLength: number): number
+
   writeBigInt64BE(value: bigint, offset?: number): number
   writeBigInt64LE(value: bigint, offset?: number): number
 
@@ -133,6 +144,11 @@ interface Buffer extends Uint8Array {
   writeUInt32LE(value: number, offset?: number): number
   writeUint32LE(value: number, offset?: number): number
 
+  writeUIntBE(value: number, offset: number, byteLength: number): number
+  writeUintBE(value: number, offset: number, byteLength: number): number
+  writeUIntLE(value: number, offset: number, byteLength: number): number
+  writeUintLE(value: number, offset: number, byteLength: number): number
+
   writeBigUint64BE(value: bigint, offset?: number): number
   writeBigUInt64BE(value: bigint, offset?: number): number
   writeBigUint64LE(value: bigint, offset?: number): number

package/index.js

@@ -104,7 +104,6 @@ module.exports = exports = class Buffer extends Uint8Array {
     const source = this
 
     if (source === target) return true
-
     if (source.byteLength !== target.byteLength) return false
 
     return (
@@ -164,14 +163,13 @@ module.exports = exports = class Buffer extends Uint8Array {
 
   fill(value, offset = 0, end = this.byteLength, encoding = 'utf8') {
     if (typeof value === 'string') {
-      // fill(string, encoding)
       if (typeof offset === 'string') {
+        // fill(string, encoding)
         encoding = offset
         offset = 0
         end = this.byteLength
-
-        // fill(string, offset, encoding)
       } else if (typeof end === 'string') {
+        // fill(string, offset, encoding)
         encoding = end
         end = this.byteLength
       }
@@ -299,14 +297,13 @@ module.exports = exports = class Buffer extends Uint8Array {
     // write(string)
     if (arguments.length === 1) return utf8.write(this, string)
 
-    // write(string, encoding)
     if (typeof offset === 'string') {
+      // write(string, encoding)
       encoding = offset
       offset = 0
       length = this.byteLength
-
-      // write(string, offset, encoding)
     } else if (typeof length === 'string') {
+      // write(string, offset, encoding)
       encoding = length
       length = this.byteLength - offset
     }
@@ -376,6 +373,26 @@ module.exports = exports = class Buffer extends Uint8Array {
     return viewOf(this).getInt32(offset, true)
   }
 
+  readIntBE(offset, byteLength) {
+    if (byteLength === 6) return readInt48BE(viewOf(this), offset)
+    if (byteLength === 5) return readInt40BE(viewOf(this), offset)
+    if (byteLength === 3) return readInt24BE(viewOf(this), offset)
+    if (byteLength === 4) return this.readInt32BE(offset)
+    if (byteLength === 2) return this.readInt16BE(offset)
+    if (byteLength === 1) return this.readInt8(offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
+  readIntLE(offset, byteLength) {
+    if (byteLength === 6) return readInt48LE(viewOf(this), offset)
+    if (byteLength === 5) return readInt40LE(viewOf(this), offset)
+    if (byteLength === 3) return readInt24LE(viewOf(this), offset)
+    if (byteLength === 4) return this.readInt32LE(offset)
+    if (byteLength === 2) return this.readInt16LE(offset)
+    if (byteLength === 1) return this.readInt8(offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
   readUint8(offset = 0) {
     return viewOf(this).getUint8(offset)
   }
@@ -394,6 +411,26 @@ module.exports = exports = class Buffer extends Uint8Array {
     return viewOf(this).getUint32(offset, true)
   }
 
+  readUintBE(offset, byteLength) {
+    if (byteLength === 6) return readUint48BE(viewOf(this), offset)
+    if (byteLength === 5) return readUint40BE(viewOf(this), offset)
+    if (byteLength === 3) return readUint24BE(viewOf(this), offset)
+    if (byteLength === 4) return this.readUint32BE(offset)
+    if (byteLength === 2) return this.readUint16BE(offset)
+    if (byteLength === 1) return this.readUint8(offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
+  readUintLE(offset, byteLength) {
+    if (byteLength === 6) return readUint48LE(viewOf(this), offset)
+    if (byteLength === 5) return readUint40LE(viewOf(this), offset)
+    if (byteLength === 3) return readUint24LE(viewOf(this), offset)
+    if (byteLength === 4) return this.readUint32LE(offset)
+    if (byteLength === 2) return this.readUint16LE(offset)
+    if (byteLength === 1) return this.readUint8(offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
   readBigUInt64BE(...args) {
     return this.readBigUint64BE(...args)
   }
@@ -419,6 +456,13 @@ module.exports = exports = class Buffer extends Uint8Array {
     return this.readUint32LE(...args)
   }
 
+  readUIntBE(...args) {
+    return this.readUintBE(...args)
+  }
+  readUIntLE(...args) {
+    return this.readUintLE(...args)
+  }
+
   writeBigInt64BE(value, offset = 0) {
     viewOf(this).setBigInt64(offset, value, false)
     return offset + 8
@@ -478,6 +522,26 @@ module.exports = exports = class Buffer extends Uint8Array {
     return offset + 4
   }
 
+  writeIntBE(value, offset, byteLength) {
+    if (byteLength === 6) return writeInt48BE(value, viewOf(this), offset)
+    if (byteLength === 5) return writeInt40BE(value, viewOf(this), offset)
+    if (byteLength === 3) return writeInt24BE(value, viewOf(this), offset)
+    if (byteLength === 4) return this.writeInt32BE(value, offset)
+    if (byteLength === 2) return this.writeInt16BE(value, offset)
+    if (byteLength === 1) return this.writeInt8(value, offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
+  writeIntLE(value, offset, byteLength) {
+    if (byteLength === 6) return writeInt48LE(value, viewOf(this), offset)
+    if (byteLength === 5) return writeInt40LE(value, viewOf(this), offset)
+    if (byteLength === 3) return writeInt24LE(value, viewOf(this), offset)
+    if (byteLength === 4) return this.writeInt32LE(value, offset)
+    if (byteLength === 2) return this.writeInt16LE(value, offset)
+    if (byteLength === 1) return this.writeInt8(value, offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
   writeUint8(value, offset = 0) {
     viewOf(this).setUint8(offset, value, true)
     return offset + 1
@@ -501,6 +565,26 @@ module.exports = exports = class Buffer extends Uint8Array {
     return offset + 4
   }
 
+  writeUintBE(value, offset, byteLength) {
+    if (byteLength === 6) return writeUint48BE(value, viewOf(this), offset)
+    if (byteLength === 5) return writeUint40BE(value, viewOf(this), offset)
+    if (byteLength === 3) return writeUint24BE(value, viewOf(this), offset)
+    if (byteLength === 4) return this.writeUint32BE(value, offset)
+    if (byteLength === 2) return this.writeUint16BE(value, offset)
+    if (byteLength === 1) return this.writeUint8(value, offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
+  writeUintLE(value, offset, byteLength) {
+    if (byteLength === 6) return writeUint48LE(value, viewOf(this), offset)
+    if (byteLength === 5) return writeUint40LE(value, viewOf(this), offset)
+    if (byteLength === 3) return writeUint24LE(value, viewOf(this), offset)
+    if (byteLength === 4) return this.writeUint32LE(value, offset)
+    if (byteLength === 2) return this.writeUint16LE(value, offset)
+    if (byteLength === 1) return this.writeUint8(value, offset)
+    throw new RangeError(`Byte length must be between 1 and 6`)
+  }
+
   writeBigUInt64BE(...args) {
     return this.writeBigUint64BE(...args)
   }
@@ -525,6 +609,13 @@ module.exports = exports = class Buffer extends Uint8Array {
   writeUInt32LE(...args) {
     return this.writeUint32LE(...args)
   }
+
+  writeUIntBE(...args) {
+    return this.writeUintBE(...args)
+  }
+  writeUIntLE(...args) {
+    return this.writeUintLE(...args)
+  }
 }
 
 const Buffer = exports
@@ -630,7 +721,6 @@ exports.concat = function concat(buffers, length) {
     }
 
     result.set(buffer, offset)
-
     offset += buffer.byteLength
   }
 
@@ -752,3 +842,189 @@ exports.btoa = function btoa(data) {
 
   return Buffer.from(data, 'latin1').toString('base64')
 }
+
+function readInt48BE(view, offset) {
+  const hi = view.getUint16(offset, false)
+  const lo = view.getUint32(offset + 2, false)
+  let value = lo + hi * 0x100000000
+  if (hi & 0x8000) value -= 0x1000000000000
+  return value
+}
+
+function readInt48LE(view, offset) {
+  const lo = view.getUint32(offset, true)
+  const hi = view.getUint16(offset + 4, true)
+  let value = lo + hi * 0x100000000
+  if (hi & 0x8000) value -= 0x1000000000000
+  return value
+}
+
+function readInt40BE(view, offset) {
+  const hi = view.getUint8(offset)
+  const lo = view.getUint32(offset + 1, false)
+  let value = lo + hi * 0x100000000
+  if (hi & 0x80) value -= 0x10000000000
+  return value
+}
+
+function readInt40LE(view, offset) {
+  const lo = view.getUint32(offset, true)
+  const hi = view.getUint8(offset + 4)
+  let value = lo + hi * 0x100000000
+  if (hi & 0x80) value -= 0x10000000000
+  return value
+}
+
+function readInt24BE(view, offset) {
+  const value =
+    (view.getUint8(offset) << 16) |
+    (view.getUint8(offset + 1) << 8) |
+    view.getUint8(offset + 2)
+  return value & 0x800000 ? value - 0x1000000 : value
+}
+
+function readInt24LE(view, offset) {
+  const value =
+    view.getUint8(offset) |
+    (view.getUint8(offset + 1) << 8) |
+    (view.getUint8(offset + 2) << 16)
+  return value & 0x800000 ? value - 0x1000000 : value
+}
+
+function readUint48BE(view, offset) {
+  const hi = view.getUint16(offset, false)
+  const lo = view.getUint32(offset + 2, false)
+  return lo + hi * 0x100000000
+}
+
+function readUint48LE(view, offset) {
+  const lo = view.getUint32(offset, true)
+  const hi = view.getUint16(offset + 4, true)
+  return lo + hi * 0x100000000
+}
+
+function readUint40BE(view, offset) {
+  const hi = view.getUint8(offset)
+  const lo = view.getUint32(offset + 1, false)
+  return lo + hi * 0x100000000
+}
+
+function readUint40LE(view, offset) {
+  const lo = view.getUint32(offset, true)
+  const hi = view.getUint8(offset + 4)
+  return lo + hi * 0x100000000
+}
+
+function readUint24BE(view, offset) {
+  return (
+    (view.getUint8(offset) << 16) |
+    (view.getUint8(offset + 1) << 8) |
+    view.getUint8(offset + 2)
+  )
+}
+
+function readUint24LE(view, offset) {
+  return (
+    view.getUint8(offset) |
+    (view.getUint8(offset + 1) << 8) |
+    (view.getUint8(offset + 2) << 16)
+  )
+}
+
+function writeInt48BE(value, view, offset) {
+  if (value < 0) value += 0x1000000000000
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint16(offset, hi, false)
+  view.setUint32(offset + 2, lo, false)
+  return offset + 6
+}
+
+function writeInt48LE(value, view, offset) {
+  if (value < 0) value += 0x1000000000000
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint32(offset, lo, true)
+  view.setUint16(offset + 4, hi, true)
+  return offset + 6
+}
+
+function writeInt40BE(value, view, offset) {
+  if (value < 0) value += 0x10000000000
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint8(offset, hi)
+  view.setUint32(offset + 1, lo, false)
+  return offset + 5
+}
+
+function writeInt40LE(value, view, offset) {
+  if (value < 0) value += 0x10000000000
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint32(offset, lo, true)
+  view.setUint8(offset + 4, hi)
+  return offset + 5
+}
+
+function writeInt24BE(value, view, offset) {
+  if (value < 0) value += 0x1000000
+  view.setUint8(offset, (value >> 16) & 0xff)
+  view.setUint8(offset + 1, (value >> 8) & 0xff)
+  view.setUint8(offset + 2, value & 0xff)
+  return offset + 3
+}
+
+function writeInt24LE(value, view, offset) {
+  if (value < 0) value += 0x1000000
+  view.setUint8(offset, value & 0xff)
+  view.setUint8(offset + 1, (value >> 8) & 0xff)
+  view.setUint8(offset + 2, (value >> 16) & 0xff)
+  return offset + 3
+}
+
+function writeUint48BE(value, view, offset) {
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint16(offset, hi, false)
+  view.setUint32(offset + 2, lo, false)
+  return offset + 6
+}
+
+function writeUint48LE(value, view, offset) {
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint32(offset, lo, true)
+  view.setUint16(offset + 4, hi, true)
+  return offset + 6
+}
+
+function writeUint40BE(value, view, offset) {
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint8(offset, hi)
+  view.setUint32(offset + 1, lo, false)
+  return offset + 5
+}
+
+function writeUint40LE(value, view, offset) {
+  const hi = Math.floor(value / 0x100000000)
+  const lo = value >>> 0
+  view.setUint32(offset, lo, true)
+  view.setUint8(offset + 4, hi)
+  return offset + 5
+}
+
+function writeUint24BE(value, view, offset) {
+  view.setUint8(offset, (value >> 16) & 0xff)
+  view.setUint8(offset + 1, (value >> 8) & 0xff)
+  view.setUint8(offset + 2, value & 0xff)
+  return offset + 3
+}
+
+function writeUint24LE(value, view, offset) {
+  view.setUint8(offset, value & 0xff)
+  view.setUint8(offset + 1, (value >> 8) & 0xff)
+  view.setUint8(offset + 2, (value >> 16) & 0xff)
+  return offset + 3
+}

package/package.json

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