@@ -1573,7 +1608,7 @@ async function request(url, options = {}) {
async function uploadQueuedRecord({
api,
record,
- notify,
+ notifyUploadPaused,
refreshFiles,
registerBackgroundUpload,
setUploads,
@@ -1590,12 +1625,53 @@ async function uploadQueuedRecord({
try {
await new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest();
+ let settled = false;
+ let lastActivityAt = Date.now();
+
+ const cleanup = () => {
+ window.clearInterval(stallTimer);
+ window.removeEventListener("offline", onOffline);
+ window.removeEventListener("pagehide", onPageHide);
+ document.removeEventListener("visibilitychange", onVisibilityChange);
+ };
+ const settle = (handler, value) => {
+ if (settled) return;
+ settled = true;
+ cleanup();
+ handler(value);
+ };
+ const fail = (message) => {
+ if (settled) return;
+ try {
+ xhr.abort();
+ } catch {}
+ settle(reject, new Error(message));
+ };
+ const markActivity = () => {
+ lastActivityAt = Date.now();
+ };
+ const onOffline = () => fail("Upload paused while offline");
+ const onPageHide = () => fail("Upload paused while app was backgrounded");
+ const onVisibilityChange = () => {
+ if (document.visibilityState === "hidden") fail("Upload paused while app was backgrounded");
+ };
+ const stallTimer = window.setInterval(() => {
+ if (Date.now() - lastActivityAt > UPLOAD_STALL_MS) {
+ fail("Upload paused after the connection stopped responding");
+ }
+ }, 5000);
+
+ window.addEventListener("offline", onOffline);
+ window.addEventListener("pagehide", onPageHide);
+ document.addEventListener("visibilitychange", onVisibilityChange);
+
xhr.open("POST", uploadUrl, true);
xhr.setRequestHeader("Content-Type", record.mimeType || "application/octet-stream");
xhr.setRequestHeader("X-WaterDrop-File-Name", encodeURIComponent(record.name || "unnamed-file"));
xhr.setRequestHeader("X-WaterDrop-Mime-Type", record.mimeType || "application/octet-stream");
xhr.setRequestHeader("X-WaterDrop-Upload-Id", record.id);
xhr.upload.onprogress = (event) => {
+ markActivity();
if (!event.lengthComputable) return;
const progress = Math.round((event.loaded / event.total) * 100);
setUploads((items) => upsertUpload(items, { ...view, status: "uploading", progress }));
@@ -1604,15 +1680,16 @@ async function uploadQueuedRecord({
updateQueuedUploadProgress(record.id, progress).catch(() => {});
}
};
+ xhr.upload.onload = markActivity;
xhr.onload = () => {
if (xhr.status >= 200 && xhr.status < 300) {
- resolve();
+ settle(resolve);
return;
}
- reject(new Error(`HTTP ${xhr.status}`));
+ settle(reject, new Error(`HTTP ${xhr.status}`));
};
- xhr.onerror = () => reject(new Error("Network error"));
- xhr.onabort = () => reject(new Error("Upload aborted"));
+ xhr.onerror = () => settle(reject, new Error("Network error"));
+ xhr.onabort = () => settle(reject, new Error("Upload aborted"));
xhr.send(record.blob);
});
@@ -1626,7 +1703,7 @@ async function uploadQueuedRecord({
const queued = await markQueuedUploadFailed(record.id, err.message || "Upload paused");
if (queued) setUploads((items) => upsertUpload(items, uploadRecordToView(queued)));
await registerBackgroundUpload();
- notify("Upload paused. It will retry when possible.", "warn");
+ notifyUploadPaused?.();
} finally {
window.clearInterval(lockTimer);
}
@@ -1650,6 +1727,10 @@ function uploadStatusText(upload) {
return `${upload.progress || 0}%`;
}
+function canDismissUpload(upload) {
+ return upload.status === "queued" || upload.status === "error";
+}
+
function isWaterDropDrag(event) {
return Array.from(event.dataTransfer?.types || []).includes("application/x-waterdrop-file");
}
@@ -1735,7 +1816,17 @@ function shortHash(hash) {
function formatAppVersion(version) {
const raw = String(version || "");
- const match = raw.match(/^(\d+)\.(\d+)\.(\d+)$/);
- if (!match) return raw;
- return `${Number(match[1])}.${Number(match[2])}.${String(Number(match[3])).padStart(2, "0")}`;
+ // Stable release: pad the patch to two digits (e.g. 0.1.2 -> 0.1.02).
+ const stable = raw.match(/^(\d+)\.(\d+)\.(\d+)$/);
+ if (stable) {
+ return `${Number(stable[1])}.${Number(stable[2])}.${String(Number(stable[3])).padStart(2, "0")}`;
+ }
+ // Beta channel: its internal id is "-testing.N" (electron-updater reserves
+ // "beta" for cascading updates), but users see it labelled as "beta".
+ const beta = raw.match(/^(\d+)\.(\d+)\.(\d+)-testing\.(\d+)$/);
+ if (beta) {
+ const base = `${Number(beta[1])}.${Number(beta[2])}.${String(Number(beta[3])).padStart(2, "0")}`;
+ return `${base}-beta.${Number(beta[4])}`;
+ }
+ return raw;
}
diff --git a/src/renderer/src/styles.css b/src/renderer/src/styles.css
index abab4b5..a227e6d 100644
--- a/src/renderer/src/styles.css
+++ b/src/renderer/src/styles.css
@@ -604,6 +604,12 @@ body::before {
.upload-status.queued {
color: var(--faint);
}
+.upload-dismiss {
+ width: 26px;
+ height: 26px;
+ border-color: transparent;
+ background: transparent;
+}
.upload-tail {
display: flex;
align-items: center;
diff --git a/src/renderer/src/uploadQueue.js b/src/renderer/src/uploadQueue.js
index ac969e5..cacd45d 100644
--- a/src/renderer/src/uploadQueue.js
+++ b/src/renderer/src/uploadQueue.js
@@ -3,6 +3,7 @@ const DB_VERSION = 1;
const STORE_NAME = "uploads";
export const PAGE_UPLOAD_LOCK_MS = 45 * 1000;
+export const STALE_UPLOAD_LOCK_MS = 2 * PAGE_UPLOAD_LOCK_MS;
export const UPLOAD_SYNC_TAG = "waterdrop-upload-queue";
let dbPromise = null;
@@ -40,6 +41,24 @@ export async function listQueuedUploads() {
.then((items) => items.sort((a, b) => Number(a.createdAt || 0) - Number(b.createdAt || 0)));
}
+export async function recoverInterruptedUploads(message = "Upload interrupted") {
+ if (!isUploadQueueSupported()) return 0;
+ const records = await listQueuedUploads();
+ const now = Date.now();
+ let recovered = 0;
+
+ for (const record of records) {
+ if (record.status !== "uploading") continue;
+ const updatedAt = Number(record.updatedAt || record.createdAt || 0);
+ const lockedUntil = Number(record.lockedUntil || 0);
+ if (lockedUntil > now && now - updatedAt <= STALE_UPLOAD_LOCK_MS) continue;
+ await markQueuedUploadFailed(record.id, message);
+ recovered += 1;
+ }
+
+ return recovered;
+}
+
export async function claimQueuedUpload(id) {
const record = await getUploadRecord(id);
if (!record) return null;