Fix stream error. Disable mimeType check

add-on/src/lib/ipfs-companion.js

@@ -211,7 +211,7 @@ try {
     onclick: copyAddressAtPublicGw
   })
 } catch (err) {
-  console.log('[ipfs-companion] Error creating contextMenus', err)
+  console.debug('[ipfs-companion] Error creating contextMenus')
 }
 
 function inFirefox () {
@@ -255,7 +255,7 @@ async function addFromURL (info) {
       const reader = new FileReader()
       reader.onloadend = () => {
         const buffer = Buffer.from(reader.result)
-        ipfs.add(buffer, uploadResultHandler)
+        ipfs.files.add(buffer, uploadResultHandler)
       }
       reader.readAsArrayBuffer(await response.blob())
     } else {
@@ -275,6 +275,17 @@ async function addFromURL (info) {
   }
 }
 
+// TODO: feature detect and push to client type specific modules.
+function getIpfsPathAndLocalAddress (hash) {
+  const path = `/ipfs/${hash}`
+  if (state.ipfsNodeType === 'embedded' && chrome.protocol.registerStringProtocol) {
+    return {path, localAddress: `ipfs://${hash}`}
+  } else {
+    const url = new URL(path, state.gwURLString).toString()
+    return {path, localAddress: url}
+  }
+}
+
 function uploadResultHandler (err, result) {
   if (err || !result) {
     console.error('[ipfs-companion] ipfs add error', err, result)
@@ -283,9 +294,9 @@ function uploadResultHandler (err, result) {
   }
   result.forEach(function (file) {
     if (file && file.hash) {
-      const path = `/ipfs/${file.hash}`
+      const {path, localAddress} = getIpfsPathAndLocalAddress(file.hash)
       browser.tabs.create({
-        'url': new URL(state.gwURLString + path).toString()
+        'url': localAddress
       })
       console.info('[ipfs-companion] successfully stored', path)
       if (state.preloadAtPublicGateway) {
@@ -383,7 +394,7 @@ async function updateContextMenus (changedTabId) {
       }
     }
   } catch (err) {
-    // console.debug('[ipfs-companion] Error updating context menus', err)
+    console.debug('[ipfs-companion] Error updating context menus')
   }
 }
 

add-on/src/lib/ipfs-protocol.js

@@ -1,4 +1,5 @@
-const identifyBuffer = require('buffer-signature').identify
+const bl = require('bl')
+const identifyStream = require('buffer-signature').identifyStream
 
 exports.createIpfsUrlProtocolHandler = (getIpfs) => {
   return async (request, reply) => {
@@ -7,47 +8,33 @@ exports.createIpfsUrlProtocolHandler = (getIpfs) => {
 
     const path = request.url.split('ipfs://')[1]
     const ipfs = getIpfs()
-    const { mimeType, data, charset } = await catFromIpfs(ipfs, path)
 
-    console.log(`[ipfs-companion] returning ${path} as ${mimeType} ${charset}`)
-    console.timeEnd('[ipfs-companion] IpfsUrlProtocolHandler')
-    reply({ mimeType, data, charset })
-  }
-}
+    try {
+      // TODO: disable mime type detection for now
+      const mimeType = 'text/plain'
+      const {data} = await getDataAndGuessMimeType(ipfs, path)
+      console.log(`[ipfs-companion] returning ${path} as ${mimeType}`)
+      reply({mimeType, data})
+    } catch (err) {
+      reply({mimeType: 'text/html', data: `Error ${err.message}`})
+    }
 
-async function catFromIpfs (ipfs, path) {
-  try {
-    const stream = await ipfs.files.cat(path)
-    console.debug(`[ipfs-companion] ipfs.files.cat returned a stream for ${path}`)
-
-    const res = await getMimeTypeAndData(stream)
-    console.debug(`[ipfs-companion] mimeType guessed as ${res.mimeType} for ${path}`)
-
-    return res
-  } catch (err) {
-    console.log('Error', err)
-    return { mimeType: 'text/html', data: `Error ${err.message}` }
+    console.timeEnd('[ipfs-companion] IpfsUrlProtocolHandler')
   }
 }
 
-async function getMimeTypeAndData (stream) {
-  let buffs = []
-
-  stream.on('data', (buff) => {
-    console.debug(`[ipfs-companion] data event from stream`)
-    buffs.push(buff)
-  })
-
+function getDataAndGuessMimeType (ipfs, path) {
   return new Promise((resolve, reject) => {
-    stream.on('error', (err) => reject(err))
-
-    stream.on('end', () => {
-      console.debug(`[ipfs-companion] end event from stream`)
-      const data = Buffer.concat(buffs)
-      const mimeType = identifyBuffer(data).mimeType
-      resolve({mimeType, data: data.toString('utf8'), charset: 'utf8'})
+    ipfs.files.cat(path, (err, stream) => {
+      if (err) return reject(err)
+
+      let mimeType = null
+      stream
+        .pipe(identifyStream(info => { mimeType = info.mimeType }))
+        .pipe(bl((err, data) => {
+          if (err) return reject(err)
+          resolve({mimeType, data: data.toString('utf8')})
+        }))
     })
   })
 }
-
-exports.getMimeTypeAndData = getMimeTypeAndData

package.json

@@ -68,6 +68,7 @@
     "web-ext": "2.2.2"
   },
   "dependencies": {
+    "bl": "1.2.1",
     "buffer-signature": "1.0.0",
     "choo": "6.6.0",
     "ipfs": "0.26.0",

yarn.lock

@@ -977,7 +977,7 @@ bip66@^1.1.3:
   dependencies:
     safe-buffer "^5.0.1"
 
-bl@^1.0.0, bl@^1.2.1:
+bl@1.2.1, bl@^1.0.0, bl@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
   dependencies: