@cuboapp/crdt 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/crdt",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "CRDT for CUBO",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/crdt.git",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@cuboapp/types": "^2.0.13",
     "@cuboapp/utils": "1.0.10",
-    "@cuboapp/ws": "1.0.6",
+    "@cuboapp/ws": "1.0.7",
     "ws": "^8.19.0",
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.30"

package/src/client/index.ts

@@ -1,12 +1,13 @@
 import { keyBy, pick, uuid } from '@cuboapp/utils'
 import { computed, reactive } from 'vue'
-import { applyUpdate, Doc } from 'yjs'
 import { applyAwarenessUpdate, Awareness, encodeAwarenessUpdate, removeAwarenessStates } from 'y-protocols/awareness'
+import { applyUpdate, Doc } from 'yjs'
 
 import { CUBO_CRDT_EVENT } from '../constants'
 import { CuboCrdtServerDocumentIncomingAction } from '../server'
 import { CuboCrdtKey } from '../types'
 
+import { AsyncSerialQueue } from './queue'
 import {
   CuboCrdtClientDocOrigin,
   CuboCrdtClientDocUpdateOptions,
@@ -17,7 +18,6 @@ import {
   CuboCrdtClientSubscribeEvent,
   CuboCrdtClientUseOptions
 } from './types'
-import { AsyncSerialQueue } from './queue'
 
 export * from './types'
 
@@ -154,6 +154,8 @@ export class CuboCrdtClient<M> {
       // отписываемся на фронте
       this.listeners.get(entity)?.delete(subscribe_id)
 
+      this.store[storeKey]!.state.subscribed = false
+
       // очищаем стор
       if (clear !== false) {
         const item = this.store[storeKey]
@@ -351,7 +353,8 @@ export class CuboCrdtClient<M> {
         awareness = new Awareness(doc)
 
         awareness.on('update', ({ added, updated, removed }, origin) => {
-          console.log('[CRDT] awarness update', origin)
+          // console.log('[CRDT] awarness update', origin)
+
           if (origin === 'remote') {
             return
           }

package/src/server/index.ts

@@ -1,5 +1,6 @@
 import { cloneDeep } from '@cuboapp/utils'
 import { WsServerSocket } from '@cuboapp/ws'
+import { applyAwarenessUpdate, encodeAwarenessUpdate, removeAwarenessStates } from 'y-protocols/awareness'
 
 import { CUBO_CRDT_EVENT } from '../constants'
 import { CuboCrdtAction } from '../types'
@@ -16,7 +17,6 @@ import {
   CuboCrdtServerUnsubscribeDto,
   CuboCrdtSocketClient
 } from './types'
-import { applyAwarenessUpdate, encodeAwarenessUpdate, removeAwarenessStates } from 'y-protocols/awareness'
 
 export * from './document'
 export * from './types'
@@ -99,7 +99,7 @@ export class CuboCrdtServer<M, A = {}, E extends Extract<keyof M, string> = Extr
         console.log('[CRDT] incoming event', data)
       }
 
-      data.forEach((row: any) => {
+      for (const row of data) {
         const update = new Uint8Array(row.data)
 
         switch (row.action) {
@@ -114,10 +114,9 @@ export class CuboCrdtServer<M, A = {}, E extends Extract<keyof M, string> = Extr
             break
           case 'awareness':
             this.onAwarenessExternalUpdate(update, row)
-
             break
         }
-      })
+      }
     })
 
     this.ws.registerHttpHandler('GET', '/stats', () => {
@@ -381,15 +380,16 @@ export class CuboCrdtServer<M, A = {}, E extends Extract<keyof M, string> = Extr
   }
 
   private onDocumentExternalUpdate(update: Uint8Array, action: CuboCrdtServerDocumentIncomingAction) {
-    const document = this.getDocument(action.entity, action.entity_id)
-
-    // console.log('onDocumentExternalUpdate', action)
-
+    let document = this.getDocument(action.entity, action.entity_id)
     if (!document) {
-      console.warn('[CRDT] onDocumentExternalUpdate - document not found:', action.entity, action.entity_id)
-    } else {
-      document.applyUpdate(new Uint8Array(update), action.origin)
+      if (this.debug) {
+        console.warn('[CRDT] onDocumentExternalUpdate - document not found, creating:', action.entity, action.entity_id)
+      }
+
+      document = this.ensureDocument(action.entity as E, action.entity_id, true)
     }
+
+    document.applyUpdate(new Uint8Array(update), action.origin)
   }
 
   private onAwarenessExternalUpdate(update: Uint8Array, action: CuboCrdtServerDocumentIncomingAction) {

package/tsconfig.json

@@ -9,11 +9,12 @@
     "target": "ES2021",
     "sourceMap": true,
     "outDir": "./dist",
-    "baseUrl": "./",
+    "strict": false,
+    "rootDir": "./",
     "incremental": true,
     "skipLibCheck": true,
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["./src/*"]
     }
   },
   "include": ["src/**/*"],