mirror of
https://github.com/Kpa-clawbot/meshcore-analyzer.git
synced 2026-11-11 11:57:57 +00:00
Fixes #2218, fixes #2230, fixes #2200. Node analytics, the account page and analytics await their data, then write into the shared `#app` container. A response that lands after the user has navigated away replaces the new page. In #2218's reproduction, the Nodes list, with 200 rows, became an Analytics heading. ## The shared part `public/app.js` keeps one view generation, `viewGeneration()`: - `navigate()` bumps it before the old page's `destroy()`, so every page init counts as a new visit, including a switch to another node of the same page type. - A page captures the value at init, and after each `await` drops the result when the value has moved on. `.eslintrc.json` declares it as a global. ## Per page **#2218, `node-analytics.js`** - `loadAnalytics` and `loadBatteryChart` check the generation on both success and error. A page-local `loadSeq` makes a time-range click a new load on the same visit, so an older range can't land over a newer one. - `NodeHopAnalytics.load` already checked `container.isConnected`, so it is unchanged. **#2230, `account.js`** - The render after `CSAuth.ready()` runs only while the generation is unchanged. - `destroy()` was empty. It now clears `shown.app` and `shown.userId`. **#2200, `analytics.js`** - A page-local `_loadSeq` sits next to the generation. Results and errors of an older window/region selection or an earlier visit are dropped, so a late failure of an old load no longer shows an error over newer results. - The bulk load renders only the six tabs drawn from its data. A tab that loads its own data (Prefix Tool, Nodes, Roles, ...) is no longer rebuilt or replaced by the bulk result: a deep-linked one renders at init, and a window, region or area change re-renders it directly. - `renderTab` guards the six tabs drawn from the bulk data (overview, rf, topology, channels, hashsizes, collisions). Until the data arrives they show "Loading analytics…", or the current load's error. Overview no longer dereferences an undefined `rf`. - Three related fixes in the same lines: - The error message is now escaped with `esc()`; it was inserted raw. - `destroy()` removes the RegionFilter and AreaFilter listeners. They piled up on every visit and called `loadAnalytics` from other pages. - `destroy()` resets the stored error. ## Tests | File | Assertions | Covers | |---|---|---| | `tests/unit/test-issue-2218-node-analytics-stale-render.js` | 12 | Loads the real router: the generation rises on every init, including another node. Late success and error after leaving, a stale visit of the same node, an older range landing last, late battery success and error. The current response, battery and error still render | | `tests/unit/test-issue-2230-account-stale-render.js` | 6 | Leaving before ready (login view and "not enabled"), re-entering before ready, the current render, an auth change after `destroy()` | | `tests/unit/test-issue-2200-analytics-stale-load.js` | 19 | An older selection landing last, a late rejection of an older selection, leave and re-enter (success and error), the current error rendered escaped and kept on a tab click, Overview and RF clicked before the data | | `tests/e2e/test-issue-2218-node-analytics-stale-e2e.js` | 4 steps | Holds `/api/nodes/*/analytics` with `page.route`, returns to `#/nodes`, then releases the response as a 200 and as a 500. The 200 rows stay and no Analytics heading appears; a normal visit still renders | How I checked them: - With the production files reverted and the tests kept, 7 of 12, 4 of 6 and 7 of 12 unit assertions fail. With the fix, all pass. - The E2E fails on the unfixed frontend with "Nodes rows 200 before release, 0 after". - Single mutations, each reverted: - removing the success check in `loadAnalytics` (analytics) fails 2 assertions; - removing the check after `CSAuth.ready()` fails 3. Other test changes: - `test-analytics-theme-refresh-before-data.js` and `test-user-management-ui.js` get a `viewGeneration: () => 0` stub. - The new E2E is registered in `scripts/non-unit-tests.json` and `deploy.yml` (shard 2, next to the #748 suite). The unit tests are in `test-all.sh`. - The broad suite's "Node side panel Details link navigates" test selected an anchor that now opens Analytics, as #2218 notes. It now clicks `#nodesRight .node-detail-btn`. Results: - `sh test-all.sh` passes, and `npx eslint public/*.js` reports 0 errors. - E2E on a fixture seeded as in CI: | Suite | Result | |---|---| | `test-e2e-playwright.js` | 148 passed, 3 skipped | | `test-user-management-e2e.js` | 28/28 | | the new #2218 suite | 4/4 | | `test-issue-748-node-analytics-coverage-e2e.js` | 2/2 | | `test-analytics-fluid-charts.js` | 8/8 | | `test-issue-1657-analytics-channels-group-sprites-e2e.js` | 5/5 | ## Not done - Two tabs that each fetch their own data can still overwrite each other after a fast tab switch between them. #2200 does not ask for that. - `nodes.js` `navigateToNode` calls its own `init` without the router, so it does not bump the generation. None of the three pages fixed here depends on that. - I placed the E2E in shard 2 without measuring suite times, which the `deploy.yml` comment asks for. --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
77 lines
3.0 KiB
JavaScript
77 lines
3.0 KiB
JavaScript
/**
|
|
* Analytics: a theme-refresh that fires before the analytics answers land.
|
|
*
|
|
* Every page load fires a theme-refresh about 300ms after the theme resolves.
|
|
* On a slow server the answers land later, and re-rendering the Overview from
|
|
* the empty data object threw (reading 'totalTransmissions'). The handler
|
|
* must leave the tab alone until loadAnalytics() renders it.
|
|
*
|
|
* Usage: node tests/unit/test-analytics-theme-refresh-before-data.js
|
|
*/
|
|
'use strict';
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const vm = require('vm');
|
|
|
|
let passed = 0, failed = 0;
|
|
function assert(cond, msg) {
|
|
if (cond) { passed++; console.log(' ✓ ' + msg); }
|
|
else { failed++; console.error(' ✗ ' + msg); }
|
|
}
|
|
|
|
function el() {
|
|
return {
|
|
style: {}, dataset: {}, value: '', innerHTML: '',
|
|
classList: { add() {}, remove() {}, toggle() {}, contains: () => false },
|
|
addEventListener() {}, removeEventListener() {},
|
|
querySelector: () => null, querySelectorAll: () => [],
|
|
};
|
|
}
|
|
const els = {};
|
|
let contentLookups = 0;
|
|
const listeners = {};
|
|
const ctx = {
|
|
console, Math, JSON, Date, Number, String, Array, Object, Set, Map, RegExp, URLSearchParams, Promise,
|
|
setTimeout, clearTimeout, requestAnimationFrame: () => 0,
|
|
getComputedStyle: () => ({ getPropertyValue: () => '' }),
|
|
localStorage: { getItem: () => null, setItem() {}, removeItem() {} },
|
|
location: { hash: '#/analytics' },
|
|
addEventListener: (type, fn) => { listeners[type] = fn; },
|
|
removeEventListener() {},
|
|
initTabBar() {}, CLIENT_TTL: {}, viewGeneration: () => 0,
|
|
// The answers never land: the refresh below fires while they are pending.
|
|
api: () => new Promise(() => {}),
|
|
RegionFilter: { init() {}, onChange() {}, regionQueryString: () => '' },
|
|
AreaFilter: { init() {}, onChange() {}, areaQueryString: () => '' },
|
|
};
|
|
let page = null;
|
|
ctx.registerPage = (name, p) => { if (name === 'analytics') page = p; };
|
|
ctx.window = ctx;
|
|
ctx.document = {
|
|
documentElement: {}, createElement: el,
|
|
addEventListener() {}, removeEventListener() {}, querySelector: () => null, querySelectorAll: () => [],
|
|
getElementById: (id) => {
|
|
if (id === 'analyticsContent') contentLookups++;
|
|
return els[id] || (els[id] = el());
|
|
},
|
|
};
|
|
vm.createContext(ctx);
|
|
vm.runInContext(fs.readFileSync(path.join(__dirname, '..', '..', 'public/analytics.js'), 'utf8'), ctx);
|
|
|
|
const rejections = [];
|
|
process.on('unhandledRejection', (e) => rejections.push(e));
|
|
|
|
(async () => {
|
|
await page.init(el());
|
|
const refresh = listeners['theme-refresh'];
|
|
assert(typeof refresh === 'function', 'init registers a theme-refresh handler');
|
|
const before = contentLookups;
|
|
let threw = null;
|
|
try { refresh(); } catch (e) { threw = e; }
|
|
await new Promise((r) => setTimeout(r, 20));
|
|
assert(!threw && rejections.length === 0, 'a refresh before the data lands does not throw (' + (threw || rejections[0] || 'ok') + ')');
|
|
assert(contentLookups === before, 'and does not re-render the tab');
|
|
console.log(`\n${passed} passed, ${failed} failed`);
|
|
process.exit(failed > 0 ? 1 : 0);
|
|
})();
|