fix: convert pin input/output to async iterables

achingbrain · achingbrain · commit e22efed644ee · 2020-02-17T04:49:18.000-05:00
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "ipfs-bitswap": "^0.27.1",
     "ipfs-block": "~0.8.1",
     "ipfs-block-service": "~0.16.0",
-    "ipfs-http-client": "^42.0.0",
+    "ipfs-http-client": "github:ipfs/js-ipfs-http-client#store-pins-in-datastore",
     "ipfs-http-response": "^0.5.0",
     "ipfs-mfs": "^1.0.0",
     "ipfs-multipart": "^0.3.0",
diff --git a/src/cli/commands/pin/add.js b/src/cli/commands/pin/add.js
@@ -26,10 +26,9 @@ module.exports = {
     resolve((async () => {
       const type = recursive ? 'recursive' : 'direct'
       const ipfs = await getIpfs()
-      const results = await ipfs.pin.add(ipfsPath, { recursive })
-      results.forEach((res) => {
+      for await (const res of ipfs.pin.add(ipfsPath, { recursive })) {
         print(`pinned ${cidToString(res.cid, { base: cidBase })} ${type}ly`)
-      })
+      }
     })())
   }
 }
diff --git a/src/cli/commands/pin/rm.js b/src/cli/commands/pin/rm.js
@@ -25,10 +25,10 @@ module.exports = {
   handler: ({ getIpfs, print, ipfsPath, recursive, cidBase, resolve }) => {
     resolve((async () => {
       const ipfs = await getIpfs()
-      const results = await ipfs.pin.rm(ipfsPath, { recursive })
-      results.forEach((res) => {
+
+      for await (const res of ipfs.pin.rm(ipfsPath, { recursive })) {
         print(`unpinned ${cidToString(res.cid, { base: cidBase })}`)
-      })
+      }
     })())
   }
 }
diff --git a/src/core/components/add/index.js b/src/core/components/add/index.js
@@ -4,6 +4,7 @@ const importer = require('ipfs-unixfs-importer')
 const normaliseAddInput = require('ipfs-utils/src/files/normalise-input')
 const { parseChunkerString } = require('./utils')
 const pipe = require('it-pipe')
