feat(regions): move project branches and commits

.circleci/config.yml

@@ -598,16 +598,24 @@ jobs:
           POSTGRES_PASSWORD: speckle
           POSTGRES_USER: speckle
         command: -c 'max_connections=1000' -c 'port=5433' -c 'wal_level=logical'
+      - image: 'speckle/speckle-postgres'
+        environment:
+          POSTGRES_DB: speckle2_test
+          POSTGRES_PASSWORD: speckle
+          POSTGRES_USER: speckle
+        command: -c 'max_connections=1000' -c 'port=5434' -c 'wal_level=logical'
       - image: 'minio/minio'
         command: server /data --console-address ":9001" --address "0.0.0.0:9000"
       - image: 'minio/minio'
         command: server /data --console-address ":9021" --address "0.0.0.0:9020"
+      - image: 'minio/minio'
+        command: server /data --console-address ":9041" --address "0.0.0.0:9040"
     environment:
       # Same as test-server:
       NODE_ENV: test
       DATABASE_URL: 'postgres://speckle:[email protected]:5432/speckle2_test'
       PGDATABASE: speckle2_test
-      POSTGRES_MAX_CONNECTIONS_SERVER: 20
+      POSTGRES_MAX_CONNECTIONS_SERVER: 50
       PGUSER: speckle
       SESSION_SECRET: 'keyboard cat'
       STRATEGY_LOCAL: 'true'

.circleci/multiregion.test-ci.json

@@ -25,6 +25,19 @@
         "endpoint": "http://127.0.0.1:9020",
         "s3Region": "us-east-1"
       }
+    },
+    "region2": {
+      "postgres": {
+        "connectionUri": "postgresql://speckle:[email protected]:5434/speckle2_test"
+      },
+      "blobStorage": {
+        "accessKey": "minioadmin",
+        "secretKey": "minioadmin",
+        "bucket": "speckle-server",
+        "createBucketIfNotExists": true,
+        "endpoint": "http://127.0.0.1:9040",
+        "s3Region": "us-east-1"
+      }
     }
   }
 }

docker-compose-deps.yml

@@ -34,6 +34,22 @@ services:
     ports:
       - '127.0.0.1:5401:5432'
 
+  postgres-region2:
+    build:
+      context: .
+      dockerfile: utils/postgres/Dockerfile
+    restart: always
+    environment:
+      POSTGRES_DB: speckle
+      POSTGRES_USER: speckle
+      POSTGRES_PASSWORD: speckle
+    volumes:
+      - postgres-region2-data:/var/lib/postgresql/data/
+      - ./setup/db/10-docker_postgres_init.sql:/docker-entrypoint-initdb.d/10-docker_postgres_init.sql
+      - ./setup/db/11-docker_postgres_keycloack_init.sql:/docker-entrypoint-initdb.d/11-docker_postgres_keycloack_init.sql
+    ports:
+      - '127.0.0.1:5402:5432'
+
   redis:
     image: 'redis:7-alpine'
     restart: always
@@ -62,6 +78,16 @@ services:
       - '127.0.0.1:9020:9000'
       - '127.0.0.1:9021:9001'
 
+  minio-region2:
+    image: 'minio/minio'
+    command: server /data --console-address ":9001"
+    restart: always
+    volumes:
+      - minio-region2-data:/data
+    ports:
+      - '127.0.0.1:9040:9000'
+      - '127.0.0.1:9041:9001'
+
   # Local OIDC provider for testing
   keycloak:
     image: quay.io/keycloak/keycloak:25.0
@@ -133,8 +159,10 @@ services:
 volumes:
   postgres-data:
   postgres-region1-data:
+  postgres-region2-data:
   redis-data:
   pgadmin-data:
   redis_insight-data:
   minio-data:
   minio-region1-data:
+  minio-region2-data:

packages/frontend-2/lib/common/generated/gql/graphql.ts

