@jcbuisson/express-x-client 3.1.10 → 3.1.12

package/CLAUDE.md

@@ -35,7 +35,7 @@ Enriches `app` with offline-first IndexedDB CRUD via Dexie. Call `app.createOffl
 This plugin also adds three dynamic attributes to `app`:
 - `app.isConnected` — boolean, updated on socket connect/disconnect
 - `app.connectedDate` — `Date` of the last connection, or `null`
-- `app.disconnectedDate` — `Date` of the last disconnection, or `null` (used as `cutoffDate` for sync)
+- `app.disconnectedDate` — `Date` of the last disconnection, or `null`
 
 Each model maintains three Dexie stores under the same DB name:
 - `values` — the actual records (indexed on `uid`, `__deleted__`)
@@ -47,7 +47,7 @@ Each model maintains three Dexie stores under the same DB name:
 
 **Optimistic writes**: `create`, `update`, `remove` write to IndexedDB immediately, then call the server service method. On server error they roll back the local change.
 
-**Sync on reconnect**: When the socket reconnects, every registered model calls `synchronizeAll`, which iterates its `whereList` and calls the server's `sync.go(modelName, where, cutoffDate, clientMetadataDict)` service. The response contains five buckets (`addClient`, `updateClient`, `deleteClient`, `addDatabase`, `updateDatabase`) that are applied in order.
+**Sync on reconnect**: When the socket reconnects, every registered model calls `synchronizeAll`, which iterates its `whereList` and calls the server's `sync.go(modelName, where, clientMetadataDict)` service. The response contains five buckets (`addClient`, `updateClient`, `deleteClient`, `addDatabase`, `updateDatabase`) that are applied in order.
 
 **Real-time observables**: `getObservable(where)` returns an RxJS `Observable` backed by Dexie's `liveQuery`. It also registers the `where` in `whereList` and triggers a sync if it is a new, unregistered filter. Vue component lifecycle cleanup is handled by `tryOnScopeDispose`.
 

package/package.json

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

package/src/client.mts

@@ -26,7 +26,11 @@ export function createClient(socket, options={}) {
    socket.on("connect", async () => {
       if (options.debug) console.log("socket connected", socket.id)
       for (const func of connectListeners) {
-         func(socket)
+         try {
+            await func(socket)
+         } catch(err) {
+            console.error('connect listener error', err)
+         }
       }
    })
 
@@ -180,6 +184,8 @@ export function offlinePlugin(app) {
 
       const dbName = modelName;
       const db = getOrCreateDB(dbName, fields);
+      const synchronizedWhereKeys = new Set();
+      const synchronizeWherePromises = new Map();
 
       const reset = async () => {
          console.log('reset', modelName);
@@ -318,8 +324,9 @@ export function offlinePlugin(app) {
          //   behavior as before.
          return defer(() => {
             const ready = addSynchroWhere(where).then((isNew: boolean) => {
-               if (isNew && app.isConnected) {
-                  return synchronize(modelName, db.values, db.metadata, where, app.disconnectedDate)
+               const whereKey = stringifyWithSortedKeys(where)
+               if (app.isConnected && (isNew || !synchronizedWhereKeys.has(whereKey))) {
+                  return synchronizeWhere(where)
                }
             })
             return from(ready).pipe(switchMap(() => liveQuery$))
@@ -337,11 +344,27 @@ export function offlinePlugin(app) {
       function removeSynchroWhere(where: object) {
          console.log('removeSynchroWhere', dbName, modelName, where)
          count -= 1
+         synchronizedWhereKeys.delete(stringifyWithSortedKeys(where))
          return removeSynchroDBWhere(where, db.whereList)
       }
 
       async function synchronizeAll() {
-         await synchronizeModelWhereList(modelName, db.values, db.metadata, app.disconnectedDate, db.whereList)
+         await synchronizeModelWhereList(modelName, db.values, db.metadata, db.whereList, synchronizeWhere)
+      }
+
+      async function synchronizeWhere(where) {
+         const whereKey = stringifyWithSortedKeys(where)
+         if (!synchronizeWherePromises.has(whereKey)) {
+            const promise = synchronize(modelName, db.values, db.metadata, where)
+               .then(() => {
+                  synchronizedWhereKeys.add(whereKey)
+               })
+               .finally(() => {
+                  synchronizeWherePromises.delete(whereKey)
+               })
+            synchronizeWherePromises.set(whereKey, promise)
+         }
+         return synchronizeWherePromises.get(whereKey)
       }
 
       // Automatically clean up when the component using this composable unmounts
@@ -365,12 +388,22 @@ export function offlinePlugin(app) {
       }
    }
 
+   let hasConnected = false
+
    app.addConnectListener(async (_socket) => {
       app.connectedDate = new Date()
       console.log('onConnect', app.connectedDate)
       app.isConnected = true
-      if (app.disconnectedDate) {
-         modelSyncFunctions.forEach(sync => sync())
+      const disconnectedDate = app.disconnectedDate
+      const isInitialConnect = !hasConnected
+      hasConnected = true
+      if (disconnectedDate || isInitialConnect) {
+         const results = await Promise.allSettled(modelSyncFunctions.map(sync => sync()))
+         const failures = results.filter(result => result.status === 'rejected')
+         if (failures.length > 0) {
+            console.error('err reconnect synchronizeAll', failures.map(result => result.reason))
+            return
+         }
       }
       app.disconnectedDate = null
    })
@@ -386,7 +419,7 @@ export function offlinePlugin(app) {
    const mutex = new Mutex()
 
    // ex: where = { uid: 'azer' }
-   async function synchronize(modelName, idbValues, idbMetadata, where, cutoffDate) {
+   async function synchronize(modelName, idbValues, idbMetadata, where) {
       await mutex.acquire()
       console.log('synchronize', modelName, where)
 
@@ -409,7 +442,7 @@ export function offlinePlugin(app) {
 
          // call sync service on `where` perimeter
          const { addClient, updateClient, deleteClient, addDatabase, updateDatabase } =
-            await app.service('sync').go(modelName, where, cutoffDate, clientMetadataDict)
+            await app.service('sync').go(modelName, where, clientMetadataDict)
          console.log('-> service.sync', modelName, where, addClient, updateClient, deleteClient, addDatabase, updateDatabase)
 
          // 1- add missing elements in indexedDB cache
@@ -483,6 +516,7 @@ export function offlinePlugin(app) {
          }
       } catch(err) {
          console.log('err synchronize', modelName, where, err)
+         throw err
       } finally {
          mutex.release()
       }
@@ -539,10 +573,11 @@ export function offlinePlugin(app) {
       }
    }
 
-   async function synchronizeModelWhereList(modelName, idbValues, idbMetadata, cutoffDate, whereDb) {
+   async function synchronizeModelWhereList(modelName, idbValues, idbMetadata, whereDb, syncWhere = null) {
       const whereList = await getWhereList(whereDb)
       for (const where of whereList) {
-         await synchronize(modelName, idbValues, idbMetadata, where, cutoffDate)
+         if (syncWhere) await syncWhere(where)
+         else await synchronize(modelName, idbValues, idbMetadata, where)
       }
    }