+const last = require('it-last')
 
 module.exports = ({ ipld, gcLock, preload, pin, options: constructorOptions }) => {
   const isShardingEnabled = constructorOptions.EXPERIMENTAL && constructorOptions.EXPERIMENTAL.sharding
@@ -111,10 +112,10 @@ function pinFile (pin, opts) {
       if (shouldPin) {
         // Note: addAsyncIterator() has already taken a GC lock, so tell
         // pin.add() not to take a (second) GC lock
-        await pin.add(file.cid, {
+        await last(pin.add(file.cid, {
           preload: false,
           lock: false
-        })
+        }))
       }
 
       yield file
diff --git a/src/core/components/dag/put.js b/src/core/components/dag/put.js
@@ -2,6 +2,7 @@
 
 const multicodec = require('multicodec')
 const nameToCodec = name => multicodec[name.toUpperCase().replace(/-/g, '_')]
+const last = require('it-last')
 
 module.exports = ({ ipld, pin, gcLock, preload }) => {
   return async function put (dagNode, options) {
@@ -51,9 +52,9 @@ module.exports = ({ ipld, pin, gcLock, preload }) => {
       })
 
       if (options.pin) {
-        await pin.add(cid, {
+        await last(pin.add(cid, {
           lock: false
-        })
+        }))
       }
 
       if (options.preload !== false) {
diff --git a/src/core/components/pin/add.js b/src/core/components/pin/add.js
@@ -17,19 +17,19 @@ module.exports = ({ pinManager, gcLock, dag }) => {
         const isPinned = await pinManager.isPinnedWithType(cid, [PinTypes.recursive, PinTypes.direct])
         const pinned = isPinned.pinned
 
-        if (pinned) {
+        /* if (pinned) {
           throw new Error(`${cid} already pinned with type ${isPinned.reason}`)
-        }
-
-        if (recursive) {
-          await pinManager.pinRecursively(cid)
-        } else {
-          await pinManager.pinDirectly(cid)
+        } */
+
+        if (!pinned) {
+          if (recursive) {
+            await pinManager.pinRecursively(cid)
+          } else {
+            await pinManager.pinDirectly(cid)
+          }
         }
 
         yield { cid }
-
-        continue
       }
     }
 
diff --git a/src/core/components/pin/pin-manager.js b/src/core/components/pin/pin-manager.js
@@ -130,29 +130,23 @@ class PinManager {
     }
   }
 
-  * indirectKeys ({ preload }) {
-    const self = this
-
-    async function * findChildren (recursiveKeys) {
-      for await (const { cid } of recursiveKeys) {
-        for await (const childCid of self._walkDag(cid, { preload })) {
-          // recursive pins override indirect pins
-          const types = [
-            PinTypes.recursive
-          ]
-
-          const result = await self.isPinnedWithType(childCid, types)
-
-          if (result.pinned) {
-            continue
-          }
-
-          yield childCid
+  async * indirectKeys ({ preload }) {
+    for await (const { cid } of this.recursiveKeys()) {
+      for await (const childCid of this._walkDag(cid, { preload })) {
+        // recursive pins override indirect pins
+        const types = [
+          PinTypes.recursive
+        ]
+
+        const result = await this.isPinnedWithType(childCid, types)
+
+        if (result.pinned) {
+          continue
         }
+
+        yield childCid
       }
     }
-
-    yield * findChildren(this.recursiveKeys())
   }
 
   async isPinnedWithType (cid, types) {
diff --git a/src/http/api/resources/dag.js b/src/http/api/resources/dag.js
@@ -14,6 +14,7 @@ const {
 const all = require('it-all')
 const log = debug('ipfs:http-api:dag')
 log.error = debug('ipfs:http-api:dag:error')
+const last = require('it-last')
 
 const IpldFormats = {
   get [multicodec.RAW] () {
@@ -252,7 +253,7 @@ exports.put = {
     }
 
     if (request.query.pin) {
-      await ipfs.pin.add(cid)
+      await last(ipfs.pin.add(cid))
     }
 
     return h.response({
diff --git a/src/http/api/resources/pin.js b/src/http/api/resources/pin.js
@@ -9,6 +9,7 @@ const pipe = require('it-pipe')
 const ndjson = require('iterable-ndjson')
 const { cidToString } = require('../../../utils/cid')
 const streamResponse = require('../../utils/stream-response')
+const all = require('it-all')
 
 function parseArgs (request, h) {
   let { arg } = request.query
@@ -93,7 +94,7 @@ exports.add = {
 
     let result
     try {
-      result = await ipfs.pin.add(path, { recursive })
+      result = await all(ipfs.pin.add(path, { recursive }))
     } catch (err) {
       if (err.message.includes('already pinned recursively')) {
         throw Boom.boomify(err, { statusCode: 400 })
@@ -122,7 +123,7 @@ exports.rm = {
 
     let result
     try {
-      result = await ipfs.pin.rm(path, { recursive })
+      result = await all(ipfs.pin.rm(path, { recursive }))
     } catch (err) {
       throw Boom.boomify(err, { message: 'Failed to remove pin' })
     }
diff --git a/test/cli/dag.js b/test/cli/dag.js
@@ -133,6 +133,7 @@ describe('dag', () => runOnAndOff.off((thing) => {
       const cid = (await ipfs('dag put --pin "{"hello":"world"}"')).trim()
 
       const out = await ipfs('pin ls')
+
       expect(out).to.include(cid)
     })
 
diff --git a/test/cli/dns.js b/test/cli/dns.js
@@ -5,7 +5,7 @@ const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const runOnAndOff = require('../utils/on-and-off')
 const isIPFS = require('is-ipfs')
 
-describe('dns', () => runOnAndOff((thing) => {
+describe.skip('dns', () => runOnAndOff((thing) => {
   let ipfs
 
   before(function () {
diff --git a/test/core/gc.spec.js b/test/core/gc.spec.js
@@ -199,7 +199,7 @@ describe.skip('gc', function () {
       // Pin first block
       // Note: pin add will take a read lock
       const pinLockRequested = pEvent(lockEmitter, 'readLock request')
-      const pin1 = ipfs.pin.add(cid1)
+      const pin1 = last(ipfs.pin.add(cid1))
 
       // Once pin lock has been requested, start GC
       await pinLockRequested
@@ -209,7 +209,7 @@ describe.skip('gc', function () {
 
       // TODO: Adding pin for removed block never returns, which means the lock
       // never gets released
-      // const pin2 = ipfs.pin.add(cid2)
+      // const pin2 = last(ipfs.pin.add(cid2))
 
       // Confirm second second block has been removed
       const localRefs = (await ipfs.refs.local()).map(r => r.ref)
@@ -230,13 +230,13 @@ describe.skip('gc', function () {
       const cid2 = (await ipfs.block.put(Buffer.from('block to pin rm 2'), null)).cid
 
       // Pin blocks
-      await ipfs.pin.add(cid1)
-      await ipfs.pin.add(cid2)
+      await last(ipfs.pin.add(cid1))
+      await last(ipfs.pin.add(cid2))
 
       // Unpin first block
       // Note: pin rm will take a read lock
       const pinLockRequested = pEvent(lockEmitter, 'readLock request')
-      const pinRm1 = ipfs.pin.rm(cid1)
+      const pinRm1 = last(ipfs.pin.rm(cid1))
 
       // Once pin lock has been requested, start GC
       await pinLockRequested
@@ -246,7 +246,7 @@ describe.skip('gc', function () {
 
       // Once GC has started, start second pin rm
       await gcStarted
-      const pinRm2 = ipfs.pin.rm(cid2)
+      const pinRm2 = last(ipfs.pin.rm(cid2))
 
       const deleted = (await gc).map(i => i.cid.toString())
       await pinRm1
diff --git a/test/core/interface.spec.js b/test/core/interface.spec.js
@@ -66,9 +66,7 @@ describe('interface-ipfs-core tests', function () {
 
   tests.object(commonFactory)
 
-  tests.pin(commonFactory, {
-    only: true
-  })
+  tests.pin(commonFactory)
 
   tests.ping(commonFactory)
 

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,9 @@ module.exports = {`
`26`	`26`	`resolve((async () => {`
`27`	`27`	`const type = recursive ? 'recursive' : 'direct'`
`28`	`28`	`const ipfs = await getIpfs()`
`29`		`- const results = await ipfs.pin.add(ipfsPath, { recursive })`
`30`		`- results.forEach((res) => {`
	`29`	`+ for await (const res of ipfs.pin.add(ipfsPath, { recursive })) {`
`31`	`30`	print(`pinned ${cidToString(res.cid, { base: cidBase })} ${type}ly`)
`32`		`- })`
	`31`	`+ }`
`33`	`32`	`})())`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ module.exports = {`
`25`	`25`	`handler: ({ getIpfs, print, ipfsPath, recursive, cidBase, resolve }) => {`
`26`	`26`	`resolve((async () => {`
`27`	`27`	`const ipfs = await getIpfs()`
`28`		`- const results = await ipfs.pin.rm(ipfsPath, { recursive })`
`29`		`- results.forEach((res) => {`
	`28`	`+`
	`29`	`+ for await (const res of ipfs.pin.rm(ipfsPath, { recursive })) {`
`30`	`30`	print(`unpinned ${cidToString(res.cid, { base: cidBase })}`)
`31`		`- })`
	`31`	`+ }`
`32`	`32`	`})())`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ const {`
`14`	`14`	`const all = require('it-all')`
`15`	`15`	`const log = debug('ipfs:http-api:dag')`
`16`	`16`	`log.error = debug('ipfs:http-api:dag:error')`
	`17`	`+const last = require('it-last')`
`17`	`18`
`18`	`19`	`const IpldFormats = {`
`19`	`20`	`get [multicodec.RAW] () {`
`@@ -252,7 +253,7 @@ exports.put = {`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`if (request.query.pin) {`
`255`		`- await ipfs.pin.add(cid)`
	`256`	`+ await last(ipfs.pin.add(cid))`
`256`	`257`	`}`
`257`	`258`
`258`	`259`	`return h.response({`