fix: always return uint8arrays

.github/workflows/main.yml

@@ -43,23 +43,48 @@ jobs:
       - uses: actions/checkout@v2
       - uses: microsoft/playwright-github-action@v1
       - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail
+      - run: npx aegir test -t browser --bail --cov
+      - uses: codecov/codecov-action@v1
+  test-chrome-webworker:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - run: npm install
+      - run: npx aegir test -t webworker --bail
   test-firefox:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: microsoft/playwright-github-action@v1
       - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail -- --browser firefox
+      - run: npx aegir test -t browser --bail -- --browser firefox
+  test-firefox-webworker:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - run: npm install
+      - run: npx aegir test -t webworker --bail -- --browser firefox
   test-webkit:
     needs: check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: microsoft/playwright-github-action@v1
       - run: npm install
-      - run: npx aegir test -t browser -t webworker --bail -- --browser webkit
+      - run: npx aegir test -t browser --bail -- --browser webkit
+  test-webkit-webworker:
+    needs: check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - run: npm install
+      - run: npx aegir test -t webworker --bail -- --browser webkit
   test-electron-main:
     needs: check
     runs-on: ubuntu-latest

benchmarks/alloc.js

@@ -0,0 +1,68 @@
+/* eslint-disable no-console */
+
+/*
+$ node benchmarks/alloc.js
+$ npx playwright-test benchmarks/alloc.js --runner benchmark
+*/
+
+import Benchmark from 'benchmark'
+import { alloc, allocUnsafe } from '../src/alloc.js'
+
+const LENGTH = 1024
+
+function checkAlloc (arr) {
+  return arr.byteLength !== LENGTH
+}
+
+const suite = new Benchmark.Suite()
+
+suite
+  .add('Uint8Arrays.alloc', () => {
+    const res = alloc(LENGTH)
+
+    if (checkAlloc(res)) {
+      throw new Error('Alloc failed')
+    }
+  })
+  .add('Uint8Arrays.allocUnsafe', () => {
+    const res = allocUnsafe(LENGTH)
+
+    if (checkAlloc(res)) {
+      throw new Error('Alloc failed')
+    }
+  })
+  .add('new Uint8Array', () => {
+    const res = new Uint8Array(LENGTH)
+
+    if (checkAlloc(res)) {
+      throw new Error('Alloc failed')
+    }
+  })
+
+if (globalThis.Buffer != null) {
+  suite.add('Buffer.alloc', function () {
+    const res = globalThis.Buffer.alloc(LENGTH)
+
+    if (checkAlloc(res)) {
+      throw new Error('Alloc failed')
+    }
+  })
+  suite.add('Buffer.allocUnsafe', function () {
+    const res = globalThis.Buffer.allocUnsafe(LENGTH)
+
+    if (checkAlloc(res)) {
+      throw new Error('Alloc failed')
+    }
+  })
+}
+
+suite
+  // add listeners
+  .on('cycle', (event) => {
+    console.log(String(event.target))
+  })
+  .on('complete', function () {
+    console.log('Fastest is ' + this.filter('fastest').map('name'))
+  })
+  // run async
+  .run({ async: true })

src/alloc.js

