@cuboapp/api-backend 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",
@@ -14,8 +14,8 @@
     "@cuboapp/utils": "1.0.12"
   },
   "peerDependencies": {
-    "@cuboapp/crdt": "1.0.14",
-    "@cuboapp/ws": "1.0.9",
+    "@cuboapp/crdt": "1.0.16",
+    "@cuboapp/ws": "1.0.10",
     "mysql2": "3.22.5",
     "pg": "8.22.0",
     "yjs": "^13.6.31"
@@ -38,8 +38,8 @@
     }
   },
   "devDependencies": {
-    "@cuboapp/crdt": "1.0.14",
-    "@cuboapp/ws": "1.0.9",
+    "@cuboapp/crdt": "file:../crdt",
+    "@cuboapp/ws": "1.0.10",
     "@types/node": "^26.0.0",
     "pg": "^8.22.0",
     "typescript": "^6.0.3"

package/src/core/index.ts

@@ -391,7 +391,7 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
       await this.options.hooks.onAfterUpdate(entity, response, prev as T[K], opts)
     }
 
-    this.crdtPush('update', entity, response, opts)
+    this.crdtPush('update', entity, response, opts, prev, Object.keys(dto))
     if (augmentation?.afterCrdtUpdate && !this.excluded(opts, 'afterCrdtUpdate')) {
       await augmentation.afterCrdtUpdate({ ...this.ctx(entity, req, opts, queryOptions), row: response })
     }
@@ -529,7 +529,14 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
       if (this.options.hooks?.onAfterUpdate && !this.excluded(opts, 'baseHooks')) {
         await this.options.hooks.onAfterUpdate(entity, row, prevById.get((row as any).id) as T[K], opts)
       }
-      this.crdtPush('update', entity, row, opts)
+      this.crdtPush(
+        'update',
+        entity,
+        row,
+        opts,
+        prevById.get((row as any).id),
+        Object.keys(dto)
+      )
     }
 
     return updated
@@ -676,12 +683,19 @@ export class CuboBackendApi<T extends CuboApiEntitiesMap<T>, A extends unknown =
     if (raw.replacements) queryDto.replacements = { ...(queryDto.replacements || {}), ...raw.replacements }
   }
 
-  private crdtPush(action: 'create' | 'update' | 'delete', entity: CuboEntity, row: any, opts: CuboCrudMethodOptions) {
+  private crdtPush(
+    action: 'create' | 'update' | 'delete',
+    entity: CuboEntity,
+    row: any,
+    opts: CuboCrudMethodOptions,
+    previousRow?: any,
+    changedKeys?: string[]
+  ) {
     // если апдейт пришёл ИЗ crdt (storeRow) — не пушим повторно, чтобы не зациклиться
     if (!this.crdt || !entity.crdt || opts.crdt) return
 
     if (action === 'create') this.crdt.pushCreate(entity, row)
-    else if (action === 'update') this.crdt.pushUpdate(entity, row)
+    else if (action === 'update') this.crdt.pushUpdate(entity, row, previousRow, changedKeys)
     else this.crdt.pushDelete(entity, row)
   }
 

package/src/crdt/index.ts

@@ -41,22 +41,34 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
 
       // подписка -> строки из БД (хуки CRUD пропускаем, чтобы не зациклить)
       fetchRows: async (client, subscribe: CuboCrdtServerSubscribe) => {
-        const { rows } = await this.api.getMany(subscribe.entity as Extract<keyof T, string>, { query: subscribe.filters }, {
+        const { rows, totals } = await this.api.getMany(subscribe.entity as Extract<keyof T, string>, { query: subscribe.filters }, {
           auth: (client as CuboCrdtSocketClient<A>).auth,
           excludeHooks: ['afterCrdtCreate', 'afterCrdtUpdate']
         })
 
-        return rows as T[Extract<keyof T, string>][]
+        return {
+          rows: rows as T[Extract<keyof T, string>][],
+          totals
+        }
       },
 
       // сохранение состояния дока обратно в БД (origin прокидываем, чтобы не пушить заново)
-      storeRow: async (entity, entity_id, body, { origin, client }) => {
-        await this.api.updateOne(entity as Extract<keyof T, string>, { query: { id: entity_id }, body }, {
+      storeRow: async (entity, entity_id, body, { previousRow, origin, client }) => {
+        const row = await this.api.updateOne(entity as Extract<keyof T, string>, { query: { id: entity_id }, body }, {
           crdt: origin,
           performer_id: (client as any)?.auth?.user_id,
           auth: (client as any)?.auth,
           excludeHooks: ['afterCrdtUpdate']
         })
+
+        if (row) {
+          this.server.notifyMutation(entity, {
+            action: 'update',
+            row,
+            previousRow: previousRow as T[Extract<keyof T, string>],
+            changedKeys: origin.keys
+          })
+        }
       },
 
       // фильтрация строки под конкретную подписку
@@ -95,16 +107,27 @@ export class CuboCrdtAdapter<T extends CuboApiEntitiesMap<T>, A> {
   // пуш изменений документов из CRUD-методов ядра
   public pushCreate(entity: CuboEntity, row: any) {
     if (!entity.crdt) return
-    this.server.ensureDocument(entity.alias as Extract<keyof T, string>, row)
+    const alias = entity.alias as Extract<keyof T, string>
+    this.server.ensureDocument(alias, row)
+    this.server.notifyMutation(alias, { action: 'create', row })
   }
 
-  public pushUpdate(entity: CuboEntity, row: any) {
+  public pushUpdate(entity: CuboEntity, row: any, previousRow?: any, changedKeys?: string[]) {
     if (!entity.crdt) return
-    this.server.ensureDocument(entity.alias as Extract<keyof T, string>, row)
+    const alias = entity.alias as Extract<keyof T, string>
+    this.server.ensureDocument(alias, row)
+    this.server.notifyMutation(alias, {
+      action: 'update',
+      row,
+      previousRow,
+      changedKeys
+    })
   }
 
   public pushDelete(entity: CuboEntity, row: any, origin?: CuboCrdtServerDocumentOrigin) {
     if (!entity.crdt) return
-    this.server.deleteDocument(entity.alias as Extract<keyof T, string>, row, origin)
+    const alias = entity.alias as Extract<keyof T, string>
+    this.server.deleteDocument(alias, row, origin)
+    this.server.notifyMutation(alias, { action: 'delete', row })
   }
 }