Optimize sync, reset, seed commands to flush cache and to use less memory (#7034)

In this PR:
- removing ugprade-0.24 commands as we are releasing 0.30
- introducing cache:flush command
- refactoring upgrade command and sync-metadata command to use the
ActiveWorkspacesCommand so they consistently run on all workspaces or
selected workspaces

Fixes:
- clear localStorage on sign out
- fix missing workspaceMember in verify resolver
- do not throw on datasource already destroyed exception which can
happen with race condition when several resolvers are resolving in
parallel

packages/twenty-server/src/engine/api/graphql/metadata.module-factory.ts

@@ -4,7 +4,7 @@ import GraphQLJSON from 'graphql-type-json';
 import { useCachedMetadata } from 'src/engine/api/graphql/graphql-config/hooks/use-cached-metadata';
 import { useThrottler } from 'src/engine/api/graphql/graphql-config/hooks/use-throttler';
 import { MetadataGraphQLApiModule } from 'src/engine/api/graphql/metadata-graphql-api.module';
-import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
 import { useGraphQLErrorHandlerHook } from 'src/engine/core-modules/graphql/hooks/use-graphql-error-handler.hook';

packages/twenty-server/src/engine/core-modules/auth/services/auth.service.ts

@@ -34,7 +34,6 @@ import { WorkspaceInviteHashValid } from 'src/engine/core-modules/auth/dto/works
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
 import { EmailService } from 'src/engine/core-modules/email/email.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { WorkspaceMember } from 'src/engine/core-modules/user/dtos/workspace-member.dto';
 import { UserService } from 'src/engine/core-modules/user/services/user.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
@@ -150,14 +149,6 @@ export class AuthService {
 
     // passwordHash is hidden for security reasons
     user.passwordHash = '';
-    const workspaceMember = await this.userService.loadWorkspaceMember(
-      user,
-      user.defaultWorkspace,
-    );
-
-    if (workspaceMember) {
-      user.workspaceMember = workspaceMember as WorkspaceMember;
-    }
 
     const accessToken = await this.tokenService.generateAccessToken(user.id);
     const refreshToken = await this.tokenService.generateRefreshToken(user.id);

packages/twenty-server/src/engine/core-modules/cache-storage/cache-storage.module.ts

@@ -1,11 +1,12 @@
-import { Module, Global, Inject, OnModuleDestroy } from '@nestjs/common';
-import { CacheModule, CACHE_MANAGER, Cache } from '@nestjs/cache-manager';
+import { CACHE_MANAGER, Cache, CacheModule } from '@nestjs/cache-manager';
+import { Global, Inject, Module, OnModuleDestroy } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 
-import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { cacheStorageModuleFactory } from 'src/engine/core-modules/cache-storage/cache-storage.module-factory';
+import { FlushCacheCommand } from 'src/engine/core-modules/cache-storage/commands/flush-cache.command';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 
 @Global()
 @Module({
@@ -25,8 +26,9 @@ import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/typ
       },
       inject: [CACHE_MANAGER],
     })),
+    FlushCacheCommand,
   ],
