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.
294 lines
9.5 KiB
TypeScript
294 lines
9.5 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
||
import {
|
||
cities,
|
||
inPeriod,
|
||
moment,
|
||
msAt,
|
||
placeKey,
|
||
replayStays,
|
||
shares,
|
||
stays,
|
||
stretches,
|
||
stripRuns,
|
||
ticks,
|
||
timeline,
|
||
union,
|
||
visits,
|
||
visitsOf,
|
||
} from '../src/admin/places/model';
|
||
import type { GeoPoint, LogEvent } from '../src/shared/types';
|
||
|
||
const D = 'd_1';
|
||
const ev = (ts: number, type: string, detail?: string, device = D): LogEvent => ({ ts, type, detail, device, person: 'p' });
|
||
const pt = (ip: string, city: string, lat: number, lon: number, device = D): GeoPoint => ({
|
||
person: 'p',
|
||
device,
|
||
ip,
|
||
ts: 0,
|
||
online: false,
|
||
lat,
|
||
lon,
|
||
city,
|
||
country: 'Russia',
|
||
cc: 'RU',
|
||
asn: 1,
|
||
org: `${city} ISP`,
|
||
});
|
||
const HOME = pt('37.78.36.76', 'Krasnodar', 45.04, 38.98);
|
||
const MOBILE = pt('85.249.175.96', 'Novocherkassk', 47.42, 40.09);
|
||
|
||
describe('stretches', () => {
|
||
it('follows connects, roams and disconnects', () => {
|
||
const list = stretches(
|
||
[
|
||
ev(100, 'connect', HOME.ip),
|
||
ev(200, 'roam', `${HOME.ip} → ${MOBILE.ip}`),
|
||
ev(300, 'disconnect'),
|
||
ev(400, 'connect', HOME.ip),
|
||
ev(150, 'connect', 'x', 'other'),
|
||
],
|
||
D,
|
||
1000,
|
||
true,
|
||
);
|
||
expect(list).toEqual([
|
||
{ ip: HOME.ip, from: 100, to: 200, live: false },
|
||
{ ip: MOBILE.ip, from: 200, to: 300, live: false },
|
||
{ ip: HOME.ip, from: 400, to: 1000, live: true },
|
||
]);
|
||
});
|
||
|
||
it('ends an open stretch at the last handshake when the device is offline', () => {
|
||
expect(stretches([ev(100, 'connect', HOME.ip)], D, 1000, false, 600)).toEqual([{ ip: HOME.ip, from: 100, to: 600, live: false }]);
|
||
expect(stretches([ev(100, 'connect', HOME.ip)], D, 1000, false)).toEqual([]);
|
||
});
|
||
|
||
it('closes a stretch at a connect the log saw without a disconnect, and sorts by time', () => {
|
||
expect(stretches([ev(300, 'connect', MOBILE.ip), ev(100, 'connect', HOME.ip)], D, 400, false, 350)).toEqual([
|
||
{ ip: HOME.ip, from: 100, to: 300, live: false },
|
||
{ ip: MOBILE.ip, from: 300, to: 350, live: false },
|
||
]);
|
||
});
|
||
|
||
it('is empty without connections in the log', () => {
|
||
expect(stretches([ev(100, 'device_added', 'Phone')], D, 1000, true)).toEqual([]);
|
||
});
|
||
});
|
||
|
||
describe('visits and stays', () => {
|
||
const s = stretches(
|
||
[
|
||
ev(0, 'connect', HOME.ip),
|
||
ev(3600, 'roam', `${HOME.ip} → ${MOBILE.ip}`),
|
||
ev(3900, 'roam', `${MOBILE.ip} → ${HOME.ip}`), // 5 min on mobile data
|
||
ev(7200, 'roam', `${HOME.ip} → ${MOBILE.ip}`),
|
||
ev(18000, 'roam', `${MOBILE.ip} → 10.0.0.9`), // not located: left out
|
||
ev(19000, 'roam', `10.0.0.9 → ${HOME.ip}`),
|
||
],
|
||
D,
|
||
20000,
|
||
true,
|
||
);
|
||
const v = visits(s, [HOME, MOBILE, pt(HOME.ip, 'Elsewhere', 1, 1, 'other')], D, 1800);
|
||
|
||
it('keeps located addresses at their place, clipped to the range', () => {
|
||
expect(v.map((x) => [x.key, x.from, x.to])).toEqual([
|
||
['Krasnodar|RU', 1800, 3600],
|
||
['Novocherkassk|RU', 3600, 3900],
|
||
['Krasnodar|RU', 3900, 7200],
|
||
['Novocherkassk|RU', 7200, 18000],
|
||
['Krasnodar|RU', 19000, 20000],
|
||
]);
|
||
expect(v[0].point.city).toBe('Krasnodar');
|
||
});
|
||
|
||
it('shares the time by place', () => {
|
||
const sh = shares(v);
|
||
expect(sh.get('Krasnodar|RU')! + sh.get('Novocherkassk|RU')!).toBeCloseTo(1);
|
||
expect(sh.get('Novocherkassk|RU')).toBeCloseTo(11100 / 17200);
|
||
});
|
||
|
||
it('folds short visits into the stay around them', () => {
|
||
const st = stays(v);
|
||
expect(st.map((x) => [x.key, x.from, x.to, x.short, x.live])).toEqual([
|
||
['Krasnodar|RU', 1800, 7200, 1, false],
|
||
['Novocherkassk|RU', 7200, 18000, 0, false],
|
||
['Krasnodar|RU', 19000, 20000, 0, true],
|
||
]);
|
||
});
|
||
|
||
it('folds for a replay only as far as needed', () => {
|
||
expect(replayStays(v).length).toBe(5); // few moves: every one
|
||
expect(replayStays(v, 2).map((x) => x.key)).toEqual(['Krasnodar|RU', 'Novocherkassk|RU', 'Krasnodar|RU']);
|
||
});
|
||
|
||
it('keys places like the map: the city, or rounded coordinates', () => {
|
||
expect(placeKey(HOME)).toBe('Krasnodar|RU');
|
||
expect(placeKey({ city: '', lat: 45.0449, lon: 38.981, cc: 'RU' })).toBe('45.0,39.0|RU');
|
||
});
|
||
});
|
||
|
||
describe('replay', () => {
|
||
const st = stays(
|
||
visits(stretches([ev(0, 'connect', HOME.ip), ev(36000, 'roam', `${HOME.ip} → ${MOBILE.ip}`)], D, 40000, true), [HOME, MOBILE], D, 0),
|
||
);
|
||
const { steps, total } = timeline(st, 1000);
|
||
|
||
it('plays a move before each stay but the first, stays held within bounds', () => {
|
||
expect(steps.map((s) => s.kind)).toEqual(['stay', 'move', 'stay']);
|
||
expect(steps[0].ms).toBe(450); // 10 h
|
||
expect(steps[2].ms).toBe(350); // an hour: the shortest hold
|
||
expect(total).toBe(450 + 1000 + 350);
|
||
});
|
||
|
||
it('finds the moment for a time and back', () => {
|
||
expect(moment(st, steps, 0).t).toBe(0);
|
||
expect(moment(st, steps, 500)).toMatchObject({ i: 1, t: 36000 });
|
||
expect(moment(st, steps, total).t).toBe(40000);
|
||
const ms = msAt(st, steps, 38000);
|
||
expect(moment(st, steps, ms).t).toBeCloseTo(38000, -1);
|
||
});
|
||
});
|
||
|
||
describe('ticks', () => {
|
||
const now = Date.UTC(2026, 9, 18, 21, 0) / 1000;
|
||
it('labels days for a week, inside the strip', () => {
|
||
const t = ticks('7d', now);
|
||
expect(t.length).toBeGreaterThanOrEqual(6);
|
||
expect(t.every(([f]) => f > 0 && f < 1)).toBe(true);
|
||
expect(t.map(([f]) => f)).toEqual(t.map(([f]) => f).sort((a, b) => a - b));
|
||
});
|
||
it('labels every six hours for a day', () => {
|
||
const t = ticks('24h', now);
|
||
expect(t.length).toBeGreaterThanOrEqual(3);
|
||
expect(t.every(([, l]) => /^\d\d:00$/.test(l))).toBe(true);
|
||
});
|
||
});
|
||
|
||
describe('cities', () => {
|
||
const at = (device: string, city: string, ts: number, online = false, cc = 'RU'): GeoPoint => ({
|
||
...pt(`10.0.0.${ts % 250}`, city, 45, 39, device),
|
||
ts,
|
||
online,
|
||
cc,
|
||
});
|
||
|
||
it('puts each device once per place: live over newest, newest over older', () => {
|
||
const [krd] = cities([at('a', 'Krasnodar', 100), at('a', 'Krasnodar', 300), at('a', 'Krasnodar', 200, true), at('b', 'Krasnodar', 50)]);
|
||
expect(krd.points.map((p) => [p.device, p.ts])).toEqual([
|
||
['a', 200],
|
||
['b', 50],
|
||
]);
|
||
expect(krd.live).toBe(1);
|
||
expect(krd.last).toBe(200);
|
||
});
|
||
|
||
it('orders places: someone there now, then more devices, then the most recent', () => {
|
||
const list = cities([
|
||
at('a', 'Sochi', 900),
|
||
at('b', 'Moscow', 100),
|
||
at('c', 'Moscow', 120),
|
||
at('d', 'Tula', 50, true),
|
||
at('e', 'Kazan', 950),
|
||
]);
|
||
expect(list.map((c) => c.name)).toEqual(['Tula', 'Moscow', 'Kazan', 'Sochi']);
|
||
});
|
||
|
||
it('keeps one city name in two countries apart, and names a place without a city by its country', () => {
|
||
const list = cities([at('a', 'Paris', 10, false, 'FR'), at('b', 'Paris', 20, false, 'US'), at('c', '', 30, false, 'TR')]);
|
||
expect(list).toHaveLength(3);
|
||
expect(list.map((c) => c.name).sort()).toEqual(['Paris', 'Paris', 'TR']);
|
||
});
|
||
|
||
it('is empty for no points', () => {
|
||
expect(cities([])).toEqual([]);
|
||
});
|
||
});
|
||
|
||
describe('inPeriod', () => {
|
||
it('takes live points now, and points seen within the period', () => {
|
||
const p = { ...pt('1.1.1.1', 'X', 0, 0), ts: 1000 - 3600 };
|
||
expect(inPeriod(p, 'online', 1000)).toBe(false);
|
||
expect(inPeriod({ ...p, online: true }, 'online', 1000)).toBe(true);
|
||
expect(inPeriod(p, '24h', 1000)).toBe(true);
|
||
expect(inPeriod({ ...p, ts: 1000 - 2 * 86400 }, '24h', 1000)).toBe(false);
|
||
expect(inPeriod({ ...p, ts: 1000 - 2 * 86400 }, '7d', 1000)).toBe(true);
|
||
});
|
||
});
|
||
|
||
describe("a place row's strip", () => {
|
||
it("lays a place's visits out as shares of the period, clipped to it", () => {
|
||
const now = 100_000;
|
||
const span = 10_000;
|
||
const v = [
|
||
{ key: 'a', point: HOME, from: 80_000, to: 92_000, live: false },
|
||
{ key: 'b', point: MOBILE, from: 92_000, to: 95_000, live: false },
|
||
{ key: 'a', point: HOME, from: 95_000, to: 100_000, live: true },
|
||
{ key: 'a', point: HOME, from: 10_000, to: 20_000, live: false },
|
||
];
|
||
expect(stripRuns(v, 'a', now, span)).toEqual([
|
||
[0, 0.2],
|
||
[0.5, 0.5],
|
||
]);
|
||
expect(stripRuns(v, 'b', now, span)).toEqual([[0.2, 0.3]]);
|
||
expect(stripRuns(v, 'c', now, span)).toEqual([]);
|
||
});
|
||
});
|
||
|
||
describe("a person's devices together", () => {
|
||
const PHONE = 'd_phone';
|
||
const LAPTOP = 'd_laptop';
|
||
const events = [
|
||
ev(0, 'connect', HOME.ip, PHONE),
|
||
ev(1000, 'roam', `${HOME.ip} → ${MOBILE.ip}`, PHONE),
|
||
ev(2000, 'disconnect', undefined, PHONE),
|
||
ev(500, 'connect', HOME.ip, LAPTOP),
|
||
ev(1500, 'disconnect', undefined, LAPTOP),
|
||
];
|
||
const points = [HOME, MOBILE].flatMap((x) => [
|
||
{ ...x, device: PHONE },
|
||
{ ...x, device: LAPTOP },
|
||
]);
|
||
const v = visitsOf(
|
||
events,
|
||
[
|
||
{ id: PHONE, online: false },
|
||
{ id: LAPTOP, online: false },
|
||
],
|
||
points,
|
||
3000,
|
||
0,
|
||
);
|
||
|
||
it('joins spans that overlap or touch', () => {
|
||
expect(
|
||
union([
|
||
[5, 8],
|
||
[0, 2],
|
||
[1, 3],
|
||
[3, 4],
|
||
[9, 9],
|
||
]),
|
||
).toEqual([
|
||
[0, 4],
|
||
[5, 8],
|
||
]);
|
||
expect(union([])).toEqual([]);
|
||
});
|
||
|
||
it("lists every device's visits in time order", () => {
|
||
expect(v.map((x) => [x.key, x.from, x.to])).toEqual([
|
||
['Krasnodar|RU', 0, 1000],
|
||
['Krasnodar|RU', 500, 1500],
|
||
['Novocherkassk|RU', 1000, 2000],
|
||
]);
|
||
});
|
||
|
||
it('shares the time any of them was at a place against the time any of them was anywhere', () => {
|
||
const sh = shares(v);
|
||
// Krasnodar 0–1500 of 0–2000; Novocherkassk 1000–2000, at once with the laptop at home
|
||
expect(sh.get('Krasnodar|RU')).toBeCloseTo(0.75);
|
||
expect(sh.get('Novocherkassk|RU')).toBeCloseTo(0.5);
|
||
});
|
||
});
|