fix(main): W1 四项修复
- updater: applyUpdateSchedule 记忆 interval,未变化不重建定时器 - updater: startupArmed 进程首次调用即消费,中途拨开只影响周期定时器 - settingsStore: LEGACY_BUILTIN_PATTERNS 补 url 预设(唯一漏登记项) - release.cjs: --channel-only 与 --skip-gitea 组合 fail-fast exit 1
This commit is contained in:
1 parent
9036bea6f3
commit
69d24fbed6
5 files changed
+147
-23
No files matched your search
@@ -493,6 +493,15 @@ console.log('[preset refresh]')
|
||||
okstate?.priority === 10 && okstate?.color.fg === '#123456' && okstate?.enabled === true,
|
||||
'a refreshed rule keeps the priority, colour and switch the user left it at'
|
||||
)
|
||||
// The very first url preset (https?:// only, widened by ftp/www alternation
|
||||
// later) is a registered legacy pattern too — an early install upgrades
|
||||
// exactly like okstate above. This regressed silently before the url entry
|
||||
// was added to LEGACY_BUILTIN_PATTERNS.
|
||||
const url = upgraded.find((r) => r.id === 'url')
|
||||
ok(
|
||||
typeof url?.pattern === 'string' && url.pattern.includes('ftp://') && url.pattern !== V1.url,
|
||||
'the early url preset (https?:// only) is refreshed to the current one'
|
||||
)
|
||||
const addedSince = [
|
||||
'warnstate',
|
||||
'danger',
|
||||
@@ -524,6 +533,14 @@ console.log('[preset refresh]')
|
||||
'a hand-edited built-in rule is left alone'
|
||||
)
|
||||
|
||||
// The legacy url pattern on a NON-builtin rule must not be refreshed either.
|
||||
const nonBuiltin = v1Set().map((r) => (r.id === 'url' ? { ...r, builtin: false } : r))
|
||||
const afterNonBuiltin = (await roundTrip({ highlightRules: nonBuiltin })).highlightRules
|
||||
ok(
|
||||
afterNonBuiltin.find((r) => r.id === 'url')?.pattern === V1.url,
|
||||
'the legacy url pattern on a non-builtin rule is left alone'
|
||||
)
|
||||
|
||||
// ...and so must a rule the user deleted: it must not come back.
|
||||
const pruned = v1Set().filter((r) => r.id !== 'numbers')
|
||||
const afterPrune = (await roundTrip({ highlightRules: pruned })).highlightRules
|
||||
|
||||
@@ -591,9 +591,10 @@ console.log('install')
|
||||
* release at a time, is dropped by a manual check and is replaced wholesale
|
||||
* when a different version shows up — so each scenario uses its own version
|
||||
* number (7.x and 9.9.9 are spent by section 7), or starts from a manual check;
|
||||
* - the "startup check armed" flag is per run too: the first `applyUpdateSchedule`
|
||||
* that allows startup checks is the only one that can arm it, which is why
|
||||
* sections 10-13 run in this order.
|
||||
* - the "startup check armed" flag is consumed by the process's FIRST
|
||||
* `applyUpdateSchedule` call regardless of the startup toggle; the sections
|
||||
* below replay "the first apply of a run" through the __resetStartupArmForTests
|
||||
* seam, so their relative order no longer encodes the arming state.
|
||||
* `reset()` re-points the feeds and the check/download doubles, so those do not
|
||||
* leak between sections.
|
||||
*/
|
||||
@@ -677,6 +678,9 @@ console.log('interval 0: the periodic check is off, the startup check still runs
|
||||
ctl.checkForUpdates = recordCheck
|
||||
fetchImpl = () => Promise.resolve(errResponse(503))
|
||||
|
||||
// Replay the first apply of a run with the toggle already on (the section
|
||||
// above consumed the real one with the toggle off).
|
||||
updater.__resetStartupArmForTests()
|
||||
const from = checkLog.length
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: true, updateCheckIntervalHours: 0 })
|
||||
await sleep(150)
|
||||
@@ -686,6 +690,64 @@ console.log('interval 0: the periodic check is off, the startup check still runs
|
||||
ok(startupChecks() === 1, 'the run has seen its startup check exactly once')
|
||||
}
|
||||
|
||||
console.log('a settings save that keeps the interval does not restart the countdown')
|
||||
{
|
||||
reset()
|
||||
stub.__setPackaged(true)
|
||||
updater.setUpdateTimeouts({ startupDelay: 20, hour: 5 })
|
||||
writeSystem({ autoCheckUpdate: false, updateCheckIntervalHours: 24, autoDownloadUpdate: false })
|
||||
ctl.checkForUpdates = recordCheck
|
||||
fetchImpl = () => Promise.resolve(errResponse(503))
|
||||
|
||||
// 24h at 5ms/hour = a 120ms period. The first apply starts the countdown;
|
||||
// 50ms in — mid-period — an unrelated settings save re-runs the applier with
|
||||
// the very same interval. If that rebuilt the timer, the next tick would land
|
||||
// a full period after the re-apply (~120ms); if the countdown survives, it
|
||||
// lands ~70ms after it.
|
||||
const from = checkLog.length
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: false, updateCheckIntervalHours: 24 })
|
||||
await sleep(50)
|
||||
const reappliedAt = checkLog.length // === from: mid-period, nothing fired yet
|
||||
const reappliedWall = Date.now()
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: false, updateCheckIntervalHours: 24 })
|
||||
let guard = 0
|
||||
while (checkLog.length === reappliedAt && guard++ < 200) await sleep(5)
|
||||
const gap = Date.now() - reappliedWall
|
||||
ok(checkLog.length > reappliedAt, 'the periodic timer kept ticking across the re-apply')
|
||||
ok(gap < 100, `the countdown was not restarted (next tick ${gap}ms after the re-apply; a restart would be ~120ms)`)
|
||||
|
||||
// Leave the section clean: stop the timer so its phase cannot bleed into the
|
||||
// cadence section below.
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: false, updateCheckIntervalHours: 0 })
|
||||
}
|
||||
|
||||
console.log('enabling the startup check mid-session does not fire a startup check')
|
||||
{
|
||||
reset()
|
||||
stub.__setPackaged(true)
|
||||
updater.setUpdateTimeouts({ startupDelay: 20, hour: 5 })
|
||||
writeSystem({ autoCheckUpdate: false, updateCheckIntervalHours: 0, autoDownloadUpdate: false })
|
||||
ctl.checkForUpdates = recordCheck
|
||||
fetchImpl = () => Promise.resolve(errResponse(503))
|
||||
|
||||
// Replay a run whose FIRST apply sees the toggle off: the arming is consumed
|
||||
// silently. Flipping the toggle on later must arm only future behavior (the
|
||||
// periodic timer), never retroactively fire a "startup" check hours into the
|
||||
// session — the settings label promises a check *at startup*.
|
||||
updater.__resetStartupArmForTests()
|
||||
const before = checkLog.length
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: false, updateCheckIntervalHours: 0 })
|
||||
await sleep(60) // well past the 20ms startup delay
|
||||
ok(checkLog.length === before, 'the toggle-off first apply scheduled nothing')
|
||||
|
||||
updater.applyUpdateSchedule({ autoCheckUpdate: true, updateCheckIntervalHours: 0 })
|
||||
await sleep(80)
|
||||
ok(
|
||||
checkLog.length === before && startupChecks() === 1,
|
||||
'enabling mid-session fires no startup check (the earlier section still owns the only one)'
|
||||
)
|
||||
}
|
||||
|
||||
console.log('re-applying the schedule replaces the cadence (and 0 stops it)')
|
||||
{
|
||||
reset()
|
||||
|
||||
Reference in new issue
Block a user