@glance-apps/sync 1.1.1 → 1.1.3

package/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.2] - 2026-06-04
+
+### Fixed
+
+- **412 retry — local DB mutated before upload**: `applyPayload` was called before
+  `upload()` in `doCycle()`. If the upload returned a 412 Precondition Failed (concurrent
+  write from another device), the retry cycle re-merged already-dirtied local state with
+  the freshly downloaded remote, producing inconsistent data (e.g. completion events
+  referencing chore sync IDs that no longer exist after the second merge). `applyPayload`
+  is now deferred until after a successful upload (204), leaving the local DB untouched
+  if the upload fails so the retry starts from a clean state.
+
 ## [1.1.1] - 2026-06-03
 
 ### Fixed
@@ -107,7 +119,8 @@ entire sync infrastructure can be shared across the GLANCE app family.
 - TypeScript declarations in `types/index.d.ts`.
 - WebDAV CORS proxy handler in `api/webdav-proxy.js`.
 
-[Unreleased]: https://github.com/glance-apps/glance-sync/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/glance-apps/glance-sync/compare/v1.1.2...HEAD
+[1.1.2]: https://github.com/glance-apps/glance-sync/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/glance-apps/glance-sync/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/glance-apps/glance-sync/compare/v1.0.3...v1.1.0
 [1.0.3]: https://github.com/glance-apps/glance-sync/compare/v1.0.2...v1.0.3

package/package.json

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

package/src/engine.js

@@ -346,34 +346,36 @@ export const createSyncEngine = (config) => {
       const mergeResult = mergePayloads(localData, remote.data);
       const { data: mergedData, localChanged, remoteChanged } = mergeResult;
 
-      if (localChanged) {
-        let mayApply = true;
-        if (validateApplyPayload) {
-          const check = await validateApplyPayload({ ...remote, data: mergedData });
-          if (!check?.valid) {
-            // eslint-disable-next-line no-console
-            console.error(`[${appId}] applyRemoteData aborted:`, check?.reason || 'validation failed');
-            mayApply = false;
-          }
-        }
-        if (mayApply) {
-          await applyPayload(mergedData, { allowEmpty: !!remote.lastModified });
-          localStorage.setItem(KEY_LOCAL_MOD, new Date().toISOString());
-        }
-      }
-
       if (remoteChanged || localChanged) {
         const mergedPayload = {
           version: ENVELOPE_DATA_VERSION,
           lastModified: new Date().toISOString(),
           data: mergedData,
         };
+        // 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({
           prebuiltPayload: mergedPayload,
           skipLockCheck: true,
           etag: etag || overrideEtag || null,
         });
 
+        if (localChanged) {
+          let mayApply = true;
+          if (validateApplyPayload) {
+            const check = await validateApplyPayload({ ...remote, data: mergedData });
+            if (!check?.valid) {
+              // eslint-disable-next-line no-console
+              console.error(`[${appId}] applyRemoteData aborted:`, check?.reason || 'validation failed');
+              mayApply = false;
+            }
+          }
+          if (mayApply) {
+            await applyPayload(mergedData, { allowEmpty: !!remote.lastModified });
+            localStorage.setItem(KEY_LOCAL_MOD, new Date().toISOString());
+          }
+        }
+
         if (hasNeverSynced && localChanged) {
           onFirstSyncReload?.();
           return true;

package/src/providers.js

@@ -246,7 +246,12 @@ export function createProviders(engineConfig) {
           // nativeHttpRequest != null means the Android HTTP bridge is available,
           // which bypasses Koofr's server-side block on Vercel proxy IPs.
           const onAndroid = engineConfig.nativeHttpRequest != null;
-          if (!onAndroid) return { success: false, error: "Koofr is blocking requests from the web app's server. Use the Android app — it connects to Koofr directly." };
+          if (!onAndroid) {
+            if (engineConfig.isHostedApp) {
+              return { success: false, error: "Koofr blocks requests from dayglance.app's servers. Use a self-hosted instance or the Android app to connect directly." };
+            }
+            return { success: false, error: "Access forbidden. If requests are going through a proxy, Koofr may be blocking that server's IP." };
+          }
           return { success: false, error: 'Access forbidden. Check that your app password is correct and has not been revoked.' };
         }
         return { success: false, error: `Unexpected response: ${res.status}${res.statusText ? ' ' + res.statusText : ''}` };