mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +02:00
This is a rollup of all the patches that have landed on the cedar project branch:891252fdd0Bug 1492475 - Part 1: Migrate most, if not all nsSearchService consumers to use async APIs. r=florian79b2eb2367Bug 1492475 - Part 2: Move nsIBrowserSearchService.idl to toolkit/components/search/nsISearchService.idl and update references. r=floriana947d3cdf0Bug 1492475 - Part 3: The search service init() method should simply return a Promise. r=florianc1e172dfacBug 1492475 - Part 4: Remove the synchronous initialization flow. r=floriancd41189eacBug 1492475 - Part 5: Since async initialization of the search service now is implicit behavior, remove the distinctive verbiage used internally. r=florian2ae7189dfaBug 1492475 - Part 6: Update the cache build task to work with an actual Promise and re-initialize only once at the same time - all to fix race conditions here. r=florianc8ee92973fBug 1492475 - Part 7: Make the region fetch not block the init flow, to ensure it's as fast as possible. r=florianc44e674e16Bug 1492475 - Part 8: Introduce an init flag, which can only be used privately, that allows to explicitly skip waiting for the region check process to complete. r=florian6c79eaf1d3Bug 1492475 - Part 9: Update unit tests to stop using 'currentEngine', in favor of 'defaultEngine'. r=Standard821b3aa17eeBug 1492475 - Part 10: Update unit tests to be fully aware of the new, async signatures of the search service API and remove sync init flow tests. r=mkaply,floriance5ba69019Bug 1492475 - Part 11: Repair incorrect usage of the `identifier` property of nsISearchEngine instances. r=florianfd177a7994Bug 1518543 - Fix up the Android (Fennec) nsISearchService shim to work with the new asynchronous API. r=florian3653d8ee22Bug 1523708 - Change the search service interaction in the show-heartbeat action to use the new async API. r=florian Differential Revision: https://phabricator.services.mozilla.com/D18355 --HG-- rename : netwerk/base/nsIBrowserSearchService.idl => toolkit/components/search/nsISearchService.idl extra : moz-landing-system : lando
385 lines
12 KiB
JavaScript
385 lines
12 KiB
JavaScript
const {FilterExpressions} = ChromeUtils.import("resource://gre/modules/components-utils/FilterExpressions.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "ASRouterPreferences",
|
|
"resource://activity-stream/lib/ASRouterPreferences.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "AddonManager",
|
|
"resource://gre/modules/AddonManager.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "NewTabUtils",
|
|
"resource://gre/modules/NewTabUtils.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "ProfileAge",
|
|
"resource://gre/modules/ProfileAge.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "ShellService",
|
|
"resource:///modules/ShellService.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "TelemetryEnvironment",
|
|
"resource://gre/modules/TelemetryEnvironment.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "AppConstants",
|
|
"resource://gre/modules/AppConstants.jsm");
|
|
ChromeUtils.defineModuleGetter(this, "AttributionCode",
|
|
"resource:///modules/AttributionCode.jsm");
|
|
|
|
const FXA_USERNAME_PREF = "services.sync.username";
|
|
const SEARCH_REGION_PREF = "browser.search.region";
|
|
const MOZ_JEXL_FILEPATH = "mozjexl";
|
|
|
|
const {activityStreamProvider: asProvider} = NewTabUtils;
|
|
|
|
const FRECENT_SITES_UPDATE_INTERVAL = 6 * 60 * 60 * 1000; // Six hours
|
|
const FRECENT_SITES_IGNORE_BLOCKED = false;
|
|
const FRECENT_SITES_NUM_ITEMS = 25;
|
|
const FRECENT_SITES_MIN_FRECENCY = 100;
|
|
|
|
/**
|
|
* CachedTargetingGetter
|
|
* @param property {string} Name of the method called on ActivityStreamProvider
|
|
* @param options {{}?} Options object passsed to ActivityStreamProvider method
|
|
* @param updateInterval {number?} Update interval for query. Defaults to FRECENT_SITES_UPDATE_INTERVAL
|
|
*/
|
|
function CachedTargetingGetter(property, options = null, updateInterval = FRECENT_SITES_UPDATE_INTERVAL) {
|
|
return {
|
|
_lastUpdated: 0,
|
|
_value: null,
|
|
// For testing
|
|
expire() {
|
|
this._lastUpdated = 0;
|
|
this._value = null;
|
|
},
|
|
get() {
|
|
return new Promise(async (resolve, reject) => {
|
|
const now = Date.now();
|
|
if (now - this._lastUpdated >= updateInterval) {
|
|
try {
|
|
this._value = await asProvider[property](options);
|
|
this._lastUpdated = now;
|
|
} catch (e) {
|
|
Cu.reportError(e);
|
|
reject(e);
|
|
}
|
|
}
|
|
resolve(this._value);
|
|
});
|
|
},
|
|
};
|
|
}
|
|
|
|
function CheckBrowserNeedsUpdate(updateInterval = FRECENT_SITES_UPDATE_INTERVAL) {
|
|
const UpdateChecker = Cc["@mozilla.org/updates/update-checker;1"];
|
|
const checker = {
|
|
_lastUpdated: 0,
|
|
_value: null,
|
|
// For testing. Avoid update check network call.
|
|
setUp(value) {
|
|
this._lastUpdated = Date.now();
|
|
this._value = value;
|
|
},
|
|
expire() {
|
|
this._lastUpdated = 0;
|
|
this._value = null;
|
|
},
|
|
get() {
|
|
return new Promise((resolve, reject) => {
|
|
const now = Date.now();
|
|
const updateServiceListener = {
|
|
onCheckComplete(request, updates, updateCount) {
|
|
checker._value = updateCount > 0;
|
|
resolve(checker._value);
|
|
},
|
|
onError(request, update) {
|
|
reject(request);
|
|
},
|
|
|
|
QueryInterface: ChromeUtils.generateQI(["nsIUpdateCheckListener"]),
|
|
};
|
|
|
|
if (UpdateChecker && (now - this._lastUpdated >= updateInterval)) {
|
|
const checkerInstance = UpdateChecker.createInstance(Ci.nsIUpdateChecker);
|
|
checkerInstance.checkForUpdates(updateServiceListener, true);
|
|
this._lastUpdated = now;
|
|
} else {
|
|
resolve(this._value);
|
|
}
|
|
});
|
|
},
|
|
};
|
|
|
|
return checker;
|
|
}
|
|
|
|
const QueryCache = {
|
|
expireAll() {
|
|
Object.keys(this.queries).forEach(query => {
|
|
this.queries[query].expire();
|
|
});
|
|
},
|
|
queries: {
|
|
TopFrecentSites: new CachedTargetingGetter(
|
|
"getTopFrecentSites",
|
|
{
|
|
ignoreBlocked: FRECENT_SITES_IGNORE_BLOCKED,
|
|
numItems: FRECENT_SITES_NUM_ITEMS,
|
|
topsiteFrecency: FRECENT_SITES_MIN_FRECENCY,
|
|
onePerDomain: true,
|
|
includeFavicon: false,
|
|
}
|
|
),
|
|
TotalBookmarksCount: new CachedTargetingGetter("getTotalBookmarksCount"),
|
|
CheckBrowserNeedsUpdate: new CheckBrowserNeedsUpdate(),
|
|
},
|
|
};
|
|
|
|
/**
|
|
* sortMessagesByWeightedRank
|
|
*
|
|
* Each message has an associated weight, which is guaranteed to be strictly
|
|
* positive. Sort the messages so that higher weighted messages are more likely
|
|
* to come first.
|
|
*
|
|
* Specifically, sort them so that the probability of message x_1 with weight
|
|
* w_1 appearing before message x_2 with weight w_2 is (w_1 / (w_1 + w_2)).
|
|
*
|
|
* This is equivalent to requiring that x_1 appearing before x_2 is (w_1 / w_2)
|
|
* "times" as likely as x_2 appearing before x_1.
|
|
*
|
|
* See Bug 1484996, Comment 2 for a justification of the method.
|
|
*
|
|
* @param {Array} messages - A non-empty array of messages to sort, all with
|
|
* strictly positive weights
|
|
* @returns the sorted array
|
|
*/
|
|
function sortMessagesByWeightedRank(messages) {
|
|
return messages
|
|
.map(message => ({message, rank: Math.pow(Math.random(), 1 / message.weight)}))
|
|
.sort((a, b) => b.rank - a.rank)
|
|
.map(({message}) => message);
|
|
}
|
|
|
|
/**
|
|
* Messages with targeting should get evaluated first, this way we can have
|
|
* fallback messages (no targeting at all) that will show up if nothing else
|
|
* matched
|
|
*/
|
|
function sortMessagesByTargeting(messages) {
|
|
return messages.sort((a, b) => {
|
|
if (a.targeting && !b.targeting) {
|
|
return -1;
|
|
}
|
|
if (!a.targeting && b.targeting) {
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
});
|
|
}
|
|
|
|
const TargetingGetters = {
|
|
get locale() {
|
|
return Services.locale.appLocaleAsLangTag;
|
|
},
|
|
get localeLanguageCode() {
|
|
return Services.locale.appLocaleAsLangTag && Services.locale.appLocaleAsLangTag.substr(0, 2);
|
|
},
|
|
get browserSettings() {
|
|
const {settings} = TelemetryEnvironment.currentEnvironment;
|
|
return {
|
|
// This way of getting attribution is deprecated - use atttributionData instead
|
|
attribution: settings.attribution,
|
|
update: settings.update,
|
|
};
|
|
},
|
|
get attributionData() {
|
|
// Attribution is determined at startup - so we can use the cached attribution at this point
|
|
return AttributionCode.getCachedAttributionData();
|
|
},
|
|
get currentDate() {
|
|
return new Date();
|
|
},
|
|
get profileAgeCreated() {
|
|
return ProfileAge().then(times => times.created);
|
|
},
|
|
get profileAgeReset() {
|
|
return ProfileAge().then(times => times.reset);
|
|
},
|
|
get usesFirefoxSync() {
|
|
return Services.prefs.prefHasUserValue(FXA_USERNAME_PREF);
|
|
},
|
|
get sync() {
|
|
return {
|
|
desktopDevices: Services.prefs.getIntPref("services.sync.clients.devices.desktop", 0),
|
|
mobileDevices: Services.prefs.getIntPref("services.sync.clients.devices.mobile", 0),
|
|
totalDevices: Services.prefs.getIntPref("services.sync.numClients", 0),
|
|
};
|
|
},
|
|
get xpinstallEnabled() {
|
|
// This is needed for all add-on recommendations, to know if we allow xpi installs in the first place
|
|
return Services.prefs.getBoolPref("xpinstall.enabled", true);
|
|
},
|
|
get addonsInfo() {
|
|
return AddonManager.getActiveAddons(["extension", "service"])
|
|
.then(({addons, fullData}) => {
|
|
const info = {};
|
|
for (const addon of addons) {
|
|
info[addon.id] = {
|
|
version: addon.version,
|
|
type: addon.type,
|
|
isSystem: addon.isSystem,
|
|
isWebExtension: addon.isWebExtension,
|
|
};
|
|
if (fullData) {
|
|
Object.assign(info[addon.id], {
|
|
name: addon.name,
|
|
userDisabled: addon.userDisabled,
|
|
installDate: addon.installDate,
|
|
});
|
|
}
|
|
}
|
|
return {addons: info, isFullData: fullData};
|
|
});
|
|
},
|
|
get searchEngines() {
|
|
return new Promise(resolve => {
|
|
// Note: calling init ensures this code is only executed after Search has been initialized
|
|
Services.search.getVisibleEngines().then(engines => {
|
|
resolve({
|
|
current: Services.search.defaultEngine.identifier,
|
|
installed: engines
|
|
.map(engine => engine.identifier)
|
|
.filter(engine => engine),
|
|
});
|
|
}).catch(() => resolve({installed: [], current: ""}));
|
|
});
|
|
},
|
|
get isDefaultBrowser() {
|
|
try {
|
|
return ShellService.isDefaultBrowser();
|
|
} catch (e) {}
|
|
return null;
|
|
},
|
|
get devToolsOpenedCount() {
|
|
return Services.prefs.getIntPref("devtools.selfxss.count");
|
|
},
|
|
get topFrecentSites() {
|
|
return QueryCache.queries.TopFrecentSites.get().then(sites => sites.map(site => (
|
|
{
|
|
url: site.url,
|
|
host: (new URL(site.url)).hostname,
|
|
frecency: site.frecency,
|
|
lastVisitDate: site.lastVisitDate,
|
|
}
|
|
)));
|
|
},
|
|
get pinnedSites() {
|
|
return NewTabUtils.pinnedLinks.links.map(site => (site ? {
|
|
url: site.url,
|
|
host: (new URL(site.url)).hostname,
|
|
searchTopSite: site.searchTopSite,
|
|
} : {}));
|
|
},
|
|
get providerCohorts() {
|
|
return ASRouterPreferences.providers.reduce((prev, current) => {
|
|
prev[current.id] = current.cohort || "";
|
|
return prev;
|
|
}, {});
|
|
},
|
|
get totalBookmarksCount() {
|
|
return QueryCache.queries.TotalBookmarksCount.get();
|
|
},
|
|
get firefoxVersion() {
|
|
return parseInt(AppConstants.MOZ_APP_VERSION.match(/\d+/), 10);
|
|
},
|
|
get region() {
|
|
return Services.prefs.getStringPref(SEARCH_REGION_PREF, "");
|
|
},
|
|
get needsUpdate() {
|
|
return QueryCache.queries.CheckBrowserNeedsUpdate.get();
|
|
},
|
|
};
|
|
|
|
this.ASRouterTargeting = {
|
|
Environment: TargetingGetters,
|
|
|
|
ERROR_TYPES: {
|
|
MALFORMED_EXPRESSION: "MALFORMED_EXPRESSION",
|
|
OTHER_ERROR: "OTHER_ERROR",
|
|
},
|
|
|
|
isMatch(filterExpression, customContext) {
|
|
let context = this.Environment;
|
|
if (customContext) {
|
|
context = {};
|
|
Object.defineProperties(context, Object.getOwnPropertyDescriptors(this.Environment));
|
|
Object.defineProperties(context, Object.getOwnPropertyDescriptors(customContext));
|
|
}
|
|
|
|
return FilterExpressions.eval(filterExpression, context);
|
|
},
|
|
|
|
isTriggerMatch(trigger = {}, candidateMessageTrigger = {}) {
|
|
if (trigger.id !== candidateMessageTrigger.id) {
|
|
return false;
|
|
} else if (!candidateMessageTrigger.params) {
|
|
return true;
|
|
}
|
|
return candidateMessageTrigger.params.includes(trigger.param);
|
|
},
|
|
|
|
/**
|
|
* checkMessageTargeting - Checks is a message's targeting parameters are satisfied
|
|
*
|
|
* @param {*} message An AS router message
|
|
* @param {obj} context A FilterExpression context
|
|
* @param {func} onError A function to handle errors (takes two params; error, message)
|
|
* @returns
|
|
*/
|
|
async checkMessageTargeting(message, context, onError) {
|
|
// If no targeting is specified,
|
|
if (!message.targeting) {
|
|
return true;
|
|
}
|
|
let result;
|
|
try {
|
|
result = await this.isMatch(message.targeting, context);
|
|
} catch (error) {
|
|
Cu.reportError(error);
|
|
if (onError) {
|
|
const type = error.fileName.includes(MOZ_JEXL_FILEPATH) ? this.ERROR_TYPES.MALFORMED_EXPRESSION : this.ERROR_TYPES.OTHER_ERROR;
|
|
onError(type, error, message);
|
|
}
|
|
result = false;
|
|
}
|
|
return result;
|
|
},
|
|
|
|
/**
|
|
* findMatchingMessage - Given an array of messages, returns one message
|
|
* whos targeting expression evaluates to true
|
|
*
|
|
* @param {Array} messages An array of AS router messages
|
|
* @param {obj} impressions An object containing impressions, where keys are message ids
|
|
* @param {trigger} string A trigger expression if a message for that trigger is desired
|
|
* @param {obj|null} context A FilterExpression context. Defaults to TargetingGetters above.
|
|
* @returns {obj} an AS router message
|
|
*/
|
|
async findMatchingMessage({messages, trigger, context, onError}) {
|
|
const weightSortedMessages = sortMessagesByWeightedRank([...messages]);
|
|
const sortedMessages = sortMessagesByTargeting(weightSortedMessages);
|
|
|
|
for (const candidate of sortedMessages) {
|
|
if (
|
|
candidate &&
|
|
(trigger ? this.isTriggerMatch(trigger, candidate.trigger) : !candidate.trigger) &&
|
|
// If a trigger expression was passed to this function, the message should match it.
|
|
// Otherwise, we should choose a message with no trigger property (i.e. a message that can show up at any time)
|
|
await this.checkMessageTargeting(candidate, context, onError)
|
|
) {
|
|
return candidate;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
},
|
|
};
|
|
|
|
// Export for testing
|
|
this.QueryCache = QueryCache;
|
|
this.CachedTargetingGetter = CachedTargetingGetter;
|
|
this.EXPORTED_SYMBOLS = ["ASRouterTargeting", "QueryCache", "CachedTargetingGetter"];
|