UBER-853 Add ydoc indexation

dev/client-resources/src/connection.ts

@@ -101,7 +101,7 @@ async function createNullFullTextAdapter (): Promise<FullTextAdapter> {
 }
 async function createNullContentTextAdapter (): Promise<ContentTextAdapter> {
   return {
-    async fetch (name: string, type: string, doc) {
+    async content (name: string, type: string, doc) {
       return ''
     },
     metrics () {
@@ -132,10 +132,14 @@ export async function connect (handler: (tx: Tx) => void): Promise<ClientConnect
       url: '',
       stages: () => []
     },
-    contentAdapter: {
-      url: '',
-      factory: createNullContentTextAdapter
+    contentAdapters: {
+      default: {
+        factory: createNullContentTextAdapter,
+        contentType: '',
+        url: ''
+      }
     },
+    defaultContentAdapter: 'default',
     workspace: getWorkspaceId('')
   }
   const serverStorage = await createServerStorage(conf, {

dev/server/src/server.ts

@@ -31,7 +31,7 @@ async function createNullFullTextAdapter (): Promise<FullTextAdapter> {
 }
 async function createNullContentTextAdapter (): Promise<ContentTextAdapter> {
   return {
-    async fetch (name: string, type: string, doc) {
+    async content (name: string, type: string, doc) {
       return ''
     },
     metrics: () => new MeasureMetricsContext('', {})
@@ -66,10 +66,14 @@ export async function start (port: number, host?: string): Promise<void> {
           stages: () => []
         },
         metrics: new MeasureMetricsContext('', {}),
-        contentAdapter: {
-          url: '',
-          factory: createNullContentTextAdapter
+        contentAdapters: {
+          default: {
+            factory: createNullContentTextAdapter,
+            contentType: '',
+            url: ''
+          }
         },
+        defaultContentAdapter: 'default',
         workspace: getWorkspaceId('')
       }
       return createPipeline(ctx, conf, [], false, () => {})

packages/text/src/index.ts

@@ -17,3 +17,4 @@ export * from './extensions'
 export * from './html'
 export * from './node'
 export * from './nodes'
+export * from './text'

packages/text/src/text.ts

@@ -0,0 +1,23 @@
+//
+// Copyright © 2023 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
+
+/**
+ * @public
+ */
+export function getText (node: ProseMirrorNode): string {
+  return node.textBetween(0, node.content.size, '\n', '')
+}

pods/server/src/server.ts

@@ -41,6 +41,7 @@ import {
   createMinioDataAdapter,
   createNullAdapter,
   createRekoniAdapter,
+  createYDocAdapter,
   getMetricsContext,
   MinioConfig
 } from '@hcengineering/server'
@@ -311,10 +312,19 @@ export function start (
         stages: (adapter, storage, storageAdapter, contentAdapter) =>
           createIndexStages(metrics.newChild('stages', {}), workspace, adapter, storage, storageAdapter, contentAdapter)
       },
-      contentAdapter: {
-        factory: createRekoniAdapter,
-        url: opt.rekoniUrl
+      contentAdapters: {
+        Rekoni: {
+          factory: createRekoniAdapter,
+          contentType: '*',
+          url: opt.rekoniUrl
+        },
+        YDoc: {
+          factory: createYDocAdapter,
+          contentType: 'application/ydoc',
+          url: ''
+        }
       },
+      defaultContentAdapter: 'Rekoni',
       storageFactory: () =>
         new MinioService({
           ...opt.minioConf,

server/core/src/content.ts

@@ -0,0 +1,59 @@
+//
+// Copyright © 2023 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { MeasureContext, WorkspaceId } from '@hcengineering/core'
+import { ContentTextAdapter, ContentTextAdapterConfiguration } from './types'
+import { Readable } from 'stream'
+
+class ContentAdapter implements ContentTextAdapter {
+  constructor (
+    private readonly adapters: Map<string, ContentTextAdapter>,
+    private readonly defaultAdapter: ContentTextAdapter,
+    private readonly context: MeasureContext
+  ) {}
+
+  async content (name: string, type: string, doc: string | Readable | Buffer): Promise<string> {
+    const adapter = this.adapters.get(type) ?? this.defaultAdapter
+    return await adapter.content(name, type, doc)
+  }
+
+  metrics (): MeasureContext {
+    return this.context
+  }
+}
+
+export async function createContentAdapter (
+  contentAdapters: Record<string, ContentTextAdapterConfiguration>,
+  defaultContentAdapter: string,
+  workspace: WorkspaceId,
+  context: MeasureContext
+): Promise<ContentTextAdapter> {
+  const adapters = new Map<string, ContentTextAdapter>()
+  let defaultAdapter: ContentTextAdapter | undefined
+
+  for (const key in contentAdapters) {
+    const adapterConf = contentAdapters[key]
+    const adapter = await adapterConf.factory(adapterConf.url, workspace, context.newChild(key, {}))
+
+    adapters.set(adapterConf.contentType, adapter)
+    if (key === defaultContentAdapter) {
+      defaultAdapter = adapter
+    }
+  }
+  if (defaultAdapter === undefined) {
+    throw new Error('No default content adapter')
+  }
+  return new ContentAdapter(adapters, defaultAdapter, context)
+}

server/core/src/indexer/content.ts

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Hardcore Engineering Inc.
+// Copyright © 2022, 2023 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -116,7 +116,7 @@ export class ContentRetrievalStage implements FullTextPipelineStage {
                     let textContent = await this.metrics.with(
                       'fetch',
                       {},
-                      async () => await this.contentAdapter.fetch(ref, contentType, readable)
+                      async () => await this.contentAdapter.content(ref, contentType, readable)
                     )
 
                     textContent = textContent

server/core/src/storage.ts

@@ -55,14 +55,15 @@ import core, {
 import { MinioService } from '@hcengineering/minio'
 import { getResource } from '@hcengineering/platform'
 import { DbAdapter, DbAdapterConfiguration, TxAdapter } from './adapter'
+import { createContentAdapter } from './content'
 import { FullTextIndex } from './fulltext'
 import { FullTextIndexPipeline } from './indexer'
 import { FullTextPipelineStage } from './indexer/types'
 import serverCore from './plugin'
 import { Triggers } from './triggers'
 import type {
-  ContentAdapterFactory,
   ContentTextAdapter,
+  ContentTextAdapterConfiguration,
   FullTextAdapter,
   FullTextAdapterFactory,
   ObjectDDParticipant,
@@ -94,10 +95,8 @@ export interface DbConfiguration {
     url: string
     stages: FullTextPipelineStageFactory
   }
-  contentAdapter: {
-    factory: ContentAdapterFactory
-    url: string
-  }
+  contentAdapters: Record<string, ContentTextAdapterConfiguration>
+  defaultContentAdapter: string
   storageFactory?: () => MinioService
 }
 
@@ -809,12 +808,12 @@ export async function createServerStorage (
 
   const metrics = conf.metrics.newChild('server-storage', {})
 
-  const contentAdapter = await conf.contentAdapter.factory(
-    conf.contentAdapter.url,
+  const contentAdapter = await createContentAdapter(
+    conf.contentAdapters,
+    conf.defaultContentAdapter,
     conf.workspace,
     metrics.newChild('content', {})
   )
-
   console.timeLog(conf.workspace.name, 'finish content adapter')
 
   const defaultAdapter = adapters.get(conf.defaultAdapter)

server/core/src/types.ts

@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Hardcore Engineering Inc.
+// Copyright © 2022, 2023 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -242,14 +242,6 @@ export class DummyFullTextAdapter implements FullTextAdapter {
   }
 }
 
-/**
- * @public
- */
-export interface ContentTextAdapter {
-  fetch: (name: string, type: string, doc: Readable | Buffer | string) => Promise<string>
-  metrics: () => MeasureContext
-}
-
 /**
  * @public
  */
@@ -262,7 +254,24 @@ export type FullTextAdapterFactory = (
 /**
  * @public
  */
-export type ContentAdapterFactory = (
+export interface ContentTextAdapterConfiguration {
+  factory: ContentTextAdapterFactory
+  contentType: string
+  url: string
+}
+
+/**
+ * @public
+ */
+export interface ContentTextAdapter {
+  content: (name: string, type: string, doc: Readable | Buffer | string) => Promise<string>
+  metrics: () => MeasureContext
+}
+
+/**
+ * @public
+ */
+export type ContentTextAdapterFactory = (
   url: string,
   workspace: WorkspaceId,
   context: MeasureContext

server/mongo/src/__tests__/storage.test.ts

@@ -69,7 +69,7 @@ async function createNullFullTextAdapter (): Promise<FullTextAdapter> {
 
 async function createNullContentTextAdapter (): Promise<ContentTextAdapter> {
   return {
-    async fetch (name: string, type: string, doc) {
+    async content (name: string, type: string, doc) {
       return ''
     },
     metrics (): MeasureContext {
@@ -149,10 +149,14 @@ describe('mongo operations', () => {
         url: '',
         stages: () => []
       },
-      contentAdapter: {
-        factory: createNullContentTextAdapter,
-        url: ''
+      contentAdapters: {
+        default: {
+          factory: createNullContentTextAdapter,
+          contentType: '',
+          url: ''
+        }
       },
+      defaultContentAdapter: 'default',
       workspace: getWorkspaceId(dbId, ''),
       storageFactory: () => createNullStorageFactory()
     }

server/server/package.json

@@ -42,6 +42,7 @@
     "@hcengineering/server-token": "^0.6.6",
     "@hcengineering/middleware": "^0.6.0",
     "@hcengineering/minio": "^0.6.0",
+    "@hcengineering/text": "^0.6.0",
     "got": "^11.8.3"
   }
 }

server/server/src/index.ts

@@ -20,3 +20,4 @@ export * from './minio'
 export * from './backup'
 export * from './metrics'
 export * from './rekoni'
+export * from './ydoc'

server/server/src/rekoni.ts

@@ -13,7 +13,7 @@ export async function createRekoniAdapter (
 ): Promise<ContentTextAdapter> {
   const token = generateToken('anticrm-hcenginnering', workspace)
   return {
-    fetch: async (name: string, type: string, doc): Promise<string> => {
+    content: async (name: string, type: string, doc): Promise<string> => {
       try {
         const resContent = await got.post(
           `${url}/toText?name=${encodeURIComponent(name)}&type=${encodeURIComponent(type)}`,

server/server/src/ydoc.ts

@@ -0,0 +1,51 @@
+import { MeasureContext, WorkspaceId } from '@hcengineering/core'
+import { ContentTextAdapter } from '@hcengineering/server-core'
+import { ReferenceNode, defaultExtensions, getText, yDocContentToNodes } from '@hcengineering/text'
+import { Readable } from 'stream'
+
+const extensions = [...defaultExtensions, ReferenceNode]
+
+/**
+ * @public
+ */
+export async function createYDocAdapter (
+  _url: string,
+  _workspace: WorkspaceId,
+  _metrics: MeasureContext
+): Promise<ContentTextAdapter> {
+  return {
+    content: async (_name: string, _type: string, data: Readable | Buffer | string): Promise<string> => {
+      const chunks: Buffer[] = []
+
+      if (data instanceof Readable) {
+        await new Promise((resolve) => {
+          data.on('readable', () => {
+            let chunk
+            while ((chunk = data.read()) !== null) {
+              const b = chunk as Buffer
+              chunks.push(b)
+            }
+          })
+
+          data.on('end', () => {
+            resolve(null)
+          })
+        })
+      } else if (data instanceof Buffer) {
+        chunks.push(data)
+      } else {
+        console.warn('ydoc content adapter does not support string content')
+      }
+
+      if (chunks.length > 0) {
+        const nodes = yDocContentToNodes(extensions, Buffer.concat(chunks))
+        return nodes.map(getText).join('\n')
+      }
+
+      return ''
+    },
+    metrics (): MeasureContext {
+      return _metrics
+    }
+  }
+}