@cuboapp/crdt 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/crdt",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "CRDT for CUBO",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/crdt.git",

package/src/client/index.ts

@@ -4,7 +4,7 @@ import { applyUpdate, Doc } from 'yjs'
 
 import { CUBO_CRDT_EVENT } from '../constants'
 import { CuboCrdtServerDocumentIncomingAction } from '../server'
-import { CuboCrdtAction, CuboCrdtKey } from '../types'
+import { CuboCrdtKey } from '../types'
 
 import {
   CuboCrdtClientDocOrigin,
@@ -67,6 +67,12 @@ export class CuboCrdtClient<M> {
     return computed(() => (this.store[entity]?.state.rows || []) as M[K][])
   }
 
+  public useComputedRow<K extends Extract<keyof M, string>>(entity: K, entity_id: number) {
+    return computed(() => {
+      return ((this.store[entity]?.state.rows || []) as M[K][]).find((row: any) => row.id === entity_id)
+    })
+  }
+
   public useList<K extends Extract<keyof M, string>, T = CuboCrdtKey<K, M>>(
     entity: K | string,
     opts?: CuboCrdtClientUseOptions
@@ -105,14 +111,14 @@ export class CuboCrdtClient<M> {
       }
 
       // подписываемся на фронте
-      this.listeners.get(entity)?.set(subscribe_id, (ctx) =>
+      this.listeners.get(entity)?.set(subscribe_id, (ctx) => {
         this.onIncomingUpdate(ctx, {
           subscribe_id,
           storeKey,
           ...(pick(opts || {}, ['onBeforeCreate', 'onBeforeUpdate', 'onBeforeDelete', 'onAfterCreate', 'onAfterUpdate', 'onAfterDelete']) ||
             {})
         })
-      )
+      })
 
       // подписываемся на бэке
       this.ws.request({ method: CUBO_CRDT_EVENT.SUBSCRIBE, data: { subscribe_id, entity, filters } })
@@ -136,6 +142,12 @@ export class CuboCrdtClient<M> {
       }
     }
 
+    // апгрейд
+    const upgrade = (filters?: Record<string, any>) => {
+      // подписываемся на бэке
+      this.upgrade(subscribe_id, filters)
+    }
+
     // авто-подписка
     if (opts?.autoSubscribe !== false) {
       subscribe()
@@ -145,6 +157,7 @@ export class CuboCrdtClient<M> {
       subscribe_id,
       storeKey,
       subscribe,
+      upgrade,
       unsubscribe,
       docs: computed(() => this.store[storeKey]?.docs),
       subscribed: () => computed(() => this.store[storeKey]?.state.subscribed || false),
@@ -160,7 +173,7 @@ export class CuboCrdtClient<M> {
   ): CuboCrdtClientRow<T> {
     // console.log('store key', opts?.storeKey ?? `${entity}:${id}`)
 
-    const { subscribe_id, storeKey, docs, subscribe, unsubscribe, subscribed } = this.useList(entity, {
+    const { subscribe_id, storeKey, docs, subscribe, upgrade, unsubscribe, subscribed } = this.useList(entity, {
       ...opts,
       filters: opts?.filters ?? { id },
       storeKey: opts?.storeKey ?? `${entity}:${id}`
@@ -171,6 +184,7 @@ export class CuboCrdtClient<M> {
       storeKey,
       doc: computed(() => docs.value?.get(id)),
       subscribe,
+      upgrade,
       unsubscribe,
       subscribed,
       row: () => {
@@ -231,7 +245,21 @@ export class CuboCrdtClient<M> {
     }
   }
 
-  private async onDocumentCreate(update: Uint8Array, ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+  public upgrade(subscribe_id: string, filters?: Record<string, any>) {
+    this.ws.request({ method: CUBO_CRDT_EVENT.UPGRADE, data: { subscribe_id, filters } })
+  }
+
+  private async onDocumentCreate(ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+    let doc = this.store[opts.storeKey]?.docs.get(ctx.entity_id)
+    if (doc) {
+      console.warn('[CRDT] onDocumentCreate: doc already exists', { ctx, opts })
+      return
+    } else {
+      doc = new Doc()
+    }
+
+    const update = new Uint8Array(ctx.data as any)
+
     if (opts?.onBeforeCreate) {
       const result = await opts.onBeforeCreate(update, ctx, opts)
       if (!result) {
@@ -239,7 +267,6 @@ export class CuboCrdtClient<M> {
       }
     }
 
-    const doc = new Doc()
     applyUpdate(doc, update, { react: false })
 
     // подписываемся на обновления документа
@@ -285,7 +312,15 @@ export class CuboCrdtClient<M> {
     }
   }
 
-  private async onDocumentUpdate(doc: Doc, update: Uint8Array, ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+  private async onDocumentUpdate(ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+    const doc = this.store[opts.storeKey]?.docs.get(ctx.entity_id)
+    if (!doc) {
+      console.warn('[CRDT] onDocumentUpdate: doc not exists', { ctx, opts })
+      return
+    }
+
+    const update = new Uint8Array(ctx.data as any)
+
     if (opts?.onBeforeUpdate) {
       const result = await opts.onBeforeUpdate(doc, update, ctx, opts)
       if (!result) {
@@ -314,7 +349,13 @@ export class CuboCrdtClient<M> {
     }
   }
 
-  private async onDocumentDelete(doc: Doc, ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+  private async onDocumentDelete(ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
+    const doc = this.store[opts.storeKey]?.docs.get(ctx.entity_id)
+    if (!doc) {
+      console.warn('[CRDT] onDocumentDelete: doc not exists', { ctx, opts })
+      return
+    }
+
     if (opts?.onBeforeDelete) {
       const result = await opts.onBeforeDelete(doc, ctx, opts)
       if (!result) {
@@ -331,7 +372,9 @@ export class CuboCrdtClient<M> {
     if (index !== undefined && index >= 0) {
       this.store[opts.storeKey]?.state.rows.splice(index, 1)
     } else {
-      console.log('row not found', index, ctx, opts)
+      if (this.debug) {
+        console.log('[CRDT] row not found', index, ctx, opts)
+      }
     }
 
     if (opts?.onAfterDelete) {
@@ -348,28 +391,16 @@ export class CuboCrdtClient<M> {
       console.warn('[CRDT] on incoming update, store key not found: "' + opts.storeKey + '"')
     }
 
-    const doc = this.store[opts.storeKey]?.docs.get(ctx.entity_id)
-    const action: CuboCrdtAction = !doc ? 'create' : ctx.action === 'delete' ? 'delete' : 'update'
-
-    // console.log('action', action)
-
-    switch (action) {
+    switch (ctx.action) {
       case 'create':
-        {
-          const update = new Uint8Array(ctx.data as any)
-          this.onDocumentCreate(update, ctx, opts)
-        }
+        this.onDocumentCreate(ctx, opts)
         break
       case 'update':
-        if (doc) {
-          const update = new Uint8Array(ctx.data as any)
-          this.onDocumentUpdate(doc, update, ctx, opts)
-        }
+      case 'upsert':
+        this.onDocumentUpdate(ctx, opts)
         break
       case 'delete':
-        if (doc) {
-          this.onDocumentDelete(doc, ctx, opts)
-        }
+        this.onDocumentDelete(ctx, opts)
         break
     }
   }

package/src/client/types/index.ts

@@ -1,6 +1,6 @@
-import { WsClient } from '@cuboapp/ws'
+import { type WsClient } from '@cuboapp/ws'
 import { ComputedRef } from 'vue'
-import { Doc } from 'yjs'
+import { type Doc } from 'yjs'
 
 import { CuboCrdtAction } from '../../types'
 
@@ -34,6 +34,7 @@ export type CuboCrdtClientList<T> = {
   storeKey: string
   docs: ComputedRef<Map<number, Doc> | undefined>
   subscribe: (filters?: any) => void
+  upgrade: (filters?: any) => void
   unsubscribe: (clear?: boolean) => void
   subscribed: () => ComputedRef<boolean>
   rows: () => ComputedRef<T[]>
@@ -45,6 +46,7 @@ export type CuboCrdtClientRow<T> = {
   storeKey: string
   doc: ComputedRef<Doc | undefined>
   subscribe: () => void
+  upgrade: (filters?: any) => void
   unsubscribe: (clear?: boolean) => void
   subscribed: () => ComputedRef<boolean>
   row: () => ComputedRef<T>

package/src/constants/index.ts

@@ -1,5 +1,6 @@
 export const CUBO_CRDT_EVENT = {
   EVENT: 'crdt:event',
   SUBSCRIBE: 'crdt:subscribe',
+  UPGRADE: 'crdt:upgrade',
   UNSUBSCRIBE: 'crdt:unsubscribe'
 }

package/src/server/document/index.ts

@@ -1,14 +1,12 @@
 import { debounce, pick } from '@cuboapp/utils'
 import { applyUpdate, Doc, encodeStateAsUpdate } from 'yjs'
 
-import { CuboCrdtExposeStrategy } from '../../types'
-
 import { CuboCrdtServerDocumentOptions, CuboCrdtServerDocumentOrigin } from '../types'
 
 export class CuboCrdtServerDocument {
   private ydoc: Doc
 
-  private firstUpdate = true
+  // private firstUpdate = false
 
   constructor(public opts: CuboCrdtServerDocumentOptions) {
     this.ydoc = new Doc({
@@ -16,14 +14,20 @@ export class CuboCrdtServerDocument {
       autoLoad: false
     })
 
-    this.ydoc.on('update', (data, origin: CuboCrdtServerDocumentOrigin) => {
-      if (this.firstUpdate) {
-        this.firstUpdate = true
-        this.opts?.onCreate?.(data, origin)
-      } else {
-        this.opts?.onUpdate?.(data, origin)
-      }
+    // записываем исходное состояние
+    this.write(opts.initialState ?? {})
 
+    // подписываемся на апдейты
+    this.ydoc.on('update', (data, origin: CuboCrdtServerDocumentOrigin) => {
+      // if (!this.firstUpdate) {
+      //   console.log('first update', this.name)
+      //   this.firstUpdate = true
+      //   // this.opts?.onCreate?.(data, origin)
+      // } else {
+      this.opts?.onUpdate?.(data, origin)
+      // }
+
+      // если нужно сохранять стейт документа - вызываем store по дебаунсу
       if (origin?.store) {
         const row = this.getJson()
         const body = pick(row, origin.keys ?? Object.keys(row))
@@ -73,17 +77,6 @@ export class CuboCrdtServerDocument {
     this.ydoc.destroy()
   }
 
-  private _inited = false
-  public init(state?: object, expose: CuboCrdtExposeStrategy = 'all') {
-    if (this._inited) {
-      return
-    }
-
-    this._inited = true
-
-    this.write(state ?? {}, { expose })
-  }
-
   public store(body: object, origin: CuboCrdtServerDocumentOrigin) {
     this.opts?.onStore?.(body, origin)
   }