@cuboapp/crdt 1.0.4 → 1.0.6

package/src/types/index.ts

@@ -1,11 +1,5 @@
-import { WsServer, WsServerRequest } from '@cuboapp/ws'
+export type CuboCrdtKey<K, M> = K extends Extract<keyof M, string> ? M[K] : any
 
-export type CuboCrdtOptions<A> = {
-  host?: string
-  port?: number
-  debug?: boolean
+export type CuboCrdtAction = 'create' | 'update' | 'delete'
 
-  authHandler?: (ctx: { server: WsServer<{ auth: A }>; request: WsServerRequest<{ auth: A }> }) => Promise<A> | A
-
-  beforeLoadDocument?: (name: string) => Promise<any> | any
-}
+export type CuboCrdtExposeStrategy = 'all' | 'other' | 'subscribe' | 'client'

package/src/utils/index.ts

@@ -1,7 +1,69 @@
 import { CuboApiEntitiesMap } from '@cuboapp/types'
 
-import { CuboCrdt, CuboCrdtOptions } from '..'
+import { CuboCrdtClient, CuboCrdtClientOptions, CuboCrdtServer, CuboCrdtServerOptions } from '..'
 
-export function createCrdt<T extends CuboApiEntitiesMap<T>, A = {}>(opts: CuboCrdtOptions<A>) {
-  return new CuboCrdt<T, A>(opts)
+export function createCrdtServer<M extends CuboApiEntitiesMap<M>, A = {}>(opts: CuboCrdtServerOptions<M, A>) {
+  return new CuboCrdtServer<M, A>(opts)
+}
+
+export function createCrdtClient<M extends CuboApiEntitiesMap<M>>(opts: CuboCrdtClientOptions<M>) {
+  return new CuboCrdtClient<M>(opts)
+}
+
+export function cleanObject<F>(object: F): any {
+  if (Array.isArray(object)) {
+    return object.map(cleanObject).filter(Boolean)
+  } else if (typeof object === 'object' && object !== null) {
+    const newObj: any = {}
+
+    for (const key in object) {
+      const value = cleanObject(object[key])
+
+      if (value !== undefined && value !== null && value !== '' && !(typeof value === 'object' && Object.keys(value).length === 0)) {
+        newObj[key] = value
+      }
+    }
+
+    return newObj
+  }
+
+  return object
+}
+
+export function checkRowIsSutable(row: object, filters?: object) {
+  let sutable = true
+
+  if (Object.keys(filters || {}).length) {
+    Object.entries(filters || {}).forEach(([key, value]) => {
+      if (!['limit', 'with'].includes(key)) {
+        const [formula, str] = `${value}`.split(':')
+
+        // console.log({ formula, str, value: row[key] })
+
+        if (!str) {
+          if (row[key as keyof typeof row] !== value) {
+            sutable = false
+          }
+        } else {
+          switch (formula) {
+            case 'in':
+              if (
+                !str
+                  .split(',')
+                  .map(Number)
+                  .includes(row[key as keyof typeof row] as any)
+              ) {
+                sutable = false
+              }
+              break
+            default:
+              sutable = false
+              break
+          }
+        }
+      }
+    })
+  }
+
+  return sutable
 }

package/src/yjs/index.ts

@@ -1,114 +0,0 @@
-import { type WsServerSocket } from '@cuboapp/ws'
-import { Doc, encodeStateAsUpdate } from 'yjs'
-
-export type CuboCrdtDocumentHooks = {
-  onBeforeDestroy?: () => Promise<void> | void
-  onAfterDestroy?: () => Promise<void> | void
-}
-
-export type CuboCrdtDocumentOptions = CuboCrdtDocumentHooks & {
-  name: string
-  autoRemove?: boolean
-  debug?: boolean
-  initial?: any
-
-  initialState?: () => Promise<any>
-  onUpdate?: (ctx: { data: Uint8Array<ArrayBufferLike>; document: CuboCrdtDocument }) => void
-
-  yjsOptions?: {
-    guid?: string
-    collectionid?: string
-    gc?: boolean
-    gcFilter?: () => true
-    meta?: any
-  }
-}
-
-export class CuboCrdtDocument {
-  private ydoc: Doc
-  public clients = new Set<WsServerSocket>()
-
-  constructor(public opts: CuboCrdtDocumentOptions) {
-    opts.autoRemove = opts?.autoRemove ?? true
-  }
-
-  get stat() {
-    return {
-      clients: this.clients.size
-    }
-  }
-
-  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()) || {} : {}
-
-    // console.log('initial state', state)
-
-    return new Promise<void>((resolve) => {
-      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()
-      })
-
-      const map = this.getMap()
-
-      this.ydoc.transact(() => {
-        if (state) {
-          Object.entries(state).forEach(([key, value]) => {
-            map.set(key, value)
-          })
-        }
-      })
-    })
-  }
-
-  getMap() {
-    return this.ydoc.getMap()
-  }
-
-  async hasClient(client: WsServerSocket) {
-    return this.clients.has(client)
-  }
-
-  async addClient(client: WsServerSocket) {
-    this.clients.add(client)
-  }
-
-  async removeClient(client: WsServerSocket) {
-    this.clients.delete(client)
-  }
-
-  async write(dto: object) {
-    console.log('CRDT write document', this.opts.name, dto)
-
-    return new Promise<void>(async (resolve) => {
-      const map = this.getMap()
-
-      this.ydoc.transact(() => {
-        Object.entries(dto).forEach(([key, value]) => {
-          map.set(key, value)
-        })
-
-        // Внимание! Резолв промиса не означает раскатку по всем подключениям,
-        // только лишь запись в Yjs-документ
-        resolve()
-      })
-    })
-  }
-}