Skip to content

Commit 77c3f29

Browse files
committed
chore: use .create function for http client and ipfs client
ipfs/js-ipfs#3550 switches away from default exports for `ipfs-http-client` and `ipfs-client` to enable an easier transition to es6 modules. All `ipfs` modules now export a `.create` factory function which returns instances of the client module. BREAKING CHANGE: expects `ipfs-http-client` and `ipfs-client` to export a `.create` function
1 parent 85229f5 commit 77c3f29

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

src/ipfsd-client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ class Client {
7676
*/
7777
_createApi () {
7878
if (this.opts.ipfsClientModule && this.grpcAddr && this.apiAddr) {
79-
this.api = this.opts.ipfsClientModule({
79+
this.api = this.opts.ipfsClientModule.create({
8080
grpc: this.grpcAddr,
8181
http: this.apiAddr
8282
})
8383
} else if (this.apiAddr) {
84-
this.api = this.opts.ipfsHttpModule(this.apiAddr)
84+
this.api = this.opts.ipfsHttpModule.create(this.apiAddr)
8585
}
8686

8787
if (this.api) {

src/ipfsd-daemon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ class Daemon {
7979

8080
_createApi () {
8181
if (this.opts.ipfsClientModule && this.grpcAddr) {
82-
this.api = this.opts.ipfsClientModule({
82+
this.api = this.opts.ipfsClientModule.create({
8383
grpc: this.grpcAddr,
8484
http: this.apiAddr
8585
})
8686
} else if (this.apiAddr) {
87-
this.api = this.opts.ipfsHttpModule(this.apiAddr)
87+
this.api = this.opts.ipfsHttpModule.create(this.apiAddr)
8888
}
8989

9090
if (!this.api) {

src/ipfsd-in-proc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class InProc {
5353
*/
5454
_setApi (addr) {
5555
this.apiAddr = multiaddr(addr)
56-
this.api = this.opts.ipfsHttpModule(addr)
56+
this.api = this.opts.ipfsHttpModule.create(addr)
5757
this.api.apiHost = this.apiAddr.nodeAddress().address
5858
this.api.apiPort = this.apiAddr.nodeAddress().port
5959
}

test/create.spec.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,19 @@ describe('`createController` should return the correct class', () => {
6565
type: 'js',
6666
disposable: false,
6767
ipfsModule: require('ipfs'),
68-
ipfsClientModule: (opts) => {
69-
clientCreated = true
68+
ipfsClientModule: {
69+
create: (opts) => {
70+
clientCreated = true
7071

71-
return require('ipfs-client')(opts)
72+
return require('ipfs-client')(opts)
73+
}
7274
},
73-
ipfsHttpModule: (opts) => {
74-
httpCreated = true
75+
ipfsHttpModule: {
76+
create: (opts) => {
77+
httpCreated = true
7578

76-
return require('ipfs-http-client')(opts)
79+
return require('ipfs-http-client')(opts)
80+
}
7781
},
7882
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
7983
})
@@ -90,15 +94,19 @@ describe('`createController` should return the correct class', () => {
9094
remote: true,
9195
disposable: false,
9296
ipfsModule: require('ipfs'),
93-
ipfsClientModule: (opts) => {
94-
clientCreated = true
97+
ipfsClientModule: {
98+
create: (opts) => {
99+
clientCreated = true
95100

96-
return require('ipfs-client')(opts)
101+
return require('ipfs-client')(opts)
102+
}
97103
},
98-
ipfsHttpModule: (opts) => {
99-
httpCreated = true
104+
ipfsHttpModule: {
105+
create: (opts) => {
106+
httpCreated = true
100107

101-
return require('ipfs-http-client')(opts)
108+
return require('ipfs-http-client')(opts)
109+
}
102110
},
103111
ipfsBin: pathJoin(__dirname, '../node_modules/ipfs/src/cli/bin.js')
104112
})

0 commit comments

Comments
 (0)