Extract postgres base package

dev/tool/src/db.ts

@@ -37,7 +37,6 @@ import {
 } from '@hcengineering/postgres'
 import { type DBDoc } from '@hcengineering/postgres/types/utils'
 import { getTransactorEndpoint } from '@hcengineering/server-client'
-import { sharedPipelineContextVars } from '@hcengineering/server-pipeline'
 import { generateToken } from '@hcengineering/server-token'
 import { connect } from '@hcengineering/server-tool'
 import { type MongoClient } from 'mongodb'
@@ -57,7 +56,7 @@ export async function moveFromMongoToPG (
   }
   const client = getMongoClient(mongoUrl)
   const mongo = await client.getClient()
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
 
   for (let index = 0; index < workspaces.length; index++) {
@@ -181,7 +180,7 @@ export async function moveWorkspaceFromMongoToPG (
   }
   const client = getMongoClient(mongoUrl)
   const mongo = await client.getClient()
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
 
   await moveWorkspace(accountDb, mongo, pgClient, ws, region, include, force)
@@ -530,7 +529,7 @@ export async function migrateCreatedModifiedBy (
         progressMade = false
         connectsCount++
 
-        pg = getDBClient(sharedPipelineContextVars, dbUrl)
+        pg = getDBClient(dbUrl)
         pgClient = await pg.getClient()
 
         // Expect temp table with mapping to be created manually
@@ -907,7 +906,7 @@ export async function migrateMergedAccounts (
     throw new Error('Only CockroachDB is supported')
   }
 
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
   const token = getToolToken()
 
@@ -1020,7 +1019,7 @@ export async function filterMergedAccountsInMembers (
     throw new Error('Only CockroachDB is supported')
   }
 
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
 
   try {
@@ -1083,7 +1082,7 @@ export async function ensureGlobalPersonsForLocalAccounts (
     throw new Error('Only CockroachDB is supported')
   }
 
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
   const token = getToolToken()
 

dev/tool/src/index.ts

@@ -44,8 +44,7 @@ import {
   registerServerPlugins,
   registerStringLoaders,
   registerTxAdapterFactory,
-  setAdapterSecurity,
-  sharedPipelineContextVars
+  setAdapterSecurity
 } from '@hcengineering/server-pipeline'
 import serverToken, { generateToken } from '@hcengineering/server-token'
 import { createWorkspace, upgradeWorkspace } from '@hcengineering/workspace-service'
@@ -134,10 +133,10 @@ const colorConstants = {
 
 // Register close on process exit.
 process.on('exit', () => {
-  shutdownPostgres(sharedPipelineContextVars).catch((err) => {
+  shutdownPostgres().catch((err) => {
     console.error(err)
   })
-  shutdownMongo(sharedPipelineContextVars).catch((err) => {
+  shutdownMongo().catch((err) => {
     console.error(err)
   })
 })
@@ -663,7 +662,6 @@ export function devTool (
   //                 },
   //                 cmd.region,
   //                 5000, // 5 gigabytes per blob
-  //                 sharedPipelineContextVars,
   //                 async (storage, workspaceStorage) => {
   //                   if (cmd.remove) {
   //                     await updateArchiveInfo(toolCtx, db, ws.workspace, true)
@@ -783,7 +781,6 @@ export function devTool (
   //               },
   //               cmd.region,
   //               100,
-  //               sharedPipelineContextVars
   //             )
   //           ) {
   //             processed++

dev/tool/src/markup.ts

@@ -55,11 +55,7 @@ import { getDBClient } from '@hcengineering/postgres'
 import { withRetry } from '@hcengineering/retry'
 import { getAccountClient } from '@hcengineering/server-client'
 import { type PipelineFactory, type StorageAdapter, createDummyStorageAdapter } from '@hcengineering/server-core'
-import {
-  createBackupPipeline,
-  createEmptyBroadcastOps,
-  sharedPipelineContextVars
-} from '@hcengineering/server-pipeline'
+import { createBackupPipeline, createEmptyBroadcastOps } from '@hcengineering/server-pipeline'
 import { generateToken } from '@hcengineering/server-token'
 import { isEmptyMarkup } from '@hcengineering/text-core'
 
@@ -396,7 +392,7 @@ export async function restoreMarkupRefs (
     usePassedCtx: true
   })
 
-  const pg = getDBClient(sharedPipelineContextVars, dbUrl)
+  const pg = getDBClient(dbUrl)
   const pgClient = await pg.getClient()
 
   try {

pods/backup/src/index.ts

@@ -24,8 +24,7 @@ import {
   registerAdapterFactory,
   registerDestroyFactory,
   registerTxAdapterFactory,
-  setAdapterSecurity,
-  sharedPipelineContextVars
+  setAdapterSecurity
 } from '@hcengineering/server-pipeline'
 import { join } from 'path'
 
@@ -47,10 +46,10 @@ const model = JSON.parse(readFileSync(process.env.MODEL_JSON ?? 'model.json').to
 
 // Register close on process exit.
 process.on('exit', () => {
-  shutdownPostgres(sharedPipelineContextVars).catch((err) => {
+  shutdownPostgres().catch((err) => {
     console.error(err)
   })
-  shutdownMongo(sharedPipelineContextVars).catch((err) => {
+  shutdownMongo().catch((err) => {
     console.error(err)
   })
 })
@@ -103,6 +102,5 @@ startBackup(
       externalStorage,
       disableTriggers: true
     })
-  },
-  sharedPipelineContextVars
+  }
 )

pods/fulltext/src/server.ts

@@ -33,8 +33,7 @@ import {
   registerServerPlugins,
   registerStringLoaders,
   registerTxAdapterFactory,
-  setAdapterSecurity,
-  sharedPipelineContextVars
+  setAdapterSecurity
 } from '@hcengineering/server-pipeline'
 import serverToken, { decodeToken } from '@hcengineering/server-token'
 import cors from '@koa/cors'
@@ -71,10 +70,10 @@ interface Reindex {
 }
 // Register close on process exit.
 process.on('exit', () => {
-  shutdownPostgres(sharedPipelineContextVars).catch((err) => {
+  shutdownPostgres().catch((err) => {
     console.error(err)
   })
-  shutdownMongo(sharedPipelineContextVars).catch((err) => {
+  shutdownMongo().catch((err) => {
     console.error(err)
   })
 })

pods/server/src/server.ts

@@ -34,8 +34,7 @@ import {
   registerServerPlugins,
   registerStringLoaders,
   registerTxAdapterFactory,
-  setAdapterSecurity,
-  sharedPipelineContextVars
+  setAdapterSecurity
 } from '@hcengineering/server-pipeline'
 
 import {
@@ -59,10 +58,10 @@ registerStringLoaders()
 
 // Register close on process exit.
 process.on('exit', () => {
-  shutdownPostgres(sharedPipelineContextVars).catch((err) => {
+  shutdownPostgres().catch((err) => {
     console.error(err)
   })
-  shutdownMongo(sharedPipelineContextVars).catch((err) => {
+  shutdownMongo().catch((err) => {
     console.error(err)
   })
 })

rush.json

@@ -912,6 +912,11 @@
       "projectFolder": "server/postgres",
       "shouldPublish": false
     },
+    {
+      "packageName": "@hcengineering/postgres-base",
+      "projectFolder": "server/postgres-base",
+      "shouldPublish": false
+    },
     {
       "packageName": "@hcengineering/elastic",
       "projectFolder": "server/elastic",

server/account/src/utils.ts

@@ -40,7 +40,6 @@ import { pbkdf2Sync, randomBytes } from 'crypto'
 import otpGenerator from 'otp-generator'
 
 import { Analytics } from '@hcengineering/analytics'
-import { sharedPipelineContextVars } from '@hcengineering/server-pipeline'
 import { decodeTokenVerbose, generateToken, TokenError } from '@hcengineering/server-token'
 import { MongoAccountDB } from './collections/mongo'
 import { PostgresAccountDB } from './collections/postgres/postgres'
@@ -93,7 +92,7 @@ export async function getAccountDB (
         application_name: appName
       }
     })
-    const client = getDBClient(sharedPipelineContextVars, uri)
+    const client = getDBClient(uri)
     const pgClient = await client.getClient()
     const pgAccount = new PostgresAccountDB(pgClient, dbNs ?? 'global_account')
 

server/backup-service/src/index.ts

@@ -36,8 +36,7 @@ export function startBackup (
     workspace: WorkspaceIds,
     branding: Branding | null,
     externalStorage: StorageAdapter
-  ) => DbConfiguration,
-  contextVars: Record<string, any>
+  ) => DbConfiguration
 ): void {
   const config = _config()
   setMetadata(serverToken.metadata.Secret, config.Secret)
@@ -66,8 +65,7 @@ export function startBackup (
     (ctx, workspace, branding, externalStorage) => {
       return getConfig(ctx, mainDbUrl, workspace, branding, externalStorage)
     },
-    config.Region,
-    contextVars
+    config.Region
   )
 
   process.on('SIGINT', shutdown)
@@ -129,7 +127,6 @@ export async function backupWorkspace (
       region,
       downloadLimit,
       [],
-      contextVars,
       fullCheck
     )
     if (result && onFinish !== undefined) {

server/backup/src/service.ts

@@ -79,7 +79,6 @@ class BackupWorker {
       externalStorage: StorageAdapter
     ) => DbConfiguration,
     readonly region: string,
-    readonly contextVars: Record<string, any>,
     readonly skipDomains: string[] = [],
     readonly fullCheck: boolean = false
   ) {
@@ -324,15 +323,14 @@ class BackupWorker {
               const modelDb = new ModelDb(hierarchy)
               const txAdapter = await adapterConf.factory(
                 ctx,
-                this.contextVars,
                 hierarchy,
                 adapterConf.url,
                 wsIds,
                 modelDb,
                 this.workspaceStorageAdapter
               )
               try {
-                await txAdapter.init?.(ctx, this.contextVars)
+                await txAdapter.init?.(ctx, {})
 
                 return (
                   await txAdapter.rawFindAll<Tx>(
@@ -418,18 +416,9 @@ export function backupService (
     externalStorage: StorageAdapter
   ) => DbConfiguration,
   region: string,
-  contextVars: Record<string, any>,
   recheck?: boolean
 ): () => void {
-  const backupWorker = new BackupWorker(
-    storage,
-    config,
-    pipelineFactory,
-    workspaceStorageAdapter,
-    getConfig,
-    region,
-    contextVars
-  )
+  const backupWorker = new BackupWorker(storage, config, pipelineFactory, workspaceStorageAdapter, getConfig, region)
 
   const shutdown = (): void => {
     void backupWorker.close()
@@ -455,7 +444,6 @@ export async function doBackupWorkspace (
   region: string,
   downloadLimit: number,
   skipDomains: string[],
-  contextVars: Record<string, any>,
   fullCheck: boolean = false,
   notify?: (progress: number) => Promise<void>
 ): Promise<boolean> {
@@ -466,7 +454,6 @@ export async function doBackupWorkspace (
     workspaceStorageAdapter,
     getConfig,
     region,
-    contextVars,
     skipDomains,
     fullCheck
   )