pumpify -> pump + better UInt8Array handling

Author: andrewosh

lib/clients/drive.js

@@ -1,7 +1,7 @@
 const grpc = require('@grpc/grpc-js')
 const maybe = require('call-me-maybe')
 const collectStream = require('stream-collector')
-const pumpify = require('pumpify')
+const pump = require('pump')
 const codecs = require('codecs')
 const { Writable, Transform } = require('streamx')
 
@@ -230,7 +230,7 @@ class RemoteHyperdrive {
     if (prefix) req.setPrefix(prefix)
 
     const call = this._client.createDiffStream(req, toMetadata({ token: this.token }))
-    return pumpify.obj(
+    return pump(
       call,
       new Transform({
         transform (rsp, cb) {
@@ -254,11 +254,12 @@ class RemoteHyperdrive {
     if (opts.end) req.setEnd(opts.end)
 
     const call = this._client.createReadStream(req, toMetadata({ token: this.token }))
-    return pumpify(
+    return pump(
       call,
       new Transform({
         transform (rsp, cb) {
-          return cb(null, Buffer.from(rsp.getChunk()))
+          const chunk = rsp.getChunk()
+          return cb(null, Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength))
         }
       })
     )
@@ -280,7 +281,10 @@ class RemoteHyperdrive {
       const call = this._client.readFile(req, toMetadata({ token: this.token }))
       collectStream(call, (err, rsps) => {
         if (err) return reject(err)
-        const bufs = rsps.map(rsp => Buffer.from(rsp.getChunk()))
+        const bufs = rsps.map(rsp => {
+          const chunk = rsp.getChunk()
+         return Buffer.from(chunk.buffer, chunk.byteOffset, chunk.byteLength)
+        })
         var decoded = Buffer.concat(bufs)
         if (codec) {
           try {
@@ -325,7 +329,8 @@ class RemoteHyperdrive {
 
       map: chunk => {
         const req = new messages.WriteStreamRequest()
-        req.setChunk(Buffer.from(chunk))
+        if (typeof chunk === 'string') chunk = Buffer.from(chunk)
+        req.setChunk(chunk)
         return req
       }
     })

lib/common.js

@@ -50,9 +50,15 @@ function fromHyperdriveOptions (opts) {
     writable: opts.getWritable() || false,
     seed: opts.getSeed() || false
   }
-  if (extracted.key) extracted.key = Buffer.from(extracted.key)
-  if (extracted.discoveryKey) extracted.discoveryKey = Buffer.from(extracted.discoveryKey)
-  if (extracted.hash) extracted.hash = Buffer.from(extracted.hash)
+  if (extracted.key) {
+    extracted.key = Buffer.from(extracted.key.buffer, extracted.key.byteOffset, extracted.key.byteLength)
+  }
+  if (extracted.discoveryKey) {
+    extracted.discoveryKey = Buffer.from(extracted.discoveryKey.buffer, extracted.discoveryKey.byteOffset, extracted.discoveryKey.byteLength)
+  }
+  if (extracted.hash) {
+    extracted.hash = Buffer.from(extracted.hash.buffer, extracted.hash.byteOffset, extracted.hash.byteLength)
+  }
   return extracted
 }
 
@@ -79,8 +85,8 @@ function fromMount (mount) {
   const key = mount.getKey()
   const hash = mount.getHash()
   return {
-    key: key ? Buffer.from(key) : null,
-    hash: hash ? Buffer.from(hash) : null,
+    key: key ? Buffer.from(key.buffer, key.byteOffset, key.byteLength) : null,
+    hash: hash ? Buffer.from(hash.buffer, hash.byteOffset, hash.byteLength) : null,
     version: mount.getVersion(),
     hypercore: mount.getHypercore()
   }
@@ -165,7 +171,7 @@ function fromMetadata (map) {
   const metadata = {}
   if (!map || !map.getLength()) return metadata
   map.forEach((value, key) => {
-    metadata[key] = Buffer.from(value)
+    metadata[key] = Buffer.from(value.buffer, value.byteOffset, value.byteLength)
   })
   return metadata
 }
@@ -185,8 +191,9 @@ function fromDriveStats (driveStats) {
 
   function getCoreStats (coreStats) {
     if (!coreStats) return {}
+    const key = coreStats.getKey()
     return {
-      key: Buffer.from(coreStats.getKey()),
+      key: key ? Buffer.from(key.buffer, key.byteOffset, key.byteLength) : null,
       peers: coreStats.getPeers(),
       uploadedBytes: coreStats.getUploadedbytes(),
       downloadedBytes: coreStats.getDownloadedbytes(),