fix: actually expose block API

Author: Alan Shaw

src/cli/commands/block/rm.js

@@ -25,7 +25,7 @@ module.exports = {
       const ipfs = await getIpfs()
       let errored = false
 
-      for await (const result of ipfs.block._rmAsyncIterator(hash, {
+      for await (const result of ipfs.block.rm(hash, {
         force,
         quiet
       })) {

src/core/components/block/get.js

@@ -2,7 +2,7 @@
 
 const { cleanCid } = require('./utils')
 
-module.exports = function block ({ blockService, preload }) {
+module.exports = ({ blockService, preload }) => {
   return async function get (cid, options) { // eslint-disable-line require-await
     options = options || {}
     cid = cleanCid(cid)

src/core/components/index.js

@@ -1,6 +1,12 @@
 'use strict'
 
 exports.add = require('./add')
+exports.block = {
+  get: require('./block/get'),
+  put: require('./block/put'),
+  rm: require('./block/rm'),
+  stat: require('./block/stat')
+}
 exports.config = require('./config')
 exports.init = require('./init')
 exports.pin = {

src/core/components/init.js

@@ -303,6 +303,12 @@ function createApi ({
 
   const api = {
     add,
+    block: {
+      get: Commands.block.get({ blockService, preload }),
+      put: Commands.block.put({ blockService, gcLock, preload }),
+      rm: Commands.block.rm({ blockService, gcLock, pinManager }),
+      stat: Commands.block.stat({ blockService, preload })
+    },
     config: Commands.config({ repo }),
     init: () => { throw new AlreadyInitializedError() },
     pin,

src/core/components/start.js

@@ -135,6 +135,12 @@ function createApi ({
 
   const api = {
     add,
+    block: {
+      get: Commands.block.get({ blockService, preload }),
+      put: Commands.block.put({ blockService, gcLock, preload }),
+      rm: Commands.block.rm({ blockService, gcLock, pinManager }),
+      stat: Commands.block.stat({ blockService, preload })
+    },
     config: Commands.config({ repo }),
     init: () => { throw new AlreadyInitializedError() },
     pin,

src/core/components/stop.js

@@ -102,8 +102,15 @@ function createApi ({
 
   const api = {
     add,
+    block: {
+      get: Commands.block.get({ blockService, preload }),
+      put: Commands.block.put({ blockService, gcLock, preload }),
+      rm: Commands.block.rm({ blockService, gcLock, pinManager }),
+      stat: Commands.block.stat({ blockService, preload })
+    },
     config: Commands.config({ repo }),
     init: () => { throw new AlreadyInitializedError() },
+    pin,
     start,
     stop: () => apiManager.api
   }

src/http/api/resources/block.js

@@ -132,7 +132,7 @@ exports.rm = {
 
     return streamResponse(request, h, async (output) => {
       try {
-        for await (const result of request.server.app.ipfs.block._rmAsyncIterator(arg, {
+        for await (const result of request.server.app.ipfs.block.rm(arg, {
           force,
           quiet
         })) {