@jcbuisson/express-x-drizzle 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-drizzle",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "main": "src/drizzle-plugins.mjs",
   "type": "module",

package/src/drizzle-plugins.mjs

@@ -1,4 +1,11 @@
+import express from "express"
+import { createServer } from "http"
+import { Server } from "socket.io"
+import bcrypt from 'bcryptjs'
+
 import { and, eq, getTableName } from "drizzle-orm";
+
+import { metadata } from '#root/src/db/schema.js';
 import { Mutex, truncateString } from '@jcbuisson/express-x'
 
 
@@ -11,9 +18,8 @@ function whereToDrizzleFilters(table, filters) {
    return conditions.length ? and(...conditions) : undefined;
 }
 
-//////////////////////////       DRIZZLE OFFLINE PLUGIN       //////////////////////////
 
-const mutex = new Mutex()
+//////////////////////////       DRIZZLE OFFLINE PLUGIN       //////////////////////////
 
 export function drizzleOfflinePlugin(app, db, metadata, models) {
 
@@ -42,7 +48,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
          
          updateWithMeta: async (uid, data, updated_at) => {
             db.transaction(async (tx) => {
-               const value = await tx.update(model).values(data).where(eq(model.uid, uid)).returning();
+               const value = await tx.update(model).set(data).where(eq(model.uid, uid)).returning();
                const meta = await tx.update(metadata).set({ updated_at }).where(eq(metadata.uid, uid)).returning();
                return [value, meta]
             })
@@ -58,12 +64,14 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
       })
    }
 
+   const syncMutex = new Mutex()
+
    // add a synchronization service
    app.createService('sync', {
 
       // AMÉLIORER : ne pas avoir une exclusion mutuelle globale, mais seulement par model/where
       go: async (modelName, where, cutoffDate, clientMetadataDict) => {
-         await mutex.acquire()
+         await syncMutex.acquire()
          try {
             console.log('>>>>> SYNC', modelName, where, cutoffDate)
             const databaseService = app.service(modelName)
@@ -166,7 +174,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
             }
          
             // STEP5: return to client the changes to perform on its cache, and create/update to perform on database with full data
-            // database creations & updates are done later by the client with complete data (this function only has client values's meta-data)
+            // Database creations & updates are done later by the client with complete data (this function only has client values's meta-data)
             return {
                toAdd: addClient,
                toUpdate: updateClient,
@@ -178,7 +186,7 @@ export function drizzleOfflinePlugin(app, db, metadata, models) {
          } catch(err) {
             console.log('*** err sync', err)
          } finally {
-            mutex.release()
+            syncMutex.release()
          }
       },
    })