@@ -19,6 +19,8 @@ const {
19
19
ArrayBuffer,
20
20
ArrayPrototypeForEach,
21
21
ArrayPrototypePush,
22
+ BigInt64Array,
23
+ BigUint64Array,
22
24
DataView,
23
25
Error,
24
26
Float32Array,
@@ -27,7 +29,6 @@ const {
27
29
Int32Array,
28
30
Int8Array,
29
31
ObjectPrototypeToString,
30
- SafeMap,
31
32
Uint16Array,
32
33
Uint32Array,
33
34
Uint8Array,
@@ -247,29 +248,40 @@ Deserializer.prototype.readRawBytes = function readRawBytes(length) {
247
248
length ) ;
248
249
} ;
249
250
250
- /* Keep track of how to handle different ArrayBufferViews.
251
- * The default Serializer for Node does not use the V8 methods for serializing
252
- * those objects because Node's `Buffer` objects use pooled allocation in many
253
- * cases, and their underlying `ArrayBuffer`s would show up in the
254
- * serialization. Because a) those may contain sensitive data and the user
255
- * may not be aware of that and b) they are often much larger than the `Buffer`
256
- * itself, custom serialization is applied. */
257
- const arrayBufferViewTypes = [ Int8Array , Uint8Array , Uint8ClampedArray ,
258
- Int16Array , Uint16Array , Int32Array , Uint32Array ,
259
- Float32Array , Float64Array , DataView ] ;
260
-
261
- const arrayBufferViewTypeToIndex = new SafeMap ( ) ;
262
-
263
- {
264
- const dummy = new ArrayBuffer ( ) ;
265
- ArrayPrototypeForEach ( arrayBufferViewTypes , ( ctor , i ) => {
266
- const tag = ObjectPrototypeToString ( new ctor ( dummy ) ) ;
267
- arrayBufferViewTypeToIndex . set ( tag , i ) ;
268
- } ) ;
251
+ function arrayBufferViewTypeToIndex ( abView ) {
252
+ const type = ObjectPrototypeToString ( abView ) ;
253
+ if ( type === '[object Int8Array]' ) return 0 ;
254
+ if ( type === '[object Uint8Array]' ) return 1 ;
255
+ if ( type === '[object Uint8ClampedArray]' ) return 2 ;
256
+ if ( type === '[object Int16Array]' ) return 3 ;
257
+ if ( type === '[object Uint16Array]' ) return 4 ;
258
+ if ( type === '[object Int32Array]' ) return 5 ;
259
+ if ( type === '[object Uint32Array]' ) return 6 ;
260
+ if ( type === '[object Float32Array]' ) return 7 ;
261
+ if ( type === '[object Float64Array]' ) return 8 ;
262
+ if ( type === '[object DataView]' ) return 9 ;
263
+ // Index 10 is FastBuffer.
264
+ if ( type === '[object BigInt64Array]' ) return 11 ;
265
+ if ( type === '[object BigUint64Array]' ) return 12 ;
266
+ return - 1 ;
269
267
}
270
268
271
- const bufferConstructorIndex =
272
- ArrayPrototypePush ( arrayBufferViewTypes , FastBuffer ) - 1 ;
269
+ function arrayBufferViewIndexToType ( index ) {
270
+ if ( index === 0 ) return Int8Array ;
271
+ if ( index === 1 ) return Uint8Array ;
272
+ if ( index === 2 ) return Uint8ClampedArray ;
273
+ if ( index === 3 ) return Int16Array ;
274
+ if ( index === 4 ) return Uint16Array ;
275
+ if ( index === 5 ) return Int32Array ;
276
+ if ( index === 6 ) return Uint32Array ;
277
+ if ( index === 7 ) return Float32Array ;
278
+ if ( index === 8 ) return Float64Array ;
279
+ if ( index === 9 ) return DataView ;
280
+ if ( index === 10 ) return FastBuffer ;
281
+ if ( index === 11 ) return BigInt64Array ;
282
+ if ( index === 12 ) return BigUint64Array ;
283
+ return undefined ;
284
+ }
273
285
274
286
class DefaultSerializer extends Serializer {
275
287
constructor ( ) {
@@ -285,14 +297,17 @@ class DefaultSerializer extends Serializer {
285
297
* @returns {void }
286
298
*/
287
299
_writeHostObject ( abView ) {
288
- let i = 0 ;
289
- if ( abView . constructor === Buffer ) {
290
- i = bufferConstructorIndex ;
291
- } else {
292
- const tag = ObjectPrototypeToString ( abView ) ;
293
- i = arrayBufferViewTypeToIndex . get ( tag ) ;
294
-
295
- if ( i === undefined ) {
300
+ // Keep track of how to handle different ArrayBufferViews. The default
301
+ // Serializer for Node does not use the V8 methods for serializing those
302
+ // objects because Node's `Buffer` objects use pooled allocation in many
303
+ // cases, and their underlying `ArrayBuffer`s would show up in the
304
+ // serialization. Because a) those may contain sensitive data and the user
305
+ // may not be aware of that and b) they are often much larger than the
306
+ // `Buffer` itself, custom serialization is applied.
307
+ let i = 10 ; // FastBuffer
308
+ if ( abView . constructor !== Buffer ) {
309
+ i = arrayBufferViewTypeToIndex ( abView ) ;
310
+ if ( i === - 1 ) {
296
311
throw new this . _getDataCloneError (
297
312
`Unserializable host object: ${ inspect ( abView ) } ` ) ;
298
313
}
@@ -313,7 +328,7 @@ class DefaultDeserializer extends Deserializer {
313
328
*/
314
329
_readHostObject ( ) {
315
330
const typeIndex = this . readUint32 ( ) ;
316
- const ctor = arrayBufferViewTypes [ typeIndex ] ;
331
+ const ctor = arrayBufferViewIndexToType ( typeIndex ) ;
317
332
const byteLength = this . readUint32 ( ) ;
318
333
const byteOffset = this . _readRawBytes ( byteLength ) ;
319
334
const BYTES_PER_ELEMENT = ctor . BYTES_PER_ELEMENT || 1 ;
0 commit comments