11'use strict'
22
3- const { Buffer } = require ( 'buffer' )
43const convert = require ( './convert' )
54const protocols = require ( './protocols-table' )
65const varint = require ( 'varint' )
6+ const uint8ArrayConcat = require ( 'uint8arrays/concat' )
7+ const uint8ArrayToString = require ( 'uint8arrays/to-string' )
78
89// export codec
910module . exports = {
@@ -13,16 +14,16 @@ module.exports = {
1314 tuplesToStringTuples,
1415 stringTuplesToTuples,
1516
16- bufferToTuples ,
17- tuplesToBuffer ,
17+ bytesToTuples ,
18+ tuplesToBytes ,
1819
19- bufferToString ,
20- stringToBuffer ,
20+ bytesToString ,
21+ stringToBytes ,
2122
2223 fromString,
23- fromBuffer ,
24- validateBuffer ,
25- isValidBuffer ,
24+ fromBytes ,
25+ validateBytes ,
26+ isValidBytes ,
2627 cleanPath,
2728
2829 ParseError,
@@ -85,21 +86,21 @@ function stringTuplesToString (tuples) {
8586 return cleanPath ( parts . join ( '/' ) )
8687}
8788
88- // [[str name, str addr]... ] -> [[int code, Buffer ]... ]
89+ // [[str name, str addr]... ] -> [[int code, Uint8Array ]... ]
8990function stringTuplesToTuples ( tuples ) {
9091 return tuples . map ( tup => {
9192 if ( ! Array . isArray ( tup ) ) {
9293 tup = [ tup ]
9394 }
9495 const proto = protoFromTuple ( tup )
9596 if ( tup . length > 1 ) {
96- return [ proto . code , convert . toBuffer ( proto . code , tup [ 1 ] ) ]
97+ return [ proto . code , convert . toBytes ( proto . code , tup [ 1 ] ) ]
9798 }
9899 return [ proto . code ]
99100 } )
100101}
101102
102- // [[int code, Buffer ]... ] -> [[str name, str addr]... ]
103+ // [[int code, Uint8Array ]... ] -> [[str name, str addr]... ]
103104function tuplesToStringTuples ( tuples ) {
104105 return tuples . map ( tup => {
105106 const proto = protoFromTuple ( tup )
@@ -110,14 +111,14 @@ function tuplesToStringTuples (tuples) {
110111 } )
111112}
112113
113- // [[int code, Buffer ]... ] -> Buffer
114- function tuplesToBuffer ( tuples ) {
115- return fromBuffer ( Buffer . concat ( tuples . map ( tup => {
114+ // [[int code, Uint8Array ]... ] -> Uint8Array
115+ function tuplesToBytes ( tuples ) {
116+ return fromBytes ( uint8ArrayConcat ( tuples . map ( tup => {
116117 const proto = protoFromTuple ( tup )
117- let buf = Buffer . from ( varint . encode ( proto . code ) )
118+ let buf = Uint8Array . from ( varint . encode ( proto . code ) )
118119
119120 if ( tup . length > 1 ) {
120- buf = Buffer . concat ( [ buf , tup [ 1 ] ] ) // add address buffer
121+ buf = uint8ArrayConcat ( [ buf , tup [ 1 ] ] ) // add address buffer
121122 }
122123
123124 return buf
@@ -135,8 +136,8 @@ function sizeForAddr (p, addr) {
135136 }
136137}
137138
138- // Buffer -> [[int code, Buffer ]... ]
139- function bufferToTuples ( buf ) {
139+ // Uint8Array -> [[int code, Uint8Array ]... ]
140+ function bytesToTuples ( buf ) {
140141 const tuples = [ ]
141142 let i = 0
142143 while ( i < buf . length ) {
@@ -158,7 +159,7 @@ function bufferToTuples (buf) {
158159 i += ( size + n )
159160
160161 if ( i > buf . length ) { // did not end _exactly_ at buffer.length
161- throw ParseError ( 'Invalid address buffer : ' + buf . toString ( 'hex ') )
162+ throw ParseError ( 'Invalid address Uint8Array : ' + uint8ArrayToString ( buf , 'base16 ') )
162163 }
163164
164165 // ok, tuple seems good.
@@ -168,44 +169,44 @@ function bufferToTuples (buf) {
168169 return tuples
169170}
170171
171- // Buffer -> String
172- function bufferToString ( buf ) {
173- const a = bufferToTuples ( buf )
172+ // Uint8Array -> String
173+ function bytesToString ( buf ) {
174+ const a = bytesToTuples ( buf )
174175 const b = tuplesToStringTuples ( a )
175176 return stringTuplesToString ( b )
176177}
177178
178- // String -> Buffer
179- function stringToBuffer ( str ) {
179+ // String -> Uint8Array
180+ function stringToBytes ( str ) {
180181 str = cleanPath ( str )
181182 const a = stringToStringTuples ( str )
182183 const b = stringTuplesToTuples ( a )
183184
184- return tuplesToBuffer ( b )
185+ return tuplesToBytes ( b )
185186}
186187
187- // String -> Buffer
188+ // String -> Uint8Array
188189function fromString ( str ) {
189- return stringToBuffer ( str )
190+ return stringToBytes ( str )
190191}
191192
192- // Buffer -> Buffer
193- function fromBuffer ( buf ) {
194- const err = validateBuffer ( buf )
193+ // Uint8Array -> Uint8Array
194+ function fromBytes ( buf ) {
195+ const err = validateBytes ( buf )
195196 if ( err ) throw err
196- return Buffer . from ( buf ) // copy
197+ return Uint8Array . from ( buf ) // copy
197198}
198199
199- function validateBuffer ( buf ) {
200+ function validateBytes ( buf ) {
200201 try {
201- bufferToTuples ( buf ) // try to parse. will throw if breaks
202+ bytesToTuples ( buf ) // try to parse. will throw if breaks
202203 } catch ( err ) {
203204 return err
204205 }
205206}
206207
207- function isValidBuffer ( buf ) {
208- return validateBuffer ( buf ) === undefined
208+ function isValidBytes ( buf ) {
209+ return validateBytes ( buf ) === undefined
209210}
210211
211212function cleanPath ( str ) {
0 commit comments