Convert DevicesDescriptors into puppeteer format
This patch converts lib/DevicesDescriptors from a devtools front-end format into a puppeteer format. This patch does this via introducing a scripts utils/fetch_devices.js which grabs devices from upstream of DevTools Front-end and converts them into puppeteer devices. References #88.
This commit is contained in:
parent
ffc5a8ae4f
commit
76ac3bded5
@ -29,7 +29,7 @@
|
|||||||
* [page.addScriptTag(url)](#pageaddscripttagurl)
|
* [page.addScriptTag(url)](#pageaddscripttagurl)
|
||||||
* [page.click(selector)](#pageclickselector)
|
* [page.click(selector)](#pageclickselector)
|
||||||
* [page.close()](#pageclose)
|
* [page.close()](#pageclose)
|
||||||
* [page.emulate(name, options)](#pageemulatename-options)
|
* [page.emulate(name)](#pageemulatename)
|
||||||
* [page.emulatedDevices()](#pageemulateddevices)
|
* [page.emulatedDevices()](#pageemulateddevices)
|
||||||
* [page.evaluate(pageFunction, ...args)](#pageevaluatepagefunction-args)
|
* [page.evaluate(pageFunction, ...args)](#pageevaluatepagefunction-args)
|
||||||
* [page.evaluateOnInitialized(pageFunction, ...args)](#pageevaluateoninitializedpagefunction-args)
|
* [page.evaluateOnInitialized(pageFunction, ...args)](#pageevaluateoninitializedpagefunction-args)
|
||||||
@ -316,10 +316,8 @@ Adds a `<script></script>` tag to the page with the desired url. Alternatively,
|
|||||||
#### page.close()
|
#### page.close()
|
||||||
- returns: <[Promise]> Returns promise which resolves when page gets closed.
|
- returns: <[Promise]> Returns promise which resolves when page gets closed.
|
||||||
|
|
||||||
#### page.emulate(name, options)
|
#### page.emulate(name)
|
||||||
- `name` <[string]> A name of the device to be emulated. Get the full list of emulated devices via `page.emulatedDevices()`.
|
- `name` <[string]> A name of the device to be emulated. Get the full list of emulated devices via `page.emulatedDevices()`.
|
||||||
- `options` <[Object]> Emulation parameters which might have the following properties:
|
|
||||||
- `landscape` <[boolean]> Emulates device in the landscape mode, defaults to `false`.
|
|
||||||
- returns: <[Promise]> Returns promise which resolves when device is emulated. Can reload the page if switching between mobile and desktop devices.
|
- returns: <[Promise]> Returns promise which resolves when device is emulated. Can reload the page if switching between mobile and desktop devices.
|
||||||
|
|
||||||
#### page.emulatedDevices()
|
#### page.emulatedDevices()
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -21,7 +21,7 @@ class EmulationManager {
|
|||||||
* @return {!Promise<!Array<string>>}
|
* @return {!Promise<!Array<string>>}
|
||||||
*/
|
*/
|
||||||
static deviceNames() {
|
static deviceNames() {
|
||||||
return Promise.resolve(DeviceDescriptors.map(entry => entry['device'].title));
|
return Promise.resolve(DeviceDescriptors.map(device => device.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -29,31 +29,20 @@ class EmulationManager {
|
|||||||
* @param {!Object=} options
|
* @param {!Object=} options
|
||||||
* @return {!Page.Viewport}
|
* @return {!Page.Viewport}
|
||||||
*/
|
*/
|
||||||
static deviceViewport(name, options) {
|
static deviceViewport(name) {
|
||||||
options = options || {};
|
const device = DeviceDescriptors.find(device => device.name === name);
|
||||||
const descriptor = DeviceDescriptors.find(entry => entry['device'].title === name)['device'];
|
if (!device)
|
||||||
if (!descriptor)
|
|
||||||
throw new Error(`Unable to emulate ${name}, no such device metrics in the library.`);
|
throw new Error(`Unable to emulate ${name}, no such device metrics in the library.`);
|
||||||
const device = EmulationManager.loadFromJSONV1(descriptor);
|
return device.viewport;
|
||||||
const viewport = options.landscape ? device.horizontal : device.vertical;
|
|
||||||
return {
|
|
||||||
width: viewport.width,
|
|
||||||
height: viewport.height,
|
|
||||||
deviceScaleFactor: device.deviceScaleFactor,
|
|
||||||
isMobile: device.capabilities.includes('mobile'),
|
|
||||||
hasTouch: device.capabilities.includes('touch'),
|
|
||||||
isLandscape: options.landscape || false
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {string} name
|
* @param {string} name
|
||||||
*/
|
*/
|
||||||
static deviceUserAgent(name, options) {
|
static deviceUserAgent(name) {
|
||||||
const descriptor = DeviceDescriptors.find(entry => entry['device'].title === name)['device'];
|
const device = DeviceDescriptors.find(device => device.name === name);
|
||||||
if (!descriptor)
|
if (!device)
|
||||||
throw new Error(`Unable to emulate ${name}, no such device metrics in the library.`);
|
throw new Error(`Unable to emulate ${name}, no such device metrics in the library.`);
|
||||||
const device = EmulationManager.loadFromJSONV1(descriptor);
|
|
||||||
return device.userAgent;
|
return device.userAgent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,86 +99,6 @@ class EmulationManager {
|
|||||||
}
|
}
|
||||||
return reloadNeeded;
|
return reloadNeeded;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} json
|
|
||||||
* @return {?Object}
|
|
||||||
*/
|
|
||||||
static loadFromJSONV1(json) {
|
|
||||||
/**
|
|
||||||
* @param {*} object
|
|
||||||
* @param {string} key
|
|
||||||
* @param {string} type
|
|
||||||
* @param {*=} defaultValue
|
|
||||||
* @return {*}
|
|
||||||
*/
|
|
||||||
function parseValue(object, key, type, defaultValue) {
|
|
||||||
if (typeof object !== 'object' || object === null || !object.hasOwnProperty(key)) {
|
|
||||||
if (typeof defaultValue !== 'undefined')
|
|
||||||
return defaultValue;
|
|
||||||
throw new Error('Emulated device is missing required property \'' + key + '\'');
|
|
||||||
}
|
|
||||||
const value = object[key];
|
|
||||||
if (typeof value !== type || value === null)
|
|
||||||
throw new Error('Emulated device property \'' + key + '\' has wrong type \'' + typeof value + '\'');
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} object
|
|
||||||
* @param {string} key
|
|
||||||
* @return {number}
|
|
||||||
*/
|
|
||||||
function parseIntValue(object, key) {
|
|
||||||
const value = /** @type {number} */ (parseValue(object, key, 'number'));
|
|
||||||
if (value !== Math.abs(value))
|
|
||||||
throw new Error('Emulated device value \'' + key + '\' must be integer');
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {*} json
|
|
||||||
* @return {!{width: number, height: number}}
|
|
||||||
*/
|
|
||||||
function parseOrientation(json) {
|
|
||||||
const result = {};
|
|
||||||
const minDeviceSize = 50;
|
|
||||||
const maxDeviceSize = 9999;
|
|
||||||
result.width = parseIntValue(json, 'width');
|
|
||||||
if (result.width < 0 || result.width > maxDeviceSize ||
|
|
||||||
result.width < minDeviceSize)
|
|
||||||
throw new Error('Emulated device has wrong width: ' + result.width);
|
|
||||||
|
|
||||||
result.height = parseIntValue(json, 'height');
|
|
||||||
if (result.height < 0 || result.height > maxDeviceSize ||
|
|
||||||
result.height < minDeviceSize)
|
|
||||||
throw new Error('Emulated device has wrong height: ' + result.height);
|
|
||||||
|
|
||||||
return /** @type {!{width: number, height: number}} */ (result);
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = {};
|
|
||||||
result.type = /** @type {string} */ (parseValue(json, 'type', 'string'));
|
|
||||||
result.userAgent = /** @type {string} */ (parseValue(json, 'user-agent', 'string'));
|
|
||||||
|
|
||||||
const capabilities = parseValue(json, 'capabilities', 'object', []);
|
|
||||||
if (!Array.isArray(capabilities))
|
|
||||||
throw new Error('Emulated device capabilities must be an array');
|
|
||||||
result.capabilities = [];
|
|
||||||
for (let i = 0; i < capabilities.length; ++i) {
|
|
||||||
if (typeof capabilities[i] !== 'string')
|
|
||||||
throw new Error('Emulated device capability must be a string');
|
|
||||||
result.capabilities.push(capabilities[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
result.deviceScaleFactor = /** @type {number} */ (parseValue(json['screen'], 'device-pixel-ratio', 'number'));
|
|
||||||
if (result.deviceScaleFactor < 0 || result.deviceScaleFactor > 100)
|
|
||||||
throw new Error('Emulated device has wrong deviceScaleFactor: ' + result.deviceScaleFactor);
|
|
||||||
|
|
||||||
result.vertical = parseOrientation(parseValue(json['screen'], 'vertical', 'object'));
|
|
||||||
result.horizontal = parseOrientation(parseValue(json['screen'], 'horizontal', 'object'));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EmulationManager._touchScriptId = Symbol('emulatingTouchScriptId');
|
EmulationManager._touchScriptId = Symbol('emulatingTouchScriptId');
|
||||||
|
@ -358,13 +358,12 @@ class Page extends EventEmitter {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {string} name
|
* @param {string} name
|
||||||
* @param {!Object=} options
|
|
||||||
* @return {!Promise}
|
* @return {!Promise}
|
||||||
*/
|
*/
|
||||||
emulate(name, options) {
|
emulate(name) {
|
||||||
return Promise.all([
|
return Promise.all([
|
||||||
this.setUserAgent(EmulationManager.deviceUserAgent(name)),
|
this.setUserAgent(EmulationManager.deviceUserAgent(name)),
|
||||||
this.setViewport(EmulationManager.deviceViewport(name, options))
|
this.setViewport(EmulationManager.deviceViewport(name))
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
224
utils/fetch_devices.js
Executable file
224
utils/fetch_devices.js
Executable file
@ -0,0 +1,224 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* Copyright 2017 Google Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const util = require('util');
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
const DEVICES_URL = 'https://raw.githubusercontent.com/ChromeDevTools/devtools-frontend/master/front_end/emulated_devices/module.json';
|
||||||
|
|
||||||
|
const template = `/**
|
||||||
|
* Copyright 2017 Google Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
module.exports = %s;
|
||||||
|
for (let device of module.exports)
|
||||||
|
module.exports[device.name] = device;
|
||||||
|
`;
|
||||||
|
|
||||||
|
const help = `Usage: node ${path.basename(__filename)} [-u <from>] <outputPath>
|
||||||
|
-u, --url The URL to load devices descriptor from. If not set,
|
||||||
|
devices will be fetched from the tip-of-tree of DevTools
|
||||||
|
frontend.
|
||||||
|
|
||||||
|
-h, --help Show this help message
|
||||||
|
|
||||||
|
Fetch Chrome DevTools front-end emulation devices from given URL, convert them to puppeteer
|
||||||
|
devices and save to the <outputPath>.
|
||||||
|
`;
|
||||||
|
|
||||||
|
let argv = require('minimist')(process.argv.slice(2), {
|
||||||
|
alias: { u: 'url', h: 'help' },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (argv.help) {
|
||||||
|
console.log(help);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let url = argv.url || DEVICES_URL;
|
||||||
|
let outputPath = argv._[0];
|
||||||
|
if (!outputPath) {
|
||||||
|
console.log('ERROR: output file name is missing. Use --help for help.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
main(url);
|
||||||
|
|
||||||
|
async function main(url) {
|
||||||
|
console.log('GET ' + url);
|
||||||
|
let text = await httpGET(url);
|
||||||
|
let json = null;
|
||||||
|
try {
|
||||||
|
json = JSON.parse(text);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`FAILED: error parsing response - ${e.message}`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let devicePayloads = json.extensions.filter(extension => extension.type === 'emulated-device').map(extension => extension.device);
|
||||||
|
let devices = [];
|
||||||
|
for (let payload of devicePayloads) {
|
||||||
|
let device = createDevice(payload, false);
|
||||||
|
let landscape = createDevice(payload, true);
|
||||||
|
devices.push(device);
|
||||||
|
if (landscape.viewport.width !== device.viewport.width || landscape.viewport.height !== device.viewport.height)
|
||||||
|
devices.push(landscape);
|
||||||
|
}
|
||||||
|
devices = devices.filter(device => device.viewport.isMobile);
|
||||||
|
devices.sort((a, b) => a.name.localeCompare(b.name));
|
||||||
|
// Use single-quotes instead of double-quotes to conform with codestyle.
|
||||||
|
let serialized = JSON.stringify(devices, null, 2)
|
||||||
|
.replace(/'/g, `\\'`)
|
||||||
|
.replace(/"/g, `'`);
|
||||||
|
let result = util.format(template, serialized);
|
||||||
|
fs.writeFileSync(outputPath, result, 'utf8');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {*} descriptor
|
||||||
|
* @param {boolean} landscape
|
||||||
|
* @return {!Object}
|
||||||
|
*/
|
||||||
|
function createDevice(descriptor, landscape) {
|
||||||
|
const devicePayload = loadFromJSONV1(descriptor);
|
||||||
|
const viewportPayload = landscape ? devicePayload.horizontal : devicePayload.vertical;
|
||||||
|
return {
|
||||||
|
name: descriptor.title + (landscape ? ' landscape' : ''),
|
||||||
|
userAgent: devicePayload.userAgent,
|
||||||
|
viewport: {
|
||||||
|
width: viewportPayload.width,
|
||||||
|
height: viewportPayload.height,
|
||||||
|
deviceScaleFactor: devicePayload.deviceScaleFactor,
|
||||||
|
isMobile: devicePayload.capabilities.includes('mobile'),
|
||||||
|
hasTouch: devicePayload.capabilities.includes('touch'),
|
||||||
|
isLandscape: landscape || false
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {*} json
|
||||||
|
* @return {?Object}
|
||||||
|
*/
|
||||||
|
function loadFromJSONV1(json) {
|
||||||
|
/**
|
||||||
|
* @param {*} object
|
||||||
|
* @param {string} key
|
||||||
|
* @param {string} type
|
||||||
|
* @param {*=} defaultValue
|
||||||
|
* @return {*}
|
||||||
|
*/
|
||||||
|
function parseValue(object, key, type, defaultValue) {
|
||||||
|
if (typeof object !== 'object' || object === null || !object.hasOwnProperty(key)) {
|
||||||
|
if (typeof defaultValue !== 'undefined')
|
||||||
|
return defaultValue;
|
||||||
|
throw new Error('Emulated device is missing required property \'' + key + '\'');
|
||||||
|
}
|
||||||
|
const value = object[key];
|
||||||
|
if (typeof value !== type || value === null)
|
||||||
|
throw new Error('Emulated device property \'' + key + '\' has wrong type \'' + typeof value + '\'');
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {*} object
|
||||||
|
* @param {string} key
|
||||||
|
* @return {number}
|
||||||
|
*/
|
||||||
|
function parseIntValue(object, key) {
|
||||||
|
const value = /** @type {number} */ (parseValue(object, key, 'number'));
|
||||||
|
if (value !== Math.abs(value))
|
||||||
|
throw new Error('Emulated device value \'' + key + '\' must be integer');
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {*} json
|
||||||
|
* @return {!{width: number, height: number}}
|
||||||
|
*/
|
||||||
|
function parseOrientation(json) {
|
||||||
|
const result = {};
|
||||||
|
const minDeviceSize = 50;
|
||||||
|
const maxDeviceSize = 9999;
|
||||||
|
result.width = parseIntValue(json, 'width');
|
||||||
|
if (result.width < 0 || result.width > maxDeviceSize ||
|
||||||
|
result.width < minDeviceSize)
|
||||||
|
throw new Error('Emulated device has wrong width: ' + result.width);
|
||||||
|
|
||||||
|
result.height = parseIntValue(json, 'height');
|
||||||
|
if (result.height < 0 || result.height > maxDeviceSize ||
|
||||||
|
result.height < minDeviceSize)
|
||||||
|
throw new Error('Emulated device has wrong height: ' + result.height);
|
||||||
|
|
||||||
|
return /** @type {!{width: number, height: number}} */ (result);
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = {};
|
||||||
|
result.type = /** @type {string} */ (parseValue(json, 'type', 'string'));
|
||||||
|
result.userAgent = /** @type {string} */ (parseValue(json, 'user-agent', 'string'));
|
||||||
|
|
||||||
|
const capabilities = parseValue(json, 'capabilities', 'object', []);
|
||||||
|
if (!Array.isArray(capabilities))
|
||||||
|
throw new Error('Emulated device capabilities must be an array');
|
||||||
|
result.capabilities = [];
|
||||||
|
for (let i = 0; i < capabilities.length; ++i) {
|
||||||
|
if (typeof capabilities[i] !== 'string')
|
||||||
|
throw new Error('Emulated device capability must be a string');
|
||||||
|
result.capabilities.push(capabilities[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
result.deviceScaleFactor = /** @type {number} */ (parseValue(json['screen'], 'device-pixel-ratio', 'number'));
|
||||||
|
if (result.deviceScaleFactor < 0 || result.deviceScaleFactor > 100)
|
||||||
|
throw new Error('Emulated device has wrong deviceScaleFactor: ' + result.deviceScaleFactor);
|
||||||
|
|
||||||
|
result.vertical = parseOrientation(parseValue(json['screen'], 'vertical', 'object'));
|
||||||
|
result.horizontal = parseOrientation(parseValue(json['screen'], 'horizontal', 'object'));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {url}
|
||||||
|
* @return {!Promise}
|
||||||
|
*/
|
||||||
|
function httpGET(url) {
|
||||||
|
let fulfill, reject;
|
||||||
|
const promise = new Promise((res, rej) => {
|
||||||
|
fulfill = res;
|
||||||
|
reject = rej;
|
||||||
|
});
|
||||||
|
const driver = url.startsWith('https://') ? require('https') : require('http');
|
||||||
|
const request = driver.get(url, response => {
|
||||||
|
let data = '';
|
||||||
|
response.setEncoding('utf8');
|
||||||
|
response.on('data', chunk => data += chunk);
|
||||||
|
response.on('end', () => fulfill(data));
|
||||||
|
response.on('error', reject);
|
||||||
|
});
|
||||||
|
request.on('error', reject);
|
||||||
|
return promise;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user