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.

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

Cookies setting fix after puppeteer update #83

Merged
merged 2 commits into from Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -42,6 +42,7 @@
"eslint-plugin-import": "^2.7.0",
"mocha": "^4.0.1",
"nodemon": "^1.12.1",
"supertest": "^3.0.0"
"supertest": "^3.0.0",
"pdf2json": "^1.1.7"
}
}
15 changes: 9 additions & 6 deletions src/core/render-core.js
Expand Up @@ -81,10 +81,14 @@ async function render(_opts = {}) {
await page.emulateMedia('screen');
}

logger.info('Setting cookies..');
opts.cookies.map(async (cookie) => {
await page.setCookie(cookie);
});
if (opts.cookies && opts.cookies.length > 0) {
logger.info('Setting cookies..');

const client = await page.target().createCDPSession();

await client.send('Network.enable');
await client.send('Network.setCookies', { cookies: opts.cookies });
}

if (opts.html) {
logger.info('Set HTML ..');
Expand Down Expand Up @@ -142,12 +146,11 @@ async function render(_opts = {}) {
const screenshotOpts = _.cloneDeep(_.omit(opts.screenshot, ['clip']));
const clipContainsSomething = _.some(opts.screenshot.clip, val => !_.isUndefined(val));
if (clipContainsSomething) {
screenshotOpts.clip = opts.screenshot.clip
screenshotOpts.clip = opts.screenshot.clip;
}

data = await page.screenshot(screenshotOpts);
}

} catch (err) {
logger.error(`Error when rendering page: ${err}`);
logger.error(err.stack);
Expand Down
45 changes: 45 additions & 0 deletions test/test-all.js
Expand Up @@ -5,6 +5,7 @@ const fs = require('fs');
const request = require('supertest');
const BPromise = require('bluebird');
const { getResource } = require('./util');
const PDFParser = require('pdf2json');
const createApp = require('../src/app');

const DEBUG = false;
Expand Down Expand Up @@ -129,4 +130,48 @@ describe('POST /api/render', () => {
chai.expect(length).to.be.above(30 * 1024 * 1);
})
);

it('cookies should exist on the page', () =>
request(app)
.post('/api/render')
.send({
url: 'http://www.html-kit.com/tools/cookietester/',
cookies:
[{
name: 'url-to-pdf-test',
value: 'test successful',
domain: 'www.html-kit.com',
}, {
name: 'url-to-pdf-test-2',
value: 'test successful 2',
domain: 'www.html-kit.com',
}],
})
.set('Connection', 'keep-alive')
.set('content-type', 'application/json')
.expect(200)
.expect('content-type', 'application/pdf')
.then((response) => {
if (DEBUG) {
console.log(response.headers);
console.log(response.body);
fs.writeFileSync('out.pdf', response.body, { encoding: null });
}

const pdfParser = new PDFParser(this, 1);

pdfParser.on('pdfParser_dataError', (errData) => {
console.error(errData.parserError);
chai.fail(errData.parserError);
});

pdfParser.on('pdfParser_dataReady', () => {
const rawContent = pdfParser.getRawTextContent();
chai.expect(rawContent.indexOf('Number of cookies received: 2')).to.be.above(0);
chai.expect(rawContent.indexOf('Cookie named "url­to­pdf­test"')).to.be.above(0);
chai.expect(rawContent.indexOf('Cookie named "url­to­pdf­test­2"')).to.be.above(0);
if (DEBUG) fs.writeFileSync('./content.txt', rawContent);
});
})
);
});