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.
76 lines
3.0 KiB
Bash
Executable File
76 lines
3.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build the release packages with the OpenWrt SDK in Docker (as CI does):
|
|
# scripts/build-packages.sh [ipk|apk|all]
|
|
# Output: dist/luci-app-dawnline-<version>.{ipk,apk}, a translation package per
|
|
# po/<lang> (dist/luci-i18n-dawnline-<lang>-<version>.{ipk,apk}) and dist/sha256sums.txt
|
|
set -euo pipefail
|
|
|
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
|
APP="$ROOT/package/luci-app-dawnline"
|
|
VERSION="$(sed -n 's/^PKG_VERSION:=//p' "$APP/Makefile")"
|
|
OUT="$ROOT/dist"
|
|
WHAT="${1:-all}"
|
|
IPK_SDK="${IPK_SDK:-itdoginfo/openwrt-sdk-ipk:24.10.6}"
|
|
APK_SDK="${APK_SDK:-itdoginfo/openwrt-sdk-apk:25.12.3}"
|
|
|
|
# One version everywhere: the Makefile, the ucode library and the web package.
|
|
[ "$(cat "$APP/root/usr/share/dawnline/version")" = "$VERSION" ] || { echo "usr/share/dawnline/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 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 "$OUT"
|
|
build() {
|
|
local type="$1" sdk="$2" tag="dawnline-build:$1"
|
|
docker build --platform linux/amd64 -f "$ROOT/build/Dockerfile" --build-arg "SDK_IMAGE=$sdk" -t "$tag" "$ROOT"
|
|
local id
|
|
id="$(docker create "$tag")"
|
|
rm -rf "$OUT/.$type" && mkdir -p "$OUT/.$type"
|
|
docker cp "$id:/builder/out/." "$OUT/.$type/"
|
|
docker rm "$id" >/dev/null
|
|
local f name
|
|
for f in "$OUT/.$type"/*."$type"; do
|
|
[ -f "$f" ] || continue
|
|
# ipk names use underscores (luci-app-dawnline_0.1.0-r1_all.ipk), apk names
|
|
# dashes: one stable name per package for both, its name and the version.
|
|
name="$(basename "$f")"
|
|
name="${name%%[_-][0-9]*}"
|
|
mv "$f" "$OUT/$name-$VERSION.$type"
|
|
echo "$OUT/$name-$VERSION.$type"
|
|
done
|
|
rm -rf "$OUT/.$type"
|
|
for name in luci-app-dawnline $(i18n_packages); do
|
|
[ -f "$OUT/$name-$VERSION.$type" ] || { echo "no $name .$type built" >&2; exit 1; }
|
|
done
|
|
}
|
|
|
|
# The translation packages luci.mk makes: one per po/<lang>.
|
|
i18n_packages() {
|
|
local d
|
|
for d in "$APP"/po/*/; do
|
|
d="$(basename "$d")"
|
|
[ "$d" = templates ] || printf 'luci-i18n-dawnline-%s\n' "$d"
|
|
done
|
|
}
|
|
|
|
case "$WHAT" in
|
|
ipk) build ipk "$IPK_SDK" ;;
|
|
apk) build apk "$APK_SDK" ;;
|
|
all) build ipk "$IPK_SDK"; build apk "$APK_SDK" ;;
|
|
*) echo "usage: $0 [ipk|apk|all]" >&2; exit 2 ;;
|
|
esac
|
|
|
|
(
|
|
cd "$OUT"
|
|
files=""
|
|
for name in luci-app-dawnline $(i18n_packages); do
|
|
for f in "$name-$VERSION".ipk "$name-$VERSION".apk; do [ -f "$f" ] && files="$files $f"; done
|
|
done
|
|
# shellcheck disable=SC2086
|
|
if command -v sha256sum >/dev/null; then sha256sum $files; else shasum -a 256 $files; fi > sha256sums.txt
|
|
)
|
|
cat "$OUT/sha256sums.txt"
|