@jcbuisson/express-x-client 3.0.1 → 3.0.3

package/package.json

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

package/src/client.mts

@@ -8,20 +8,6 @@ import { tryOnScopeDispose } from '@vueuse/core';
 import { useSessionStorage } from '@vueuse/core'
 
 
-//////////////////////////       UTILITIES       //////////////////////////
-
-function generateUID(length) {
-   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-   let uid = ''
-
-   for (let i = 0; i < length; i++) {
-     const randomIndex = Math.floor(Math.random() * characters.length)
-     uid += characters.charAt(randomIndex)
-   }
-   return uid
-}
-
-
 //////////////////////////       EXPRESSX       //////////////////////////
 
 export function createClient(socket, options={}) {
@@ -150,8 +136,6 @@ export function createClient(socket, options={}) {
       return new Proxy(service, handler)
    }
 
-   //--------------------         APPLICATION-LEVEL EVENTS         --------------------
-
    // There is a need for application-wide events sent outside any service method call, for example when backend state changes
    // without front-end interactions
    socket.on('app-event', ({ type, value }) => {
@@ -166,6 +150,16 @@ export function createClient(socket, options={}) {
       type2appHandler[type] = handler
    }
 
+   function connect() {
+      if (options.debug) console.log('connecting...')
+      socket.connect()
+   }
+
+   function disconnect() {
+      if (options.debug) console.log('disconnecting...')
+      socket.disconnect()
+   }
+
    const app = {
       configure,
       addConnectListener,
@@ -177,6 +171,7 @@ export function createClient(socket, options={}) {
    
       service,
       on,
+      connect, disconnect,
    }
 
    return app
@@ -370,9 +365,9 @@ export function offlinePlugin(app) {
          return removeSynchroDBWhere(where, db.whereList)
       }
 
-      // async function synchronizeAll() {
-      //    await synchronizeModelWhereList(app, modelName, db.values, db.metadata, app.getDisconnectedDate(), db.whereList)
-      // }
+      async function synchronizeAll() {
+         await synchronizeModelWhereList(modelName, db.values, db.metadata, app.disconnectedDate, db.whereList)
+      }
 
       // Automatically clean up when the component using this composable unmounts
       tryOnScopeDispose(async () => {
@@ -388,7 +383,7 @@ export function offlinePlugin(app) {
          create, update, remove,
          findByUID, findWhere,
          getObservable,
-         // synchronizeAll,
+         synchronizeAll,
          addSynchroWhere,
       }
    }
@@ -411,7 +406,7 @@ export function offlinePlugin(app) {
    const mutex = new Mutex()
 
    // ex: where = { uid: 'azer' }
-   async function synchronize(app, modelName, idbValues, idbMetadata, where, cutoffDate) {
+   async function synchronize(modelName, idbValues, idbMetadata, where, cutoffDate) {
       await mutex.acquire()
       console.log('synchronize', modelName, where)
 
@@ -566,12 +561,12 @@ export function offlinePlugin(app) {
       }
    }
 
-   // async function synchronizeModelWhereList(modelName, idbValues, idbMetadata, cutoffDate, whereDb) {
-   //    const whereList = await getWhereList(whereDb)
-   //    for (const where of whereList) {
-   //       await synchronize(modelName, idbValues, idbMetadata, where, cutoffDate)
-   //    }
-   // }
+   async function synchronizeModelWhereList(modelName, idbValues, idbMetadata, cutoffDate, whereDb) {
+      const whereList = await getWhereList(whereDb)
+      for (const where of whereList) {
+         await synchronize(modelName, idbValues, idbMetadata, where, cutoffDate)
+      }
+   }
 
    // Singleton map to reuse Dexie instances per database name
    const dbInstances = new Map();
@@ -596,6 +591,20 @@ export function offlinePlugin(app) {
 }
 
 
+//////////////////////////       UTILITIES       //////////////////////////
+
+function generateUID(length) {
+   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+   let uid = ''
+
+   for (let i = 0; i < length; i++) {
+     const randomIndex = Math.floor(Math.random() * characters.length)
+     uid += characters.charAt(randomIndex)
+   }
+   return uid
+}
+
+
 function stringifyWithSortedKeys(obj, space = null) {
    return JSON.stringify(obj, (key, value) => {
       // If the value is a plain object (not an array, null, or other object type like Date)