@jcbuisson/express-x-client 3.1.17 → 3.1.19

package/package.json

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

package/src/client.mts

@@ -251,6 +251,8 @@ export function offlinePlugin(app) {
             .then(result => applyCreateAcknowledgement(uid, now, result))
             .catch(async err => {
                console.log(`*** err sync ${modelName} create`, err)
+               const currentMetadata = await db.metadata.get(uid)
+               if (!isCreateRequestStillCurrent(currentMetadata, now)) return
                // rollback
                await db.values.delete(uid)
                await db.metadata.delete(uid)
@@ -261,7 +263,7 @@ export function offlinePlugin(app) {
 
       async function applyCreateAcknowledgement(uid, requestCreatedAt, result) {
          const currentMetadata = await db.metadata.get(uid)
-         if (!currentMetadata || !sameTimestamp(currentMetadata.created_at, requestCreatedAt)) return
+         if (!isCreateRequestStillCurrent(currentMetadata, requestCreatedAt)) return
          const [value, meta] = Array.isArray(result) ? result : []
          if (value?.uid) await db.values.put(value)
          if (meta?.uid)
@@ -270,6 +272,13 @@ export function offlinePlugin(app) {
             await db.metadata.update(uid, { __dirty__: false })
       }
 
+      function isCreateRequestStillCurrent(currentMetadata, requestCreatedAt) {
+         return currentMetadata
+            && sameTimestamp(currentMetadata.created_at, requestCreatedAt)
+            && !currentMetadata.updated_at
+            && !currentMetadata.deleted_at
+      }
+
       async function applyUpdateAcknowledgement(uid, requestUpdatedAt, result) {
          const currentMetadata = await db.metadata.get(uid)
          if (!currentMetadata || !sameTimestamp(currentMetadata.updated_at, requestUpdatedAt)) return
@@ -525,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)
                }
@@ -532,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)
@@ -587,6 +600,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();