-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
addresses #1000 and #976 1. Ensures all `Runtime.evaluate` calls result in the native Promise 2. Transforms all errors produced during the evaluation to a standard object that can be rejected by our driver wrapper
- Loading branch information
1 parent
dcdabb7
commit 5b10bf1
Showing
8 changed files
with
312 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -280,5 +280,6 @@ <h2>Do better web tester page</h2> | |
| } | ||
| </script> | ||
|
|
||
| <script src="./promise_polyfill.js"></script> | ||
| </body> | ||
| </html> | ||
254 changes: 254 additions & 0 deletions
254
lighthouse-cli/test/fixtures/dobetterweb/promise_polyfill.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,254 @@ | ||
| /* | ||
| * @license | ||
| * From taylorhakes/promise-polyfill | ||
| * Copyright (c) 2014 Taylor Hakes | ||
| * Copyright (c) 2014 Forbes Lindesay | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| (function () { | ||
|
|
||
| // Store setTimeout reference so promise-polyfill will be unaffected by | ||
| // other code modifying setTimeout (like sinon.useFakeTimers()) | ||
| var setTimeoutFunc = setTimeout; | ||
|
|
||
| function noop() {} | ||
|
|
||
| // Polyfill for Function.prototype.bind | ||
| function bind(fn, thisArg) { | ||
| return function () { | ||
| fn.apply(thisArg, arguments); | ||
| }; | ||
| } | ||
|
|
||
| function Promise(fn) { | ||
| if (typeof this !== 'object') throw new TypeError('Promises must be constructed via new'); | ||
| if (typeof fn !== 'function') throw new TypeError('not a function'); | ||
| this._state = 0; | ||
| this._handled = false; | ||
| this._value = undefined; | ||
| this._deferreds = []; | ||
|
|
||
| doResolve(fn, this); | ||
| } | ||
|
|
||
| function handle(self, deferred) { | ||
| while (self._state === 3) { | ||
| self = self._value; | ||
| } | ||
| if (self._state === 0) { | ||
| self._deferreds.push(deferred); | ||
| return; | ||
| } | ||
| self._handled = true; | ||
| Promise._immediateFn(function () { | ||
| var cb = self._state === 1 ? deferred.onFulfilled : deferred.onRejected; | ||
| if (cb === null) { | ||
| (self._state === 1 ? resolve : reject)(deferred.promise, self._value); | ||
| return; | ||
| } | ||
| var ret; | ||
| try { | ||
| ret = cb(self._value); | ||
| } catch (e) { | ||
| reject(deferred.promise, e); | ||
| return; | ||
| } | ||
| resolve(deferred.promise, ret); | ||
| }); | ||
| } | ||
|
|
||
| function resolve(self, newValue) { | ||
| try { | ||
| // Promise Resolution Procedure: https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure | ||
| if (newValue === self) throw new TypeError('A promise cannot be resolved with itself.'); | ||
| if (newValue && (typeof newValue === 'object' || typeof newValue === 'function')) { | ||
| var then = newValue.then; | ||
| if (newValue instanceof Promise) { | ||
| self._state = 3; | ||
| self._value = newValue; | ||
| finale(self); | ||
| return; | ||
| } else if (typeof then === 'function') { | ||
| doResolve(bind(then, newValue), self); | ||
| return; | ||
| } | ||
| } | ||
| self._state = 1; | ||
| self._value = newValue; | ||
| finale(self); | ||
| } catch (e) { | ||
| reject(self, e); | ||
| } | ||
| } | ||
|
|
||
| function reject(self, newValue) { | ||
| self._state = 2; | ||
| self._value = newValue; | ||
| finale(self); | ||
| } | ||
|
|
||
| function finale(self) { | ||
| if (self._state === 2 && self._deferreds.length === 0) { | ||
| Promise._immediateFn(function() { | ||
| if (!self._handled) { | ||
| Promise._unhandledRejectionFn(self._value); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| for (var i = 0, len = self._deferreds.length; i < len; i++) { | ||
| handle(self, self._deferreds[i]); | ||
| } | ||
| self._deferreds = null; | ||
| } | ||
|
|
||
| function Handler(onFulfilled, onRejected, promise) { | ||
| this.onFulfilled = typeof onFulfilled === 'function' ? onFulfilled : null; | ||
| this.onRejected = typeof onRejected === 'function' ? onRejected : null; | ||
| this.promise = promise; | ||
| } | ||
|
|
||
| /** | ||
| * Take a potentially misbehaving resolver function and make sure | ||
| * onFulfilled and onRejected are only called once. | ||
| * | ||
| * Makes no guarantees about asynchrony. | ||
| */ | ||
| function doResolve(fn, self) { | ||
| var done = false; | ||
| try { | ||
| fn(function (value) { | ||
| if (done) return; | ||
| done = true; | ||
| resolve(self, value); | ||
| }, function (reason) { | ||
| if (done) return; | ||
| done = true; | ||
| reject(self, reason); | ||
| }); | ||
| } catch (ex) { | ||
| if (done) return; | ||
| done = true; | ||
| reject(self, ex); | ||
| } | ||
| } | ||
|
|
||
| Promise.prototype['catch'] = function (onRejected) { | ||
| return this.then(null, onRejected); | ||
| }; | ||
|
|
||
| Promise.prototype.then = function (onFulfilled, onRejected) { | ||
| var prom = new (this.constructor)(noop); | ||
|
|
||
| handle(this, new Handler(onFulfilled, onRejected, prom)); | ||
| return prom; | ||
| }; | ||
|
|
||
| Promise.all = function (arr) { | ||
| var args = Array.prototype.slice.call(arr); | ||
|
|
||
| return new Promise(function (resolve, reject) { | ||
| if (args.length === 0) return resolve([]); | ||
| var remaining = args.length; | ||
|
|
||
| function res(i, val) { | ||
| try { | ||
| if (val && (typeof val === 'object' || typeof val === 'function')) { | ||
| var then = val.then; | ||
| if (typeof then === 'function') { | ||
| then.call(val, function (val) { | ||
| res(i, val); | ||
| }, reject); | ||
| return; | ||
| } | ||
| } | ||
| args[i] = val; | ||
| if (--remaining === 0) { | ||
| resolve(args); | ||
| } | ||
| } catch (ex) { | ||
| reject(ex); | ||
| } | ||
| } | ||
|
|
||
| for (var i = 0; i < args.length; i++) { | ||
| res(i, args[i]); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| Promise.resolve = function (value) { | ||
| if (value && typeof value === 'object' && value.constructor === Promise) { | ||
| return value; | ||
| } | ||
|
|
||
| return new Promise(function (resolve) { | ||
| resolve(value); | ||
| }); | ||
| }; | ||
|
|
||
| Promise.reject = function (value) { | ||
| return new Promise(function (resolve, reject) { | ||
| reject(value); | ||
| }); | ||
| }; | ||
|
|
||
| Promise.race = function (values) { | ||
| return new Promise(function (resolve, reject) { | ||
| for (var i = 0, len = values.length; i < len; i++) { | ||
| values[i].then(resolve, reject); | ||
| } | ||
| }); | ||
| }; | ||
|
|
||
| // Use polyfill for setImmediate for performance gains | ||
| Promise._immediateFn = (typeof setImmediate === 'function' && function (fn) { setImmediate(fn); }) || | ||
| function (fn) { | ||
| setTimeoutFunc(fn, 0); | ||
| }; | ||
|
|
||
| Promise._unhandledRejectionFn = function _unhandledRejectionFn(err) { | ||
| if (typeof console !== 'undefined' && console) { | ||
| console.warn('Possible Unhandled Promise Rejection:', err); // eslint-disable-line no-console | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Set the immediate function to execute callbacks | ||
| * @param fn {function} Function to execute | ||
| * @deprecated | ||
| */ | ||
| Promise._setImmediateFn = function _setImmediateFn(fn) { | ||
| Promise._immediateFn = fn; | ||
| }; | ||
|
|
||
| /** | ||
| * Change the function to execute on unhandled rejection | ||
| * @param {function} fn Function to execute on unhandled rejection | ||
| * @deprecated | ||
| */ | ||
| Promise._setUnhandledRejectionFn = function _setUnhandledRejectionFn(fn) { | ||
| Promise._unhandledRejectionFn = fn; | ||
| }; | ||
|
|
||
| window.Promise = Promise; | ||
|
|
||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.