Dawnline 0.20.0
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

- **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.
This commit is contained in:
Aemeath committed 2026-11-13 09:43:50 +03:00
1 parent f8130e39a8
commit ac90575b0b
788 files changed
+139244 -41720

No files matched your search

+110
View File
@@ -0,0 +1,110 @@
// Package state is where a person stands: whether their access works now, and if not, why. As
// dawnline.core works it out (own_state, person_state, person_usage, person_quota): the same answer for the
// same settings, counters and moment, because the access rules, the admin and the person's own page must all
// say the same thing.
//
// Pure: the settings, the counters and a moment in, a word out. Days are the router's (package zone).
package state
import (
"regexp"
"strconv"
"time"
"github.com/tickcount/luci-app-dawnline/backend/model"
"github.com/tickcount/luci-app-dawnline/backend/usage"
"github.com/tickcount/luci-app-dawnline/backend/zone"
)
// The states.
const (
Active = "active"
Paused = "paused"
Expired = "expired"
Quota = "quota"
NoServer = "no_server"
ServerOff = "server_off"
)
var date = regexp.MustCompile(`^([0-9]{4})-([0-9]{2})-([0-9]{2})$`)
// DateEnd is the last second of a day "YYYY-MM-DD" on the router's calendar; ok is false for anything else.
func DateEnd(s string) (int64, bool) {
m := date.FindStringSubmatch(s)
if m == nil {
return 0, false
}
y, _ := strconv.Atoi(m[1])
mo, _ := strconv.Atoi(m[2])
d, _ := strconv.Atoi(m[3])
return time.Date(y, time.Month(mo), d, 23, 59, 59, 0, zone.Local()).Unix(), true
}
// Usage is the bytes a person used in their limit's period at ts: their limit month, or all time.
func Usage(p *model.Person, u *usage.Usage, ts int64) float64 {
if u == nil {
return 0
}
rec := u.People[p.ID]
if rec == nil {
return 0
}
if p.QuotaPeriod == "total" {
if rec.Total == nil {
return 0
}
return rec.Total[0] + rec.Total[1]
}
if lm := usage.LimitMonth(rec, ts); lm != nil {
return lm.Rx + lm.Tx
}
return 0
}
// QuotaBytes is a person's limit at ts: the base and the extra data while it lasts; 0 is no limit.
func QuotaBytes(p *model.Person, ts int64) float64 {
if !(p.QuotaGB > 0) {
return 0
}
gb := p.QuotaGB
if p.BonusGB > 0 && ts < int64(p.BonusUntil) {
gb += p.BonusGB
}
return gb * 1073741824
}
// PersonExpired tells whether a person's end date has passed.
func PersonExpired(p *model.Person, ts int64) bool {
if p.Expires == "" {
return false
}
end, ok := DateEnd(p.Expires)
return ok && ts > end
}
// Own is a person's state whatever their server is doing.
func Own(p *model.Person, u *usage.Usage, ts int64) string {
if p.Paused {
return Paused
}
// Past the end date access stops: the one thing an end date does.
if PersonExpired(p, ts) {
return Expired
}
if q := QuotaBytes(p, ts); q > 0 && Usage(p, u, ts) >= q {
return Quota
}
return Active
}
// Of is a person's state: active, or why they are off (their own reason, or their server's).
func Of(m *model.Model, p *model.Person, u *usage.Usage, ts int64) string {
srv := m.Servers[p.Server]
if srv == nil {
return NoServer
}
if !srv.Enabled {
return ServerOff
}
return Own(p, u, ts)
}
+80
View File
@@ -0,0 +1,80 @@
package state
import (
"encoding/json"
"os"
"testing"
"time"
"github.com/tickcount/luci-app-dawnline/backend/model"
"github.com/tickcount/luci-app-dawnline/backend/uci"
"github.com/tickcount/luci-app-dawnline/backend/usage"
"github.com/tickcount/luci-app-dawnline/backend/zone"
)
// Every person of testdata/state.uci, at every moment of the trace, stands where ucode says
// (scripts/ucode-golden.sh writes trace.json from dawnline.core).
func TestHeldToUcode(t *testing.T) {
zone.Set(time.UTC)
text, err := os.ReadFile("testdata/state.uci")
if err != nil {
t.Fatal(err)
}
c, err := uci.Parse(string(text))
if err != nil {
t.Fatal(err)
}
m := model.Load(c, nil)
raw, err := os.ReadFile("testdata/trace.json")
if err != nil {
t.Fatal(err)
}
var golden struct {
Usage *usage.Usage `json:"usage"`
Moments []struct {
TS int64 `json:"ts"`
People map[string]struct {
State string `json:"state"`
Own string `json:"own"`
Used float64 `json:"used"`
Quota float64 `json:"quota"`
} `json:"people"`
} `json:"moments"`
}
if err := json.Unmarshal(raw, &golden); err != nil {
t.Fatal(err)
}
seen := map[string]bool{}
for _, at := range golden.Moments {
if len(at.People) != len(m.People) {
t.Fatalf("ucode knows %d people, Go %d", len(at.People), len(m.People))
}
for id, want := range at.People {
p := m.People[id]
got := [2]string{Of(m, p, golden.Usage, at.TS), Own(p, golden.Usage, at.TS)}
if got != [2]string{want.State, want.Own} {
t.Errorf("%s at %d: %v, ucode has %s / %s", id, at.TS, got, want.State, want.Own)
}
if u, q := Usage(p, golden.Usage, at.TS), QuotaBytes(p, at.TS); u != want.Used || q != want.Quota {
t.Errorf("%s at %d: used %v of %v, ucode has %v of %v", id, at.TS, u, q, want.Used, want.Quota)
}
seen[want.State] = true
}
}
for _, s := range []string{Active, Paused, Expired, Quota, NoServer, ServerOff} {
if !seen[s] {
t.Errorf("the trace never reaches %q", s)
}
}
}
// An end date is the router's own day.
func TestTheRoutersDay(t *testing.T) {
msk, _ := zone.FromPOSIX("MSK-3")
zone.Set(msk)
defer zone.Set(time.UTC)
end, ok := DateEnd("2026-11-12")
if !ok || time.Unix(end, 0).UTC().Format("2006-01-02 15:04:05") != "2026-11-12 20:59:59" {
t.Fatalf("the end of the day: %v", time.Unix(end, 0).UTC())
}
}
+42
View File
@@ -0,0 +1,42 @@
# People in every state, for testdata/trace.uc.
config settings 'settings'
config server 'on'
option subnet '10.9.0.0/24'
config server 'off'
option subnet '10.10.0.0/24'
option enabled '0'
config person 'plain'
option server 'on'
config person 'paused'
option server 'on'
option paused '1'
option expires '2020-01-01'
config person 'ends'
option server 'on'
option expires '2027-01-15'
config person 'badend'
option server 'on'
option expires 'soon'
config person 'month'
option server 'on'
option quota_gb '1'
config person 'bonus'
option server 'on'
option quota_gb '1'
option bonus_gb '2'
option bonus_until '1800500000'
config person 'total'
option server 'on'
option quota_gb '0.5'
option quota_period 'total'
config person 'legacy'
option server 'on'
option quota_gb '1'
config person 'nowhere'
option server 'gone'
config person 'serveroff'
option server 'off'
option paused '1'
+704
View File
@@ -0,0 +1,704 @@
{
"usage": {
"devices": {
},
"people": {
"month": {
"total": [
3221225472,
3221225472
],
"period": {
"start": 1800000000,
"rx": 429496729.6,
"tx": 751619276.8
}
},
"bonus": {
"total": [
9663676416,
0
],
"period": {
"start": 1800000000,
"rx": 1073741824,
"tx": 1610612736.0
}
},
"total": {
"total": [
214748364.8,
332859965.44
]
},
"legacy": {
"total": [
2147483648,
0
],
"months": {
"2027-01": [
644245094.4,
644245094.4
],
"2027-02": [
107374182.4,
0
]
}
}
}
},
"moments": [
{
"ts": 1800000000,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800021600,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800055800,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800057600,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800080400,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800400000,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 2684354560.0,
"quota": 3221225472
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1800600000,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "quota",
"own": "quota",
"used": 2684354560.0,
"quota": 1073741824
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "quota",
"own": "quota",
"used": 1288490188.8,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1801728000,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "quota",
"own": "quota",
"used": 2684354560.0,
"quota": 1073741824
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "active",
"own": "active",
"used": 107374182.4,
"quota": 1073741824
},
"month": {
"state": "quota",
"own": "quota",
"used": 1181116006.4,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1802764800,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 0,
"quota": 1073741824
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "active",
"own": "active",
"used": 107374182.4,
"quota": 1073741824
},
"month": {
"state": "active",
"own": "active",
"used": 0,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
},
{
"ts": 1804320000,
"people": {
"badend": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"bonus": {
"state": "active",
"own": "active",
"used": 0,
"quota": 1073741824
},
"ends": {
"state": "expired",
"own": "expired",
"used": 0,
"quota": 0
},
"legacy": {
"state": "active",
"own": "active",
"used": 0,
"quota": 1073741824
},
"month": {
"state": "active",
"own": "active",
"used": 0,
"quota": 1073741824
},
"nowhere": {
"state": "no_server",
"own": "active",
"used": 0,
"quota": 0
},
"paused": {
"state": "paused",
"own": "paused",
"used": 0,
"quota": 0
},
"plain": {
"state": "active",
"own": "active",
"used": 0,
"quota": 0
},
"serveroff": {
"state": "server_off",
"own": "paused",
"used": 0,
"quota": 0
},
"total": {
"state": "quota",
"own": "quota",
"used": 547608330.24,
"quota": 536870912.0
}
}
}
]
}