steam-frame/saphid--frame-control
1
0 Fork 0
mirror of https://github.com/saphid/frame-control.git synced 2026-10-06 07:00:37 +02:00
Code Issues Packages Projects Releases 6 Wiki Activity

Devices: fixes from review round 22

Browse Source 
- An upload's answer arriving after a switch opens nothing; the APK
  alternatives dialog installs on the headset the APK was checked for.
- A handshake that goes silent (e.g. a jump host's forward hanging) moves on
  to the next address.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
saphidandClaude Opus 5.5 committed 2026-09-29 00:53:18 +10:00
1 parent 8bd8d63546
commit b779376f5b
2 files changed
+13 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/index.html
+12 -5
View File
@@ -1549,10 +1549,16 @@ function upload(file, mode, dev = window.connDevice) {
const bar = $("prog").firstElementChild;
$("prog").style.display = "block"; bar.style.width = "0";
xhr.upload.onprogress = e => { if (e.lengthComputable) bar.style.width = (100 * e.loaded / e.total) + "%"; };
const gen = devGen;
xhr.onload = () => {
$("prog").style.display = "none";
let data; try { data = JSON.parse(xhr.responseText); } catch { data = { error: `HTTP ${xhr.status}` }; }
if (data.apk?.blocker && xhr.status >= 300) checkApkAlternatives(data.apk);
if (gen !== devGen) { // the app switched headsets meanwhile: nothing to offer about this one here
const err = new Error(data.error || "Switched headsets");
err.stale = true;
return xhr.status < 300 ? resolve(data) : reject(err);
}
if (data.apk?.blocker && xhr.status >= 300) checkApkAlternatives(data.apk, dev);
xhr.status < 300 ? resolve(data) : reject(new Error(data.error));
};
xhr.onerror = () => { $("prog").style.display = "none"; reject(new Error("network error")); };
@@ -1560,7 +1566,7 @@ function upload(file, mode, dev = window.connDevice) {
});
}
let apkLookup = 0;
async function checkApkAlternatives(apk) {
async function checkApkAlternatives(apk, dev = window.connDevice) {
const lookup = ++apkLookup;
$("apkAltReason").textContent = apk.blocker;
$("apkAltVersions").textContent = "Checking F-Droid for older versions…";
@@ -1571,12 +1577,12 @@ async function checkApkAlternatives(apk) {
if (apk.version_code != null) query.set("code", apk.version_code);
try {
const result = await api(`/api/apk-versions?${query}`);
if (lookup === apkLookup && $("apkAltDlg").open) showApkAlternatives(apk.blocker, result);
if (lookup === apkLookup && $("apkAltDlg").open) showApkAlternatives(apk.blocker, result, dev);
} catch (e) {
if (lookup === apkLookup) $("apkAltVersions").textContent = e.message;
}
}
function showApkAlternatives(reason, result) {
function showApkAlternatives(reason, result, dev = window.connDevice) {
$("apkAltReason").textContent = reason;
$("apkAltNote").textContent = `${result.versions.length} of ${result.total} compatible versions. ${result.note}`;
$("apkAltErrors").textContent = result.errors.join(" · ");
@@ -1591,9 +1597,10 @@ function showApkAlternatives(reason, result) {
const v = result.versions[+b.dataset.version];
if (installing.has(result.package)) return;
b.disabled = true; b.textContent = "Installing…";
// For the headset the APK was checked against: refused (409) if the app has switched since.
const res = await runJob(`Install ${result.package} ${v.version}`, result.package, () => api("/api/android", {
action: "install", package: result.package, url: v.url
}));
}, dev));
if (res) $("apkAltDlg").close(); else { b.disabled = false; b.textContent = "Install"; }
await loadAndroid();
if (cat.apps) { const y = window.scrollY; filterCatalog(); window.scrollTo(0, y); }