Merge directory option to fit createInstance

Author: phillmac

src/factory/ipfs-api.js

@@ -11,7 +11,8 @@ async function api_factory(ipfs_host, ipfs_port, orbitdb_dir, orbitdb_opts) {
     let orbitdb_api
 
     ipfs        = new IpfsApi(ipfs_host, ipfs_port)
-    orbitdb     = await OrbitDB.createInstance(ipfs, orbitdb_dir, orbitdb_opts)
+    if (orbitdb_dir) orbitdb_opts = object.assign({'directory': orbitdb_dir}, orbitdb_opts)
+    orbitdb     = await OrbitDB.createInstance(ipfs, orbitdb_opts)
     dbm         = new DBManager(orbitdb)
     orbitdb_api = new OrbitApi(dbm)
 

src/factory/ipfs-local.js

@@ -29,7 +29,8 @@ async function api_factory(ipfs_opts, orbitdb_dir, orbitdb_opts) {
           resolve(node)
         })
       }).catch((ex) => {throw ex})
-    orbitdb     = await OrbitDB.createInstance(ipfs, orbitdb_dir, orbitdb_opts)
+    if (orbitdb_dir) orbitdb_opts = object.assign({'directory': orbitdb_dir}, orbitdb_opts)
+    orbitdb     = await OrbitDB.createInstance(ipfs, orbitdb_opts)
     dbm         = new DBManager(orbitdb)
     orbitdb_api = new OrbitApi(dbm)