@@ -1,3 +1,5 @@
+import { asUint8Array } from './util/as-uint8array.js'
+
 /**
  * Returns a `Uint8Array` of the requested size. Referenced memory will
  * be initialized to 0.
@@ -7,7 +9,7 @@
  */
 export function alloc (size = 0) {
   if (globalThis.Buffer != null && globalThis.Buffer.alloc != null) {
-    return globalThis.Buffer.alloc(size)
+    return asUint8Array(globalThis.Buffer.alloc(size))
   }
 
   return new Uint8Array(size)
@@ -23,7 +25,7 @@ export function alloc (size = 0) {
  */
 export function allocUnsafe (size = 0) {
   if (globalThis.Buffer != null && globalThis.Buffer.allocUnsafe != null) {
-    return globalThis.Buffer.allocUnsafe(size)
+    return asUint8Array(globalThis.Buffer.allocUnsafe(size))
   }
 
   return new Uint8Array(size)

src/concat.js

@@ -1,4 +1,5 @@
 import { allocUnsafe } from './alloc.js'
+import { asUint8Array } from './util/as-uint8array.js'
 
 /**
  * Returns a new Uint8Array created by concatenating the passed ArrayLikes
@@ -19,5 +20,5 @@ export function concat (arrays, length) {
     offset += arr.length
   }
 
-  return output
+  return asUint8Array(output)
 }

src/from-string.js

@@ -1,4 +1,5 @@
 import bases from './util/bases.js'
+import { asUint8Array } from './util/as-uint8array.js'
 
 /**
  * @typedef {import('./util/bases').SupportedEncodings} SupportedEncodings
@@ -23,7 +24,7 @@ export function fromString (string, encoding = 'utf8') {
   }
 
   if ((encoding === 'utf8' || encoding === 'utf-8') && globalThis.Buffer != null && globalThis.Buffer.from != null) {
-    return globalThis.Buffer.from(string, 'utf8')
+    return asUint8Array(globalThis.Buffer.from(string, 'utf-8'))
   }
 
   // add multibase prefix

src/util/as-uint8array.js

@@ -0,0 +1,15 @@
+
+/**
+ * To guarantee Uint8Array semantics, convert nodejs Buffers
+ * into vanilla Uint8Arrays
+ *
+ * @param {Uint8Array} buf
+ * @returns {Uint8Array}
+ */
+export function asUint8Array (buf) {
+  if (globalThis.Buffer != null) {
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength)
+  }
+
+  return buf
+}

src/xor.js

@@ -1,4 +1,5 @@
 import { allocUnsafe } from './alloc.js'
+import { asUint8Array } from './util/as-uint8array.js'
 
 /**
  * Returns the xor distance between two arrays
@@ -17,5 +18,5 @@ export function xor (a, b) {
     result[i] = a[i] ^ b[i]
   }
 
-  return result
+  return asUint8Array(result)
 }

test/alloc.spec.js

@@ -22,4 +22,20 @@ describe('Uint8Array alloc', () => {
 
     expect(allocUnsafe(size)).to.have.property('byteLength', size)
   })
+
+  it('alloc returns Uint8Array', () => {
+    const a = alloc(10)
+    const slice = a.slice()
+
+    // node slice is a copy operation, Uint8Array slice is a no-copy operation
+    expect(slice.buffer).to.not.equal(a.buffer)
+  })
+
+  it('allocUnsafe returns Uint8Array', () => {
+    const a = allocUnsafe(10)
+    const slice = a.slice()
+
+    // node slice is a copy operation, Uint8Array slice is a no-copy operation
+    expect(slice.buffer).to.not.equal(a.buffer)
+  })
 })

test/concat.spec.js

@@ -35,4 +35,14 @@ describe('Uint8Array concat', () => {
 
     expect(concat([a, b], 8)).to.deep.equal(c)
   })
+
+  it('concat returns Uint8Array', () => {
+    const a = Uint8Array.from([0, 1, 2, 3])
+    const b = [4, 5, 6, 7]
+    const c = concat([a, b])
+    const slice = c.slice()
+
+    // node slice is a copy operation, Uint8Array slice is a no-copy operation
+    expect(slice.buffer).to.not.equal(c.buffer)
+  })
 })

test/from-string.spec.js

@@ -52,4 +52,12 @@ describe('Uint8Array fromString', () => {
     // @ts-expect-error 'derp' is not a valid encoding
     expect(() => fromString(str, 'derp')).to.throw(/Unsupported encoding/)
   })
+
+  it('fromString returns Uint8Array', () => {
+    const a = fromString('derp')
+    const slice = a.slice()
+
+    // node slice is a copy operation, Uint8Array slice is a no-copy operation
+    expect(slice.buffer).to.not.equal(a.buffer)
+  })
 })

test/xor.spec.js

@@ -24,4 +24,14 @@ describe('Uint8Array xor', () => {
 
     expect(xor(a, b)).to.deep.equal(Uint8Array.from([0, 0]))
   })
+
+  it('xors returns Uint8Array', () => {
+    const a = Uint8Array.from([1, 1])
+    const b = Uint8Array.from([1, 1])
+    const c = xor(a, b)
+    const slice = c.slice()
+
+    // node slice is a copy operation, Uint8Array slice is a no-copy operation
+    expect(slice.buffer).to.not.equal(c.buffer)
+  })
 })