Compare commits

4 Commits
Author SHA1 Message Date
Aemeath 0fd22b917a Dawnline 0.16.1
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
- Checking one component for updates in Components no longer fails
  with "XHR request timed out": the check starts at once instead of
  keeping the page waiting twenty seconds
- On a router without curl, updates and the installer download release
  files through GitHub's API: GitHub's own download links can make
  OpenWrt's built-in downloader hang
- Adding a device in the admin offers the same four types as the
  personal page: PC, Mobile, Router and Other (phones and tablets are
  one choice)
2026-10-26 06:41:54 +03:00
Aemeath 2388603322 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
- 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
2026-10-24 21:33:48 +03:00
Aemeath 750564ab7e Dawnline 0.15.1
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
- Dropdowns (the ⋯ menu, the language picker, the page's QR card) open
  on a softer spring: they grow in without the wobble at the end
- Renaming a device on its card: the hint under the name and a refusal
  take the status's place as whole words, and after a save the status
  comes back the same way
- Cancelling a rename started while the status was still changing puts
  back what it said, not a mix of its old and new letters
2026-10-22 18:01:01 +03:00
dependabot[bot] 3fadee87d3 Bump vitest from 3.2.4 to 5.0.5 in /web
Closes the open Dependabot alerts for vitest, @vitest/mocker and tinypool (dev dependencies only; tinypool is no longer pulled in).
2026-10-22 17:58:11 +03:00
108 changed files with 3621 additions and 1478 deletions

No files matched your search

+8 -8
View File
@@ -33,7 +33,7 @@ jobs:
version: ${{ steps.version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
@@ -63,14 +63,14 @@ jobs:
- { type: apk, sdk: 'itdoginfo/openwrt-sdk-apk:25.12.3@sha256:6d832008ddd1b8ec4edc84f5e6e0bf22a13ba2d6888083a8e69fa26d752c276f' }
steps:
- name: Checkout
uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- name: Setup Node.js
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: '22'
node-version: '26'
cache: npm
cache-dependency-path: web/package-lock.json
@@ -87,7 +87,7 @@ jobs:
run: scripts/build-packages.sh ${{ matrix.type }}
- name: Upload
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
with:
name: package-${{ matrix.type }}
# The app and its translation packages (luci-i18n-dawnline-<lang>).
@@ -105,7 +105,7 @@ jobs:
steps:
# The whole history and the tags: the notes list the commits since the previous tag.
- name: Checkout
uses: actions/checkout@fbc6f3992d24b796d5a048ff273f7fcc4a7b6c09 # v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
fetch-depth: 0
@@ -116,7 +116,7 @@ jobs:
cat notes.md
- name: Download packages
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
with:
pattern: package-*
path: release
@@ -129,7 +129,7 @@ jobs:
cat sha256sums.txt
- name: Publish the release
uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2
uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64 # v3.0.3
with:
name: Dawnline ${{ github.ref_name }}
tag_name: ${{ github.ref_name }}
+27 -11
View File
@@ -24,14 +24,14 @@ jobs:
working-directory: web
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
- name: Setup Node.js
uses: actions/setup-node@v5
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: '22'
node-version: '26'
cache: npm
cache-dependency-path: web/package-lock.json
@@ -51,6 +51,20 @@ jobs:
id: types
run: npm run --silent typecheck
# oxlint's correctness rules: what the types let through (a stray expression, a needless escape).
- name: Lint
id: lint
run: npm run --silent lint
# Exports nobody imports, files nobody reaches, dependencies used but not listed (or listed but unused).
- name: Unused code
id: knip
run: |
if ! npm run --silent knip; then
echo "::error::knip found unused code or a dependency problem: remove it, or drop the export when only its own file uses it."
exit 1
fi
# The catalogs follow the code: every string collected, translated, its placeholders kept.
- name: Translations
id: i18n
@@ -64,17 +78,17 @@ jobs:
id: tests
run: npm test
# The bundles under package/ are committed: a build must change nothing
# and leave no new file behind (an output nobody added to git would be
# missing from the package).
- name: Build bundles and check they are committed
# The bundles under package/ are not committed (build.yml builds them
# before packaging): a build must touch no tracked file and leave every
# output it writes ignored by .gitignore, so none ends up in a commit.
- name: Build bundles and check they stay out of git
id: build
run: |
npm run --silent build
changed="$(git status --porcelain --untracked-files=all -- ../package)"
if [ -n "$changed" ]; then
echo "$changed"
echo "::error::The committed bundles are out of date or the build left new files. Run 'npm run build' in web/ and commit the result."
echo "::error::The build changed a tracked file under package/ or wrote one .gitignore does not cover."
exit 1
fi
@@ -88,6 +102,8 @@ jobs:
echo "|---|---|"
echo "| Formatting | ${{ steps.format.outcome }} |"
echo "| Types | ${{ steps.types.outcome }} |"
echo "| Lint | ${{ steps.lint.outcome }} |"
echo "| Unused code | ${{ steps.knip.outcome }} |"
echo "| Translations | ${{ steps.i18n.outcome }} |"
echo "| Tests | ${{ steps.tests.outcome }} |"
echo "| Bundles | ${{ steps.build.outcome }} |"
@@ -98,7 +114,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
@@ -127,7 +143,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
@@ -174,7 +190,7 @@ jobs:
release: ['24.10', '25.12']
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
+3
View File
@@ -2,3 +2,6 @@ node_modules/
dist/
.DS_Store
web/coverage/
# The web bundles: web/ builds them (npm run build), CI before packaging.
package/luci-app-dawnline/htdocs/luci-static/resources/dawnline/
package/luci-app-dawnline/root/usr/share/dawnline/portal/assets/
+2 -2
View File
@@ -17,7 +17,7 @@ This repo usually sits inside the router-admin workspace (`../AGENTS.md`). Its r
## Layout
- `package/luci-app-dawnline/root/` — what lands on the router: ucode modules in `usr/share/ucode/dawnline/` (`rpc/` for the LuCI backend), the agent and updater in `usr/libexec/dawnline/`, the portal in `usr/share/dawnline/portal/`, the init script, rpcd ACL.
- `web/` — TypeScript sources of the admin UI (`src/admin`) and the portal (`src/portal`), shared code in `src/shared`; the built bundles are committed under `package/`. `web/i18n/` — the string catalogs' tools (`extract.ts`, `po.ts`, `lmo.ts`).
- `web/` — TypeScript sources of the admin UI (`src/admin`) and the portal (`src/portal`), shared code in `src/shared`; `npm run build` writes the bundles under `package/` (git-ignored: CI builds them before packaging). `web/i18n/` — the string catalogs' tools (`extract.ts`, `po.ts`, `lmo.ts`).
- `package/luci-app-dawnline/po/` — the admin's catalog (`templates/dawnline.pot`, `ru/dawnline.po`): luci.mk builds the `luci-i18n-dawnline-ru` package from it. The portal's catalog is `web/src/portal/i18n/ru.po`, bundled into the portal.
- `install.sh`, `uninstall.sh` — the standalone installer and uninstaller (both have `--dry-run`).
- `scripts/` — `lint-ucode.py`, `compile-ucode.sh` (compiles every ucode file of a tree wherever ucode runs), `check-ucode.sh` (the same on the router, without installing), `ucode-container.sh` (compile and unit tests in the OpenWrt rootfs containers CI uses), `deploy.sh` (dev deploy over SSH), `build-packages.sh`, `build-release.sh`, `release-notes.sh`.
@@ -27,7 +27,7 @@ This repo usually sits inside the router-admin workspace (`../AGENTS.md`). Its r
- `python3 scripts/lint-ucode.py` (use before definition, exports, POSIX regexes, rpcd methods; layering notes are informational).
- `scripts/ucode-container.sh` (needs docker): compiles every ucode file and runs `tests/ucode` on OpenWrt 24.10 and 25.12, exactly what CI does. `scripts/check-ucode.sh` compiles on the router instead when there is no docker. New ucode entry points are added to the compile list in `scripts/compile-ucode.sh`, to `lint-ucode.py`, and to the executables list in `.github/workflows/ci.yml`; a pure function gets a case in `tests/ucode/<module>.test.uc`.
- In `web/`: `npm run format:check`, `npm run typecheck` (sources and tests), `npm run i18n:check` (after changing visible text: `npm run i18n`, translate the new entries in each `ru.po`), `npm test`, `npm run build` — and commit the rebuilt bundles and the catalogs (CI fails on a changed or new file under `package/`).
- In `web/`: `npm run format:check`, `npm run typecheck` (sources and tests), `npm run lint` (oxlint), `npm run knip` (unused exports and dependencies), `npm run i18n:check` (after changing visible text: `npm run i18n`, translate the new entries in each `ru.po`), `npm test`, `npm run build` — and commit the catalogs (the bundles stay out of git; CI fails when the build leaves a file under `package/` that `.gitignore` does not cover).
- `shellcheck -S warning` for the shell scripts (CI finds them by shebang).
- A tag builds only after CI passes on it (`build.yml` calls `ci.yml`).
+64 -60
View File
@@ -58,160 +58,160 @@ colors:
light-qr-bg: "#ffffff"
typography:
body:
fontFamily: Geist
fontFamily: system-ui
fontSize: 15px
fontWeight: 400
lineHeight: 22px
letterSpacing: -0.011em
display-number:
fontFamily: Geist
fontFamily: system-ui
fontSize: 36px
fontWeight: 600
lineHeight: 40px
letterSpacing: -0.045em
card-title-alone:
fontFamily: Geist
fontFamily: system-ui
fontSize: 22px
fontWeight: 500
lineHeight: 28px
letterSpacing: -0.03em
section-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 20px
fontWeight: 500
lineHeight: 28px
letterSpacing: -0.025em
sheet-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 20px
fontWeight: 500
lineHeight: 28px
letterSpacing: -0.5px
empty-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 18px
fontWeight: 500
lineHeight: 24px
letterSpacing: -0.02em
value:
fontFamily: Geist
fontFamily: system-ui
fontSize: 17px
fontWeight: 500
lineHeight: 24px
letterSpacing: -0.02em
fontFeature: '"tnum"'
card-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 16px
fontWeight: 500
lineHeight: 22px
letterSpacing: -0.02em
button:
fontFamily: Geist
fontFamily: system-ui
fontSize: 16px
fontWeight: 500
lineHeight: 22px
letterSpacing: -0.015em
button-strong:
fontFamily: Geist
fontFamily: system-ui
fontSize: 16px
fontWeight: 600
lineHeight: 22px
letterSpacing: -0.015em
input:
fontFamily: Geist
fontFamily: system-ui
fontSize: 16px
fontWeight: 500
lineHeight: 24px
letterSpacing: -0.012em
step-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 16px
fontWeight: 500
lineHeight: 24px
letterSpacing: -0.02em
row-title:
fontFamily: Geist
fontFamily: system-ui
fontSize: 15px
fontWeight: 500
lineHeight: 22px
letterSpacing: -0.02em
breadcrumb:
fontFamily: Geist
fontFamily: system-ui
fontSize: 15px
fontWeight: 400
fontWeight: 500
lineHeight: 22px
letterSpacing: -0.15px
question-text:
fontFamily: Geist
fontFamily: system-ui
fontSize: 15px
fontWeight: 400
lineHeight: 21px
desc:
fontFamily: Geist
fontFamily: system-ui
fontSize: 14px
fontWeight: 400
lineHeight: 20px
menu-item:
fontFamily: Geist
fontFamily: system-ui
fontSize: 14px
fontWeight: 500
lineHeight: 20px
toast:
fontFamily: Geist
fontFamily: system-ui
fontSize: 14px
fontWeight: 500
lineHeight: 20px
meta:
fontFamily: Geist
fontFamily: system-ui
fontSize: 13px
fontWeight: 400
lineHeight: 18px
pill-label:
fontFamily: Geist
fontFamily: system-ui
fontSize: 13px
fontWeight: 600
lineHeight: 18px
label-sm:
fontFamily: Geist
fontFamily: system-ui
fontSize: 12px
fontWeight: 500
lineHeight: 16px
tooltip:
fontFamily: Geist
fontFamily: system-ui
fontSize: 12px
fontWeight: 500
lineHeight: 12px
letterSpacing: -0.1px
divider-label:
fontFamily: Geist
fontFamily: system-ui
fontSize: 12px
fontWeight: 500
lineHeight: 22px
letterSpacing: 0.06em
axis:
fontFamily: Geist
fontFamily: system-ui
fontSize: 11px
fontWeight: 500
lineHeight: 16px
axis-xs:
fontFamily: Geist
fontFamily: system-ui
fontSize: 10px
fontWeight: 500
lineHeight: 14px
calendar-head:
fontFamily: Geist
fontFamily: system-ui
fontSize: 9px
fontWeight: 600
lineHeight: 10px
mono-link:
fontFamily: Geist Mono
fontFamily: ui-monospace
fontSize: 13px
fontWeight: 400
lineHeight: 22px
letterSpacing: 0px
mono-code:
fontFamily: Geist Mono
fontFamily: ui-monospace
fontSize: 12px
fontWeight: 400
lineHeight: 18px
@@ -446,12 +446,11 @@ The styles live in `web/src/portal/styles` (tokens in `tokens.css`), the motion
The portal is one person's page on a router.
**Lineage.** The look was approved as a mockup (Oct 2026). It borrows from four places:
**Lineage.** The look was approved as a mockup (Oct 2026). It borrows from three places:
- **skiper-ui:** skiper21's palette, accent, highlight and tab pill, and skiper103's bouncy accordion;
- **iconiqui:** the breadcrumb and the edge fades (dia-text);
- **aicss.dev:** the busy orb, "Orbs B4 Converge";
- **Vercel's Geist:** the type.
- **aicss.dev:** the busy orb, "Orbs B4 Converge".
**Personality.** Calm, dark and tactile. The page is near-black (`#080808`). There are no borders: each layer is a step brighter than the one under it. One sky blue is the only accent. Every other colour means a state. The UI is made of big round shapes (36 px sheets, 28 px cards, pills), and glass icons are the only illustration.
@@ -490,7 +489,7 @@ The measured luminance steps are tiny. In dark, raised vs bg is 1.07:1, field vs
| Token | Dark | Light | Use |
|---|---|---|---|
| `--text` | `#ededed` | `#0b0b0b` | Titles, values, current crumb, bold steps |
| `--text` | `#ededed` | `#0b0b0b` | Titles, values, the breadcrumb's place, bold steps |
| `--text-2` | `#8c8c8a` | `#6d6d6b` | Secondary lines: statuses at rest, labels, hints, sheet subs, head values, accordion chevrons |
| `--text-3` | `#4f4f4e` | `#a6a6a4` | Faint: counts ("3 of 4"), "OR", axis ends, placeholders, idle picker icons, the limit note, chevrons in badges |
@@ -566,9 +565,9 @@ Frosted pane: dark `--gi-a .58 / --gi-b .14` white with a `.5` rim and no edge s
## Typography
**Families:** **Geist** (variable, 100–900) and **Geist Mono**. They are self-hosted as woff2 next to `portal.css` (CSP `font-src 'self'`). Geist ships in Latin and Cyrillic subsets split by `unicode-range`, Geist Mono in Latin. Fallbacks are `-apple-system, system-ui, 'Segoe UI', sans-serif` and `ui-monospace, 'SF Mono', Menlo, monospace`, all with `font-display: swap`.
**Families:** the system's own, nothing downloaded (no `@font-face`, no `font-src` in the CSP). Sans `system-ui, -apple-system, 'Segoe UI', Roboto, 'Noto Sans', Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif`: SF Pro on Apple, Segoe UI on Windows (Segoe UI Variable on 11), Roboto on Android, the desktop's sans on Linux. Mono `ui-monospace, 'SF Mono', SFMono-Regular, Menlo, 'Cascadia Mono', Consolas, 'Liberation Mono', 'DejaVu Sans Mono', monospace`: SF Mono in Safari, Menlo in Chrome on a Mac, Cascadia Mono or Consolas on Windows. Both are `--font` and `--mono` in `tokens.css`.
**Base:** `400 15px/22px`, `letter-spacing: -0.011em`, `-webkit-font-smoothing: antialiased`. Body `cursor: default`, because the page is an app, not a document. Fields, the link and the configuration keep the I-beam.
**Base:** `400 15px/22px`, `letter-spacing: -0.011em`, `-webkit-font-smoothing: antialiased`. Body `cursor: default` and `user-select: none`, because the page is an app, not a document: a title, a label or a value is not text to copy. What is typed or copied by hand can be selected, with the I-beam: fields, the mono text (the link, a hostname, a file's name) and the configuration.
### Scale (measured live)
@@ -586,7 +585,7 @@ Frosted pane: dark `--gi-a .58 / --gi-b .14` white with a `.5` rim and no edge s
| Step title | 16 / 24 | 500 | −0.02em | "1 Get AmneziaVPN" |
| Row title | 15 / 22 | 500 | −0.02em | Accordion heads, notice title, month total |
| Option title | 15 / 22 | 500 | −0.015em | "LAN Bypass" in its option row |
| Breadcrumb | 15 / 22 | 400 (current 500) | −0.15px | Server › person |
| Breadcrumb | 15 / 22 | 500 | −0.15px | The server's name |
| Question text | 15 / 21 | 400 | — | Remove / Reconnect body |
| Desc / sub / value line | 14 / 20 | 400 | — | Row descriptions, sheet subs, head values |
| Menu item, toast | 14 / 20 | 500 | — | ⋯ menu, toast |
@@ -604,7 +603,7 @@ Frosted pane: dark `--gi-a .58 / --gi-b .14` white with a `.5` rim and no edge s
- **Tracking tightens as size grows:** −0.011em for body, −0.02em at 15–17 px, −0.025em to −0.045em for titles and numbers. Mono is always `0`.
- **Only 400, 500 and 600.** 500 marks a title or a value, 600 marks a filled button, a number on display, a pill or a step number.
- **Numbers that change use `.num`** (`tabular-nums`), so a morph or a hover readout never shifts its neighbours.
- **Mono is for things typed or copied by hand:** addresses, links, hostnames, the configuration. Names stay in Geist.
- **Mono is for things typed or copied by hand:** addresses, links, hostnames, the configuration. Names stay in the sans.
- **One line where it fits:** names, statuses, crumbs and link rows end in an ellipsis. The full text goes in `title`.
- `text-wrap: balance` for short centred paragraphs (first device, "gone" card, secure sheet). `pretty` for left-aligned question text.
- **No uppercase** except the "OR" divider. **No ellipsis on buttons**: "Remove", never "Remove…". "…" appears only for progress and truncation. The single exception is another app's own menu label quoted verbatim ("Import Tunnel(s) from File…").
@@ -617,7 +616,7 @@ Frosted pane: dark `--gi-a .58 / --gi-b .14` white with a `.5` rim and no edge s
### Page frame
- `.page`: `max-width: 1072px`, centred. The side gutter is `max(16px, safe-area)`. The top is `40px + safe-area-top` and the bottom `112px`, so the end of the scroll clears the bottom fade.
- No navbar. The page opens with a **breadcrumb row**: 32 px high and 32 px above the content. The Dawnline mark sits in a 32 px box (logo 24 px), then `server › person`, then on the right the language pill and the QR knob.
- No navbar. The page opens with a **breadcrumb row**: 32 px high and 32 px above the content. The Dawnline mark sits in a 32 px box (logo 24 px), then the server's name (not the person's: the page is theirs), then on the right the language pill and the QR knob.
- **Edge fades** sit above the page and under every overlay:
- **top:** 80 px plus the safe area, a `bg → 75% → 0` gradient with `backdrop-filter: blur(12px)` (not on a touch screen, where it would be drawn again on every frame of a scroll), masked `1 → .88 @44% → 0`. It shows only once `scrollY > 2`, so the breadcrumb at rest stays crisp.
- **bottom:** 96 px, a plain `bg → transparent` gradient interpolated `in oklab`.
@@ -720,8 +719,8 @@ Only the person moves the page: on a phone nothing the page does pulls it up or
| 11 | Ends of the way |
| 10 | Name chip, badge icon tile, link row knobs |
| 9 | File card icon |
| 2.5–4 | Chart bars (2.5 month, 3 spark, 3 calendar cells), meter and hours bar, a field's selection wash (4) |
| 1 | A field's caret and selection handles |
| 2.5–4 | Chart bars (2.5 month, 3 spark, 3 calendar cells), meter and hours bar, a field's and the page's selection wash (4) |
| 1 | A field's caret and selection handles, the page's selection handles |
| 999 / 50% | Buttons, pills, chips, toasts, tooltips, the switch / knobs, step numbers, reach marks, the switch's knob, the handles' knobs |
### Shape rules
@@ -741,10 +740,10 @@ Measurements are CSS pixels, read live at 1138 px and 375 px. Source files are u
### Breadcrumb · `page/frame.ts`
- **Layout:** a 32 px row with `gap 10`. The mark box is 32 × 32 (logo 24). The path is 15/22 `text-2` with `gap 6` and a 14 px chevron; the current crumb is `text` 500 with `aria-current="page"`.
- **Layout:** a 32 px row with `gap 10`. The mark box is 32 × 32 (logo 24). The place, the server's name, is the one crumb: 15/22 `text` 500 with `aria-current="page"`. The person's name is not shown: the page is theirs, and on a phone it crowded the place out.
- **Language pill** (`.cr-lang`, a pick pill: see below): 32 high, pill, `knob` fill, padding `0 8`, gap 6: the language's 16 px flag disc, its 14 px 500 code and a 14 px chevron. Its popup opens under it, 10 px away.
- **QR knob** (`.cr-qr`): a knob with the QR icon. It opens into the page's code card where it stands (see below).
- **Truncation:** the crumbs truncate independently, each with its own ellipsis.
- **Truncation:** the place ends in an ellipsis where the row has no room for it.
### Dropdowns · `ui/drop.ts`, `styles/drop.css`
@@ -752,7 +751,7 @@ The ⋯ menu, the pick pills' popups and the page code card are one kind of thin
- **Glass** (`.drop`): Apple's iOS 26 Liquid Glass, Regular (Figma kit), in `tokens.css` `--glass-*`: on dark black 40% with a white 4% film (the kit's black 60% + white 6% at 67%), on light `rgba(245,245,245,.6)`; backdrop `blur 28, saturate 1.8`; a soft, even 1 px inner edge, no gradient (white 5% / black 4%); a shadow on light only, soft (`0 8 32` black 12%): on dark the edge sets it apart. Its own colours: text `#F5F5F5` / `#1A1A1A`, subtitles `#8A8A8A` / `#727272`, destructive `#FF383C` (`--bad`), separators a touch softer than the edge (white 4% / black 3%); a solid highlight (`raised` + `text` 8% / 11%). Nothing dims around one. Over the page and a sheet alike (z 60).
- **Placement:** its nearest point 8 px from its button, under it where it fits, else over it; centred on it, 12 px inside the screen's edge.
- **Motion:** in, a spring out of where it grows from (`scale .5, blur 6` on POP, a little overshoot); out, back towards it from where it stands (`scale .7, blur 4`, 110 ms EASE_IN): quicker than it came.
- **Motion:** in, a spring out of where it grows from (`scale .5, blur 6` on SOFT, about 4% over: POP's 14% read as a wobble); out, back towards it from where it stands (`scale .7, blur 4`, 110 ms EASE_IN): quicker than it came.
- **Highlight** (`ui/glide.ts`): one for all of a dropdown's items (rows, segments), under their icons and words, solid and the same for every item (no tint for Reconnect or Remove), with the corners of what it is on. It fades in (160 ms) where the pointer or the keyboard is, glides from item to item on GLIDE (`spring(640, 40)`, about 2% over: place, size, corners), presses in to 0.97 with what it is on, and fades where the pointer leaves, or goes back to the item it rests on (a pick pill's picked segment, where it starts).
- **Shut by:** a press outside it and its button, its button again, Escape (only it: a sheet under it stays; focus goes back to its button), a choice, another dropdown opening (at once), a resize (at once). One at a time; the page holds its repaints while one is open.
@@ -786,6 +785,7 @@ The ⋯ menu, the pick pills' popups and the page code card are one kind of thin
| `red` | bad / white | 600 | Remove |
- **Size:** 48 high (`.sm` 40, 15 px), pill, padding 0 20 (`.sm` 0 16), gap 8, `.block` = full width.
- **Hover:** a filled one (`accent`, `red`) lets its fill down to 82%, `tint` deepens to accent 20%, `soft` takes text 6% over its knob.
- **Press:** `scale(.95)`. No ellipsis, no blue text links for actions.
- **Busy:** the button keeps its size. Its content blurs away and the **orb** comes up through the blur in the button's own colour. See *Motion → Busy orb*.
@@ -796,6 +796,7 @@ The ⋯ menu, the pick pills' popups and the page code card are one kind of thin
- Arrow for create, check for save. The field and its go button are the whole form: no label row, no separate Save.
- **Caret** (`ui/caret.ts`, on name fields, with a mouse or trackpad; a touch screen keeps the system's): the input's own is hidden (`caret-color: transparent`) and the field draws one as macOS does: accent, 2 × 20, radius 1. It glides to where the next letter goes (see *Motion → Caret and selection*), and a click puts it where clicked at once. It blinks 0.6 s on / 0.6 s off with soft fades, stays solid while typing and blinks again 0.5 s after the last key.
- **Selection** (`pointer: fine` only): the native selection is see-through and the text keeps its colour. Under the text sits an accent 26% wash, 22 high, radius 4, with an iOS handle at each end: a 2 × 22 line with a 9 px knob, on top at the start and under it at the end. A selection grows out of the caret and, on collapse, fades in place before its ends rejoin the caret. It never runs past the input's edges, so a long, scrolled name's wash stops before the go button. On a touch screen the field draws neither: the system's caret shows (in the accent) with its own selection and handles.
- **The page's selection** (`ui/selection.ts`, `pointer: fine` only), where text can be selected (*Typography → Base*): the same look as a field's, drawn over the text instead of under it (it cannot sit under every block's), each band blending so the words keep their colour (`screen` in dark, `multiply` in light, over an opaque `accent 26% on bg`). One band per line run, 2 px taller than its line, radius 4; a handle at each end. It stands on the layer of what holds it (the page under its edge fades, a sheet, a dropdown) and is clipped to what clips or scrolls it there. A press where nothing can be selected lets go of the selection (the browser keeps it over unselectable text, which is most of the page). A touch screen keeps the system's.
- **Refusal:** a refused entry makes the field **shake** at once, while a red line under it (`ui/bad-line.ts`) says why in a few words, short enough for one line.
- **Shake** (`shared/shake.ts`): iOS's wrong-passcode shake, a damped swing sideways about four times in 0.52 s (14 px at most, settling by half), linear over its frames. The field's outline goes red with it (a 1.5 px inset ring in `bad`, as the focus ring is drawn), holds 0.7 s and fades back to the ring the field has (focused or not) over 0.8 s on ease-out; another refusal starts it red again. Another one starts from where the field is, never jumping back; only its own animation is touched, so the focus ring's transition goes on. With less motion asked for it doesn't move (the red line or toast still says why).
@@ -840,10 +841,10 @@ A longer reason sits in `title` and, for a screen reader, in hidden text right a
**Rename on the card** (`flows/rename.ts`): the name is where it is changed.
- **At rest:** an editable name is a button. Under the pointer a faint wash (`raised` + text 6%, radius 8) hugs its words.
- **Editing:** the name gives way to its own input in the same font and place, with no frame or fill: only the field's caret and selection (the name selected). The status line morphs to a hint in `text-2`.
- **Saving:** the words shimmer (see *Motion → Shimmer*), settle to solid, and the status morphs back from the hint, words and colour.
- **Cancelling:** the name it had comes back; the status turns back.
- **Refusal:** the words shake (no red ring here, the field has none) and the status line says why in `bad`, in its one line, in full on hover.
- **Editing:** the name gives way to its own input in the same font and place, with no frame or fill: only the field's caret and selection (the name selected). The status line blurs across to a hint in `text-2`: whole words, not letters (*Whole mode*), as the hint only stands in for the status.
- **Saving:** the words shimmer (see *Motion → Shimmer*), settle to solid, and the status blurs back from the hint, words and colour.
- **Cancelling:** the name it had comes back; the status blurs back.
- **Refusal:** the words shake (no red ring here, the field has none) and the status line blurs across to why in `bad`, in its one line, in full on hover.
**Add card:** a `button.dev.add`, min-height 144, centred, grey glass plus 36 and "Add device" in `text-2` 500. Hover raised + knob 45%, press `.98`.
@@ -891,6 +892,7 @@ A repaint keeps the rows on the page and changes what they hold in place, the sa
- **View:** padding `0 24 24`.
- **View head** (`.vhead`): 76 high. Title 20/28 500, centred with a Back knob inside a flow. The head is the drag handle, with `touch-action: none` and a grab cursor.
- **Sub line:** 14/20 `text-2`, pulled up 16 px under the head.
- **Scrolling:** what is taller than the screen scrolls inside the sheet with no scrollbar (a bar would cut into its round corners); so does the configuration in it.
**Movement:**
@@ -1006,7 +1008,7 @@ One choice with a switch (Add a device's **LAN Bypass**). A line that unfolds un
### File card and configuration
- **File card:** `field`, radius 18, padding 12. A 38 × 46 "file" icon (radius 9, mono 10 600 ".conf"), the filename in mono 13, a 12 px line, and an accent `sm` block button. Inside an inset row it steps up one (*Accordion → Inset variant*).
- **Configuration:** `pre` 12/18 mono, max-height 16 rem, scrolls.
- **Configuration:** `pre` 12/18 mono, max-height 16 rem, scrolls (no scrollbar, as the sheet).
- colours: section headers in accent, keys in `text`, values in `text-2`;
- **keys are masked** (`••••` in `text-3`, letter-spaced 1 px) until "Show key". The mask and the key share one place and cross-fade; the one at rest is out of sight.
@@ -1016,8 +1018,9 @@ One choice with a switch (Add a device's **LAN Bypass**). A line that unfolds un
### Demo-only pieces · `demo/` (not in the router build)
- "Demo" chip after the crumbs (26 high, accent-soft, 13 px 600).
- GitHub knob (its mark only, 32 px, as the QR knob) before the language pill (hidden below 480 px; a button in the drawer instead).
- **"Demo" and GitHub, one split pill** just before the language pill (`demo/crumbs.ts`): accent-soft, 32 high as the knobs beside it, "Demo" 14 px 600 with a down chevron, then GitHub's mark (38 wide). The halves are 2 px apart; their outer corners are half the height (16), the inner ones 4. Hover (a mouse only) deepens the tint to accent 20%; a press scales a half to 0.94. Over a card alone (no language) "Demo" stands alone after the place: 26 high, round, 13 px.
- **On a phone (< 560 px) the pill is a dock** at the bottom right, 20 px above the safe area, since the breadcrumb has no room for it. It lives in `<body>`, outside the page: the page's entrance and a scenario's swap move the page with a transform and a filter, which would carry a fixed child along and leave its glass undrawn until they end. Glass (`--glass-bg`, blur 28 saturate 1.8, the glass edge), 36 high, "Demo" with an up chevron, GitHub 40 wide; the halves 2 px apart, corners 18 outside and 5 inside. Over the bottom fade, under the sheets (z 40). It rises from under the screen's edge (620 ms, EASE_OUT, 260 ms into the first wave) on a transform alone: Safari leaves a backdrop blur undrawn while the element's opacity is animating. Hover is a 7% film over the glass, never in place of it.
- A scenario's swap dims and blurs `.page`, not `#app`: a filter on `#app` would carry the fixed edge fades along until it ends.
- Scenario drawer: grouped rows on `field`, 2 px apart inside a radius-20 group, 60 px min, glass 30; the current row in accent with a check.
---
@@ -1093,8 +1096,8 @@ Computed from `spring()` and confirmed live: the published CSS variables read 57
| Token | k / c | ζ | Settles | Overshoot | 50% at | 90% at | Peak at | Used for |
|---|---|---|---|---|---|---|---|---|
| **BOUNCY** | 300 / 20 | 0.58 | 572 ms | **10.8%** | 78 ms | 133 ms | 222 ms | Toast in, a newly created device card popping in and the way's server icon pop |
| **POP** | 520 / 24 | 0.53 | 544 ms | **14.3%** | 58 ms | 96 ms | 162 ms | ⋯ menu open, check icon after copy, the OS mark turning in |
| **SOFT** | 380 / 28 | 0.72 | 476 ms | 3.9% | 74 ms | 138 ms | 232 ms | Accordion rows and chevron, dialog open (computer) and its scrim |
| **POP** | 520 / 24 | 0.53 | 544 ms | **14.3%** | 58 ms | 96 ms | 162 ms | Check icon after copy, the OS mark turning in |
| **SOFT** | 380 / 28 | 0.72 | 476 ms | 3.9% | 74 ms | 138 ms | 232 ms | Dropdowns open (⋯ menu, pick pills, page code card), accordion rows and chevron, dialog open (computer) and its scrim |
| **SMOOTH** | 300 / 35 | 1.01 | 524 ms | 0 | 98 ms | 228 ms | — | Widths and heights (morph width, sheet height glide, sheet width, a card's and the notice's height on a repaint, the QR box's size), FLIP of cards and letters, picker pill trailing edge, flex-grow and the picked name's width, folds, tooltip glide, snap-back after a pull and its dim; the switch, the field's focus ring and the go button's colours (via CSS var) |
| **LEAD** | 520 / 46 | 1.01 | 396 ms | 0 | 74 ms | 173 ms | — | Leading edge of the stretching picker pill |
| **QUICK** | 900 / 60 | 1.00 | 296 ms | 0 | 56 ms | 130 ms | — | ⋯ menu highlight following the pointer |
@@ -1187,7 +1190,7 @@ Every text that changes in place while visible morphs. Hover readouts over chart
- **Kerning correction:** each letter is nudged onto the plain text's kerned position, so the last frame lands exactly on the final text.
- **Done:** at the end the element holds plain text again, and an ellipsis box keeps its ellipsis.
**Whole mode** (`whole: true`, for words in a flowing sentence, app names, menu paths): old words `out, b4` 180 ms EASE_IN, new words `in, b4 → 0` 280 / 60 EASE_OUT.
**Whole mode** (`whole: true`, for words in a flowing sentence, app names, menu paths, and the rename hint and refusals standing in for a card's status: `data-whole` on the line, so the repaint after a save blurs the status back too): old words `out, b4` 180 ms EASE_IN, new words `in, b4 → 0` 280 / 60 EASE_OUT.
**Colour** (`morphChanged` after a repaint): a text that takes another colour with its words (a status turning green) keeps the old colour on the words that leave, and the new words turn from it (280 ms EASE_OUT).
@@ -1272,13 +1275,13 @@ A click mid-way (a double click) turns every row and body back from where it sta
| What | Motion | Timing |
|---|---|---|
| Open | `in, s.9 → 1, b4 → 0`, origin at the button's corner (top right, or bottom right when above) | POP 544 |
| Close | from where it stands (one still popping in included) → `out, s.96, b3` | 120, EASE_IN |
| Highlight appears | opacity at the hovered item | 150, EASE_OUT |
| Highlight moves | `translateY` to the next item; colour to its tone | QUICK 296; bg 150 |
| Highlight leaves | opacity 0 when the pointer leaves the menu; back on an item while it still shows, it turns back and glides from where it stands | 150 |
| Open | `in, s.5 → 1, b6 → 0`, origin at the button's side (see *Dropdowns*) | SOFT 476 |
| Close | from where it stands (one still opening included) → `out, s.7, b4` | 110, EASE_IN |
| Highlight appears | opacity at the hovered item | 160, EASE_OUT |
| Highlight moves | place, size and corners to the next item | GLIDE |
| Highlight leaves | opacity 0 when the pointer leaves the menu; back on an item while it still shows, it turns back and glides from where it stands | 160 |
QUICK replaced SMOOTH for the highlight because SMOOTH felt late: it reaches 90% at 130 ms against SMOOTH's 228 ms.
POP (14% over) used to open every dropdown: from `scale .5` it overshot to about 1.07 and read as a wobble; SOFT tops out near 1.02.
#### 7. Toast
@@ -1383,6 +1386,7 @@ The ring does not travel: the old tile's ring fades and the new tile's ring draw
| Caret blink | solid while it moves or they type; 0.5 s after the last key, 0.6 s on / 0.6 s off with soft fades (`caret-blink`); its on/off fade | 1200 ease-in-out loop; 100 linear |
| Selection | grows out of the caret: both edges start where the caret is and ride the caret's spring; the wash and handles fade in. A wash still fading from the last selection turns back instead and glides from its old ends to the new ones. | 140 linear |
| Selection collapses | the wash fades where it stands (no slide), then its ends rejoin the caret | 140 linear, the ends at 160 ms |
| The page's selection (`ui/selection.ts`) | as a field's: each line's ends ride the caret's spring; a new selection grows out of where it started, a line it reaches grows from the side it is reached from; on collapse it fades where it stands. Checked every frame while it shows: when the text moves or goes with no event (a scroll, a fold, a sheet's view or the sheet shut) it goes along at once, or fades where none of it shows | 140 linear, gone at 160 ms |
#### 15. Other moments
@@ -1405,7 +1409,7 @@ Words being saved (a name on its card) shimmer as an assistant's "thinking" line
- 0: Return; the words' copy laid over them dims to the muted base (240, standard curve), the caret steps aside;
- +120: the first sweep sets off (1.8 s across, linear), then again after a 0.58 s rest, until the answer;
- answer: the band holds where it is and the words fade back to their colour (480, standard curve);
- then: the input gives way to the name (identical, nothing moves), the card is drawn again and its status morphs from the hint, words and colour.
- then: the input gives way to the name (identical, nothing moves), the card is drawn again and its status blurs back from the hint (whole words), words and colour.
**Reconnect:**
+4 -3
View File
@@ -400,7 +400,7 @@ scripts/ build, deploy and check scripts
cd web
npm ci
npm run format # Prettier
npm run ci # format check, types, catalogs, tests, minified bundles
npm run ci # format check, types, lint, unused code, catalogs, tests, minified bundles
npm run i18n # collect new strings into the catalogs (then translate them in ru.po)
scripts/lint-ucode.py # static ucode checks
@@ -412,8 +412,9 @@ scripts/capture-portal.mjs # the portal's from its demo, in Englis
scripts/frame-screenshots.py # frame them for this README
```
The web bundles and the catalogs are committed: CI fails when they are out of
date or a string is untranslated (`rules/i18n.md`). Pushing a tag `vX.Y.Z`
The web bundles are built, not committed (`npm run build` before
`scripts/build-packages.sh`); the catalogs are committed, and CI fails when they
are out of date or a string is untranslated (`rules/i18n.md`). Pushing a tag `vX.Y.Z`
(matching `PKG_VERSION`) builds the packages and their translations with the
OpenWrt SDK and publishes a release with `sha256sums.txt`.
+4 -3
View File
@@ -404,7 +404,7 @@ scripts/ скрипты сборки, деплоя и
cd web
npm ci
npm run format # Prettier
npm run ci # форматирование, типы, каталоги, тесты, минифицированные бандлы
npm run ci # форматирование, типы, линтер, неиспользуемый код, каталоги, тесты, бандлы
npm run i18n # собрать новые строки в каталоги (затем перевести их в ru.po)
scripts/lint-ucode.py # статические проверки ucode
@@ -416,8 +416,9 @@ scripts/capture-portal.mjs # скриншоты портала д
scripts/frame-screenshots.py # оформить их для README
```
Бандлы и каталоги лежат в репозитории: CI падает, если они устарели или строка
не переведена (`rules/i18n.md`). Тег `vX.Y.Z` (совпадающий с `PKG_VERSION`)
Бандлы не лежат в репозитории, они собираются (`npm run build` перед
`scripts/build-packages.sh`); каталоги лежат, и CI падает, если они устарели или
строка не переведена (`rules/i18n.md`). Тег `vX.Y.Z` (совпадающий с `PKG_VERSION`)
собирает пакеты и переводы в OpenWrt SDK и публикует релиз с `sha256sums.txt`.
---
+2 -2
View File
@@ -1,7 +1,7 @@
# Builds luci-app-dawnline with the OpenWrt SDK.
# docker build -f build/Dockerfile --build-arg SDK_IMAGE=itdoginfo/openwrt-sdk-ipk:24.10.6 .
# The web bundles (htdocs/.../app.js, portal assets) are built by npm first and
# committed; the SDK only packs files, so the package is the same on every arch.
# The web bundles (htdocs/.../app.js, portal assets) are built by npm first
# (not committed); the SDK only packs files, so the package is the same on every arch.
ARG SDK_IMAGE=itdoginfo/openwrt-sdk-ipk:24.10.6
FROM ${SDK_IMAGE}
+30 -12
View File
@@ -487,18 +487,19 @@ check_tools() {
# ---------- downloads ----------
# fetch_once URL FILE [SECONDS]
# fetch_once URL FILE [SECONDS] [ACCEPT]
fetch_once() {
_fu="$1"
_fd="$2"
_ft="${3:-$DOWNLOAD_TIMEOUT}"
_fa="${4:-}"
rm -f "$_fd"
case "$FETCHER" in
curl)
run_logged download curl -fsSL --connect-timeout "$CONNECT_TIMEOUT" --max-time "$_ft" \
--speed-limit 1024 --speed-time 30 -o "$_fd" "$_fu"
--speed-limit 1024 --speed-time 30 ${_fa:+-H "Accept: $_fa"} -o "$_fd" "$_fu"
;;
*) run_logged download "$FETCHER" -q -T "$CONNECT_TIMEOUT" -O "$_fd" "$_fu" ;;
*) run_logged download "$FETCHER" -q -T "$CONNECT_TIMEOUT" ${_fa:+--header="Accept: $_fa"} -O "$_fd" "$_fu" ;;
esac
_frc=$?
[ "$_frc" -eq 0 ] && [ -s "$_fd" ] && return 0
@@ -531,16 +532,29 @@ asset_digest() {
jsonfilter -i "$1" -e "@.assets[@.name='$2'].digest" 2>/dev/null | head -n 1 | sed -n 's/^sha256:\([0-9a-f]\{64\}\)$/\1/p'
}
# download URL FILE LABEL [SHA256]: direct, then (only when the sha256 is
# known) two mirrors, then direct again. A file whose sha256 doesn't match is
# thrown away and the next source is tried; without a sha256 only GitHub
# itself is used.
# A release file's URL in the GitHub API, from release JSON (empty if unknown).
# Asked for application/octet-stream, it answers with the file itself.
asset_api_url() {
[ -s "$1" ] || return 0
jsonfilter -i "$1" -e "@.assets[@.name='$2'].url" 2>/dev/null | head -n 1 |
sed -n 's#^\(https://api\.github\.com/repos/[^/]*/[^/]*/releases/assets/[0-9][0-9]*\)$#\1#p'
}
# download URL FILE LABEL [SHA256] [API_URL]: without curl the API's URL
# first (github.com's redirect carries a Content-Security-Policy header that
# can outgrow uclient-fetch's 4 KB line buffer, and it stalls there), then
# direct, then (only when the sha256 is known) two mirrors, then direct again.
# A file whose sha256 doesn't match is thrown away and the next source is
# tried; without a sha256 only GitHub itself is used.
download() {
_du="$1"
_dd="$2"
_dl="$3"
_dw="${4:-}"
_da="${5:-}"
[ "$FETCHER" != curl ] || _da=""
set -- "$_du"
[ -z "$_da" ] || set -- "$_da" "$_du"
if [ -n "$_dw" ]; then
for _m in $MIRRORS; do set -- "$@" "$_m$_du"; done
fi
@@ -555,7 +569,9 @@ download() {
sleep 2
msg "Downloading $_dl via $(host_of "$_try") (attempt $_n/$_total)"
fi
if fetch_once "$_try" "$_dd"; then
_acc=""
[ "$_try" != "$_da" ] || _acc="application/octet-stream"
if fetch_once "$_try" "$_dd" "" "$_acc"; then
if [ -n "$_dw" ] && [ "$(sha256sum "$_dd" 2>/dev/null | awk '{ print $1 }')" != "$_dw" ]; then
warn "$(host_of "$_try") sent a file that doesn't match GitHub's sha256: discarded"
rm -f "$_dd"
@@ -1118,10 +1134,11 @@ confirm() {
download_release_file() {
_name="$1"
_sums="$TMP_DIR/sha256sums.txt"
# The checksum: GitHub's own (API), else the release's sha256sums.txt straight from github.com.
# The checksum: GitHub's own (API), else the release's sha256sums.txt straight from GitHub.
_want="$(asset_digest "$TMP_DIR/release.json" "$_name")"
if [ -z "$_want" ]; then
[ -s "$_sums" ] || download "$ASSET_BASE/sha256sums.txt" "$_sums" sha256sums.txt || {
[ -s "$_sums" ] || download "$ASSET_BASE/sha256sums.txt" "$_sums" sha256sums.txt "" \
"$(asset_api_url "$TMP_DIR/release.json" sha256sums.txt)" || {
err "Download failed: sha256sums.txt (does release $VERSION exist?)"
return 1
}
@@ -1131,7 +1148,7 @@ download_release_file() {
return 1
}
fi
download "$ASSET_BASE/$_name" "$TMP_DIR/$_name" "$_name" "$_want" || {
download "$ASSET_BASE/$_name" "$TMP_DIR/$_name" "$_name" "$_want" "$(asset_api_url "$TMP_DIR/release.json" "$_name")" || {
err "Download failed: $_name"
return 1
}
@@ -1158,7 +1175,8 @@ download_awg() {
_f="$TMP_DIR/$_p$_pf"
# Verified when GitHub publishes the file's sha256 (then mirrors may serve it).
_want="$(asset_digest "$TMP_DIR/awg-$_s.json" "$_p$_pf")"
if download "https://github.com/$_repo/releases/download/v$OWRT_RELEASE/$_p$_pf" "$_f" "$_p ($_repo)" "$_want" &&
if download "https://github.com/$_repo/releases/download/v$OWRT_RELEASE/$_p$_pf" "$_f" "$_p ($_repo)" "$_want" \
"$(asset_api_url "$TMP_DIR/awg-$_s.json" "$_p$_pf")" &&
verify_archive "$_f"; then
_files="$_files $_f"
else
+1 -1
View File
@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-dawnline
PKG_VERSION:=0.15.0
PKG_VERSION:=0.16.1
PKG_RELEASE:=1
PKG_LICENSE:=MIT
# po/<lang>/dawnline.po becomes luci-i18n-dawnline-<lang> (luci.mk), released
@@ -1,31 +0,0 @@
// Generated from dawnline/web — do not edit by hand.
'use strict';
'require baseclass';
'require dom';
'require poll';
'require rpc';
'require ui';
var va=Object.create;var ds=Object.defineProperty;var ba=Object.getOwnPropertyDescriptor;var xa=Object.getOwnPropertyNames;var wa=Object.getPrototypeOf,ya=Object.prototype.hasOwnProperty;var ka=(t,e)=>()=>(e||t((e={exports:{}}).exports,e),e.exports);var _a=(t,e,o,s)=>{if(e&&typeof e=="object"||typeof e=="function")for(let r of xa(e))!ya.call(t,r)&&r!==o&&ds(t,r,{get:()=>e[r],enumerable:!(s=ba(e,r))||s.enumerable});return t};var Ca=(t,e,o)=>(o=t!=null?va(wa(t)):{},_a(e||!t||!t.__esModule?ds(o,"default",{value:t,enumerable:!0}):o,t));var _s=ka((ys,ks)=>{"use strict";var ws=(function(){var t=function(P,R){var w=236,k=17,y=P,O=o[R],b=null,f=0,T=null,C=[],A={},K=function(z,$){f=y*4+17,b=(function(E){for(var I=new Array(E),D=0;D<E;D+=1){I[D]=new Array(E);for(var W=0;W<E;W+=1)I[D][W]=null}return I})(f),Y(0,0),Y(f-7,0),Y(0,f-7),Z(),j(),me(z,$),y>=7&&te(z),T==null&&(T=ne(y,O,C)),ke(T,$)},Y=function(z,$){for(var E=-1;E<=7;E+=1)if(!(z+E<=-1||f<=z+E))for(var I=-1;I<=7;I+=1)$+I<=-1||f<=$+I||(0<=E&&E<=6&&(I==0||I==6)||0<=I&&I<=6&&(E==0||E==6)||2<=E&&E<=4&&2<=I&&I<=4?b[z+E][$+I]=!0:b[z+E][$+I]=!1)},Q=function(){for(var z=0,$=0,E=0;E<8;E+=1){K(!0,E);var I=r.getLostPoint(A);(E==0||z>I)&&(z=I,$=E)}return $},j=function(){for(var z=8;z<f-8;z+=1)b[z][6]==null&&(b[z][6]=z%2==0);for(var $=8;$<f-8;$+=1)b[6][$]==null&&(b[6][$]=$%2==0)},Z=function(){for(var z=r.getPatternPosition(y),$=0;$<z.length;$+=1)for(var E=0;E<z.length;E+=1){var I=z[$],D=z[E];if(b[I][D]==null)for(var W=-2;W<=2;W+=1)for(var ee=-2;ee<=2;ee+=1)W==-2||W==2||ee==-2||ee==2||W==0&&ee==0?b[I+W][D+ee]=!0:b[I+W][D+ee]=!1}},te=function(z){for(var $=r.getBCHTypeNumber(y),E=0;E<18;E+=1){var I=!z&&($>>E&1)==1;b[Math.floor(E/3)][E%3+f-8-3]=I}for(var E=0;E<18;E+=1){var I=!z&&($>>E&1)==1;b[E%3+f-8-3][Math.floor(E/3)]=I}},me=function(z,$){for(var E=O<<3|$,I=r.getBCHTypeInfo(E),D=0;D<15;D+=1){var W=!z&&(I>>D&1)==1;D<6?b[D][8]=W:D<8?b[D+1][8]=W:b[f-15+D][8]=W}for(var D=0;D<15;D+=1){var W=!z&&(I>>D&1)==1;D<8?b[8][f-D-1]=W:D<9?b[8][15-D-1+1]=W:b[8][15-D-1]=W}b[f-8][8]=!z},ke=function(z,$){for(var E=-1,I=f-1,D=7,W=0,ee=r.getMaskFunction($),X=f-1;X>0;X-=2)for(X==6&&(X-=1);;){for(var ve=0;ve<2;ve+=1)if(b[I][X-ve]==null){var Le=!1;W<z.length&&(Le=(z[W]>>>D&1)==1);var re=ee(I,X-ve);re&&(Le=!Le),b[I][X-ve]=Le,D-=1,D==-1&&(W+=1,D=7)}if(I+=E,I<0||f<=I){I-=E,E=-E;break}}},U=function(z,$){for(var E=0,I=0,D=0,W=new Array($.length),ee=new Array($.length),X=0;X<$.length;X+=1){var ve=$[X].dataCount,Le=$[X].totalCount-ve;I=Math.max(I,ve),D=Math.max(D,Le),W[X]=new Array(ve);for(var re=0;re<W[X].length;re+=1)W[X][re]=255&z.getBuffer()[re+E];E+=ve;var ze=r.getErrorCorrectPolynomial(Le),Re=a(W[X],ze.getLength()-1),is=Re.mod(ze);ee[X]=new Array(ze.getLength()-1);for(var re=0;re<ee[X].length;re+=1){var as=re+is.getLength()-ee[X].length;ee[X][re]=as>=0?is.getAt(as):0}}for(var ls=0,re=0;re<$.length;re+=1)ls+=$[re].totalCount;for(var ao=new Array(ls),hn=0,re=0;re<I;re+=1)for(var X=0;X<$.length;X+=1)re<W[X].length&&(ao[hn]=W[X][re],hn+=1);for(var re=0;re<D;re+=1)for(var X=0;X<$.length;X+=1)re<ee[X].length&&(ao[hn]=ee[X][re],hn+=1);return ao},ne=function(z,$,E){for(var I=l.getRSBlocks(z,$),D=d(),W=0;W<E.length;W+=1){var ee=E[W];D.put(ee.getMode(),4),D.put(ee.getLength(),r.getLengthInBits(ee.getMode(),z)),ee.write(D)}for(var X=0,W=0;W<I.length;W+=1)X+=I[W].dataCount;if(D.getLengthInBits()>X*8)throw"code length overflow. ("+D.getLengthInBits()+">"+X*8+")";for(D.getLengthInBits()+4<=X*8&&D.put(0,4);D.getLengthInBits()%8!=0;)D.putBit(!1);for(;!(D.getLengthInBits()>=X*8||(D.put(w,8),D.getLengthInBits()>=X*8));)D.put(k,8);return U(D,I)};A.addData=function(z,$){$=$||"Byte";var E=null;switch($){case"Numeric":E=c(z);break;case"Alphanumeric":E=p(z);break;case"Byte":E=u(z);break;case"Kanji":E=g(z);break;default:throw"mode:"+$}C.push(E),T=null},A.isDark=function(z,$){if(z<0||f<=z||$<0||f<=$)throw z+","+$;return b[z][$]},A.getModuleCount=function(){return f},A.make=function(){if(y<1){for(var z=1;z<40;z++){for(var $=l.getRSBlocks(z,O),E=d(),I=0;I<C.length;I++){var D=C[I];E.put(D.getMode(),4),E.put(D.getLength(),r.getLengthInBits(D.getMode(),z)),D.write(E)}for(var W=0,I=0;I<$.length;I++)W+=$[I].dataCount;if(E.getLengthInBits()<=W*8)break}y=z}K(!1,Q())},A.createTableTag=function(z,$){z=z||2,$=typeof $>"u"?z*4:$;var E="";E+='<table style="',E+=" border-width: 0px; border-style: none;",E+=" border-collapse: collapse;",E+=" padding: 0px; margin: "+$+"px;",E+='">',E+="<tbody>";for(var I=0;I<A.getModuleCount();I+=1){E+="<tr>";for(var D=0;D<A.getModuleCount();D+=1)E+='<td style="',E+=" border-width: 0px; border-style: none;",E+=" border-collapse: collapse;",E+=" padding: 0px; margin: 0px;",E+=" width: "+z+"px;",E+=" height: "+z+"px;",E+=" background-color: ",E+=A.isDark(I,D)?"#000000":"#ffffff",E+=";",E+='"/>';E+="</tr>"}return E+="</tbody>",E+="</table>",E},A.createSvgTag=function(z,$,E,I){var D={};typeof arguments[0]=="object"&&(D=arguments[0],z=D.cellSize,$=D.margin,E=D.alt,I=D.title),z=z||2,$=typeof $>"u"?z*4:$,E=typeof E==Line truncated
`}return E%2&&z>0?Re.substring(0,Re.length-E-1)+Array(E+1).join("▀"):Re.substring(0,Re.length-1)};return A.createASCII=function(z,$){if(z=z||1,z<2)return fe($);z-=1,$=typeof $>"u"?z*2:$;var E=A.getModuleCount()*z+$*2,I=$,D=E-$,W,ee,X,ve,Le=Array(z+1).join("██"),re=Array(z+1).join(" "),ze="",Re="";for(W=0;W<E;W+=1){for(X=Math.floor((W-I)/z),Re="",ee=0;ee<E;ee+=1)ve=1,I<=ee&&ee<D&&I<=W&&W<D&&A.isDark(X,Math.floor((ee-I)/z))&&(ve=0),Re+=ve?Le:re;for(X=0;X<z;X+=1)ze+=Re+`
`}return ze.substring(0,ze.length-1)},A.renderTo2dContext=function(z,$){$=$||2;for(var E=A.getModuleCount(),I=0;I<E;I++)for(var D=0;D<E;D++)z.fillStyle=A.isDark(I,D)?"black":"white",z.fillRect(I*$,D*$,$,$)},A};t.stringToBytesFuncs={default:function(P){for(var R=[],w=0;w<P.length;w+=1){var k=P.charCodeAt(w);R.push(k&255)}return R}},t.stringToBytes=t.stringToBytesFuncs.default,t.createStringToBytes=function(P,R){var w=(function(){for(var y=h(P),O=function(){var j=y.read();if(j==-1)throw"eof";return j},b=0,f={};;){var T=y.read();if(T==-1)break;var C=O(),A=O(),K=O(),Y=String.fromCharCode(T<<8|C),Q=A<<8|K;f[Y]=Q,b+=1}if(b!=R)throw b+" != "+R;return f})(),k=63;return function(y){for(var O=[],b=0;b<y.length;b+=1){var f=y.charCodeAt(b);if(f<128)O.push(f);else{var T=w[y.charAt(b)];typeof T=="number"?(T&255)==T?O.push(T):(O.push(T>>>8),O.push(T&255)):O.push(k)}}return O}};var e={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},o={L:1,M:0,Q:3,H:2},s={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},r=(function(){var P=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],R=1335,w=7973,k=21522,y={},O=function(b){for(var f=0;b!=0;)f+=1,b>>>=1;return f};return y.getBCHTypeInfo=function(b){for(var f=b<<10;O(f)-O(R)>=0;)f^=R<<O(f)-O(R);return(b<<10|f)^k},y.getBCHTypeNumber=function(b){for(var f=b<<12;O(f)-O(w)>=0;)f^=w<<O(f)-O(w);return b<<12|f},y.getPatternPosition=function(b){return P[b-1]},y.getMaskFunction=function(b){switch(b){case s.PATTERN000:return function(f,T){return(f+T)%2==0};case s.PATTERN001:return function(f,T){return f%2==0};case s.PATTERN010:return function(f,T){return T%3==0};case s.PATTERN011:return function(f,T){return(f+T)%3==0};case s.PATTERN100:return function(f,T){return(Math.floor(f/2)+Math.floor(T/3))%2==0};case s.PATTERN101:return function(f,T){return f*T%2+f*T%3==0};case s.PATTERN110:return function(f,T){return(f*T%2+f*T%3)%2==0};case s.PATTERN111:return function(f,T){return(f*T%3+(f+T)%2)%2==0};default:throw"bad maskPattern:"+b}},y.getErrorCorrectPolynomial=function(b){for(var f=a([1],0),T=0;T<b;T+=1)f=f.multiply(a([1,i.gexp(T)],0));return f},y.getLengthInBits=function(b,f){if(1<=f&&f<10)switch(b){case e.MODE_NUMBER:return 10;case e.MODE_ALPHA_NUM:return 9;case e.MODE_8BIT_BYTE:return 8;case e.MODE_KANJI:return 8;default:throw"mode:"+b}else if(f<27)switch(b){case e.MODE_NUMBER:return 12;case e.MODE_ALPHA_NUM:return 11;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 10;default:throw"mode:"+b}else if(f<41)switch(b){case e.MODE_NUMBER:return 14;case e.MODE_ALPHA_NUM:return 13;case e.MODE_8BIT_BYTE:return 16;case e.MODE_KANJI:return 12;default:throw"mode:"+b}else throw"type:"+f},y.getLostPoint=function(b){for(var f=b.getModuleCount(),T=0,C=0;C<f;C+=1)for(var A=0;A<f;A+=1){for(var K=0,Y=b.isDark(C,A),Q=-1;Q<=1;Q+=1)if(!(C+Q<0||f<=C+Q))for(var j=-1;j<=1;j+=1)A+j<0||f<=A+j||Q==0&&j==0||Y==b.isDark(C+Q,A+j)&&(K+=1);K>5&&(T+=3+K-5)}for(var C=0;C<f-1;C+=1)for(var A=0;A<f-1;A+=1){var Z=0;b.isDark(C,A)&&(Z+=1),b.isDark(C+1,A)&&(Z+=1),b.isDark(C,A+1)&&(Z+=1),b.isDark(C+1,A+1)&&(Z+=1),(Z==0||Z==4)&&(T+=3)}for(var C=0;C<f;C+=1)for(var A=0;A<f-6;A+=1)b.isDark(C,A)&&!b.isDark(C,A+1)&&b.isDark(C,A+2)&&b.isDark(C,A+3)&&b.isDark(C,A+4)&&!b.isDark(C,A+5)&&b.isDark(C,A+6)&&(T+=40);for(var A=0;A<f;A+=1)for(var C=0;C<f-6;C+=1)b.isDark(C,A)&&!b.isDark(C+1,A)&&b.isDark(C+2,A)&&b.isDark(C+3,A)&&b.isDark(C+4,A)&&!b.isDark(C+5,A)&&b.isDark(C+6,A)&&(T+=40);for(var te=0,A=0;A<f;A+=1)for(var C=0;C<f;C+=1)b.isDark(C,A)&&(te+=1);var me=Math.abs(100*te/f/f-50)/5;return T+=me*10,T},y})(),i=(function(){for(var P=new Array(256),R=new Array(256),w=0;w<8;w+=1)P[w]=1<<w;for(var w=8;w<256;w+=1)P[w]=P[w-4]^P[w-5]^P[w-6]^P[w-8];for(var w=0;w<255;w+=1)R[P[w]]=w;var k={};return k.glog=function(y){if(y<1)throw"glog("+y+")";return R[y]},k.gexp=function(y){for(;y<0;)y+=255;for(;y>=256;)y-=255;return P[y]},k})();function a(P,R){if(typeof P.length>"u")throw P.length+"/"+R;var w=(function(){for(var y=0;y<P.length&&P[y]==0;)y+=1;for(var O=new Array(P.length-y+R),b=0;b<P.length-y;b+=1)O[b]=P[b+y];return O})(),k={};return k.getAt=function(y){return w[y]},k.getLength=function(){return w.length},k.multiply=function(y){for(var O=new Array(k.getLength()+y.getLength()-1),b=0;b<k.getLength();b+=1)for(var f=0;f<y.getLength();f+=1)O[b+f]^=i.gexp(i.glog(k.getAt(b))+i.glog(y.getAt(f)));return a(O,0)},k.mod=function(y){if(k.getLengt Line truncated
`)}function ol(t){let e=new Map(t.people.map(s=>[s.id,s.name])),o=new Map(t.people.flatMap(s=>s.devices.map(r=>[r.id,r.name])));return{people:e,devices:o}}function Xe(t,e,o,s="",r=[]){let i=ol(t),a=[...e.map(u=>({ts:u.ts,category:Zt(u.type),type:u.type,person:u.person?i.people.get(u.person)??u.pname??u.person:"",device:u.device?i.devices.get(u.device)??u.dname??u.device:"",detail:u.detail??"",where:u.where??"",by:Ve(u)??""})),...r.map(u=>({ts:u.ts,category:"system",type:`${u.src}.${u.level}`,person:"",device:"",detail:`${u.who?`${u.who} `:""}${u.msg}${u.detail?`
${u.detail}`:""}`,where:Qt(u.src),by:""}))].sort((u,g)=>u.ts-g.ts).map(({ts:u,...g})=>({time:new Date(u*1e3).toISOString(),...g})),l=new Date().toISOString().slice(0,10),d=`dawnline-activity${s?`-${s}`:""}-${l}.${o}`;if(o==="json"){Ae(d,JSON.stringify(a,null,2),"application/json");return}let c=["time","category","type","person","device","detail","where","by"],p={time:_("Time"),category:_("Category"),type:_("Type"),person:_("Person"),device:_("Device"),detail:_("Detail"),where:_("Where"),by:_("By")};Ae(d,nr(c,a,p),"text/csv")}var sl=["","7","30","90"],rl=t=>t?G(Number(t),"Older than %s day","Older than %s days"):_("Everything"),or=t=>t?G(t,"%s event removed","%s events removed"):_("Nothing matched");function dt(t,e,o,s,r,i=!1){let a=n("select",{class:"cbi-input-select"},[n("option",{value:""},_("All categories")),...Rt.map(d=>n("option",{value:d,selected:d===r?"selected":null},Ke(d))),i?n("option",{value:"system",selected:r==="system"?"selected":null},_("System")):""]),l=n("select",{class:"cbi-input-select"},sl.map(d=>n("option",{value:d},rl(d))));ae(t,[n("p",{class:"dl-muted"},`${e} ${_("This cannot be undone; export first if you want a copy.")}`),n("label",{class:"dl-fld"},[n("span",{class:"dl-fld-label"},_("Category")),a]),n("label",{class:"dl-fld"},[n("span",{class:"dl-fld-label"},_("Which events")),l])],[de()," ",H(_("Clear"),async()=>{let d=0;if(a.value!=="system")try{d+=(await N.logsClear({...o,category:a.value,older_days:l.value})).removed}catch(c){F(_e(c),"error",1e4);return}if(i&&(a.value==="system"||a.value===""))try{d+=(await N.serviceLogClear(l.value)).removed}catch(c){le();let p=m(_("The service log was not cleared: %s"),_e(c));F(a.value==="system"?p:`${m(_("Activity: %s."),or(d).toLowerCase())} ${p}`,"error",1e4),s();return}le(),F(or(d),"success",3e3),s()},"negative")])}function It(t,e,o,s){let r=t==="device"?m(_("Clears %s's daily and monthly traffic history. Their person's totals and data limit are not changed."),o):t==="person"?m(_("Clears %s's traffic history and that of their devices. Their data limit starts again from zero."),o):_("Clears traffic history for everyone. Data limits start again from zero.");ae(t==="all"?_("Reset all traffic history?"):m(_("Reset traffic history for %s?"),o),[n("p",{class:"dl-muted"},r)],[de()," ",H(_("Reset"),async()=>{await q(()=>N.usageClear(t,e),_("Traffic history reset"))&&(le(),s())},"negative")])}var il={jc:"0",jmin:"0",jmax:"0",s1:"0",s2:"0",s3:"",s4:"",h1:"1",h2:"2",h3:"3",h4:"4",i1:"",i2:"",i3:"",i4:"",i5:""},al={header_protection_key:"HeaderProtectionKey",content_padding_addition:"ContentPaddingAddition",rekey_after_time:"RekeyAfterTime",rekey_timeout:"RekeyTimeout",reject_after_time:"RejectAfterTime",keepalive_timeout:"KeepaliveTimeout",max_handshake_attempts:"MaxHandshakeAttempts",random_trailers:"RandomTrailers",disable_cookies:"DisableCookies"};function ll(t){let e={};for(let[o,s]of Object.entries(al))t[o]!=null&&t[o]!==""&&(e[s]=String(t[o]));return e}function dl(t,e){let o=t.amnezia,s=o.obfuscation??{},r=d=>s[d]!=null&&s[d]!==""?String(s[d]):il[d],i=o.host.replace(/^\[(.*)\]$/,"$1"),a={H1:r("h1"),H2:r("h2"),H3:r("h3"),H4:r("h4"),I1:r("i1"),I2:r("i2"),I3:r("i3"),I4:r("i4"),I5:r("i5"),Jc:r("jc"),Jmin:r("jmin"),Jmax:r("jmax"),S1:r("s1"),S2:r("s2"),S3:r("s3"),S4:r("s4"),...ll(s),allowed_ips:o.allowed_ips,client_ip:o.client_ip,client_priv_key:o.client_priv_key,client_pub_key:o.client_pub_key,config:t.conf.replace(/\r?\n/g,`\r
`),hostName:i,mtu:o.mtu,persistent_keep_alive:o.persistent_keep_alive,port:Number(o.port),psk_key:o.psk_key,server_pub_key:o.server_pub_key},l={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(a),port:String(o.port),protocol_version:s.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:e,hostName:i};return o.dns[0]&&(l.dns1=o.dns[0],l.dns2=o.dns[1]||o.dns[0]),l}function cl(t){let e="";for(let o=0;o<t.length;o+=32768)e+=String.fromCharCode(...t.subarray(o,o+32768));return btoa(e).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function pl(t){let e=globalThis;if(typeof e.CompressionStream>"u")return null;try{let o=new e.Blob([t]).stream().pipeThrough(new e.CompressionStream("deflate")),s=new Uint8Array(await new e.Response(o).arrayBuffer()),r=new Uint8Array(4+s.length);return new DataView(r.buffer).setUint32(0,t.length,!1),r.set(s,4),r}catch{return null}}async function Po(t,e,o=!0){let s=new TextEncoder().encode(JSON.stringify(dl(t,e))),r=o?await pl(s):null;return`vpn://${cl(r??s)}`}function rr(){return[{id:"off",title:_("Off"),ic:"zap",stealth:0,speed:4,text:_("Plain WireGuard-compatible traffic. Fastest, but easy to recognise and block."),apps:_("Any WireGuard app"),short:_("Any WireGuard app")},{id:"balanced",title:_("Balanced"),ic:"shield",stealth:3,speed:4,needs:"v2",text:_("AmneziaWG 2.0: junk packets, padded packets and a first packet that looks like DNS. For networks that learned to spot 1.0-style junk."),apps:_("AmneziaVPN 4.8.12 or newer, AmneziaWG 2.0+ apps"),short:_("AmneziaWG 2.0+ apps")},{id:"max",title:_("Maximum"),ic:"lock",stealth:4,speed:3,needs:"v3",text:_("AmneziaWG 3.1: encrypted packet headers, random tails and sizes, jittered timing, and a first packet that looks like DNS."),apps:_("Apps with AmneziaWG 3.1 (current AmneziaVPN)"),short:_("AmneziaWG 3.1 apps")}]}var Xt=t=>rr().find(e=>e.id===t),$n=t=>t.v3?"max":t.v2?"balanced":"off",en=t=>t==="standard"?_("Standard (old)"):t==="strong"?_("Strong (old)"):null;function ul(t,e){return e?t==="v2"?_("Needs AmneziaWG 2.0 or newer on the router (kmod-amneziawg and amneziawg-tools from July 2025 on)."):_("Needs AmneziaWG 3.1 on the router (kmod-amneziawg and amneziawg-tools 3.1)."):t==="v2"?_("Needs AmneziaWG on the router."):_("Needs AmneziaWG 3.1 on the router: install it first.")}function sr(t,e){return n("span",{class:"dl-dots",title:m(_("%s: %s of 4"),e,t)},[n("span",{class:"dl-dots-label"},e),n("span",{class:"dl-dots-row"},[0,1,2,3].map(o=>n("i",{class:o<t?"on":""})))])}function Dn(t,e,o,s,r=!0){let i=n("div",{class:"dl-methods",role:"radiogroup","aria-label":_("Disguise method")}),a=()=>dom.content(i,rr().map(l=>{let d=!l.needs||t[l.needs],c=l.id===e;return n("button",{type:"button",role:"radio","aria-checked":c?"true":"false","aria-disabled":d?null:"true",class:`dl-method${c?" on":""}${d?"":" off"}`,click:()=>{!d||c||(e=l.id,a(),o(l.id))}},[n("div",{class:"dl-method-head"},[n("span",{class:"dl-method-ic"},v(l.ic)),n("b",{},l.title),l.id===s?n("span",{class:"dl-pill ok"},_("Current")):""]),n("p",{},l.text),n("div",{class:"dl-method-meters"},[sr(l.stealth,_("Stealth")),sr(l.speed,_("Speed"))]),n("div",{class:"dl-method-foot"},d?[v(l.id==="off"?"wireguard":"amneziawg"),n("span",{},l.apps)]:[v("alert"),n("span",{},ul(l.needs,r))])])}));return a(),i}function ir(t,e){return n("div",{class:"dl-corehead"},[n("h3",{},t),e?n("span",{class:"dl-sub"},e):""])}var ar=[["jc","Jc"],["jmin","Jmin"],["jmax","Jmax"],["s1","S1"],["s2","S2"],["s3","S3"],["s4","S4"],["h1","H1"],["h2","H2"],["h3","H3"],["h4","H4"],["i1","I1"],["i2","I2"],["i3","I3"],["i4","I4"],["i5","I5"],["header_protection_key","HeaderProtectionKey"],["content_padding_addition","ContentPaddingAddition"],["rekey_after_time","RekeyAfterTime"],["rekey_timeout","RekeyTimeout"],["reject_after_time","RejectAfterTime"],["keepalive_timeout","KeepaliveTimeout"],["max_handshake_attempts","MaxHandshakeAttempts"],["random_trailers","RandomTrailers"],["disable_cookies","DisableCookies"]];function ml(t,e){let o=p=>p==="header_protection_key"?e:t[p]!=null&&t[p]!=="",s=ar.filter(([p])=>o(p));if(!s.length)return null;let r=(p,u)=>n("span",{class:"dl-pv"},[n("i",{},u),n("b",{},p==="header_protection_key"?_("set","key"):t[p])]),i=(p,u,g,M)=>{let x=ar.filter(([h])=>M.includes(h)&&o(h));return x.length?n("div",{class:"dl-pgroup"},[n("div",{class:"dl-pgroup-head"},[v(u),n("b",{},p)]),n("p",{},g),n("div",{class:"dl-pvals"},x.map(([h,S])=>r(h,S)))]):""},a=Number(t.jc||0),l=(t.i1??"").includes("0x8580")?_("A first packet shaped like a DNS answer."):_("Extra packets sent before the handshake."),d=s.filter(([p])=>p!=="header_protection_key").map(([p,u])=>`${u} = ${t[p]}`).join(`
`),c=n("div",{class:"dl-pgrid"},[i(_("Junk packets"),"zap",a?m(N_(a,"%s random packet of %s–%s bytes before each handshake.","%s random packets of %s–%s bytes before each handshake."),V(a),t.jmin,t.jmax):_("No junk packets."),["jc","jmin","jmax"]),i(_("Padding"),"archive",_("Random bytes in front of handshake, cookie and data packets, so their sizes do not match WireGuard."),["s1","s2","s3","s4"]),i(_("Packet types"),"key",_("The values that replace WireGuard’s recognisable message types."),["h1","h2","h3","h4"]),i(_("Signatures"),"globe",l,["i1","i2","i3","i4","i5"]),i(_("Protection"),"lock",_("AmneziaWG 3.1: encrypted headers, random tails and extra padding on data packets."),["header_protection_key","content_padding_addition","random_trailers","disable_cookies"]),i(_("Timing"),"clock",_("Handshake and key timers vary within these ranges instead of WireGuard’s fixed values."),["rekey_after_time","rekey_timeout","reject_after_time","keepalive_timeout","max_handshake_attempts"])]);return n("details",{class:"dl-params"},[n("summary",{},[v("chevron"),n("span",{},_("Current parameters")),n("span",{class:"dl-pcount"},String(s.length)),n("span",{class:"dl-spacer"}),n("button",{type:"button",class:"dl-linkbtn",click:p=>{p.preventDefault(),xe(d,e?_("Parameters copied. The header protection key is in each device’s file."):_("Parameters copied"))}},_("Copy as config"))]),c])}function lr(t,e){if(/^\s*\[.+\]\s*$/.test(t))return n("span",{class:"dl-conf-sec"},t);let o=/^(\s*[A-Za-z0-9]+\s*=)\s*(.*)$/.exec(t);if(!o)return document.createTextNode(t);let s=/^(\s*)(PrivateKey|PresharedKey)\b/.test(t);return n("span",{},[n("span",{class:"dl-conf-k"},o[1])," ",s&&!e?n("span",{class:"dl-conf-mask"},"••••••••••••••••"):o[2]])}function hl(t){let e=!1,o=n("pre",{class:"dl-conf"}),s=()=>dom.content(o,t.conf.split(`
`).flatMap((a,l)=>l?[`
`,lr(a,e)]:[lr(a,e)])),r=n("button",{type:"button",class:"dl-chipbtn",click:a=>{a.preventDefault(),e=!e,dom.content(r,[v(e?"x":"key"),e?_("Hide key"):_("Show key")]),s()}},[v("key"),_("Show key")]);s();let i=new Blob([t.conf]).size;return n("div",{class:"dl-stack gap8"},[n("div",{class:"dl-filecard"},[n("span",{class:"dl-filecard-ic"},".conf"),n("span",{class:"dl-stack"},[n("span",{class:"dl-mono dl-ellipsis"},t.filename),n("span",{class:"dl-sub"},`AmneziaWG · ${G(i,"%s byte","%s bytes")}`)]),H([v("download")," ",_("Download")],()=>Ae(t.filename,t.conf,"application/octet-stream"),"positive")]),n("details",{class:"dl-params"},[n("summary",{},[v("chevron"),n("span",{},_("Configuration")),n("span",{class:"dl-spacer"}),r,n("button",{type:"button",class:"dl-chipbtn",click:a=>{a.preventDefault(),xe(t.conf,_("Configuration copied"))}},[v("copy"),_("Copy")])]),o])])}function $o(t){let e=t.amnezia.obfuscation??{},o={h1:"1",h2:"2",h3:"3",h4:"4"};return Object.entries(e).every(([s,r])=>r==null||r===""||r===(o[s]??"0"))}async function fl(t,e="file"){if(!t.has_private_key)return n("div",{class:"dl-hint"},_("This device generated its own keys in the browser, so its full configuration only exists on that device."));let o=await Po(t,t.server),s={qr:()=>n("div",{class:"dl-qr-pane"},[_n(t.conf),n("span",{class:"dl-sub"},$o(t)?_("Scan with AmneziaVPN or any WireGuard app on the device."):_("Scan with AmneziaVPN or AmneziaWG on the device."))]),key:()=>n("div",{class:"dl-stack gap8"},[n("div",{class:"dl-linkbox"},[n("span",{class:"dl-mono"},o),H(_("Copy"),()=>xe(o,_("Key copied")))]),n("span",{class:"dl-sub"},m(_("AmneziaVPN → %s. Keep it private."),["+",_("Insert","AmneziaVPN app"),_("Continue","AmneziaVPN app")].join(" → ")))]),file:()=>hl(t)},r=n("div",{class:"dl-connect-body"}),i=n("div",{class:"dl-seg"}),a=l=>{i.querySelectorAll("button").forEach(d=>d.classList.toggle("on",d.dataset.id===l)),dom.content(r,s[l]())};for(let[l,d]of[["file",_("File")],["key",_("Key")],["qr",_("QR code")]])i.appendChild(n("button",{type:"button","data-id":l,click:()=>a(l)},d));return a(e),n("div",{class:"dl-stack gap12"},[i,r])}async function gl(t,e,o,s){let r=Xt(o),a=t.st.people.filter(d=>d.server===e.id).reduce((d,c)=>d+c.devices.length,0);await pe(s?_("Generate new disguise values?"):m(_("Switch to %s?"),r.title),[G(a,"%s AmneziaWG device stops connecting until it imports its configuration again (from their personal link or from you).","%s AmneziaWG devices stop connecting until they import their configuration again (from their personal link or from you)."),o==="max"?_("They need an app with AmneziaWG 3.1."):o==="balanced"?_("They need an app with AmneziaWG 2.0 or newer."):"",t.st.servers.length===1&&a?_("To keep the old disguise for some people, add a second server and move them there."):""].filter(Boolean).join(" "),s?_("Generate and apply"):_("Switch and apply"),!0)&&await q(()=>N.serverObfuscation(e.id,o),s?_("New values applied"):m(_("%s applied"),r.title))&&(F(_("Devices are marked “Update config” until they import again."),"info",6e3),await t.refresh())}function vl(t,e){let o=t.st,s=ue(String(e.port),{inputmode:"numeric",class:"cbi-input-text dl-w-port dl-mono"}),r=ue(e.mtu?String(e.mtu):"",{placeholder:_("Auto"),inputmode:"numeric",class:"cbi-input-text dl-w-port dl-mono"}),i=ue(String(e.keepalive??""),{placeholder:"25",inputmode:"numeric",class:"cbi-input-text dl-w-port dl-mono"}),a=Xt(e.preset)?e.preset:void 0,l=a??$n(o.awg),d=H("",()=>gl(t,e,l,l===a),"neutral"),c=()=>dom.content(d,l===a?[v("reset")," ",_("Generate new values")]:[m(_("Switch to %s"),Xt(l).title)]);c();let p=o.awg_state?.tools!==!1,u=[],g=Ce(_("UDP port"),s,()=>Jt(Number(s.value),u,[_("Opened on the WAN firewall automatically."),Number(s.value)===4500?_("4500 is IPsec’s port: most networks let it through."):""].filter(Boolean).join(" ")));N.serverPorts(e.id).then(h=>{u=h.udp_taken??[],g.refresh()}).catch(()=>{});let M=Ce("MTU",r,()=>$s(r.value,e.mtus)),x=Ce(_("Keep-alive"),i,()=>Ds(i.value));return Vt("",[ir("AmneziaWG",e.ifname),ye("globe",_("Listening"),_("Where devices reach this core from the internet"),[g]),ye("file",_("In every device configuration"),_("Changing these marks devices “Update config” until they import again"),[M,x]),ye("shield",_("Disguise"),_("So networks that block VPNs do not recognise the tunnel. Off = plain WireGuard"),[en(e.preset)?yt("warn",oe(_("%s is AmneziaWG 1.0 junk only, which networks learned to spot; it is not offered any more. Switch to %s or %s: devices import their configuration again."),n("b",{},en(e.preset)),n("b",{},_("Balanced")),n("b",{},_("Maximum")))):"",Dn(o.awg,l,h=>{l=h,c()},a,p),p&&!o.awg.v3?yt("info",oe(_("This router runs an older AmneziaWG. %s becomes available with kmod-amneziawg and amneziawg-tools 3.1."),n("b",{},_("Maximum")))):"",ml(e.obf??{},e.hpk)??"",n("div",{class:"dl-row-end"},[n("span",{class:"dl-sub"},_("Applies at once: every AmneziaWG device imports its configuration again.")),d])]),n Line truncated
`),_("Log copied")))]),p,u]),[g],"wide"),x([n("button",{class:"cbi-button cbi-button-neutral spinning",type:"button",disabled:"disabled"},r?_("Checking…"):_("Working…"))]);let S=o??null,B=o?.id,P,R=0,w=T=>{B!==T.id&&(B=T.id,e.onJob?.(T))};if(o)e.onJob?.(o);else try{let T=await N.updatesStatus().catch(()=>null);P=T?.job?.id,R=T?.now??0;let C=await N.updatesRun(t);C.job&&C.job.state==="running"&&C.job.id!==P&&(S=C.job,w(C.job))}catch(T){return M=[_e(T)],p.textContent=M[0],dom.content(u,n("div",{class:"dl-comp-status warn"},[v("alert"),n("span",{},_e(T))])),x([h(!0)]),F(_e(T),"error"),null}let k=null,y=0;for(;;){if(await Vo(1e3),k=await N.updatesStatus().catch(()=>null),!k){if(++y>60)break;continue}y=0;let T=k.job;if(!T||!oi(T,B,P,R)){if(Date.now()-i>15e3)break;continue}if(w(T),S=T,T.log.length){M=T.log;let C=p.scrollTop+p.clientHeight>=p.scrollHeight-8;p.textContent=M.join(`
`),C&&(p.scrollTop=p.scrollHeight)}if(l.textContent=ti(T,e.version??""),!l.isConnected&&l.textContent&&a.after(l),c.textContent=ei((T.finished??k.now)-T.started),T.state==="running"){d.hidden=!T.phase,d.textContent=T.phase;continue}break}if(p.scrollTop=p.scrollHeight,d.hidden=!1,!S||S.state==="running")return d.className="dl-pill warn",d.textContent=_("No answer"),dom.content(u,n("div",{class:"dl-comp-status warn"},[v("alert"),n("span",{},_("The router stopped answering. The job may still finish: reopen Components in a minute."))])),x([h()]),e.onDone?.(k),S;if(S.state==="failed")return d.className="dl-pill bad",d.textContent=_("Failed"),dom.content(u,n("div",{class:"dl-comp-status bad"},[v("x"),n("span",{},[n("b",{},(S.error??_("Operation failed")).replace(/\.$/,"")),r?"":`. ${_("Nothing else was changed.")}`])])),x([H(_("Copy log"),()=>xe(M.join(`
`),_("Log copied"))),h(!0)]),F(`${Un(s)??_("Update","noun")}: ${S.error??_("failed")}`,"error"),e.onDone?.(k),S;if(d.className="dl-pill ok",d.textContent=_("Finished"),r&&k){let T=ni(k,s);if(dom.content(u,n("div",{class:`dl-comp-status ${T.tone}`},[v(T.tone==="ok"?"check":T.tone==="warn"?"alert":"download"),n("span",{},T.text)])),F(T.text,T.tone==="warn"?"warning":"success"),e.onDone?.(k),T.update&&e.onUpdate){let C=k;x([h(),H(m(_("Update to %s"),T.update),()=>e.onUpdate(C),"positive")])}else x([h()]),T.tone==="ok"&&setTimeout(()=>u.isConnected&&le(),1200);return S}let O=/^app:(lang:|nolang$)/.exec(S.component??"");if(O){let T=()=>{ui.menu?.flushCache(),location.reload()};return dom.content(u,n("div",{class:"dl-comp-status ok"},[v("check"),n("span",{},[n("b",{},O[1]==="nolang"?_("The translation is removed."):_("The translation is installed."))," ",_("Reloading the page…")])])),x([h(),H(_("Reload now"),T,"positive")]),await Vo(4e3),u.isConnected&&T(),S}if(s==="app"&&S.to){let T=S.to,C=n("span",{},_("Waiting for the router to restart its services…"));dom.content(u,n("div",{class:"dl-comp-status ok"},[v("check"),n("span",{},[n("b",{},m(_("Dawnline %s is installed."),T))," ",C])]));let A=()=>{ui.menu?.flushCache(),location.reload()};x([h(),H(_("Reload now"),A,"positive")]),F(m(_("Dawnline updated to %s"),T),"success",6e3);for(let K=1;K<=30;K++)if(C.textContent=m(_("Waiting for the router to restart its services (%s of 30)…"),K),await Vo(1500),(await N.updatesStatus().catch(()=>null))?.version===T)return C.textContent=_("Services are back. Reloading…"),setTimeout(A,800),S;return C.textContent=_("Services restarted. Reload the page to use the new version."),S}let b=[...S.result?.pkgs?.updated??[],...S.result?.pkgs?.installed??[]],f=s==="pkgs"?b.length?m(_("Updated %s"),b.join(", ")):_("Updated system packages"):s==="amneziawg"?S.to?m(_("AmneziaWG %s is installed"),S.to):_("AmneziaWG is installed"):_("Operation completed");return dom.content(u,n("div",{class:"dl-comp-status ok"},[v("check"),n("span",{},f)])),x([h()]),F(f,"success"),e.onDone?.(k),S}function Kl(t){return{https:[_("Install HTTPS for the portal?"),_("Installing HTTPS for the portal")],acme:[_("Install ACME certificates?"),_("Installing ACME certificates")],home:[_("Install the home-like link?"),_("Installing the home-like link")],awg:[_("Install AmneziaWG?"),_("Installing AmneziaWG")]}[t]}async function si(t,e,o,s){let[r,i]=Kl(e);return!await pe(r,o,_("Install"))||(await dn(t,{title:i}))?.state!=="done"?!1:(setTimeout(()=>s?.(),4e3),!0)}function Gn(t){return si("amneziawg:auto","awg",_("Dawnline installs the AmneziaWG build made for this firmware and loads it. If the network service has to restart to learn it, connections drop for a few seconds."),t)}async function cn(t,e,o){return t==="awg"?Gn(o):e.length?si(`pkgs:${e.join(",")}`,t,m(_("%s from the OpenWrt feeds. Dawnline sets the rest up when they arrive."),e.join(", ")),o):!0}async function ri(t,e){if(t==="awg")return Gn(e);let o=await q(()=>N.updatesStatus());return o?cn(t,o.needs?.[t]??[],e):!1}var Vl=()=>[["wan","WAN"],["ethernet","Ethernet"],["wifi","Wi-Fi"],["vpn",_("VPN & tunnels")],["other",_("Other")]],Yl={wan:"globe",ethernet:"ethernet",bridge:"bridge",wifi:"wifi",vpn:"tunnel",other:"link"};function Yo(t){let e=n("b",{},oe(_("add its interface %s to their source interfaces yourself"),n("span",{class:"dl-mono"},t)));return[...oe(_("Off: internet traffic goes straight to the WAN, the fastest way. DNS still goes through this router. Proxies and filters here handle the tunnel only if you %s."),e)," ",n("span",{class:"dl-warn"},_("If the router’s DNS hands out proxy addresses, those sites won’t open without it."))]}function Jo(){return wt(_("Slower: every packet crosses the router twice. On a dual-core router expect up to a third less speed, and lost packets at full load."))}function ii(t,e,o){let s=t.id,r=e,i=n("div",{class:"dl-stack gap16"},n("section",{class:"dl-setsec"},n("div",{class:"dl-setsec-body"},n("p",{class:"dl-muted"},_("Loading interfaces…"))))),a,l=!0,d="",c=!0,p=!0,u="all",g=!1,M=Zr(r,s,o),x=new Set,h="",S=()=>JSON.stringify([p,l,l?"":d,c,[...x].sort()]),B=()=>a.detected.lan||a.saved.lan||"",P=()=>(l?a.detected.wan||a.saved.wan:d)||"",R=()=>new Map(a.devices.map(j=>[j.name,j])),w=()=>{let j=R();return[...c&&B()?[B()]:[],...[...x].filter(te=>te!==B())].filter(te=>te!==P()).map(te=>j.get(te)??{name:te,nets:[],missing:!0})},k=(j,Z)=>{a=j,Z&&(l=j.config.auto_wan,d=j.config.wan_device||j.detected.wan||j.saved.wan||"",c=j.config.auto_lan,p=j.config.lan_like,u=j.config.mesh??(j.config.device_mesh?"all":"off"),x=new Set(j.config.lan_devices),h=S()),Y()},y=async j=>{let Z=await N.interfaces(s).catch(te=>(F(te.message,"error"),null));Z&&k(Z,j)};function O(j){let Z=c&&j.name===B(),te=!!j.own||!!j.master||j.name===P()||Z;return Z||x.has(j.name)||!te&&(j.nets.length>0||!!j.missing)}function b(j){let Z=c&&j.name===B(),te=j.name===P(),me=!Z&&x.has(j.name),U=!(!!j.own||!!j.maste Line truncated
`).map(e=>zt(e)).join(`
`);function qn(t,e,o,s){let r=t.by==="admin",i=zt(t.msg),a=n("div",{class:`dl-row dl-slog-row ${r?"dl-ev-by-admin":`dl-ev-by-system ${nd[t.level]??""}`}${t.detail?" has-detail":""}`},[r?n("span",{class:"dl-ev-tile",title:_("Done by you in LuCI")},v("admin")):n("span",{class:"dl-ev-tile sys",title:sd(t.level)},v(od[t.src]??"zap")),n("span",{class:"dl-row-main"},r?[...rd(t),t.note?n("span",{class:"dl-muted"},` · ${Xs(t.note)}`):"",t.detail?n("span",{class:`dl-slog-more${e?" open":""}`},v("chevron")):"",t.detail&&e?n("pre",{class:"dl-slog-detail"},ai(t.detail)):""]:[t.src==="awg"&&t.who&&t.who!=="AmneziaWG"?n("span",{class:"dl-ev-kind"},`${_("Server")} `):"",n("b",{class:"dl-sys-src",title:Qt(t.src)},t.who?t.src==="awg"?t.who:zt(t.who):Qt(t.src)),/^[:,]/.test(i)?"":" ",n("span",{class:"dl-muted"},i),t.detail?n("span",{class:`dl-slog-more${e?" open":""}`},v("chevron")):"",t.detail&&e?n("pre",{class:"dl-slog-detail"},ai(t.detail)):""]),n("span",{class:"dl-faint dl-nowrap",title:new Date(t.ts*1e3).toLocaleString(ie())},s)]);return t.detail&&a.addEventListener("click",l=>{l.target.closest("pre")||o()}),a}function li(t){let e=new Date(t*1e3),o=new Date,s=new Date;if(s.setDate(o.getDate()-1),e.toDateString()===o.toDateString())return _("Today");if(e.toDateString()===s.toDateString())return _("Yesterday");let r=e.toLocaleDateString(ie(),{weekday:"long",day:"numeric",month:"long"});return r.charAt(0).toLocaleUpperCase(ie())+r.slice(1)}var Ut=t=>Pt(t).toLocaleDateString(ie(),{day:"numeric",month:"short"}),pn=200,Wt=40;function di(t,e){let o=Math.max(1,...t.map(a=>Math.max(a[1],a[2]))),s=a=>t.map((l,d)=>`${e[d]*pn},${Wt-2-l[a]/o*(Wt-6)}`),r=s(2),i=s(1);return{area:`M${r.join(" L")} L${e[e.length-1]*pn},${Wt} L${e[0]*pn},${Wt}Z`,down:`M${r.join(" L")}`,up:`M${i.join(" L")}`}}var Kn=(t,e,o,s)=>n("div",{class:"dl-speed-col"},[n("span",{class:"dl-sub"},[n("span",{class:o},e),` ${t}`]),s]),ci=([t,e])=>[n("span",{},oe(_("Today %s"),n("b",{},se(t+e)))),n("span",{},[n("span",{class:"dl-dn"},"↓"),` ${se(e)} `,n("span",{class:"dl-up"},"↑"),` ${se(t)}`])];function pi(t,e,o,s=!1){let r=t.slice(-15),i=r[r.length-1],a=i&&e-i[0]<180,l=a?i[2]:0,d=a?i[1]:0,c;if(r.length>1&&!s){let u=di(r,r.map((g,M)=>M/(r.length-1)));c=kt(`<svg viewBox="0 0 ${pn} ${Wt}" preserveAspectRatio="none" class="dl-speed-chart" aria-hidden="true"><path d="${u.area}" class="area"/><path d="${u.down}" class="line"/><path d="${u.up}" class="line up"/></svg>`),we(c,()=>{let g=r[r.length-1];return[n("div",{class:"dl-tip-title"},new Date(g[0]*1e3).toLocaleTimeString(ie(),{hour:"2-digit",minute:"2-digit"})),n("div",{},`↓ ${We(g[2])} · ↑ ${We(g[1])}`)]})}else c=n("div",{class:"dl-speed-wait"},[n("i"),s?"":n("span",{},_("Collecting… 1 point a minute"))]);let p=u=>s?n("span",{class:"dl-speed-val off"},"—"):n("span",{class:"dl-speed-val"},We(u));return n("div",{class:"dl-bento-tile"},[n("div",{class:"dl-bento-head"},[n("span",{class:"dl-metric-label"},_("Speed now")),s?"":n("span",{class:"dl-sub"},_("last 15 min"))]),n("div",{class:"dl-speed-cols"},[Kn(_("Download","speed"),"↓","dl-dn",p(l)),Kn(_("Upload","speed"),"↑","dl-up",p(d))]),c,n("div",{class:"dl-speed-today"},ci(o))])}var Vn=class{constructor(){this.span=n("span",{class:"dl-sub"},_("last 2 min"));this.down=n("span",{class:"dl-speed-val"});this.up=n("span",{class:"dl-speed-val"});this.chart=kt(`<svg viewBox="0 0 ${pn} ${Wt}" preserveAspectRatio="none" class="dl-speed-chart" aria-hidden="true"><path class="area"/><path class="line"/><path class="line up"/></svg>`);this.wait=n("div",{class:"dl-speed-wait"});this.shown=this.wait;this.today=n("div",{class:"dl-speed-today"});this.el=n("div",{class:"dl-bento-tile"},[n("div",{class:"dl-bento-head"},[n("span",{class:"dl-metric-label"},_("Speed now")),this.span]),n("div",{class:"dl-speed-cols"},[Kn(_("Download","speed"),"↓","dl-dn",this.down),Kn(_("Upload","speed"),"↑","dl-up",this.up)]),this.wait,this.today])}update(e,o,s){let r=s||!!e.error;this.span.style.display=s?"none":"";for(let[l,d]of[[this.down,e.tx],[this.up,e.rx]])l.className=`dl-speed-val${r?" off":""}`,l.textContent=r?"—":We(d);let i=!r&&e.pts.length>1;if(i){let l=di(e.pts,e.xs),[d,c,p]=this.chart.querySelectorAll("path");d.setAttribute("d",l.area),c.setAttribute("d",l.down),p.setAttribute("d",l.up)}else dom.content(this.wait,[n("i"),s||e.early&&!e.error?"":n("span",{},e.error?m(_("Couldn't read the live speed: %s"),e.error):_("Collecting… 1 point a second"))]);let a=i?this.chart:this.wait;a!==this.shown&&(this.shown.replaceWith(a),this.shown=a),dom.content(this.today,ci(o))}};function Yn(t,e){let o=t.slice(-30),s=o.map(d=>d.rx+d.tx),r=Math.max(1,...s),i=s.reduce((d,c)=>d+c,0),a=s.reduce((d,c,p)=>c>s[d]?p:d,0),l=n("div",{class:"dl-bento-bars"},o.map((d,c)=>{let p=s[c],u=n("i",{class:c===o.length-1?"hi":"",style:`height:${Math.max(4,p/r*100)}%`}),g=n("span",{},[u]);return we(g,()=>[n("div",{class:"dl-tip-title"},c===o.length-1?`${_("Today")} · ${Ut(d.day)}`:Ut(d.day)),n("div",{},se(pLine truncated
`)){let d=l.trimEnd();if(i){/^```/.test(d.trim())?(e.push(n("pre",{},i.join(`
`))),i=null):i.push(l);continue}if(/^```/.test(d.trim())){a(),i=[];continue}let c=/^(#{1,6})\s+(.*)$/.exec(d),p=/^\s*[-*+]\s+(.*)$/.exec(d)??/^\s*\d+[.)]\s+(.*)$/.exec(d);c?(a(),e.push(n("h5",{},o(c[2])))):p?(r.length&&a(),s||(s=n("ul",{}),e.push(s)),s.appendChild(n("li",{},o(p[1])))):d.trim()?(s&&(s=null),r.push(d.trim())):a()}return i&&e.push(n("pre",{},i.join(`
`))),a(),e}function Si(t){let e=[],o=!1;for(let s of t.replace(/\r/g,"").split(`
`)){let r=/^#{1,6}\s+(.*)$/.exec(s);if(r){if(o=/^install\b/i.test(r[1].trim()),/^what.s new$/i.test(r[1].trim()))continue}else/^\*\*Full Changelog\*\*/.test(s)&&(o=!1);o||e.push(s)}return e.join(`
`).replace(/\n{3,}/g,`
`).trim()}async function mn(t,e,o,s){let r=n("div",{class:"dl-notes"},n("p",{class:"dl-muted dl-loading"},_("Loading release notes…"))),i=n("div",{class:"dl-op-head"}),a="";ae(o,[i,r],[H([v("copy")," ",_("Copy")],()=>xe(a,_("Release notes copied")))," ",de(_("Close"))],"wide");try{let l=await N.updatesNotes(t,e,s??"");a=Si(l.body||"");let d=Ei(l.url);dom.content(i,[l.published?n("span",{class:"dl-pill"},Ie(l.published)):"",l.prerelease?n("span",{class:"dl-pill warn"},_("Pre-release")):"",n("span",{class:"dl-spacer"}),d?n("a",{href:d,target:"_blank",rel:"noopener",class:"dl-linkbtn"},[_("On GitHub")," ",v("open")]):""]),dom.content(r,a.trim()?Ti(a):n("p",{class:"dl-muted"},_("This release has no notes.")))}catch(l){dom.content(r,n("p",{class:"dl-muted"},_e(l)))}}function hd(t){let e={"6h":_("checks every 6 h"),"12h":_("checks every 12 h"),"1d":_("checks daily"),"7d":_("checks weekly")};return e[t]??e["1d"]}var ns=t=>t?Ie(t):"";function fd(t){let e=/^(.{20,}?)(?:;\s|:\s)/.exec(t)?.[1];return e||(t.length<=90?t:`${t.slice(0,90).replace(/[\s,;:]+\S*$/,"")}…`)}function $i(t,e){let o=t.st,s=o.policy,r=o.kept?.app,i=e?.update&&e.tag?e.tag:o.version,a=g=>()=>mn("app",g,m(_("What’s new in Dawnline %s"),g.replace(/^v/,""))),l=e?.tag&&(e.update||e.status==="latest")?gd(t,e.tag,e.update?o.version:""):null,d=e?.tag??i,c=s.check&&o.auto?.check?o.auto.check+({"6h":6,"12h":12,"1d":24,"7d":168}[s.interval]??24)*3600:0,p=(g,M)=>n("div",{class:"dl-stack gap4"},[n("span",{class:"dl-metric-label"},g),n("span",{class:"dl-comp-side-v"},M)]),u=[{label:_("What’s new"),ic:"file",run:a(i)},{label:_("Open on GitHub"),ic:"globe",run:()=>window.open(`https://github.com/${o.repo}`,"_blank","noopener")},null,{label:m(_("Reinstall %s"),o.version),ic:"reset",warn:!0,run:()=>t.op("app:reinstall",_("Reinstalling Dawnline"),o.version)},r?{label:m(_("Roll back to %s"),r.version),ic:"archive",warn:!0,run:async()=>{await pe(m(_("Roll back to Dawnline %s?"),r.version),m(_("The copy kept on the router replaces %s. A backup of the settings is made first."),o.version),_("Roll back"))&&t.op("app:rollback",_("Rolling back Dawnline"),o.version)}}:null];return n("section",{class:"dl-panel flush dl-comp-hero"},[n("div",{class:"dl-comp-hero-main"},[n("div",{class:"dl-comp-hero-head"},[n("span",{class:"dl-group-ic"},v("sunrise")),n("b",{class:"dl-comp-name"},"Dawnline"),t.state("app",e,e?.latest??""),n("span",{class:"dl-spacer"}),t.round(()=>t.op("check:app",_("Checking Dawnline"),o.version),u,!0)]),n("div",{class:"dl-comp-verrow"},[n("div",{class:"dl-stack"},[n("div",{class:"dl-comp-big"},[o.version,e?.update?n("small",{},`→ ${e.latest}`):e?.status==="dev"&&e.latest?n("small",{class:"dl-faint"},m(_("release %s"),e.latest)):""]),n("span",{class:"dl-faint dl-comp-meta"},e?.error?"":e?.update?e.published?m(_("released %s"),ns(e.published)):"":e?.status==="dev"?_("ahead of the latest release"):e?[_("latest release"),e.published?m(_("released %s"),ns(e.published)):""].filter(Boolean).join(" · "):_("not checked yet"))])]),l?.items.length?n("div",{class:"dl-stack gap4"},[n("ul",{class:"dl-comp-bullets"},l.items.map(g=>n("li",{},g))),l.total>l.items.length?n("button",{type:"button",class:"dl-linkbtn dl-comp-more",click:a(d)},G(l.total-l.items.length,"+%s more in What’s new","+%s more in What’s new")):""]):"",e?.error?n("p",{class:"dl-sub dl-comp-lead dl-upd-bad"},e.error):"",e?.update?n("div",{class:"dl-comp-btns"},[H(_("Update now"),()=>t.op("app",_("Updating Dawnline"),o.version),"positive",{disabled:t.busy}),H(_("What’s new"),a(i))]):"",bd(t),vd(t)]),n("div",{class:"dl-comp-hero-side"},[p(_("Source"),[v("globe"),n("a",{href:`https://github.com/${o.repo}`,target:"_blank",rel:"noopener"},o.repo)]),p(_("Auto-update"),[s.auto?Se("ok",_("On")):Se("",_("Off")),n("span",{class:"dl-muted"},s.auto?s.mode==="immediate"?_("as soon as found"):m(s.interval==="7d"?_("weekly at %s"):_("daily at %s"),s.time):s.check?hd(s.interval):_("checks off"))]),p(_("Last check"),o.check?[ce(o.check.time,o.now),c>o.now?n("span",{class:"dl-faint"},`· ${m(_("next in %s"),st(c-o.now))}`):""]:[_("Never")]),p(_("Rollback"),r?[n("span",{class:"dl-mono"},r.version),n("span",{class:"dl-faint"},_("kept on flash"))]:[n("span",{class:"dl-muted"},s.keep?_("Kept after the next update"):_("Off"))])])])}function gd(t,e,o){if(t.notes.has(e))return t.notes.get(e)??null;t.notes.set(e,null);let s=r=>r.replace(/\*\*|`|\[([^\]]+)\]\([^)]*\)/g,(i,a)=>a??"").trim();return(async()=>{let i=((await N.updatesNotes("app",e,"").catch(()=>null))?.body??"").split(`
`).map(l=>/^\s*[-*+]\s+(.*)$/.exec(l)?.[1]).filter(l=>!!l);i.length||(i=(await N.updatesChanges(o,e).catch(()=>null))?.items??[]);let a={items:i.slice(0,3).map(l=>fd(s(l))),total:i.length};t.notes.set(e,a),a.items.length&&t.root.isConnected&&t.paint()})(),null}function Xn(t){return t==="ru"?_("Russian translation"):t}function vd(t){let e=(t.st.translations??[]).includes("ru"),o=be(e,Xn("ru"),r=>{t.op(r?"app:lang:ru":"app:nolang",r?_("Adding the Russian translation"):_("Removing the Russian translation"),t.st.version)});o.disabled=t.busy;let s=n("details",{class:"dl-params dl-comp-fold",open:t.langOpen?"open":null},[n("summary",{},[v("chevron"),n("span",{},_("Translation")),n("span",{class:"dl-sub"},e?_("Russian"):_("English only"))]),n("div",{class:"dl-params-body"},[n("div",{class:"dl-list"},[n("div",{class:"dl-row"},[n("span",{class:"dl-row-main dl-stack"},[n("b",{},Xn("ru")),n("span",{class:"dl-sub"},_("LuCI pages for Dawnline"))]),n("span",{class:"dl-comp-bact"},o)])])])]);return s.addEventListener("toggle",()=>t.langOpen=s.open),s}function bd(t){let e=n("div",{class:"dl-params-body"}),o=n("details",{class:"dl-params dl-comp-vers",open:t.versOpen?"open":null},[n("summary",{},[v("chevron"),n("span",{},_("Versions")),n("span",{class:"dl-sub"},_("install any release"))]),e]);return o.addEventListener("toggle",()=>{t.versOpen=o.open,t.versOpen&&eo(t,e)}),t.versOpen&&eo(t,e),o}async function eo(t,e){let o=ue("",{placeholder:_("Tag, e.g. 0.3.1"),class:"cbi-input-text dl-mono","aria-label":_("Release tag")}),s=p=>{if(p=p.trim(),!/^v?[0-9][0-9A-Za-z.+~-]{0,40}$/.test(p))return F(_("Enter a release tag like 0.3.1"),"warning");Pi(t,p)};o.addEventListener("keydown",p=>{p.key==="Enter"&&(p.preventDefault(),s(o.value))});let r=n("div",{class:"dl-comp-tag"},[o,H(_("Install"),()=>s(o.value),"neutral",{disabled:t.busy})]),i=t.versPage,a=p=>{t.versPage=Math.max(1,t.versPage+p),eo(t,e)},l=p=>n("div",{class:"dl-comp-pager"},[n("button",{type:"button",class:"dl-linkbtn",disabled:i<=1?"disabled":null,click:()=>a(-1)},_("← Newer")),n("span",{class:"dl-faint"},m(_("Page %s"),i)),n("button",{type:"button",class:"dl-linkbtn",disabled:p?null:"disabled",click:()=>a(1)},_("Older →"))]),d=t.versCache.get(i);if(!d){dom.content(e,[r,n("p",{class:"dl-muted dl-loading"},_("Loading versions…"))]);try{d=(await N.updatesReleases(i)).releases}catch(p){if(i!==t.versPage||!e.isConnected)return;dom.content(e,[r,n("div",{class:"dl-row-actions"},[n("span",{class:"dl-muted"},m(_("Failed to load versions: %s"),_e(p))),H(_("Try again"),()=>eo(t,e))]),l(!1)]);return}if(t.versCache.set(i,d),i!==t.versPage||!e.isConnected)return}if(!d.length)return dom.content(e,[r,n("p",{class:"dl-muted"},i>1?_("No more versions."):_("No versions found.")),l(!1)]);let c=t.st.version;dom.content(e,[r,...d.map(p=>{let u=p.tag.replace(/^v/,"");return n("div",{class:"dl-comp-ver"},[n("span",{class:"dl-mono"},u),n("span",{class:"dl-sub"},ns(p.published)),p.prerelease?Se("warn",_("Pre-release")):"",n("span",{class:"dl-comp-ic"},Pe("file",_("What’s new"),()=>mn("app",p.tag,m(_("What’s new in Dawnline %s"),u)))),u===c?Se("ok",_("Installed")):H(_("Install"),()=>Pi(t,p.tag),"neutral",{disabled:t.busy})])}),l(d.length>=5)])}async function Pi(t,e){let o=e.replace(/^v/,"");o.localeCompare(t.st.version,void 0,{numeric:!0})<0&&!await pe(m(_("Install Dawnline %s?"),o),m(_("It is older than %s. A backup of the settings is made first; restore it from Settings if something looks wrong."),t.st.version),_("Install"))||t.op(`app@${e}`,m(_("Installing Dawnline %s"),o),t.st.version)}function Di(t,e){let o=t.st,s=o.kept?.amneziawg,r=e?.sources??{},i=Object.keys(r),a=e?.current??null,l=a?r[a]:void 0,d=!!e?.ru,c=o.needs?.awg??[],p=c.length?null:e?.installed??null,u=[];a&&p&&u.push({label:_("Reinstall this build"),warn:!0,ic:"reset",run:()=>t.op(`amneziawg:${a}${d?":ru":""}`,_("Reinstalling AmneziaWG"),p)}),s&&u.push({label:m(_("Roll back to %s"),s.version),ic:"archive",warn:!0,run:async()=>{await pe(m(_("Roll back AmneziaWG to %s?"),s.version),_("The build kept on the router is installed again. Every AmneziaWG tunnel restarts for a few seconds."),_("Roll back"))&&t.op("amneziawg:rollback",_("Rolling back AmneziaWG"),p??void 0)}});let g=[e?.release?{label:_("What’s new"),ic:"file",run:()=>mn("amneziawg",e.release,m(_("What’s new in the %s build"),l?.label??"AmneziaWG"),a??"slava")}:null,{label:_("Open on GitHub"),ic:"globe",run:()=>window.open(`https://github.com/${l?.repo??"Slava-Shchipunov/awg-openwrt"}`,"_blank","noopener")},...u.length?[null,...u]:[]].filter((b,f,T)=>b!==null||f>0&&T[f-1]!==null),M=o.tunnels??[],x=M.length?M.length===1?m(_("Switching restarts the tunnel for a few seconds: %s. Devices keep their configurations."),M[0]):m(N_(M.length,"Switching restarts %s tunnel for a few seconds: %s. Devices keep their configurations.","Switching restarts %s tunnels for a few seconds: %s. Devices keep their configurations."),V(M.length),M.join(", ")):_("Switching takes a few Line truncated
`)}r.push(p),l+=c-1}let a=H([v("more")],()=>Te(a,[{label:_("Export CSV"),icon:v("download"),run:()=>Xe(o,s,"csv",e.id)},{label:_("Export JSON"),icon:v("download"),run:()=>Xe(o,s,"json",e.id)},null,{label:m(_("Clear %s's activity"),e.name),icon:v("trash"),danger:!0,run:()=>dt(m(_("Clear %s's activity"),e.name),m(_("Removes events about %s and their devices."),e.name),{person:e.id},()=>t.refresh())}]),"neutral",{title:_("Export or clear"),class:"cbi-button cbi-button-neutral dl-icon-only"});return n("div",{class:"dl-panel flush"},[n("div",{class:"dl-panel-head pad"},[n("h3",{},_("Activity")),n("span",{class:"dl-sub"},s.length>10?m(_("latest 10 of %s"),V(s.length)):""),n("span",{class:"dl-spacer"}),a]),r.length?r:n("div",{class:"dl-row dl-muted"},_("Nothing yet."))])}var no=class{constructor(){this.id="";this.events=[];this.mapOpen=!1;this.map=null;this.parts={};this.series=[];this.devSeries={};this.ticks=0;this.fullNext=!1}async fetch(e){let[o,s,r]=await Promise.all([N.status(30),e?N.events(2e3,this.id).catch(()=>null):Promise.resolve(null),e?N.personUsage(this.id,30).catch(()=>null):Promise.resolve(null)]);return{st:o,ev:s?.events??null,use:r}}async load(){return this.id=new URLSearchParams(location.search).get("id")??"",this.fetch(!0)}render(e){this.take(e);let o=this.st.people.find(a=>a.id===this.id);if(!o)return n("div",{class:"dl-empty"},[n("h3",{},_("Person not found")),n("p",{},_("They may have been removed.")),n("a",{class:"cbi-button",href:L.url("admin/network/dawnline/server")},_("Back to Servers"))]);this.p=o;for(let a of["crumbs","head","devices","traffic","places","activity","limits"])this.parts[a]=n("div",{});this.parts.devices.className="dl-person-devices";let s=n("div",{},[this.parts.crumbs,this.parts.head,n("div",{class:"dl-grid-person"},[n("div",{class:"dl-col"},[this.parts.devices,this.parts.traffic,this.parts.places,this.parts.activity]),n("div",{class:"dl-col"},[this.parts.limits])])]);this.paint();let r=new URLSearchParams(location.search),i=r.get("device")&&o.devices.find(a=>a.id===r.get("device"));return i?setTimeout(()=>Ye(this.p,i,this.deviceOpts()),50):r.get("add")&&setTimeout(()=>pt(this.p,this.deviceOpts()),50),this.poller=nt({fetch:a=>{let l=a||this.fullNext||++this.ticks%4===0;return this.fullNext=!1,this.fetch(l)},every:15,live:!0,active:()=>s.isConnected,apply:(a,l)=>this.apply(a,l)}),s}take(e){this.st=e.st,e.ev&&(this.events=e.ev),e.use&&(this.series=e.use.person,this.devSeries=e.use.devices)}apply(e,o){this.take(e);let s=this.st.people.find(r=>r.id===this.id);if(!s){o||(location.href=jt(this.p?.server));return}this.p=s,this.paint(o),this.map?.update(this.mapData())}async refresh(){this.fullNext=!0,await this.poller?.refresh()}async patch(e,o){var i;this.poller?.claim();let s=await q(()=>N.personUpdate(this.p.id,e),o);if(!s)return!1;this.poller?.claim();let r=this.st.people.findIndex(a=>a.id===this.p.id);return(i=s.person).rate??(i.rate=this.p.rate),r>=0&&(this.st.people[r]=s.person),this.p=s.person,this.paint(),!0}get today(){return Ge(this.series.length?this.series:this.st.series)}get core(){return Ot(this.st.servers,this.p.server)}deviceOpts(){return{refresh:()=>this.refresh(),geo:this.st.geo,now:this.st.now,today:this.today,core:this.core,server:this.st.servers.find(e=>e.id===this.p.server),events:()=>this.events}}mapData(){return{geo:this.st.geo,people:this.st.people,now:this.st.now,person:this.p.id}}crumbs(){let e=this.p;return n("nav",{class:"dl-crumbs","aria-label":_("Breadcrumb")},[n("a",{href:jt(e.server)},this.st.servers.find(o=>o.id===e.server)?.name??_("Servers")),n("span",{},"/"),n("a",{href:jt(e.server)},_("People")),n("span",{},"/"),n("span",{},e.name)])}paint(e=!1){Ne(this.parts.crumbs,this.crumbs(),e),Ne(this.parts.head,Ui(this),e),Ne(this.parts.traffic,Wi(this),e),Ne(this.parts.devices,Gi(this),e),Ne(this.parts.limits,Zi(this),e),this.paintPlaces(e),Ne(this.parts.activity,Xi(this),e)}paintPlaces(e=!1){let o=Qi(this);o&&Ne(this.parts.places,o,e&&!this.mapOpen)}};var Sd={ok:"check",warn:"alert",error:"x",skip:"pause"},oo=class{constructor(e,o,s,r){this.el=n("div",{});this.wdEl=n("div",{});this.checksEl=n("div",{class:"dl-panel"});this.recentEl=n("div",{class:"dl-panel flush dl-recent"});this.checks=null;this.summary=n("div",{});this.open=new Set;this.st=e,this.sl=o,this.events=s,this.toLog=r,dom.content(this.el,[this.summary,this.wdEl,n("div",{class:"dl-health-cols"},[this.checksEl,this.recentEl])]),this.paintChecks(),this.paintLive(o,s)}async run(e){let o=e?await Jn(e):await N.health().catch(()=>null);o&&(this.take(o),e==="netrestart"&&setTimeout(()=>this.el.isConnected&&void this.run(),5e3))}take(e){this.checks=e.checks,this.paintChecks(),this.paintLive(e,this.events)}paintChecks(){let e=this.checks;if(!e){dom.content(this.summary,""),dom.content(this.checksEl,[n("div",{class:"dl-panel-head"},[n("h3",{},_("Checks"))]),n("p",{class:"dl-muted dl-loading"},_("Running checks…"))]);return}let o=e.filter(a=>a.status==="error").length,s=e.filter(a=>a.status===" Line truncated
`);function fa(){let t=document.createElement("style");return t.dataset.dawnline="1",t.textContent=Vd,t}function Lt(t){return()=>{let e=new t;return Object.assign({load:()=>e.load(),render:async s=>{let r=await e.render(s),i=document.createElement("div");return i.className="dl-root",i.append(fa(),r),i},addFooter(){return e.noFooter?document.createElement("div"):this.super("addFooter",[])}},{handleSave:null,handleSaveApply:null,handleReset:null})}}var ux=Lt(un),mx=Lt(Ct),hx=Lt(un),fx=Lt(Qn),gx=Lt(no),vx=Lt(io),bx=Lt(to);function ga(t){return()=>({load:()=>(ui.menu?.flushCache(),location.replace(`${L.url("admin/network/dawnline/diagnostics")}${t?`?tab=${t}`:""}`),new Promise(()=>{})),render:()=>document.createElement("div"),handleSave:null,handleSaveApply:null,handleReset:null})}var xx=ga(""),wx=ga("log");return baseclass.extend({ activity: wx, diagnostics: vx, health: xx, overview: ux, people: mx, person: gx, server: hx, settings: fx, updates: bx });
@@ -4099,6 +4099,10 @@ msgstr "Метод не поддерживается."
msgid "Missing: %s."
msgstr "Не хватает: %s."
#: web/src/shared/format.ts
msgid "Mobile"
msgstr "Мобильный"
#: web/src/admin/pages/person/limits.ts
msgid "Monthly"
msgstr "В месяц"
@@ -4043,6 +4043,10 @@ msgstr ""
msgid "Missing: %s."
msgstr ""
#: web/src/shared/format.ts
msgid "Mobile"
msgstr ""
#: web/src/admin/pages/person/limits.ts
msgid "Monthly"
msgstr ""
@@ -360,7 +360,7 @@ let LOCK = null;
for (let i = 0; i < 10 && !LOCK; i++) {
LOCK = upd.try_lock();
if (!LOCK)
system('usleep 100000 2>/dev/null || sleep 1');
sleep(100);
}
if (!LOCK)
exit(0);
@@ -1,3 +0,0 @@
Geist and Geist Mono are licensed under the SIL Open Font License, Version 1.1.
Copyright (c) 2023 Vercel, in collaboration with basement.studio.
https://github.com/vercel/geist-font/blob/main/OFL.txt
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><style>.t{fill:#0a0a0a}.g{fill:#fff}@media (prefers-color-scheme:dark){.t{fill:#fff}.g{fill:#0a0a0a}}</style><rect class="t" width="64" height="64" rx="16"/><path class="g" d="M14 38a18 18 0 0 1 36 0z"/><rect class="g" x="12" y="43" width="40" height="4" rx="2" opacity=".5"/></svg>

Before

Width:  |  Height:  |  Size: 343 B

@@ -1 +0,0 @@
@font-face{font-family:Geist;src:url(geist-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+2000-206F,U+20AC,U+2122,U+2190-21FF,U+2212,U+2215}@font-face{font-family:Geist;src:url(geist-cyrillic-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap;unicode-range:U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116}@font-face{font-family:Geist Mono;src:url(geist-mono-latin-wght-normal.woff2) format("woff2");font-weight:100 900;font-display:swap}:root{color-scheme:dark;--bg: #080808;--raised: #121212;--field: #161616;--knob: #232323;--seg: rgba(237, 237, 237, .05);--seg-shadow: none;--line: rgba(255, 255, 255, .06);--text: #ededed;--text-2: #8c8c8a;--text-3: #4f4f4e;--accent: #4eafff;--accent-ink: #ffffff;--accent-soft: rgba(78, 175, 255, .13);--ok: #30d158;--ok-soft: rgba(48, 209, 88, .14);--warn: #ff8d28;--bad: #ff383c;--bad-soft: rgba(255, 56, 60, .13);--sel-bg: rgba(131, 209, 255, .25);--sel-fg: #64c6ff;--scrim: rgba(8, 8, 8, .8);--glass-bg: linear-gradient(rgba(255, 255, 255, .04), rgba(255, 255, 255, .04)), rgba(0, 0, 0, .4);--glass-edge: rgba(255, 255, 255, .05);--glass-sep: rgba(255, 255, 255, .04);--glass-text: #f5f5f5;--glass-sub: #8a8a8a;--glass-bad: var(--bad);--glass-hl: color-mix(in srgb, var(--raised), var(--text) 8%);--glass-hover: color-mix(in srgb, var(--raised), var(--text) 5%);--glass-shadow: 0 0 0 transparent;--line-glass: rgba(255, 255, 255, .07);--pop-shadow: 0 18px 48px -14px rgba(0, 0, 0, .75);--sheet-shadow: 0 24px 64px -16px rgba(0, 0, 0, .6);--bar: rgba(237, 237, 237, .13);--toast: #232323;--toast-fg: #ededed;--qr-bg: #0a0a0a;--gi-a: rgba(255, 255, 255, .58);--gi-b: rgba(255, 255, 255, .14);--gi-rim: rgba(255, 255, 255, .5);--gi-edge: rgba(0, 0, 0, 0);--gi-detail: #ffffff;--t-grey-a: #cfcfcd;--t-grey-b: #5a5a59;--t-blue-a: #a6d9ff;--t-blue-b: #1d84e6;--t-green-a: #a8f29c;--t-green-b: #30d158;--t-red-a: #ffadad;--t-red-b: #ff383c;--t-orange-a: #ffc08f;--t-orange-b: #ff8d28;--font: Geist, -apple-system, system-ui, "Segoe UI", sans-serif;--mono: "Geist Mono", ui-monospace, "SF Mono", Menlo, monospace;--r-sheet: 36px;--r-card: 28px;--r-row: 20px;--r-field: 16px;--r-tile: 12px;--ease-out: cubic-bezier(.23, 1, .32, 1);--gutter-l: max(16px, env(safe-area-inset-left, 0px));--gutter-r: max(16px, env(safe-area-inset-right, 0px))}@media(prefers-color-scheme:light){:root{color-scheme:light;--bg: #f2f2f1;--raised: #ffffff;--field: #f3f3f2;--knob: #e8e8e7;--seg: #ffffff;--seg-shadow: 0 1px 2px rgba(0, 0, 0, .08), 0 0 0 .5px rgba(0, 0, 0, .05);--line: rgba(0, 0, 0, .07);--text: #0b0b0b;--text-2: #6d6d6b;--text-3: #a6a6a4;--accent: #2b9dff;--accent-soft: rgba(43, 157, 255, .12);--ok: #30d158;--ok-soft: rgba(48, 209, 88, .12);--warn: #ff8d28;--bad: #ff383c;--bad-soft: rgba(255, 56, 60, .1);--sel-bg: rgba(78, 175, 255, .22);--sel-fg: #0a76cf;--scrim: rgba(236, 236, 235, .62);--glass-bg: rgba(245, 245, 245, .6);--glass-edge: rgba(0, 0, 0, .04);--glass-sep: rgba(0, 0, 0, .03);--glass-text: #1a1a1a;--glass-sub: #727272;--glass-hl: color-mix(in srgb, var(--raised), var(--text) 11%);--glass-hover: color-mix(in srgb, var(--raised), var(--text) 4%);--glass-shadow: 0 8px 32px rgba(0, 0, 0, .12);--line-glass: rgba(0, 0, 0, .07);--pop-shadow: 0 18px 44px -14px rgba(0, 0, 0, .2);--sheet-shadow: 0 24px 64px -18px rgba(0, 0, 0, .22);--bar: rgba(11, 11, 11, .11);--toast: #0b0b0b;--toast-fg: #f2f2f1;--qr-bg: #ffffff;--gi-a: rgba(250, 250, 249, .72);--gi-b: rgba(206, 206, 204, .5);--gi-rim: rgba(255, 255, 255, .9);--gi-edge: rgba(0, 0, 0, .11);--gi-detail: rgba(28, 28, 28, .72);--t-grey-a: #a9a9a7;--t-grey-b: #3d3d3c;--t-blue-a: #7cc4ff;--t-blue-b: #0a6fd6;--t-green-a: #82e070;--t-green-b: #30d158;--t-red-a: #ff9090;--t-red-b: #ff383c}}*{box-sizing:border-box}html{-webkit-text-size-adjust:100%;scrollbar-gutter:stable;overflow-anchor:none;touch-action:manipulation}body{margin:0;background:var(--bg);color:var(--text);font:400 15px/22px var(--font);letter-spacing:-.011em;-webkit-font-smoothing:antialiased;min-height:100vh;min-height:100dvh;cursor:default}body.locked{overflow:hidden}input,textarea,.linkrow .mono,.conf{cursor:text}::selection{background:var(--sel-bg);color:var(--sel-fg)}button{font:inherit;color:inherit;letter-spacing:inherit;background:none;border:0;padding:0;margin:0;cursor:pointer;-webkit-tap-highlight-color:transparent}button:disabled{cursor:default}a{color:inherit;text-decoration:none}:focus{outline:none}.kbd :focus-visible{outline:2px solid color-mix(in srgb,var(--accent) 65%,transparent);outline-offset:2px}[hidden]{display:none!important}.offscreen{position:fixed;left:-9999px;top:0;opacity:0}.mono{font-family:var(--mono);letter-spacing:0}.num{font-variant-numeric:tabular-nums}.ok-t{color:var(--ok)}.warn-t{color:var(--warn)}.bad-t{color:var(--bad)}.here-t{color:var(--accent)}.i{width:18px;height:18px;flex:none}.gi{width:24px;height:24px;flex:none;overflow:visible;--ta: var(Line truncated
@@ -1,6 +0,0 @@
"use strict";(()=>{var Xi=Object.create;var Xo=Object.defineProperty;var Ji=Object.getOwnPropertyDescriptor;var Zi=Object.getOwnPropertyNames;var ea=Object.getPrototypeOf,ta=Object.prototype.hasOwnProperty;var na=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var oa=(e,t,n,o)=>{if(t&&typeof t=="object"||typeof t=="function")for(let r of Zi(t))!ta.call(e,r)&&r!==n&&Xo(e,r,{get:()=>t[r],enumerable:!(o=Ji(t,r))||o.enumerable});return e};var ra=(e,t,n)=>(n=e!=null?Xi(ea(e)):{},oa(t||!e||!e.__esModule?Xo(n,"default",{value:e,enumerable:!0}):n,e));var qr=na((Fr,Wr)=>{"use strict";var Gr=(function(){var e=function(g,v){var d=236,u=17,l=g,b=n[v],y=null,p=0,C=null,k=[],A={},F=function(S,H){p=l*4+17,y=(function(L){for(var P=new Array(L),$=0;$<L;$+=1){P[$]=new Array(L);for(var I=0;I<L;I+=1)P[$][I]=null}return P})(p),N(0,0),N(p-7,0),N(0,p-7),Y(),q(),te(S,H),l>=7&&Z(S),C==null&&(C=Ie(l,b,k)),le(C,H)},N=function(S,H){for(var L=-1;L<=7;L+=1)if(!(S+L<=-1||p<=S+L))for(var P=-1;P<=7;P+=1)H+P<=-1||p<=H+P||(0<=L&&L<=6&&(P==0||P==6)||0<=P&&P<=6&&(L==0||L==6)||2<=L&&L<=4&&2<=P&&P<=4?y[S+L][H+P]=!0:y[S+L][H+P]=!1)},R=function(){for(var S=0,H=0,L=0;L<8;L+=1){F(!0,L);var P=r.getLostPoint(A);(L==0||S>P)&&(S=P,H=L)}return H},q=function(){for(var S=8;S<p-8;S+=1)y[S][6]==null&&(y[S][6]=S%2==0);for(var H=8;H<p-8;H+=1)y[6][H]==null&&(y[6][H]=H%2==0)},Y=function(){for(var S=r.getPatternPosition(l),H=0;H<S.length;H+=1)for(var L=0;L<S.length;L+=1){var P=S[H],$=S[L];if(y[P][$]==null)for(var I=-2;I<=2;I+=1)for(var G=-2;G<=2;G+=1)I==-2||I==2||G==-2||G==2||I==0&&G==0?y[P+I][$+G]=!0:y[P+I][$+G]=!1}},Z=function(S){for(var H=r.getBCHTypeNumber(l),L=0;L<18;L+=1){var P=!S&&(H>>L&1)==1;y[Math.floor(L/3)][L%3+p-8-3]=P}for(var L=0;L<18;L+=1){var P=!S&&(H>>L&1)==1;y[L%3+p-8-3][Math.floor(L/3)]=P}},te=function(S,H){for(var L=b<<3|H,P=r.getBCHTypeInfo(L),$=0;$<15;$+=1){var I=!S&&(P>>$&1)==1;$<6?y[$][8]=I:$<8?y[$+1][8]=I:y[p-15+$][8]=I}for(var $=0;$<15;$+=1){var I=!S&&(P>>$&1)==1;$<8?y[8][p-$-1]=I:$<9?y[8][15-$-1+1]=I:y[8][15-$-1]=I}y[p-8][8]=!S},le=function(S,H){for(var L=-1,P=p-1,$=7,I=0,G=r.getMaskFunction(H),W=p-1;W>0;W-=2)for(W==6&&(W-=1);;){for(var X=0;X<2;X+=1)if(y[P][W-X]==null){var oe=!1;I<S.length&&(oe=(S[I]>>>$&1)==1);var U=G(P,W-X);U&&(oe=!oe),y[P][W-X]=oe,$-=1,$==-1&&(I+=1,$=7)}if(P+=L,P<0||p<=P){P-=L,L=-L;break}}},me=function(S,H){for(var L=0,P=0,$=0,I=new Array(H.length),G=new Array(H.length),W=0;W<H.length;W+=1){var X=H[W].dataCount,oe=H[W].totalCount-X;P=Math.max(P,X),$=Math.max($,oe),I[W]=new Array(X);for(var U=0;U<I[W].length;U+=1)I[W][U]=255&S.getBuffer()[U+L];L+=X;var be=r.getErrorCorrectPolynomial(oe),ue=i(I[W],be.getLength()-1),Yo=ue.mod(be);G[W]=new Array(be.getLength()-1);for(var U=0;U<G[W].length;U+=1){var jo=U+Yo.getLength()-G[W].length;G[W][U]=jo>=0?Yo.getAt(jo):0}}for(var Qo=0,U=0;U<H.length;U+=1)Qo+=H[U].totalCount;for(var ao=new Array(Qo),fn=0,U=0;U<P;U+=1)for(var W=0;W<H.length;W+=1)U<I[W].length&&(ao[fn]=I[W][U],fn+=1);for(var U=0;U<$;U+=1)for(var W=0;W<H.length;W+=1)U<G[W].length&&(ao[fn]=G[W][U],fn+=1);return ao},Ie=function(S,H,L){for(var P=c.getRSBlocks(S,H),$=f(),I=0;I<L.length;I+=1){var G=L[I];$.put(G.getMode(),4),$.put(G.getLength(),r.getLengthInBits(G.getMode(),S)),G.write($)}for(var W=0,I=0;I<P.length;I+=1)W+=P[I].dataCount;if($.getLengthInBits()>W*8)throw"code length overflow. ("+$.getLengthInBits()+">"+W*8+")";for($.getLengthInBits()+4<=W*8&&$.put(0,4);$.getLengthInBits()%8!=0;)$.putBit(!1);for(;!($.getLengthInBits()>=W*8||($.put(d,8),$.getLengthInBits()>=W*8));)$.put(u,8);return me($,P)};A.addData=function(S,H){H=H||"Byte";var L=null;switch(H){case"Numeric":L=m(S);break;case"Alphanumeric":L=M(S);break;case"Byte":L=h(S);break;case"Kanji":L=x(S);break;default:throw"mode:"+H}k.push(L),C=null},A.isDark=function(S,H){if(S<0||p<=S||H<0||p<=H)throw S+","+H;return y[S][H]},A.getModuleCount=function(){return p},A.make=function(){if(l<1){for(var S=1;S<40;S++){for(var H=c.getRSBlocks(S,b),L=f(),P=0;P<k.length;P++){var $=k[P];L.put($.getMode(),4),L.put($.getLength(),r.getLengthInBits($.getMode(),S)),$.write(L)}for(var I=0,P=0;P<H.length;P++)I+=H[P].dataCount;if(L.getLengthInBits()<=I*8)break}l=S}F(!1,R())},A.createTableTag=function(S,H){S=S||2,H=typeof H=="undefined"?S*4:H;var L="";L+='<table style="',L+=" border-width: 0px; border-style: none;",L+=" border-collapse: collapse;",L+=" padding: 0px; margin: "+H+"px;",L+='">',L+="<tbody>";for(var P=0;P<A.getModuleCount();P+=1){L+="<tr>";for(var $=0;$<A.getModuleCount();$+=1)L+='<td style="',L+=" border-width: 0px; border-style: none;",L+=" border-collapse: collapse;",L+=" padding: 0px; margin: 0px;",L+=" width: "+S+"px;",L+=" height: "+S+"px;",L+=" background-color: ",L+=A.isDark(P,$)?"#000000":"#ffffff",L+=";",L+='"/>';L+="</tr>"}return L+="</tbody>",L+="</table>",L},A.createSvgTag=function(S,H,L,P){var $={};typeof arguments[0]=="object"&&($=arguments[0],S=$.cellSize,H=$.margin,L=$.alt,P=$.title),S=S||2,H=typeof H=="undefined"?S*4:H,L=typeof L=="string"?{text:L}:L||{Line truncated
`}return L%2&&S>0?ue.substring(0,ue.length-L-1)+Array(L+1).join("▀"):ue.substring(0,ue.length-1)};return A.createASCII=function(S,H){if(S=S||1,S<2)return Ge(H);S-=1,H=typeof H=="undefined"?S*2:H;var L=A.getModuleCount()*S+H*2,P=H,$=L-H,I,G,W,X,oe=Array(S+1).join("██"),U=Array(S+1).join(" "),be="",ue="";for(I=0;I<L;I+=1){for(W=Math.floor((I-P)/S),ue="",G=0;G<L;G+=1)X=1,P<=G&&G<$&&P<=I&&I<$&&A.isDark(W,Math.floor((G-P)/S))&&(X=0),ue+=X?oe:U;for(W=0;W<S;W+=1)be+=ue+`
`}return be.substring(0,be.length-1)},A.renderTo2dContext=function(S,H){H=H||2;for(var L=A.getModuleCount(),P=0;P<L;P++)for(var $=0;$<L;$++)S.fillStyle=A.isDark(P,$)?"black":"white",S.fillRect(P*H,$*H,H,H)},A};e.stringToBytesFuncs={default:function(g){for(var v=[],d=0;d<g.length;d+=1){var u=g.charCodeAt(d);v.push(u&255)}return v}},e.stringToBytes=e.stringToBytesFuncs.default,e.createStringToBytes=function(g,v){var d=(function(){for(var l=O(g),b=function(){var q=l.read();if(q==-1)throw"eof";return q},y=0,p={};;){var C=l.read();if(C==-1)break;var k=b(),A=b(),F=b(),N=String.fromCharCode(C<<8|k),R=A<<8|F;p[N]=R,y+=1}if(y!=v)throw y+" != "+v;return p})(),u=63;return function(l){for(var b=[],y=0;y<l.length;y+=1){var p=l.charCodeAt(y);if(p<128)b.push(p);else{var C=d[l.charAt(y)];typeof C=="number"?(C&255)==C?b.push(C):(b.push(C>>>8),b.push(C&255)):b.push(u)}}return b}};var t={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},n={L:1,M:0,Q:3,H:2},o={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},r=(function(){var g=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],v=1335,d=7973,u=21522,l={},b=function(y){for(var p=0;y!=0;)p+=1,y>>>=1;return p};return l.getBCHTypeInfo=function(y){for(var p=y<<10;b(p)-b(v)>=0;)p^=v<<b(p)-b(v);return(y<<10|p)^u},l.getBCHTypeNumber=function(y){for(var p=y<<12;b(p)-b(d)>=0;)p^=d<<b(p)-b(d);return y<<12|p},l.getPatternPosition=function(y){return g[y-1]},l.getMaskFunction=function(y){switch(y){case o.PATTERN000:return function(p,C){return(p+C)%2==0};case o.PATTERN001:return function(p,C){return p%2==0};case o.PATTERN010:return function(p,C){return C%3==0};case o.PATTERN011:return function(p,C){return(p+C)%3==0};case o.PATTERN100:return function(p,C){return(Math.floor(p/2)+Math.floor(C/3))%2==0};case o.PATTERN101:return function(p,C){return p*C%2+p*C%3==0};case o.PATTERN110:return function(p,C){return(p*C%2+p*C%3)%2==0};case o.PATTERN111:return function(p,C){return(p*C%3+(p+C)%2)%2==0};default:throw"bad maskPattern:"+y}},l.getErrorCorrectPolynomial=function(y){for(var p=i([1],0),C=0;C<y;C+=1)p=p.multiply(i([1,s.gexp(C)],0));return p},l.getLengthInBits=function(y,p){if(1<=p&&p<10)switch(y){case t.MODE_NUMBER:return 10;case t.MODE_ALPHA_NUM:return 9;case t.MODE_8BIT_BYTE:return 8;case t.MODE_KANJI:return 8;default:throw"mode:"+y}else if(p<27)switch(y){case t.MODE_NUMBER:return 12;case t.MODE_ALPHA_NUM:return 11;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 10;default:throw"mode:"+y}else if(p<41)switch(y){case t.MODE_NUMBER:return 14;case t.MODE_ALPHA_NUM:return 13;case t.MODE_8BIT_BYTE:return 16;case t.MODE_KANJI:return 12;default:throw"mode:"+y}else throw"type:"+p},l.getLostPoint=function(y){for(var p=y.getModuleCount(),C=0,k=0;k<p;k+=1)for(var A=0;A<p;A+=1){for(var F=0,N=y.isDark(k,A),R=-1;R<=1;R+=1)if(!(k+R<0||p<=k+R))for(var q=-1;q<=1;q+=1)A+q<0||p<=A+q||R==0&&q==0||N==y.isDark(k+R,A+q)&&(F+=1);F>5&&(C+=3+F-5)}for(var k=0;k<p-1;k+=1)for(var A=0;A<p-1;A+=1){var Y=0;y.isDark(k,A)&&(Y+=1),y.isDark(k+1,A)&&(Y+=1),y.isDark(k,A+1)&&(Y+=1),y.isDark(k+1,A+1)&&(Y+=1),(Y==0||Y==4)&&(C+=3)}for(var k=0;k<p;k+=1)for(var A=0;A<p-6;A+=1)y.isDark(k,A)&&!y.isDark(k,A+1)&&y.isDark(k,A+2)&&y.isDark(k,A+3)&&y.isDark(k,A+4)&&!y.isDark(k,A+5)&&y.isDark(k,A+6)&&(C+=40);for(var A=0;A<p;A+=1)for(var k=0;k<p-6;k+=1)y.isDark(k,A)&&!y.isDark(k+1,A)&&y.isDark(k+2,A)&&y.isDark(k+3,A)&&y.isDark(k+4,A)&&!y.isDark(k+5,A)&&y.isDark(k+6,A)&&(C+=40);for(var Z=0,A=0;A<p;A+=1)for(var k=0;k<p;k+=1)y.isDark(k,A)&&(Z+=1);var te=Math.abs(100*Z/p/p-50)/5;return C+=te*10,C},l})(),s=(function(){for(var g=new Array(256),v=new Array(256),d=0;d<8;d+=1)g[d]=1<<d;for(var d=8;d<256;d+=1)g[d]=g[d-4]^g[d-5]^g[d-6]^g[d-8];for(var d=0;d<255;d+=1)v[g[d]]=d;var u={};return u.glog=function(l){if(l<1)throw"glog("+l+")";return v[l]},u.gexp=function(l){for(;l<0;)l+=255;for(;l>=256;)l-=255;return g[l]},u})();function i(g,v){if(typeof g.length=="undefined")throw g.length+"/"+v;var d=(function(){for(var l=0;l<g.length&&g[l]==0;)l+=1;for(var b=new Array(g.length-l+v),y=0;y<g.length-l;y+=1)b[y]=g[y+l];return b})(),u={};return u.getAt=function(l){return d[l]},u.getLength=function(){return d.length},u.multiply=function(l){for(var b=new Array(u.getLength()+l.getLength()-1),y=0;y<u.getLength();y+=1)for(var p=0;p<l.getLength();p+=1)b[y+p]^=s.gexp(s.glog(u.getAt(y))+s.glog(l.getAt(p)));return i(b,0)},u.mod=function(l){if(u.ge Line truncated
`),hostName:s,mtu:n.mtu,persistent_keep_alive:n.persistent_keep_alive,port:Number(n.port),psk_key:n.psk_key,server_pub_key:n.server_pub_key},c={containers:[{container:"amnezia-awg",awg:{isThirdPartyConfig:!0,last_config:JSON.stringify(i),port:String(n.port),protocol_version:o.header_protection_key?"3.1":"2",transport_proto:"udp"}}],defaultContainer:"amnezia-awg",description:t,hostName:s};return n.dns[0]&&(c.dns1=n.dns[0],c.dns2=n.dns[1]||n.dns[0]),c}function bc(e){let t="";for(let n=0;n<e.length;n+=32768)t+=String.fromCharCode(...e.subarray(n,n+32768));return btoa(t).replace(/\+/g,"-").replace(/\//g,"_").replace(/=+$/,"")}async function xc(e){let t=globalThis;if(typeof t.CompressionStream=="undefined")return null;try{let n=new t.Blob([e]).stream().pipeThrough(new t.CompressionStream("deflate")),o=new Uint8Array(await new t.Response(n).arrayBuffer()),r=new Uint8Array(4+o.length);return new DataView(r.buffer).setUint32(0,e.length,!1),r.set(o,4),r}catch{return null}}async function Oo(e,t,n=!0){let o=new TextEncoder().encode(JSON.stringify(vc(e,t))),r=n?await xc(o):null;return`vpn://${bc(r!=null?r:o)}`}var Us=e=>e.replace(/^vpn:\/\//,"");var Ys=["height","marginTop","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius"],wc={opacity:0,filter:"blur(2px)"};function js(e,t,n){let o=e.getAnimations();D(e,t,n),o.forEach(r=>r.cancel())}var Mc=new Set(["offset","computedOffset","easing","composite"]),Ec=e=>e.replace(/[A-Z]/g,t=>`-${t.toLowerCase()}`);function Gt(...e){let t=[],n=[],o=new Set;for(let s of e)for(let i=s;i&&!o.has(i);i=i.parentElement)if(o.add(i),!(!(i instanceof HTMLElement)||i.classList.contains("closing")))for(let c of i.getAnimations()){let f=c.playState==="running"&&c.effect instanceof KeyframeEffect?c.effect.getKeyframes():[],m=f[f.length-1];if(m&&("width"in m||"maxWidth"in m)&&n.push({a:c,t:c.currentTime}),!(m!=null&&m.height)||m.height==="0px")continue;let M=getComputedStyle(i),h={},x={};for(let w of Object.keys(m))Mc.has(w)||(h[w]=M.getPropertyValue(Ec(w)),x[w]=m[w]);t.push({el:i,a:c,t:c.currentTime,cur:h,to:x})}if(!t.length)return;[...t,...n].forEach(s=>s.a.cancel());let r=t.map(s=>getComputedStyle(s.el).height);for(let s of n)s.a.play(),s.a.currentTime=s.t;t.forEach((s,i)=>{s.a.play(),Math.abs(parseFloat(r[i])-parseFloat(String(s.to.height)))<.5?s.a.currentTime=s.t:s.a.effect.setKeyframes([s.cur,{...s.to,height:r[i]}])})}function ut(e,t={}){let n=a("div",{class:`acc${t.inset?" inset":""}`}),o=e.map((h,x)=>{var v;let w=h.body.filter(d=>!!d),T=!w.length,O=[h.icon,a("span",{class:"acc-title"},a("span",{class:"t"},h.title),(v=h.tag)!=null?v:null),h.val?a("span",{class:`acc-val${h.valHide?" hide-open":""}`},h.val):null],B=x===t.open&&!T,E=T?a("div",{class:"acc-head"},...O):a("button",{type:"button",class:"acc-head","aria-expanded":String(B),onclick:()=>M(g)},...O,V("chevron","i acc-chev")),g=a("div",{class:`acc-row${T?" still":""}${B?" open":""}${h.aside?" has-aside":""}`},E,h.aside?a("div",{class:"acc-aside"},h.aside):null,a("div",{class:"acc-body"},...w));return n.appendChild(g),g}),r=h=>h.querySelector(".acc-body"),s=()=>{let h=o.filter(x=>!x.hidden);h.forEach((x,w)=>{let T=x.classList.contains("open");x.classList.toggle("rt",w===0||T||h[w-1].classList.contains("open")),x.classList.toggle("rb",w===h.length-1||T||h[w+1].classList.contains("open"))}),o.forEach(x=>{x.classList.toggle("first",x===h[0]),x.classList.toggle("last",x===h[h.length-1])})},i=h=>{let x=getComputedStyle(h),w={};for(let T of Ys)w[T]=T==="height"?`${h.getBoundingClientRect().height}px`:x[T];return w},c=()=>o.forEach(h=>{var x;return(x=h.querySelector("button.acc-head"))==null?void 0:x.setAttribute("aria-expanded",String(h.classList.contains("open")))}),f=h=>h.classList.contains("open")||h.classList.contains("closing"),m=h=>{if(!f(h))return wc;let x=getComputedStyle(r(h));return{opacity:x.opacity,filter:x.filter==="none"?"blur(0px)":x.filter}};function M(h){var v,d;let x=o.map(i),w=o.map(m),T=(v=t.hold)==null?void 0:v.call(t);o.forEach(u=>u.getAnimations().forEach(l=>l.cancel()));let O=!h.classList.contains("open"),B=o.filter(u=>f(u)&&!(u===h&&O));o.forEach(u=>{u.classList.remove("closing"),u!==h&&u.classList.remove("open")}),h.classList.toggle("open",O),O&&h.classList.add("opened"),s();let E=Ot(),g=o.map(i);if(T==null||T(),Gt(n.parentElement),o.forEach((u,l)=>{let b=()=>{u.classList.remove("closing"),u.classList.contains("open")||u.classList.remove("opened")};if(!Ys.some(y=>x[l][y]!==g[l][y]))return b();B.includes(u)&&u.classList.add("closing"),D(u,[x[l],g[l]],{duration:_e.duration,easing:_e.easing}).onfinish=b}),B.forEach(u=>{let l=w[o.indexOf(u)];js(r(u),[l,{opacity:0,filter:"blur(2px)"}],{duration:160*Number(l.opacity),easing:J,fill:"forwards"})}),O){let u=w[o.indexOf(h)];js(r(h),[u,{opacity:1,filter:"blur(0px)"}],{duration:300*(1-Number(u.opacity)),easing:"cubic-bezier(0,0,.58,1)"})}Rt(E),c(),(d=t.onToggle)==null||d.call(t,o.indexOf(h),O,!1)}return s(),{el:n,openInde Line truncated
`).flatMap((h,x)=>x?[`
`,ei(h)]:[ei(h)])),o=!!at(e.filename,e.conf),r=V("key"),s=V("x"),i=a("span",{},_("Show key")),c=a("button",{type:"button",class:"btn soft sm",onclick:()=>{t=!t,ee(i,t?_("Hide key"):_("Show key")),n.querySelectorAll(".secret").forEach(h=>Xn(h,t,Js)),n.querySelectorAll(".mask").forEach(h=>Xn(h,!t,Js)),Xn(r,!t,Zs),Xn(s,t,Zs)}},ci(r,s),i),f=a("button",{type:"button",class:"btn soft sm",onclick:h=>ge(e.conf,_("Configuration copied"),h.currentTarget)},V("copy"),a("span",{class:"lbl"},_("Copy"))),m=a("div",{class:"filecard"},a("div",{class:"fc-row"},a("span",{class:"filecard-ic"},".conf"),a("span",{class:"t"},a("span",{class:"mono"},e.filename),a("span",{},_("For computers and routers")))),a("button",{type:"button",class:"btn accent sm block",onclick:()=>Xt(e.filename,e.conf)},V(o?"open":"download"),a("span",{},o?_("Share file"):_("Download")))),M=ut([{icon:ne("file"),title:_("Configuration"),body:[a("div",{class:"confbar"},c,f),n]}],{inset:!0});return a("div",{class:"step-box"},m,M.el)}function di(e){let t=a("span",{class:"osm-p"},we[e]),n=ds(Kt(e,"ios"),Kt(e,"android"));return{el:a("span",{class:"scanline"},a("span",{},...ht(_("In %s:"),t)),n.el),set(o){ee(t,we[o],void 0,{whole:!0}),n.set(Kt(o,"ios"),Kt(o,"android"))}}}function ui(e){let t=a("span",{class:"tt"}),n=a("span",{class:"tt-m"}),o=a("span",{class:"hp-tip","aria-hidden":"true"},t,n),r=a("button",{type:"button",class:"hp-b",onclick:()=>Xt(e().file,e().text)},V("download")),s=a("button",{type:"button",class:"hp-b"},V("copy")),i=a("div",{class:"hpill",role:"group","aria-label":_("The connection"),"data-key":"conn"},r,s,o),c=null,f=0,m=0,M=l=>{var b;return l===s&&s.classList.contains("done")?_("Copied"):(b=l.getAttribute("aria-label"))!=null?b:""},h=(l,b)=>{n.textContent=b;let y=n.offsetWidth+20;return Math.min(l.offsetLeft+l.offsetWidth/2,i.offsetWidth+30-y/2)},x=l=>`translateX(${l}px) translateX(-50%)`,w=()=>{let l=getComputedStyle(o);return{opacity:l.opacity,filter:l.filter==="none"?"blur(0px)":l.filter,transform:l.transform}},T=(l,b)=>{let y=o.getAnimations();D(o,l,b),y.forEach(p=>p.cancel())},O=l=>{let b=w();o.style.transform=x(l),T([b,{opacity:1,filter:"blur(0px)",transform:x(l)}],{duration:K.duration,easing:K.easing})},B=l=>ee(t,l),E=l=>{if(clearTimeout(f),c===l&&o.classList.contains("on"))return;if(c=l,o.classList.contains("on")||+getComputedStyle(o).opacity>0){let y=M(l);return o.classList.add("on"),O(h(l,y)),B(y)}let b=()=>{let y=M(l);se(t,y);let p=h(l,y);o.style.transform=x(p),o.classList.add("on"),T([{opacity:0,transform:`${x(p)} translateY(-3px) scale(.96)`,filter:"blur(3px)"},{opacity:1,transform:x(p),filter:"blur(0px)"}],{duration:220,easing:Q})};performance.now()<m?b():f=window.setTimeout(b,420)},g=()=>{if(clearTimeout(f),c=null,!o.classList.contains("on"))return;m=performance.now()+500;let l=w();o.classList.remove("on"),T([l,{...l,opacity:0}],{duration:120,easing:"ease-out"})};for(let l of[r,s])l.addEventListener("pointerenter",b=>{b.pointerType==="mouse"&&E(l)}),l.addEventListener("focus",()=>{l.matches(":focus-visible")&&E(l)}),l.addEventListener("blur",b=>{i.contains(b.relatedTarget)||g()});i.addEventListener("pointerleave",g);let v=l=>{let b=V(l);s.querySelector("svg").replaceWith(b),D(b,[{opacity:0,transform:"scale(.6)",filter:"blur(3px)"},{opacity:1,transform:"none",filter:"none"}],{duration:Se.duration,easing:Se.easing})},d=()=>{if(c!==s||!o.classList.contains("on"))return;let l=M(s);O(h(s,l)),B(l)},u=0;return s.addEventListener("click",()=>{let l=e();ge(l.text,l.msg),clearTimeout(u),s.classList.contains("done")||(s.classList.add("done"),v("check"),d()),u=window.setTimeout(()=>{s.classList.remove("done"),v("copy"),d()},1600)}),{el:i,sync(){let l=e().app;r.setAttribute("aria-label",z(_("Download %s config"),l)),s.setAttribute("aria-label",z(_("Copy %s config"),l))}}}function pi(e,t){var n,o,r;return e?((n=e.setup)==null?void 0:n.state)==="trying"?"trying":e.handshake<=t?"waiting":((o=e.setup)==null?void 0:o.state)==="flowing"?"connected":((r=e.setup)==null?void 0:r.state)==="nodata"?"nodata":"waiting":"waiting"}function Tc(e,t){switch(e){case"trying":return[_("Unable to complete the handshake"),_("Your network may be blocking the connection.")];case"connected":return[z(_("%s connected"),t.name),""];case"nodata":return[_("Handshake complete, but no data"),_("The router drops its traffic: the address does not match.")];case"waiting":return[_("Waiting for the connection"),""]}}var fi={waiting:"",trying:"trying",connected:"done",nodata:"nodata"};function hi(e){let t=a("b",{},_("Waiting for the connection")),n=a("span",{class:"ws",hidden:!0}),o=a("span",{class:"t"},t,n),r=a("div",{class:"way-text"},o),s=a("span",{class:"way-track"},a("span",{class:"way-glow"},a("span",{class:"run"},a("i")),a("span",{class:"knock"},a("i"))),a("span",{class:"way-fill"}),a("span",{class:"way-break"},a("i"))),i=a("div",{class:"way",role:"status","aria-live":"polite"},a("div",{class:"way-row"},a("span",{class:"way-end"},V(e.kind)),s,a("span",{class:"way-end ho Line truncated
@@ -9,7 +9,7 @@ import { serve } from 'dawnline.portal';
let env = {};
for (let k in [ 'REQUEST_METHOD', 'REQUEST_URI', 'REMOTE_ADDR', 'HTTPS', 'CONTENT_LENGTH', 'CONTENT_TYPE',
'HTTP_HOST', 'HTTP_ORIGIN', 'HTTP_USER_AGENT', 'HTTP_ACCEPT', 'HTTP_ACCEPT_LANGUAGE',
'HTTP_HOST', 'HTTP_ORIGIN', 'HTTP_USER_AGENT', 'HTTP_ACCEPT', 'HTTP_ACCEPT_LANGUAGE', 'HTTP_ACCEPT_ENCODING',
// The visitor behind Cloudflare (believed only when REMOTE_ADDR is Cloudflare's).
'HTTP_CF_CONNECTING_IP' ])
env[k] = getenv(k);
@@ -79,14 +79,17 @@ function cached(key, ttl, fn) {
/* ---------- releases ---------- */
function slim(x) {
let digests = {};
for (let a in x.assets ?? [])
let digests = {}, ids = {};
for (let a in x.assets ?? []) {
if (match(a.digest ?? '', /^sha256:[0-9a-f]{64}$/))
digests[a.name] = substr(a.digest, 7);
if (type(a.id) == 'int' && a.id > 0)
ids[a.name] = a.id;
}
return {
tag: x.tag_name, name: x.name ?? x.tag_name, published: x.published_at ?? null,
prerelease: !!x.prerelease, url: x.html_url ?? null, body: substr(x.body ?? '', 0, 12000),
assets: map(x.assets ?? [], (a) => a.name), digests,
assets: map(x.assets ?? [], (a) => a.name), digests, ids,
};
}
@@ -194,6 +197,25 @@ export function sha256(path) {
return match(run(`sha256sum ${q(path)}`).out, /^([0-9a-f]{64})/)?.[1];
};
/** A release file's URL on github.com in parts: { repo, tag, name }, or null for any other URL. */
export function release_file(url) {
let m = match(url ?? '', /^https:\/\/github\.com\/([A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+)\/releases\/download\/([^\/?#]+)\/([^\/?#]+)$/);
return m ? { repo: m[1], tag: m[2], name: m[3] } : null;
};
/** The same file through the API (api.github.com), when its release is known; else null. */
function asset_api_url(url) {
let f = release_file(url);
if (!f)
return null;
let id = null;
try {
id = release(f.repo, f.tag)?.ids?.[f.name];
}
catch (e) {}
return id ? `https://api.github.com/repos/${f.repo}/releases/assets/${id}` : null;
}
/**
* Download to a file. o: { sha256, mirrors, log }. Direct first; mirrors
* only when the sha256 is known (from the API) and mirrors are allowed. A
@@ -203,24 +225,32 @@ export function sha256(path) {
export function download(url, dest, o) {
o ??= {};
let want = o.sha256 ? lc(o.sha256) : null;
let tries = [ url ];
let curl = have_curl();
let tries = [];
// Without curl a release file comes through the API first: github.com's redirect to it carries a
// Content-Security-Policy header that can outgrow uclient-fetch's 4 KB line buffer, and it stalls there.
let api = curl ? null : asset_api_url(url);
if (api)
push(tries, { u: api, accept: 'application/octet-stream' });
push(tries, { u: url });
let direct = length(tries);
if (want && o.mirrors && match(url, /^https:\/\/(github\.com|raw\.githubusercontent\.com)\//))
for (let m in MIRRORS)
push(tries, m + url);
for (let i, u in tries) {
let host = replace(u, /^https:\/\/([^\/]+)\/.*$/, '$1');
if (i > 0)
push(tries, { u: m + url, mirror: true });
for (let i, t in tries) {
let host = replace(t.u, /^https:\/\/([^\/]+)\/.*$/, '$1');
if (t.mirror)
o.log?.(sprintf(_('Trying mirror %s'), host));
let r = have_curl()
? run(`curl -fsSL --connect-timeout 15 --max-time 300 --retry 1 -o ${q(dest)} ${q(u)}`)
: run(`uclient-fetch -q -T 30 -O ${q(dest)} ${q(u)}`);
let r = curl
? run(`curl -fsSL --connect-timeout 15 --max-time 300 --retry 1 -o ${q(dest)} ${q(t.u)}`)
: run(`uclient-fetch -q -T 30 ${t.accept ? `--header=${q('Accept: ' + t.accept)} ` : ''}-O ${q(dest)} ${q(t.u)}`);
if (r.code == 0 && (stat(dest)?.size ?? 0) > 0) {
if (!want || sha256(dest) == want)
return u;
return t.u;
o.log?.(sprintf(_("Warning: %s sent a file that does not match GitHub's sha256, discarded"), host));
}
system(`rm -f ${q(dest)}`);
if (i == 0 && length(tries) > 1)
if (i == direct - 1 && length(tries) > direct)
o.log?.(_('GitHub did not answer, trying mirrors'));
}
return null;
@@ -1,7 +1,7 @@
// Dawnline — the personal portal.
//
// GET /<code> the app shell
// GET /<code>/assets/<file> its script, styles and fonts
// GET /<code>/assets/<file> its script and styles (gzipped when the browser takes it)
// GET /<code>/api/state
// POST /<code>/api/devices { name, kind, public_key?, lan_bypass? }
// GET /<code>/api/devices/<id>/config
@@ -45,7 +45,7 @@ import { _ } from 'dawnline.i18n';
const RATE = `${RUN_DIR}/portal-rate.json`;
const ASSETS = '/usr/share/dawnline/portal/assets';
const TYPES = { js: 'text/javascript', css: 'text/css', svg: 'image/svg+xml', woff2: 'font/woff2', png: 'image/png' };
const TYPES = { js: 'text/javascript', css: 'text/css', png: 'image/png' };
const FAIL_LIMIT = 8;
const FAIL_WINDOW = 900;
// All Cloudflare visitors together (three-word codes can't be guessed anyway).
@@ -263,12 +263,15 @@ function place(r) {
/** The app shell; it reads the code from its own URL and sends it along. */
function shell(r) {
// The build's time joins the version so every update busts the hour-long asset cache.
// The build's time joins the version: every update gives the assets new URLs, so they are cached for good.
let v = `?v=${VERSION}.${stat(`${ASSETS}/portal.js`)?.mtime ?? 0}`;
let base = r.base, title = place(r);
// The icon goes in the page: a request of its own would start another CGI process.
let icon = readfile(`${ASSETS}/icon.svg`);
let favicon = icon ? `<link rel="icon" href="data:image/svg+xml;base64,${b64enc(icon)}" type="image/svg+xml">\n` : '';
headers(r, '200 OK', {
'Content-Type': 'text/html; charset=utf-8',
'Content-Security-Policy': "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data: blob:; font-src 'self'; " +
'Content-Security-Policy': "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' data: blob:; " +
"connect-src 'self'; base-uri 'none'; form-action 'self'; frame-ancestors 'none'",
});
r.io.write(`<!doctype html>
@@ -279,8 +282,7 @@ function shell(r) {
<meta name="color-scheme" content="light dark">
<meta name="robots" content="noindex, nofollow">
<title>${html_escape(title)}</title>
<link rel="icon" href="${base}/assets/icon.svg${v}" type="image/svg+xml">
<link rel="stylesheet" href="${base}/assets/portal.css${v}">
${favicon}<link rel="stylesheet" href="${base}/assets/portal.css${v}">
</head>
<body>
<div id="app" data-base="${html_escape(base)}" data-title="${html_escape(title)}"></div>
@@ -291,13 +293,18 @@ function shell(r) {
finish();
}
/** Script, styles, icon and fonts (kept outside the web root). */
/** Script and styles (kept outside the web root); the shell's ?v= changes with every build, so they never go stale. */
function asset(r, name) {
let ext = match(name, /^[a-z0-9-]+\.(js|css|svg|woff2|png)$/)?.[1];
let data = ext ? readfile(`${ASSETS}/${name}`) : null;
let ext = match(name, /^[a-z0-9-]+\.(js|css|png)$/)?.[1];
// The build keeps a gzipped copy beside each: a third of the bytes for a browser that takes it.
let gz = ext && r.gzip ? readfile(`${ASSETS}/${name}.gz`) : null;
let data = gz ?? (ext ? readfile(`${ASSETS}/${name}`) : null);
if (data == null)
not_found(r);
headers(r, '200 OK', { 'Content-Type': TYPES[ext], 'Cache-Control': 'private, max-age=3600' });
let h = { 'Content-Type': TYPES[ext], 'Cache-Control': 'private, max-age=31536000, immutable', 'Vary': 'Accept-Encoding' };
if (gz != null)
h['Content-Encoding'] = 'gzip';
headers(r, '200 OK', h);
r.io.write(data);
finish();
}
@@ -519,6 +526,7 @@ export function handle(io) {
hsts: https && (match(host, /:([0-9]+)$/)?.[1] ?? '443') == '443',
person: null,
base: '',
gzip: match(lc(header('accept-encoding') ?? ''), /(^|[ ,])gzip([ ;,]|$)/) != null,
};
let segs = filter(split(path, '/'), (s) => s != '');
@@ -80,7 +80,7 @@ function releases(a) {
let page = +(a.page ?? 1);
if (page != int(page) || page < 1 || page > 50)
die(_('Unknown page.'));
return { releases: map(gh.releases(REPO, page), (x) => ({ ...x, body: null, digests: null })), page };
return { releases: map(gh.releases(REPO, page), (x) => ({ ...x, body: null, digests: null, ids: null })), page };
}
/** Release notes for What's new: Dawnline by tag, or an AmneziaWG build's release. */
@@ -94,7 +94,7 @@ function notes(a) {
r = gh.release(rp, `v${tag}`);
if (!r)
die(sprintf(_('No release %s in %s.'), tag, rp));
return { ...r, digests: null, repo: rp };
return { ...r, digests: null, ids: null, repo: rp };
}
/** What changed between the installed Dawnline and a release (points for the Components tab). */
@@ -111,8 +111,10 @@ function changes(a) {
}
/**
* Start an update job. Returns the new job once its worker has written it,
* else null (the caller follows updates_status); never an older job.
* Start an update job. Returns the new job once its worker has written it
* (a quick check may be over by then), else null (the caller follows
* updates_status); never an older job. Waits two seconds at most: LuCI gives
* up on a call after twenty.
*/
function run(a) {
let what = a.what ?? 'check';
@@ -126,16 +128,17 @@ function run(a) {
if (upd.busy())
die(_('Another component action is already running'));
ensure_dir(RUN_DIR);
let t0 = time();
let t0 = time(), prev = read_json(upd.JOB_FILE, null)?.id;
let args = substr(what, 0, 5) == 'check' ? `check ${substr(what, 6)}` : `install ${what}`;
// The job speaks the admin's language (use() let only a plain language code through).
let lang = i18n.current();
system(`${lang ? `DAWNLINE_LANG=${lang} ` : ''}start-stop-daemon -S -b -x /usr/libexec/dawnline/updater -- ${args}`);
for (let i = 0; i < 20; i++) {
let j = read_json(upd.JOB_FILE, null);
if (j?.state == 'running' && j.started >= t0)
if (j && j.id != prev && j.started >= t0)
return { started: true, job: j };
system('usleep 100000 2>/dev/null || sleep 1');
// ucode's own sleep: OpenWrt's BusyBox has no usleep.
sleep(100);
}
return { started: true, job: null };
}
@@ -30,7 +30,7 @@ export function check(ctx) {
/**
* The sha256 a release publishes for a file: GitHub's own (API), else the
* release's sha256sums.txt fetched straight from github.com (never a mirror).
* release's sha256sums.txt fetched straight from GitHub (never a mirror).
*/
function want_sha(ctx, tag, asset, dir) {
let want = gh.asset_sha256(REPO, tag, asset);
@@ -5,7 +5,7 @@
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
import { _ } from 'dawnline.i18n';
export const VERSION = '0.15.0';
export const VERSION = '0.16.1';
/** GitHub repository with Dawnline releases (updates and the installer). */
export const REPO = 'tickcount/luci-app-dawnline';
export const RUN_DIR = '/var/run/dawnline';
+1 -1
View File
@@ -16,4 +16,4 @@ Read with `code-standards.md` and, for anything visible, `ui-design.md` and `i18
## Checks
- In `web/`: `npm run format:check`, `npm run typecheck`, `npm run i18n:check`, `npm test`, `npm run build`; the rebuilt bundles under `package/` and the catalogs are committed (CI fails otherwise).
- In `web/`: `npm run format:check`, `npm run typecheck`, `npm run lint`, `npm run knip`, `npm run i18n:check`, `npm test`, `npm run build`; the catalogs are committed, the bundles under `package/` are git-ignored (CI builds them before packaging).
+5
View File
@@ -17,6 +17,11 @@ APK_SDK="${APK_SDK:-itdoginfo/openwrt-sdk-apk:25.12.3}"
grep -q "^export const VERSION = '$VERSION';" "$APP/root/usr/share/ucode/dawnline/util.uc" || { echo "util.uc VERSION != $VERSION" >&2; exit 1; }
grep -q "\"version\": \"$VERSION\"" "$ROOT/web/package.json" || { echo "web/package.json version != $VERSION" >&2; exit 1; }
# The web bundles are not committed: web/ builds them (npm run build).
for f in htdocs/luci-static/resources/dawnline/app.js root/usr/share/dawnline/portal/assets/portal.js root/usr/share/dawnline/portal/assets/portal.css; do
[ -f "$APP/$f" ] || { echo "$APP/$f is missing: run 'npm run build' in web/" >&2; exit 1; }
done
mkdir -p "$OUT"
build() {
local type="$1" sdk="$2" tag="dawnline-build:$1"
+4
View File
@@ -18,6 +18,10 @@ grep -q "PKG_VERSION:=$VERSION\$" "$APP/Makefile" || { echo "Makefile PKG_VERSIO
grep -q "\"version\": \"$VERSION\"" "$ROOT/web/package.json" || { echo "web/package.json version != $VERSION" >&2; exit 1; }
[ "${SKIP_WEB:-0}" = 1 ] || (cd "$ROOT/web" && npm run --silent ci)
# With SKIP_WEB=1 the bundles come from an earlier build (they are not committed).
for f in htdocs/luci-static/resources/dawnline/app.js root/usr/share/dawnline/portal/assets/portal.js root/usr/share/dawnline/portal/assets/portal.css; do
[ -f "$APP/$f" ] || { echo "$APP/$f is missing: run 'npm run build' in web/" >&2; exit 1; }
done
mkdir -p "$STAGE/www" "$OUT"
cp -R "$APP/root/." "$STAGE/"
+1 -1
View File
@@ -140,7 +140,7 @@ const prelude = (lang, db) => `(() => {
});
})()`;
const TYPES = { '.html': 'text/html', '.js': 'text/javascript', '.css': 'text/css', '.svg': 'image/svg+xml', '.woff2': 'font/woff2' };
const TYPES = { '.html': 'text/html', '.js': 'text/javascript', '.css': 'text/css', '.svg': 'image/svg+xml' };
/** Answer the page's requests from the demo build: its page for the personal link, its files by name. */
async function serve(page) {
+2 -5
View File
@@ -23,8 +23,6 @@ import tempfile
ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
RAW = os.path.join(ROOT, 'docs', 'screenshots', 'raw')
OUT = os.path.join(ROOT, 'docs', 'screenshots')
FONT = os.path.join(ROOT, 'package', 'luci-app-dawnline', 'root', 'usr', 'share', 'dawnline', 'portal', 'assets',
'geist-latin-wght-normal.woff2')
SHOTS = ['overview', 'people', 'person', 'portal', 'overview-ru', 'people-ru', 'person-ru', 'portal-ru']
# name -> the steps in front of its page, in order (raw captures). The portal's come from its demo
@@ -47,7 +45,6 @@ CANDIDATES = [
]
TEMPLATE = """<!doctype html><html><head><meta charset="utf-8"><style>
@font-face{{font-family:Geist;src:url('file://{font}') format('woff2');font-weight:100 900}}
html,body{{margin:0;width:{w}px;height:{h}px;overflow:hidden}}
body{{position:relative;background:#080808}}
.panel{{position:absolute;left:{px}px;top:{py}px;width:{pw}px;height:{ph}px;
@@ -56,7 +53,7 @@ body{{position:relative;background:#080808}}
box-shadow:0 0 0 1px rgba(255,255,255,.04)}}
.sheet{{position:absolute;display:block;filter:drop-shadow(0 24px 48px rgba(0,0,0,.6))}}
.n{{position:absolute;width:34px;height:34px;border-radius:50%;display:grid;place-items:center;
font:600 16px Geist,sans-serif;color:#ededed;background:#232323;
font:600 16px system-ui,-apple-system,sans-serif;color:#ededed;background:#232323;
box-shadow:0 0 0 1px rgba(255,255,255,.12),0 6px 16px rgba(0,0,0,.5)}}
</style></head><body><div class="panel"></div><img class="page" src="file://{src}">{steps}</body></html>"""
@@ -113,7 +110,7 @@ def main():
html = os.path.join(tmp, f'{name}.html')
with open(html, 'w', encoding='utf-8') as f:
f.write(TEMPLATE.format(w=w, h=h, x=x, y=y, iw=iw, ih=ih, px=x - INSET, py=y - INSET, pw=iw + 2 * INSET,
ph=ih + 2 * INSET, src=src, font=FONT, steps=steps))
ph=ih + 2 * INSET, src=src, steps=steps))
out = os.path.join(OUT, f'{name}.png')
subprocess.run([browser, '--headless=new', '--disable-gpu', '--hide-scrollbars', '--allow-file-access-from-files',
f'--force-device-scale-factor={SCALE}', f'--window-size={w},{h}', f'--screenshot={out}', f'file://{html}'],
+25
View File
@@ -0,0 +1,25 @@
// dawnline.github: which URLs are a release's files (those can come through
// the API instead of github.com's redirect) and the points of a commit message.
import * as gh from 'dawnline.github';
test('release_file', () => {
eq(gh.release_file('https://github.com/tickcount/luci-app-dawnline/releases/download/v0.16.0/sha256sums.txt'),
{ repo: 'tickcount/luci-app-dawnline', tag: 'v0.16.0', name: 'sha256sums.txt' }, 'a Dawnline release file');
eq(gh.release_file('https://github.com/Slava-Shchipunov/awg-openwrt/releases/download/v24.10.4/kmod-amneziawg_v24.10.4_aarch64_cortex-a53_mediatek_filogic.ipk'),
{ repo: 'Slava-Shchipunov/awg-openwrt', tag: 'v24.10.4', name: 'kmod-amneziawg_v24.10.4_aarch64_cortex-a53_mediatek_filogic.ipk' },
'an AmneziaWG build');
eq(gh.release_file('https://ghfast.top/https://github.com/tickcount/luci-app-dawnline/releases/download/v0.16.0/a.ipk'), null, 'a mirror');
eq(gh.release_file('https://raw.githubusercontent.com/tickcount/luci-app-dawnline/main/install.sh'), null, 'not a release file');
eq(gh.release_file('https://github.com/tickcount/luci-app-dawnline/releases/latest'), null, 'the latest redirect');
eq(gh.release_file('https://github.com/a/b/releases/download/v1/x.ipk?raw=1'), null, 'a query');
eq(gh.release_file('https://github.com/a/b/releases/download/v1/sub/x.ipk'), null, 'a deeper path');
eq(gh.release_file(null), null, 'nothing');
});
test('points', () => {
eq(gh.points('Dawnline 0.16.0\n\n- Check no longer times out\n- Downloads without curl\n go through the API'),
[ 'Check no longer times out', 'Downloads without curl go through the API' ], 'a release commit, a wrapped point');
eq(gh.points('Fix the portal'), [ 'Fix the portal' ], 'another commit: its title');
eq(gh.points('Dawnline 0.16.0'), [], 'a bare release title');
eq(gh.points('Merge branch x\n\n- y'), [], 'a merge');
});
-1
View File
@@ -1,6 +1,5 @@
node_modules/
coverage/
package-lock.json
src/portal/fonts/
src/admin/styles/*.css
dist/
+38 -10
View File
@@ -31,7 +31,9 @@ import fs from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import * as prettier from 'prettier';
import ts from 'typescript';
import * as ts from 'typescript/unstable/ast';
import { createVirtualFileSystem } from 'typescript/unstable/fs';
import { API } from 'typescript/unstable/sync';
import { keyOf, parsePo, pluralForms, translated, writePo, type Entry, type Po } from './po.ts';
const WEB = path.resolve(import.meta.dirname, '..');
@@ -149,14 +151,39 @@ class Errors {
}
function isFunctionLike(n: ts.Node): boolean {
return ts.isFunctionLike(n) || ts.isPropertyDeclaration(n) || ts.isClassStaticBlockDeclaration(n);
return ts.isFunctionLikeDeclaration(n) || ts.isPropertyDeclaration(n) || ts.isClassStaticBlockDeclaration(n);
}
/**
* The syntax trees of the files, parsed in one run by TypeScript 7 (its JS API
* drives the native compiler, tsgo). They go to it as a virtual project, ucode
* as JavaScript: nothing else is read, no import followed, no type checked.
*/
function parseAll(files: string[]): Map<string, ts.SourceFile> {
const name = (f: string) => (f.endsWith('.ts') ? f : `${f}.js`);
const config = '/dawnline-i18n/tsconfig.json';
const vfs: Record<string, string> = {
[config]: JSON.stringify({ compilerOptions: { allowJs: true, noLib: true, noResolve: true, types: [] }, files: files.map(name) }),
};
for (const f of files) vfs[name(f)] = fs.readFileSync(f, 'utf8');
const api = new API({ cwd: WEB, fs: createVirtualFileSystem(vfs) });
try {
const program = api.updateSnapshot({ openProjects: [config] }).getProject(config)?.program;
if (!program) throw new Error('TypeScript did not open the virtual project');
return new Map(
files.map((f) => {
const sf = program.getSourceFile(name(f));
if (!sf) throw new Error(`TypeScript did not parse ${rel(f)}`);
return [f, sf];
}),
);
} finally {
api.close();
}
}
/** Every translation call in one file. */
function scan(file: string, lazy: boolean, logs: boolean, errors: Errors, out: Found[]) {
const text = fs.readFileSync(file, 'utf8');
const kind = file.endsWith('.ts') ? ts.ScriptKind.TS : ts.ScriptKind.JS;
const sf = ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true, kind);
function scan(file: string, sf: ts.SourceFile, lazy: boolean, logs: boolean, errors: Errors, out: Found[]) {
const wrapper = WRAPPERS.has(file);
const visit = (node: ts.Node) => {
if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && CALLS[node.expression.text] && !wrapper) {
@@ -201,7 +228,7 @@ function scan(file: string, lazy: boolean, logs: boolean, errors: Errors, out: F
out.push(e);
}
}
ts.forEachChild(node, visit);
node.forEachChild(visit);
};
visit(sf);
}
@@ -213,9 +240,9 @@ function scanMenu(file: string, out: Found[]) {
}
/** One catalog's strings, deduplicated and sorted (by code unit: the same order on every machine). */
function collect(spec: CatalogSpec, errors: Errors): Entry[] {
function collect(spec: CatalogSpec, trees: Map<string, ts.SourceFile>, errors: Errors): Entry[] {
const found: Found[] = [];
for (const f of spec.sources()) scan(f, spec.lazy(f), !!spec.logs, errors, found);
for (const f of spec.sources()) scan(f, trees.get(f)!, spec.lazy(f), !!spec.logs, errors, found);
for (const f of spec.menus?.() ?? []) scanMenu(f, found);
const byKey = new Map<string, Found>();
for (const e of found) {
@@ -316,7 +343,8 @@ async function main() {
}
const usedDrafts = new Set<string>();
const collected = CATALOGS.map((spec) => ({ spec, entries: collect(spec, errors) }));
const trees = parseAll([...new Set(CATALOGS.flatMap((spec) => spec.sources()))]);
const collected = CATALOGS.map((spec) => ({ spec, entries: collect(spec, trees, errors) }));
const only = opt.only.map((f) => rel(path.resolve(f)));
const under = (r: string) => only.some((o) => r === o || r.startsWith(`${o}/`));
// Linting some files: the problems of those (other files may be half-way through a change).
+2624 -1016
View File
File diff suppressed because it is too large. Load diff
+17 -8
View File
@@ -1,6 +1,6 @@
{
"name": "dawnline-web",
"version": "0.15.0",
"version": "0.16.1",
"private": true,
"license": "MIT",
"type": "module",
@@ -12,18 +12,27 @@
"test": "vitest run",
"format": "prettier --write .",
"format:check": "prettier --check .",
"ci": "npm run format:check && npm run typecheck && npm run i18n:check && npm run test && npm run build",
"lint": "oxlint --deny-warnings",
"knip": "knip",
"ci": "npm run format:check && npm run typecheck && npm run lint && npm run knip && npm run i18n:check && npm run test && npm run build",
"i18n": "node i18n/extract.ts",
"i18n:check": "node i18n/extract.ts --check"
},
"dependencies": {
"qrcode-generator": "1.4.4"
"qrcode-generator": "2.0.4"
},
"devDependencies": {
"@types/node": "22.20.5",
"prettier": "3.6.2",
"tsup": "8.5.0",
"typescript": "5.9.3",
"vitest": "3.2.4"
"@types/node": "26.6.5",
"esbuild": "0.28.2",
"knip": "6.43.0",
"oxlint": "1.89.0",
"prettier": "3.9.10",
"tsup": "9.0.0",
"typescript": "7.0.2",
"vitest": "5.0.5"
},
"allowScripts": {
"esbuild@0.28.2": true,
"fsevents@2.3.3": true
}
}
+2 -2
View File
@@ -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(', '), {
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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) : '', {
+1 -1
View File
@@ -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 };
+27 -12
View File
@@ -17,7 +17,20 @@ import { isOn, sw } from './ui/controls';
import { qrCode } from './ui/qr';
import { deviceNameHelp, type Help } from './netcheck';
import { deviceStatus } from './ui/badges';
import { ago, bytes, defaultName, fitName, homeOf, isoDay, kindLabel, KINDS, netsLabel, todayOf } from '../shared/format';
import {
ago,
bytes,
defaultName,
fitName,
homeOf,
isoDay,
kindLabel,
netsLabel,
pickLabel,
PICKS,
todayOf,
type KindPick,
} from '../shared/format';
import { guardDeviceName } from '../shared/name-guard';
import { fill, fmt, locale, num } from '../shared/i18n';
import { icon } from '../shared/icons';
@@ -610,44 +623,46 @@ export function addDevice(person: Person, o: DeviceOpts) {
while (taken.some((t) => t.toLowerCase() === name.toLowerCase())) name = fitName(base, ` ${++n}`);
return name;
};
let kind: Kind = 'phone';
// Mobile from here is a phone: the admin is never on the device itself (see KindPick).
const kindOf = (p: KindPick): Kind => (p === 'mobile' ? 'phone' : p);
let pick: KindPick = 'mobile';
const nameInput = E('input', {
type: 'text',
class: 'cbi-input-text',
placeholder: suggest(kind),
placeholder: suggest(kindOf(pick)),
}) as HTMLInputElement;
const said = nameGuard(nameInput, () => nameRow.refresh());
const nameRow = liveField(_('Name'), nameInput, () =>
said(
nameInput.value.trim()
? deviceNameHelp(nameInput.value, taken, _('Shown in the portal and in the app.'))
: { text: fmt(_('Named after its type: %s.'), suggest(kind)), bad: false },
: { text: fmt(_('Named after its type: %s.'), suggest(kindOf(pick))), bad: false },
),
);
const kinds = E(
'div',
{ class: 'dl-kinds', role: 'radiogroup', 'aria-label': _('Type') },
KINDS.map((k) =>
PICKS.map((k) =>
E(
'button',
{
type: 'button',
role: 'radio',
class: k === kind ? 'on' : '',
'aria-checked': k === kind ? 'true' : 'false',
class: k === pick ? 'on' : '',
'aria-checked': k === pick ? 'true' : 'false',
'data-kind': k,
click: () => {
kind = k;
pick = k;
kinds.querySelectorAll('button').forEach((c) => {
const on = (c as HTMLElement).dataset.kind === k;
c.classList.toggle('on', on);
c.setAttribute('aria-checked', on ? 'true' : 'false');
});
nameInput.placeholder = suggest(k);
nameInput.placeholder = suggest(kindOf(k));
nameRow.refresh();
},
},
[icon(k), E('span', {}, kindLabel(k))],
[icon(k), E('span', {}, pickLabel(k))],
),
),
);
@@ -704,8 +719,8 @@ export function addDevice(person: Person, o: DeviceOpts) {
notify(h.text, 'warning');
return;
}
const name = nameInput.value.trim() || suggest(kind);
const r = await attempt(() => api.deviceCreate(person.id, name, kind, isOn(bypass)));
const name = nameInput.value.trim() || suggest(kindOf(pick));
const r = await attempt(() => api.deviceCreate(person.id, name, kindOf(pick), isOn(bypass)));
if (!r) return;
closeModal();
notify(fmt(_('%s added'), name), 'success', 3000);
+2 -2
View File
@@ -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',
+1 -1
View File
@@ -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) {
+2 -2
View File
@@ -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 },
+3 -2
View File
@@ -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;
+14 -15
View File
@@ -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);
}
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -180,7 +180,7 @@
.dl-fld { display: flex; flex-direction: column; gap: 8px; margin: 0 0 16px; }
.dl-fld-label { font-size: 13px; font-weight: 500; color: var(--dl-fg); }
.dl-fld .cbi-input-text { width: 100%; box-sizing: border-box; }
.dl-kinds { display: grid; grid-template-columns: repeat(5, minmax(0, 1fr)); gap: 6px; }
.dl-kinds { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 6px; }
.dl-kinds button { all: unset; box-sizing: border-box; cursor: pointer; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 6px;
height: 68px; border-radius: 10px; border: 1px solid var(--dl-line); color: var(--dl-fg-muted); font-size: 12px; font-weight: 500; text-align: center; min-width: 0; }
.dl-kinds button .dl-icon { width: 20px; height: 20px; }
+1 -1
View File
@@ -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';
-6
View File
@@ -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.
+2 -1
View File
@@ -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(
+1 -1
View File
@@ -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);
+3 -3
View File
@@ -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
+2 -1
View File
@@ -93,7 +93,8 @@ export async function runOperation(what: string | null, o: OpOptions, follow?: U
prevId = before?.job?.id;
since = before?.now ?? 0;
const r = await api.updatesRun(what!);
if (r.job && r.job.state === 'running' && r.job.id !== prevId) {
// A quick check may already be over: still this click's job (updates_run never returns an older one).
if (r.job && r.job.id !== prevId) {
job = r.job;
known(r.job);
}
+1 -1
View File
@@ -5,7 +5,7 @@
import { addDays, parseDay } from '../shared/format';
export type CellKind = 'past' | 'today' | 'left' | 'end' | 'after';
type CellKind = 'past' | 'today' | 'left' | 'end' | 'after';
export interface Cell {
day: string;
kind: CellKind;
+44 -13
View File
@@ -1,40 +1,71 @@
// What the demo adds to the breadcrumb: the scenario chip right after the path,
// and a GitHub knob (its mark only) just before the page's language picker (none over a card
// alone, which has no picker either). On a phone the pill would crowd out the names, so it
// gives way to a button in the scenario drawer (demo.css). The portal redraws
// the breadcrumb with the page and says when (onCrumbs), so both go back in
// place after each redraw; a language change makes both again in it.
// What the demo adds to the page: "Demo" (it opens the scenarios) and a link to
// GitHub, one split pill. Wide, the pill stands in the breadcrumb just before the
// page's language. On a phone the breadcrumb has no room for it, so it is a dock
// of its own at the bottom right, in <body>, outside the page: the page's
// entrance and a scenario's swap move the page with a transform and a filter,
// which would carry a fixed child along and leave its glass undrawn until they
// end. Over a card alone (no language) only the chip, right after the place, and
// no dock. The portal redraws the breadcrumb with the page and says when
// (onCrumbs), so the pill goes back in place after each redraw; a language
// change makes all of it again in it.
import { h, ic } from '../dom';
import { onLang } from '../i18n';
import { EASE_OUT, play } from '../motion';
import { onCrumbs } from '../page/frame';
import { REPO } from './data';
import { scenarioChip } from './picker';
import { scenarioPicker } from './picker';
import type { DemoRouter } from './router';
export function mountCrumbs(router: DemoRouter) {
const app = document.getElementById('app')!;
const open = scenarioPicker(router);
const demo = (cls: string) =>
h('button', { type: 'button', class: cls, 'aria-haspopup': 'dialog', onclick: open }, h('span', {}, _('Demo')), ic('chevron', 'i'));
const github = (cls: string) =>
h('a', { class: cls, href: REPO, target: '_blank', rel: 'noopener', 'aria-label': _('Dawnline on GitHub') }, ic('github'));
const make = () => ({
chip: scenarioChip(router),
gh: h('a', { class: 'dm-gh', href: REPO, target: '_blank', rel: 'noopener', 'aria-label': _('Dawnline on GitHub') }, ic('github')),
chip: demo('dm-chip'),
gh: github('dm-gh'),
dock: h('div', { class: 'dm-dock' }, demo('dm-dock-demo'), github('dm-dock-gh')),
});
let { chip, gh } = make();
let { chip, gh, dock } = make();
let first = true;
const keep = () => {
const crumbs = app.querySelector('.crumbs');
const path = crumbs?.querySelector('.cr-path');
if (!crumbs || !path) return;
if (path.nextElementSibling !== chip) path.after(chip);
const lang = crumbs.querySelector('.cr-lang');
if (lang && lang.previousElementSibling !== gh) lang.before(gh);
chip.classList.toggle('split', !!lang);
if (!lang) {
gh.remove();
dock.remove();
if (path.nextElementSibling !== chip) path.after(chip);
return;
}
if (lang.previousElementSibling !== gh || gh.previousElementSibling !== chip) lang.before(chip, gh);
if (dock.isConnected) return;
document.body.append(dock);
// It rises from under the screen's edge (with the page's first wave, the first time), on a transform alone:
// Safari leaves a backdrop blur undrawn while the element's opacity is animating, and it would pop in at the end.
play(dock, [{ transform: 'translateY(calc(100% + 64px))' }, { transform: 'none' }], {
duration: 620,
delay: first ? 260 : 0,
easing: EASE_OUT,
fill: 'backwards',
});
first = false;
};
// Each time the page draws its breadcrumb again (a repaint, the language changed).
onCrumbs(keep);
keep();
// The page has redrawn its breadcrumb in the new language by now (main.ts listens first).
onLang(() => {
const was = dock;
chip.remove();
gh.remove();
({ chip, gh } = make());
({ chip, gh, dock } = make());
if (was.isConnected) was.replaceWith(dock);
keep();
});
}
+4 -4
View File
@@ -6,7 +6,7 @@
import type { State } from '../state';
import type { Device, Kind, Pair, Person } from '../../shared/types';
export const GB = 2 ** 30;
const GB = 2 ** 30;
const HOUR = 3600;
const DAY = 86400;
@@ -94,14 +94,14 @@ export function seedDevices(s: ScenarioId, t: number, id: () => string): DemoDev
}
/** The person's state in the scenario: the four the admin's limits stop them in, else active. */
export function personState(s: ScenarioId): Person['state'] {
function personState(s: ScenarioId): Person['state'] {
return s === 'quota' || s === 'hours' || s === 'paused' || s === 'expired' ? s : 'active';
}
export const locked = (s: ScenarioId) => s === 'paused' || s === 'expired';
const locked = (s: ScenarioId) => s === 'paused' || s === 'expired';
export const deviceLimit = (s: ScenarioId) => (s === 'full' ? 3 : 4);
/** The local day (YYYY-MM-DD) of a time: in the demo, the visitor's clock is the router's. */
export function isoDay(t: number): string {
function isoDay(t: number): string {
const d = new Date(t * 1000);
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
}
+94 -38
View File
@@ -1,19 +1,17 @@
/* The portal demo's stylesheet: the portal's own, then the demo's pieces in its tokens — the "Demo"
chip after the breadcrumb's path, the GitHub knob before the page's language, the scenario
rows in the drawer, and the set-up state switch beside the set-up sheet's ×. */
/* The portal demo's stylesheet: the portal's own, then the demo's pieces in its tokens — "Demo" and GitHub as
one split pill before the page's language (on a phone a dock at the bottom), the scenario rows in the drawer,
and the set-up state switch beside the set-up sheet's ×. */
@import '../styles/index.css';
/* The path keeps its width so the chip sits right after it; the page's QR stays at the end. */
.cr-path {
flex: 0 1 auto;
}
/* "Demo" and GitHub, one split pill just before the page's language: as high as the knobs beside it, the halves
2px apart, their inner corners 4px (the outer ones half the height: 999px would scale every radius of a half
down to nothing). Over a card alone the chip stands by itself after the place, 26px and round. */
.dm-chip {
display: inline-flex;
align-items: center;
gap: 4px;
height: 26px;
padding: 0 8px 0 10px;
margin-right: auto;
border-radius: 999px;
background: var(--accent-soft);
color: var(--accent);
@@ -24,53 +22,117 @@
transform 150ms var(--ease-out),
background-color 150ms;
}
.dm-chip:hover {
background: color-mix(in srgb, var(--accent) 20%, transparent);
}
.dm-chip:active {
transform: scale(0.94);
.dm-chip.split {
height: 32px;
padding: 0 10px 0 14px;
border-radius: 16px 4px 4px 16px;
font-size: 14px;
}
.dm-chip .i {
width: 14px;
height: 14px;
transform: rotate(90deg);
}
/* A card alone (paused): the breadcrumb is centred, the chip with it. */
.page.single .dm-chip {
margin-right: 0;
}
/* GitHub: a knob with its mark only, as the QR knob, just before the language. On a phone it would crowd out
the names (the server's and the person's): there it is a button in the drawer instead. */
.dm-gh {
display: inline-grid;
place-items: center;
width: 32px;
width: 38px;
height: 32px;
border-radius: 50%;
background: var(--knob);
color: var(--text);
margin-left: -8px;
padding-right: 2px;
border-radius: 4px 16px 16px 4px;
background: var(--accent-soft);
color: var(--accent);
text-decoration: none;
flex: none;
transition:
transform 150ms var(--ease-out),
background-color 150ms;
}
.dm-gh:hover {
background: color-mix(in srgb, var(--knob), var(--text) 6%);
}
.dm-gh:active {
transform: scale(0.94);
}
.dm-gh .i {
width: 16px;
height: 16px;
}
@media (max-width: 479px) {
/* Pointed at with a mouse only: a tap would leave it lit. */
@media (hover: hover) {
.dm-chip:hover,
.dm-gh:hover {
background: color-mix(in srgb, var(--accent) 20%, transparent);
}
}
.dm-chip:active,
.dm-gh:active {
transform: scale(0.94);
}
/* On a phone the breadcrumb has no room for the pill: it is the dock instead (crumbs.ts), in <body> at the bottom
right, over the bottom fade and under the sheets; glass, 36px, the halves as in the breadcrumb. */
@media (max-width: 559px) {
.dm-chip.split,
.dm-gh {
display: none;
}
}
.dm-dock {
position: fixed;
z-index: 40;
right: max(16px, env(safe-area-inset-right, 0px));
bottom: calc(20px + env(safe-area-inset-bottom, 0px));
display: flex;
gap: 2px;
}
@media (min-width: 560px) {
.dm-dock {
display: none;
}
}
.dm-dock > * {
display: inline-flex;
align-items: center;
justify-content: center;
height: 36px;
color: var(--accent);
font-size: 14px;
font-weight: 600;
letter-spacing: -0.01em;
text-decoration: none;
background: var(--glass-bg);
-webkit-backdrop-filter: blur(28px) saturate(1.8);
backdrop-filter: blur(28px) saturate(1.8);
box-shadow:
inset 0 0 0 1px var(--glass-edge),
var(--glass-shadow);
transition: transform 150ms var(--ease-out);
-webkit-tap-highlight-color: transparent;
}
.dm-dock-demo {
gap: 4px;
padding: 0 10px 0 14px;
border-radius: 18px 5px 5px 18px;
}
.dm-dock-demo .i {
width: 14px;
height: 14px;
transform: rotate(-90deg);
}
.dm-dock-gh {
width: 40px;
border-radius: 5px 18px 18px 5px;
}
.dm-dock-gh .i {
width: 16px;
height: 16px;
}
/* A film over the glass, never in place of it. */
@media (hover: hover) {
.dm-dock > *:hover {
background:
linear-gradient(color-mix(in srgb, var(--text) 7%, transparent), color-mix(in srgb, var(--text) 7%, transparent)), var(--glass-bg);
}
}
.dm-dock > *:active {
transform: scale(0.94);
}
/* The drawer: groups of rows that touch, one step lighter than the sheet, the current one in the accent. */
.dm-group {
@@ -132,7 +194,7 @@
flex: none;
}
/* The drawer's foot: Start over, and on a phone GitHub beside it. */
/* The drawer's foot: Start over. */
.dm-foot {
display: flex;
gap: 8px;
@@ -140,12 +202,6 @@
.dm-foot .btn {
flex: 1;
}
@media (min-width: 480px) {
.dm-gh-alt {
display: none;
}
}
/* The set-up state switch: a pill beside ×, gliding into its place when the device arrives. */
.dm-way {
position: absolute;
+1 -1
View File
@@ -26,7 +26,7 @@ msgstr ""
msgid "Dawnline on GitHub"
msgstr ""
#: web/src/portal/demo/picker.ts
#: web/src/portal/demo/crumbs.ts
msgid "Demo"
msgstr ""
+1 -1
View File
@@ -28,7 +28,7 @@ msgstr "Авто"
msgid "Dawnline on GitHub"
msgstr "Dawnline на GitHub"
#: web/src/portal/demo/picker.ts
#: web/src/portal/demo/crumbs.ts
msgid "Demo"
msgstr "Демо"
+12 -17
View File
@@ -1,8 +1,7 @@
// The demo's scenario picker: the "Demo" chip, opening a drawer with the
// scenarios in groups (glass icon, name, what the page shows) and "Start over".
// Picking one swaps the page in place. Built only from the portal's own parts
// (sheet, glass icons, toast, motion); where the chip sits is crumbs.ts. On a
// phone the drawer's foot also links to GitHub, the breadcrumb having no room.
// The demo's scenario picker: a drawer with the scenarios in groups (glass
// icon, name, what the page shows) and "Start over". Picking one swaps the page
// in place. Built only from the portal's own parts (sheet, glass icons, toast,
// motion); the "Demo" buttons that open it, and where they sit, are crumbs.ts.
import { h, ic } from '../dom';
import { call } from '../api';
@@ -11,7 +10,7 @@ import { closeSheet, head, onSheetEntry, openSheet, sub, type View } from '../ui
import { glass, type Tone } from '../ui/glass';
import { toast } from '../ui/feedback';
import { EASE_OUT, play } from '../motion';
import { REPO, groups, type Scenario, type ScenarioId } from './data';
import { groups, type Scenario, type ScenarioId } from './data';
import type { DemoRouter } from './router';
/** Each scenario's glass icon and tone (the glass set is smaller than the line icons). */
@@ -28,8 +27,8 @@ const LOOK: Record<ScenarioId, [string, Tone]> = {
full: ['phone', 'grey'],
};
/** The chip that opens the scenarios. */
export function scenarioChip(router: DemoRouter): HTMLElement {
/** What opens the scenarios' drawer. */
export function scenarioPicker(router: DemoRouter): () => void {
const app = document.getElementById('app')!;
/** Swap the page in place: it dims away and comes back drawn from the scenario, the link saying which. */
@@ -44,14 +43,16 @@ export function scenarioChip(router: DemoRouter): HTMLElement {
else mark();
closeSheet();
router.use(s);
const out = play(app, [{ opacity: 1 }, { opacity: 0, filter: 'blur(4px)' }], { duration: 160, easing: EASE_OUT, fill: 'forwards' });
// The page, not #app: a filter or a transform on #app would carry its fixed edge fades along until it ends.
const page = app.querySelector<HTMLElement>('.page') ?? app;
const out = play(page, [{ opacity: 1 }, { opacity: 0, filter: 'blur(4px)' }], { duration: 160, easing: EASE_OUT, fill: 'forwards' });
const st = await call<State>('state');
await out.finished;
setState(st);
repaint();
out.cancel();
play(
app,
page,
[
{ opacity: 0, filter: 'blur(4px)', transform: 'translateY(6px)' },
{ opacity: 1, filter: 'none', transform: 'none' },
@@ -94,16 +95,10 @@ export function scenarioChip(router: DemoRouter): HTMLElement {
ic('reset'),
h('span', {}, _('Start over')),
),
h('a', { class: 'btn soft dm-gh-alt', href: REPO, target: '_blank', rel: 'noopener' }, ic('github'), h('span', {}, 'GitHub')),
),
);
return { el, label: _('Try a scenario') };
}
return h(
'button',
{ type: 'button', class: 'dm-chip', 'aria-haspopup': 'dialog', onclick: () => openSheet(scenarios) },
h('span', {}, _('Demo')),
ic('chevron', 'i'),
);
return () => openSheet(scenarios);
}
+1 -1
View File
@@ -51,7 +51,7 @@ export interface RouterOpts {
}
/** A settings sheet waits for the first connection: it comes this long after the settings are shown. */
export const CONNECT_AFTER = [6, 9];
const CONNECT_AFTER = [6, 9];
class Refusal {
constructor(
+9 -16
View File
@@ -7,7 +7,7 @@
// to add it there.
import type { ClientConfig, Kind } from '../../shared/types';
import { defaultName, fitName, kindLabel, netsLabel } from '../../shared/format';
import { defaultName, fitName, netsLabel, pickLabel, pickOf, PICKS, type KindPick } from '../../shared/format';
import { guardDeviceName } from '../../shared/name-guard';
import { shake } from '../../shared/shake';
import { fmt, num, plural } from '../../shared/i18n';
@@ -59,7 +59,7 @@ const modelReady: Promise<string> = (async () => {
const m = ((await uad.getHighEntropyValues(['model'])).model ?? '').trim();
if (!m || m === 'K') return '';
const g = GALAXY.find(([re]) => re.test(m));
MODEL = g ? `${g[1]} (${m})` : /^SM-/.test(m) ? `Galaxy ${m}` : m;
MODEL = g ? `${g[1]} (${m})` : m.startsWith('SM-') ? `Galaxy ${m}` : m;
} catch {
/* not offered */
}
@@ -77,15 +77,8 @@ function guessName(kind: Kind): string {
return defaultName(kind);
}
/*
* Phones and tablets are one choice. The device is still kept as a phone or a
* tablet (the lines say "the tablet"): on the device itself the browser tells
* which; picked from elsewhere it is a phone.
*/
type Pick = 'computer' | 'mobile' | 'router' | 'other';
const pickLabel = (p: Pick): string => (p === 'mobile' ? _('Mobile') : kindLabel(p));
const pickOf = (k: Kind): Pick => (k === 'phone' || k === 'tablet' ? 'mobile' : k);
const kindOf = (p: Pick): Kind => (p !== 'mobile' ? p : guessKind() === 'tablet' ? 'tablet' : 'phone');
// Mobile is a tablet when this page is open on one (see KindPick).
const kindOf = (p: KindPick): Kind => (p !== 'mobile' ? p : guessKind() === 'tablet' ? 'tablet' : 'phone');
/**
* What they chose so far, kept outside the view: Back from "Open on the device"
@@ -93,7 +86,7 @@ const kindOf = (p: Pick): Kind => (p !== 'mobile' ? p : guessKind() === 'tablet'
* typed (unset while the name is still the guess).
*/
interface Draft {
pick?: Pick;
pick?: KindPick;
bypass: boolean;
name?: string;
}
@@ -142,11 +135,11 @@ function vAdd(draft: Draft): View {
const st = state()!;
const p = st.person;
// The kinds this router takes, as the four choices.
const picks = (['computer', 'mobile', 'router', 'other'] as Pick[]).filter((k) => st.kinds.some((x) => pickOf(x) === k));
const picks = PICKS.filter((k) => st.kinds.some((x) => pickOf(x) === k));
const guess = picks.includes(pickOf(guessKind())) ? pickOf(guessKind()) : picks[0];
let pick: Pick = draft.pick && picks.includes(draft.pick) ? draft.pick : guess;
let pick: KindPick = draft.pick && picks.includes(draft.pick) ? draft.pick : guess;
const taken = new Set(p.devices.map((d) => d.name.toLowerCase()));
const suggest = (k: Pick) => {
const suggest = (k: KindPick) => {
const n = k === pickOf(guessKind()) ? guessName(kindOf(k)) : defaultName(k === 'mobile' ? 'phone' : k);
// Stripped of what the router refuses and cut to its limit, the number after it too ("Galaxy S24+ 2").
if (!taken.has(fitName(n).toLowerCase())) return fitName(n);
@@ -230,7 +223,7 @@ function vAdd(draft: Draft): View {
if (draft.name === undefined && pick === pickOf(guessKind())) input.value = suggest(pick);
});
// The picked tile rings itself where it stands (the ring does not travel between tiles).
function choose(k: Pick) {
function choose(k: KindPick) {
pick = draft.pick = k;
tiles.forEach((t, i) => {
const on = picks[i] === k;
+19 -12
View File
@@ -1,9 +1,9 @@
// Renaming a device where its name stands on the card: a click on the name (or Rename in its ⋯ menu) turns it
// into its own input, in the name's font and place, with nothing around it but the field's caret and selection
// (ui/caret.ts), the name selected. The status line under it says how to finish. Return saves: the words shimmer
// while the router answers (ui/shimmer.ts), settle, and the card is drawn again with the new name, its status
// morphing back from the hint. Esc or a click away puts the name it had back, whatever was typed. What the router
// won't take never gets in (shared/name-guard.ts): the words shake and the status line says why in red; the
// (ui/caret.ts), the name selected. The status line under it blurs across to how to finish. Return saves: the words
// shimmer while the router answers (ui/shimmer.ts), settle, and the card is drawn again with the new name, its
// status blurring back from the hint. Esc or a click away puts the name it had back, whatever was typed. What the
// router won't take never gets in (shared/name-guard.ts): the words shake and the status line says why in red; the
// router's own refusals (a name taken) say so the same way.
import type { Device } from '../../shared/types';
@@ -13,22 +13,25 @@ import { call } from '../api';
import { h } from '../dom';
import { repaint, setState, state, type State } from '../state';
import { smoothCaret } from '../ui/caret';
import { morphText } from '../ui/morph';
import { morphText, textOf } from '../ui/morph';
import { shimmer } from '../ui/shimmer';
/** The status line's colours (page/devices.ts), and the red of a refusal. */
const TONES = ['ok-t', 'warn-t', 'here-t', 'bad-t'];
/**
* The status line says something else in another tone: its words morph and the colour turns from the one it
* had, as a repaint's status does. Only the tone classes change hands: a morph under way keeps its own.
* The status line says something else in another tone: the hint or a refusal stands in for the status, so the
* words blur across whole (not letter by letter) and the colour turns from the one it had. Marked `data-whole`
* meanwhile: the repaint after a save brings the status back the same way. Only the tone classes change hands: a
* morph under way keeps its own.
*/
function say(stat: HTMLElement, text: string, tone: string, title = text) {
const color = getComputedStyle(stat).color;
for (const t of TONES) stat.classList.toggle(t, t === tone);
// The line is one line: a long reason (the router's own) reads in full on hover.
stat.title = title;
morphText(stat, text, undefined, { color });
stat.dataset.whole = '';
morphText(stat, text, undefined, { color, whole: true });
}
/**
@@ -54,7 +57,8 @@ export function renameOnCard(d: Device, card: HTMLElement) {
const name = card.querySelector<HTMLElement>('.dev-name');
const stat = card.querySelector<HTMLElement>('.dev-stat');
if (!name || !stat) return;
const was = { text: stat.textContent ?? '', tone: TONES.find((t) => stat.classList.contains(t)) ?? '', title: stat.title };
// What it says, not what shows: still morphing (a rename just let go), it holds both its old and new letters.
const was = { text: textOf(stat), tone: TONES.find((t) => stat.classList.contains(t)) ?? '', title: stat.title };
// How to finish, where a keyboard says it; on a touch screen its Done key saves.
const hint = matchMedia('(pointer: fine)').matches ? _('Return to save, Esc to cancel') : '';
@@ -100,9 +104,12 @@ export function renameOnCard(d: Device, card: HTMLElement) {
if (saved) name.textContent = saved;
name.hidden = false;
form.remove();
// Saved: the hint stays for the repaint, which morphs it into the status (words and colour) as it does any
// status that changed. Let go: it turns back here.
if (!saved) say(stat, was.text, was.tone, was.title);
// Saved: the hint stays for the repaint, which blurs it into the status (words and colour). Let go: it turns
// back here, and is the status again (a repaint morphs it letter by letter).
if (!saved) {
say(stat, was.text, was.tone, was.title);
delete stat.dataset.whole;
}
if (!back) return;
// After a save the card is drawn again: the name is found anew then.
if (saved)
+1 -1
View File
@@ -67,7 +67,7 @@ export interface SetupCtx {
* A badge: the mark in a tile, two lines, a chevron (an action) or the open
* mark (a store page, in a new tab). `primary`: the one thing to tap in step 2.
*/
export function badge(
function badge(
st: { href?: string; top: string; main: string; mark: string; onclick?: (ev: Event) => void },
primary = false,
): HTMLElement {
+1 -1
View File
@@ -115,7 +115,7 @@ function foldBlock(el: HTMLElement, fold: boolean, instant: boolean) {
type Layout = 'same' | 'router' | 'away' | 'pc-away';
export function setupView(d: Device, cfg: ClientConfig, key: string, here = false): View {
function setupView(d: Device, cfg: ClientConfig, key: string, here = false): View {
const pf = platform();
const apps = appsFor(preset());
const handheld = d.kind === 'phone' || d.kind === 'tablet';
-3
View File
@@ -1,3 +0,0 @@
Geist and Geist Mono are licensed under the SIL Open Font License, Version 1.1.
Copyright (c) 2023 Vercel, in collaboration with basement.studio.
https://github.com/vercel/geist-font/blob/main/OFL.txt
Binary file not shown.
+1 -1
View File
@@ -808,7 +808,7 @@ msgstr ""
msgid "Method not allowed."
msgstr ""
#: web/src/portal/flows/add.ts
#: web/src/shared/format.ts
msgid "Mobile"
msgstr ""
+1 -1
View File
@@ -813,7 +813,7 @@ msgstr "Мбит/с"
msgid "Method not allowed."
msgstr "Метод не поддерживается."
#: web/src/portal/flows/add.ts
#: web/src/shared/format.ts
msgid "Mobile"
msgstr "Мобильный"
+4
View File
@@ -22,6 +22,7 @@ import { closeDrop, dropOpen } from './ui/drop';
import { closeSheet, sheetOpen } from './ui/sheet';
import { renaming } from './flows/rename';
import { keepPressFootprint } from './ui/press';
import { pageSelection } from './ui/selection';
import { startAdd } from './flows/add';
import { openSetup } from './flows/setup-view';
@@ -211,6 +212,9 @@ onLang(() => {
// A press that shrinks a control under the pointer still lands on it (ui/press.ts).
keepPressFootprint();
// The page's own text selection where text can be selected, as the fields draw theirs (ui/selection.ts).
pageSelection();
// The focus ring only while the keyboard moves focus (base.css .kbd): on from Tab or an arrow, off at a press.
const KEYS = new Set(['Tab', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight']);
document.addEventListener('keydown', (e) => KEYS.has(e.key) && document.documentElement.classList.add('kbd'), true);
+4 -4
View File
@@ -71,16 +71,16 @@ export function spring(k: number, c: number, m = 1): Spring {
export const BOUNCY = spring(300, 20);
/** Pills, widths and heights: no overshoot. */
export const SMOOTH = spring(300, 35);
/** Small things that pop: a check, a menu. */
/** Small things that pop: a check, a mark turning in. */
export const POP = spring(520, 24);
/** The leading edge of a stretching pill: faster than SMOOTH, no overshoot. */
export const LEAD = spring(520, 46);
/** A dialog on a computer and the accordions: the menu's pop made softer (about 4% over, 90% there at ~140 ms). */
/** The dropdowns, a dialog on a computer and the accordions: POP made softer (about 4% over, 90% there at ~140 ms). */
export const SOFT = spring(380, 28);
/** What follows the pointer (a menu's highlight): there in about 130 ms, no overshoot. */
export const QUICK = spring(900, 60);
const QUICK = spring(900, 60);
/** A highlight gliding from row to row: quick, with a touch of give (about 2% over). */
export const GLIDE = spring(640, 40);
const GLIDE = spring(640, 40);
export const EASE_OUT = 'cubic-bezier(0.23, 1, 0.32, 1)';
export const EASE_IN = 'cubic-bezier(0.55, 0, 1, 0.45)';
+1 -1
View File
@@ -209,7 +209,7 @@ function hoursBar(hours: string, tzOffset: number | undefined): HTMLElement | nu
}
/** The access accordion for this state; `open`: the row to keep open (a repaint), else the data. */
export function accessAccordion(st: State, open = 1): Accordion {
function accessAccordion(st: State, open = 1): Accordion {
const p = st.person;
const used = p.quota_used || p.month[0] + p.month[1];
const pct = p.quota_limit ? Math.min(100, (used / p.quota_limit) * 100) : 0;
+4 -11
View File
@@ -117,10 +117,9 @@ function qrKnob(): HTMLElement {
}
/**
* The breadcrumb: the place, then the person (none when the link stopped
* working); at its end, the language and this page's code for another
* device, on the page itself only (not over a card: paused, link gone,
* nothing loaded).
* The breadcrumb: the place alone (the page is the person's own, so not their
* name); at its end, the language and this page's code for another device, on
* the page itself only (not over a card: paused, link gone, nothing loaded).
*/
/** Who is told the breadcrumb was drawn again (the demo adds its chip and GitHub link to it: demo/crumbs.ts). */
const drawnCrumbs: (() => void)[] = [];
@@ -129,15 +128,9 @@ export const onCrumbs = (fn: () => void) => void drawnCrumbs.push(fn);
export function crumbs(gone = false, card = false) {
if (!crumbsEl) return;
const p = gone ? null : state()?.person;
const place = h('span', { class: p ? '' : 'cur', 'aria-current': p ? null : 'page' }, placeName());
crumbsEl.replaceChildren(
h('span', { class: 'cr-mark' }, markup(LOGO)),
h(
'nav',
{ class: 'cr-path', 'aria-label': _('Breadcrumb') },
place,
p ? [ic('chevron'), h('span', { class: 'cur', 'aria-current': 'page' }, p.name)] : null,
),
h('nav', { class: 'cr-path', 'aria-label': _('Breadcrumb') }, h('span', { class: 'cur', 'aria-current': 'page' }, placeName())),
...(card ? [] : [langPicker()]),
...(p && !card ? [qrKnob()] : []),
);
+2 -2
View File
@@ -26,7 +26,7 @@ export function notice(tone: Tone, icon: string, title: string | null, sub: stri
}
/** The admin's hours as the visitor reads them: "08:00–22:00 your time" (or the router's, said so). */
export function hoursText(hours: string): string {
function hoursText(hours: string): string {
const hw = hoursFor(hours, state()?.tz_offset, -new Date().getTimezoneOffset());
if (!hw) return fmt(_('%s (router time)'), hours.replace('-', '–'));
const span = `${clockOf(hw.from)}–${clockOf(hw.to)}`;
@@ -52,7 +52,7 @@ export function stateNotice(p: Person): [string, string, string] {
}
/** The page's notice, or null when nothing stands in the way. */
export function pageNotice(p: Person): HTMLElement | null {
function pageNotice(p: Person): HTMLElement | null {
if (p.state !== 'active') return notice(p.state === 'quota' || p.state === 'expired' ? 'bad' : 'warn', ...stateNotice(p));
const left = daysLeft(p.expires, today());
return endsSoon(p, left)
+1 -1
View File
@@ -55,7 +55,7 @@ export function appsFor(preset: Preset): AppChoice[] {
return out;
}
export type Mark = 'appstore' | 'googleplay' | 'windows' | 'apple' | 'linux' | 'openwrt' | 'github' | 'site';
type Mark = 'appstore' | 'googleplay' | 'windows' | 'apple' | 'linux' | 'openwrt' | 'github' | 'site';
export interface Store {
href: string;
+1 -1
View File
@@ -52,7 +52,7 @@ export const now = () => current?.now ?? Date.now() / 1000;
/** The platform this page is open on (iPad on Safari says Mac; touch points tell). */
export const platform = (): Platform => platformOf(navigator.userAgent, navigator.maxTouchPoints);
/** The server's disguise is off: plain WireGuard, so any WireGuard app connects. */
export const plainWg = () => current?.server.awg_disguise === false;
const plainWg = () => current?.server.awg_disguise === false;
/** The server's disguise generation, for which apps and versions connect. */
export const preset = (): Preset => current?.server.preset ?? (plainWg() ? 'off' : 'max');
/** The secure twin when this page is plain HTTP, else null. */
+8 -3
View File
@@ -25,18 +25,23 @@ body {
-webkit-font-smoothing: antialiased;
min-height: 100vh;
min-height: 100dvh;
/* An app, not a document: the arrow over text. Controls set the hand; what is typed or copied by
hand (fields, the link, the configuration) keeps the I-beam. */
/* An app, not a document: the arrow over text, and no selecting it (a title, a label, a value is not text to
copy). Controls set the hand; what is typed or copied by hand (fields, the mono text: the link, hostnames, a
file's name; the configuration) can be selected, with the I-beam. */
cursor: default;
-webkit-user-select: none;
user-select: none;
}
body.locked {
overflow: hidden;
}
input,
textarea,
.linkrow .mono,
.mono,
.conf {
cursor: text;
-webkit-user-select: text;
user-select: text;
}
::selection {
background: var(--sel-bg);
+50 -3
View File
@@ -94,6 +94,9 @@
color: #fff;
font-weight: 600;
}
.btn.red:hover {
background: color-mix(in srgb, var(--bad) 82%, transparent);
}
/* Waiting for the router: the button keeps its size, its content blurs away and an orb comes up in
its place (ui/busy.ts runs the change). The orb is B4 Converge from aicss.dev's Orbs, at its own
28px stage and twice its speed: one circle walks a triangle, sharp at each corner and smaller,
@@ -341,7 +344,8 @@
opacity: 0;
transition: opacity 140ms linear;
}
.caret-hd::after {
.caret-hd::after,
.tsel-hd::after {
content: '';
position: absolute;
left: 50%;
@@ -351,16 +355,59 @@
border-radius: 50%;
background: var(--accent);
}
.caret-hd.s::after {
.caret-hd.s::after,
.tsel-hd.s::after {
top: -7px;
}
.caret-hd.e::after {
.caret-hd.e::after,
.tsel-hd.e::after {
bottom: -7px;
}
.field.selecting .caret-sel,
.field.selecting .caret-hd {
opacity: 1;
}
/* The page's own selection (ui/selection.ts), as the fields', where text can be selected (base.css), with a mouse
or trackpad: the native one is see-through, the text keeping its colour (currentcolor), and ours is drawn over it,
one band per line and a handle at each end. A band lies over the text, so it blends: in dark the screen lifts the
ground to the accent wash and leaves the words as they are, in light the multiply. Each band and handle is fixed
in <body> on its own: a box around them would make them blend with nothing but each other. */
.own-tsel .mono::selection,
.own-tsel .mono *::selection,
.own-tsel .conf::selection,
.own-tsel .conf *::selection {
background: transparent;
color: currentcolor;
}
.tsel-band,
.tsel-hd {
position: fixed;
left: 0;
top: 0;
pointer-events: none;
opacity: 0;
transition: opacity 140ms linear;
}
.tsel-band {
border-radius: 4px;
background: color-mix(in srgb, var(--accent) 26%, var(--bg));
mix-blend-mode: screen;
will-change: transform;
}
@media (prefers-color-scheme: light) {
.tsel-band {
mix-blend-mode: multiply;
}
}
.tsel-hd {
width: 2px;
border-radius: 1px;
background: var(--accent);
}
.tsel-band.on,
.tsel-hd.on {
opacity: 1;
}
/* Words on their way to the router (ui/shimmer.ts): the input's own are hidden under a copy that dims and lets a
light band sweep across it, the band the words' colour over a muted base; the caret steps aside meanwhile. */
+2 -6
View File
@@ -38,8 +38,8 @@ body.scrolled .edge-fade.top {
background: linear-gradient(to top in oklab, var(--bg) 0%, transparent 100%);
}
/* The breadcrumb (iconiqui, measured): 32px high, the mark in a 32px box, 15px crumbs 6px apart
with a 14px chevron, the current one brighter. The mark is one colour: the text's. */
/* The breadcrumb (iconiqui, measured): 32px high, the mark in a 32px box, then the place, 15px and
bright (the one crumb: the page is the person's own). The mark is one colour: the text's. */
.crumbs {
display: flex;
align-items: center;
@@ -84,10 +84,6 @@ body.scrolled .edge-fade.top {
color: var(--text);
font-weight: 500;
}
.cr-path .i {
width: 14px;
height: 14px;
}
/* The language (a pick pill, ui/pick.ts): as high as the QR knob beside it, its flag, its code and a chevron
that turns up while the popup is open. */
.cr-lang {
+5
View File
@@ -389,9 +389,14 @@
font: 12px/18px var(--mono);
max-height: 16rem;
overflow: auto;
scrollbar-width: none;
white-space: pre;
color: var(--text-2);
}
/* It scrolls with no bar, as the sheet it sits in. */
.conf::-webkit-scrollbar {
display: none;
}
.conf .k {
color: var(--text);
}
+5
View File
@@ -68,11 +68,16 @@
overflow: hidden;
flex: none;
}
/* It scrolls with no bar: a bar would cut into the sheet's round corners and its glass. */
.sheet-scroll {
flex: 1 1 auto;
min-height: 0;
overflow-y: auto;
overscroll-behavior: contain;
scrollbar-width: none;
}
.sheet-scroll::-webkit-scrollbar {
display: none;
}
.view {
padding: 0 24px 24px;
+5 -25
View File
@@ -1,29 +1,7 @@
/* The portal's fonts and tokens. Dark first (the skiper21 palette, measured), light by the system's
/* The portal's tokens. Dark first (the skiper21 palette, measured), light by the system's
choice. Surfaces step up in brightness (ground → raised → field → knob) instead of borders; the
accent is the one sky blue, colour otherwise only means state (ok green, warn orange, bad red). */
@font-face {
font-family: Geist;
src: url(geist-latin-wght-normal.woff2) format('woff2');
font-weight: 100 900;
font-display: swap;
unicode-range:
U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+20AC, U+2122, U+2190-21FF, U+2212, U+2215;
}
@font-face {
font-family: Geist;
src: url(geist-cyrillic-wght-normal.woff2) format('woff2');
font-weight: 100 900;
font-display: swap;
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}
@font-face {
font-family: 'Geist Mono';
src: url(geist-mono-latin-wght-normal.woff2) format('woff2');
font-weight: 100 900;
font-display: swap;
}
:root {
color-scheme: dark;
--bg: #080808;
@@ -84,8 +62,10 @@
--t-orange-a: #ffc08f;
--t-orange-b: #ff8d28;
--font: Geist, -apple-system, system-ui, 'Segoe UI', sans-serif;
--mono: 'Geist Mono', ui-monospace, 'SF Mono', Menlo, monospace;
/* Each system's own type, nothing downloaded: SF Pro on Apple, Segoe UI on Windows, Roboto on
Android, the desktop's sans on Linux; SF Mono, Cascadia Mono or Consolas for code. */
--font: system-ui, -apple-system, 'Segoe UI', Roboto, 'Noto Sans', Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif;
--mono: ui-monospace, 'SF Mono', SFMono-Regular, Menlo, 'Cascadia Mono', Consolas, 'Liberation Mono', 'DejaVu Sans Mono', monospace;
--r-sheet: 36px;
--r-card: 28px;
--r-row: 20px;
+2 -1
View File
@@ -26,7 +26,8 @@ function now(el: Element): Keyframe {
/** What gives way: the button's own elements (a bare word goes into a span first). */
function content(btn: HTMLElement): Element[] {
for (const n of [...btn.childNodes])
// A copy: childNodes is live and the loop replaces nodes in it.
for (const n of Array.from(btn.childNodes))
if (n.nodeType === Node.TEXT_NODE && n.textContent?.trim()) n.replaceWith(h('span', {}, n.textContent));
return [...btn.children].filter((c) => !c.classList.contains('orb'));
}
+1 -1
View File
@@ -25,7 +25,7 @@ export interface Glide {
}
/** The frame the glide is tuned to, in ms. */
const FRAME = 16.67;
export const FRAME = 16.67;
/**
* Move a glide on by `frames` frames (after bencho.dev's one-time code, a softer pull: per frame
+3 -3
View File
@@ -4,7 +4,7 @@
// towards it, from where it stands), and the same ways to shut it: a press outside it and its button, Escape (the
// sheet under it stays; focus goes back to the button), a resize (at once). Each lays out and fills its own.
import { EASE_IN, POP, play } from '../motion';
import { EASE_IN, SOFT, play } from '../motion';
/** From its button, and from the screen's edge. */
export const GAP = 8;
@@ -26,7 +26,7 @@ function standing(el: Element): Keyframe {
return { opacity: s.opacity, transform: s.transform, filter: s.filter === 'none' ? 'blur(0px)' : s.filter };
}
/** In: a spring out of its transform origin. */
/** In: a soft spring out of its transform origin (a little over, no wobble). */
export function appear(el: Element) {
play(
el,
@@ -34,7 +34,7 @@ export function appear(el: Element) {
{ opacity: 0, transform: 'scale(.5)', filter: 'blur(6px)' },
{ opacity: 1, transform: 'none', filter: 'blur(0px)' },
],
{ duration: POP.duration, easing: POP.easing },
{ duration: SOFT.duration, easing: SOFT.easing },
);
}
+1 -1
View File
@@ -51,7 +51,7 @@ export function toast(msg: string, bad = false) {
}
/** An icon that changes in place: the new one (by name, or one to put back) pops in where the old one stood. */
export function swapIcon(icon: Element, to: string | Element): Element {
function swapIcon(icon: Element, to: string | Element): Element {
const next = typeof to === 'string' ? ic(to, icon.getAttribute('class') ?? 'i') : to;
icon.replaceWith(next);
play(
+1 -1
View File
@@ -136,7 +136,7 @@ const amneziaMark = () =>
let gid = 0;
/** A glass icon as markup (`cls`: its classes, e.g. "gi xl"). */
export function glassSvg(name: string, tone: Tone = 'grey', cls = 'gi'): string {
function glassSvg(name: string, tone: Tone = 'grey', cls = 'gi'): string {
const g = GL[name] ?? GL.other;
const id = `gl${++gid}`;
const detail =
+2 -4
View File
@@ -49,8 +49,7 @@ export function openMenu(anchor: HTMLElement, all: (MenuItem | null)[], title: s
rows.push(b);
return b;
};
const sections: HTMLElement[] = [
...groups.map((g) =>
const sections: HTMLElement[] = groups.map((g) =>
h(
'div',
{ class: 'pop-grp' },
@@ -63,8 +62,7 @@ export function openMenu(anchor: HTMLElement, all: (MenuItem | null)[], title: s
),
),
),
),
];
);
// A thin line between sections (iOS's, inset; the rows themselves sit in a 16 px inset).
const body = h(
'div',
+5 -3
View File
@@ -100,7 +100,7 @@ export function kept(a: string[], b: string[]): [number, number][] {
while (q < a.length - p && q < b.length - p && a[a.length - 1 - q] === b[b.length - 1 - q]) q++;
const A = a.slice(p, a.length - q);
const B = b.slice(p, b.length - q);
const L = Array.from({ length: A.length + 1 }, () => new Array<number>(B.length + 1).fill(0));
const L = Array.from({ length: A.length + 1 }, () => Array.from({ length: B.length + 1 }, () => 0));
for (let i = A.length - 1; i >= 0; i--)
for (let j = B.length - 1; j >= 0; j--) L[i][j] = A[i] === B[j] ? L[i + 1][j + 1] + 1 : Math.max(L[i + 1][j], L[i][j + 1]);
const out: [number, number][] = [];
@@ -357,6 +357,8 @@ export function morphText(el: HTMLElement, next: string, from = textOf(el), o: M
export interface Said {
text: string;
color: string;
/** Its words change as a whole (`data-whole`: a hint standing in for a card's status): they blur across. */
whole: boolean;
}
/** The keyed texts under `root` (`data-t`), before a repaint rebuilds them. */
@@ -364,7 +366,7 @@ export function textsOf(root: ParentNode): Map<string, Said> {
return new Map(
[...root.querySelectorAll<HTMLElement>('[data-t]')].map((el) => [
el.dataset.t!,
{ text: textOf(el), color: getComputedStyle(el).color },
{ text: textOf(el), color: getComputedStyle(el).color, whole: el.hasAttribute('data-whole') },
]),
);
}
@@ -378,7 +380,7 @@ export function morphChanged(root: ParentNode, was: Map<string, Said>, fresh: El
const before = was.get(el.dataset.t!);
const now = textOf(el);
if (!before || before.text === now || runs.has(el) || fresh.some((f) => f.contains(el))) return;
morphText(el, now, before.text, { color: before.color });
morphText(el, now, before.text, { color: before.color, whole: before.whole });
});
}
+1 -1
View File
@@ -11,7 +11,7 @@ import { appear, EDGE, GAP, opened, vanish } from './drop';
import { glide } from './glide';
import { letterIn, letterOut, morphText, setText } from './morph';
export interface PickOption<T> {
interface PickOption<T> {
value: T;
label: () => string;
/** Before the label, in the popup and on the pill (a dot, a flag): made anew each time it shows. */
+279
View File
@@ -0,0 +1,279 @@
// The page's own text selection, as the name fields draw theirs (ui/caret.ts), with a mouse or trackpad. Little
// of the page can be selected (base.css: what is typed or copied by hand, the mono text and the configuration);
// there the native selection is see-through and this draws an accent wash over each line it covers, a little
// taller than the line, with a handle at each end, as iOS does. Each line's ends glide on the fields' pull
// (glideStep): the wash grows out of where the selection started, follows the pointer, and fades where it stands
// as it collapses; when the text moves or goes (a scroll, a fold, a sheet), it goes along at once. Fields keep their own: a range cannot measure
// an input's text. On a touch screen the system's selection stays, with its own handles.
//
// The wash lies over the text, not under it (it cannot go under every block's), so it blends (controls.css): the
// text keeps its colour and the ground under it takes the accent. It stands on the layer of what holds the
// selection (the page, under its edge fades; a sheet; a dropdown) and is clipped to what clips or scrolls it there.
import { h } from '../dom';
import { calm } from '../motion';
import { FRAME, glideStep, type Glide } from './caret';
/** One run of a line the selection covers, on screen. */
interface Box {
top: number;
height: number;
left: number;
right: number;
}
interface Band {
el: HTMLElement;
top: number;
height: number;
l: Glide;
r: Glide;
}
/** The layer a selection stands on, by what holds it: just over its dropdown or sheet, else under the edge fades. */
const layer = (el: Element): number => (el.closest('.toasts') ? 71 : el.closest('.drop') ? 61 : el.closest('.sheet-root') ? 51 : 29);
/** What shows `el`: the screen, cut by every box around it that clips or scrolls. */
function clipOf(el: Element, seen: Map<Element, Box>): Box {
const had = seen.get(el);
if (had) return had;
const up = el.parentElement;
const c = up ? { ...clipOf(up, seen) } : { top: 0, height: innerHeight, left: 0, right: innerWidth };
const cs = getComputedStyle(el);
if (cs.overflowX !== 'visible' || cs.overflowY !== 'visible') {
const r = el.getBoundingClientRect();
const bottom = Math.min(c.top + c.height, r.bottom);
c.top = Math.max(c.top, r.top);
c.height = Math.max(0, bottom - c.top);
c.left = Math.max(c.left, r.left);
c.right = Math.min(c.right, r.right);
}
seen.set(el, c);
return c;
}
/** The lines `range` covers in what can be selected, one box per run of a line, and the layer they stand on. */
function lines(range: Range): { boxes: Box[]; z: number } {
const root = range.commonAncestorContainer;
const texts: Text[] = [];
if (root instanceof Text) texts.push(root);
else {
const walk = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
for (let n = walk.nextNode(); n; n = walk.nextNode()) if (range.intersectsNode(n)) texts.push(n as Text);
}
const seen = new Map<Element, Box>();
const runs: Box[] = [];
let z = 0;
for (const t of texts) {
const el = t.parentElement;
if (!el) continue;
const cs = getComputedStyle(el);
if ((cs.userSelect || cs.webkitUserSelect) === 'none') continue;
const part = document.createRange();
part.setStart(t, t === range.startContainer ? range.startOffset : 0);
part.setEnd(t, t === range.endContainer ? range.endOffset : t.length);
if (part.collapsed) continue;
z ||= layer(el);
const c = clipOf(el, seen);
for (const q of part.getClientRects()) {
if (q.width < 0.5) continue;
// A little taller than the line, as the fields' wash.
const top = Math.max(c.top, q.top - 1);
const bottom = Math.min(c.top + c.height, q.bottom + 1);
const left = Math.max(c.left, q.left);
const right = Math.min(c.right, q.right);
if (bottom - top >= 0.5 && right - left >= 0.5) runs.push({ top, height: bottom - top, left, right });
}
}
runs.sort((a, b) => a.top - b.top || a.left - b.left);
const boxes: Box[] = [];
for (const q of runs) {
const b = boxes.find((x) => Math.abs(x.top - q.top) < 2 && q.left - x.right < 6 && x.left - q.right < 6);
if (!b) boxes.push({ ...q });
else {
b.left = Math.min(b.left, q.left);
b.right = Math.max(b.right, q.right);
b.height = Math.max(b.height, q.height);
}
}
return { boxes, z };
}
/** The focus before the anchor: the selection was dragged up or to the left. */
function backward(s: Selection): boolean {
if (!s.anchorNode || !s.focusNode) return false;
if (s.anchorNode === s.focusNode) return s.focusOffset < s.anchorOffset;
return !!(s.anchorNode.compareDocumentPosition(s.focusNode) & Node.DOCUMENT_POSITION_PRECEDING);
}
/** Where the selection started, on screen, or null where that has no place (a node with no box). */
function anchorX(s: Selection): number | null {
if (!s.anchorNode) return null;
const r = document.createRange();
r.setStart(s.anchorNode, s.anchorOffset);
const q = r.getBoundingClientRect();
return q.height ? q.left : null;
}
/** Draw the page's selection from now on (a mouse or trackpad only). Call it once. */
export function pageSelection() {
if (!matchMedia('(pointer: fine)').matches) return;
document.documentElement.classList.add('own-tsel');
const h0 = h('span', { class: 'tsel-hd s', 'aria-hidden': 'true' });
const h1 = h('span', { class: 'tsel-hd e', 'aria-hidden': 'true' });
let bands: Band[] = [];
let shown = false;
let gone = 0;
let watch = 0;
let queued = 0;
const jump = (g: Glide) => {
g.x = g.t;
g.v = 0;
};
const draw = () => {
for (const b of bands) {
b.el.style.transform = `translate(${b.l.x.toFixed(2)}px, ${b.top.toFixed(2)}px)`;
b.el.style.width = `${Math.max(0, b.r.x - b.l.x).toFixed(2)}px`;
b.el.style.height = `${b.height.toFixed(2)}px`;
}
const a = bands[0];
const z = bands[bands.length - 1];
if (!a || !z) return;
h0.style.transform = `translate(${(a.l.x - 1).toFixed(2)}px, ${a.top.toFixed(2)}px)`;
h0.style.height = `${a.height.toFixed(2)}px`;
h1.style.transform = `translate(${(z.r.x - 1).toFixed(2)}px, ${z.top.toFixed(2)}px)`;
h1.style.height = `${z.height.toFixed(2)}px`;
};
// One loop for every edge; it stops when all of them rest.
let raf = 0;
let last = 0;
const step = (t: number) => {
const frames = last ? (t - last) / FRAME : 1;
last = t;
let busy = false;
for (const b of bands) for (const g of [b.l, b.r]) if (glideStep(g, frames)) busy = true;
draw();
raf = busy ? requestAnimationFrame(step) : 0;
if (!raf) last = 0;
};
const follow = () => {
if (calm()) {
for (const b of bands) [b.l, b.r].forEach(jump);
return draw();
}
if (!raf) raf = requestAnimationFrame(step);
};
const all = () => [...bands.map((b) => b.el), h0, h1];
// Collapsed: the wash fades where it stands, and is gone once it has.
const fade = () => {
if (!shown) return;
shown = false;
all().forEach((el) => el.classList.remove('on'));
clearTimeout(gone);
gone = window.setTimeout(() => {
if (shown) return;
bands.forEach((b) => b.el.remove());
bands = [];
h0.remove();
h1.remove();
}, 160);
};
/** The selection's lines as they stand; none while a field has the focus (it draws its own). */
const now = (sel: Selection | null) => {
const focus = document.activeElement;
const typing = focus instanceof HTMLInputElement || focus instanceof HTMLTextAreaElement;
return sel && sel.rangeCount && !sel.isCollapsed && !typing ? lines(sel.getRangeAt(0)) : { boxes: [], z: 0 };
};
const place = (still: boolean) => {
const sel = getSelection();
const { boxes, z } = now(sel);
if (!sel || !boxes.length) return fade();
// A new selection grows out of where it started (a wash still fading turns back from where it stands); a line
// it reaches grows from the side it is reached from.
const from = bands.length ? null : anchorX(sel);
const back = backward(sel);
const kept: Band[] = [];
for (const box of boxes) {
let b = bands.find((x) => !kept.includes(x) && Math.abs(x.top - box.top) < 2);
if (!b) {
const x = from ?? (back ? box.right : box.left);
b = {
el: h('span', { class: 'tsel-band', 'aria-hidden': 'true' }),
top: box.top,
height: box.height,
l: { x, v: 0, t: x },
r: { x, v: 0, t: x },
};
document.body.append(b.el);
}
b.top = box.top;
b.height = box.height;
b.l.t = box.left;
b.r.t = box.right;
if (still) [b.l, b.r].forEach(jump);
b.el.style.zIndex = String(z);
kept.push(b);
}
bands.filter((b) => !kept.includes(b)).forEach((b) => b.el.remove());
bands = kept;
h0.style.zIndex = h1.style.zIndex = String(z + 1);
if (!h0.isConnected) document.body.append(h0, h1);
clearTimeout(gone);
draw();
// Drawn where they start before they fade in (a style read in between, so the fade runs).
if (!shown) h0.getBoundingClientRect();
shown = true;
all().forEach((el) => el.classList.add('on'));
follow();
if (!watch) watch = requestAnimationFrame(look);
};
// While it shows, every frame: the text may move or go with no event to say so (a fold closing over it, a
// sheet's view swapped or the sheet shut, a scroll): the wash moves with it at once, or fades where nothing of
// it shows any more. The selection itself stays, as the browser keeps it.
const look = () => {
watch = 0;
if (!shown) return;
if (!queued) {
const { boxes } = now(getSelection());
const same =
boxes.length === bands.length &&
boxes.every((x, i) => {
const b = bands[i];
return (
Math.abs(x.top - b.top) < 0.5 &&
Math.abs(x.height - b.height) < 0.5 &&
Math.abs(x.left - b.l.t) < 0.5 &&
Math.abs(x.right - b.r.t) < 0.5
);
});
if (!same) place(true);
}
if (shown) watch = requestAnimationFrame(look);
};
// After the event: by then the browser has moved its selection.
const soon = () => {
if (!queued)
queued = requestAnimationFrame(() => {
queued = 0;
place(false);
});
};
document.addEventListener('selectionchange', () => soon());
// A press where nothing can be selected lets go of the selection, as a click anywhere does in a document: the
// browser keeps it over text that cannot be selected, and here that is most of the page.
document.addEventListener(
'pointerdown',
(e) => {
if (e.button !== 0 || !(e.target instanceof Element)) return;
const cs = getComputedStyle(e.target);
if ((cs.userSelect || cs.webkitUserSelect) === 'none') getSelection()?.removeAllRanges();
},
true,
);
}
+1 -1
View File
@@ -443,7 +443,7 @@ export function go(factory: ViewFactory) {
swapView(factory());
}
export function back() {
function back() {
if (stack.length < 2 || root.dataset.closing) return;
leave();
stack.pop();
+13 -3
View File
@@ -222,13 +222,23 @@ export function defaultName(k: Kind): string {
return k === 'other' ? _('Device') : kindLabel(k);
}
/** In picker order. */
export const KINDS: Kind[] = ['computer', 'phone', 'tablet', 'router', 'other'];
export function kindLabel(k: Kind): string {
return { computer: _('PC'), phone: _('Phone'), tablet: _('Tablet'), router: _('Router'), other: _('Other') }[k];
}
/**
* Adding a device, phones and tablets are one choice. The device is still
* kept as a phone or a tablet (the lines say "the tablet"): on the device
* itself the browser tells which; picked from elsewhere it is a phone.
*/
export type KindPick = 'computer' | 'mobile' | 'router' | 'other';
/** In picker order. */
export const PICKS: KindPick[] = ['computer', 'mobile', 'router', 'other'];
export const pickLabel = (p: KindPick): string => (p === 'mobile' ? _('Mobile') : kindLabel(p));
export const pickOf = (k: Kind): KindPick => (k === 'phone' || k === 'tablet' ? 'mobile' : k);
export function stateLabel(s: PersonState): string {
return {
active: _('Active'),
+3
View File
@@ -4,6 +4,9 @@ const P: Record<string, string> = {
phone: '<rect x="7" y="2.5" width="10" height="19" rx="2.2"/><path d="M11 18.5h2"/>',
computer: '<rect x="3" y="4.5" width="18" height="12" rx="1.8"/><path d="M2 19.5h20"/>',
tablet: '<rect x="4.5" y="2.5" width="15" height="19" rx="2.2"/><path d="M11 18.5h2"/>',
// Phones and tablets as one choice (KindPick): a phone in front of a tablet, which stops short of it.
mobile:
'<path d="M9.5 6V4.7a2.2 2.2 0 0 1 2.2-2.2h7.1a2.2 2.2 0 0 1 2.2 2.2v11.6a2.2 2.2 0 0 1-2.2 2.2H14"/><rect x="3" y="8" width="8.5" height="13.5" rx="2.2"/><path d="M6.5 18.5h1.5"/>',
router: '<rect x="3" y="13" width="18" height="7" rx="1.8"/><path d="M7 16.5h.01M10.5 16.5h.01M8 13l-2-6M16 13l2-6"/>',
server:
'<rect x="3" y="4" width="18" height="7" rx="1.8"/><rect x="3" y="13" width="18" height="7" rx="1.8"/><path d="M7 7.5h.01M7 16.5h.01M11 7.5h6M11 16.5h6"/>',
Loaded 100 of 108 files, more files were not shown because too many files have changed in this diff. Show more