@@ -4587,6 +4587,11 @@ export type WorkspaceProjectInviteCreateInput = {
 export type WorkspaceProjectMutations = {
   __typename?: 'WorkspaceProjectMutations';
   create: Project;
+  /**
+   * Update project region and move all regional data to new db.
+   * TODO: Currently performs all operations synchronously in request, should probably be scheduled.
+   */
+  moveToRegion: Project;
   moveToWorkspace: Project;
   updateRole: Project;
 };
@@ -4597,6 +4602,12 @@ export type WorkspaceProjectMutationsCreateArgs = {
 };
 
 
+export type WorkspaceProjectMutationsMoveToRegionArgs = {
+  projectId: Scalars['String']['input'];
+  regionKey: Scalars['String']['input'];
+};
+
+
 export type WorkspaceProjectMutationsMoveToWorkspaceArgs = {
   projectId: Scalars['String']['input'];
   workspaceId: Scalars['String']['input'];
@@ -8299,6 +8310,7 @@ export type WorkspacePlanFieldArgs = {
 }
 export type WorkspaceProjectMutationsFieldArgs = {
   create: WorkspaceProjectMutationsCreateArgs,
+  moveToRegion: WorkspaceProjectMutationsMoveToRegionArgs,
   moveToWorkspace: WorkspaceProjectMutationsMoveToWorkspaceArgs,
   updateRole: WorkspaceProjectMutationsUpdateRoleArgs,
 }

packages/server/assets/workspacesCore/typedefs/regions.graphql

@@ -12,3 +12,11 @@ extend type WorkspaceMutations {
   """
   setDefaultRegion(workspaceId: String!, regionKey: String!): Workspace!
 }
+
+extend type WorkspaceProjectMutations {
+  """
+  Update project region and move all regional data to new db.
+  TODO: Currently performs all operations synchronously in request, should probably be scheduled.
+  """
+  moveToRegion(projectId: String!, regionKey: String!): Project!
+}

packages/server/modules/auth/tests/apps.graphql.spec.js

@@ -63,7 +63,6 @@ const { getServerInfoFactory } = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 let sendRequest
-let server
 
 const createAppToken = createAppTokenFactory({
   storeApiToken: storeApiTokenFactory({ db }),
@@ -128,7 +127,6 @@ describe('GraphQL @apps-api', () => {
 
   before(async () => {
     const ctx = await beforeEachContext()
-    server = ctx.server
     ;({ sendRequest } = await initializeTestServer(ctx))
     testUser = {
       name: 'Dimitrie Stefanescu',
@@ -157,10 +155,6 @@ describe('GraphQL @apps-api', () => {
     ])}`
   })
 
-  after(async () => {
-    await server.close()
-  })
-
   let testAppId
   let testApp
 

packages/server/modules/auth/tests/auth.spec.js

@@ -138,7 +138,6 @@ const expect = chai.expect
 
 let app
 let sendRequest
-let server
 
 describe('Auth @auth', () => {
   describe('Local authN & authZ (token endpoints)', () => {
@@ -160,7 +159,6 @@ describe('Auth @auth', () => {
 
     before(async () => {
       const ctx = await beforeEachContext()
-      server = ctx.server
       app = ctx.app
       ;({ sendRequest } = await initializeTestServer(ctx))
 
@@ -173,10 +171,6 @@ describe('Auth @auth', () => {
       )
     })
 
-    after(async () => {
-      await server.close()
-    })
-
     it('Should register a new user (speckle frontend)', async () => {
       await request(app)
         .post('/auth/local/register?challenge=test')

packages/server/modules/core/graph/generated/graphql.ts

@@ -4609,6 +4609,11 @@ export type WorkspaceProjectInviteCreateInput = {
 export type WorkspaceProjectMutations = {
   __typename?: 'WorkspaceProjectMutations';
   create: Project;
+  /**
+   * Update project region and move all regional data to new db.
+   * TODO: Currently performs all operations synchronously in request, should probably be scheduled.
+   */
+  moveToRegion: Project;
   moveToWorkspace: Project;
   updateRole: Project;
 };
@@ -4619,6 +4624,12 @@ export type WorkspaceProjectMutationsCreateArgs = {
 };
 
 
+export type WorkspaceProjectMutationsMoveToRegionArgs = {
+  projectId: Scalars['String']['input'];
+  regionKey: Scalars['String']['input'];
+};
+
+
 export type WorkspaceProjectMutationsMoveToWorkspaceArgs = {
   projectId: Scalars['String']['input'];
   workspaceId: Scalars['String']['input'];
@@ -6943,6 +6954,7 @@ export type WorkspacePlanResolvers<ContextType = GraphQLContext, ParentType exte
 
 export type WorkspaceProjectMutationsResolvers<ContextType = GraphQLContext, ParentType extends ResolversParentTypes['WorkspaceProjectMutations'] = ResolversParentTypes['WorkspaceProjectMutations']> = {
   create?: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<WorkspaceProjectMutationsCreateArgs, 'input'>>;
+  moveToRegion?: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<WorkspaceProjectMutationsMoveToRegionArgs, 'projectId' | 'regionKey'>>;
   moveToWorkspace?: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<WorkspaceProjectMutationsMoveToWorkspaceArgs, 'projectId' | 'workspaceId'>>;
   updateRole?: Resolver<ResolversTypes['Project'], ParentType, ContextType, RequireFields<WorkspaceProjectMutationsUpdateRoleArgs, 'input'>>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;

packages/server/modules/core/services/projects.ts

@@ -61,7 +61,7 @@ export const createNewProjectFactory =
             const replicatedProject = await getProject({ projectId })
             if (!replicatedProject) throw new StreamNotFoundError()
           },
-          { maxAttempts: 10 }
+          { maxAttempts: 100 }
         )
       } catch (err) {
         if (err instanceof StreamNotFoundError) {

packages/server/modules/cross-server-sync/graph/generated/graphql.ts

@@ -4590,6 +4590,11 @@ export type WorkspaceProjectInviteCreateInput = {
 export type WorkspaceProjectMutations = {
   __typename?: 'WorkspaceProjectMutations';
   create: Project;
+  /**
+   * Update project region and move all regional data to new db.
+   * TODO: Currently performs all operations synchronously in request, should probably be scheduled.
+   */
+  moveToRegion: Project;
   moveToWorkspace: Project;
   updateRole: Project;
 };
@@ -4600,6 +4605,12 @@ export type WorkspaceProjectMutationsCreateArgs = {
 };
 
 
+export type WorkspaceProjectMutationsMoveToRegionArgs = {
+  projectId: Scalars['String']['input'];
+  regionKey: Scalars['String']['input'];
+};
+
+
 export type WorkspaceProjectMutationsMoveToWorkspaceArgs = {
   projectId: Scalars['String']['input'];
   workspaceId: Scalars['String']['input'];

packages/server/modules/multiregion/utils/dbSelector.ts

@@ -214,7 +214,7 @@ const setUpUserReplication = async ({
   try {
     await from.public.raw(`CREATE PUBLICATION ${pubName} FOR TABLE users;`)
   } catch (err) {
-    if (!(err instanceof Error))
+    if (!(err instanceof Error)) {
       throw new DatabaseError(
         'Could not create publication {pubName} when setting up user replication for region {regionName}',
         from.public,
@@ -223,7 +223,16 @@ const setUpUserReplication = async ({
           info: { pubName, regionName }
         }
       )
-    if (!err.message.includes('already exists')) throw err
+    }
+
+    const errorMessage = err.message
+
+    if (
+      !['already exists', 'violates unique constraint'].some((message) =>
+        errorMessage.includes(message)
+      )
+    )
+      throw err
   }
 
   const fromUrl = new URL(

packages/server/modules/shared/helpers/dbHelper.ts

@@ -23,7 +23,7 @@ export async function* executeBatchedSelect<
 >(
   selectQuery: Knex.QueryBuilder<TRecord, TResult>,
   options?: Partial<BatchedSelectOptions>
-): AsyncGenerator<TResult, void, unknown> {
+): AsyncGenerator<Awaited<typeof selectQuery>, void, unknown> {
   const { batchSize = 100, trx } = options || {}
 
   if (trx) selectQuery.transacting(trx)
@@ -34,7 +34,7 @@ export async function* executeBatchedSelect<
   let currentOffset = 0
   while (hasMorePages) {
     const q = selectQuery.clone().offset(currentOffset)
-    const results = (await q) as TResult
+    const results = (await q) as Awaited<typeof selectQuery>
 
     if (!results.length) {
       hasMorePages = false

packages/server/modules/stats/tests/stats.spec.ts

@@ -8,7 +8,6 @@ import {
   getTotalUserCountFactory
 } from '@/modules/stats/repositories/index'
 import { Scopes } from '@speckle/shared'
-import { Server } from 'node:http'
 import { db } from '@/db/knex'
 import {
   createCommitByBranchIdFactory,
@@ -194,8 +193,7 @@ describe('Server stats services @stats-services', function () {
 })
 
 describe('Server stats api @stats-api', function () {
-  let server: Server,
-    sendRequest: Awaited<ReturnType<typeof initializeTestServer>>['sendRequest']
+  let sendRequest: Awaited<ReturnType<typeof initializeTestServer>>['sendRequest']
 
   const adminUser = {
     name: 'Dimitrie',
@@ -233,7 +231,6 @@ describe('Server stats api @stats-api', function () {
   before(async function () {
     this.timeout(15000)
     const ctx = await beforeEachContext()
-    server = ctx.server
     ;({ sendRequest } = await initializeTestServer(ctx))
 
     adminUser.id = await createUser(adminUser)
@@ -263,10 +260,6 @@ describe('Server stats api @stats-api', function () {
     await seedDb(params)
   })
 
-  after(async function () {
-    await server.close()
-  })
-
   it('Should not get stats if user is not admin', async () => {
     const res = await sendRequest(adminUser.badToken, { query: fullQuery })
     expect(res.body.errors).to.exist

packages/server/modules/webhooks/tests/webhooks.spec.js

@@ -2,11 +2,7 @@
 const expect = require('chai').expect
 const assert = require('assert')
 
-const {
-  beforeEachContext,
-  initializeTestServer,
-  truncateTables
-} = require('@/test/hooks')
+const { beforeEachContext, initializeTestServer } = require('@/test/hooks')
 const { noErrors } = require('@/test/helpers')
 const { Scopes, Roles } = require('@speckle/shared')
 const {
@@ -26,7 +22,6 @@ const {
   deleteWebhookFactory,
   dispatchStreamEventFactory
 } = require('@/modules/webhooks/services/webhooks')
-const { Users, Streams } = require('@/modules/core/dbSchema')
 const {
   getStreamFactory,
   createStreamFactory,
@@ -166,7 +161,7 @@ const createPersonalAccessToken = createPersonalAccessTokenFactory({
 
 describe('Webhooks @webhooks', () => {
   const getWebhook = getWebhookByIdFactory({ db })
-  let server, sendRequest
+  let sendRequest
 
   const userOne = {
     name: 'User',
@@ -191,7 +186,6 @@ describe('Webhooks @webhooks', () => {
 
   before(async () => {
     const ctx = await beforeEachContext()
-    server = ctx.server
     ;({ sendRequest } = await initializeTestServer(ctx))
 
     userOne.id = await createUser(userOne)
@@ -201,16 +195,6 @@ describe('Webhooks @webhooks', () => {
     webhookOne.streamId = streamOne.id
   })
 
-  after(async () => {
-    await truncateTables([
-      Users.name,
-      Streams.name,
-      'webhooks_config',
-      'webhooks_events'
-    ])
-    await server.close()
-  })
-
   describe('Create, Read, Update, Delete Webhooks', () => {
     it('Should create a webhook', async () => {
       webhookOne.id = await createWebhookFactory({