Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit 8cb2b5b

Browse files
Fix things
1 parent 7d5d86e commit 8cb2b5b

File tree

2 files changed

+12
-24
lines changed

2 files changed

+12
-24
lines changed

src/request-api.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ function onRes (buffer, cb) {
2929
cb(error)
3030
})
3131
}
32-
console.log(res.headers)
32+
3333
if (stream && !buffer) return cb(null, res)
3434

3535
if (chunkedObjects) {
3636
const parsed = []
37-
res.on('data', chunk => parsed.push(JSON.parse(chunk)))
37+
res.on('data', chunk => {
38+
try {
39+
parsed.push(JSON.parse(chunk))
40+
} catch (err) {
41+
// Browser quirks emit more than needed sometimes
42+
}
43+
})
3844
res.on('end', () => cb(null, parsed))
3945
return
4046
}

test/tests.js

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,6 @@ describe('IPFS Node.js API wrapper tests', () => {
193193
throw err
194194
}
195195

196-
if (!res.on) {
197-
// Just a string
198-
assert.equal(res.toString(), testfile)
199-
done()
200-
return
201-
}
202-
203196
let buf = ''
204197
res
205198
.on('error', err => { throw err })
@@ -391,13 +384,6 @@ describe('IPFS Node.js API wrapper tests', () => {
391384
apiClients['a'].block.get(blorbKey, (err, res) => {
392385
if (err) throw err
393386

394-
if (!res.on) {
395-
// Just a string
396-
assert.equal(res.toString(), 'blorb')
397-
done()
398-
return
399-
}
400-
401387
let buf = ''
402388
res
403389
.on('data', function (data) { buf += data })
@@ -442,13 +428,6 @@ describe('IPFS Node.js API wrapper tests', () => {
442428
apiClients['a'].object.data(testObjectHash, (err, res) => {
443429
if (err) throw err
444430

445-
if (!res.on) {
446-
// Just a string
447-
assert.equal(res.toString(), 'testdata')
448-
done()
449-
return
450-
}
451-
452431
let buf = ''
453432
res
454433
.on('error', err => { throw err })
@@ -729,6 +708,8 @@ describe('IPFS Node.js API wrapper tests', () => {
729708
throw err
730709
}
731710

711+
assert.equal(typeof res, 'object')
712+
732713
return done()
733714

734715
// non ipns or pk hashes fail to fetch, known bug
@@ -749,7 +730,8 @@ describe('IPFS Node.js API wrapper tests', () => {
749730
if (err) {
750731
throw err
751732
}
752-
console.log(res)
733+
734+
assert.equal(typeof res, 'object')
753735
assert(res)
754736
done()
755737
})

0 commit comments

Comments
 (0)