Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b7717bc

Browse files
author
Alan Shaw
committed
refactor: async iterators wip
1 parent 31881e5 commit b7717bc

File tree

24 files changed

+108
-369
lines changed

24 files changed

+108
-369
lines changed

‎package.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
},
4343
"dependencies": {
4444
"abort-controller": "^3.0.0",
45-
"async-iterator-all": "^1.0.0",
46-
"async-iterator-to-pull-stream": "^1.3.0",
4745
"bignumber.js": "^9.0.0",
4846
"bl": "^4.0.0",
4947
"bs58": "^4.0.1",
5048
"buffer": "^5.4.2",
51-
"callbackify": "^1.1.0",
5249
"cids": "~0.7.1",
5350
"debug": "^4.1.0",
5451
"err-code": "^2.0.0",
@@ -62,7 +59,6 @@
6259
"is-ipfs": "~0.6.1",
6360
"it-glob": "0.0.6",
6461
"it-tar": "^1.1.0",
65-
"it-to-stream": "^0.1.1",
6662
"iterable-ndjson": "^1.1.0",
6763
"ky": "^0.15.0",
6864
"ky-universal": "^0.3.0",
@@ -74,8 +70,7 @@
7470
"multihashes": "~0.4.14",
7571
"parse-duration": "^0.1.1",
7672
"peer-id": "~0.12.3",
77-
"peer-info": "~0.15.1",
78-
"promise-nodeify": "^3.0.1"
73+
"peer-info": "~0.15.1"
7974
},
8075
"devDependencies": {
8176
"aegir": "^20.4.1",

‎src/bitswap/index.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
5-
module.exports = (config) => ({
6-
wantlist: callbackify.variadic(require('./wantlist')(config)),
7-
stat: callbackify.variadic(require('./stat')(config)),
8-
unwant: callbackify.variadic(require('./unwant')(config))
3+
module.exports = config => ({
4+
wantlist: require('./wantlist')(config),
5+
stat: require('./stat')(config),
6+
unwant: require('./unwant')(config)
97
})

‎src/block/index.js‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
11
'use strict'
22

3-
const nodeify = require('promise-nodeify')
4-
const callbackify = require('callbackify')
5-
const { collectify } = require('../lib/converters')
6-
7-
module.exports = config => {
8-
const rm = require('./rm-async-iterator')(config)
9-
10-
return {
11-
get: callbackify.variadic(require('./get')(config)),
12-
stat: callbackify.variadic(require('./stat')(config)),
13-
put: callbackify.variadic(require('./put')(config)),
14-
rm: (input, options, callback) => {
15-
if (typeof options === 'function') {
16-
callback = options
17-
options = {}
18-
}
19-
return nodeify(collectify(rm)(input, options), callback)
20-
},
21-
_rmAsyncIterator: rm
22-
}
23-
}
3+
module.exports = config => ({
4+
get: require('./get')(config),
5+
stat: require('./stat')(config),
6+
put: require('./put')(config),
7+
rm: require('./rm')(config)
8+
})

‎src/block/rm-async-iterator.js‎ renamed to ‎src/block/rm.js‎

File renamed without changes.

‎src/bootstrap/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
53
module.exports = config => ({
6-
add: callbackify.variadic(require('./add')(config)),
7-
rm: callbackify.variadic(require('./rm')(config)),
8-
list: callbackify.variadic(require('./list')(config))
4+
add: require('./add')(config),
5+
rm: require('./rm')(config),
6+
list: require('./list')(config)
97
})

‎src/config/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
53
module.exports = config => ({
6-
get: callbackify.variadic(require('./get')(config)),
7-
set: callbackify.variadic(require('./set')(config)),
8-
replace: callbackify.variadic(require('./replace')(config)),
4+
get: require('./get')(config),
5+
set: require('./set')(config),
6+
replace: require('./replace')(config),
97
profiles: require('./profiles')(config)
108
})

‎src/config/profiles/index.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
53
module.exports = config => ({
6-
apply: callbackify.variadic(require('./apply')(config)),
7-
list: callbackify.variadic(require('./list')(config))
4+
apply: require('./apply')(config),
5+
list: require('./list')(config)
86
})

‎src/dag/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
53
module.exports = config => ({
6-
get: callbackify.variadic(require('./get')(config)),
7-
put: callbackify.variadic(require('./put')(config)),
8-
resolve: callbackify.variadic(require('./resolve')(config))
4+
get: require('./get')(config),
5+
put: require('./put')(config),
6+
resolve: require('./resolve')(config)
97
})

‎src/dht/index.js‎

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,11 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
const errCode = require('err-code')
5-
const { collectify } = require('../lib/converters')
6-
7-
module.exports = config => {
8-
const get = require('./get')(config)
9-
const findPeer = require('./find-peer')(config)
10-
11-
return {
12-
get: callbackify.variadic(async (key, options) => {
13-
for await (const value of get(key, options)) {
14-
return value
15-
}
16-
throw errCode(new Error('value not found'), 'ERR_TYPE_5_NOT_FOUND')
17-
}),
18-
put: callbackify.variadic(collectify(require('./put')(config))),
19-
findProvs: callbackify.variadic(collectify(require('./find-provs')(config))),
20-
findPeer: callbackify.variadic(async (peerId, options) => {
21-
for await (const peerInfo of findPeer(peerId, options)) {
22-
return peerInfo
23-
}
24-
throw errCode(new Error('final peer not found'), 'ERR_TYPE_2_NOT_FOUND')
25-
}),
26-
provide: callbackify.variadic(collectify(require('./provide')(config))),
27-
// find closest peerId to given peerId
28-
query: callbackify.variadic(collectify(require('./query')(config)))
29-
}
30-
}
3+
module.exports = config => ({
4+
get: require('./get')(config),
5+
put: require('./put')(config),
6+
findProvs: require('./find-provs')(config),
7+
findPeer: require('./find-peer')(config),
8+
provide: require('./provide')(config),
9+
// find closest peerId to given peerId
10+
query: require('./query')(config)
11+
})

‎src/diag/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
'use strict'
22

3-
const callbackify = require('callbackify')
4-
53
module.exports = config => ({
6-
net: callbackify.variadic(require('./net')(config)),
7-
sys: callbackify.variadic(require('./sys')(config)),
8-
cmds: callbackify.variadic(require('./cmds')(config))
4+
net: require('./net')(config),
5+
sys: require('./sys')(config),
6+
cmds: require('./cmds')(config)
97
})

0 commit comments

Comments
 (0)