UBERF-6888: Async triggers

models/server-activity/src/index.ts

@@ -39,6 +39,7 @@ export function createModel (builder: Builder): void {
   })
 
   builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverActivity.trigger.ReferenceTrigger
+    trigger: serverActivity.trigger.ReferenceTrigger,
+    isAsync: true
   })
 }

models/server-chunter/src/index.ts

@@ -83,6 +83,7 @@ export function createModel (builder: Builder): void {
       _class: core.class.TxCollectionCUD,
       'tx._class': core.class.TxCreateDoc,
       'tx.objectClass': chunter.class.ChatMessage
-    }
+    },
+    isAsync: true
   })
 }

server-plugins/activity-resources/src/references.ts

@@ -597,27 +597,25 @@ async function ActivityReferenceCreate (tx: TxCUD<Doc>, control: TriggerControl)
   if (control.hierarchy.isDerived(ctx.objectClass, notification.class.InboxNotification)) return []
   if (control.hierarchy.isDerived(ctx.objectClass, activity.class.ActivityReference)) return []
 
-  control.storageFx(async (adapter) => {
-    const txFactory = new TxFactory(control.txFactory.account)
+  const txFactory = new TxFactory(control.txFactory.account)
 
-    const doc = TxProcessor.createDoc2Doc(ctx)
-    const targetTx = guessReferenceTx(control.hierarchy, tx)
-
-    const txes: Tx[] = await getCreateReferencesTxes(
-      control,
-      adapter,
-      txFactory,
-      doc,
-      targetTx.objectId,
-      targetTx.objectClass,
-      targetTx.objectSpace,
-      tx
-    )
+  const doc = TxProcessor.createDoc2Doc(ctx)
+  const targetTx = guessReferenceTx(control.hierarchy, tx)
 
-    if (txes.length !== 0) {
-      await control.apply(txes, true)
-    }
-  })
+  const txes: Tx[] = await getCreateReferencesTxes(
+    control,
+    control.storageAdapter,
+    txFactory,
+    doc,
+    targetTx.objectId,
+    targetTx.objectClass,
+    targetTx.objectSpace,
+    tx
+  )
+
+  if (txes.length !== 0) {
+    await control.apply(txes, true)
+  }
 
   return []
 }
@@ -647,26 +645,24 @@ async function ActivityReferenceUpdate (tx: TxCUD<Doc>, control: TriggerControl)
     return []
   }
 
-  control.storageFx(async (adapter) => {
-    const txFactory = new TxFactory(control.txFactory.account)
-    const doc = TxProcessor.updateDoc2Doc(rawDoc, ctx)
-    const targetTx = guessReferenceTx(control.hierarchy, tx)
-
-    const txes: Tx[] = await getUpdateReferencesTxes(
-      control,
-      adapter,
-      txFactory,
-      doc,
-      targetTx.objectId,
-      targetTx.objectClass,
-      targetTx.objectSpace,
-      tx
-    )
+  const txFactory = new TxFactory(control.txFactory.account)
+  const doc = TxProcessor.updateDoc2Doc(rawDoc, ctx)
+  const targetTx = guessReferenceTx(control.hierarchy, tx)
 
-    if (txes.length !== 0) {
-      await control.apply(txes, true)
-    }
-  })
+  const txes: Tx[] = await getUpdateReferencesTxes(
+    control,
+    control.storageAdapter,
+    txFactory,
+    doc,
+    targetTx.objectId,
+    targetTx.objectClass,
+    targetTx.objectSpace,
+    tx
+  )
+
+  if (txes.length !== 0) {
+    await control.apply(txes, true)
+  }
 
   return []
 }

server-plugins/attachment-resources/src/index.ts

@@ -15,7 +15,7 @@
 //
 
 import type { Attachment } from '@hcengineering/attachment'
-import type { Doc, Ref, Tx, TxRemoveDoc } from '@hcengineering/core'
+import type { Tx, TxRemoveDoc } from '@hcengineering/core'
 import { TxProcessor } from '@hcengineering/core'
 import type { TriggerControl } from '@hcengineering/server-core'
 
