@cuboapp/api-backend 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuboapp/api-backend",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Backend Api for CuboApp",
   "main": "src/index.ts",
   "repository": "git@github.com:cuboapp/api-backend.git",

package/src/crdt/index.ts

@@ -1,23 +1,17 @@
 import { QueryTypes } from '@cuboapp/database'
 import { CuboApiEntitiesMap, CuboEntity } from '@cuboapp/types'
 import { Database } from '@hocuspocus/extension-database'
-import {
-  beforeSyncPayload,
-  Document,
-  Hocuspocus,
-  onChangePayload,
-  onLoadDocumentPayload,
-  onStoreDocumentPayload,
-  Server
-} from '@hocuspocus/server'
+import { Server } from '@hocuspocus/server'
 import { IncomingHttpHeaders } from 'http'
 import * as Y from 'yjs'
 
 import { CuboBackendApi } from '..'
-import { DirectConnection } from './types'
+import { CuboDirectConnection } from './types'
 
 export * from './types'
 
+export * from '@hocuspocus/server'
+
 export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
   public server: Server
   private documentPrefix = 'cubo'
@@ -43,7 +37,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
 
               const { entityAlias, id } = this.parseDocumentName(documentName)
 
-              console.log('fetch', entityAlias, id)
+              // console.log('fetch', entityAlias, id)
               if (id <= 0) {
                 return null
               }
@@ -66,7 +60,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
 
               const db = await this.api.helpers.getConnection('write')
 
-              const [data] = await db.connection.query(`SELECT ${fieldKey} from ${entityAlias} where id=:id`, {
+              const [data] = await db.connection.query(`SELECT ${fieldKey} from ${entityAlias} where id = :id`, {
                 type: QueryTypes.SELECT,
                 replacements: {
                   id
@@ -78,7 +72,6 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
               }
 
               const raw = (data as any)[fieldKey]
-              // console.log('raw', raw)
 
               if (!raw) {
                 return null
@@ -150,7 +143,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
       ],
       onAuthenticate: async (data) => {
         try {
-          return onAuthenticate?.(this.api, data)
+          return await onAuthenticate?.(this.api, data)
         } catch (err) {
           throw new Error('Ошибка авторизации: ' + err)
         }
@@ -278,13 +271,13 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
   }
 
   public isCrdtSupported(entity: CuboEntity) {
-    const hasCrdtField = entity.fields.some((f) => f.alias === this.api.options.crdt?.fieldAlias || this.defaultCrdtFieldAlias)
+    const hasCrdtField = entity.fields.some((f) => f.alias === (this.api.options.crdt?.fieldAlias || this.defaultCrdtFieldAlias))
 
     return hasCrdtField
   }
 
   public getCrdtField(entity: CuboEntity) {
-    const crdtField = entity.fields.find((f) => f.alias === this.api.options.crdt?.fieldAlias || this.defaultCrdtFieldAlias)
+    const crdtField = entity.fields.find((f) => f.alias === (this.api.options.crdt?.fieldAlias || this.defaultCrdtFieldAlias))
 
     return crdtField
   }
@@ -308,7 +301,7 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
     return this.server.hocuspocus.openDirectConnection(documentName, context)
   }
 
-  public async connectionDisconnect(connection: DirectConnection) {
+  public async connectionDisconnect(connection: CuboDirectConnection) {
     const { document, instance, context } = connection
 
     if (document) {
@@ -414,5 +407,3 @@ export class CuboCrdt<T extends CuboApiEntitiesMap<T>> {
     return Buffer.from(Y.encodeStateAsUpdate(document))
   }
 }
-
-export { beforeSyncPayload, DirectConnection, Document, Hocuspocus, onChangePayload, onLoadDocumentPayload, onStoreDocumentPayload }

package/src/crdt/types.ts

@@ -27,7 +27,7 @@ export type CuboCrdtConfiguration<T extends CuboApiEntitiesMap<T>> = Omit<
   fieldAlias?: string
 }
 
-export type DirectConnection = {
+export type CuboDirectConnection = {
   document: Document | null
   instance: Hocuspocus
   context: any