Skip to content
This repository was archived by the owner on Sep 28, 2021. It is now read-only.

fix: firefox using readable stream #3

Merged
merged 1 commit into from
Jul 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"mime-types": "^2.1.18",
"multihashes": "^0.4.13",
"promisify-es6": "^1.0.3",
"readable-stream-node-to-web": "^1.0.1"
"stream-to-blob": "^1.0.1"
},
"devDependencies": {
"aegir": "^13.1.0",
Expand Down
29 changes: 20 additions & 9 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
const fileType = require('file-type')
const mimeTypes = require('mime-types')
const stream = require('stream')
const nodeToWebStream = require('readable-stream-node-to-web')
const toBlob = require('stream-to-blob')

const resolver = require('./resolver')
const pathUtils = require('./utils/path')
Expand Down Expand Up @@ -68,7 +68,7 @@ const response = (ipfsNode, ipfsPath) => {

readableStream.once('error', (error) => {
if (error) {
resolve(new Response(error.toString(), header(500, 'Service Worker Error')))
resolve(new Response(error.toString(), header(500, 'Error fetching the file')))
}
})

Expand All @@ -79,19 +79,30 @@ const response = (ipfsNode, ipfsPath) => {
if (filetypeChecked) {
return
}

filetypeChecked = true
// return Response with mime type
const fileSignature = fileType(chunk)
const mimeType = mimeTypes.lookup(fileSignature ? fileSignature.ext : null)

if (mimeType) {
resolve(
new Response(typeof ReadableStream === 'function' ? nodeToWebStream(responseStream) : responseStream,
header(200, 'OK', { 'Content-Type': mimeTypes.contentType(mimeType) }))
)
if (typeof Blob === 'undefined') {
if (mimeType) {
resolve(new Response(responseStream, header(200, 'OK', { 'Content-Type': mimeTypes.contentType(mimeType) })))
} else {
resolve(new Response(responseStream, header()))
}
} else {
resolve(new Response(typeof ReadableStream === 'function' ? nodeToWebStream(responseStream) : responseStream,
header()))
toBlob(responseStream, (err, blob) => {
if (err) {
resolve(new Response(err.toString(), header(500, 'Error fetching the file')))
}

if (mimeType) {
resolve(new Response(blob, header(200, 'OK', { 'Content-Type': mimeTypes.contentType(mimeType) })))
} else {
resolve(new Response(blob, header()))
}
})
}
})
})
Expand Down