@glance-apps/sync 2.1.0 → 2.1.2

package/CHANGELOG.md

@@ -7,6 +7,49 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.1.2] - 2026-10-11
+
+### Fixed
+
+- **`webdavFetch` awaits `nativeHttpRequest`.** The native path called the
+  bridge without `await`, so it only worked with a synchronous bridge, and a
+  synchronous bridge blocks the WebView's JS thread (input and rendering) for
+  the whole request. On Android that froze dayGLANCE for minutes on cold
+  start while a failing sync server timed out
+  (krelltunez/dayGLANCE#2048). The bridge may now return its result or a
+  Promise of it, as `SYNC_PACKAGE_SPEC.md` already documented; the type
+  says so too. A synchronous bridge keeps working unchanged.
+
+## [2.1.1] - 2026-10-11
+
+### Fixed
+
+- **A `download()` cycle whose upload fails no longer reports success.**
+  `upload()` reported and then swallowed every failure except 412, so when
+  it ran inside `download()` (seeding an empty remote, or pushing a merge)
+  the cycle carried on, stamped the last-synced key, called
+  `onLastSyncedChange` and reported `success`. The error showed for five
+  seconds before the auto-revert, and from then on "Last synced" kept
+  advancing on every poll while nothing reached the server. Reported against
+  dayGLANCE (krelltunez/dayGLANCE#2037) with a misconfigured WebDAV folder,
+  but any upload failure did it: 403, 409, 5xx, a refused MKCOL, a network
+  drop that left GET working. The cycle now ends without the last-synced
+  stamp or the success status. The upload's own error report is unchanged.
+  Remote changes are still applied locally when only the upload failed, so a
+  device that can read but not write keeps receiving; the download backoff
+  still resets, because the download half worked.
+- **An upload refused by `validateUploadPayload` inside a cycle** is treated
+  the same way: nothing was written, so the cycle is not a success.
+- **A hard-stopped cycle** (`APP_ID_MISMATCH`, `SCHEMA_FORWARD_INCOMPATIBLE`)
+  no longer falls through to the success bookkeeping after reporting its
+  error.
+
+### Changed
+
+- `engine.upload()` resolves to `true` when the provider accepted the write
+  and `false` otherwise (it resolved to `undefined`). Callers that ignore the
+  result are unaffected.
+
 ## [2.1.0] - 2026-10-11
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glance-apps/sync",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "MIT",
   "type": "module",
   "main": "src/index.js",

package/src/engine.js

@@ -213,17 +213,20 @@ export const createSyncEngine = (config) => {
    * @param {string} [opts.etag]            - If-Match etag for optimistic concurrency.
    * @param {boolean} [opts.skipLockCheck]  - Bypass the in-progress guard (used
    *   when called from within download()'s merge cycle to avoid self-deadlock).
+   * @returns {Promise<boolean>} true only when the provider accepted the write.
+   *   download() reads it: a cycle whose upload did not land must not record
+   *   "last synced" or report success.
    */
   const upload = async ({ prebuiltPayload, etag = null, skipLockCheck = false } = {}) => {
-    if (hardStopped) return;
+    if (hardStopped) return false;
     const cfg = getConfig();
-    if (!cfg?.enabled) return;
+    if (!cfg?.enabled) return false;
     if (!skipLockCheck && syncing) {
       pendingFollowup = true;
-      return;
+      return false;
     }
     const provider = providers[cfg.provider];
-    if (!provider) return;
+    if (!provider) return false;
 
     if (!skipLockCheck) syncing = true;
     const t0 = Date.now();
@@ -239,7 +242,7 @@ export const createSyncEngine = (config) => {
           // eslint-disable-next-line no-console
           console.error(`[${appId}] cloud sync upload aborted:`, check?.reason || 'validation failed');
           onStatusChange?.('idle');
-          return;
+          return false;
         }
       }
 
@@ -258,6 +261,7 @@ export const createSyncEngine = (config) => {
       onLastSyncedChange?.(now);
       onStatusChange?.('success');
       scheduleAutoRevert('success', SUCCESS_HOLD_MS);
+      return true;
     } catch (err) {
       // eslint-disable-next-line no-console
       console.error(`[${appId}] cloud sync upload error:`, err);
@@ -267,7 +271,7 @@ export const createSyncEngine = (config) => {
         // When download() is the caller, it handles the 412 retry itself. Bubble.
         if (skipLockCheck) throw err;
         onStatusChange?.('idle');
-        return;
+        return false;
       }
 
       if (cls.code === 'AUTH_FAILURE') {
@@ -282,6 +286,7 @@ export const createSyncEngine = (config) => {
       onError?.(formatErrorMessage(cls), cls.code, cls.isHardStop);
       onStatusChange?.('error');
       scheduleAutoRevert('error', ERROR_HOLD_MS);
+      return false;
     } finally {
       if (!skipLockCheck) syncing = false;
     }
@@ -311,16 +316,23 @@ export const createSyncEngine = (config) => {
 
     let conflictShown = false;
     let passphraseRequired = false;
+    // Set when a cycle's upload did not land (it failed, or validation refused
+    // it). upload() has already reported it, so the cycle ends without stamping
+    // "last synced" or reporting success: a device whose writes never reach the
+    // server must not look synced. Remote changes are still applied locally,
+    // as before, so a device that can read but not write keeps receiving.
+    let uploadFailed = false;
 
     // Inner helper: download, merge, apply, upload (if anything changed).
     // Returns true if a reload was triggered (caller should bail).
     // skipIfMatch forces an unconditional upload (no If-Match) — the
     // last-writer-wins fallback used after two consecutive 412s.
     const doCycle = async (overrideEtag, { skipIfMatch = false } = {}) => {
+      uploadFailed = false;
       const downloaded = await provider.download(cfg);
       if (!downloaded) {
         // Empty remote — seed it with local state.
-        await upload({ skipLockCheck: true });
+        if (!(await upload({ skipLockCheck: true }))) uploadFailed = true;
         return false;
       }
       const { payload: remoteRaw, etag } = downloaded;
@@ -364,11 +376,12 @@ export const createSyncEngine = (config) => {
         };
         // Upload first — if this throws (e.g. 412 PRECONDITION_FAILED), the
         // local DB must remain untouched so the retry starts from clean state.
-        await upload({
+        const uploaded = await upload({
           prebuiltPayload: mergedPayload,
           skipLockCheck: true,
           etag: skipIfMatch ? null : (etag || overrideEtag || null),
         });
+        if (!uploaded) uploadFailed = true;
 
         if (localChanged) {
           let mayApply = true;
@@ -398,8 +411,13 @@ export const createSyncEngine = (config) => {
       const reloaded = await doCycle(null);
       if (reloaded || conflictShown) return;
 
+      // A hard stop (foreign or newer envelope) has already reported its
+      // error; it is not a successful cycle either.
+      if (hardStopped) return;
+      // The download half worked, so its backoff resets either way.
       downloadErrorCount = 0;
       downloadBackoffUntil = 0;
+      if (uploadFailed) return;
       const elapsed = Date.now() - t0;
       if (elapsed < MIN_SYNC_DURATION_MS) {
         await new Promise(r => setTimeout(r, MIN_SYNC_DURATION_MS - elapsed));

package/src/providers.js

@@ -24,7 +24,8 @@ const toBase64 = (str) => btoa(String.fromCharCode(...new TextEncoder().encode(s
  * before deciding whether to pass a function here).
  *
  * @param {object}        config
- * @param {Function|null} config.nativeHttpRequest  - Android bridge fn, or null
+ * @param {Function|null} config.nativeHttpRequest  - Android bridge fn, or null.
+ *   May return its result or a Promise of it; prefer async (see webdavFetch).
  * @param {Function|null} config.electronProxyFetch - Electron proxy fn, or null
  * @param {string}        [config.proxyUrl='']      - base URL for CORS proxy
  */
@@ -40,7 +41,11 @@ export const webdavFetch = (config) => async (method, targetUrl, authHeaders, bo
     if (body !== undefined && body !== null) {
       headers['Content-Type'] = extraHeaders['Content-Type'] || 'application/octet-stream';
     }
-    const result = config.nativeHttpRequest(method, targetUrl, headers, body ?? '');
+    // Awaited: the bridge may return its result or a Promise of it. A
+    // synchronous bridge blocks the WebView's JS thread (input and rendering)
+    // for the whole request, so hosts should supply an async one
+    // (krelltunez/dayGLANCE#2048); awaiting a plain value is harmless.
+    const result = await config.nativeHttpRequest(method, targetUrl, headers, body ?? '');
     if (!result) throw new Error('Native HTTP bridge unavailable');
     return {
       status: result.status,

package/types/index.d.ts

@@ -92,7 +92,7 @@ export type NativeHttpRequest = (
   url: string,
   headers: Record<string, string>,
   body: string | null,
-) => NativeHttpResponse | null;
+) => NativeHttpResponse | null | Promise<NativeHttpResponse | null>;
 
 export type ElectronProxyFetch = (
   method: string,
@@ -362,7 +362,7 @@ export interface SyncEngine {
     prebuiltPayload?: unknown;
     etag?: string | null;
     skipLockCheck?: boolean;
-  }): Promise<void>;
+  }): Promise<boolean>;
   download(): Promise<void>;
   runBackup(frequency: BackupFrequency): Promise<void>;
   test(config: Record<string, unknown>): Promise<{ success: boolean; error?: string }>;