-  exports: [...Object.values(CacheStorageNamespace)],
+  exports: [...Object.values(CacheStorageNamespace), FlushCacheCommand],
 })
 export class CacheStorageModule implements OnModuleDestroy {
   constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {}

packages/twenty-server/src/engine/core-modules/cache-storage/commands/flush-cache.command.ts

@@ -0,0 +1,29 @@
+import { Logger } from '@nestjs/common';
+
+import { Command, CommandRunner } from 'nest-commander';
+
+import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
+
+// TODO: implement dry-run
+@Command({
+  name: 'cache:flush',
+  description: 'Completely flush cache',
+})
+export class FlushCacheCommand extends CommandRunner {
+  private readonly logger = new Logger(FlushCacheCommand.name);
+
+  constructor(
+    @InjectCacheStorage(CacheStorageNamespace.EngineWorkspace)
+    private readonly cacheStorage: CacheStorageService,
+  ) {
+    super();
+  }
+
+  async run(): Promise<void> {
+    this.logger.log('Flushing cache...');
+    await this.cacheStorage.flush();
+    this.logger.log('Cache flushed');
+  }
+}

packages/twenty-server/src/engine/core-modules/throttler/throttler.service.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@nestjs/common';
 
+import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
+import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 import {
   ThrottlerException,
   ThrottlerExceptionCode,
 } from 'src/engine/core-modules/throttler/throttler.exception';
-import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
-import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
-import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 
 @Injectable()
 export class ThrottlerService {

packages/twenty-server/src/engine/core-modules/user/user.resolver.ts

@@ -103,7 +103,7 @@ export class UserResolver {
   ): Promise<WorkspaceMember | null> {
     const workspaceMember = await this.userService.loadWorkspaceMember(
       user,
-      workspace,
+      workspace ?? user.defaultWorkspace,
     );
 
     if (workspaceMember && workspaceMember.avatarUrl) {

packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.module.ts

@@ -21,7 +21,6 @@ import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadat
 import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
 
 import { FieldMetadataEntity } from './field-metadata.entity';
 import { FieldMetadataService } from './field-metadata.service';
@@ -38,7 +37,6 @@ import { UpdateFieldInput } from './dtos/update-field.input';
           'metadata',
         ),
         WorkspaceMigrationModule,
-        WorkspaceStatusModule,
         WorkspaceMigrationRunnerModule,
         WorkspaceMetadataVersionModule,
         ObjectMetadataModule,

packages/twenty-server/src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service.ts

@@ -48,7 +48,5 @@ export class WorkspaceMetadataVersionService {
     await this.workspaceMetadataCacheService.recomputeMetadataCache(
       workspaceId,
     );
-
-    await this.twentyORMGlobalManager.loadDataSourceForWorkspace(workspaceId);
   }
 }

packages/twenty-server/src/engine/twenty-orm/factories/workspace-datasource.factory.ts

@@ -146,7 +146,18 @@ export class WorkspaceDatasourceFactory {
 
         return workspaceDataSource;
       },
-      (dataSource) => dataSource.destroy(),
+      async (dataSource) => {
+        try {
+          await dataSource.destroy();
+        } catch (error) {
+          // Ignore error if pool has already been destroyed which is a common race condition case
+          if (error.message === 'Called end on pool more than once') {
+            return;
+          }
+
+          throw error;
+        }
+      },
     );
 
     if (!workspaceDataSource) {

packages/twenty-server/src/engine/workspace-cache-storage/workspace-cache-storage.service.ts

@@ -2,8 +2,8 @@ import { Injectable } from '@nestjs/common';
 
 import { EntitySchemaOptions } from 'typeorm';
 
-import { CacheStorageService } from 'src/engine/core-modules/cache-storage/cache-storage.service';
 import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
+import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 import { ObjectMetadataMap } from 'src/engine/metadata-modules/utils/generate-object-metadata-map.util';
 

packages/twenty-server/src/engine/workspace-manager/workspace-manager.module.ts

@@ -5,7 +5,6 @@ import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadat
 import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
-import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
 import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
 
 import { WorkspaceManagerService } from './workspace-manager.service';
@@ -18,7 +17,6 @@ import { WorkspaceManagerService } from './workspace-manager.service';
     DataSourceModule,
     WorkspaceSyncMetadataModule,
     WorkspaceHealthModule,
-    WorkspaceStatusModule,
   ],
   exports: [WorkspaceManagerService],
   providers: [WorkspaceManagerService],

packages/twenty-server/src/engine/workspace-manager/workspace-status/services/workspace-status.service.ts

@@ -1,72 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Any, Repository } from 'typeorm';
-
-import {
-  BillingSubscription,
-  SubscriptionStatus,
-} from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
-import { FeatureFlagKey } from 'src/engine/core-modules/feature-flag/enums/feature-flag-key.enum';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-
-@Injectable()
-export class WorkspaceStatusService {
-  constructor(
-    private readonly environmentService: EnvironmentService,
-    @InjectRepository(Workspace, 'core')
-    private readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(BillingSubscription, 'core')
-    private readonly billingSubscriptionRepository: Repository<BillingSubscription>,
-    @InjectRepository(FeatureFlagEntity, 'core')
-    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
-  ) {}
-
-  async getActiveWorkspaceIds(): Promise<string[]> {
-    const workspaces = await this.workspaceRepository.find();
-    const workspaceIds = workspaces.map((workspace) => workspace.id);
-
-    if (!this.environmentService.get('IS_BILLING_ENABLED')) {
-      return workspaceIds;
-    }
-
-    const billingSubscriptionForWorkspaces =
-      await this.billingSubscriptionRepository.find({
-        where: {
-          workspaceId: Any(workspaceIds),
-          status: Any([
-            SubscriptionStatus.PastDue,
-            SubscriptionStatus.Active,
-            SubscriptionStatus.Trialing,
-          ]),
-        },
-      });
-
-    const workspaceIdsWithActiveSubscription =
-      billingSubscriptionForWorkspaces.map(
-        (billingSubscription) => billingSubscription.workspaceId,
-      );
-
-    const freeAccessEnabledFeatureFlagForWorkspace =
-      await this.featureFlagRepository.find({
-        where: {
-          workspaceId: Any(workspaceIds),
-          key: FeatureFlagKey.IsFreeAccessEnabled,
-          value: true,
-        },
-      });
-
-    const workspaceIdsWithFreeAccessEnabled =
-      freeAccessEnabledFeatureFlagForWorkspace.map(
-        (featureFlag) => featureFlag.workspaceId,
-      );
-
-    return workspaceIds.filter(
-      (workspaceId) =>
-        workspaceIdsWithActiveSubscription.includes(workspaceId) ||
-        workspaceIdsWithFreeAccessEnabled.includes(workspaceId),
-    );
-  }
-}

