ipfs#2667 Adding go-ipfs compatible solution for relay and hop

License: MIT
Signed-off-by: ggarri <[email protected]>

Author: ggarri

src/core/components/libp2p.js

@@ -110,10 +110,10 @@ function getLibp2pOptions ({ options, config, datastore, peerInfo, peerBook }) {
       },
       relay: {
         enabled: get(options, 'relay.enabled',
-          get(config, 'relay.enabled', true)),
+          !get(config, 'Swarm.DisableRelay', false)),
         hop: {
           enabled: get(options, 'relay.hop.enabled',
-            get(config, 'relay.hop.enabled', false)),
+            get(config, 'Swarm.EnableRelayHop', false)),
           active: get(options, 'relay.hop.active',
             get(config, 'relay.hop.active', false))
         }

src/core/config.js

@@ -79,7 +79,9 @@ const configSchema = s({
       ConnMgr: optional(s({
         LowWater: 'number?',
         HighWater: 'number?'
-      }))
+      })),
+      EnableRelayHop: 'boolean?',
+      DisableRelay: 'boolean?',
     }))
   })),
   ipld: 'object?',

src/core/runtime/config-nodejs.js

@@ -48,6 +48,8 @@ module.exports = () => ({
     ConnMgr: {
       LowWater: 200,
       HighWater: 500
-    }
+    },
+    DisableRelay: false,
+    EnableRelayHop: false,
   }
 })