Files
dawnline/backend/geo/locator.go
T
Aemeath ac90575b0b
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions
Dawnline 0.20.0
- **Backend rewritten in Go.** One daemon, `dawnlined`, replaces the whole ucode backend: the rpcd plugin, the agent, the CLI and the updater. The package no longer depends on ucode.
- **Per-architecture builds.** The release carries the backend for arm64, ARMv7, mips, mipsle and amd64; the router fetches its own after the package is installed and checks its sha256. Dawnline does not run on other architectures (older ARM, 32-bit x86, RISC-V).
- **Faster on the router.** A firewall sync takes 0.06 s instead of 0.9 s; a full apply takes about 300 ms. The portal is served by the daemon itself, without a CGI process per request.
- **Live pages.** The admin and the portal follow a live stream from the router instead of re-fetching the whole state every 30 seconds.
- **Admin redesigned in the portal's style.** Three sections (Overview · Log · Settings); a server is a page of its own with People, Places and Settings; a device opens as a dialog over its person.
- **Changes wait for «Apply».** Every setting, and a person's access, is staged in one dock before it reaches the router.
- **Configuration rollout.** After a change that makes devices fetch their configuration again, the admin shows how many have fetched it and who has not. Every setting shows beforehand (⟳N) how many devices it will touch.
- **Waiting for a decision.** Overview and People put first the people who need one (access ended, limit reached, a device that does not connect), each with its one action a tap away.
- **Bulk actions on people.** «Select» (or a long press on a card) picks several people to extend by a month, pause or resume at once.
- **Undo.** An action done from a card or a request is undone from its toast.
- **Update dialogs redesigned.** An update is one view from its question to its result; Dawnline's own update runs in it like every other, and the page reloads itself once the new version answers. Other versions are a list, each with its notes and Install on a page of its own.
- **Site to site: networks behind a router.** A router connected as a device can have networks behind it (up to eight, /16 to /30): the server routes them and applies the router's access to them. A network that shares addresses with a tunnel, the router's own networks or another site is refused by name.
- **Routers from the portal.** People can add a router and name its networks on their own page; the admin accepts or declines with a reason, or lets them through without asking.
- **Check access and Health know the networks behind routers.**
- **Usage limits reworked.** A monthly limit no longer follows the calendar. A person's month starts with their first traffic and ends a month later; the next one starts only when they connect again, so time away uses up none of it. Before, everyone's limit reset on the 1st.
- Extra data lasts until that person's month ends; «Reset usage» starts the month anew.
- A limit is for a month or for the whole term; the admin and the portal show when it resets.
- Charts that said «this month» show the last 30 days.
- After the update nobody loses what was counted: the month that was running becomes the person's first and ends on the 1st.
- **Access by time of day removed.** The Hours limit is gone from the admin, the portal and the backend; saved hours are dropped.
- **Expiry simplified.** An end date always stops access, with a heads-up three days before; the per-person choice is gone.
- **No false disconnects from sleeping phones.** A phone or a tablet stays online through ten minutes of silence.
- **Mobile Safari fixes.** Pressing a control no longer sends the page to its top; tab tracks that do not fit scroll; switches animate after a press.
2026-11-13 09:43:50 +03:00

161 lines
3.7 KiB
Go

package geo
import (
"sync"
"time"
"github.com/tickcount/luci-app-dawnline/backend/usage"
)
// A lookup run: this many addresses at most, within this long.
const (
perRun = 3
budget = 12 * time.Second
)
// Locator finds the places of addresses for the map, a few at a time and never in the way of who asks: a
// lookup waits on the network for seconds. Addresses that just connected go first; the minute adds
// anything still shown that is missing or stale. One run at a time; what did not fit waits for the next.
type Locator struct {
Store Store
Get Fetch
// Usage is the counters now: they tell which addresses are still shown, and whose they are.
Usage func() *usage.Usage
// Found is told the places found ("City · ISP" by address) and the devices seen from those addresses.
Found func(where map[string]string, devices []string)
mu sync.Mutex
pending []string
running bool
lastHome int64
}
func (l *Locator) shown(u *usage.Usage) []string {
var ips []string
seen := map[string]bool{}
if u == nil {
return ips
}
for _, rec := range u.Devices {
for ip := range rec.IPs {
if !seen[ip] {
seen[ip] = true
ips = append(ips, ip)
}
}
}
return ips
}
// Ask has these addresses located now (provider: the settings' choice), and with them whatever of more is
// missing or stale. It returns at once; the run goes on by itself.
func (l *Locator) Ask(provider string, ips, more []string) {
l.mu.Lock()
for _, ip := range ips {
known := false
for _, q := range l.pending {
known = known || q == ip
}
if !known {
l.pending = append(l.pending, ip)
}
}
if l.running {
l.mu.Unlock()
return
}
todo := Stale(l.Store.Load(), append(append([]string{}, l.pending...), more...), time.Now().Unix())
want := todo
if len(want) > perRun {
want = want[:perRun]
}
// what just connected and did not fit waits for the next run
var rest []string
for _, ip := range todo[len(want):] {
for _, q := range l.pending {
if q == ip {
rest = append(rest, ip)
}
}
}
l.pending = rest
if len(want) == 0 {
l.mu.Unlock()
return
}
l.running = true
l.mu.Unlock()
go func() {
found := LookupAll(l.Get, provider, want, perRun, budget)
l.done(found)
l.mu.Lock()
l.running = false
again := len(l.pending) > 0
l.mu.Unlock()
if again {
l.Ask(provider, nil, nil)
}
}()
}
// done puts a run's results into the cache and tells who waits for them.
func (l *Locator) done(found map[string]Place) {
u := l.Usage()
c := l.Store.Load()
if !Merge(c, found, l.shown(u), time.Now().Unix()) {
return
}
l.Store.Save(c)
where := map[string]string{}
for ip, p := range found {
if s := Label(p); s != "" {
where[ip] = s
}
}
if len(where) == 0 || l.Found == nil {
return
}
var devices []string
if u != nil {
for id, rec := range u.Devices {
for ip := range where {
if _, has := rec.IPs[ip]; has {
devices = append(devices, id)
break
}
}
}
}
l.Found(where, devices)
}
// Minute is the minute's part: addresses still shown that are missing or stale get a run, and the router's
// own place is looked at about hourly (wan: its public address as the router has it, "" when unknown).
func (l *Locator) Minute(enabled bool, provider, wan string) {
if !enabled {
l.mu.Lock()
l.pending = nil
l.mu.Unlock()
return
}
l.Ask(provider, nil, l.shown(l.Usage()))
now := time.Now().Unix()
l.mu.Lock()
due := now-l.lastHome > 3600
if due {
l.lastHome = now
}
l.mu.Unlock()
if due {
go func() {
c := l.Store.Load()
if ResolveHome(l.Get, provider, c, wan, time.Now().Unix()) {
// the places found meanwhile are the file's: only the router's own is put in
fresh := l.Store.Load()
fresh.Home = c.Home
l.Store.Save(fresh)
}
}()
}
}