packages/twenty-server/src/engine/workspace-manager/workspace-status/workspace-manager.module.ts

@@ -1,21 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { BillingSubscription } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
-import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentModule } from 'src/engine/core-modules/environment/environment.module';
-import { WorkspaceStatusService } from 'src/engine/workspace-manager/workspace-status/services/workspace-status.service';
-
-@Module({
-  imports: [
-    EnvironmentModule,
-    TypeOrmModule.forFeature(
-      [Workspace, BillingSubscription, FeatureFlagEntity],
-      'core',
-    ),
-  ],
-  exports: [WorkspaceStatusService],
-  providers: [WorkspaceStatusService],
-})
-export class WorkspaceStatusModule {}

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command.ts

@@ -1,11 +1,12 @@
-import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 
-import isEmpty from 'lodash.isempty';
-import { Command, CommandRunner, Option } from 'nest-commander';
+import { Command, Option } from 'nest-commander';
+import { Repository } from 'typeorm';
 
+import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
 import { WorkspaceHealthService } from 'src/engine/workspace-manager/workspace-health/workspace-health.service';
-import { WorkspaceStatusService } from 'src/engine/workspace-manager/workspace-status/services/workspace-status.service';
 import { WorkspaceSyncMetadataService } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.service';
 
 import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.service';
@@ -21,35 +22,24 @@ interface RunWorkspaceMigrationsOptions {
   name: 'workspace:sync-metadata',
   description: 'Sync metadata',
 })
-export class SyncWorkspaceMetadataCommand extends CommandRunner {
-  private readonly logger = new Logger(SyncWorkspaceMetadataCommand.name);
-
+export class SyncWorkspaceMetadataCommand extends ActiveWorkspacesCommandRunner {
   constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
     private readonly workspaceSyncMetadataService: WorkspaceSyncMetadataService,
     private readonly workspaceHealthService: WorkspaceHealthService,
     private readonly dataSourceService: DataSourceService,
     private readonly syncWorkspaceLoggerService: SyncWorkspaceLoggerService,
-    private readonly workspaceStatusService: WorkspaceStatusService,
   ) {
-    super();
+    super(workspaceRepository);
   }
 
-  async run(
+  async executeActiveWorkspacesCommand(
     _passedParam: string[],
     options: RunWorkspaceMigrationsOptions,
+    workspaceIds: string[],
   ): Promise<void> {
-    // TODO: re-implement load index from workspaceService, this is breaking the logger
-    let workspaceIds = options.workspaceId ? [options.workspaceId] : [];
-
-    if (isEmpty(workspaceIds)) {
-      const activeWorkspaceIds =
-        await this.workspaceStatusService.getActiveWorkspaceIds();
-
-      workspaceIds = activeWorkspaceIds;
-      this.logger.log(
-        `Attempting to sync ${activeWorkspaceIds.length} workspaces.`,
-      );
-    }
+    this.logger.log(`Attempting to sync ${workspaceIds.length} workspaces.`);
 
     let count = 1;
 
@@ -138,15 +128,6 @@ export class SyncWorkspaceMetadataCommand extends CommandRunner {
     );
   }
 
-  @Option({
-    flags: '-w, --workspace-id [workspace_id]',
-    description: 'workspace id',
-    required: false,
-  })
-  parseWorkspaceId(value: string): string {
-    return value;
-  }
-
   @Option({
     flags: '-d, --dry-run',
     description: 'Dry run without applying changes',

packages/twenty-server/src/engine/workspace-manager/workspace-sync-metadata/commands/workspace-sync-metadata-commands.module.ts

@@ -6,7 +6,6 @@ import { WorkspaceModule } from 'src/engine/core-modules/workspace/workspace.mod
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { WorkspaceHealthModule } from 'src/engine/workspace-manager/workspace-health/workspace-health.module';
-import { WorkspaceStatusModule } from 'src/engine/workspace-manager/workspace-status/workspace-manager.module';
 import { ConvertRecordPositionsToIntegers } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/convert-record-positions-to-integers.command';
 import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/workspace-sync-metadata/workspace-sync-metadata.module';
 
@@ -22,7 +21,6 @@ import { SyncWorkspaceLoggerService } from './services/sync-workspace-logger.ser
     DataSourceModule,
     WorkspaceDataSourceModule,
     TypeOrmModule.forFeature([Workspace], 'core'),
-    WorkspaceStatusModule,
   ],
   providers: [
     SyncWorkspaceMetadataCommand,