Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(page.evaluate): better function serialization #3480

Merged
merged 7 commits into from
Nov 1, 2018
Merged

fix(page.evaluate): better function serialization #3480

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53d5fb7
fix(page.evaluate): better function serialization
aslushnikov Nov 1, 2018
4408c18
address comments
aslushnikov Nov 1, 2018
3ed0d07
added async shorthand
aslushnikov Nov 1, 2018
558841a
disable test on node6
aslushnikov Nov 1, 2018
f58dc68
another attempt to bypass node6
aslushnikov Nov 1, 2018
f0ea50c
fix lint
aslushnikov Nov 1, 2018
81345f9
final fix
aslushnikov Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 19 additions & 1 deletion lib/ExecutionContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,26 @@ class ExecutionContext {
if (typeof pageFunction !== 'function')
throw new Error('The following is not a function: ' + pageFunction);

let functionText = pageFunction.toString();
try {
new Function('(' + functionText + ')');
} catch (e1) {
// This means we have a function shorthand. Try another
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// This means we have a function shorthand. Try another
// This means we might have a function shorthand. Try another

// time prefixing 'function '.
if (functionText.startsWith('async '))
functionText = 'async function ' + functionText.substring('async '.length);
else
functionText = 'function ' + functionText;
try {
new Function('(' + functionText + ')');
} catch (e2) {
// We tried hard to serialize, but there's a weird beast here.
throw new Error('Passed function is not well-serializable!');
}
}

const { exceptionDetails, result: remoteObject } = await this._client.send('Runtime.callFunctionOn', {
functionDeclaration: pageFunction.toString() + '\n' + suffix + '\n',
functionDeclaration: functionText + '\n' + suffix + '\n',
executionContextId: this._contextId,
arguments: args.map(convertArgument.bind(this)),
returnByValue: false,
Expand Down
22 changes: 16 additions & 6 deletions test/page.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ const DeviceDescriptors = utils.requireRoot('DeviceDescriptors');
const iPhone = DeviceDescriptors['iPhone 6'];
const iPhoneLandscape = DeviceDescriptors['iPhone 6 landscape'];

let asyncawait = true;
try {
new Function('async function foo() {await 1}');
} catch (e) {
asyncawait = false;
}

module.exports.addTests = function({testRunner, expect, headless}) {
const {describe, xdescribe, fdescribe} = testRunner;
const {it, fit, xit} = testRunner;
Expand Down Expand Up @@ -65,12 +72,6 @@ module.exports.addTests = function({testRunner, expect, headless}) {
});
});

let asyncawait = true;
try {
new Function('async function foo() {await 1}');
} catch (e) {
asyncawait = false;
}
(asyncawait ? describe : xdescribe)('Async stacks', () => {
it('should work', async({page, server}) => {
server.setRoute('/empty.html', (req, res) => {
Expand Down Expand Up @@ -176,6 +177,15 @@ module.exports.addTests = function({testRunner, expect, headless}) {
const result = await page.evaluate(() => 7 * 3);
expect(result).toBe(21);
});
(asyncawait ? it : xit)('should work with function shorthands', async({page, server}) => {
const a = {
sum(a, b) { return a + b; },

async mult(a, b) { return a * b; }
};
expect(await page.evaluate(a.sum, 1, 2)).toBe(3);
expect(await page.evaluate(a.mult, 2, 4)).toBe(8);
});
it('should throw when evaluation triggers reload', async({page, server}) => {
let error = null;
await page.evaluate(() => {
Expand Down