Dawnline 0.16.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 / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
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 / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
- The personal page loads faster and costs the router less: its script and styles come compressed, stay in the browser until the next update, and the icon comes with the page instead of a request of its own - The page uses the system's own font (SF Pro on Apple devices, Segoe UI on Windows, Roboto on Android) instead of downloading one - The top of the page shows the server's name alone, so it fits on a phone - Text can be selected only where it is there to be copied (addresses, file names, the configuration), with the name field's own selection: a soft highlight with handles that glides after the pointer - Sheets scroll without a scrollbar - Red buttons (Remove) light up under the pointer, as the others do - Demo: "Demo" and GitHub are one button; on a phone it floats at the bottom of the screen, and switching scenarios no longer makes the edge fades jump
This commit is contained in:
1 parent
750564ab7e
commit
2388603322
91 files changed
+2564
-1027
No files matched your search
@@ -16,7 +16,7 @@ import { fmt, plural } from '../shared/i18n';
|
||||
type Service = Status['services'][number];
|
||||
|
||||
/** Circle colours; the circle stores an index. */
|
||||
export const CIRCLE_COLORS = ['#3a83f7', '#a78bfa', '#f472b6', '#f59e0b', '#10b981', '#22d3ee', '#ef4444', '#84cc16'];
|
||||
const CIRCLE_COLORS = ['#3a83f7', '#a78bfa', '#f472b6', '#f59e0b', '#10b981', '#22d3ee', '#ef4444', '#84cc16'];
|
||||
|
||||
export const circleDot = (c: Circle | undefined) =>
|
||||
E('i', { class: 'dl-circle-dot', style: `background:${CIRCLE_COLORS[c?.color ?? 0] ?? CIRCLE_COLORS[0]}` });
|
||||
@@ -26,7 +26,7 @@ export const homeAccess = (p: Person) => p.access === 'both' || (p.access === 'l
|
||||
|
||||
/* ---------- Home services ---------- */
|
||||
|
||||
export function serviceDialog(sv: Service | null, prefill: Partial<Service>, onSaved: () => unknown) {
|
||||
function serviceDialog(sv: Service | null, prefill: Partial<Service>, onSaved: () => unknown) {
|
||||
const name = input(sv?.name ?? prefill.name ?? '', { placeholder: _('NAS') });
|
||||
const addr = input(sv?.address ?? prefill.address ?? '', { placeholder: '192.168.1.10', class: 'cbi-input-text dl-mono' });
|
||||
const ports = input((sv?.ports ?? prefill.ports ?? []).join(', '), {
|
||||
|
||||
@@ -295,7 +295,7 @@ export interface LogsInfo {
|
||||
}
|
||||
|
||||
/** The path that makes tunnel clients' internet traffic enter from the LAN. */
|
||||
export interface LikeHome {
|
||||
interface LikeHome {
|
||||
active: boolean;
|
||||
dev?: string;
|
||||
address?: string;
|
||||
|
||||
@@ -220,7 +220,7 @@ export function plainWg(cfg: AwgConfig): boolean {
|
||||
}
|
||||
|
||||
/** File / key / QR switcher for a client configuration; opens on the file unless asked otherwise. */
|
||||
export async function connectBlock(cfg: AwgConfig, initial: 'file' | 'key' | 'qr' = 'file'): Promise<HTMLElement> {
|
||||
async function connectBlock(cfg: AwgConfig, initial: 'file' | 'key' | 'qr' = 'file'): Promise<HTMLElement> {
|
||||
if (!cfg.has_private_key)
|
||||
return E(
|
||||
'div',
|
||||
@@ -297,7 +297,7 @@ async function applyDisguise(ctx: CoreCtx, srv: Server, m: Method, same: boolean
|
||||
}
|
||||
|
||||
/** Server → AmneziaWG: listening port, what goes into every configuration, disguise, tunnel. */
|
||||
export function settingsCard(ctx: CoreCtx, srv: Server): HTMLElement {
|
||||
function settingsCard(ctx: CoreCtx, srv: Server): HTMLElement {
|
||||
const st: Status = ctx.st;
|
||||
const port = input(String(srv.port), { inputmode: 'numeric', class: 'cbi-input-text dl-w-port dl-mono' });
|
||||
const mtu = input(srv.mtu ? String(srv.mtu) : '', {
|
||||
|
||||
@@ -6,7 +6,7 @@ import type { Server } from '../../shared/types';
|
||||
import type { Core } from './common';
|
||||
import { awg } from './awg';
|
||||
|
||||
export type { Core, CoreCtx } from './common';
|
||||
export type { Core } from './common';
|
||||
|
||||
const CORES: Record<string, Core> = { awg };
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { fmt } from '../shared/i18n';
|
||||
|
||||
export type Method = 'balanced' | 'max' | 'off';
|
||||
/** The router features a method may need (the boolean ones of AwgCaps). */
|
||||
export type AwgNeed = 'v2' | 'v3';
|
||||
type AwgNeed = 'v2' | 'v3';
|
||||
|
||||
export interface MethodInfo {
|
||||
id: Method;
|
||||
@@ -26,7 +26,7 @@ export interface MethodInfo {
|
||||
}
|
||||
|
||||
/** The methods in picker order, in the page's language. */
|
||||
export function methods(): MethodInfo[] {
|
||||
function methods(): MethodInfo[] {
|
||||
return [
|
||||
{
|
||||
id: 'off',
|
||||
|
||||
@@ -70,7 +70,7 @@ async function toPng(svg: string): Promise<Blob> {
|
||||
type Invitee = Pick<Person, 'id' | 'name'> & { link?: string | null; links?: string[] };
|
||||
|
||||
/** The personal link and its other addresses (person_links); null while the portal is off. */
|
||||
export async function personLinks(id: string): Promise<{ link: string; links: string[] } | null> {
|
||||
async function personLinks(id: string): Promise<{ link: string; links: string[] } | null> {
|
||||
const r = await attempt(() => api.personLinks(id));
|
||||
if (!r) return null;
|
||||
if (!r.link) {
|
||||
|
||||
@@ -138,7 +138,7 @@ export interface MapData {
|
||||
* The latest point per device inside the time window: per device and city on a
|
||||
* person's page, per city in a device's window.
|
||||
*/
|
||||
export function visiblePoints(data: MapData, range: Range): GeoPoint[] {
|
||||
function visiblePoints(data: MapData, range: Range): GeoPoint[] {
|
||||
const best = new Map<string, GeoPoint>();
|
||||
for (const p of data.geo.points) {
|
||||
if (data.person && p.person !== data.person) continue;
|
||||
@@ -1233,7 +1233,7 @@ function face(slot: { el: HTMLElement; at: [number, number]; who?: string; where
|
||||
* when `quiet`: a redraw), gone ones leave the row at once and shrink away where they were, the
|
||||
* "+N" is one element whose number changes, and the plate's width follows smoothly.
|
||||
*/
|
||||
export function fillFaces(
|
||||
function fillFaces(
|
||||
box: HTMLElement,
|
||||
faces: Face[],
|
||||
on: { click: (f: Face, b: HTMLElement) => void; hover: (f: Face | null) => void },
|
||||
|
||||
@@ -103,6 +103,7 @@ export function portalPortHelp(port: number, taken: PortHold[], ipLinks: boolean
|
||||
export const chars = (s: string): number => Array.from(s).length;
|
||||
|
||||
const NAME_MAX = 48;
|
||||
// oxlint-disable-next-line no-control-regex -- control characters are what it refuses
|
||||
const BAD_NAME = /[<>"\\\u0000-\u001f\u007f]/;
|
||||
|
||||
/** "Up to 48 characters (50 now).": a name over its limit. */
|
||||
@@ -147,7 +148,7 @@ export function isIpv4(s: string): boolean {
|
||||
return !!m && m.slice(1).every((x) => Number(x) <= 255);
|
||||
}
|
||||
|
||||
export function isIpv6(s: string): boolean {
|
||||
function isIpv6(s: string): boolean {
|
||||
return /^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$/.test(s) && !/:::/.test(s);
|
||||
}
|
||||
|
||||
@@ -161,7 +162,7 @@ export function hostHelp(s: string, port?: number, empty: string | null = null):
|
||||
if (!t) return empty != null ? { text: empty, bad: false } : { text: _('Enter a hostname or IP address.'), bad: true };
|
||||
if (/^[a-z]+:\/\//i.test(t)) return { text: _('Leave out https:// - just the name.'), bad: true };
|
||||
if (/\/.*/.test(t)) return { text: _('Just the name, without a path.'), bad: true };
|
||||
if (/^[^:\[]+:\d+$/.test(t)) return { text: _('Just the name, without a port (the port is on AmneziaWG).'), bad: true };
|
||||
if (/^[^:[]+:\d+$/.test(t)) return { text: _('Just the name, without a port (the port is on AmneziaWG).'), bad: true };
|
||||
if (/\s/.test(t)) return { text: _('A hostname has no spaces.'), bad: true };
|
||||
if (t.length > 253 || !(HOSTNAME.test(t) || isIpv4(t) || isIpv6(t))) return { text: _('Use a hostname or an IP address.'), bad: true };
|
||||
const shown = isIpv6(t) ? `[${t}]` : t;
|
||||
|
||||
@@ -226,22 +226,21 @@ export class PeoplePage {
|
||||
render(stAll: Status): Promise<Node> {
|
||||
const st = this.scope(stAll);
|
||||
this.st = st;
|
||||
const page = this;
|
||||
const sort = E(
|
||||
'select',
|
||||
{
|
||||
class: 'dl-select',
|
||||
'aria-label': _('Sort'),
|
||||
change: (ev: Event) => {
|
||||
page.sort = (ev.target as HTMLSelectElement).value as SortBy;
|
||||
remember('dl.people.sort', page.sort);
|
||||
page.decorate();
|
||||
this.sort = (ev.target as HTMLSelectElement).value as SortBy;
|
||||
remember('dl.people.sort', this.sort);
|
||||
this.decorate();
|
||||
},
|
||||
},
|
||||
[
|
||||
E('option', { value: 'seen', selected: page.sort === 'seen' ? 'selected' : null }, _('Last seen', 'sort')),
|
||||
E('option', { value: 'name', selected: page.sort === 'name' ? 'selected' : null }, _('Name', 'sort')),
|
||||
E('option', { value: 'usage', selected: page.sort === 'usage' ? 'selected' : null }, _('Usage', 'sort')),
|
||||
E('option', { value: 'seen', selected: this.sort === 'seen' ? 'selected' : null }, _('Last seen', 'sort')),
|
||||
E('option', { value: 'name', selected: this.sort === 'name' ? 'selected' : null }, _('Name', 'sort')),
|
||||
E('option', { value: 'usage', selected: this.sort === 'usage' ? 'selected' : null }, _('Usage', 'sort')),
|
||||
],
|
||||
);
|
||||
// Find, once the list is long enough to need it; "/" focuses it.
|
||||
@@ -252,8 +251,8 @@ export class PeoplePage {
|
||||
'aria-label': _('Find a person or device'),
|
||||
hidden: st.people.length > 8 ? null : 'hidden',
|
||||
input: (ev: Event) => {
|
||||
page.query = (ev.target as HTMLInputElement).value.trim().toLowerCase();
|
||||
page.decorate();
|
||||
this.query = (ev.target as HTMLInputElement).value.trim().toLowerCase();
|
||||
this.decorate();
|
||||
},
|
||||
}) as HTMLInputElement;
|
||||
const onSlash = (ev: KeyboardEvent) => {
|
||||
@@ -266,14 +265,14 @@ export class PeoplePage {
|
||||
document.addEventListener('keydown', onSlash);
|
||||
onNavigate(() => document.removeEventListener('keydown', onSlash));
|
||||
const wrap = E('div', { class: 'dl-root' }, [
|
||||
page.serverId
|
||||
this.serverId
|
||||
? ''
|
||||
: E('div', { class: 'dl-pagehead' }, [
|
||||
E('div', { class: 'dl-stack' }, [
|
||||
E('h2', { class: 'dl-h1' }, _('People')),
|
||||
E('span', { class: 'dl-muted dl-people-count' }, this.countText()),
|
||||
]),
|
||||
st.servers.length ? button([icon('plus'), ` ${_('Add person')}`], () => page.openCreate(), 'add') : '',
|
||||
st.servers.length ? button([icon('plus'), ` ${_('Add person')}`], () => this.openCreate(), 'add') : '',
|
||||
]),
|
||||
st.servers.length
|
||||
? ''
|
||||
@@ -291,7 +290,7 @@ export class PeoplePage {
|
||||
E('div', { class: 'dl-toolbar-end' }, [
|
||||
find,
|
||||
sort,
|
||||
page.serverId ? button([icon('plus'), ` ${_('Add person')}`], () => page.openCreate(), 'add') : '',
|
||||
this.serverId ? button([icon('plus'), ` ${_('Add person')}`], () => this.openCreate(), 'add') : '',
|
||||
]),
|
||||
]),
|
||||
this.list,
|
||||
@@ -303,13 +302,13 @@ export class PeoplePage {
|
||||
fetch: () => api.status(30),
|
||||
every: 30,
|
||||
live: true,
|
||||
active: () => !!page.el?.isConnected,
|
||||
apply: (st, quiet) => page.take(st, quiet),
|
||||
active: () => !!this.el?.isConnected,
|
||||
apply: (st, quiet) => this.take(st, quiet),
|
||||
});
|
||||
// ?add=1 opens Add person once, not again on every server's People tab.
|
||||
if (!addOpened && new URLSearchParams(location.search).get('add')) {
|
||||
addOpened = true;
|
||||
setTimeout(() => page.openCreate(), 100);
|
||||
setTimeout(() => this.openCreate(), 100);
|
||||
}
|
||||
return Promise.resolve(wrap);
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ export function msAt(st: Stay[], steps: Step[], t: number): number {
|
||||
return step.start + step.ms * Math.min(0.999, Math.max(0, (t - s.from) / Math.max(1, s.to - s.from)));
|
||||
}
|
||||
|
||||
export const ease = (x: number) => (x <= 0 ? 0 : x >= 1 ? 1 : x < 0.5 ? 2 * x * x : 1 - (-2 * x + 2) ** 2 / 2);
|
||||
const ease = (x: number) => (x <= 0 ? 0 : x >= 1 ? 1 : x < 0.5 ? 2 * x * x : 1 - (-2 * x + 2) ** 2 / 2);
|
||||
|
||||
/** The shimmer's middle (a share of the arc) `q` into a move: it enters before the place it leaves and runs out past the next. */
|
||||
export function bandMiddle(q: number): number {
|
||||
|
||||
@@ -13,7 +13,7 @@ const LOST_AFTER = 3;
|
||||
* Request tickets: an answer is shown only if nothing newer was shown before
|
||||
* it. `claim()` invalidates everything in flight (an edit's own answer wins).
|
||||
*/
|
||||
export class Sequence {
|
||||
class Sequence {
|
||||
private n = 0;
|
||||
private shown = 0;
|
||||
next(): number {
|
||||
|
||||
@@ -27,7 +27,7 @@ import settings from './settings.css';
|
||||
import components from './components.css';
|
||||
import access from './access.css';
|
||||
|
||||
export const CSS = [
|
||||
const CSS = [
|
||||
base,
|
||||
people,
|
||||
controls,
|
||||
|
||||
@@ -11,7 +11,7 @@ export function pill(tone: string, text: string, title?: string): HTMLElement {
|
||||
return E('span', { class: `dl-pill ${tone}`, title: title ?? null }, text);
|
||||
}
|
||||
|
||||
export function stateTone(p: Person): string {
|
||||
function stateTone(p: Person): string {
|
||||
if (p.state === 'active') return 'ok';
|
||||
if (p.state === 'quota' || p.state === 'expired') return 'bad';
|
||||
return 'warn';
|
||||
|
||||
@@ -107,12 +107,6 @@ export function chipToggle(
|
||||
);
|
||||
}
|
||||
|
||||
/** Mark a chip toggle on or off in place. */
|
||||
export function setChip(b: HTMLElement, on: boolean) {
|
||||
b.classList.toggle('on', on);
|
||||
b.setAttribute('aria-pressed', on ? 'true' : 'false');
|
||||
}
|
||||
|
||||
/**
|
||||
* Single choice as LuCI's select (a ListValue's widget); the choice is `.value`.
|
||||
* Unknown values get an option of their own, so nothing is lost on save.
|
||||
|
||||
@@ -18,7 +18,8 @@ type OpenMenu = HTMLElement & { dlAnchor?: HTMLElement; dlClose?: () => void };
|
||||
export function dropdown(anchor: HTMLElement, items: (MenuItem | null)[]) {
|
||||
const prev = document.querySelector('.dl-dd') as OpenMenu | null;
|
||||
if (prev) {
|
||||
prev.dlClose ? prev.dlClose() : prev.remove();
|
||||
if (prev.dlClose) prev.dlClose();
|
||||
else prev.remove();
|
||||
if (prev.dlAnchor === anchor) return;
|
||||
}
|
||||
const menu: OpenMenu = E(
|
||||
|
||||
@@ -11,7 +11,7 @@ let floating: HTMLElement | null = null;
|
||||
let anchor: HTMLElement | null = null;
|
||||
let watch = 0;
|
||||
|
||||
export function hideTip() {
|
||||
function hideTip() {
|
||||
if (floating) floating.style.display = 'none';
|
||||
anchor = null;
|
||||
clearInterval(watch);
|
||||
|
||||
@@ -15,7 +15,7 @@ export function markdown(src: string): Node[] {
|
||||
const parts: (Node | string)[] = [];
|
||||
const re = /(`[^`]+`)|(\*\*[^*]+\*\*)|(\[[^\]]+\]\((https?:\/\/[^)\s]+)\))|(https?:\/\/[^\s<>()]+[^\s<>().,;:!?])/g;
|
||||
let last = 0;
|
||||
for (let m: RegExpExecArray | null; (m = re.exec(s)); ) {
|
||||
for (let m: RegExpExecArray | null; (m = re.exec(s));) {
|
||||
if (m.index > last) parts.push(s.slice(last, m.index));
|
||||
if (m[1]) parts.push(E('code', {}, m[1].slice(1, -1)));
|
||||
else if (m[2]) parts.push(E('b', {}, m[2].slice(2, -2)));
|
||||
@@ -38,13 +38,13 @@ export function markdown(src: string): Node[] {
|
||||
for (const raw of src.replace(/\r/g, '').split('\n')) {
|
||||
const line = raw.trimEnd();
|
||||
if (fence) {
|
||||
if (/^```/.test(line.trim())) {
|
||||
if (line.trim().startsWith('```')) {
|
||||
out.push(E('pre', {}, fence.join('\n')));
|
||||
fence = null;
|
||||
} else fence.push(raw);
|
||||
continue;
|
||||
}
|
||||
if (/^```/.test(line.trim())) {
|
||||
if (line.trim().startsWith('```')) {
|
||||
flush();
|
||||
fence = [];
|
||||
continue;
|
||||
@@ -84,7 +84,7 @@ export function forRouter(md: string): string {
|
||||
if (h) {
|
||||
skip = /^install\b/i.test(h[1].trim());
|
||||
if (/^what.s new$/i.test(h[1].trim())) continue;
|
||||
} else if (/^\*\*Full Changelog\*\*/.test(line)) skip = false;
|
||||
} else if (line.startsWith('**Full Changelog**')) skip = false;
|
||||
if (!skip) out.push(line);
|
||||
}
|
||||
return out
|
||||
|
||||
Reference in new issue
Block a user