hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial config updates to avoid race clobbering

Browse source 
Updates to the global configuration object happen via storage onChanged
event, however this is not guaranteed to fire before a set() promise
resolves: https://bugzilla.mozilla.org/show_bug.cgi?id=1554088

This can lead to situations where setting multiple values in sequence
can result in a previously scheduled callback clobbering newer settings.
Slightly mitigate races by not replacing the entire object; however this
only helps with flat values and won't catch nested object updates such
as the keymap settings.
This commit is contained in:
arcnmx 2019-07-29 14:24:30 -07:00
parent 798d03890b
commit 1cbf1d3f3f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lib/config.ts
View file

@ -1539,7 +1539,7 @@ const parseConfigHelper = (pconf, parseobj) => {
// Listen for changes to the storage and update the USERCONFIG if appropriate.
// TODO: BUG! Sync and local storage are merged at startup, but not by this thing.
browser.storage.onChanged.addListener(async (changes, areaname) => {
browser.storage.onChanged.addListener((changes, areaname) => {
if (CONFIGNAME in changes) {
const { newValue } = changes[CONFIGNAME]
const old = USERCONFIG
@ -1573,13 +1573,14 @@ browser.storage.onChanged.addListener(async (changes, areaname) => {
) !== JSON.stringify(newValue[k]),
)
USERCONFIG = newValue
// TODO: this should be a deep comparison but this is better than nothing
changedKeys.concat(unsetKeys).forEach(key => USERCONFIG[key] = newValue[key])
// Trigger listeners
unsetKeys.forEach(key => triggerChangeListeners(key, DEFAULTS[key]))
changedKeys.forEach(key => triggerChangeListeners(key))
} else if (areaname === (await get("storageloc"))) {
} else if (areaname === get("storageloc")) {
// If newValue is undefined and AREANAME is the same value as STORAGELOC, the user wants to clean their config
USERCONFIG = o({})