Dawnline 0.17.0
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
Build packages / CI (push) Blocked by required conditions
Build packages / Version (push) Waiting to run
CI / Web (format, types, tests, bundles) (push) Blocked by required conditions
CI / ShellCheck (push) Blocked by required conditions
CI / ucode static checks (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 24.10) (push) Blocked by required conditions
CI / ucode compiles and tests pass (OpenWrt 25.12) (push) Blocked by required conditions
- Redraw the admin's charts in the connection map's style: the live speed as lines, the last 30 days and a device's week as stacked download and upload bars, a device's days as a strip, data use as meters. - Read any chart point by point with the pointer, a tap or the arrow keys; a day's tooltip compares it with the average and shows its download and upload. - Show where a data limit leads at the recent pace: the week ahead on the meter, and when the limit fills or what a monthly one reaches by the reset. - Make Speed now live, one point a second, on a person's page, in the People list and in an online person's card. - Name every place an online person's devices connect from, and the city each device connects from now. - Portal: read the month and the week by tap or arrow keys, see how a day compares with the others, the pace toward the data limit and how long the allowed hours still run. - Send VPN clients' DNS to the LAN's DNS after its interceptors, so transparent proxies such as forkop also handle their lookups.
This commit is contained in:
1 parent
b0d9982796
commit
18e3013047
50 files changed
+1683
-425
No files matched your search
@@ -1,5 +1,6 @@
|
||||
// Dawnline — the live meter (the Overview's Speed now): each server's
|
||||
// throughput, one point a second over the last two minutes.
|
||||
// Dawnline — the live meter (Speed now on the Overview, the People list and a
|
||||
// person's page): each server's throughput and that of each device moving
|
||||
// traffic, one point a second over the last two minutes.
|
||||
//
|
||||
// The meter RPC (dawnline.rpc.status) calls want() and read(); the agent's
|
||||
// watcher makes a point from every read it already does (sample(), point())
|
||||
@@ -8,8 +9,8 @@
|
||||
// while WANT is younger than WANT_FOR seconds: the first second of a look,
|
||||
// then with each new point. When WANT goes stale it removes FILE: with nobody
|
||||
// looking the watcher pays a little arithmetic and one stat() a second, and
|
||||
// writes nothing. FILE holds server ids and byte rates only, no keys, names
|
||||
// or personal codes. Who is online and the per-minute rates are not here
|
||||
// writes nothing. FILE holds server and device ids and byte rates only, no
|
||||
// keys, names or personal codes. Who is online and the per-minute rates are not here
|
||||
// (dawnline.live, the agent's tick).
|
||||
//
|
||||
// Bytes are the peers' counters (dawnline.awg.dump): tx includes the
|
||||
@@ -95,26 +96,31 @@ function delta(a, b) {
|
||||
/**
|
||||
* The point between samples `a` and `b`, null when they are not a second or
|
||||
* so apart (the first sample, a stalled watcher): { ts, servers: { server
|
||||
* id: [ rx, tx ] } }, bytes per second of its devices together (rx what came
|
||||
* from them, tx what went to them, as a server's per-minute `rate`), for
|
||||
* every server whose tunnel `b` read ([ 0, 0 ] when nothing moved). A device
|
||||
* is counted from its second sample on, on the server it was on in both.
|
||||
* id: [ rx, tx ] }, dev: { device id: [ rx, tx ] } }, bytes per second of
|
||||
* each server's devices together (rx what came from them, tx what went to
|
||||
* them, as a server's per-minute `rate`), for every server whose tunnel `b`
|
||||
* read ([ 0, 0 ] when nothing moved), and of each device that moved
|
||||
* something (one left out moved nothing, while its server was read). A
|
||||
* device is counted from its second sample on, on the server it was on in both.
|
||||
*/
|
||||
export function point(a, b) {
|
||||
let dt = b.t - a.t;
|
||||
if (!(dt > 0.2 && dt < 5))
|
||||
return null;
|
||||
let sum = {};
|
||||
let sum = {}, dev = {};
|
||||
for (let sid in b.servers)
|
||||
sum[sid] = [ 0, 0 ];
|
||||
for (let id, v in b.dev) {
|
||||
let o = a.dev[id];
|
||||
if (!o || o[2] != v[2])
|
||||
continue;
|
||||
sum[v[2]][0] += delta(o[0], v[0]);
|
||||
sum[v[2]][1] += delta(o[1], v[1]);
|
||||
let rx = delta(o[0], v[0]), tx = delta(o[1], v[1]);
|
||||
sum[v[2]][0] += rx;
|
||||
sum[v[2]][1] += tx;
|
||||
if (rx || tx)
|
||||
dev[id] = [ int(rx / dt), int(tx / dt) ];
|
||||
}
|
||||
let p = { ts: b.ts, servers: {} };
|
||||
let p = { ts: b.ts, servers: {}, dev };
|
||||
for (let sid, v in sum)
|
||||
p.servers[sid] = [ int(v[0] / dt), int(v[1] / dt) ];
|
||||
return p;
|
||||
|
||||
@@ -216,6 +216,13 @@ function table(m, sets, ctx) {
|
||||
if (length(ifs))
|
||||
// Home names (and no LAN DNS at all): the plain resolver, whatever address was asked.
|
||||
push(t, ` iifname { ${join(', ', ifs)} } ip saddr @dns_real meta l4proto { tcp, udp } th dport 53 ${to_resolver}`);
|
||||
push(t, ' }');
|
||||
// After the LAN's own DNS interceptors (transparent proxies redirect port 53
|
||||
// at dstnat - 1): only the first NAT of a connection counts, so a DNAT here
|
||||
// first would hand the query to the plain resolver behind their back. When
|
||||
// none of them takes the tunnel, this sends it to the LAN's DNS.
|
||||
push(t, ' chain dns_lan {');
|
||||
push(t, ' type nat hook prerouting priority dstnat + 5; policy accept;');
|
||||
for (let id, srv in m.servers)
|
||||
for (let tn in core.tunnels(srv)) {
|
||||
// Everyone else: the LAN's DNS, through the netns (from the LAN side) when internet goes that way.
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { open, readfile, writefile, rename, mkdir, stat, unlink, popen, lsdir } from 'fs';
|
||||
import { _ } from 'dawnline.i18n';
|
||||
|
||||
export const VERSION = '0.16.3';
|
||||
export const VERSION = '0.17.0';
|
||||
/** GitHub repository with Dawnline releases (updates and the installer). */
|
||||
export const REPO = 'tickcount/luci-app-dawnline';
|
||||
export const RUN_DIR = '/var/run/dawnline';
|
||||
|
||||
Reference in new issue
Block a user