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

fix: don't overwrite global constructor names in remote (#20637)

Browse source 
* fix: don't overwrite global constructor names in remote

* fake constructor names better, and improve error serialization
This commit is contained in:
Jeremy Apthorp 2019-10-20 23:48:03 -07:00 • committed by Cheng Zhao
parent 820dab295f
commit b155ebeeb3
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/browser/remote/server.ts
View file

@ -245,6 +245,17 @@ type MetaTypeFromRenderer = {
length: number
}
const fakeConstructor = (constructor: Function, name: string) =>
new Proxy(Object, {
get (target, prop, receiver) {
if (prop === 'name') {
return name
} else {
return Reflect.get(target, prop, receiver)
}
}
})
// Convert array of meta data from renderer into array of real values.
const unwrapArgs = function (sender: electron.WebContents, frameId: number, contextId: string, args: any[]) {
const metaToValue = function (meta: MetaTypeFromRenderer): any {
@ -262,8 +273,9 @@ const unwrapArgs = function (sender: electron.WebContents, frameId: number, cont
then: metaToValue(meta.then)
})
case 'object': {
const ret: any = {}
Object.defineProperty(ret.constructor, 'name', { value: meta.name })
const ret: any = meta.name !== 'Object' ? Object.create({
constructor: fakeConstructor(Object, meta.name)
}) : {}
for (const { name, value } of meta.members) {
ret[name] = metaToValue(value)