2010-09-04 04:00:09 +00:00
|
|
|
<?php
|
|
|
|
|
/**
|
2015-10-28 03:24:40 +00:00
|
|
|
* Context for ResourceLoader modules.
|
2012-04-30 07:16:10 +00:00
|
|
|
*
|
2010-09-04 04:00:09 +00:00
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
|
|
|
*
|
2010-09-24 17:31:40 +00:00
|
|
|
* @file
|
2010-09-04 04:00:09 +00:00
|
|
|
* @author Trevor Parscal
|
|
|
|
|
* @author Roan Kattouw
|
|
|
|
|
*/
|
|
|
|
|
|
2015-06-04 03:52:45 +00:00
|
|
|
use MediaWiki\Logger\LoggerFactory;
|
2016-11-22 23:39:22 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2015-06-04 03:52:45 +00:00
|
|
|
|
2010-09-04 04:00:09 +00:00
|
|
|
/**
|
2011-10-14 08:06:54 +00:00
|
|
|
* Object passed around to modules which contains information about the state
|
2016-09-28 16:47:24 +00:00
|
|
|
* of a specific loader request.
|
2010-09-04 04:00:09 +00:00
|
|
|
*/
|
|
|
|
|
class ResourceLoaderContext {
|
2010-09-29 19:04:04 +00:00
|
|
|
protected $resourceLoader;
|
2010-09-04 04:00:09 +00:00
|
|
|
protected $request;
|
2015-11-10 03:12:24 +00:00
|
|
|
protected $logger;
|
2015-11-17 21:14:17 +00:00
|
|
|
|
|
|
|
|
// Module content vary
|
2010-09-04 04:00:09 +00:00
|
|
|
protected $skin;
|
2015-11-17 21:14:17 +00:00
|
|
|
protected $language;
|
2010-09-04 04:00:09 +00:00
|
|
|
protected $debug;
|
2015-11-17 21:14:17 +00:00
|
|
|
protected $user;
|
|
|
|
|
|
|
|
|
|
// Request vary (in addition to cache vary)
|
|
|
|
|
protected $modules;
|
2010-09-04 04:00:09 +00:00
|
|
|
protected $only;
|
2010-09-13 23:19:05 +00:00
|
|
|
protected $version;
|
2012-05-11 19:16:29 +00:00
|
|
|
protected $raw;
|
2014-11-11 19:50:44 +00:00
|
|
|
protected $image;
|
|
|
|
|
protected $variant;
|
|
|
|
|
protected $format;
|
2015-11-17 21:14:17 +00:00
|
|
|
|
|
|
|
|
protected $direction;
|
|
|
|
|
protected $hash;
|
2014-10-04 10:22:07 +00:00
|
|
|
protected $userObj;
|
2014-11-11 19:50:44 +00:00
|
|
|
protected $imageObj;
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-10-14 08:06:54 +00:00
|
|
|
/**
|
2014-04-20 21:33:05 +00:00
|
|
|
* @param ResourceLoader $resourceLoader
|
|
|
|
|
* @param WebRequest $request
|
2011-10-14 08:06:54 +00:00
|
|
|
*/
|
2014-08-10 10:36:59 +00:00
|
|
|
public function __construct( ResourceLoader $resourceLoader, WebRequest $request ) {
|
2010-09-29 19:04:04 +00:00
|
|
|
$this->resourceLoader = $resourceLoader;
|
2010-09-04 04:00:09 +00:00
|
|
|
$this->request = $request;
|
2015-11-10 03:12:24 +00:00
|
|
|
$this->logger = $resourceLoader->getLogger();
|
2010-10-19 20:45:02 +00:00
|
|
|
|
2016-09-28 16:47:24 +00:00
|
|
|
// Future developers: Avoid use of getVal() in this class, which performs
|
|
|
|
|
// expensive UTF normalisation by default. Use getRawVal() instead.
|
|
|
|
|
// Values here are either one of a finite number of internal IDs,
|
|
|
|
|
// or previously-stored user input (e.g. titles, user names) that were passed
|
|
|
|
|
// to this endpoint by ResourceLoader itself from the canonical value.
|
|
|
|
|
// Values do not come directly from user input and need not match.
|
|
|
|
|
|
2010-10-20 14:58:35 +00:00
|
|
|
// List of modules
|
2016-09-28 16:47:24 +00:00
|
|
|
$modules = $request->getRawVal( 'modules' );
|
2016-02-17 09:09:32 +00:00
|
|
|
$this->modules = $modules ? self::expandModuleNames( $modules ) : [];
|
2015-06-10 17:43:32 +00:00
|
|
|
|
2010-10-20 14:58:35 +00:00
|
|
|
// Various parameters
|
2016-09-28 16:47:24 +00:00
|
|
|
$this->user = $request->getRawVal( 'user' );
|
2014-08-07 10:25:56 +00:00
|
|
|
$this->debug = $request->getFuzzyBool(
|
2015-06-10 17:43:32 +00:00
|
|
|
'debug',
|
|
|
|
|
$resourceLoader->getConfig()->get( 'ResourceLoaderDebug' )
|
2014-08-07 10:25:56 +00:00
|
|
|
);
|
2016-09-28 16:47:24 +00:00
|
|
|
$this->only = $request->getRawVal( 'only', null );
|
|
|
|
|
$this->version = $request->getRawVal( 'version', null );
|
2013-03-07 16:50:43 +00:00
|
|
|
$this->raw = $request->getFuzzyBool( 'raw' );
|
2015-06-10 17:43:32 +00:00
|
|
|
|
2014-11-11 19:50:44 +00:00
|
|
|
// Image requests
|
2016-09-28 16:47:24 +00:00
|
|
|
$this->image = $request->getRawVal( 'image' );
|
|
|
|
|
$this->variant = $request->getRawVal( 'variant' );
|
|
|
|
|
$this->format = $request->getRawVal( 'format' );
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2016-09-28 16:47:24 +00:00
|
|
|
$this->skin = $request->getRawVal( 'skin' );
|
2012-02-27 22:41:20 +00:00
|
|
|
$skinnames = Skin::getSkinNames();
|
|
|
|
|
// If no skin is specified, or we don't recognize the skin, use the default skin
|
|
|
|
|
if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) {
|
2014-08-07 10:25:56 +00:00
|
|
|
$this->skin = $resourceLoader->getConfig()->get( 'DefaultSkin' );
|
2010-09-04 04:00:09 +00:00
|
|
|
}
|
|
|
|
|
}
|
2011-10-14 08:06:54 +00:00
|
|
|
|
2011-05-05 13:46:47 +00:00
|
|
|
/**
|
|
|
|
|
* Expand a string of the form jquery.foo,bar|jquery.ui.baz,quux to
|
2016-08-13 01:10:40 +00:00
|
|
|
* an array of module names like [ 'jquery.foo', 'jquery.bar',
|
|
|
|
|
* 'jquery.ui.baz', 'jquery.ui.quux' ]
|
2013-03-11 17:15:01 +00:00
|
|
|
* @param string $modules Packed module name list
|
2014-04-20 21:33:05 +00:00
|
|
|
* @return array Array of module names
|
2011-05-05 13:46:47 +00:00
|
|
|
*/
|
|
|
|
|
public static function expandModuleNames( $modules ) {
|
2016-02-17 09:09:32 +00:00
|
|
|
$retval = [];
|
2011-05-05 13:46:47 +00:00
|
|
|
$exploded = explode( '|', $modules );
|
|
|
|
|
foreach ( $exploded as $group ) {
|
|
|
|
|
if ( strpos( $group, ',' ) === false ) {
|
|
|
|
|
// This is not a set of modules in foo.bar,baz notation
|
|
|
|
|
// but a single module
|
|
|
|
|
$retval[] = $group;
|
|
|
|
|
} else {
|
|
|
|
|
// This is a set of modules in foo.bar,baz notation
|
|
|
|
|
$pos = strrpos( $group, '.' );
|
2011-05-14 13:34:03 +00:00
|
|
|
if ( $pos === false ) {
|
|
|
|
|
// Prefixless modules, i.e. without dots
|
2013-05-27 15:13:59 +00:00
|
|
|
$retval = array_merge( $retval, explode( ',', $group ) );
|
2011-05-14 13:34:03 +00:00
|
|
|
} else {
|
|
|
|
|
// We have a prefix and a bunch of suffixes
|
|
|
|
|
$prefix = substr( $group, 0, $pos ); // 'foo'
|
2016-08-13 01:10:40 +00:00
|
|
|
$suffixes = explode( ',', substr( $group, $pos + 1 ) ); // [ 'bar', 'baz' ]
|
2011-05-14 13:34:03 +00:00
|
|
|
foreach ( $suffixes as $suffix ) {
|
|
|
|
|
$retval[] = "$prefix.$suffix";
|
|
|
|
|
}
|
2011-05-05 13:46:47 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return $retval;
|
|
|
|
|
}
|
2011-10-14 08:06:54 +00:00
|
|
|
|
2011-09-01 13:02:20 +00:00
|
|
|
/**
|
2014-05-10 08:39:37 +00:00
|
|
|
* Return a dummy ResourceLoaderContext object suitable for passing into
|
|
|
|
|
* things that don't "really" need a context.
|
2011-10-14 08:06:54 +00:00
|
|
|
* @return ResourceLoaderContext
|
2011-09-01 13:02:20 +00:00
|
|
|
*/
|
|
|
|
|
public static function newDummyContext() {
|
2014-08-23 06:18:20 +00:00
|
|
|
return new self( new ResourceLoader(
|
2016-11-22 23:39:22 +00:00
|
|
|
MediaWikiServices::getInstance()->getMainConfig(),
|
2015-06-04 03:52:45 +00:00
|
|
|
LoggerFactory::getInstance( 'resourceloader' )
|
2016-02-17 09:09:32 +00:00
|
|
|
), new FauxRequest( [] ) );
|
2011-09-01 13:02:20 +00:00
|
|
|
}
|
2010-09-13 23:19:05 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return ResourceLoader
|
|
|
|
|
*/
|
2010-09-29 19:04:04 +00:00
|
|
|
public function getResourceLoader() {
|
|
|
|
|
return $this->resourceLoader;
|
|
|
|
|
}
|
2011-05-21 17:45:20 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @return WebRequest
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getRequest() {
|
|
|
|
|
return $this->request;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2015-11-10 03:12:24 +00:00
|
|
|
/**
|
|
|
|
|
* @since 1.27
|
|
|
|
|
* @return \Psr\Log\LoggerInterface
|
|
|
|
|
*/
|
|
|
|
|
public function getLogger() {
|
|
|
|
|
return $this->logger;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return array
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getModules() {
|
|
|
|
|
return $this->modules;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getLanguage() {
|
2010-11-19 06:52:38 +00:00
|
|
|
if ( $this->language === null ) {
|
2015-10-28 23:55:39 +00:00
|
|
|
// Must be a valid language code after this point (T64849)
|
|
|
|
|
// Only support uselang values that follow built-in conventions (T102058)
|
2016-09-28 16:47:24 +00:00
|
|
|
$lang = $this->getRequest()->getRawVal( 'lang', '' );
|
2015-10-28 23:55:39 +00:00
|
|
|
// Stricter version of RequestContext::sanitizeLangCode()
|
|
|
|
|
if ( !Language::isValidBuiltInCode( $lang ) ) {
|
|
|
|
|
wfDebug( "Invalid user language code\n" );
|
2016-08-29 23:35:55 +00:00
|
|
|
$lang = $this->getResourceLoader()->getConfig()->get( 'LanguageCode' );
|
2015-10-28 23:55:39 +00:00
|
|
|
}
|
|
|
|
|
$this->language = $lang;
|
2010-11-19 06:52:38 +00:00
|
|
|
}
|
2010-09-04 04:00:09 +00:00
|
|
|
return $this->language;
|
|
|
|
|
}
|
2010-09-04 10:28:41 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return string
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getDirection() {
|
2010-11-19 06:52:38 +00:00
|
|
|
if ( $this->direction === null ) {
|
2016-09-28 16:47:24 +00:00
|
|
|
$this->direction = $this->getRequest()->getRawVal( 'dir' );
|
2010-11-19 06:52:38 +00:00
|
|
|
if ( !$this->direction ) {
|
2017-02-20 22:44:19 +00:00
|
|
|
// Determine directionality based on user language (T8100)
|
2012-05-25 21:52:39 +00:00
|
|
|
$this->direction = Language::factory( $this->getLanguage() )->getDir();
|
2010-11-19 06:52:38 +00:00
|
|
|
}
|
|
|
|
|
}
|
2010-09-04 04:00:09 +00:00
|
|
|
return $this->direction;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
2015-06-10 17:43:32 +00:00
|
|
|
* @return string
|
2011-05-21 17:45:20 +00:00
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getSkin() {
|
|
|
|
|
return $this->skin;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
2011-09-13 20:15:00 +00:00
|
|
|
* @return string|null
|
2011-05-21 17:45:20 +00:00
|
|
|
*/
|
2010-09-11 03:26:15 +00:00
|
|
|
public function getUser() {
|
2010-09-11 07:33:16 +00:00
|
|
|
return $this->user;
|
2010-09-11 03:26:15 +00:00
|
|
|
}
|
|
|
|
|
|
2016-03-10 23:33:58 +00:00
|
|
|
/**
|
|
|
|
|
* Get a Message object with context set. See wfMessage for parameters.
|
|
|
|
|
*
|
|
|
|
|
* @since 1.27
|
|
|
|
|
* @param mixed ...
|
|
|
|
|
* @return Message
|
|
|
|
|
*/
|
|
|
|
|
public function msg() {
|
|
|
|
|
return call_user_func_array( 'wfMessage', func_get_args() )
|
2016-09-15 22:11:59 +00:00
|
|
|
->inLanguage( $this->getLanguage() )
|
|
|
|
|
// Use a dummy title because there is no real title
|
|
|
|
|
// for this endpoint, and the cache won't vary on it
|
|
|
|
|
// anyways.
|
|
|
|
|
->title( Title::newFromText( 'Dwimmerlaik' ) );
|
2016-03-10 23:33:58 +00:00
|
|
|
}
|
|
|
|
|
|
2014-10-04 10:22:07 +00:00
|
|
|
/**
|
|
|
|
|
* Get the possibly-cached User object for the specified username
|
|
|
|
|
*
|
|
|
|
|
* @since 1.25
|
2016-05-10 19:37:46 +00:00
|
|
|
* @return User
|
2014-10-04 10:22:07 +00:00
|
|
|
*/
|
|
|
|
|
public function getUserObj() {
|
|
|
|
|
if ( $this->userObj === null ) {
|
|
|
|
|
$username = $this->getUser();
|
|
|
|
|
if ( $username ) {
|
2016-05-10 19:37:46 +00:00
|
|
|
// Use provided username if valid, fallback to anonymous user
|
|
|
|
|
$this->userObj = User::newFromName( $username ) ?: new User;
|
2014-10-04 10:22:07 +00:00
|
|
|
} else {
|
2016-05-10 19:37:46 +00:00
|
|
|
// Anonymous user
|
|
|
|
|
$this->userObj = new User;
|
2014-10-04 10:22:07 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $this->userObj;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getDebug() {
|
|
|
|
|
return $this->debug;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
2014-04-20 21:33:05 +00:00
|
|
|
* @return string|null
|
2011-05-21 17:45:20 +00:00
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getOnly() {
|
|
|
|
|
return $this->only;
|
|
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
resourceloader: Replace timestamp system with version hashing
Modules now track their version via getVersionHash() instead of getModifiedTime().
== Background ==
While some resources have observeable timestamps (e.g. files stored on disk),
many other resources do not. E.g. config variables, and module definitions.
For static file modules, one can e.g. revert one of more files in a module to a
previous version and not affect the max timestamp.
Wiki modules include pages only if they exist. The user module supports common.js
and skin.js. By default neither exists. If a user has both, and then the
less-recently modified one is deleted, the max-timestamp remains unchanged.
For client-side caching, batch requests use "Math.max" on the relevant timestamps.
Again, if a module changes but another module is more recent (e.g. out-of-order
deployment, or out-of-order discovery), the change would not result in a cache miss.
More scenarios can be found in the associated Phabricator tasks.
== Version hash ==
Previously we virtually mapped these variables to a timestamp by storing the current
time alongside a hash of the value in ObjectCache. Considering the number of
possible request contexts (wikis * modules * users * skins * languages) this doesn't
work well. It results in needless cache invalidation when the first time observation
is purged due to LRU algorithms. It also has other minor bugs leading to fewer
cache hits.
All modules automatically get the benefits of version hashing with this change.
The old getDefinitionMtime() and getHashMtime() have been replaced with dummies
that return 1. These functions are often called from getModifiedTime() in subclasses.
For backward-compatibility, their respective values (definition summary and hash)
are now included in getVersionHash directly.
As examples, the following modules have been updated to use getVersionHash directly.
Other modules still work fine and can be updated later.
* ResourceLoaderFileModule
* ResourceLoaderEditToolbarModule
* ResourceLoaderStartUpModule
* ResourceLoaderWikiModule
The presence of hashes in place of timestamps increases the startup module size on
a default MediaWiki install from 4.4k to 5.8k (after gzip and minification).
== ETag ==
Since timestamps are no longer tracked, we need a different way to implement caching
for cache proxies (e.g. Varnish) and web browsers. Previously we used the
Last-Modified header (in combination with Cache-Control and Expires).
Instead of Last-Modified (and If-Modified-Since), we use ETag (and If-None-Match).
Entity tags (new in HTTP/1.1) are much stricter than Last-Modified by default.
They instruct browsers to allow usage of partial Range requests. Since our responses
are dynamically generated, we need to use the Weak version of ETag.
While this sounds bad, it's no different than Last-Modified. As reassured by
RFC 2616 <http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.3.3> the
specified behaviour behind Last-Modified follows the same "Weak" caching logic as
Entity tags. It's just that entity tags are capable of a stricter mode (whereas
Last-Modified is inherently weak).
== File cache ==
If $wgUseFileCache is enabled, ResourceLoader uses ResourceFileCache to cache
load.php responses. While the blind TTL handling (during the allowed expiry period)
is still maxage/timestamp based, tryRespondNotModified() now requires the caller to
know the expected ETag.
For this to work, the FileCache handling had to be moved from the top of
ResoureLoader::respond() to after the expected ETag is computed.
This also allows us to remove the duplicate tryRespondNotModified() handling since
that's is already handled by ResourceLoader::respond() meanwhile.
== Misc ==
* Remove redundant modifiedTime cache in ResourceLoaderFileModule.
* Change bugzilla references to Phabricator.
* Centralised inclusion of wgCacheEpoch using getDefinitionSummary. Previously this
logic was duplicated in each place the modified timestamp was used.
* It's easy to forget calling the parent class in getDefinitionSummary().
Previously this method only tracked 'class' by default. As such, various
extensions hardcoded that one value instead of calling the parent and extending
the array. To better prevent this in the future, getVersionHash() now asserts
that the '_cacheEpoch' property made it through.
* tests: Don't use getDefinitionSummary() as an API.
Fix ResourceLoaderWikiModuleTest to call getPages properly.
* In tests, the default timestamp used to be 1388534400000 (which is the unix time
of 20140101000000; the unit tests' CacheEpoch). The new version hash of these
modules is "XyCC+PSK", which is the base64 encoded prefix of the SHA1 digest of:
'{"_class":"ResourceLoaderTestModule","_cacheEpoch":"20140101000000"}'
* Add sha1.js library for client-side hash generation.
Compared various different implementations for code size (after minfication/gzip),
and speed (when used for short hexidecimal strings).
https://jsperf.com/sha1-implementations
- CryptoJS <https://code.google.com/p/crypto-js/#SHA-1> (min+gzip: 2.5k)
http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha1.js
Chrome: 45k, Firefox: 89k, Safari: 92k
- jsSHA <https://github.com/Caligatio/jsSHA>
https://github.com/Caligatio/jsSHA/blob/3c1d4f2e/src/sha1.js (min+gzip: 1.8k)
Chrome: 65k, Firefox: 53k, Safari: 69k
- phpjs-sha1 <https://github.com/kvz/phpjs> (RL min+gzip: 0.8k)
https://github.com/kvz/phpjs/blob/1eaab15d/functions/strings/sha1.js
Chrome: 200k, Firefox: 280k, Safari: 78k
Modern browsers implement the HTML5 Crypto API. However, this API is asynchronous,
only enabled when on HTTPS in Chromium, and is quite low-level. It requires boilerplate
code to actually use with TextEncoder, ArrayBuffer and Uint32Array. Due this being
needed in the module loader, we'd have to load the fallback regardless. Considering
this is not used in a critical path for performance, it's not worth shipping two
implementations for this optimisation.
May also resolve:
* T44094
* T90411
* T94810
Bug: T94074
Change-Id: Ibb292d2416839327d1807a66c78fd96dac0637d0
2015-04-29 22:53:24 +00:00
|
|
|
* @see ResourceLoaderModule::getVersionHash
|
resourceloader: Move queue formatting out of OutputPage
HTML formatting of the queue was distributed over several OutputPage methods.
Each method demanding a snippet of HTML by calling makeResourceLoaderLink()
with a limited amount of information. As such, makeResourceLoaderLink() was
unable to provide the client with the proper state information.
Centralising it also allows it to better reduce duplication in HTML output
and maintain a more accurate state.
Problems fixed by centralising:
1. The 'user' module is special (due to per-user 'version' and 'user' params).
It is manually requested via script-src. To avoid a separate (and wrong)
request from something that requires it, we set state=loading directly.
However, because the module is in the bottom, the old HTML formatter could
only put state=loading in the bottom also. This sometimes caused a wrong
request to be fired for modules=user if something in the top queue
triggered a requirement for it.
2. Since a464d1d4 (T87871) we track states of page-style modules, with purpose
of allowing dependencies on style modules without risking duplicate loading
on pages where the styles are loaded already. This didn't work, because the
state information about page-style modules is output near the stylesheet,
which is after the script tag with mw.loader.load(). That runs first, and
mw.loader would still make a duplicate request before it learns the state.
Changes:
* Document reasons for style/script tag order in getHeadHtml (per 09537e83).
* Pass $type from getModuleStyles() to getAllowedModules(). This wasn't needed
before since a duplicate check in makeResourceLoaderLink() verified the
origin a second time.
* Declare explicit position 'top' on 'user.options' and 'user.tokens' module.
Previously, OutputPage hardcoded them in the top. The new formatter doesn't.
* Remove getHeadScripts().
* Remove getInlineHeadScripts().
* Remove getExternalHeadScripts().
* Remove buildCssLinks().
* Remove getScriptsForBottomQueue().
* Change where Skin::setupSkinUserCss() is called. This methods lets the skin
add modules to the queue. Previously it was called from buildCssLinks(),
via headElement(), via prepareQuickTemplate(), via OutputPage::output().
It's now in OutputPage::output() directly (slightly earlier). This is needed
because prepareQuickTemplate() calls bottomScripts() before headElement().
And bottomScript() would lazy-initialise the queue and lock it before
setupSkinUserCss() is called from headElement().
This makes execution order more predictable instead of being dependent on
the arbitrary order of data extraction in prepareQuickTemplate (which varies
from one skin to another).
* Compute isUserModulePreview() and isKnownEmpty() for the 'user' module early
on so. This avoids wrongful loading and fixes problem 1.
Effective changes in output:
* mw.loader.state() is now before mw.loader.load(). This fixes problem 2.
* mw.loader.state() now sets 'user.options' and 'user.tokens' to "loading".
* mw.loader.state() now sets 'user' (as "loading" or "ready"). Fixes problem 1.
* The <script async src> tag for 'startup' changed position (slightly).
Previously it was after all inline scripts and stylesheets. It's still after
all inline scripts and after most stylesheets, but before any user styles.
Since the queue is now formatted outside OutputPage, it can't inject the
meta-ResourceLoaderDynamicStyles tag and user-stylesheet hack in the middle
of existing output. This shouldn't have any noticable impact.
Bug: T87871
Change-Id: I605b8cd1e1fc009b4662a0edbc54d09dd65ee1df
2016-07-15 14:13:09 +00:00
|
|
|
* @see ResourceLoaderClientHtml::makeLoad
|
2014-04-20 21:33:05 +00:00
|
|
|
* @return string|null
|
2011-05-21 17:45:20 +00:00
|
|
|
*/
|
2010-09-13 23:19:05 +00:00
|
|
|
public function getVersion() {
|
|
|
|
|
return $this->version;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-11 19:16:29 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
|
|
|
|
public function getRaw() {
|
|
|
|
|
return $this->raw;
|
|
|
|
|
}
|
|
|
|
|
|
2014-11-11 19:50:44 +00:00
|
|
|
/**
|
|
|
|
|
* @return string|null
|
|
|
|
|
*/
|
|
|
|
|
public function getImage() {
|
|
|
|
|
return $this->image;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @return string|null
|
|
|
|
|
*/
|
|
|
|
|
public function getVariant() {
|
|
|
|
|
return $this->variant;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* @return string|null
|
|
|
|
|
*/
|
|
|
|
|
public function getFormat() {
|
|
|
|
|
return $this->format;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* If this is a request for an image, get the ResourceLoaderImage object.
|
|
|
|
|
*
|
|
|
|
|
* @since 1.25
|
|
|
|
|
* @return ResourceLoaderImage|bool false if a valid object cannot be created
|
|
|
|
|
*/
|
|
|
|
|
public function getImageObj() {
|
|
|
|
|
if ( $this->imageObj === null ) {
|
|
|
|
|
$this->imageObj = false;
|
|
|
|
|
|
|
|
|
|
if ( !$this->image ) {
|
|
|
|
|
return $this->imageObj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$modules = $this->getModules();
|
|
|
|
|
if ( count( $modules ) !== 1 ) {
|
|
|
|
|
return $this->imageObj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$module = $this->getResourceLoader()->getModule( $modules[0] );
|
|
|
|
|
if ( !$module || !$module instanceof ResourceLoaderImageModule ) {
|
|
|
|
|
return $this->imageObj;
|
|
|
|
|
}
|
|
|
|
|
|
2015-06-05 22:26:56 +00:00
|
|
|
$image = $module->getImage( $this->image, $this );
|
2014-11-11 19:50:44 +00:00
|
|
|
if ( !$image ) {
|
|
|
|
|
return $this->imageObj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$this->imageObj = $image;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $this->imageObj;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function shouldIncludeScripts() {
|
2015-06-10 17:43:32 +00:00
|
|
|
return $this->getOnly() === null || $this->getOnly() === 'scripts';
|
2010-09-04 04:00:09 +00:00
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function shouldIncludeStyles() {
|
2015-06-10 17:43:32 +00:00
|
|
|
return $this->getOnly() === null || $this->getOnly() === 'styles';
|
2010-09-04 04:00:09 +00:00
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
|
|
|
|
* @return bool
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function shouldIncludeMessages() {
|
2015-06-10 17:43:32 +00:00
|
|
|
return $this->getOnly() === null;
|
2010-09-04 04:00:09 +00:00
|
|
|
}
|
2010-09-04 12:53:01 +00:00
|
|
|
|
2011-05-21 17:45:20 +00:00
|
|
|
/**
|
2015-11-17 21:11:19 +00:00
|
|
|
* All factors that uniquely identify this request, except 'modules'.
|
|
|
|
|
*
|
|
|
|
|
* The list of modules is excluded here for legacy reasons as most callers already
|
|
|
|
|
* split up handling of individual modules. Including it here would massively fragment
|
|
|
|
|
* the cache and decrease its usefulness.
|
|
|
|
|
*
|
|
|
|
|
* E.g. Used by RequestFileCache to form a cache key for storing the reponse output.
|
|
|
|
|
*
|
2011-05-21 17:45:20 +00:00
|
|
|
* @return string
|
|
|
|
|
*/
|
2010-09-04 04:00:09 +00:00
|
|
|
public function getHash() {
|
2011-02-19 16:48:05 +00:00
|
|
|
if ( !isset( $this->hash ) ) {
|
2016-02-17 09:09:32 +00:00
|
|
|
$this->hash = implode( '|', [
|
2015-11-17 21:14:17 +00:00
|
|
|
// Module content vary
|
|
|
|
|
$this->getLanguage(),
|
|
|
|
|
$this->getSkin(),
|
|
|
|
|
$this->getDebug(),
|
|
|
|
|
$this->getUser(),
|
|
|
|
|
// Request vary
|
|
|
|
|
$this->getOnly(),
|
|
|
|
|
$this->getVersion(),
|
2015-11-17 21:15:24 +00:00
|
|
|
$this->getRaw(),
|
2015-11-17 21:14:17 +00:00
|
|
|
$this->getImage(),
|
|
|
|
|
$this->getVariant(),
|
|
|
|
|
$this->getFormat(),
|
2016-02-17 09:09:32 +00:00
|
|
|
] );
|
2010-09-17 11:45:49 +00:00
|
|
|
}
|
|
|
|
|
return $this->hash;
|
2010-09-04 04:00:09 +00:00
|
|
|
}
|
2010-09-17 11:45:49 +00:00
|
|
|
}
|