Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.

Commit 68805b0

Browse files
fix: replace node buffers with uint8arrays (#244)
* fix: replace node buffers with uint8arrays BREAKING CHANGES: - All deps used by this module now use Uint8Arrays in place of node Buffers * chore: skip know test issues with aegir * fix: use simple-peer fork branch * chore: update libp2p-webrtc-peer Co-authored-by: Jacob Heun <[email protected]>
1 parent 9b87e9b commit 68805b0

File tree

11 files changed

+21
-48
lines changed

11 files changed

+21
-48
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,37 +49,37 @@
4949
},
5050
"homepage": "https://github.com/libp2p/js-libp2p-webrtc-star#readme",
5151
"devDependencies": {
52-
"aegir": "^23.0.0",
52+
"aegir": "^25.1.0",
5353
"chai": "^4.2.0",
5454
"dirty-chai": "^2.0.1",
5555
"electron-webrtc": "~0.3.0",
56-
"libp2p-interfaces": "libp2p/js-interfaces#skip-abort-while-reading",
56+
"libp2p-interfaces": "^0.4.0",
5757
"p-wait-for": "^3.1.0",
5858
"sinon": "^9.0.0",
59+
"uint8arrays": "^1.1.0",
5960
"wrtc": "^0.4.3"
6061
},
6162
"dependencies": {
6263
"@hapi/hapi": "^18.4.0",
6364
"@hapi/inert": "^5.2.2",
6465
"abortable-iterator": "^3.0.0",
65-
"buffer": "^5.6.0",
6666
"class-is": "^1.1.0",
6767
"debug": "^4.1.1",
6868
"err-code": "^2.0.0",
6969
"ipfs-utils": "^2.3.0",
7070
"it-pipe": "^1.0.1",
71-
"libp2p-utils": "^0.1.0",
72-
"libp2p-webrtc-peer": "^9.7.2",
73-
"mafmt": "^7.0.1",
71+
"libp2p-utils": "^0.2.0",
72+
"libp2p-webrtc-peer": "^10.0.1",
73+
"mafmt": "^8.0.0",
7474
"menoetius": "0.0.2",
7575
"minimist": "^1.2.0",
76-
"multiaddr": "^7.1.0",
76+
"multiaddr": "^8.0.0",
7777
"p-defer": "^3.0.0",
78-
"peer-id": "~0.13.12",
78+
"peer-id": "^0.14.0",
7979
"prom-client": "^12.0.0",
8080
"socket.io": "^2.3.0",
8181
"socket.io-client": "^2.3.0",
82-
"stream-to-it": "^0.2.0",
82+
"stream-to-it": "^0.2.2",
8383
"streaming-iterables": "^5.0.2"
8484
},
8585
"contributors": [

src/socket-to-conn.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
const abortable = require('abortable-iterator')
44
const toIterable = require('stream-to-it')
5-
const { Buffer } = require('buffer')
65
const { CLOSE_TIMEOUT } = require('./constants')
76
const toMultiaddr = require('libp2p-utils/src/ip-port-to-multiaddr')
87

@@ -41,7 +40,7 @@ module.exports = (socket, options = {}) => {
4140
await sink((async function * () {
4241
for await (const chunk of source) {
4342
// Convert BufferList to Buffer
44-
yield Buffer.isBuffer(chunk) ? chunk : chunk.slice()
43+
yield chunk instanceof Uint8Array ? chunk : chunk.slice()
4544
}
4645
})())
4746
} catch (err) {

test/sig-server.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
4+
const { expect } = require('aegir/utils/chai')
85
const io = require('socket.io-client')
96
const multiaddr = require('multiaddr')
107

test/transport/dial.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33

44
'use strict'
55

6-
const chai = require('chai')
7-
const dirtyChai = require('dirty-chai')
8-
const expect = chai.expect
9-
chai.use(dirtyChai)
6+
const { expect } = require('aegir/utils/chai')
107
const multiaddr = require('multiaddr')
118
const pipe = require('it-pipe')
129
const { collect } = require('streaming-iterables')
10+
const uint8ArrayFromString = require('uint8arrays/from-string')
1311

1412
module.exports = (create) => {
1513
describe('dial', () => {
@@ -57,7 +55,7 @@ module.exports = (create) => {
5755
this.timeout(20 * 1000)
5856

5957
const conn = await ws1.dial(ws2._signallingAddr)
60-
const data = Buffer.from('some data')
58+
const data = uint8ArrayFromString('some data')
6159
const values = await pipe(
6260
[data],
6361
conn,

test/transport/discovery.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('aegir/utils/chai')
96
const multiaddr = require('multiaddr')
107

118
module.exports = (create) => {

test/transport/filter.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
4+
const { expect } = require('aegir/utils/chai')
85

96
const multiaddr = require('multiaddr')
107

test/transport/instance.spec.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
/* eslint-env mocha */
22
'use strict'
33

4-
const chai = require('chai')
5-
const dirtyChai = require('dirty-chai')
6-
const expect = chai.expect
7-
chai.use(dirtyChai)
4+
const { expect } = require('aegir/utils/chai')
85

96
const WebRTCStar = require('../../src')
107

test/transport/listen.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('aegir/utils/chai')
96
const multiaddr = require('multiaddr')
107

118
module.exports = (create) => {

test/transport/reconnect.node.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
'use strict'
44

5-
const chai = require('chai')
6-
const dirtyChai = require('dirty-chai')
7-
const expect = chai.expect
8-
chai.use(dirtyChai)
5+
const { expect } = require('aegir/utils/chai')
96
const multiaddr = require('multiaddr')
107
const sigServer = require('../../src/sig-server')
118

test/transport/track.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
'use strict'
55

6-
const chai = require('chai')
7-
const dirtyChai = require('dirty-chai')
8-
const expect = chai.expect
9-
chai.use(dirtyChai)
6+
const { expect } = require('aegir/utils/chai')
107
const multiaddr = require('multiaddr')
118
const pipe = require('it-pipe')
129
const pWaitFor = require('p-wait-for')

0 commit comments

Comments
 (0)