mirror of
https://github.com/tiennm99/claude-code-usage-bubble.git
synced 2026-10-27 22:18:03 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 tiennm99
|
6494740fd1 | ||
|
tiennm99
|
c0bb291754 | ||
|
tiennm99
|
37cf7a3a42 | ||
|
tiennm99
|
15f1120132 | ||
|
tiennm99
|
5462df1e7e | ||
|
tiennm99
|
dfff4ebe9f | ||
|
tiennm99
|
4e2ecbf588 |
No files matched your search
Generated
+2
-1
@@ -4693,12 +4693,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "usage-monitor"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
dependencies = [
|
||||
"auto-launch",
|
||||
"dbus",
|
||||
"dirs 6.0.0",
|
||||
"flate2",
|
||||
"jiff",
|
||||
"libc",
|
||||
"libloading 0.9.0",
|
||||
"log",
|
||||
|
||||
+4
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "usage-monitor"
|
||||
version = "0.8.0"
|
||||
version = "0.9.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Floating bubble showing Claude Code and Codex usage"
|
||||
@@ -23,6 +23,8 @@ tauri-plugin-single-instance = "2"
|
||||
ureq = { version = "3", features = ["platform-verifier", "socks-proxy"] }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
# Local time zone for the clock-aligned poll and update check.
|
||||
jiff = "0.2"
|
||||
dirs = "6"
|
||||
log = "0.4"
|
||||
simplelog = "0.12"
|
||||
@@ -56,6 +58,7 @@ windows = { version = "0.62", features = [
|
||||
"Win32_Foundation",
|
||||
"Win32_System_Registry",
|
||||
"Win32_System_Threading",
|
||||
"Win32_UI_Accessibility",
|
||||
"Win32_UI_WindowsAndMessaging",
|
||||
"Win32_UI_Shell",
|
||||
"Win32_Graphics_Dwm",
|
||||
|
||||
@@ -4,291 +4,160 @@
|
||||
|
||||
# Usage Monitor
|
||||
|
||||
A floating, draggable circular bubble that shows your Claude Code and/or
|
||||
Codex usage on Windows and Linux — inspired by the floating "memory boost
|
||||
ball" UX of 360 Security and IObit Advanced SystemCare.
|
||||
A floating, see-through bubble that shows how much of your Claude Code and
|
||||
Codex limits you have used, on Windows and Linux x86_64. Linux ARM64 and macOS
|
||||
are not supported yet; see [ROADMAP.md](ROADMAP.md).
|
||||
|
||||
Drop it anywhere on screen, drag it around, snap it to a monitor edge,
|
||||
left-click for a panel with both your 5-hour and 7-day windows, right-click
|
||||
for the menu.
|
||||
## Features
|
||||
|
||||
Linux ARM64 and macOS are not supported yet; see [ROADMAP.md](ROADMAP.md).
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
Inspired by [CodeZeno/Claude-Code-Usage-Monitor](https://github.com/CodeZeno/Claude-Code-Usage-Monitor),
|
||||
which solves the same "how close am I to the Claude Code limit?" problem
|
||||
with a horizontal taskbar widget. This project takes the UX in a different
|
||||
direction — a floating, draggable circular bubble that the user can place
|
||||
anywhere on screen — and is a clean-room implementation: the HTTP client,
|
||||
provider polling, credential discovery, tray rendering, and
|
||||
self-updater are all written from scratch against the same public APIs
|
||||
(Anthropic, ChatGPT, GitHub Releases).
|
||||
|
||||
## What you get
|
||||
|
||||
- A see-through floating bubble: a round head showing your current 5-hour
|
||||
Claude Code or Codex usage as a percentage and a colored progress ring,
|
||||
with a slimmer tail holding the 7-day usage and reset bars
|
||||
- Drag anywhere — the bubble snaps to monitor work-area edges when
|
||||
released
|
||||
- Resize with `Ctrl + MouseWheel` on the bubble, or use **Controls** →
|
||||
**Make smaller / Make larger / Reset size** from the right-click menu
|
||||
(140–360 logical pixels)
|
||||
- Left-click the bubble for an expanded panel with both **5h** and **7d**
|
||||
bars plus reset countdowns
|
||||
- Right-click for refresh, displayed providers, update frequency, startup,
|
||||
**Reset position**, updates, **Show widget**, **Click-through**,
|
||||
**Restart** and **Exit**
|
||||
- A system tray icon per enabled provider, with a usage badge
|
||||
- Desktop notifications when usage crosses a threshold, when a sign-in
|
||||
expires and after an update was applied
|
||||
- Auto-hide when a fullscreen app is in the foreground (games, video,
|
||||
presentations) — reappears when you leave fullscreen
|
||||
- Bubbles stay above other always-on-top windows, such as chat
|
||||
notifications: on Windows a covered bubble is raised again within about
|
||||
1.5 s, and on every platform shown bubbles are put back on top every
|
||||
minute, so nothing can keep them covered or hidden
|
||||
|
||||
## Who this is for
|
||||
|
||||
Windows 10/11 and Linux x86_64 users who already have **Claude Code (CLI or
|
||||
App) installed and signed in** on the same machine. Codex support is
|
||||
optional — install and sign in to the Codex CLI, then enable Codex from the
|
||||
right-click **Providers** menu.
|
||||
- **The bubble:** a round head with your 5-hour usage and a progress ring,
|
||||
and a tail with the 7-day usage and time to reset. Left-click it for a
|
||||
panel with both windows and their countdowns.
|
||||
- **Place it anywhere:** drag it, and it snaps to a screen edge when you let
|
||||
go near one. Resize it with `Ctrl` + mouse wheel.
|
||||
- **Always on top:** it stays above other windows, chat notifications
|
||||
included, and hides while a fullscreen app (a game, a video, slides) is
|
||||
in front.
|
||||
- **Click-through:** an option to let clicks pass through the bubble to the
|
||||
window below.
|
||||
- **One bubble per provider:** Claude Code is on by default; Codex is
|
||||
optional.
|
||||
- **Tray and alerts:** a tray icon with a usage badge per provider, and
|
||||
desktop notifications when usage crosses a threshold or a sign-in expires.
|
||||
- **Updates itself:** new releases install automatically.
|
||||
|
||||
## Requirements
|
||||
|
||||
- Windows 10 or Windows 11, or Linux x86_64 (see below)
|
||||
- Claude Code (CLI or App) installed and authenticated
|
||||
- The `claude` CLI, for automatic token refresh. The app looks for it on
|
||||
`PATH`, and on Linux also in `~/.local/bin` and `~/.claude/local`. Without
|
||||
it an expired sign-in is not refreshed and you have to sign in again.
|
||||
- Optional: Codex CLI installed and authenticated, if you want Codex usage.
|
||||
Its token is refreshed through the `codex` CLI, found the same way.
|
||||
|
||||
### Windows
|
||||
|
||||
The app draws its windows with the Microsoft Edge **WebView2 runtime**.
|
||||
Windows 11 ships it, and most up-to-date Windows 10 machines already have it.
|
||||
If it is missing, the app shows a message with the download link and exits;
|
||||
install the
|
||||
[Evergreen WebView2 runtime](https://developer.microsoft.com/microsoft-edge/webview2/)
|
||||
and start the app again.
|
||||
|
||||
### Linux
|
||||
|
||||
- **Runtime libraries:** WebKitGTK 4.1 (`libwebkit2gtk-4.1-0` on
|
||||
Debian/Ubuntu) and, for the tray icons, `libayatana-appindicator3-1`.
|
||||
The `.deb` pulls these in. Without an AppIndicator library the app runs
|
||||
without tray icons.
|
||||
- **A compositing window manager.** The bubble is a transparent window;
|
||||
without a compositor its corners are drawn opaque.
|
||||
- **X11 is the supported session.** Under Wayland the app runs through
|
||||
Xwayland, where positioning, snapping and always-on-top work. Without
|
||||
Xwayland (or with `GDK_BACKEND=wayland` set) the bubbles still show, but
|
||||
they cannot be positioned, snapped, kept on top or saved where you drop
|
||||
them.
|
||||
- **Tray limits:** Linux tray icons (AppIndicator) only open the menu. They
|
||||
show no tooltip, and a left click does not toggle the bubble; use the
|
||||
menu instead.
|
||||
- Windows 10/11, or Linux x86_64.
|
||||
- Claude Code (CLI or app), installed and signed in. The `claude` CLI must
|
||||
be on `PATH` (on Linux, `~/.local/bin` and `~/.claude/local` work too) so
|
||||
the app can refresh an expired sign-in.
|
||||
- For Codex: the Codex CLI, installed and signed in.
|
||||
- **Windows:** the
|
||||
[WebView2 runtime](https://developer.microsoft.com/microsoft-edge/webview2/).
|
||||
Windows 11 and most up-to-date Windows 10 machines have it; if not, the
|
||||
app tells you and exits.
|
||||
- **Linux:**
|
||||
- WebKitGTK 4.1 and `libayatana-appindicator3-1` for the tray icons. The
|
||||
`.deb` installs both.
|
||||
- A compositing window manager, or the bubble's corners are drawn
|
||||
opaque.
|
||||
- An X11 session. Under Wayland the app runs through Xwayland. Without
|
||||
Xwayland the bubbles show, but cannot be positioned, snapped or kept on
|
||||
top.
|
||||
|
||||
## Install
|
||||
|
||||
### Windows
|
||||
Download from the
|
||||
[latest release](https://github.com/tiennm99/usage-monitor/releases/latest).
|
||||
|
||||
Grab `usage-monitor.exe` from the
|
||||
[Releases page](https://github.com/tiennm99/usage-monitor/releases/latest).
|
||||
Put it in a folder of its own that you can write to (e.g.
|
||||
`%LOCALAPPDATA%\UsageMonitor\`) and run it. The app is portable: it keeps
|
||||
`settings.json` next to the exe, so moving the folder keeps your settings. It
|
||||
updates itself from the same Releases feed: when a check finds a new
|
||||
release, it installs it and restarts on its own, with no click needed.
|
||||
- **Windows:** `usage-monitor.exe`. Put it in a folder you can write to,
|
||||
such as `%LOCALAPPDATA%\UsageMonitor\`, and run it. The exe is unsigned:
|
||||
when SmartScreen warns, click **More info** → **Run anyway**.
|
||||
- **Linux AppImage:** `usage-monitor_X.Y.Z_amd64.AppImage`. Put it in a
|
||||
folder you can write to, run `chmod +x` on it, and run it.
|
||||
- **Linux .deb:** `sudo apt install ./usage-monitor_X.Y.Z_amd64.deb`.
|
||||
|
||||
**First-run note:** the binary is unsigned, so SmartScreen will show
|
||||
"Windows protected your PC". Click **More info** → **Run anyway**. Code
|
||||
signing is on the roadmap.
|
||||
The exe and the AppImage are portable: they keep `settings.json` next to
|
||||
themselves.
|
||||
|
||||
### Linux x86_64
|
||||
## Use
|
||||
|
||||
From the same
|
||||
[Releases page](https://github.com/tiennm99/usage-monitor/releases/latest),
|
||||
pick one:
|
||||
- **Left-click** the bubble for the details panel.
|
||||
- **Right-click** the bubble or the tray icon for the menu:
|
||||
- **Refresh**
|
||||
- **Update frequency:** how often usage is fetched.
|
||||
- **Providers:** which bubbles to show.
|
||||
- **Settings:** start at login, **Reset position**, **Check for updates**
|
||||
and the **Auto-update check** interval.
|
||||
- **Controls:** resize.
|
||||
- **Show widget**
|
||||
- **Click-through**
|
||||
- **Restart** and **Exit**
|
||||
- **Tray icon:** a left click shows or hides the bubbles. On Linux any click
|
||||
opens the menu, and there is no tooltip.
|
||||
- **With click-through on**, the bubbles ignore the mouse. Turn it off from
|
||||
the tray menu.
|
||||
|
||||
- `usage-monitor_X.Y.Z_amd64.AppImage`: make it executable
|
||||
(`chmod +x`) and run it. Like the Windows exe it is portable and keeps
|
||||
`settings.json` next to the AppImage file, so give it a folder you can
|
||||
write to. The AppImage updates itself in place, the same way. If you turned on "Start
|
||||
at login" in v0.6.0 or earlier and the AppImage path contains a space,
|
||||
turn it off and on again once: those releases wrote the path unquoted,
|
||||
so the app never started at login.
|
||||
- `usage-monitor_X.Y.Z_amd64.deb`: install it with
|
||||
`sudo apt install ./usage-monitor_X.Y.Z_amd64.deb`. The app
|
||||
still checks for updates, but installing one is left to you: download the
|
||||
new `.deb` and install it the same way.
|
||||
Timers follow your local clock. Every 5 minutes means :00, :05, :10 and so
|
||||
on; hourly means the top of the hour, daily means midnight, and weekly means
|
||||
Monday at midnight.
|
||||
|
||||
### Build from source
|
||||
### Updates
|
||||
|
||||
Prerequisites: the [Rust toolchain](https://www.rust-lang.org/tools/install)
|
||||
and [Node.js](https://nodejs.org/) with npm. The Tauri CLI is a local dev
|
||||
dependency, so `npm ci` installs it.
|
||||
The app checks GitHub Releases on the **Auto-update check** schedule
|
||||
(hourly by default). At launch it checks only if a scheduled time has passed
|
||||
since the last check. A failed check is retried after 1, 2, 4… minutes, but
|
||||
never later than the next scheduled time.
|
||||
|
||||
On Windows:
|
||||
When a check finds a new release, the exe and the AppImage install it and
|
||||
restart on their own. The `.deb` only tells you; install the new `.deb` the
|
||||
same way you installed the first.
|
||||
|
||||
```powershell
|
||||
git clone https://github.com/tiennm99/usage-monitor
|
||||
cd usage-monitor
|
||||
npm ci
|
||||
npm run tauri build -- --no-bundle
|
||||
```
|
||||
## Files and diagnostics
|
||||
|
||||
The binary lands at `target\release\usage-monitor.exe`.
|
||||
Run with `--diagnose` to write a log, which is cleared on each start.
|
||||
|
||||
On Linux x86_64, install the build dependencies first (Debian/Ubuntu):
|
||||
| What | Windows | Linux |
|
||||
|------|---------|-------|
|
||||
| Log (`--diagnose`) | `%TEMP%\usage-monitor.log` | `~/.local/state/usage-monitor/usage-monitor.log` |
|
||||
| Settings | `settings.json` next to the exe | next to the AppImage; for the `.deb`, `~/.config/UsageMonitor/settings.json` |
|
||||
| Update downloads, `update-error.log` | `%LOCALAPPDATA%\UsageMonitor\updates\` | `~/.local/share/UsageMonitor/updates/` |
|
||||
| Web view cache | `%LOCALAPPDATA%\io.github.tiennm99.usagemonitor\` | `~/.local/share/io.github.tiennm99.usagemonitor/` |
|
||||
|
||||
On Linux the `XDG_*` variables move these folders when they are set. On
|
||||
Windows the app also writes `%LOCALAPPDATA%\UsageMonitor\icon.png` and an
|
||||
`HKCU\Software\Classes\AppUserModelId` entry, which notifications from a
|
||||
portable exe need.
|
||||
|
||||
## Privacy
|
||||
|
||||
- **Reads:** your Claude Code credentials (`~/.claude/.credentials.json`)
|
||||
and, with Codex on, your Codex credentials (`$CODEX_HOME/auth.json` or
|
||||
`~/.codex/auth.json`).
|
||||
- **Sends:** usage requests to Anthropic and, with Codex on, to ChatGPT,
|
||||
plus update checks to GitHub Releases. Nothing else: no analytics, no
|
||||
backend, and no credentials sent to any third party.
|
||||
- **Runs:** when a sign-in has expired, `claude -p .` or `codex exec .`
|
||||
runs hidden in the temp folder, so the CLI refreshes its token. Codex runs
|
||||
with `--skip-git-repo-check` and a read-only sandbox. Each run sends one
|
||||
tiny prompt, which counts toward your usage.
|
||||
- **Stores:** bubble positions and size, the menu choices, and the time of
|
||||
the last update check.
|
||||
|
||||
## Build from source
|
||||
|
||||
You need [Rust](https://www.rust-lang.org/tools/install) and
|
||||
[Node.js](https://nodejs.org/). On Debian/Ubuntu, install the build
|
||||
dependencies first:
|
||||
|
||||
```bash
|
||||
sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file \
|
||||
libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev
|
||||
```
|
||||
|
||||
Then:
|
||||
|
||||
```bash
|
||||
git clone https://github.com/tiennm99/usage-monitor
|
||||
cd usage-monitor
|
||||
npm ci
|
||||
npm run tauri build -- --no-bundle
|
||||
```
|
||||
|
||||
The binary lands at `target/release/usage-monitor`. To build the
|
||||
`.deb` and AppImage instead, also install `patchelf` (the AppImage needs it)
|
||||
and run `npm run tauri build -- --bundles deb,appimage`; they land under
|
||||
`target/release/bundle/`.
|
||||
|
||||
Local builds carry no updater signature (`createUpdaterArtifacts` is off in
|
||||
`tauri.conf.json`), so they cannot be published as an update. Only the
|
||||
release workflow signs builds; see
|
||||
The binary lands in `target/release/`. For the `.deb` and AppImage, install
|
||||
`patchelf` and run `npm run tauri build -- --bundles deb,appimage` instead.
|
||||
Local builds are unsigned, so they can't be published as updates; see
|
||||
[docs/release-process.md](docs/release-process.md).
|
||||
|
||||
## Use
|
||||
## Acknowledgements
|
||||
|
||||
Run the app. The bubble appears near the bottom-right corner of your
|
||||
primary monitor on first launch. Drag it where you want it, release to snap
|
||||
to the nearest edge if you let go close to one.
|
||||
|
||||
- **Left-click** the bubble to open the expanded panel (5h + 7d + countdowns)
|
||||
- **Right-click** for **Refresh**, **Update frequency**, **Providers**,
|
||||
**Settings**, **Controls**, **Show widget**, **Click-through**,
|
||||
**Restart** and **Exit**.
|
||||
**Settings** holds "Start with Windows" ("Start at login" on Linux),
|
||||
**Reset position**, a manual **Check for updates** and the
|
||||
**Auto-update check** interval (Disabled / Hourly / Daily / Weekly)
|
||||
- **Drag** anywhere — it floats on top of all other windows
|
||||
- **Ctrl + MouseWheel** on the bubble, or **Controls** in the right-click
|
||||
menu, to resize it
|
||||
- **Tray icon:** left-click toggles the bubble visibility, right-click opens
|
||||
the same menu (on Linux, any click opens the menu)
|
||||
- **Click-through:** when checked, the bubbles ignore the mouse, so clicks
|
||||
reach the windows underneath. You can't drag, resize or right-click a
|
||||
bubble then; uncheck it from the tray icon's menu
|
||||
|
||||
### Providers
|
||||
|
||||
Use the right-click **Providers** menu to choose what is shown:
|
||||
|
||||
- **Claude Code** is enabled by default
|
||||
- **Codex** can be enabled alongside Claude Code or shown by itself
|
||||
|
||||
When multiple providers are shown, each gets its own bubble that you can position
|
||||
independently.
|
||||
|
||||
### Changes from the v0.5.0 Windows build
|
||||
|
||||
The app moved from a hand-written Win32 UI to Tauri. Most behaviour is the
|
||||
same; these differences are visible:
|
||||
|
||||
- The transparent corners around the round bubble no longer pass clicks
|
||||
through to the window below; they just ignore clicks.
|
||||
- Alerts are Windows toast notifications instead of tray balloons, so they
|
||||
no longer use a warning or info icon.
|
||||
- Proxy auto-configuration (PAC scripts and WPAD) is no longer used. A
|
||||
static system proxy, its bypass list and the `HTTPS_PROXY`-style
|
||||
environment variables still are, including a SOCKS `ALL_PROXY` such as
|
||||
`socks5h://127.0.0.1:7890`, for usage requests and updates alike.
|
||||
- Only one copy runs per signed-in user session, instead of one per machine.
|
||||
|
||||
## Diagnostics
|
||||
|
||||
```text
|
||||
usage-monitor.exe --diagnose # Windows
|
||||
usage-monitor --diagnose # Linux .deb (pass the same flag to the AppImage)
|
||||
```
|
||||
|
||||
This writes a log file, truncated on each start, to:
|
||||
|
||||
| OS | Log file |
|
||||
|----|----------|
|
||||
| Windows | `%TEMP%\usage-monitor.log` |
|
||||
| Linux | `$XDG_STATE_HOME/usage-monitor/usage-monitor.log`, usually `~/.local/state/usage-monitor/usage-monitor.log` (readable by your user only) |
|
||||
|
||||
Settings are saved to:
|
||||
|
||||
| OS | Settings file |
|
||||
|----|---------------|
|
||||
| Windows | `settings.json` next to `usage-monitor.exe` |
|
||||
| Linux AppImage | `settings.json` next to the `.AppImage` file |
|
||||
| Linux `.deb` | `$XDG_CONFIG_HOME/UsageMonitor/settings.json`, usually `~/.config/UsageMonitor/settings.json` |
|
||||
|
||||
Other files the app writes:
|
||||
|
||||
| What | Windows | Linux |
|
||||
|------|---------|-------|
|
||||
| Update downloads and `update-error.log` | `%LOCALAPPDATA%\UsageMonitor\updates\` | `~/.local/share/UsageMonitor/updates/` |
|
||||
| Web view profile (cache, storage) | `%LOCALAPPDATA%\io.github.tiennm99.usagemonitor\` (WebView2) | `~/.local/share/io.github.tiennm99.usagemonitor/` (WebKitGTK) |
|
||||
|
||||
On Windows the app also writes its notification icon to
|
||||
`%LOCALAPPDATA%\UsageMonitor\icon.png` and registers it under
|
||||
`HKCU\Software\Classes\AppUserModelId\io.github.tiennm99.usagemonitor`,
|
||||
which Windows needs to show toasts from a portable exe.
|
||||
|
||||
## Privacy and security
|
||||
|
||||
What the app reads:
|
||||
|
||||
- Your local Claude Code OAuth credentials from `~/.claude/.credentials.json`
|
||||
- If Codex is enabled, your local Codex credentials from `$CODEX_HOME/auth.json`
|
||||
or `~/.codex/auth.json`
|
||||
|
||||
What the app sends over the network:
|
||||
|
||||
- Requests to Anthropic's Claude endpoints to read your usage
|
||||
- Requests to ChatGPT's Codex usage endpoint, if Codex is enabled
|
||||
- Requests for `latest.json` from GitHub Releases, hourly by default and at
|
||||
launch when the last check is older than that. A failed check is retried
|
||||
sooner, starting after a minute and backing off up to the interval. Set **Settings** → **Auto-update check** to
|
||||
**Disabled** in the right-click menu to stop them; **Check for updates**
|
||||
still works when you click it.
|
||||
|
||||
What the app runs:
|
||||
|
||||
- When a usage request is rejected because the sign-in has expired, the app
|
||||
runs `claude -p .` for Claude Code and `codex exec .` for Codex, for each
|
||||
provider that was rejected. They run hidden in the background, so the CLI
|
||||
refreshes its token. Each run sends one tiny prompt, which counts toward
|
||||
your usage. The runs use the system temporary folder as their working
|
||||
folder, and Codex runs with `--skip-git-repo-check` and a read-only
|
||||
sandbox.
|
||||
|
||||
What the app stores locally:
|
||||
|
||||
- Bubble position(s) per model
|
||||
- Bubble size
|
||||
- Whether the bubbles are shown (**Show widget**)
|
||||
- Whether the bubbles let clicks through (**Click-through**)
|
||||
- Polling frequency
|
||||
- Auto-update check interval
|
||||
- Last update check time
|
||||
- Displayed provider preferences
|
||||
|
||||
What it does **not** do: send credentials to any third-party server, run a
|
||||
backend service, collect analytics, upload your project files, or write to
|
||||
your Codex `auth.json` directly.
|
||||
Inspired by
|
||||
[CodeZeno/Claude-Code-Usage-Monitor](https://github.com/CodeZeno/Claude-Code-Usage-Monitor),
|
||||
a taskbar widget for the same problem, and by the floating "boost ball" of
|
||||
360 Security and IObit Advanced SystemCare. This is a clean-room
|
||||
implementation against the same public APIs.
|
||||
|
||||
## License
|
||||
|
||||
Apache License 2.0 — see [LICENSE](LICENSE).
|
||||
Apache License 2.0. See [LICENSE](LICENSE).
|
||||
+90
-20
@@ -15,9 +15,7 @@
|
||||
use std::collections::HashMap;
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
use std::sync::{Arc, Mutex, PoisonError};
|
||||
use std::time::Duration;
|
||||
#[cfg(not(windows))]
|
||||
use std::time::Instant;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use tauri::{
|
||||
AppHandle, Manager, Monitor, PhysicalPosition, PhysicalSize, WebviewUrl, WebviewWindow,
|
||||
@@ -351,6 +349,8 @@ pub fn create(app: &AppHandle, provider: ProviderId) -> tauri::Result<()> {
|
||||
set_position(&window, placement.pos);
|
||||
}
|
||||
set_size(&window, placement.size);
|
||||
// Windows applies it on the main thread, in `prepare_native`.
|
||||
#[cfg(not(windows))]
|
||||
if click_through {
|
||||
set_ignore_cursor(&window, true);
|
||||
}
|
||||
@@ -363,7 +363,7 @@ pub fn create(app: &AppHandle, provider: ProviderId) -> tauri::Result<()> {
|
||||
placement.dpi
|
||||
);
|
||||
|
||||
prepare_native(app, &window, provider);
|
||||
prepare_native(app, &window, provider, click_through);
|
||||
#[cfg(target_os = "linux")]
|
||||
if let Some(is_dark) = platform::linux::portal_prefers_dark() {
|
||||
runtime.set_dark(is_dark);
|
||||
@@ -399,13 +399,22 @@ pub fn create(app: &AppHandle, provider: ProviderId) -> tauri::Result<()> {
|
||||
/// move-end, setting-change and display-change messages. Both must run on
|
||||
/// the window's own (main) thread before the first show.
|
||||
#[cfg(windows)]
|
||||
fn prepare_native(app: &AppHandle, window: &WebviewWindow, provider: ProviderId) {
|
||||
fn prepare_native(
|
||||
app: &AppHandle,
|
||||
window: &WebviewWindow,
|
||||
provider: ProviderId,
|
||||
click_through: bool,
|
||||
) {
|
||||
let window = window.clone();
|
||||
let hook_app = app.clone();
|
||||
let queued = app.run_on_main_thread(move || {
|
||||
if let Err(err) = platform::windows::apply_no_activate(&window) {
|
||||
log::warn!("{} may take focus: {err}", window.label());
|
||||
}
|
||||
if click_through {
|
||||
set_ignore_cursor(&window, true);
|
||||
}
|
||||
watch_z_order(&hook_app);
|
||||
let hooked = platform::windows::install_bubble_hook(&window, move |event| {
|
||||
on_hook_event(&hook_app, provider, event);
|
||||
});
|
||||
@@ -419,7 +428,13 @@ fn prepare_native(app: &AppHandle, window: &WebviewWindow, provider: ProviderId)
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn prepare_native(_app: &AppHandle, _window: &WebviewWindow, _provider: ProviderId) {}
|
||||
fn prepare_native(
|
||||
_app: &AppHandle,
|
||||
_window: &WebviewWindow,
|
||||
_provider: ProviderId,
|
||||
_click_through: bool,
|
||||
) {
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn on_hook_event(app: &AppHandle, provider: ProviderId, event: platform::windows::BubbleHookEvent) {
|
||||
@@ -520,24 +535,69 @@ pub fn bring_back(app: &AppHandle) {
|
||||
#[cfg(windows)]
|
||||
pub fn keep_on_top(app: &AppHandle) {
|
||||
let handle = app.clone();
|
||||
let queued = app.run_on_main_thread(move || {
|
||||
let shows = runtime_of(&handle).is_some_and(|r| r.with_state(|s| s.visibility.shows()));
|
||||
if !shows {
|
||||
return;
|
||||
}
|
||||
for (_, window) in windows(&handle) {
|
||||
match platform::windows::covered_by_other_topmost(&window) {
|
||||
Ok(true) => raise(&window),
|
||||
Ok(false) => {}
|
||||
Err(err) => log::warn!("{} on-top check failed: {err}", window.label()),
|
||||
}
|
||||
}
|
||||
});
|
||||
let queued = app.run_on_main_thread(move || raise_covered(&handle));
|
||||
if let Err(err) = queued {
|
||||
log::warn!("bubble on-top check could not reach the main thread: {err}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Most raises in [`RAISE_WINDOW`] before raising pauses until it ends, so
|
||||
/// another app that also fights for the top cannot keep both busy; the
|
||||
/// fullscreen check carries on at its own pace.
|
||||
#[cfg(windows)]
|
||||
const MAX_RAISES: u32 = 20;
|
||||
#[cfg(windows)]
|
||||
const RAISE_WINDOW: Duration = Duration::from_secs(1);
|
||||
|
||||
/// Body of [`keep_on_top`]; runs on the main thread.
|
||||
#[cfg(windows)]
|
||||
fn raise_covered(app: &AppHandle) {
|
||||
static RAISES: Mutex<Option<(Instant, u32)>> = Mutex::new(None);
|
||||
let shows = runtime_of(app).is_some_and(|r| r.with_state(|s| s.visibility.shows()));
|
||||
if !shows {
|
||||
return;
|
||||
}
|
||||
for (_, window) in windows(app) {
|
||||
match platform::windows::covered_by_other_topmost(&window) {
|
||||
Ok(true) => {}
|
||||
Ok(false) => continue,
|
||||
Err(err) => {
|
||||
log::warn!("{} on-top check failed: {err}", window.label());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
let allowed = {
|
||||
let mut raises = RAISES.lock().unwrap_or_else(PoisonError::into_inner);
|
||||
let now = Instant::now();
|
||||
let (start, count) = raises.get_or_insert((now, 0));
|
||||
if now.duration_since(*start) >= RAISE_WINDOW {
|
||||
(*start, *count) = (now, 0);
|
||||
}
|
||||
*count += 1;
|
||||
if *count == MAX_RAISES + 1 {
|
||||
log::warn!("bubble raises paused: another window keeps taking the top");
|
||||
}
|
||||
*count <= MAX_RAISES
|
||||
};
|
||||
if allowed {
|
||||
raise(&window);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Raise covered bubbles the moment another app shows a window or changes
|
||||
/// the z-order. Installed once, on the main thread.
|
||||
#[cfg(windows)]
|
||||
fn watch_z_order(app: &AppHandle) {
|
||||
static WATCHING: std::sync::Once = std::sync::Once::new();
|
||||
WATCHING.call_once(|| {
|
||||
let handle = app.clone();
|
||||
if let Err(err) = platform::windows::watch_z_order(move || raise_covered(&handle)) {
|
||||
log::warn!("z-order watch unavailable, relying on the periodic check: {err}");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn raise(window: &WebviewWindow) {
|
||||
#[cfg(windows)]
|
||||
let result = platform::windows::raise_topmost(window).map_err(|e| e.to_string());
|
||||
@@ -565,8 +625,18 @@ pub fn set_click_through(app: &AppHandle, ignore: bool) {
|
||||
}
|
||||
}
|
||||
|
||||
/// On Windows the style bits are set directly: tao's
|
||||
/// `set_ignore_cursor_events` re-applies all its window flags, and since
|
||||
/// bubbles are shown through [`show`], not tao, it believes them hidden and
|
||||
/// hides them, also dropping their no-activate and tool-window styles.
|
||||
fn set_ignore_cursor(window: &WebviewWindow, ignore: bool) {
|
||||
if let Err(err) = window.set_ignore_cursor_events(ignore) {
|
||||
#[cfg(windows)]
|
||||
let result = platform::windows::set_click_through(window, ignore).map_err(|e| e.to_string());
|
||||
#[cfg(not(windows))]
|
||||
let result = window
|
||||
.set_ignore_cursor_events(ignore)
|
||||
.map_err(|e| e.to_string());
|
||||
if let Err(err) = result {
|
||||
log::warn!("{} click-through not set: {err}", window.label());
|
||||
}
|
||||
}
|
||||
|
||||
+110
-22
@@ -8,7 +8,11 @@
|
||||
use std::collections::HashMap;
|
||||
use std::time::{Duration, Instant, SystemTime};
|
||||
|
||||
use jiff::tz::TimeZone;
|
||||
use jiff::{Timestamp, ToSpan, Zoned};
|
||||
|
||||
use crate::core::i18n::{self, LocaleStrings};
|
||||
use crate::core::settings;
|
||||
use crate::usage::{ProviderId, UsageWindows, Window};
|
||||
|
||||
/// Minimum gap between two cooldown-gated alerts (threshold and session
|
||||
@@ -291,27 +295,78 @@ pub enum UpdateCheckDue {
|
||||
}
|
||||
|
||||
/// Schedule the automatic update check from the last check time (unix
|
||||
/// seconds). `None` when auto-check is disabled. Due when never checked or
|
||||
/// when `now - last >= interval`; otherwise after the remainder.
|
||||
/// seconds). `None` when auto-check is disabled. Checks fall on local
|
||||
/// clock boundaries: hourly at the top of each hour, daily at midnight,
|
||||
/// weekly at midnight on Monday. Due when never checked or when the last
|
||||
/// check came before the boundary that most recently passed; otherwise
|
||||
/// after the time left until the next boundary.
|
||||
pub fn update_check_due(
|
||||
last_check_unix: Option<u64>,
|
||||
interval_secs: Option<u64>,
|
||||
now_unix: u64,
|
||||
tz: &TimeZone,
|
||||
) -> Option<UpdateCheckDue> {
|
||||
let interval = interval_secs?;
|
||||
let Some(last) = last_check_unix else {
|
||||
return Some(UpdateCheckDue::Now);
|
||||
};
|
||||
let elapsed = now_unix.saturating_sub(last);
|
||||
if elapsed >= interval {
|
||||
Some(UpdateCheckDue::Now)
|
||||
} else {
|
||||
Some(UpdateCheckDue::After(Duration::from_secs(
|
||||
interval - elapsed,
|
||||
)))
|
||||
let (start, next) = clock_slot(interval, now_unix, tz);
|
||||
// A last check after `now` (a clock set back) counts as this slot's.
|
||||
match last_check_unix {
|
||||
Some(last) if last >= start => Some(UpdateCheckDue::After(Duration::from_secs(
|
||||
next.saturating_sub(now_unix),
|
||||
))),
|
||||
_ => Some(UpdateCheckDue::Now),
|
||||
}
|
||||
}
|
||||
|
||||
/// The slot of a clock-aligned timer that holds `now_unix`: the boundary
|
||||
/// that most recently passed and the next one, in unix seconds. An hour,
|
||||
/// a day and a week follow the local calendar (top of the hour, midnight,
|
||||
/// Monday midnight), across daylight-saving changes too. Any other interval
|
||||
/// splits the local day evenly, so 5 minutes falls on :00, :05, :10 and
|
||||
/// so on.
|
||||
pub fn clock_slot(interval_secs: u64, now_unix: u64, tz: &TimeZone) -> (u64, u64) {
|
||||
let calendar = || -> Result<(Zoned, Zoned), jiff::Error> {
|
||||
let now = Timestamp::from_second(i64::try_from(now_unix).unwrap_or(i64::MAX))?
|
||||
.to_zoned(tz.clone());
|
||||
let (start, step) = match interval_secs {
|
||||
settings::UPDATE_CHECK_HOURLY_SECS => (
|
||||
now.with()
|
||||
.minute(0)
|
||||
.second(0)
|
||||
.subsec_nanosecond(0)
|
||||
.build()?,
|
||||
1.hour(),
|
||||
),
|
||||
settings::UPDATE_CHECK_DAILY_SECS => (now.start_of_day()?, 1.day()),
|
||||
settings::UPDATE_CHECK_WEEKLY_SECS => {
|
||||
let days = now.weekday().to_monday_zero_offset();
|
||||
let monday = now.start_of_day()?.checked_sub(i64::from(days).days())?;
|
||||
(monday.start_of_day()?, 1.week())
|
||||
}
|
||||
_ => return Err(jiff::Error::from_args(format_args!("no calendar slot"))),
|
||||
};
|
||||
let next = start.checked_add(step)?;
|
||||
Ok((start, next))
|
||||
};
|
||||
match calendar() {
|
||||
Ok((start, next)) => (unix_secs(&start), unix_secs(&next)),
|
||||
Err(_) => {
|
||||
let interval = i64::try_from(interval_secs.max(1)).unwrap_or(i64::MAX);
|
||||
let now = i64::try_from(now_unix).unwrap_or(i64::MAX);
|
||||
let offset = Timestamp::from_second(now)
|
||||
.map(|t| i64::from(tz.to_offset(t).seconds()))
|
||||
.unwrap_or(0);
|
||||
let local = now.saturating_add(offset);
|
||||
let start = local - local.rem_euclid(interval) - offset;
|
||||
let start = u64::try_from(start).unwrap_or(0);
|
||||
(start, start.saturating_add(interval.unsigned_abs()))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn unix_secs(zoned: &Zoned) -> u64 {
|
||||
u64::try_from(zoned.timestamp().as_second()).unwrap_or(0)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -620,28 +675,61 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn update_schedule_due_and_remaining() {
|
||||
let hour = 3_600;
|
||||
assert_eq!(update_check_due(None, None, 10_000), None);
|
||||
assert_eq!(update_check_due(Some(9_000), None, 10_000), None);
|
||||
let utc = TimeZone::UTC;
|
||||
let hour = settings::UPDATE_CHECK_HOURLY_SECS;
|
||||
// 10_000 s is 02:46:40 UTC; the hour started at 7_200.
|
||||
assert_eq!(update_check_due(None, None, 10_000, &utc), None);
|
||||
assert_eq!(update_check_due(Some(9_000), None, 10_000, &utc), None);
|
||||
assert_eq!(
|
||||
update_check_due(None, Some(hour), 10_000),
|
||||
update_check_due(None, Some(hour), 10_000, &utc),
|
||||
Some(UpdateCheckDue::Now)
|
||||
);
|
||||
assert_eq!(
|
||||
update_check_due(Some(10_000 - hour), Some(hour), 10_000),
|
||||
update_check_due(Some(7_199), Some(hour), 10_000, &utc),
|
||||
Some(UpdateCheckDue::Now)
|
||||
);
|
||||
assert_eq!(
|
||||
update_check_due(Some(10_000 - 600), Some(hour), 10_000),
|
||||
Some(UpdateCheckDue::After(Duration::from_secs(3_000)))
|
||||
update_check_due(Some(7_200), Some(hour), 10_000, &utc),
|
||||
Some(UpdateCheckDue::After(Duration::from_secs(800)))
|
||||
);
|
||||
// A clock that moved backwards counts as zero elapsed.
|
||||
// A clock that moved backwards counts as checked this slot.
|
||||
assert_eq!(
|
||||
update_check_due(Some(20_000), Some(hour), 10_000),
|
||||
Some(UpdateCheckDue::After(Duration::from_secs(hour)))
|
||||
update_check_due(Some(20_000), Some(hour), 10_000, &utc),
|
||||
Some(UpdateCheckDue::After(Duration::from_secs(800)))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn clock_slots_follow_the_local_calendar() {
|
||||
let utc = TimeZone::UTC;
|
||||
// 5 minutes: 02:46:40 sits in 02:45..02:50.
|
||||
assert_eq!(clock_slot(300, 10_000, &utc), (9_900, 10_200));
|
||||
// At +05:30 local hours start at UTC :30.
|
||||
let india = TimeZone::fixed(jiff::tz::Offset::from_seconds(5 * 3_600 + 30 * 60).unwrap());
|
||||
assert_eq!(
|
||||
clock_slot(settings::UPDATE_CHECK_HOURLY_SECS, 10_000, &india),
|
||||
(9_000, 12_600)
|
||||
);
|
||||
// 1970-01-01 was a Thursday: its week started Monday 1969-12-29,
|
||||
// before the epoch, so the slot start clamps to 0.
|
||||
assert_eq!(
|
||||
clock_slot(settings::UPDATE_CHECK_WEEKLY_SECS, 10_000, &utc),
|
||||
(0, 4 * 86_400)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_daily_slot_spans_a_short_daylight_saving_day() {
|
||||
let Ok(berlin) = TimeZone::get("Europe/Berlin") else {
|
||||
return; // no tz database on this machine
|
||||
};
|
||||
// 2026-03-29 is 23 hours long in Berlin; it starts at 23:00 UTC.
|
||||
let noon = 1_774_785_600; // 2026-03-29 12:00 UTC
|
||||
let (start, next) = clock_slot(settings::UPDATE_CHECK_DAILY_SECS, noon, &berlin);
|
||||
assert_eq!(start, 1_774_738_800);
|
||||
assert_eq!(next - start, 23 * 3_600);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn countdown_delay_takes_the_nearest_change_with_a_floor() {
|
||||
let now = SystemTime::UNIX_EPOCH + Duration::from_secs(1_800_000_000);
|
||||
|
||||
+2
-1
@@ -6,7 +6,8 @@
|
||||
//! The same thread brings the bubbles back every minute while they should
|
||||
//! show, in case another window covered or hid them. On Windows it also
|
||||
//! re-raises, on every check, a bubble that another app's always-on-top
|
||||
//! window (a chat toast, say) has just covered.
|
||||
//! window (a chat toast, say) covers, as a backstop for the z-order watch
|
||||
//! in `bubble.rs`.
|
||||
|
||||
use std::io;
|
||||
use std::sync::Arc;
|
||||
|
||||
+88
-8
@@ -1,5 +1,6 @@
|
||||
//! Windows-only helpers. This is the only module that talks to Win32 APIs.
|
||||
|
||||
use std::cell::RefCell;
|
||||
use std::io;
|
||||
use std::path::Path;
|
||||
use std::time::Duration;
|
||||
@@ -20,6 +21,7 @@ use windows::Win32::Graphics::Gdi::{
|
||||
GetMonitorInfoW, MonitorFromWindow, MONITORINFO, MONITOR_DEFAULTTONEAREST,
|
||||
};
|
||||
use windows::Win32::System::Threading::{OpenProcess, WaitForSingleObject, PROCESS_SYNCHRONIZE};
|
||||
use windows::Win32::UI::Accessibility::{SetWinEventHook, HWINEVENTHOOK};
|
||||
use windows::Win32::UI::Shell::{
|
||||
DefSubclassProc, RemoveWindowSubclass, SHAppBarMessage,
|
||||
SetCurrentProcessExplicitAppUserModelID, SetWindowSubclass, ABE_BOTTOM, ABE_LEFT, ABE_RIGHT,
|
||||
@@ -28,11 +30,13 @@ use windows::Win32::UI::Shell::{
|
||||
use windows::Win32::UI::WindowsAndMessaging::{
|
||||
GetClassNameW, GetForegroundWindow, GetWindow, GetWindowLongPtrW, GetWindowRect,
|
||||
GetWindowThreadProcessId, IsIconic, IsWindowVisible, MessageBoxW, SetForegroundWindow,
|
||||
SetWindowLongPtrW, SetWindowPos, ShowWindow, GWL_EXSTYLE, GWL_STYLE, GW_HWNDPREV, HWND_TOPMOST,
|
||||
MA_NOACTIVATE, MB_ICONERROR, MB_OK, MB_SETFOREGROUND, SWP_FRAMECHANGED, SWP_NOACTIVATE,
|
||||
SWP_NOMOVE, SWP_NOSIZE, SWP_NOZORDER, SW_HIDE, SW_SHOWNOACTIVATE, WM_DISPLAYCHANGE,
|
||||
WM_EXITSIZEMOVE, WM_MOUSEACTIVATE, WM_NCDESTROY, WM_SETTINGCHANGE, WS_EX_NOACTIVATE,
|
||||
WS_EX_TOOLWINDOW, WS_EX_TOPMOST,
|
||||
SetWindowLongPtrW, SetWindowPos, ShowWindow, CHILDID_SELF, EVENT_OBJECT_REORDER,
|
||||
EVENT_OBJECT_SHOW, GWL_EXSTYLE, GWL_STYLE, GW_HWNDPREV, HWND_TOPMOST, MA_NOACTIVATE,
|
||||
MB_ICONERROR, MB_OK, MB_SETFOREGROUND, OBJID_WINDOW, SWP_FRAMECHANGED, SWP_NOACTIVATE,
|
||||
SWP_NOMOVE, SWP_NOSIZE, SWP_NOZORDER, SW_HIDE, SW_SHOWNOACTIVATE, WINEVENT_OUTOFCONTEXT,
|
||||
WINEVENT_SKIPOWNPROCESS, WM_DISPLAYCHANGE, WM_EXITSIZEMOVE, WM_MOUSEACTIVATE, WM_NCDESTROY,
|
||||
WM_SETTINGCHANGE, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TOPMOST,
|
||||
WS_EX_TRANSPARENT,
|
||||
};
|
||||
|
||||
use crate::core::geom::{self, Edge, Rect};
|
||||
@@ -203,19 +207,34 @@ pub fn apply_toolwindow(window: &tauri::WebviewWindow) -> io::Result<()> {
|
||||
add_ex_style(window, WS_EX_TOOLWINDOW.0)
|
||||
}
|
||||
|
||||
/// Let mouse input pass through a bubble to the windows below, or take it
|
||||
/// again. These are the bits tao's `set_ignore_cursor_events` sets, without
|
||||
/// its re-applying every window flag, which hides a bubble shown through
|
||||
/// [`show_no_activate`]. Run it on the window's own (main) thread.
|
||||
pub fn set_click_through(window: &tauri::WebviewWindow, ignore: bool) -> io::Result<()> {
|
||||
set_ex_style(window, (WS_EX_TRANSPARENT | WS_EX_LAYERED).0, ignore)
|
||||
}
|
||||
|
||||
/// OR `bits` into a window's extended style and apply the frame change.
|
||||
fn add_ex_style(window: &tauri::WebviewWindow, bits: u32) -> io::Result<()> {
|
||||
set_ex_style(window, bits, true)
|
||||
}
|
||||
|
||||
/// Set or clear `bits` in a window's extended style and apply the frame
|
||||
/// change.
|
||||
fn set_ex_style(window: &tauri::WebviewWindow, bits: u32, on: bool) -> io::Result<()> {
|
||||
let hwnd = hwnd_of(window)?;
|
||||
let wanted = bits as isize;
|
||||
let bits = bits as isize;
|
||||
// SAFETY: `hwnd` is a live top-level window of this process.
|
||||
let current = unsafe { GetWindowLongPtrW(hwnd, GWL_EXSTYLE) };
|
||||
if current & wanted == wanted {
|
||||
let wanted = if on { current | bits } else { current & !bits };
|
||||
if wanted == current {
|
||||
return Ok(());
|
||||
}
|
||||
// SAFETY: as above. A zero return is only an error when the last error
|
||||
// is set, so it is cleared first.
|
||||
unsafe { SetLastError(WIN32_ERROR(0)) };
|
||||
let previous = unsafe { SetWindowLongPtrW(hwnd, GWL_EXSTYLE, current | wanted) };
|
||||
let previous = unsafe { SetWindowLongPtrW(hwnd, GWL_EXSTYLE, wanted) };
|
||||
if previous == 0 {
|
||||
let err = io::Error::last_os_error();
|
||||
if err.raw_os_error().unwrap_or(0) != 0 {
|
||||
@@ -357,6 +376,67 @@ fn covers(other: HWND, ours: &Rect, own_pid: u32) -> bool {
|
||||
visible_window_bounds(other).is_some_and(|(theirs, _)| theirs.intersects(ours))
|
||||
}
|
||||
|
||||
thread_local! {
|
||||
/// The callback of [`watch_z_order`], on the thread that installed it.
|
||||
static Z_ORDER_CALLBACK: RefCell<Option<Box<dyn Fn()>>> = const { RefCell::new(None) };
|
||||
}
|
||||
|
||||
/// Call `callback` as soon as a window of another process is shown or the
|
||||
/// z-order changes, so a bubble can go back on top of a new always-on-top
|
||||
/// window (a chat toast, say) at once instead of at the next poll. The
|
||||
/// events arrive through this thread's message loop, so install it on the
|
||||
/// main thread; the hook lives as long as the process.
|
||||
pub fn watch_z_order(callback: impl Fn() + 'static) -> io::Result<()> {
|
||||
Z_ORDER_CALLBACK.with(|slot| *slot.borrow_mut() = Some(Box::new(callback)));
|
||||
// SAFETY: an out-of-context hook needs no module handle; the procedure
|
||||
// is a plain function that lives for the whole process.
|
||||
let hook = unsafe {
|
||||
SetWinEventHook(
|
||||
EVENT_OBJECT_SHOW,
|
||||
EVENT_OBJECT_REORDER,
|
||||
None,
|
||||
Some(z_order_event_proc),
|
||||
0,
|
||||
0,
|
||||
WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS,
|
||||
)
|
||||
};
|
||||
if hook.is_invalid() {
|
||||
Z_ORDER_CALLBACK.with(|slot| slot.borrow_mut().take());
|
||||
return Err(io::Error::other("SetWinEventHook failed"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
unsafe extern "system" fn z_order_event_proc(
|
||||
_hook: HWINEVENTHOOK,
|
||||
event: u32,
|
||||
_hwnd: HWND,
|
||||
id_object: i32,
|
||||
id_child: i32,
|
||||
_thread: u32,
|
||||
_time: u32,
|
||||
) {
|
||||
// Only whole windows count: a shown caret or cursor is an object too,
|
||||
// and a hidden window cannot cover anything.
|
||||
let relevant = match event {
|
||||
EVENT_OBJECT_SHOW => id_object == OBJID_WINDOW.0 && id_child == CHILDID_SELF as i32,
|
||||
EVENT_OBJECT_REORDER => true,
|
||||
_ => false,
|
||||
};
|
||||
if relevant {
|
||||
// `try_borrow` skips an event raised from inside the callback.
|
||||
Z_ORDER_CALLBACK.with(|slot| {
|
||||
let Ok(callback) = slot.try_borrow() else {
|
||||
return;
|
||||
};
|
||||
if let Some(callback) = callback.as_ref() {
|
||||
callback();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/// Hide a bubble (see [`show_no_activate`]).
|
||||
pub fn hide(window: &tauri::WebviewWindow) -> io::Result<()> {
|
||||
let hwnd = hwnd_of(window)?;
|
||||
|
||||
@@ -1034,6 +1034,7 @@ fn setup(app: &mut tauri::App, cli: &CliArgs) -> Result<(), Box<dyn Error>> {
|
||||
poll_interval: Duration::from_millis(u64::from(state.settings.poll_interval_ms)),
|
||||
update_interval_secs: state.settings.update_check_interval_secs,
|
||||
last_update_check_unix: state.settings.last_update_check_unix,
|
||||
tz: jiff::tz::TimeZone::system(),
|
||||
};
|
||||
let providers = enabled_providers(&state.settings);
|
||||
|
||||
|
||||
+224
-178
@@ -7,17 +7,20 @@
|
||||
//! each due [`Action`] to its [`SchedulerHost`]. A host must return quickly:
|
||||
//! slow work (HTTP, the CLI refresh) runs on worker threads it spawns.
|
||||
//!
|
||||
//! `Instant` stops while the machine sleeps, so the update check, which is
|
||||
//! due at a wall-clock time, is kept as a unix timestamp, and the thread
|
||||
//! wakes at least every [`MAX_WAIT`] to notice a resume (see
|
||||
//! [`resumed_from_sleep`]).
|
||||
//! The poll and the update check run on local clock boundaries (see
|
||||
//! [`clock_slot`]): a 5-minute poll at :00, :05, :10 and so on, a daily
|
||||
//! update check at midnight. `Instant` stops while the machine sleeps, so
|
||||
//! those deadlines are kept as unix timestamps, and the thread wakes at
|
||||
//! least every [`MAX_WAIT`] to notice a resume (see [`resumed_from_sleep`]).
|
||||
|
||||
use std::io;
|
||||
use std::sync::mpsc::{Receiver, RecvTimeoutError};
|
||||
use std::thread::JoinHandle;
|
||||
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
||||
|
||||
use crate::core::state::{update_check_due, UpdateCheckDue};
|
||||
use jiff::tz::TimeZone;
|
||||
|
||||
use crate::core::state::{clock_slot, update_check_due, UpdateCheckDue};
|
||||
|
||||
/// Shortest poll interval, guarding against a hand-edited `0` in the
|
||||
/// settings file turning into a busy loop.
|
||||
@@ -42,7 +45,8 @@ const RESUME_THRESHOLD: Duration = Duration::from_secs(30);
|
||||
pub enum Message {
|
||||
/// Poll at once. The periodic poll deadline is left as it is.
|
||||
PollNow,
|
||||
/// Change the poll interval and re-arm it from now, without polling.
|
||||
/// Change the poll interval and re-arm it at its next boundary, without
|
||||
/// polling.
|
||||
SetPollInterval(Duration),
|
||||
/// Re-render the countdowns after this delay; `None` clears the deadline.
|
||||
RecomputeCountdown(Option<Duration>),
|
||||
@@ -53,9 +57,9 @@ pub enum Message {
|
||||
interval_secs: Option<u64>,
|
||||
last_check_unix: Option<u64>,
|
||||
},
|
||||
/// An update check finished. Only this re-arms the check: after the
|
||||
/// full interval when it succeeded, after a growing retry delay capped
|
||||
/// at the interval when it failed.
|
||||
/// An update check finished. Only this re-arms the check: at the next
|
||||
/// boundary when it succeeded, after a growing retry delay capped at
|
||||
/// that boundary when it failed.
|
||||
UpdateCheckDone {
|
||||
interval_secs: Option<u64>,
|
||||
succeeded: bool,
|
||||
@@ -77,17 +81,21 @@ pub trait SchedulerHost {
|
||||
}
|
||||
|
||||
/// Settings the deadlines start from.
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct Config {
|
||||
pub poll_interval: Duration,
|
||||
pub update_interval_secs: Option<u64>,
|
||||
pub last_update_check_unix: Option<u64>,
|
||||
/// The zone whose clock the poll and the update check follow.
|
||||
pub tz: TimeZone,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Deadlines {
|
||||
tz: TimeZone,
|
||||
poll_interval: Duration,
|
||||
poll_at: Instant,
|
||||
/// Unix seconds the next poll is due at.
|
||||
poll_at_unix: u64,
|
||||
countdown_at: Option<Instant>,
|
||||
/// Unix seconds the next update check is due at.
|
||||
update_at_unix: Option<u64>,
|
||||
@@ -98,15 +106,16 @@ pub struct Deadlines {
|
||||
impl Deadlines {
|
||||
/// Arm the deadlines at startup. Returns the actions due at once: the
|
||||
/// update check when the last one is older than its interval.
|
||||
pub fn new(config: Config, now: Instant, now_unix: u64) -> (Self, Vec<Action>) {
|
||||
let poll_interval = config.poll_interval.max(MIN_POLL_INTERVAL);
|
||||
pub fn new(config: Config, now_unix: u64) -> (Self, Vec<Action>) {
|
||||
let mut deadlines = Self {
|
||||
poll_interval,
|
||||
poll_at: now + poll_interval,
|
||||
tz: config.tz,
|
||||
poll_interval: config.poll_interval.max(MIN_POLL_INTERVAL),
|
||||
poll_at_unix: 0,
|
||||
countdown_at: None,
|
||||
update_at_unix: None,
|
||||
update_failures: 0,
|
||||
};
|
||||
deadlines.poll_at_unix = deadlines.next_poll(now_unix);
|
||||
let actions = deadlines.arm_update(
|
||||
config.update_interval_secs,
|
||||
config.last_update_check_unix,
|
||||
@@ -121,7 +130,7 @@ impl Deadlines {
|
||||
Message::PollNow => vec![Action::Poll],
|
||||
Message::SetPollInterval(interval) => {
|
||||
self.poll_interval = interval.max(MIN_POLL_INTERVAL);
|
||||
self.poll_at = now + self.poll_interval;
|
||||
self.poll_at_unix = self.next_poll(now_unix);
|
||||
Vec::new()
|
||||
}
|
||||
Message::RecomputeCountdown(delay) => {
|
||||
@@ -136,29 +145,31 @@ impl Deadlines {
|
||||
interval_secs,
|
||||
succeeded,
|
||||
} => {
|
||||
let delay = if succeeded {
|
||||
self.update_failures = 0;
|
||||
interval_secs.map(update_interval)
|
||||
} else {
|
||||
let delay = interval_secs.map(|secs| self.retry_delay(secs));
|
||||
self.update_failures = self.update_failures.saturating_add(1);
|
||||
delay
|
||||
};
|
||||
self.update_at_unix = delay.map(|d| now_unix.saturating_add(d.as_secs()));
|
||||
self.update_at_unix = interval_secs.map(|secs| {
|
||||
let next = self.next_update(secs, now_unix);
|
||||
if succeeded {
|
||||
self.update_failures = 0;
|
||||
next
|
||||
} else {
|
||||
let retry = now_unix.saturating_add(self.retry_delay().as_secs());
|
||||
self.update_failures = self.update_failures.saturating_add(1);
|
||||
retry.min(next)
|
||||
}
|
||||
});
|
||||
Vec::new()
|
||||
}
|
||||
Message::Shutdown => Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Fire every deadline that has passed. The poll re-arms for a full
|
||||
/// interval; the countdown and update check stay disarmed until the
|
||||
/// Fire every deadline that has passed. The poll re-arms at its next
|
||||
/// boundary; the countdown and update check stay disarmed until the
|
||||
/// host re-arms them (after the re-render, after the check finished).
|
||||
pub fn take_due(&mut self, now: Instant, now_unix: u64) -> Vec<Action> {
|
||||
let mut due = Vec::new();
|
||||
if self.poll_at <= now {
|
||||
if self.poll_at_unix <= now_unix {
|
||||
due.push(Action::Poll);
|
||||
self.poll_at = now + self.poll_interval;
|
||||
self.poll_at_unix = self.next_poll(now_unix);
|
||||
}
|
||||
if self.countdown_at.is_some_and(|at| at <= now) {
|
||||
due.push(Action::Countdown);
|
||||
@@ -171,25 +182,23 @@ impl Deadlines {
|
||||
due
|
||||
}
|
||||
|
||||
/// The machine woke from sleep: poll at once and re-arm the poll for a
|
||||
/// full interval from now. The update check needs nothing here, since
|
||||
/// The machine woke from sleep: poll at once and re-arm the poll at its
|
||||
/// next boundary. The update check needs nothing here, since
|
||||
/// [`Self::take_due`] compares its wall-clock deadline with `now_unix`.
|
||||
pub fn resume(&mut self, now: Instant) -> Vec<Action> {
|
||||
self.poll_at = now + self.poll_interval;
|
||||
pub fn resume(&mut self, now_unix: u64) -> Vec<Action> {
|
||||
self.poll_at_unix = self.next_poll(now_unix);
|
||||
vec![Action::Poll]
|
||||
}
|
||||
|
||||
/// Time until the nearest deadline. The poll deadline is always armed,
|
||||
/// so there always is one.
|
||||
pub fn next_wakeup(&self, now: Instant, now_unix: u64) -> Duration {
|
||||
let update = self
|
||||
.update_at_unix
|
||||
.map(|at| Duration::from_secs(at.saturating_sub(now_unix)));
|
||||
let until = |at: u64| Duration::from_secs(at.saturating_sub(now_unix));
|
||||
[
|
||||
Some(self.poll_at.saturating_duration_since(now)),
|
||||
Some(until(self.poll_at_unix)),
|
||||
self.countdown_at
|
||||
.map(|at| at.saturating_duration_since(now)),
|
||||
update,
|
||||
self.update_at_unix.map(until),
|
||||
]
|
||||
.into_iter()
|
||||
.flatten()
|
||||
@@ -204,7 +213,7 @@ impl Deadlines {
|
||||
now_unix: u64,
|
||||
) -> Vec<Action> {
|
||||
let interval_secs = interval_secs.map(|secs| secs.max(MIN_UPDATE_INTERVAL.as_secs()));
|
||||
match update_check_due(last_check_unix, interval_secs, now_unix) {
|
||||
match update_check_due(last_check_unix, interval_secs, now_unix, &self.tz) {
|
||||
None => {
|
||||
self.update_at_unix = None;
|
||||
Vec::new()
|
||||
@@ -220,18 +229,24 @@ impl Deadlines {
|
||||
}
|
||||
}
|
||||
|
||||
/// Delay before the next try after the current run of failures:
|
||||
/// `UPDATE_RETRY_BASE * 2^failures`, capped at the check interval.
|
||||
fn retry_delay(&self, interval_secs: u64) -> Duration {
|
||||
let factor = 1u32.checked_shl(self.update_failures).unwrap_or(u32::MAX);
|
||||
UPDATE_RETRY_BASE
|
||||
.saturating_mul(factor)
|
||||
.min(update_interval(interval_secs))
|
||||
/// The poll boundary after `now_unix`.
|
||||
fn next_poll(&self, now_unix: u64) -> u64 {
|
||||
clock_slot(self.poll_interval.as_secs(), now_unix, &self.tz).1
|
||||
}
|
||||
}
|
||||
|
||||
fn update_interval(secs: u64) -> Duration {
|
||||
Duration::from_secs(secs).max(MIN_UPDATE_INTERVAL)
|
||||
/// The update-check boundary after `now_unix`.
|
||||
fn next_update(&self, interval_secs: u64, now_unix: u64) -> u64 {
|
||||
let interval_secs = interval_secs.max(MIN_UPDATE_INTERVAL.as_secs());
|
||||
clock_slot(interval_secs, now_unix, &self.tz).1
|
||||
}
|
||||
|
||||
/// Delay before the next try after the current run of failures:
|
||||
/// `UPDATE_RETRY_BASE * 2^failures`; the caller caps it at the next
|
||||
/// boundary.
|
||||
fn retry_delay(&self) -> Duration {
|
||||
let factor = 1u32.checked_shl(self.update_failures).unwrap_or(u32::MAX);
|
||||
UPDATE_RETRY_BASE.saturating_mul(factor)
|
||||
}
|
||||
}
|
||||
|
||||
/// Whether the wall clock ran ahead of `Instant` by more than
|
||||
@@ -260,7 +275,7 @@ where
|
||||
std::thread::Builder::new()
|
||||
.name("scheduler".into())
|
||||
.spawn(move || {
|
||||
let (deadlines, initial) = Deadlines::new(config, Instant::now(), unix_now());
|
||||
let (deadlines, initial) = Deadlines::new(config, unix_now());
|
||||
for action in initial {
|
||||
host.run(action);
|
||||
}
|
||||
@@ -282,7 +297,7 @@ fn run_loop<H: SchedulerHost>(mut deadlines: Deadlines, rx: &Receiver<Message>,
|
||||
"wall clock moved {wall_elapsed:?} while Instant moved {instant_elapsed:?}; \
|
||||
treating it as a resume from sleep"
|
||||
);
|
||||
for action in deadlines.resume(now) {
|
||||
for action in deadlines.resume(unix_now()) {
|
||||
host.run(action);
|
||||
}
|
||||
}
|
||||
@@ -308,71 +323,97 @@ mod tests {
|
||||
use super::*;
|
||||
use std::sync::mpsc::{self, Sender};
|
||||
|
||||
use jiff::tz;
|
||||
|
||||
use crate::core::settings::{
|
||||
UPDATE_CHECK_DAILY_SECS, UPDATE_CHECK_HOURLY_SECS, UPDATE_CHECK_WEEKLY_SECS,
|
||||
};
|
||||
|
||||
const MIN: Duration = Duration::from_secs(60);
|
||||
const M: u64 = 60;
|
||||
const HOUR: u64 = 60 * M;
|
||||
const DAY: u64 = 24 * HOUR;
|
||||
/// Friday 2027-01-15 08:00:00 UTC, a whole hour.
|
||||
const NOW_UNIX: u64 = 1_800_000_000;
|
||||
const DAY: u64 = 24 * 60 * 60;
|
||||
/// The Monday 00:00 UTC that starts `NOW_UNIX`'s week.
|
||||
const MONDAY: u64 = NOW_UNIX - 4 * DAY - 8 * HOUR;
|
||||
|
||||
fn config(update: Option<u64>, last: Option<u64>) -> Config {
|
||||
Config {
|
||||
poll_interval: 5 * MIN,
|
||||
update_interval_secs: update,
|
||||
last_update_check_unix: last,
|
||||
tz: TimeZone::UTC,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn poll_fires_every_interval() {
|
||||
fn poll_fires_on_interval_boundaries() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, initial) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
// Started at 08:02:10, a 5-minute poll is next due at 08:05:00.
|
||||
let start = NOW_UNIX + 2 * M + 10;
|
||||
let (mut d, initial) = Deadlines::new(config(None, None), start);
|
||||
assert!(initial.is_empty());
|
||||
assert_eq!(d.next_wakeup(t0, NOW_UNIX), 5 * MIN);
|
||||
assert!(d.take_due(t0 + 4 * MIN, NOW_UNIX).is_empty());
|
||||
assert_eq!(d.take_due(t0 + 5 * MIN, NOW_UNIX), [Action::Poll]);
|
||||
assert_eq!(d.next_wakeup(t0 + 5 * MIN, NOW_UNIX), 5 * MIN);
|
||||
assert_eq!(d.take_due(t0 + 10 * MIN, NOW_UNIX), [Action::Poll]);
|
||||
assert_eq!(d.next_wakeup(t0, start), Duration::from_secs(2 * M + 50));
|
||||
assert!(d.take_due(t0, NOW_UNIX + 5 * M - 1).is_empty());
|
||||
assert_eq!(d.take_due(t0, NOW_UNIX + 5 * M), [Action::Poll]);
|
||||
assert_eq!(d.next_wakeup(t0, NOW_UNIX + 5 * M), 5 * MIN);
|
||||
// A late wake-up keeps the boundaries: 08:10:20 re-arms 08:15:00.
|
||||
assert_eq!(d.take_due(t0, NOW_UNIX + 10 * M + 20), [Action::Poll]);
|
||||
assert!(d.take_due(t0, NOW_UNIX + 15 * M - 1).is_empty());
|
||||
assert_eq!(d.take_due(t0, NOW_UNIX + 15 * M), [Action::Poll]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn poll_boundaries_follow_the_local_clock() {
|
||||
// At +05:45, 5-minute boundaries fall on the local :00, :05 and so
|
||||
// on, which is UTC :15, :20 and so on.
|
||||
let mut cfg = config(None, None);
|
||||
cfg.tz = TimeZone::fixed(tz::Offset::from_seconds(5 * 3_600 + 45 * 60).unwrap());
|
||||
cfg.poll_interval = 60 * MIN;
|
||||
let (d, _) = Deadlines::new(cfg, NOW_UNIX);
|
||||
assert_eq!(
|
||||
d.next_wakeup(Instant::now(), NOW_UNIX),
|
||||
Duration::from_secs(15 * M)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn poll_now_polls_without_moving_the_periodic_deadline() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
let (mut d, _) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
assert_eq!(
|
||||
d.handle(Message::PollNow, t0 + 2 * MIN, NOW_UNIX),
|
||||
d.handle(Message::PollNow, t0, NOW_UNIX + 2 * M),
|
||||
[Action::Poll]
|
||||
);
|
||||
assert_eq!(d.take_due(t0 + 5 * MIN, NOW_UNIX), [Action::Poll]);
|
||||
assert_eq!(d.take_due(t0, NOW_UNIX + 5 * M), [Action::Poll]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn new_poll_interval_rearms_from_now_without_polling() {
|
||||
fn new_poll_interval_rearms_at_its_next_boundary_without_polling() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
let t1 = t0 + 4 * MIN;
|
||||
let (mut d, _) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
let t1 = NOW_UNIX + 4 * M;
|
||||
assert!(d
|
||||
.handle(Message::SetPollInterval(MIN * 15), t1, NOW_UNIX)
|
||||
.handle(Message::SetPollInterval(MIN * 15), t0, t1)
|
||||
.is_empty());
|
||||
assert!(d.take_due(t0 + 5 * MIN, NOW_UNIX).is_empty());
|
||||
assert_eq!(d.next_wakeup(t1, NOW_UNIX), 15 * MIN);
|
||||
assert_eq!(d.take_due(t1 + 15 * MIN, NOW_UNIX), [Action::Poll]);
|
||||
assert!(d.take_due(t0, NOW_UNIX + 5 * M).is_empty());
|
||||
assert_eq!(d.next_wakeup(t0, t1), 11 * MIN);
|
||||
assert_eq!(d.take_due(t0, NOW_UNIX + 15 * M), [Action::Poll]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_zero_poll_interval_is_floored() {
|
||||
let t0 = Instant::now();
|
||||
let mut cfg = config(None, None);
|
||||
cfg.poll_interval = Duration::ZERO;
|
||||
let (d, _) = Deadlines::new(cfg, t0, NOW_UNIX);
|
||||
assert_eq!(d.next_wakeup(t0, NOW_UNIX), MIN_POLL_INTERVAL);
|
||||
let (d, _) = Deadlines::new(cfg, NOW_UNIX);
|
||||
assert_eq!(d.next_wakeup(Instant::now(), NOW_UNIX), MIN_POLL_INTERVAL);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn countdown_fires_once_until_rearmed() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
let (mut d, _) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
let delay = Duration::from_secs(31);
|
||||
d.handle(Message::RecomputeCountdown(Some(delay)), t0, NOW_UNIX);
|
||||
assert_eq!(d.next_wakeup(t0, NOW_UNIX), delay);
|
||||
@@ -384,42 +425,10 @@ mod tests {
|
||||
assert!(d.take_due(t0 + 2 * delay, NOW_UNIX).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn startup_checks_for_updates_when_due() {
|
||||
let t0 = Instant::now();
|
||||
let hourly = Some(UPDATE_CHECK_HOURLY_SECS);
|
||||
let (_, never_checked) = Deadlines::new(config(hourly, None), t0, NOW_UNIX);
|
||||
assert_eq!(never_checked, [Action::CheckForUpdates]);
|
||||
let (_, stale) = Deadlines::new(config(hourly, Some(NOW_UNIX - 2 * 3_600)), t0, NOW_UNIX);
|
||||
assert_eq!(stale, [Action::CheckForUpdates]);
|
||||
let (_, disabled) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
assert!(disabled.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn startup_waits_for_the_remainder_when_not_due() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, initial) = Deadlines::new(
|
||||
config(Some(UPDATE_CHECK_HOURLY_SECS), Some(NOW_UNIX - 600)),
|
||||
t0,
|
||||
NOW_UNIX,
|
||||
);
|
||||
assert!(initial.is_empty());
|
||||
let remaining = 3_000;
|
||||
assert!(!d
|
||||
.take_due(t0, NOW_UNIX + remaining - 60)
|
||||
.contains(&Action::CheckForUpdates));
|
||||
assert_eq!(d.next_wakeup(t0, NOW_UNIX + remaining - 60), MIN);
|
||||
assert_eq!(
|
||||
d.take_due(t0, NOW_UNIX + remaining),
|
||||
[Action::CheckForUpdates]
|
||||
);
|
||||
}
|
||||
|
||||
/// Whether a check is due at `now_unix`, with `Instant` left at `t0`
|
||||
/// to show the update deadline follows the wall clock alone.
|
||||
fn check_due(d: &mut Deadlines, t0: Instant, now_unix: u64) -> bool {
|
||||
d.take_due(t0, now_unix).contains(&Action::CheckForUpdates)
|
||||
/// Whether a check is due at `now_unix`.
|
||||
fn check_due(d: &mut Deadlines, now_unix: u64) -> bool {
|
||||
d.take_due(Instant::now(), now_unix)
|
||||
.contains(&Action::CheckForUpdates)
|
||||
}
|
||||
|
||||
fn done(interval_secs: Option<u64>, succeeded: bool) -> Message {
|
||||
@@ -430,76 +439,118 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn only_a_finished_check_rearms_the_full_interval() {
|
||||
let t0 = Instant::now();
|
||||
let hour = UPDATE_CHECK_HOURLY_SECS;
|
||||
let (mut d, initial) = Deadlines::new(config(Some(hour), None), t0, NOW_UNIX);
|
||||
assert_eq!(initial, [Action::CheckForUpdates]);
|
||||
// While the check runs nothing else is scheduled for it.
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + 3 * hour));
|
||||
|
||||
let t1 = NOW_UNIX + 3 * hour;
|
||||
d.handle(done(Some(hour), true), t0, t1);
|
||||
assert!(!check_due(&mut d, t0, t1 + hour / 2));
|
||||
assert!(check_due(&mut d, t0, t1 + hour));
|
||||
// It repeats every interval, not just once.
|
||||
let t2 = t1 + hour;
|
||||
d.handle(done(Some(hour), true), t0, t2);
|
||||
assert!(check_due(&mut d, t0, t2 + hour));
|
||||
fn startup_checks_only_when_a_boundary_passed_since_the_last_check() {
|
||||
let hourly = Some(UPDATE_CHECK_HOURLY_SECS);
|
||||
let (_, never_checked) = Deadlines::new(config(hourly, None), NOW_UNIX + M);
|
||||
assert_eq!(never_checked, [Action::CheckForUpdates]);
|
||||
// Checked at 07:59:59, started at 08:01: 08:00 passed in between.
|
||||
let (_, passed) = Deadlines::new(config(hourly, Some(NOW_UNIX - 1)), NOW_UNIX + M);
|
||||
assert_eq!(passed, [Action::CheckForUpdates]);
|
||||
// Checked at 08:00:30, started at 08:59: no boundary yet, so it
|
||||
// waits for 09:00.
|
||||
let (mut d, waiting) =
|
||||
Deadlines::new(config(hourly, Some(NOW_UNIX + 30)), NOW_UNIX + 59 * M);
|
||||
assert!(waiting.is_empty());
|
||||
assert!(!check_due(&mut d, NOW_UNIX + HOUR - 1));
|
||||
assert!(check_due(&mut d, NOW_UNIX + HOUR));
|
||||
let (_, disabled) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
assert!(disabled.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_failed_check_retries_with_a_doubling_delay_capped_at_the_interval() {
|
||||
let t0 = Instant::now();
|
||||
fn daily_and_weekly_checks_fall_on_local_midnight() {
|
||||
let daily = Some(UPDATE_CHECK_DAILY_SECS);
|
||||
let midnight = NOW_UNIX - 8 * HOUR;
|
||||
let (_, before) = Deadlines::new(config(daily, Some(midnight - 1)), NOW_UNIX);
|
||||
assert_eq!(before, [Action::CheckForUpdates]);
|
||||
let (mut d, after) = Deadlines::new(config(daily, Some(midnight)), NOW_UNIX);
|
||||
assert!(after.is_empty());
|
||||
assert!(!check_due(&mut d, midnight + DAY - 1));
|
||||
assert!(check_due(&mut d, midnight + DAY));
|
||||
|
||||
let weekly = Some(UPDATE_CHECK_WEEKLY_SECS);
|
||||
let (mut d, initial) = Deadlines::new(config(weekly, Some(MONDAY + 1)), NOW_UNIX);
|
||||
assert!(initial.is_empty());
|
||||
assert!(!check_due(&mut d, MONDAY + 7 * DAY - 1));
|
||||
assert!(check_due(&mut d, MONDAY + 7 * DAY));
|
||||
|
||||
// At UTC+07:00 local midnight is 17:00 UTC the day before.
|
||||
let mut cfg = config(daily, Some(NOW_UNIX));
|
||||
cfg.tz = TimeZone::fixed(tz::offset(7));
|
||||
let (mut d, _) = Deadlines::new(cfg, NOW_UNIX);
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 9 * HOUR - 1));
|
||||
assert!(check_due(&mut d, NOW_UNIX + 9 * HOUR));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_finished_check_rearms_at_the_next_boundary() {
|
||||
let hour = UPDATE_CHECK_HOURLY_SECS;
|
||||
let (mut d, _) = Deadlines::new(config(Some(hour), None), t0, NOW_UNIX);
|
||||
let (mut d, initial) = Deadlines::new(config(Some(hour), None), NOW_UNIX);
|
||||
assert_eq!(initial, [Action::CheckForUpdates]);
|
||||
// While the check runs nothing else is scheduled for it.
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 3 * hour));
|
||||
|
||||
let t1 = NOW_UNIX + 3 * hour + 20 * M;
|
||||
d.handle(done(Some(hour), true), Instant::now(), t1);
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 4 * hour - 1));
|
||||
assert!(check_due(&mut d, NOW_UNIX + 4 * hour));
|
||||
// It repeats every boundary, not just once.
|
||||
d.handle(done(Some(hour), true), Instant::now(), NOW_UNIX + 4 * hour);
|
||||
assert!(check_due(&mut d, NOW_UNIX + 5 * hour));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_failed_check_retries_with_a_doubling_delay_capped_at_the_next_boundary() {
|
||||
let day = UPDATE_CHECK_DAILY_SECS;
|
||||
let (mut d, _) = Deadlines::new(config(Some(day), None), NOW_UNIX);
|
||||
let mut now = NOW_UNIX;
|
||||
for expected in [60, 120, 240, 480, 960, 1_920, hour, hour] {
|
||||
d.handle(done(Some(hour), false), t0, now);
|
||||
assert!(!check_due(&mut d, t0, now + expected - 1));
|
||||
assert!(check_due(&mut d, t0, now + expected));
|
||||
for expected in [60, 120, 240, 480, 960, 1_920, 3_840] {
|
||||
d.handle(done(Some(day), false), Instant::now(), now);
|
||||
assert!(!check_due(&mut d, now + expected - 1));
|
||||
assert!(check_due(&mut d, now + expected));
|
||||
now += expected;
|
||||
}
|
||||
// The next delay would pass midnight, so it retries at midnight.
|
||||
let midnight = NOW_UNIX - 8 * HOUR + DAY;
|
||||
now = midnight - 10 * M;
|
||||
d.handle(done(Some(day), false), Instant::now(), now);
|
||||
assert!(check_due(&mut d, midnight));
|
||||
// A success resets the delay: the next failure retries after a minute.
|
||||
d.handle(done(Some(hour), true), t0, now);
|
||||
assert!(check_due(&mut d, t0, now + hour));
|
||||
now += hour;
|
||||
d.handle(done(Some(hour), false), t0, now);
|
||||
assert!(check_due(&mut d, t0, now + 60));
|
||||
d.handle(done(Some(day), true), Instant::now(), midnight);
|
||||
d.handle(done(Some(day), false), Instant::now(), midnight + HOUR);
|
||||
assert!(check_due(&mut d, midnight + HOUR + 60));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_failed_check_with_auto_check_off_stays_off() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
d.handle(done(None, false), t0, NOW_UNIX);
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + 7 * DAY));
|
||||
let (mut d, _) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
d.handle(done(None, false), Instant::now(), NOW_UNIX);
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 7 * DAY));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_update_deadline_follows_the_wall_clock_across_a_sleep() {
|
||||
fn the_wall_clock_deadlines_survive_a_sleep() {
|
||||
// `Instant` does not advance while the machine sleeps, but the
|
||||
// check is still due once the wall clock passes its time.
|
||||
// deadlines are due once the wall clock passes them.
|
||||
let t0 = Instant::now();
|
||||
let day = UPDATE_CHECK_DAILY_SECS;
|
||||
let (mut d, _) = Deadlines::new(config(Some(day), Some(NOW_UNIX)), t0, NOW_UNIX);
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + day - 1));
|
||||
assert!(check_due(
|
||||
&mut d,
|
||||
t0 + Duration::from_secs(1),
|
||||
NOW_UNIX + day
|
||||
));
|
||||
let (mut d, _) = Deadlines::new(config(Some(day), Some(NOW_UNIX)), NOW_UNIX);
|
||||
let midnight = NOW_UNIX - 8 * HOUR + DAY;
|
||||
assert!(!d
|
||||
.take_due(t0, midnight - 1)
|
||||
.contains(&Action::CheckForUpdates));
|
||||
assert!(d.take_due(t0, midnight).contains(&Action::CheckForUpdates));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resume_polls_at_once_and_rearms_the_poll() {
|
||||
fn resume_polls_at_once_and_rearms_the_poll_at_its_boundary() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(config(None, None), t0, NOW_UNIX);
|
||||
let t1 = t0 + 2 * MIN;
|
||||
assert_eq!(d.resume(t1), [Action::Poll]);
|
||||
assert!(d.take_due(t0 + 5 * MIN, NOW_UNIX).is_empty());
|
||||
assert_eq!(d.next_wakeup(t1, NOW_UNIX), 5 * MIN);
|
||||
assert_eq!(d.take_due(t1 + 5 * MIN, NOW_UNIX), [Action::Poll]);
|
||||
let (mut d, _) = Deadlines::new(config(None, None), NOW_UNIX);
|
||||
let woke = NOW_UNIX + 7 * HOUR + 2 * M;
|
||||
assert_eq!(d.resume(woke), [Action::Poll]);
|
||||
assert!(d.take_due(t0, woke).is_empty());
|
||||
assert_eq!(d.next_wakeup(t0, woke), 3 * MIN);
|
||||
assert_eq!(d.take_due(t0, woke + 3 * M), [Action::Poll]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -520,11 +571,10 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn weekly_to_daily_with_the_last_check_two_days_ago_checks_at_once() {
|
||||
let t0 = Instant::now();
|
||||
fn weekly_to_daily_checks_at_once_when_midnight_passed_since_the_last_check() {
|
||||
let last = Some(NOW_UNIX - 2 * DAY);
|
||||
let (mut d, initial) =
|
||||
Deadlines::new(config(Some(UPDATE_CHECK_WEEKLY_SECS), last), t0, NOW_UNIX);
|
||||
Deadlines::new(config(Some(UPDATE_CHECK_WEEKLY_SECS), last), NOW_UNIX);
|
||||
assert!(initial.is_empty());
|
||||
assert_eq!(
|
||||
d.handle(
|
||||
@@ -532,7 +582,7 @@ mod tests {
|
||||
interval_secs: Some(UPDATE_CHECK_DAILY_SECS),
|
||||
last_check_unix: last,
|
||||
},
|
||||
t0,
|
||||
Instant::now(),
|
||||
NOW_UNIX,
|
||||
),
|
||||
[Action::CheckForUpdates]
|
||||
@@ -540,44 +590,40 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn daily_to_weekly_waits_for_the_new_remainder() {
|
||||
let t0 = Instant::now();
|
||||
fn daily_to_weekly_waits_for_monday() {
|
||||
let last = Some(NOW_UNIX - 2 * DAY);
|
||||
let (mut d, _) = Deadlines::new(config(Some(UPDATE_CHECK_HOURLY_SECS), last), t0, NOW_UNIX);
|
||||
let (mut d, _) = Deadlines::new(config(Some(UPDATE_CHECK_HOURLY_SECS), last), NOW_UNIX);
|
||||
let actions = d.handle(
|
||||
Message::SetUpdateInterval {
|
||||
interval_secs: Some(UPDATE_CHECK_WEEKLY_SECS),
|
||||
last_check_unix: last,
|
||||
},
|
||||
t0,
|
||||
Instant::now(),
|
||||
NOW_UNIX,
|
||||
);
|
||||
assert!(actions.is_empty());
|
||||
let remaining = 5 * DAY;
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + remaining - 60));
|
||||
assert!(check_due(&mut d, t0, NOW_UNIX + remaining));
|
||||
assert!(!check_due(&mut d, MONDAY + 7 * DAY - 1));
|
||||
assert!(check_due(&mut d, MONDAY + 7 * DAY));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn disabling_auto_check_cancels_the_deadline() {
|
||||
let t0 = Instant::now();
|
||||
let (mut d, _) = Deadlines::new(
|
||||
config(Some(UPDATE_CHECK_HOURLY_SECS), Some(NOW_UNIX - 600)),
|
||||
t0,
|
||||
NOW_UNIX,
|
||||
config(Some(UPDATE_CHECK_HOURLY_SECS), Some(NOW_UNIX + 60)),
|
||||
NOW_UNIX + 600,
|
||||
);
|
||||
d.handle(
|
||||
Message::SetUpdateInterval {
|
||||
interval_secs: None,
|
||||
last_check_unix: Some(NOW_UNIX - 600),
|
||||
last_check_unix: Some(NOW_UNIX + 60),
|
||||
},
|
||||
t0,
|
||||
NOW_UNIX,
|
||||
Instant::now(),
|
||||
NOW_UNIX + 600,
|
||||
);
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + 7 * DAY));
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 7 * DAY));
|
||||
// A check that finishes after auto-check was turned off stays off.
|
||||
d.handle(done(None, true), t0, NOW_UNIX);
|
||||
assert!(!check_due(&mut d, t0, NOW_UNIX + 14 * DAY));
|
||||
d.handle(done(None, true), Instant::now(), NOW_UNIX);
|
||||
assert!(!check_due(&mut d, NOW_UNIX + 14 * DAY));
|
||||
}
|
||||
|
||||
/// Records actions on a channel, standing in for the runtime.
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
/* Bubble palette. Accent and fill colours come from the payload. */
|
||||
:root[data-theme='dark'] {
|
||||
/* 60% opaque, so the desktop shows through. Tracks and the edge are
|
||||
/* 80% opaque, so the desktop shows through. Tracks and the edge are
|
||||
tints over it, so they keep the same contrast step on a light or dark
|
||||
desktop; the text halo keeps text readable on either. */
|
||||
--bg: rgb(31 31 31 / 60%);
|
||||
--bg: rgb(31 31 31 / 80%);
|
||||
--track: rgb(0 0 0 / 28%);
|
||||
--time-track: rgb(255 255 255 / 14%);
|
||||
--time-fill: #b0b0b0;
|
||||
@@ -14,7 +14,7 @@
|
||||
}
|
||||
|
||||
:root[data-theme='light'] {
|
||||
--bg: rgb(243 243 243 / 60%);
|
||||
--bg: rgb(243 243 243 / 80%);
|
||||
--track: rgb(0 0 0 / 10%);
|
||||
--time-track: rgb(0 0 0 / 8%);
|
||||
--time-fill: #666666;
|
||||
|
||||
Reference in new issue
Block a user