Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / Backend (Go: vet, tests, a real ubusd and uhttpd) (push) Blocked by required conditions
CI / Package files (push) Blocked by required conditions
- **Backend rewritten in Go.** One daemon, `dawnlined`, replaces the whole ucode backend: the rpcd plugin, the agent, the CLI and the updater. The package no longer depends on ucode. - **Per-architecture builds.** The release carries the backend for arm64, ARMv7, mips, mipsle and amd64; the router fetches its own after the package is installed and checks its sha256. Dawnline does not run on other architectures (older ARM, 32-bit x86, RISC-V). - **Faster on the router.** A firewall sync takes 0.06 s instead of 0.9 s; a full apply takes about 300 ms. The portal is served by the daemon itself, without a CGI process per request. - **Live pages.** The admin and the portal follow a live stream from the router instead of re-fetching the whole state every 30 seconds. - **Admin redesigned in the portal's style.** Three sections (Overview · Log · Settings); a server is a page of its own with People, Places and Settings; a device opens as a dialog over its person. - **Changes wait for «Apply».** Every setting, and a person's access, is staged in one dock before it reaches the router. - **Configuration rollout.** After a change that makes devices fetch their configuration again, the admin shows how many have fetched it and who has not. Every setting shows beforehand (⟳N) how many devices it will touch. - **Waiting for a decision.** Overview and People put first the people who need one (access ended, limit reached, a device that does not connect), each with its one action a tap away. - **Bulk actions on people.** «Select» (or a long press on a card) picks several people to extend by a month, pause or resume at once. - **Undo.** An action done from a card or a request is undone from its toast. - **Update dialogs redesigned.** An update is one view from its question to its result; Dawnline's own update runs in it like every other, and the page reloads itself once the new version answers. Other versions are a list, each with its notes and Install on a page of its own. - **Site to site: networks behind a router.** A router connected as a device can have networks behind it (up to eight, /16 to /30): the server routes them and applies the router's access to them. A network that shares addresses with a tunnel, the router's own networks or another site is refused by name. - **Routers from the portal.** People can add a router and name its networks on their own page; the admin accepts or declines with a reason, or lets them through without asking. - **Check access and Health know the networks behind routers.** - **Usage limits reworked.** A monthly limit no longer follows the calendar. A person's month starts with their first traffic and ends a month later; the next one starts only when they connect again, so time away uses up none of it. Before, everyone's limit reset on the 1st. - Extra data lasts until that person's month ends; «Reset usage» starts the month anew. - A limit is for a month or for the whole term; the admin and the portal show when it resets. - Charts that said «this month» show the last 30 days. - After the update nobody loses what was counted: the month that was running becomes the person's first and ends on the 1st. - **Access by time of day removed.** The Hours limit is gone from the admin, the portal and the backend; saved hours are dropped. - **Expiry simplified.** An end date always stops access, with a heads-up three days before; the per-person choice is gone. - **No false disconnects from sleeping phones.** A phone or a tablet stays online through ten minutes of silence. - **Mobile Safari fixes.** Pressing a control no longer sends the page to its top; tab tracks that do not fit scroll; switches animate after a press.
58 lines
3.3 KiB
Bash
Executable File
58 lines
3.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build the web bundles and pack luci-app-dawnline as a filesystem overlay
|
|
# tarball: dist/luci-app-dawnline-<version>.tar.gz (paths relative to /), with
|
|
# the translations as their packages lay them out (the catalogs compiled by
|
|
# web/i18n/lmo.ts, byte for byte po2lmo's, and the uci-defaults that adds the
|
|
# language to LuCI). scripts/deploy.sh installs it for development; releases
|
|
# are the .ipk/.apk packages (build-packages.sh).
|
|
set -euo pipefail
|
|
|
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
|
APP="$ROOT/package/luci-app-dawnline"
|
|
VERSION="$(cat "$APP/root/usr/share/dawnline/version")"
|
|
OUT="$ROOT/dist"
|
|
STAGE="$(mktemp -d)"
|
|
trap 'rm -rf "$STAGE"' EXIT
|
|
|
|
grep -q "PKG_VERSION:=$VERSION\$" "$APP/Makefile" || { echo "Makefile PKG_VERSION != $VERSION" >&2; exit 1; }
|
|
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 htdocs/luci-static/resources/dawnline/style.js htdocs/luci-static/resources/dawnline/map.js htdocs/luci-static/resources/dawnline/qr.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/"
|
|
cp -R "$APP/htdocs/." "$STAGE/www/"
|
|
# The Go backend, for the one router this tarball goes to (BACKEND_ARCH: its `uname -m`; deploy.sh asks it).
|
|
# Without it the tarball has none and the pages ask the router themselves, as a release package does
|
|
# until the backend is built for every architecture (docs/backend.md).
|
|
if [ -n "${BACKEND_ARCH:-}" ]; then
|
|
BIN="$("$ROOT/scripts/build-backend.sh" "$BACKEND_ARCH" | tail -n1)"
|
|
cp "$BIN" "$STAGE/usr/libexec/dawnline/dawnlined"
|
|
chmod 755 "$STAGE/usr/libexec/dawnline/dawnlined"
|
|
fi
|
|
for po in "$APP"/po/*/dawnline.po; do
|
|
l="$(basename "$(dirname "$po")")"
|
|
[ "$l" = templates ] && continue
|
|
mkdir -p "$STAGE/usr/lib/lua/luci/i18n"
|
|
node "$ROOT/web/i18n/lmo.ts" "$po" "$STAGE/usr/lib/lua/luci/i18n/dawnline.$l.lmo"
|
|
# The name LuCI lists the language by (luci.mk's LUCI_LANG.<lang>).
|
|
case "$l" in ru) name='Русский (Russian)' ;; *) name="$l" ;; esac
|
|
printf "uci set luci.languages.%s='%s'; uci commit luci\n" "$l" "$name" > "$STAGE/etc/uci-defaults/luci-i18n-dawnline-$l"
|
|
done
|
|
chmod 755 "$STAGE/usr/bin/dawnline" "$STAGE/usr/libexec/dawnline/updater" "$STAGE/usr/libexec/dawnline/fetch-backend" "$STAGE/usr/libexec/dawnline/resolver" "$STAGE/usr/libexec/dawnline/postupdate" \
|
|
"$STAGE/etc/init.d/dawnline" "$STAGE/etc/uci-defaults/90_dawnline" "$STAGE/etc/hotplug.d/iface/95-dawnline"
|
|
find "$STAGE" -name '.DS_Store' -delete
|
|
|
|
TAR="$OUT/luci-app-dawnline-$VERSION.tar.gz"
|
|
# Files only (no directory entries) and root ownership: extracting into /
|
|
# must never touch the mode or owner of /usr, /www or /etc.
|
|
( cd "$STAGE" && find usr www etc -type f | LC_ALL=C sort > "$STAGE/.files" )
|
|
COPYFILE_DISABLE=1 tar --format ustar --uid 0 --gid 0 --uname root --gname root \
|
|
-czf "$TAR" -C "$STAGE" -T "$STAGE/.files"
|
|
( cd "$OUT" && shasum -a 256 "$(basename "$TAR")" > "$(basename "$TAR").sha256" )
|
|
echo "$TAR"
|