mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Use ArrayBuffer.isView to detect Buffer and ArrayBuffer

Browse source
This commit is contained in:
Cheng Zhao 2016-07-25 16:39:09 +09:00
parent eb51e080e5
commit 1c9421bc89
5 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/browser/rpc-server.js
View file

@ -2,7 +2,7 @@
const electron = require('electron')
const v8Util = process.atomBinding('v8_util')
const {ipcMain, isPromise, isTypedArray, webContents} = electron
const {ipcMain, isPromise, webContents} = electron
const objectsRegistry = require('./objects-registry')
@ -59,12 +59,10 @@ let valueToMeta = function (sender, value, optimizeSimpleObject = false) {
// Recognize certain types of objects.
if (value === null) {
meta.type = 'value'
} else if (Buffer.isBuffer(value)) {
} else if (ArrayBuffer.isView(value)) {
meta.type = 'buffer'
} else if (Array.isArray(value)) {
meta.type = 'array'
} else if (isTypedArray(value)) {
meta.type = 'typed-array'
} else if (value instanceof Error) {
meta.type = 'error'
} else if (value instanceof Date) {
@ -151,8 +149,6 @@ const unwrapArgs = function (sender, args) {
return unwrapArgs(sender, meta.value)
case 'buffer':
return new Buffer(meta.value)
case 'typed-array':
return Buffer.from(meta.value)
case 'date':
return new Date(meta.value)
case 'promise':