ipfs · achingbrain · Aug 25, 2020 · Aug 25, 2020 · Aug 25, 2020 · Aug 25, 2020
diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
@@ -58,7 +58,7 @@
     "it-tar": "^1.2.2",
     "it-to-buffer": "^1.0.0",
     "it-to-stream": "^0.1.1",
-    "merge-options": "^2.0.0",
+    "merge-options": "^3.0.1",
     "multiaddr": "^8.0.0",
     "multiaddr-to-uri": "^6.0.0",
     "multibase": "^3.0.0",

diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
@@ -62,11 +62,10 @@
     "dep-check": "aegir dep-check"
   },
   "dependencies": {
-    "@hapi/ammo": "^3.1.2",
-    "@hapi/boom": "^7.4.3",
-    "@hapi/content": "^4.1.0",
-    "@hapi/hapi": "^18.4.0",
-    "@hapi/joi": "^15.1.0",
+    "@hapi/ammo": "^5.0.1",
+    "@hapi/boom": "^9.1.0",
+    "@hapi/content": "^5.0.2",
+    "@hapi/hapi": "^20.0.0",
     "abort-controller": "^3.0.0",
     "any-signal": "^1.1.0",
     "array-shuffle": "^1.0.1",
@@ -88,7 +87,7 @@
     "fnv1a": "^1.0.1",
     "get-folder-size": "^2.0.0",
     "hamt-sharding": "^1.0.0",
-    "hapi-pino": "^6.1.0",
+    "hapi-pino": "^8.2.0",
     "hashlru": "^2.3.0",
     "interface-datastore": "^2.0.0",
     "ipfs-bitswap": "^3.0.0",
@@ -126,6 +125,7 @@
     "it-tar": "^1.2.2",
     "it-to-stream": "^0.1.1",
     "iterable-ndjson": "^1.1.0",
+    "joi": "^17.2.1",
     "jsondiffpatch": "^0.4.1",
     "just-safe-set": "^2.1.0",
     "libp2p": "libp2p/js-libp2p#0.29.x",
@@ -145,7 +145,7 @@
     "libp2p-webrtc-star": "^0.19.0",
     "libp2p-websockets": "^0.14.0",
     "mafmt": "^8.0.0",
-    "merge-options": "^2.0.0",
+    "merge-options": "^3.0.1",
     "mortice": "^2.0.0",
     "multiaddr": "^8.0.0",
     "multiaddr-to-uri": "^6.0.0",

diff --git a/packages/ipfs/src/http/api/resources/config.js b/packages/ipfs/src/http/api/resources/config.js
@@ -232,6 +232,9 @@ exports.replace = {
       parse: false,
       output: 'stream'
     },
+    response: {
+      emptyStatusCode: 200
+    },
     pre: [{
       assign: 'args',
       method: async (request, h) => {

diff --git a/packages/ipfs/src/http/api/resources/dht.js b/packages/ipfs/src/http/api/resources/dht.js
@@ -217,6 +217,9 @@ exports.provide = {
           override: true,
           ignoreUndefined: true
         })
+    },
+    response: {
+      emptyStatusCode: 200
     }
   },
   async handler (request, h) {
@@ -255,6 +258,9 @@ exports.put = {
         arg: Joi.array().length(2).items(Joi.binary()).required(),
         timeout: Joi.timeout()
       })
+    },
+    response: {
+      emptyStatusCode: 200
     }
   },
   async handler (request, h) {

diff --git a/packages/ipfs/src/http/api/resources/files/cp.js b/packages/ipfs/src/http/api/resources/files/cp.js
@@ -14,10 +14,7 @@ const mfsCp = {
         parents: Joi.boolean().default(false),
         flush: Joi.boolean().default(true),
         hashAlg: Joi.string().default('sha2-256'),
-        cidVersion: Joi.number().integer().valid([
-          0,
-          1
-        ]).default(0),
+        cidVersion: Joi.number().integer().valid(0, 1).default(0),
         shardSplitThreshold: Joi.number().integer().min(0).default(1000),
         timeout: Joi.timeout()
       })

