@jcbuisson/express-x-client 3.1.18 → 3.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-client",
-  "version": "3.1.18",
+  "version": "3.1.20",
   "type": "module",
   "description": "Client library for ExpressX framework",
   "main": "src/client.mts",

package/src/client.mts

@@ -534,6 +534,8 @@ export function offlinePlugin(app) {
          if (deleteClient.length > 0) {
             await idbValues.db.transaction('rw', [idbValues, idbMetadata], async () => {
                for (const [uid] of deleteClient) {
+                  const currentMetadata = await idbMetadata.get(uid)
+                  if (!metadataUnchangedSinceRequest(currentMetadata, clientMetadataDict[uid])) continue
                   await idbValues.delete(uid)
                   await idbMetadata.delete(uid)
                }
@@ -541,6 +543,8 @@ export function offlinePlugin(app) {
          }
          // 3- update elements of cache with server's newer version
          for (const [elt, serverMeta] of updateClient) {
+            const currentMetadata = await idbMetadata.get(elt.uid)
+            if (!metadataUnchangedSinceRequest(currentMetadata, clientMetadataDict[elt.uid])) continue
             const value = { ...elt }
             delete value.__deleted__
             await idbValues.put(value)
@@ -554,6 +558,8 @@ export function offlinePlugin(app) {
             // get() call: idbValues.get(undefined) itself throws before fullValue is
             // assigned, so checking fullValue == null afterwards is too late.
             if (elt.uid == null) continue
+            let currentMetadata = await idbMetadata.get(elt.uid)
+            if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
             const fullValue = await idbValues.get(elt.uid)
             if (fullValue == null) continue  // record deleted concurrently
             delete fullValue.uid
@@ -561,10 +567,14 @@ export function offlinePlugin(app) {
             try {
                const result = await app.service(modelName).createWithMeta(elt.uid, fullValue, elt.created_at)
                const serverMeta = Array.isArray(result) ? result[1] : null
+               currentMetadata = await idbMetadata.get(elt.uid)
+               if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
                if (serverMeta?.uid) await idbMetadata.put({ ...serverMeta, __dirty__: false })
                else await idbMetadata.update(elt.uid, { __dirty__: false })
             } catch(err) {
                console.log("*** err sync user addDatabase", err, elt.uid, fullValue, elt.created_at)
+               currentMetadata = await idbMetadata.get(elt.uid)
+               if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
                // rollback
                await idbValues.delete(elt.uid)
                await idbMetadata.delete(elt.uid)
@@ -574,6 +584,8 @@ export function offlinePlugin(app) {
          // 5- update elements of `updateDatabase` with full data from cache
          for (const elt of updateDatabase) {
             if (elt.uid == null) continue
+            let currentMetadata = await idbMetadata.get(elt.uid)
+            if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
             const fullValue = await idbValues.get(elt.uid)
             if (fullValue == null) continue  // record deleted concurrently
             delete fullValue.uid
@@ -581,6 +593,8 @@ export function offlinePlugin(app) {
             try {
                const result = await app.service(modelName).updateWithMeta(elt.uid, fullValue, elt.updated_at)
                const serverMeta = Array.isArray(result) ? result[1] : null
+               currentMetadata = await idbMetadata.get(elt.uid)
+               if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
                if (serverMeta?.uid) await idbMetadata.put({ ...serverMeta, __dirty__: false })
                else await idbMetadata.update(elt.uid, { __dirty__: false })
             } catch(err) {
@@ -596,6 +610,14 @@ export function offlinePlugin(app) {
       }
    }
 
+   function metadataUnchangedSinceRequest(currentMetadata, requestMetadata) {
+      return currentMetadata
+         && requestMetadata
+         && sameTimestamp(currentMetadata.created_at, requestMetadata.created_at)
+         && sameTimestamp(currentMetadata.updated_at, requestMetadata.updated_at)
+         && sameTimestamp(currentMetadata.deleted_at, requestMetadata.deleted_at)
+   }
+
    // Singleton map to reuse Dexie instances per database name
    const dbInstances = new Map();