feat: Add core.NodeConfig with ProximityDriver. Change NewNode to use…

… it.

Signed-off-by: jefft0 <jeff@thefirst.org>

android/bridge/src/main/java/ipfs/gomobile/android/IPFS.java

@@ -13,6 +13,7 @@
 import core.Core;
 import core.Config;
 import core.Repo;
+import core.NodeConfig;
 import core.Node;
 import core.Shell;
 import core.SockManager;
@@ -163,11 +164,12 @@ synchronized public void start() throws NodeStartException {
             throw new NodeStartException("Node already started");
         }
 
-        BleInterface BLEDriver = new BleInterface(context.get(), true);
+        NodeConfig nodeConfig = Core.newNodeConfig();
+        nodeConfig.setBleDriver(new BleInterface(context.get(), true));
 
         try {
             openRepoIfClosed();
-            node = Core.newNode(repo, BLEDriver);
+            node = Core.newNode(repo, nodeConfig);
             node.serveUnixSocketAPI(absSockPath);
 
             // serve config Addresses API & Gateway

go/bind/core/node.go

@@ -35,7 +35,11 @@ type Node struct {
 	ipfsMobile *ipfs_mobile.IpfsMobile
 }
 
-func NewNode(r *Repo, driver ProximityDriver) (*Node, error) {
+func NewNode(r *Repo, config *NodeConfig) (*Node, error) {
+	if config == nil {
+		config = NewNodeConfig()
+	}
+
 	var dialer net.Dialer
 	net.DefaultResolver = &net.Resolver{
 		PreferGo: false,
@@ -58,14 +62,14 @@ func NewNode(r *Repo, driver ProximityDriver) (*Node, error) {
 
 	switch {
 	// Java embedded driver (android)
-	case driver != nil:
+	case config.bleDriver != nil:
 		logger := zap.NewExample()
 		defer func() {
 			if err := logger.Sync(); err != nil {
 				fmt.Println(err)
 			}
 		}()
-		bleOpt = libp2p.Transport(proximity.NewTransport(ctx, logger, driver))
+		bleOpt = libp2p.Transport(proximity.NewTransport(ctx, logger, config.bleDriver))
 	// Go embedded driver (ios)
 	case ble.Supported:
 		logger := zap.NewExample()

go/bind/core/node_config.go

@@ -0,0 +1,13 @@
+package core
+
+// Config is used in NewNode.
+type NodeConfig struct {
+	bleDriver ProximityDriver
+}
+
+func NewNodeConfig() *NodeConfig {
+	return &NodeConfig{
+	}
+}
+
+func (c *NodeConfig) SetBleDriver(driver ProximityDriver) { c.bleDriver = driver }