@jcbuisson/express-x-client 3.1.19 → 3.1.23

package/package.json

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

package/src/client.mts

@@ -293,7 +293,12 @@ export function offlinePlugin(app) {
       async function applyDeleteAcknowledgement(uid, requestDeletedAt, result) {
          const currentMetadata = await db.metadata.get(uid)
          if (!currentMetadata || !sameTimestamp(currentMetadata.deleted_at, requestDeletedAt)) return
-         const [, meta] = Array.isArray(result) ? result : []
+         const [value, meta] = Array.isArray(result) ? result : []
+         if (value?.uid && !meta?.deleted_at) {
+            const restoredValue = { ...value }
+            delete restoredValue.__deleted__
+            await db.values.put(restoredValue)
+         }
          if (meta?.uid)
             await db.metadata.put({ ...meta, __dirty__: false })
          else
@@ -525,6 +530,8 @@ export function offlinePlugin(app) {
                   // uid to Dexie between the idbValues.filter snapshot and this step,
                   // add() would throw ConstraintError and abort the entire transaction,
                   // silently dropping every other addClient record in the batch.
+                  const currentMetadata = await idbMetadata.get(value.uid)
+                  if (currentMetadata && compareMetadataTime(metaData, currentMetadata) <= 0) continue
                   await idbValues.put(value)
                   await idbMetadata.put({ ...metaData, __dirty__: false })
                }
@@ -558,6 +565,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
@@ -565,10 +574,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)
@@ -578,6 +591,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
@@ -585,6 +600,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) {