Merge branch 'master' into chore/interface-tests-async-node-creation

Author: Alan Shaw

COPYRIGHT

@@ -0,0 +1,5 @@
+This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license.
+Unless otherwise noted, all code contributed prior to 2019-11-21 and not contributed by
+a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs/issues/2624) is
+licensed under MIT-only. All new contributions (and past contributions since 2019-11-21)
+are licensed under a dual MIT/Apache-2.0 license.

LICENSE-APACHE

@@ -0,0 +1,5 @@
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

LICENSE LICENSE-MITLICENSE renamed to LICENSE-MIT

@@ -1,7 +1,5 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Juan Batiz-Benet
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -18,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

docs/RELEASE_ISSUE_TEMPLATE.md

@@ -21,7 +21,7 @@
 # ✅ Release Checklist
 
 - [ ] **Stage 0 - Automated Testing**
-  - [ ] Feature freeze. If any "non-trivial" changes (see the footnotes of [doc/releases.md](https://github.com/ipfs/js-ipfs/tree/master/doc/releases.md) for a definition) get added to the release, uncheck all the checkboxes and return to this stage.
+  - [ ] Feature freeze. If any "non-trivial" changes (see the footnotes of [docs/releases.md](https://github.com/ipfs/js-ipfs/tree/master/docs/releases.md) for a definition) get added to the release, uncheck all the checkboxes and return to this stage.
   - [ ] Automated Testing (already tested in CI) - Ensure that all tests are passing, this includes:
     - [ ] unit/functional/integration/e2e
     - [ ] interop
@@ -71,11 +71,11 @@
   - Infrastructure Testing:
     - TBD
 - [ ] **Stage 2 - Community Dev Testing**
-  - [ ] Reach out to the IPFS _early testers_ listed in [doc/EARLY_TESTERS.md](https://github.com/ipfs/js-ipfs/tree/master/doc/EARLY_TESTERS.md) for testing this release (check when no more problems have been reported). If you'd like to be added to this list, please file a PR.
+  - [ ] Reach out to the IPFS _early testers_ listed in [docs/EARLY_TESTERS.md](https://github.com/ipfs/js-ipfs/tree/master/docs/EARLY_TESTERS.md) for testing this release (check when no more problems have been reported). If you'd like to be added to this list, please file a PR.
   - [ ] Reach out on IRC for additional early testers.
 - [ ] **Stage 3 - Community Prod Testing**
   - [ ] Update [js.ipfs.io](https://js.ipfs.io) examples to use the latest js-ipfs
-  - [ ] Invite the IPFS [_early testers_](https://github.com/ipfs/js-ipfs/tree/master/doc/EARLY_TESTERS.md) to deploy the release to part of their production infrastructure.
+  - [ ] Invite the IPFS [_early testers_](https://github.com/ipfs/js-ipfs/tree/master/docs/EARLY_TESTERS.md) to deploy the release to part of their production infrastructure.
   - [ ] Invite the wider community (link to the release issue):
     - [ ] [discuss.ipfs.io](https://discuss.ipfs.io/c/announcements)
     - [ ] Twitter

package.json

@@ -7,7 +7,7 @@
   ],
   "homepage": "https://js.ipfs.io",
   "bugs": "https://github.com/ipfs/js-ipfs/issues",
-  "license": "MIT",
+  "license": "(Apache-2.0 OR MIT)",
   "leadMaintainer": "Alan Shaw <[email protected]>",
   "files": [
     "src",
@@ -78,10 +78,10 @@
     "buffer-peek-stream": "^1.0.1",
     "byteman": "^1.3.5",
     "callbackify": "^1.1.0",
-    "cid-tool": "~0.3.0",
+    "cid-tool": "~0.4.0",
     "cids": "~0.7.1",
     "class-is": "^1.1.0",
-    "dag-cbor-links": "^1.3.0",
+    "dag-cbor-links": "^1.3.2",
     "datastore-core": "~0.7.0",
     "datastore-pubsub": "^0.2.1",
     "debug": "^4.1.0",
@@ -100,9 +100,9 @@
     "ipfs-bitswap": "^0.26.0",
     "ipfs-block": "~0.8.1",
     "ipfs-block-service": "~0.16.0",
-    "ipfs-http-client": "^39.0.2",
+    "ipfs-http-client": "^40.0.1",
     "ipfs-http-response": "~0.4.0",
-    "ipfs-mfs": "^0.13.0",
+    "ipfs-mfs": "^0.13.2",
     "ipfs-multipart": "^0.2.0",
     "ipfs-repo": "^0.29.0",
     "ipfs-unixfs": "~0.1.16",
@@ -164,6 +164,7 @@
     "peer-book": "^0.9.1",
     "peer-id": "^0.12.2",
     "peer-info": "~0.15.1",
+    "pretty-bytes": "^5.3.0",
     "progress": "^2.0.1",
     "promise-nodeify": "^3.0.1",
     "promisify-es6": "^1.0.3",
@@ -190,7 +191,7 @@
     "update-notifier": "^3.0.1",
     "uri-to-multiaddr": "^3.0.1",
     "varint": "^5.0.0",
-    "yargs": "^14.0.0",
+    "yargs": "^15.0.1",
     "yargs-promise": "^1.1.0"
   },
   "devDependencies": {

src/cli/commands/bitswap/stat.js

@@ -2,6 +2,7 @@
 
 const multibase = require('multibase')
 const { cidToString } = require('../../../utils/cid')
+const prettyBytes = require('pretty-bytes')
 
 module.exports = {
   command: 'stat',
@@ -13,24 +14,42 @@ module.exports = {
       describe: 'Number base to display CIDs in. Note: specifying a CID base for v0 CIDs will have no effect.',
       type: 'string',
       choices: multibase.names
+    },
+    human: {
+      type: 'boolean',
+      default: false
     }
   },
 
-  handler ({ getIpfs, print, cidBase, resolve }) {
+  handler ({ getIpfs, print, cidBase, resolve, human }) {
     resolve((async () => {
       const ipfs = await getIpfs()
       const stats = await ipfs.bitswap.stat()
-      stats.wantlist = stats.wantlist.map(k => cidToString(k['/'], { base: cidBase, upgrade: false }))
-      stats.peers = stats.peers || []
+
+      if (human) {
+        stats.blocksReceived = stats.blocksReceived.toNumber()
+        stats.blocksSent = stats.blocksSent.toNumber()
+        stats.dataReceived = prettyBytes(stats.dataReceived.toNumber()).toUpperCase()
+        stats.dataSent = prettyBytes(stats.dataSent.toNumber()).toUpperCase()
+        stats.dupBlksReceived = stats.dupBlksReceived.toNumber()
+        stats.dupDataReceived = prettyBytes(stats.dupDataReceived.toNumber()).toUpperCase()
+        stats.wantlist = `[${stats.wantlist.length} keys]`
+      } else {
+        const wantlist = stats.wantlist.map((elem) => cidToString(elem['/'], { base: cidBase, upgrade: false }))
+        stats.wantlist = `[${wantlist.length} keys]
+            ${wantlist.join('\n            ')}`
+      }
 
       print(`bitswap status
-  blocks received: ${stats.blocksReceived}
-  dup blocks received: ${stats.dupBlksReceived}
-  dup data received: ${stats.dupDataReceived}B
-  wantlist [${stats.wantlist.length} keys]
-    ${stats.wantlist.join('\n    ')}
-  partners [${stats.peers.length}]
-    ${stats.peers.join('\n    ')}`)
+        provides buffer: ${stats.provideBufLen}
+        blocks received: ${stats.blocksReceived}
+        blocks sent: ${stats.blocksSent}
+        data received: ${stats.dataReceived}
+        data sent: ${stats.dataSent}
+        dup blocks received: ${stats.dupBlksReceived}
+        dup data received: ${stats.dupDataReceived}
+        wantlist ${stats.wantlist}
+        partners [${stats.peers.length}]`)
     })())
   }
 }

src/cli/commands/dag/put.js

@@ -4,6 +4,7 @@ const mh = require('multihashes')
 const multibase = require('multibase')
 const dagCBOR = require('ipld-dag-cbor')
 const dagPB = require('ipld-dag-pb')
+const CID = require('cids')
 const { cidToString } = require('../../../utils/cid')
 
 const inputDecoders = {
@@ -109,6 +110,12 @@ module.exports = {
 
       source = inputDecoders[inputEncoding](source)
 
+      // Support legacy { "/" : "<CID>" } format so dag put is actually useful
+      // on the command line: https://github.com/ipld/js-ipld-dag-cbor/issues/84
+      if (inputEncoding === 'json' && format === 'dag-cbor') {
+        source = objectSlashToCID(source)
+      }
+
       const cid = await ipfs.dag.put(source, {
         format,
         hashAlg,
@@ -122,3 +129,26 @@ module.exports = {
     })())
   }
 }
+
+function objectSlashToCID (obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(objectSlashToCID)
+  }
+
+  if (obj && typeof obj === 'object') {
+    const keys = Object.keys(obj)
+    if (keys.length === 1 && '/' in obj) {
+      if (typeof obj['/'] !== 'string') {
+        throw new Error('link should have been a string')
+      }
+      return new CID(obj['/']) // throws if not a CID - consistent with go-ipfs
+    }
+
+    return keys.reduce((obj, key) => {
+      obj[key] = objectSlashToCID(obj[key])
+      return obj
+    }, obj)
+  }
+
+  return obj
+}

src/cli/commands/repo/stat.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const prettyBytes = require('pretty-bytes')
+
 module.exports = {
   command: 'stat',
 
@@ -15,14 +17,23 @@ module.exports = {
 
   handler (argv) {
     argv.resolve((async () => {
-      const ipfs = await argv.getIpfs()
-      const stats = await ipfs.repo.stat({ human: argv.human })
-      argv.print(`repo status
-  number of objects: ${stats.numObjects}
-  repo size: ${stats.repoSize}
-  repo path: ${stats.repoPath}
-  version: ${stats.version}
-  maximum storage: ${stats.storageMax}`)
+      const { getIpfs, human } = argv
+
+      const ipfs = await getIpfs()
+      const stats = await ipfs.repo.stat()
+
+      if (human) {
+        stats.numObjects = stats.numObjects.toNumber()
+        stats.repoSize = prettyBytes(stats.repoSize.toNumber()).toUpperCase()
+        stats.storageMax = prettyBytes(stats.storageMax.toNumber()).toUpperCase()
+      }
+
+      argv.print(
+`NumObjects: ${stats.numObjects}
+RepoSize: ${stats.repoSize}
+StorageMax: ${stats.storageMax}
+RepoPath: ${stats.repoPath}
+Version: ${stats.version}`)
     })())
   }
 }

src/cli/commands/swarm/connect.js

@@ -14,7 +14,7 @@ module.exports = {
       }
       const ipfs = await argv.getIpfs()
       const res = await ipfs.swarm.connect(argv.address)
-      argv.print(res.Strings[0])
+      res.forEach(msg => argv.print(msg))
     })())
   }
 }

src/cli/commands/swarm/disconnect.js

@@ -14,7 +14,7 @@ module.exports = {
       }
       const ipfs = await argv.getIpfs()
       const res = await ipfs.swarm.disconnect(argv.address)
-      argv.print(res.Strings[0])
+      res.forEach(msg => argv.print(msg))
     })())
   }
 }