@cuboapp/crdt 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/crdt",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "CRDT for CUBO",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/crdt.git",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@cuboapp/types": "^2.0.11",
     "@cuboapp/utils": "1.0.9",
-    "@cuboapp/ws": "1.0.3",
+    "@cuboapp/ws": "1.0.4",
     "ws": "^8.19.0",
     "yjs": "^13.6.29"
   },

package/src/client/index.ts

@@ -1,9 +1,11 @@
 import { EventEmitter } from '@cuboapp/utils'
 import { createWsClient, WsClient } from '@cuboapp/ws'
+import { applyUpdate, Doc } from 'yjs'
 
 export type CuboCrdtClientOptions = {
   host?: string
   port?: number
+  protocol?: 'wss' | 'ws' | string
   authToken?: () => Promise<string>
   debug?: boolean
 }
@@ -18,6 +20,7 @@ export class CuboCrdtClient {
     this.ws = createWsClient({
       host: this.opts.host,
       port: this.opts.port,
+      protocol: this.opts.protocol,
       autoReconnect: true,
       pingInterval: 5000,
       authToken: this.opts.authToken ? () => this.opts.authToken!() : () => ''
@@ -42,25 +45,37 @@ export class CuboCrdtClient {
     }
   }
 
-  async subscribe(event: string, cb: any, filters?: any) {
+  async subscribe({ entity, id, filters }: { entity: string; id?: number; filters?: any }, cb: any) {
     if (this.opts.debug) {
-      console.log('subscribe', event)
+      console.log('subscribeEntity', { entity, id })
     }
 
+    filters = filters || {}
+    if (id) {
+      filters.id = id
+    }
+
+    const event = `crdt:${entity}`
+    // const event = id ? `crdt:${entity}:${id}` : `crdt:${entity}`
+
     this.ee.addListener(event, cb)
     this.ws.request({ method: 'crdt:subscribe', data: { event, filters } })
   }
 
-  async unsubscribe(event: string, cb: any) {
+  async unsubscribe({ entity, id, filters }: { entity: string; id?: number; filters?: any }, cb: any) {
     if (this.opts.debug) {
-      console.log('unsubscribe', event)
+      console.log('subscribeEntity', { entity, id })
     }
+
+    const event = `crdt:${entity}`
+    // const event = id ? `crdt:${entity}:${id}` : `crdt:${entity}`
+
     this.ee.removeListener(event, cb)
-    this.ws.request({ method: 'crdt:unsubscribe', data: { event } })
+    this.ws.request({ method: 'crdt:unsubscribe', data: { event, filters } })
   }
 
-  async openDocument<T>(entity: string, id: number): Promise<T> {
-    const state = await this.ws.request(
+  async openDocument(entity: string, id: number, doc: Doc): Promise<void> {
+    const state: any = await this.ws.request(
       {
         method: 'crdt:open',
         data: { name: `${entity}:${id}` }
@@ -68,7 +83,13 @@ export class CuboCrdtClient {
       { wait: true }
     )
 
-    return state as T
+    this.ee.addListener(`crdt:update:${entity}:${id}`, (ctx) => {
+      applyUpdate(doc, new Uint8Array(ctx.data))
+    })
+
+    this.ws.request({ method: 'crdt:subscribe', data: { crdt: { entity, id } } })
+
+    applyUpdate(doc, new Uint8Array(state))
   }
 
   async closeDocument(entity: string, id: number) {
@@ -79,5 +100,7 @@ export class CuboCrdtClient {
       },
       { wait: true }
     )
+
+    this.ee.removeAllListeners(`crdt:document:${entity}:${id}:update`)
   }
 }

package/src/index.ts

@@ -21,29 +21,43 @@ export class CuboCrdt<
   K extends string = Extract<keyof T, string>,
   ID extends string = `${K}:${number | string}`
 > {
-  private documents = new Map<ID, CuboCrdtDocument>()
+  public documents = new Map<ID, CuboCrdtDocument>()
   private loading = new Map<ID, Promise<CuboCrdtDocument>>()
 
   public ee = new EventEmitter()
 
   constructor(private options: CuboCrdtOptions<A>) {}
 
-  public async start() {}
+  public async start() {
+    // setInterval(() => {
+    // console.log('documents', this.documents.size)
+    // }, 1000)
+    // const doc = new Doc()
+    // const map = doc.getMap('store')
+    // doc.on('update', (upd) => {
+    //   const map1 = doc.getMap('store')
+    //   console.log('new state', map1.toJSON())
+    // })
+    // doc.transact(() => {
+    //   map.set('key', 'value')
+    // })
+  }
 
   public async stop() {}
 
-  public async getDocument(name: ID) {
+  public async getDocument(name: ID, autoCreate = true) {
     // существующий документ
     if (!this.documents.has(name)) {
-      if (this.options.debug) {
-        console.log('CRDT create document', name)
-      }
+      if (!this.loading.has(name) && autoCreate) {
+        if (this.options.debug) {
+          console.log('CRDT create document load start', name)
+        }
 
-      if (!this.loading.has(name)) {
         this.loading.set(
           name,
           new Promise(async (resolve) => {
             const document = new CuboCrdtDocument({
+              name,
               autoRemove: true,
               debug: this.options.debug,
               initialState: () => {
@@ -61,12 +75,36 @@ export class CuboCrdt<
         )
       }
 
-      this.documents.set(name, await this.loading.get(name)!)
+      const document = await this.loading.get(name)
+
+      this.loading.delete(name)
+      this.documents.set(name, document)
+    }
+
+    if (this.options.debug) {
+      console.log('CRDT create document load completed', name, this.documents.size)
     }
 
     return this.documents.get(name)
   }
 
+  public async removeDocument(name: ID) {
+    if (this.options.debug) {
+      console.log('CRDT remove document', name)
+    }
+
+    if (this.loading.has(name)) {
+      try {
+        Promise.reject(this.loading.get(name))
+        this.loading.delete(name)
+      } catch {}
+    }
+
+    if (this.documents.has(name)) {
+      this.documents.delete(name)
+    }
+  }
+
   public async updateDocument(name: ID, dto: object) {
     const document = await this.getDocument(name)
 

package/src/yjs/index.ts

@@ -1,5 +1,5 @@
 import { type WsServerSocket } from '@cuboapp/ws'
-import { Doc } from 'yjs'
+import { Doc, encodeStateAsUpdate } from 'yjs'
 
 export type CuboCrdtDocumentHooks = {
   onBeforeDestroy?: () => Promise<void> | void
@@ -7,6 +7,7 @@ export type CuboCrdtDocumentHooks = {
 }
 
 export type CuboCrdtDocumentOptions = CuboCrdtDocumentHooks & {
+  name: string
   autoRemove?: boolean
   debug?: boolean
   initial?: any
@@ -27,8 +28,7 @@ export class CuboCrdtDocument {
   private ydoc: Doc
   public clients = new Set<WsServerSocket>()
 
-  constructor(public opts?: CuboCrdtDocumentOptions) {
-    opts = opts || {}
+  constructor(public opts: CuboCrdtDocumentOptions) {
     opts.autoRemove = opts?.autoRemove ?? true
   }
 
@@ -38,36 +38,48 @@ export class CuboCrdtDocument {
     }
   }
 
+  get stateAsUpdate() {
+    return encodeStateAsUpdate(this.ydoc)
+  }
+
   async init() {
+    console.log('init doc', this.opts.name)
+
     this.ydoc = new Doc({
       ...(this.opts?.yjsOptions || {}),
       autoLoad: false,
       shouldLoad: false
     })
 
-    const state = this.opts?.initialState ? await this.opts?.initialState() : {}
+    const state = this.opts?.initialState ? (await this.opts?.initialState()) || {} : {}
+
+    // console.log('initial state', state)
 
     return new Promise<void>((resolve) => {
-      this.ydoc.once('updateV2', () => {
-        this.ydoc.on('updateV2', (data) => {
+      this.ydoc.once('update', () => {
+        this.ydoc.on('update', (data) => {
+          // console.log('document updated', this.opts.name, this.getMap().toJSON())
+
           this.opts?.onUpdate?.({ data, document: this })
         })
 
         resolve()
       })
 
-      this.ydoc.transact((t) => {
-        const map = t.doc.getMap()
+      const map = this.getMap()
 
-        Object.entries(state).forEach(([key, value]) => {
-          map.set(key, value)
-        })
+      this.ydoc.transact(() => {
+        if (state) {
+          Object.entries(state).forEach(([key, value]) => {
+            map.set(key, value)
+          })
+        }
       })
     })
   }
 
-  getMap(name?: string) {
-    return this.ydoc.getMap(name)
+  getMap() {
+    return this.ydoc.getMap()
   }
 
   async hasClient(client: WsServerSocket) {
@@ -83,10 +95,12 @@ export class CuboCrdtDocument {
   }
 
   async write(dto: object) {
+    console.log('CRDT write document', this.opts.name, dto)
+
     return new Promise<void>(async (resolve) => {
-      this.ydoc.transact(({ doc }) => {
-        const map = doc.getMap()
+      const map = this.getMap()
 
+      this.ydoc.transact(() => {
         Object.entries(dto).forEach(([key, value]) => {
           map.set(key, value)
         })