diff --git a/packages/ipfs/src/http/api/resources/files/mkdir.js b/packages/ipfs/src/http/api/resources/files/mkdir.js
@@ -17,10 +17,7 @@ const mfsMkdir = {
         mtimeNsecs: Joi.number().integer().min(0),
         parents: Joi.boolean().default(false),
         hashAlg: Joi.string().default('sha2-256'),
-        cidVersion: Joi.number().integer().valid([
-          0,
-          1
-        ]).default(0),
+        cidVersion: Joi.number().integer().valid(0, 1).default(0),
         flush: Joi.boolean().default(true),
         shardSplitThreshold: Joi.number().integer().min(0).default(1000),
         timeout: Joi.timeout()

diff --git a/packages/ipfs/src/http/api/resources/files/mv.js b/packages/ipfs/src/http/api/resources/files/mv.js
@@ -14,10 +14,7 @@ const mfsMv = {
         recursive: Joi.boolean().default(false),
         parents: Joi.boolean().default(false),
         hashAlg: Joi.string().default('sha2-256'),
-        cidVersion: Joi.number().integer().valid([
-          0,
-          1
-        ]).default(0),
+        cidVersion: Joi.number().integer().valid(0, 1).default(0),
         flush: Joi.boolean().default(true),
         shardSplitThreshold: Joi.number().integer().min(0).default(1000),
         timeout: Joi.timeout()

diff --git a/packages/ipfs/src/http/api/resources/files/touch.js b/packages/ipfs/src/http/api/resources/files/touch.js
@@ -15,10 +15,7 @@ const mfsTouch = {
         mtime: Joi.number().integer(),
         mtimeNsecs: Joi.number().integer().min(0),
         hashAlg: Joi.string().default('sha2-256'),
-        cidVersion: Joi.number().integer().valid([
-          0,
-          1
-        ]).default(0),
+        cidVersion: Joi.number().integer().valid(0, 1).default(0),
         flush: Joi.boolean().default(true),
         shardSplitThreshold: Joi.number().integer().min(0).default(1000),
         timeout: Joi.timeout()

diff --git a/packages/ipfs/src/http/api/resources/files/write.js b/packages/ipfs/src/http/api/resources/files/write.js
@@ -24,18 +24,11 @@ const mfsWrite = {
         create: Joi.boolean().default(false),
         truncate: Joi.boolean().default(false),
         rawLeaves: Joi.boolean().default(false),
-        cidVersion: Joi.number().integer().valid([
-          0,
-          1
-        ]).default(0),
+        cidVersion: Joi.number().integer().valid(0, 1).default(0),
         hashAlg: Joi.string().default('sha2-256'),
         parents: Joi.boolean().default(false),
         progress: Joi.func(),
-        strategy: Joi.string().valid([
-          'flat',
-          'balanced',
-          'trickle'
-        ]).default('trickle'),
+        strategy: Joi.string().valid('flat', 'balanced', 'trickle').default('trickle'),
         flush: Joi.boolean().default(true),
         reduceSingleLeafToSelf: Joi.boolean().default(false),
         shardSplitThreshold: Joi.number().integer().min(0).default(1000),

diff --git a/packages/ipfs/src/http/api/resources/pubsub.js b/packages/ipfs/src/http/api/resources/pubsub.js
@@ -83,6 +83,9 @@ exports.publish = {
       parse: false,
       output: 'stream'
     },
+    response: {
+      emptyStatusCode: 200
+    },
     pre: [{
       assign: 'data',
       method: async (request, h) => {

diff --git a/packages/ipfs/src/http/error-handler.js b/packages/ipfs/src/http/error-handler.js
@@ -35,8 +35,8 @@ module.exports = server => {
         response: res.output.payload
       }
 
-      server.logger().error(debug)
-      server.logger().error(res)
+      server.logger.error(debug)
+      server.logger.error(res)
     }
 
     return h.response({

diff --git a/packages/ipfs/src/http/gateway/routes/gateway.js b/packages/ipfs/src/http/gateway/routes/gateway.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const resources = require('../resources')
 
 module.exports = [
@@ -10,9 +10,9 @@ module.exports = [
     options: {
       handler: resources.gateway.handler,
       validate: {
-        params: {
+        params: Joi.object({
           path: Joi.string().required()
-        }
+        })
       },
       response: {
         ranges: false // disable built-in support, handler does it manually
@@ -28,9 +28,9 @@ module.exports = [
     options: {
       handler: resources.gateway.handler,
       validate: {
-        params: {
+        params: Joi.object({
           path: Joi.string().required()
-        }
+        })
       },
       response: {
         ranges: false // disable built-in support, handler does it manually

diff --git a/packages/ipfs/src/http/utils/joi.js b/packages/ipfs/src/http/utils/joi.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Joi = require('@hapi/joi')
+const Joi = require('joi')
 const CID = require('cids')
 const parseDuration = require('parse-duration').default
 const multiaddr = require('multiaddr')
@@ -41,87 +41,122 @@ module.exports = Joi
   .extend(
     (joi) => {
       return {
-        name: 'cid',
+        type: 'cid',
         base: joi.any(),
-        pre (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return toCID(value)
+          return { value: toCID(value) }
         }
       }
     },
     (joi) => {
       return {
-        name: 'ipfsPath',
+        type: 'ipfsPath',
         base: joi.string(),
-        coerce (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return toIpfsPath(value)
+          return { value: toIpfsPath(value) }
         }
       }
     },
     (joi) => {
       return {
-        name: 'peerId',
+        type: 'peerId',
         base: joi.string(),
-        pre (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return new CID(value).toString()
+          return { value: new CID(value).toString() }
         }
       }
     },
     (joi) => {
       return {
-        name: 'multiaddr',
+        type: 'multiaddr',
         base: joi.string(),
-        pre (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return multiaddr(value).toString()
+          return { value: multiaddr(value).toString() }
         }
       }
     },
     (joi) => {
       return {
-        name: 'timeout',
-        base: joi.string(),
-        pre (value, state, options) {
+        type: 'timeout',
+        base: joi.number(),
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return parseDuration(value)
+          return { value: parseDuration(value) }
         }
       }
     },
     (joi) => {
       return {
-        name: 'cidAndPath',
+        type: 'cidAndPath',
         base: joi.any(),
-        pre (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return toCidAndPath(value)
+          return { value: toCidAndPath(value) }
         }
       }
     },
     (joi) => {
       return {
-        name: 'cidBase',
+        type: 'cidBase',
         base: joi.string(),
-        pre (value, state, options) {
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
@@ -130,20 +165,25 @@ module.exports = Joi
             throw new Error('Invalid base name')
           }
 
-          return value
+          return { value }
         }
       }
     },
     (joi) => {
       return {
-        name: 'json',
-        base: joi.string(),
-        pre (value, state, options) {
+        type: 'json',
+        base: joi.any(),
+        validate (value, helpers) {
+          if (helpers.schema.$_getFlag('presence') === 'required' && !value) {
+            return { value, errors: helpers.error('required') }
+          }
+        },
+        coerce (value, helpers) {
           if (!value) {
             return
           }
 
-          return JSON.parse(value)
+          return { value: JSON.parse(value) }
         }
       }
     })