fix: prevent returning from http write command early

Also splits bufferStream out into it's own module as sometimes it's useful to have a pull stream that emits a known number of buffers. License: MIT Signed-off-by: achingbrain <[email protected]>
ipfs · Jul 31, 2018 · 1018e7d · 1018e7d
1 parent 36bde9d
commit 1018e7d
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 71 deletions.
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "detect-webworker": "^1.0.0",
     "dirty-chai": "^2.0.1",
     "ipfs": "~0.30.0",
+    "pull-buffer-stream": "^1.0.0",
     "safe-buffer": "^5.1.1",
     "tmp": "~0.0.33"
   },

diff --git a/src/core/utils/index.js b/src/core/utils/index.js
@@ -8,7 +8,6 @@ module.exports = {
   countStreamBytes: require('./count-stream-bytes'),
   createLock: require('./create-lock'),
   createNode: require('./create-node'),
-  endPullStream: require('./end-pull-stream'),
   formatCid: require('./format-cid'),
   limitStreamBytes: require('./limit-stream-bytes'),
   loadNode: require('./load-node'),

diff --git a/src/core/utils/limit-stream-bytes.js b/src/core/utils/limit-stream-bytes.js
@@ -1,14 +1,13 @@
 'use strict'
 
 const asyncMap = require('pull-stream/throughs/async-map')
-const endPullStream = require('./end-pull-stream')
 
 const limitStreamBytes = (limit) => {
   let bytesRead = 0
 
   return asyncMap((buffer, cb) => {
     if (bytesRead > limit) {
-      endPullStream(cb)
+      cb(true) // eslint-disable-line standard/no-callback-literal
     }
 
     // If we only need to return part of this buffer, slice it to make it smaller

diff --git a/src/core/write/update-tree.js b/src/core/write/update-tree.js
@@ -42,7 +42,7 @@ const updateTree = (ipfs, root, fileSize, streamStart, streamEnd, source, option
         nodeStart: streamPosition,
         nodeEnd: fileSize
       }, findDAGNodesWithRequestedData),
-      paramap(updateNodeData(source)),
+      asyncMap(updateNodeData(source)),
       filter(Boolean),
       asyncMap((link, next) => {
         if (!link.parent || link.index === undefined) {
@@ -179,7 +179,11 @@ const updateTree = (ipfs, root, fileSize, streamStart, streamEnd, source, option
             sourceEnd = undefined
           }
 
-          sourceData.copy(newData, targetStart, sourceStart, sourceEnd)
+          try {
+            sourceData.copy(newData, targetStart, sourceStart, sourceEnd)
+          } catch (error) {
+            return cb(error)
+          }
 
           cb(null, new UnixFs(meta.type, newData).marshal())
         },

diff --git a/src/http/write.js b/src/http/write.js
@@ -63,6 +63,7 @@ const mfsWrite = (api) => {
             strategy,
             flush
           })
+            .then(() => reply())
             .catch(error => {
               reply({
                 Message: error.message,
@@ -79,18 +80,6 @@ const mfsWrite = (api) => {
             Type: 'error'
           }).code(500).takeover()
         })
-
-        parser.on('end', () => {
-          if (!filesParsed) {
-            return reply({
-              Message: "File argument 'data' is required.",
-              Code: 0,
-              Type: 'error'
-            }).code(400).takeover()
-          }
-
-          reply()
-        })
       },
       validate: {
         options: {

diff --git a/test/cp.spec.js b/test/cp.spec.js
@@ -4,10 +4,10 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
+const bufferStream = require('pull-buffer-stream')
 
 const {
-  createMfs,
-  bufferStream
+  createMfs
 } = require('./helpers')
 
 describe('cp', function () {

diff --git a/test/helpers/buffer-stream.js b/test/helpers/buffer-stream.js
diff --git a/test/helpers/index.js b/test/helpers/index.js
@@ -38,7 +38,6 @@ const createMfs = promisify((cb) => {
 
 module.exports = {
   createMfs,
-  bufferStream: require('./buffer-stream'),
   collectLeafCids: require('./collect-leaf-cids'),
   EMPTY_DIRECTORY_HASH: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
   EMPTY_DIRECTORY_HASH_BASE32: 'bafybeiczsscdsbs7ffqz55asqdf3smv6klcw3gofszvwlyarci47bgf354'

diff --git a/test/mv.spec.js b/test/mv.spec.js
@@ -4,9 +4,9 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
+const bufferStream = require('pull-buffer-stream')
 const {
-  createMfs,
-  bufferStream
+  createMfs
 } = require('./helpers')
 
 describe('mv', function () {

diff --git a/test/read.spec.js b/test/read.spec.js
@@ -6,9 +6,7 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const path = require('path')
 const loadFixture = require('aegir/fixtures')
-const {
-  bufferStream
-} = require('./helpers')
+const bufferStream = require('pull-buffer-stream')
 const pull = require('pull-stream/pull')
 const collect = require('pull-stream/sinks/collect')
 const {

diff --git a/test/rm.spec.js b/test/rm.spec.js
@@ -4,9 +4,9 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
+const bufferStream = require('pull-buffer-stream')
 const {
-  createMfs,
-  bufferStream
+  createMfs
 } = require('./helpers')
 const {
   FILE_SEPARATOR

diff --git a/test/write.spec.js b/test/write.spec.js
@@ -8,8 +8,8 @@ const path = require('path')
 const loadFixture = require('aegir/fixtures')
 const isNode = require('detect-node')
 const values = require('pull-stream/sources/values')
+const bufferStream = require('pull-buffer-stream')
 const {
-  bufferStream,
   collectLeafCids,
   createMfs
 } = require('./helpers')