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.
111 lines
4.8 KiB
TypeScript
111 lines
4.8 KiB
TypeScript
// The demo's router at LuCI's ubus door: it owns fetch for that one address and answers the JSON-RPC the page sends
|
|
// there as the backend's object `dawnline` does, from status.ts and router.ts. Two kinds of question come: the stream's (hello,
|
|
// sync, wait, watch, refresh: state/transport.ts), answered with the whole state as one snapshot that never moves,
|
|
// and the pages' own (the log, a person's usage, the checks, the service log, a server's interfaces, a device's
|
|
// configuration).
|
|
//
|
|
// It answers questions only. Anything else (a change, or a question no page of the demo's asks yet) is refused as
|
|
// ubus refuses an unknown method, and named on the console, so whoever opens a page it cannot draw sees why.
|
|
// Imported before the admin (main.ts): the door is taken before a page asks.
|
|
|
|
import { DOOR } from './luci';
|
|
import { NOW } from './past';
|
|
import { config, events, health, interfaces, meter, serviceLog } from './router';
|
|
import { status, usage } from './status';
|
|
import type { Lang } from './cast';
|
|
|
|
/** ubus's own status codes. */
|
|
const OK = 0;
|
|
const METHOD_NOT_FOUND = 3;
|
|
const NOT_FOUND = 4;
|
|
|
|
const EPOCH = 'demo';
|
|
const started = Date.now();
|
|
/** The router's clock: the demo's moment, moving on with the page (so what the page holds stays fresh). */
|
|
const clock = (): number => NOW + (Date.now() - started) / 1000;
|
|
/** The router says its own words in the page's language. */
|
|
const lang = (): Lang => (document.documentElement.lang === 'ru' ? 'ru' : 'en');
|
|
|
|
type Args = Record<string, unknown>;
|
|
const text = (v: unknown): string | undefined => (typeof v === 'string' && v ? v : undefined);
|
|
const count = (v: unknown): number | undefined => (typeof v === 'number' && Number.isFinite(v) ? v : undefined);
|
|
|
|
/** The status cut into the stream's topics (state/join.ts puts them together again), with the meter and the backend's own. */
|
|
function topics(): Record<string, unknown> {
|
|
const { now, tz, servers, people, circles, services, geo, events: recent, totals, series, hours, ...router } = status(lang());
|
|
return {
|
|
backend: { ok: true, at: clock() },
|
|
router,
|
|
clock: { now, tz },
|
|
traffic: { totals, series, hours },
|
|
servers,
|
|
people,
|
|
circles,
|
|
services,
|
|
places: geo,
|
|
recent,
|
|
meter: meter(),
|
|
};
|
|
}
|
|
|
|
const sleep = (seconds: number) => new Promise((done) => setTimeout(done, seconds * 1000));
|
|
|
|
const ANSWERS: Record<string, (a: Args) => unknown> = {
|
|
hello: () => ({ version: 'demo', stream: 'poll', epoch: EPOCH, seq: 1, lease: 30, now: clock() }),
|
|
sync: () => ({ epoch: EPOCH, seq: 1, docs: topics() }),
|
|
// nothing ever happens here: a held call is let go empty when its time is up
|
|
wait: (a) => sleep(count(a.timeout) ?? 15).then(() => ({ epoch: EPOCH, seq: 1, events: [] })),
|
|
watch: () => ({}),
|
|
refresh: () => ({}),
|
|
events: (a) => events(lang(), count(a.limit) ?? 0, text(a.person), count(a.since), text(a.device)),
|
|
person_usage: (a) => usage(text(a.id) ?? '', count(a.days) ?? 31),
|
|
health: () => health(lang()),
|
|
interfaces: (a) => interfaces(text(a.id) ?? ''),
|
|
device_config: (a) => config(text(a.id) ?? '', lang()),
|
|
service_log: () => serviceLog(),
|
|
};
|
|
|
|
interface Call {
|
|
id?: unknown;
|
|
params?: unknown;
|
|
}
|
|
|
|
async function answer(call: Call): Promise<object> {
|
|
const [, object, method, args] = Array.isArray(call.params) ? (call.params as unknown[]) : [];
|
|
const reply = (code: number, data?: unknown) => ({
|
|
jsonrpc: '2.0',
|
|
id: call.id ?? null,
|
|
result: data === undefined ? [code] : [code, data],
|
|
});
|
|
if (object !== 'dawnline' || typeof method !== 'string') return reply(NOT_FOUND);
|
|
const made = Object.prototype.hasOwnProperty.call(ANSWERS, method)
|
|
? await ANSWERS[method](args && typeof args === 'object' ? (args as Args) : {})
|
|
: undefined;
|
|
if (made == null) {
|
|
console.warn(`Dawnline demo: the router does not answer "${method}"`);
|
|
return reply(METHOD_NOT_FOUND);
|
|
}
|
|
return reply(OK, made);
|
|
}
|
|
|
|
/** One request to the door: a call or a batch of them; given up when the page lets it go (a held call it no longer waits for). */
|
|
async function door(init: RequestInit = {}): Promise<Response> {
|
|
const gone = new Promise<never>((_ok, fail) =>
|
|
init.signal?.addEventListener('abort', () => fail(new DOMException('Aborted', 'AbortError'))),
|
|
);
|
|
let asked: Call | Call[];
|
|
try {
|
|
asked = JSON.parse(String(init.body)) as Call | Call[];
|
|
} catch {
|
|
return new Response('', { status: 400 });
|
|
}
|
|
const made = Array.isArray(asked) ? Promise.all(asked.map(answer)) : answer(asked);
|
|
return new Response(JSON.stringify(await Promise.race([made, gone])), { headers: { 'Content-Type': 'application/json' } });
|
|
}
|
|
|
|
const real = window.fetch.bind(window);
|
|
window.fetch = (input, init) => {
|
|
const url = typeof input === 'string' ? input : input instanceof URL ? input.href : input.url;
|
|
return new URL(url, location.href).pathname === DOOR ? door(init) : real(input, init);
|
|
};
|