@cuboapp/crdt 1.0.20 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/crdt",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "CRDT for CUBO",
   "main": "src/index.ts",
   "repository": {

package/src/client/index.ts

@@ -1,6 +1,6 @@
 import { keyBy, pick, uuid } from '@cuboapp/utils'
 import { WsClientEvent } from '@cuboapp/ws'
-import { computed, reactive } from 'vue'
+import { computed, reactive, shallowReactive } from 'vue'
 import { applyAwarenessUpdate, Awareness, encodeAwarenessUpdate, removeAwarenessStates } from 'y-protocols/awareness'
 import { applyUpdate, Doc } from 'yjs'
 
@@ -234,8 +234,8 @@ export class CuboCrdtClient<M> {
 
       this.store[storeKey] = {
         state,
-        docs: new Map(),
-        awarenesses: new Map()
+        docs: shallowReactive(new Map()),
+        awarenesses: shallowReactive(new Map())
       }
     }
 
@@ -551,6 +551,47 @@ export class CuboCrdtClient<M> {
     }
   }
 
+  private ensureDocumentAwareness(
+    ctx: CuboCrdtClientSubscribeEvent,
+    opts: CuboCrdtClientDocUpdateOptions,
+    doc: Doc,
+    entity_id: number
+  ) {
+    if (!opts.awareness) {
+      return
+    }
+
+    let awareness = this.store[opts.storeKey]?.awarenesses.get(entity_id)
+
+    if (awareness) {
+      return
+    }
+
+    awareness = new Awareness(doc)
+
+    awareness.on('update', ({ added, updated, removed }, origin) => {
+      if (origin === 'remote') {
+        return
+      }
+
+      const changed = added.concat(updated).concat(removed)
+      const update = encodeAwarenessUpdate(awareness!, changed)
+
+      this.ws.request({
+        method: CUBO_CRDT_EVENT.EVENT,
+        data: {
+          action: 'awareness',
+          entity: ctx.entity,
+          entity_id,
+          data: Array.from(update),
+          origin: { expose: 'other', subscribe_id: opts.subscribe_id }
+        }
+      })
+    })
+
+    this.store[opts.storeKey]?.awarenesses.set(entity_id, awareness)
+  }
+
   private async onDocumentCreate(ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {
     const entity_id = ctx.entity_id
     if (entity_id === undefined) {
@@ -568,6 +609,7 @@ export class CuboCrdtClient<M> {
 
       applyUpdate(existing, new Uint8Array(ctx.data as any), { react: false })
       this.applyRowJson(opts.storeKey, entity_id, existing)
+      this.ensureDocumentAwareness(ctx, opts, existing, entity_id)
       return
     }
 
@@ -630,38 +672,7 @@ export class CuboCrdtClient<M> {
       await opts.onAfterCreate(doc, update, ctx, opts)
     }
 
-    if (opts?.awareness) {
-      let awareness = this.store[opts.storeKey]?.awarenesses.get(entity_id)
-
-      if (!awareness) {
-        awareness = new Awareness(doc)
-
-        awareness.on('update', ({ added, updated, removed }, origin) => {
-          // console.log('[CRDT] awarness update', origin)
-
-          if (origin === 'remote') {
-            return
-          }
-
-          const changed = added.concat(updated).concat(removed)
-          const update = encodeAwarenessUpdate(awareness, changed)
-
-          this.ws.request({
-            method: CUBO_CRDT_EVENT.EVENT,
-            data: {
-              action: 'awareness',
-              entity: ctx.entity,
-              entity_id,
-              data: Array.from(update),
-              // 'other' — не шлём свой же курсор обратно исходной подписке
-              origin: { expose: 'other', subscribe_id: opts.subscribe_id }
-            }
-          })
-        })
-
-        this.store[opts.storeKey]?.awarenesses.set(entity_id, awareness)
-      }
-    }
+    this.ensureDocumentAwareness(ctx, opts, doc, entity_id)
   }
 
   private async onDocumentUpdate(ctx: CuboCrdtClientSubscribeEvent, opts: CuboCrdtClientDocUpdateOptions) {

package/src/server/document/index.ts

@@ -19,28 +19,7 @@ export class CuboCrdtServerDocument {
     })
 
     if (opts.awareness) {
-      this.awareness = new Awareness(this.ydoc)
-      this.awareness.setLocalState(null)
-
-      this.awareness.on('update', ({ added, updated, removed }, origin: CuboCrdtServerDocumentOrigin) => {
-        const subId = origin?.subscribe_id
-
-        if (subId) {
-          let set = this.awarenessBySubscribe.get(subId)
-          if (!set) {
-            set = new Set()
-            this.awarenessBySubscribe.set(subId, set)
-          }
-
-          added.concat(updated).forEach((id) => set!.add(id))
-          removed.forEach((id) => set!.delete(id))
-        }
-
-        const changed = added.concat(updated).concat(removed)
-        const update = encodeAwarenessUpdate(this.awareness!, changed)
-
-        this.opts?.onAwarenessUpdate?.(update, origin)
-      })
+      this.enableAwareness()
     }
 
     this.persistedState = cloneDeep(opts.initialState ?? {})
@@ -72,6 +51,35 @@ export class CuboCrdtServerDocument {
     })
   }
 
+  public enableAwareness() {
+    if (this.awareness) {
+      return
+    }
+
+    this.awareness = new Awareness(this.ydoc)
+    this.awareness.setLocalState(null)
+
+    this.awareness.on('update', ({ added, updated, removed }, origin: CuboCrdtServerDocumentOrigin) => {
+      const subId = origin?.subscribe_id
+
+      if (subId) {
+        let set = this.awarenessBySubscribe.get(subId)
+        if (!set) {
+          set = new Set()
+          this.awarenessBySubscribe.set(subId, set)
+        }
+
+        added.concat(updated).forEach((id) => set!.add(id))
+        removed.forEach((id) => set!.delete(id))
+      }
+
+      const changed = added.concat(updated).concat(removed)
+      const update = encodeAwarenessUpdate(this.awareness!, changed)
+
+      this.opts?.onAwarenessUpdate?.(update, origin)
+    })
+  }
+
   public get name() {
     return this.opts.name
   }

package/src/server/index.ts

@@ -605,6 +605,10 @@ export class CuboCrdtServer<M, A = {}, E extends Extract<keyof M, string> = Extr
 
     let document = this.documents.get(documentName)
     if (document) {
+      if (awareness) {
+        document.enableAwareness()
+      }
+
       // Освежаем существующий документ строкой из БД.
       //
       // Раньше документ возвращался как есть, а подписка отправляла клиенту его