Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

fix #952 : adding +50Mb files via createAddStream #983

Merged
merged 1 commit into from
Sep 3, 2017
Merged
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
8 changes: 7 additions & 1 deletion examples/exchange-files-in-browser/package.json
Original file line number Diff line number Diff line change
@@ -2,10 +2,16 @@
"name": "exchange-files-browser",
"version": "0.0.0",
"scripts": {
"start": "http-server -c-1 -p 12345 public"
"bundle": "browserify public/js/app.js > public/js/bundle.js",
"serve": "http-server -c-1 -p 12345 public",
"start": "npm run bundle && npm run serve"
},
"license": "MIT",
"devDependencies": {
"browserify": "^14.4.0",
"http-server": "^0.10.0"
},
"dependencies": {
"stream-buffers": "^3.0.1"
}
}
3 changes: 2 additions & 1 deletion examples/exchange-files-in-browser/public/index.html
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ <h2>Peers</h2>

<!-- The IPFS node module -->
<script src="//unpkg.com/ipfs/dist/index.min.js"></script>
<script src="js/app.js"></script>
<!-- <script src="js/app.js"></script> -->
<script src="js/bundle.js"></script>
</body>
</html>
81 changes: 69 additions & 12 deletions examples/exchange-files-in-browser/public/js/app.js
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ const $details = document.querySelector('#details')
const $allDisabledButtons = document.querySelectorAll('button:disabled')
const $allDisabledInputs = document.querySelectorAll('input:disabled')
const $filesList = document.querySelector('.file-list')
const streamBuffers = require('stream-buffers')

let node
let peerInfo
@@ -137,16 +138,71 @@ function onDrop (event) {
filesArray.map((file) => {
readFileContents(file)
.then((buffer) => {
return node.files.add([{
path: file.name,
content: new node.types.Buffer(buffer)
}])
let fileSize = buffer.byteLength

if (fileSize < 50000000) {
return node.files.add([{
path: file.name,
content: new node.types.Buffer(buffer)
}])
} else {
// use createAddStream and chunk the file.
let progress = 0

let myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
// frequency: 10, // in milliseconds.
chunkSize: 32048 // in bytes.
})

node.files.createAddStream((err, stream) => {
if (err) throw err

stream.on('data', (file) => {
$multihashInput.value = file.hash
$filesStatus.innerHTML = `Added ${file.path} as ${file.hash}`

if (progressbar) {
clearInterval(progressbar)
progress = 0
}
})

myReadableStreamBuffer.on('data', (chunk) => {
progress += chunk.byteLength
})

if (!myReadableStreamBuffer.destroy) {
myReadableStreamBuffer.destroy = () => {}
}

stream.write({
path: file.name,
content: myReadableStreamBuffer
})

myReadableStreamBuffer.put(Buffer.from(buffer))
myReadableStreamBuffer.stop()

myReadableStreamBuffer.on('end', () => {
stream.end()
})

myReadableStreamBuffer.resume()

// progress.
let progressbar = setInterval(() => {
console.log('progress: ', progress, '/', fileSize, ' = ', Math.floor((progress / fileSize) * 100), '%')
}, 5000)
})
}
})
.then((files) => {
$multihashInput.value = files[0].hash
$filesStatus.innerHTML = files
if (files && files.length) {
$multihashInput.value = files[0].hash
$filesStatus.innerHTML = files
.map((e) => `Added ${e.path} as ${e.hash}`)
.join('<br>')
}
})
.catch(onError)
})
@@ -178,14 +234,15 @@ function refreshPeerList () {
if (err) {
return onError(err)
}

const peersAsHtml = peers
.map((peer) => {
const addr = peer.addr.toString()
if (addr.indexOf('ipfs') >= 0) {
return addr
} else {
return addr + peer.peer.id.toB58String()
if (peer.addr) {
const addr = peer.addr.toString()
if (addr.indexOf('ipfs') >= 0) {
return addr
} else {
return addr + peer.peer.id.toB58String()
}
}
})
.map((addr) => {