@jcbuisson/express-x-client 3.1.20 → 3.1.26

package/package.json

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

package/src/client.mts

@@ -265,6 +265,11 @@ export function offlinePlugin(app) {
          const currentMetadata = await db.metadata.get(uid)
          if (!isCreateRequestStillCurrent(currentMetadata, requestCreatedAt)) return
          const [value, meta] = Array.isArray(result) ? result : []
+         if (!value?.uid && meta?.deleted_at) {
+            await db.values.delete(uid)
+            await db.metadata.delete(uid)
+            return
+         }
          if (value?.uid) await db.values.put(value)
          if (meta?.uid)
             await db.metadata.put({ ...meta, __dirty__: false })
@@ -293,7 +298,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 +535,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 })
                }
@@ -569,6 +581,11 @@ export function offlinePlugin(app) {
                const serverMeta = Array.isArray(result) ? result[1] : null
                currentMetadata = await idbMetadata.get(elt.uid)
                if (!metadataUnchangedSinceRequest(currentMetadata, elt)) continue
+               if (Array.isArray(result) && !result[0]?.uid && serverMeta?.deleted_at) {
+                  await idbValues.delete(elt.uid)
+                  await idbMetadata.delete(elt.uid)
+                  continue
+               }
                if (serverMeta?.uid) await idbMetadata.put({ ...serverMeta, __dirty__: false })
                else await idbMetadata.update(elt.uid, { __dirty__: false })
             } catch(err) {