@@ -24,7 +24,7 @@ import type { TriggerControl } from '@hcengineering/server-core'
  */
 export async function OnAttachmentDelete (
   tx: Tx,
-  { findAll, hierarchy, fulltextFx, storageFx, removedMap, ctx }: TriggerControl
+  { removedMap, ctx, storageAdapter, workspace }: TriggerControl
 ): Promise<Tx[]> {
   const rmTx = TxProcessor.extractTx(tx) as TxRemoveDoc<Attachment>
 
@@ -34,13 +34,8 @@ export async function OnAttachmentDelete (
   if (attach === undefined) {
     return []
   }
-  fulltextFx(async (adapter) => {
-    await adapter.remove([attach.file as Ref<Doc>])
-  })
 
-  storageFx(async (adapter, bucket) => {
-    await adapter.remove(ctx, bucket, [attach.file])
-  })
+  await storageAdapter.remove(ctx, workspace, [attach.file])
 
   return []
 }

server-plugins/collaboration-resources/src/index.ts

@@ -21,7 +21,10 @@ import type { TriggerControl } from '@hcengineering/server-core'
 /**
  * @public
  */
-export async function OnDelete (tx: Tx, { hierarchy, storageFx, removedMap, ctx }: TriggerControl): Promise<Tx[]> {
+export async function OnDelete (
+  tx: Tx,
+  { hierarchy, storageAdapter, workspace, removedMap, ctx }: TriggerControl
+): Promise<Tx[]> {
   const rmTx = TxProcessor.extractTx(tx) as TxRemoveDoc<Doc>
 
   if (rmTx._class !== core.class.TxRemoveDoc) {
@@ -44,12 +47,10 @@ export async function OnDelete (tx: Tx, { hierarchy, storageFx, removedMap, ctx
     }
   }
 
-  storageFx(async (adapter, bucket) => {
-    // TODO This is not accurate way to delete collaborative document
-    // Even though we are deleting it here, the document can be currently in use by someone else
-    // and when editing session ends, the collborator service will recreate the document again
-    await removeCollaborativeDoc(adapter, bucket, toDelete, ctx)
-  })
+  // TODO This is not accurate way to delete collaborative document
+  // Even though we are deleting it here, the document can be currently in use by someone else
+  // and when editing session ends, the collborator service will recreate the document again
+  await removeCollaborativeDoc(storageAdapter, workspace, toDelete, ctx)
 
   return []
 }

server-plugins/contact-resources/src/index.ts

@@ -90,7 +90,7 @@ export async function OnPersonAccountCreate (tx: Tx, control: TriggerControl): P
  */
 export async function OnContactDelete (
   tx: Tx,
-  { findAll, hierarchy, storageFx, removedMap, txFactory, ctx }: TriggerControl
+  { findAll, hierarchy, storageAdapter, workspace, removedMap, txFactory, ctx }: TriggerControl
 ): Promise<Tx[]> {
   const rmTx = tx as TxRemoveDoc<Contact>
 
@@ -112,20 +112,18 @@ export async function OnContactDelete (
     return []
   }
 
-  storageFx(async (adapter, bucket) => {
-    await adapter.remove(ctx, bucket, [avatar])
+  await storageAdapter.remove(ctx, workspace, [avatar])
 
-    if (avatar != null) {
-      const extra = await adapter.list(ctx, bucket, avatar)
-      if (extra.length > 0) {
-        await adapter.remove(
-          ctx,
-          bucket,
-          Array.from(extra.entries()).map((it) => it[1]._id)
-        )
-      }
+  if (avatar != null) {
+    const extra = await storageAdapter.list(ctx, workspace, avatar)
+    if (extra.length > 0) {
+      await storageAdapter.remove(
+        ctx,
+        workspace,
+        Array.from(extra.entries()).map((it) => it[1]._id)
+      )
     }
-  })
+  }
 
   const result: Tx[] = []
 

server/core/src/configuration.ts

@@ -69,5 +69,5 @@ export interface DbConfiguration {
   contentAdapters: Record<string, ContentTextAdapterConfiguration>
   serviceAdapters: Record<string, ServiceAdapterConfig>
   defaultContentAdapter: string
-  storageFactory?: () => StorageAdapter
+  storageFactory: () => StorageAdapter
 }

server/core/src/server/index.ts

@@ -54,7 +54,7 @@ export async function createServerStorage (
   const adapters = new Map<string, DbAdapter>()
   const modelDb = new ModelDb(hierarchy)
 
-  const storageAdapter = conf.storageFactory?.()
+  const storageAdapter = conf.storageFactory()
 
   await ctx.with('create-adapters', {}, async (ctx) => {
     for (const key in conf.adapters) {