Skip to content

Resume a dropped mesh download where it stopped, without counting it as a failed attempt #1799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Robbie1977 merged 3 commits into from
Sep 22, 2026
Merged

Resume a dropped mesh download where it stopped, without counting it as a failed attempt #1799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c760be6
Bump client pin to VFBv2.4.5.8, and count resumed downloads in GA
Robbie1977 Sep 22, 2026
02fcbaf
Bump client pin to VFBv2.4.5.9
Robbie1977 Sep 22, 2026
13a229e
Bump client pin to VFBv2.4.5.10
Robbie1977 Sep 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG geppettoSimulationRelease=VFBv2.1.0.4
ARG geppettoDatasourceRelease=VFBv2.3.8.4
ARG geppettoModelSwcRelease=v1.0.1
ARG geppettoFrontendRelease=VFBv2.4.0.2
ARG geppettoClientRelease=VFBv2.4.5.7
ARG geppettoClientRelease=VFBv2.4.5.10
ARG ukAcVfbGeppettoRelease=v2.2.5.4

ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster"
Expand Down
18 changes: 16 additions & 2 deletions components/VFBMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2676,8 +2676,18 @@ class VFBMain extends React.Component {
* Separate event so the counts stay comparable, and short enough to
* survive GA4's 40-character event names.
*/
/*
* aN is every request the load made; rN, when present, is how many of
* them picked a dropped download up from where it stopped (client
* VFBv2.4.5.8). Absent when none did, so the names stay as they were.
*/
var resumed = (info.resumes > 0) ? 'r' + info.resumes : null;
if (!info.ok) {
gaDetail('geomfail', info.kind, info.reason, info.call, 'a' + (info.attempts || 1));
if (resumed !== null) {
gaDetail('geomfail', info.kind, info.reason, info.call, 'a' + (info.attempts || 1), resumed);
} else {
gaDetail('geomfail', info.kind, info.reason, info.call, 'a' + (info.attempts || 1));
}
var geomBits = diagBits(info);
gaDetail('geomdiag', info.kind, geomBits[0], geomBits[1], geomBits[2],
progressBucket(info), info.effectiveType || 'na');
Expand All @@ -2687,7 +2697,11 @@ class VFBMain extends React.Component {
* answered with an error -- and came good from another. Invisible
* to the user, so this is the only place it shows.
*/
gaDetail('georecover', info.kind, info.call, 'a' + info.attempts);
if (resumed !== null) {
gaDetail('georecover', info.kind, info.call, 'a' + info.attempts, resumed);
} else {
gaDetail('georecover', info.kind, info.call, 'a' + info.attempts);
}
}
/*
* A mesh the browser cannot load leaves the term with no geometry at
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.4.5",
"@babel/plugin-transform-runtime": "^7.4.5",
"@geppettoengine/geppetto-client": "VirtualFlyBrain/geppetto-client#VFBv2.4.5.7",
"@geppettoengine/geppetto-client": "VirtualFlyBrain/geppetto-client#VFBv2.4.5.10",
"@material-ui/icons": "^4.0.0",
"@material-ui/lab": "^4.0.0-alpha.57",
"@types/react-rnd": "^8.0.0",
Expand Down
Loading