The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Record published app versions (#28128)
martmull9dc41d819ab6
diff --git a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.tsindex 10671d7c3ee..364fbf19f8f 100644--- a/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts+++ b/packages/twenty-oxlint-rules/rules/prefer-workspace-scoped-repository.exemptions.ts@@ -14,6 +14,7 @@ export const STRUCTURAL_EXEMPTIONS = ['ApplicationRegistrationEntity','ApplicationRegistrationVariableEntity',+ 'ApplicationRegistrationVersionEntity','BillingMeterEntity','BillingPriceEntity','BillingProductEntity',diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-fast-1792077317736-add-application-registration-versions.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-fast-1792077317736-add-application-registration-versions.tsnew file mode 100644index 00000000000..b68c5ca77d6--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-fast-1792077317736-add-application-registration-versions.ts@@ -0,0 +1,21 @@+import { QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { FastInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/fast-instance-command.interface';++@RegisteredInstanceCommand('2.48.0', 1792077317736)+export class AddApplicationRegistrationVersionsFastInstanceCommand implements FastInstanceCommand {+ public async up(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query('CREATE TABLE "core"."applicationRegistrationVersion" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "applicationRegistrationId" uuid NOT NULL, "version" character varying NOT NULL, "sourceType" character varying NOT NULL, "sourcePackage" character varying, "tarballFileId" uuid, "tarballUrl" character varying, "publishedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), CONSTRAINT "IDX_APP_REG_VERSION_APP_REGISTRATION_ID_VERSION_UNIQUE" UNIQUE ("applicationRegistrationId", "version"), CONSTRAINT "CHK_APP_REG_VERSION_NPM_HAS_SOURCE_PACKAGE" CHECK ("sourceType" <> \'npm\' OR "sourcePackage" IS NOT NULL), CONSTRAINT "PK_bfa9041162e158e878354984852" PRIMARY KEY ("id"))');+ await queryRunner.query('CREATE INDEX "IDX_APP_REG_VERSION_TARBALL_FILE_ID" ON "core"."applicationRegistrationVersion" ("tarballFileId") ');+ await queryRunner.query('ALTER TABLE "core"."applicationRegistrationVersion" ADD CONSTRAINT "FK_02169996cebff7ce601ef1a8856" FOREIGN KEY ("applicationRegistrationId") REFERENCES "core"."applicationRegistration"("id") ON DELETE CASCADE ON UPDATE NO ACTION');+ await queryRunner.query('ALTER TABLE "core"."applicationRegistrationVersion" ADD CONSTRAINT "FK_d0a422e76f4d8289dd6c18c538c" FOREIGN KEY ("tarballFileId") REFERENCES "core"."file"("id") ON DELETE SET NULL ON UPDATE NO ACTION');+ }++ public async down(queryRunner: QueryRunner): Promise<void> {+ await queryRunner.query('ALTER TABLE "core"."applicationRegistrationVersion" DROP CONSTRAINT "FK_d0a422e76f4d8289dd6c18c538c"');+ await queryRunner.query('ALTER TABLE "core"."applicationRegistrationVersion" DROP CONSTRAINT "FK_02169996cebff7ce601ef1a8856"');+ await queryRunner.query('DROP INDEX "core"."IDX_APP_REG_VERSION_TARBALL_FILE_ID"');+ await queryRunner.query('DROP TABLE "core"."applicationRegistrationVersion"');+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.tsnew file mode 100644index 00000000000..8a7bb54852a--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.ts@@ -0,0 +1,31 @@+import { type DataSource, type QueryRunner } from 'typeorm';++import { RegisteredInstanceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-instance-command.decorator';+import { type SlowInstanceCommand } from 'src/engine/core-modules/upgrade/interfaces/slow-instance-command.interface';++@RegisteredInstanceCommand('2.48.0', 1792077361238, { type: 'slow' })+export class BackfillApplicationRegistrationVersionsSlowInstanceCommand implements SlowInstanceCommand {+ async runDataMigration(dataSource: DataSource): Promise<void> {+ await dataSource.query(+ `INSERT INTO "core"."applicationRegistrationVersion"+ ("applicationRegistrationId", "version", "sourceType", "sourcePackage",+ "tarballFileId", "publishedAt")+ SELECT "id", "latestAvailableVersion", "sourceType", "sourcePackage",+ "tarballFileId",+ "updatedAt"+ FROM "core"."applicationRegistration"+ WHERE "deletedAt" IS NULL+ AND "latestAvailableVersion" IS NOT NULL+ AND "sourceType" IN ('npm', 'tarball')+ ON CONFLICT ("applicationRegistrationId", "version") DO NOTHING`,+ );+ }++ public async up(_queryRunner: QueryRunner): Promise<void> {+ return;+ }++ public async down(_queryRunner: QueryRunner): Promise<void> {+ return;+ }+}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/add-application-registration-versions-upgrade-command-name.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/add-application-registration-versions-upgrade-command-name.constant.tsnew file mode 100644index 00000000000..dda0bd99ff0--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-48/add-application-registration-versions-upgrade-command-name.constant.ts@@ -0,0 +1,2 @@+export const ADD_APPLICATION_REGISTRATION_VERSIONS_UPGRADE_COMMAND_NAME =+ '2.48.0_AddApplicationRegistrationVersionsFastInstanceCommand_1792077317736';diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.tsindex efc50c84126..0bd0057ee0e 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/instance-commands.constant.ts@@ -242,6 +242,8 @@ import { DropUsageLimitMeterFastInstanceCommand } from 'src/database/commands/upimport { SetWorkspaceEventLogRetentionDefaultFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-instance-command-fast-1791790299002-set-workspace-event-log-retention-default';import { AddWidgetAvailabilityToFrontComponentFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-47/2-47-instance-command-fast-1791898075681-add-widget-availability-to-front-component';import { AddIdentifyAccountLogicFunctionAndExternalAccountIdFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-48/2-48-instance-command-fast-1791975194413-add-identify-account-logic-function-and-external-account-id';+import { AddApplicationRegistrationVersionsFastInstanceCommand } from 'src/database/commands/upgrade-version-command/2-48/2-48-instance-command-fast-1792077317736-add-application-registration-versions';+import { BackfillApplicationRegistrationVersionsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-48/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions';export const INSTANCE_COMMANDS = [AddViewFieldGroupIdIndexOnViewFieldFastInstanceCommand,@@ -486,4 +488,6 @@ export const INSTANCE_COMMANDS = [SetWorkspaceEventLogRetentionDefaultFastInstanceCommand,AddWidgetAvailabilityToFrontComponentFastInstanceCommand,AddIdentifyAccountLogicFunctionAndExternalAccountIdFastInstanceCommand,+ AddApplicationRegistrationVersionsFastInstanceCommand,+ BackfillApplicationRegistrationVersionsSlowInstanceCommand,];diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-install.service.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-install.service.spec.tsindex 2ee8c51baaa..ca3a50d72a4 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-install.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/__tests__/application-install.service.spec.ts@@ -14,6 +14,7 @@ import {type ResolvedPackage,} from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';import { type ApplicationVersionValidationService } from 'src/engine/core-modules/application/application-package/application-version-validation.service';+import { type ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { type ApplicationLookupService } from 'src/engine/core-modules/application/application-lookup/application-lookup.service';@@ -74,6 +75,9 @@ describe('ApplicationInstallService', () => {{validateVersionProgression: jest.fn().mockReturnValue({ allowed: true }),} as unknown as ApplicationVersionValidationService,+ {+ ensureNpmVersion: jest.fn().mockResolvedValue(undefined),+ } as unknown as ApplicationRegistrationVersionService,{} as ApplicationSyncService,{applyManifestToWorkspace: jestdiff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.tsindex 321405e30c4..c4527f8ed71 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.module.ts@@ -22,10 +22,12 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheimport { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadata-modules/flat-entity/services/workspace-many-or-all-flat-entity-maps-cache.module';import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';+import { ApplicationRegistrationVersionModule } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.module';@Module({imports: [ApplicationRegistrationLookupModule,+ ApplicationRegistrationVersionModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,TypeOrmModule.forFeature([ApplicationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.tsindex dfd9375c2f8..fce39194d2c 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-install/application-install.service.ts@@ -25,6 +25,7 @@ import {VERSION_PROGRESSION_REASON_TO_INSTALL_EXCEPTION_CODE,VERSION_REASON_TO_APPLICATION_EXCEPTION_CODE,} from 'src/engine/core-modules/application/application-package/constants/version-reason-to-exception-code.constant';+import { ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { isImageFilePath } from 'src/engine/core-modules/application/application-registration/utils/is-image-file-path.util';@@ -76,6 +77,7 @@ export class ApplicationInstallService {private readonly applicationLookupService: ApplicationLookupService,private readonly applicationPackageFetcherService: ApplicationPackageFetcherService,private readonly applicationVersionValidationService: ApplicationVersionValidationService,+ private readonly applicationRegistrationVersionService: ApplicationRegistrationVersionService,private readonly applicationSyncService: ApplicationSyncService,private readonly applicationManifestApplyService: ApplicationManifestApplyService,private readonly fileStorageService: FileStorageService,@@ -381,6 +383,18 @@ export class ApplicationInstallService {}}+ if (+ appRegistration.sourceType === ApplicationRegistrationSourceType.NPM &&+ isDefined(resolvedPackage.registryTarballUrl)+ ) {+ await this.applicationRegistrationVersionService.ensureNpmVersion({+ applicationRegistrationId: appRegistration.id,+ version: newVersion,+ sourcePackage: appRegistration.sourcePackage,+ tarballUrl: resolvedPackage.registryTarballUrl,+ });+ }+if (isVersionUpgrade && shouldApplyApprovedCapabilities) {await this.applicationService.update(application.id, {grantedCapabilities,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.tsindex 826f2f3cd4e..927d02a4a58 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service.ts@@ -1,10 +1,17 @@import { Injectable, Logger } from '@nestjs/common';+import { isNonEmptyString } from '@sniptt/guards';import { isDefined, isValidUuid } from 'twenty-shared/utils';-import { MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';+import {+ MarketplaceService,+ type RegistryPackageInfo,+} from 'src/engine/core-modules/application/application-marketplace/marketplace.service';+import { ApplicationPackageFetcherService } from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';+import { ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { ApplicationRegistrationAssetService } from 'src/engine/core-modules/application/application-registration/application-registration-asset.service';import { ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { areRegistrationAssetsStored } from 'src/engine/core-modules/application/application-registration/utils/are-registration-assets-stored.util';@@ -17,7 +24,9 @@ export class MarketplaceCatalogSyncService {private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly applicationRegistrationLookupService: ApplicationRegistrationLookupService,private readonly applicationRegistrationAssetService: ApplicationRegistrationAssetService,+ private readonly applicationRegistrationVersionService: ApplicationRegistrationVersionService,private readonly marketplaceService: MarketplaceService,+ private readonly applicationPackageFetcherService: ApplicationPackageFetcherService,) {}async syncCatalog(): Promise<void> {@@ -75,6 +84,17 @@ export class MarketplaceCatalogSyncService {continue;}+ try {+ await this.recordCatalogVersion({+ registration,+ registryPackage: pkg,+ });+ } catch (error) {+ this.logger.error(+ `Failed to record version ${pkg.version} of registry app "${pkg.name}": ${error instanceof Error ? error.message : String(error)}`,+ );+ }+// Rehost the logo and gallery images from the registry CDN so display// urls are served from fileIds like every other source. Skipped when// the version is unchanged and the files are already stored; the@@ -108,4 +128,49 @@ export class MarketplaceCatalogSyncService {}}}++ private async recordCatalogVersion({+ registration,+ registryPackage,+ }: {+ registration: Pick<ApplicationRegistrationEntity, 'id'>;+ registryPackage: RegistryPackageInfo;+ }): Promise<void> {+ if (!isNonEmptyString(registryPackage.version)) {+ return;+ }++ const recordedVersion =+ await this.applicationRegistrationVersionService.findOneByApplicationRegistrationIdAndVersion(+ {+ applicationRegistrationId: registration.id,+ version: registryPackage.version,+ },+ );++ if (isDefined(recordedVersion?.tarballUrl)) {+ return;+ }++ const tarballUrl =+ await this.applicationPackageFetcherService.findRegistryTarballUrl({+ packageName: registryPackage.name,+ version: registryPackage.version,+ });++ if (!isDefined(tarballUrl)) {+ this.logger.warn(+ `Version ${registryPackage.version} of ${registryPackage.name} left incomplete: registry gave no artifact details, retrying on the next sync`,+ );++ return;+ }++ await this.applicationRegistrationVersionService.ensureNpmVersion({+ applicationRegistrationId: registration.id,+ version: registryPackage.version,+ sourcePackage: registryPackage.name,+ tarballUrl,+ });+ }}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.tsindex 288e56ece37..5152bb1c70f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace.module.ts@@ -5,6 +5,7 @@ import { ApplicationModule } from 'src/engine/core-modules/application/applicatiimport { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';import { ApplicationRegistrationLookupModule } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.module';import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';+import { ApplicationRegistrationVersionModule } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.module';import { MarketplaceCatalogSyncCronCommand } from 'src/engine/core-modules/application/application-marketplace/crons/commands/marketplace-catalog-sync.cron.command';import { MarketplaceCatalogSyncCronJob } from 'src/engine/core-modules/application/application-marketplace/crons/marketplace-catalog-sync.cron.job';import { MarketplaceCatalogCacheProviderService } from 'src/engine/core-modules/application/application-marketplace/marketplace-catalog-cache-provider.service';@@ -22,6 +23,7 @@ import { MarketplaceCatalogSyncCommand } from 'src/engine/core-modules/applicatiApplicationPackageModule,ApplicationRegistrationLookupModule,ApplicationRegistrationModule,+ ApplicationRegistrationVersionModule,CoreEntityCacheModule,PermissionsModule,],diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.tsindex 759473a5fe0..14b2549994d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-package-fetcher.service.ts@@ -45,6 +45,7 @@ export type ResolvedPackage = {cleanupDir: string;manifest: Manifest;packageJson: PackageJson;+ registryTarballUrl?: string;};const registryVersionMetadataSchema = z.object({@@ -129,6 +130,36 @@ export class ApplicationPackageFetcherService implements OnModuleInit {}}+ async findRegistryTarballUrl({+ packageName,+ version,+ }: {+ packageName: string;+ version: string;+ }): Promise<string | null> {+ try {+ assertValidNpmPackageName(packageName);+ assertValidNpmVersionSpec(version);++ return await this.fetchRegistryTarballUrlOrThrow(+ this.twentyConfigService.get('APP_REGISTRY_URL'),+ packageName,+ version,+ this.twentyConfigService.get('APP_REGISTRY_TOKEN'),+ );+ } catch (error) {+ if (!(error instanceof ApplicationException)) {+ throw error;+ }++ this.logger.warn(+ `No registry artifact for ${packageName}@${version}: ${error.message}`,+ );++ return null;+ }+ }+async cleanupExtractedDir(extractedDir: string): Promise<void> {try {await fs.rm(extractedDir, { recursive: true, force: true });@@ -155,7 +186,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {assertValidNpmVersionSpec(versionSpec);- const tarballUrl = await this.fetchTarballUrl(+ const tarballUrl = await this.fetchRegistryTarballUrlOrThrow(registryUrl,sourcePackage,versionSpec,@@ -196,6 +227,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {cleanupDir: workDir,manifest,packageJson,+ registryTarballUrl: tarballUrl,};} catch (error) {await this.cleanupExtractedDir(workDir);@@ -289,7 +321,7 @@ export class ApplicationPackageFetcherService implements OnModuleInit {}}- private async fetchTarballUrl(+ private async fetchRegistryTarballUrlOrThrow(registryUrl: string,sourcePackage: string,versionSpec: string,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/application-version-validation.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-version-validation.service.tsindex db493090f39..30fa31bca50 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-package/application-version-validation.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-version-validation.service.ts@@ -114,6 +114,18 @@ export class ApplicationVersionValidationService {});}+ validatePackageVersion(incomingVersion: string): VersionProgressionResult {+ if (!isDefined(semver.valid(incomingVersion))) {+ return {+ allowed: false,+ reason: 'INVALID_INCOMING_VERSION',+ message: `Invalid version "${incomingVersion}" in package.json. Must be a valid semver version.`,+ };+ }++ return { allowed: true };+ }+// A current version that is not valid semver never blocks: there is// nothing reliable to compare against.validateVersionProgression({@@ -127,12 +139,10 @@ export class ApplicationVersionValidationService {universalIdentifier: string;action: 'install' | 'deploy';}): VersionProgressionResult {- if (!isDefined(semver.valid(incomingVersion))) {- return {- allowed: false,- reason: 'INVALID_INCOMING_VERSION',- message: `Invalid version "${incomingVersion}" in package.json. Must be a valid semver version.`,- };+ const validation = this.validatePackageVersion(incomingVersion);++ if (!validation.allowed) {+ return validation;}if (!isDefined(semver.valid(currentVersion))) {diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.entity.tsnew file mode 100644index 00000000000..3e0da547a77--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.entity.ts@@ -0,0 +1,77 @@+import {+ Check,+ Column,+ CreateDateColumn,+ Entity,+ Index,+ JoinColumn,+ ManyToOne,+ PrimaryGeneratedColumn,+ type Relation,+ Unique,+ UpdateDateColumn,+} from 'typeorm';++import { ADD_APPLICATION_REGISTRATION_VERSIONS_UPGRADE_COMMAND_NAME } from 'src/database/commands/upgrade-version-command/2-48/add-application-registration-versions-upgrade-command-name.constant';+import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';+import { WasIntroducedInUpgrade } from 'src/engine/core-modules/upgrade/decorators/was-introduced-in-upgrade.decorator';++@Entity({ name: 'applicationRegistrationVersion', schema: 'core' })+@WasIntroducedInUpgrade({+ upgradeCommandName:+ ADD_APPLICATION_REGISTRATION_VERSIONS_UPGRADE_COMMAND_NAME,+})+@Unique('IDX_APP_REG_VERSION_APP_REGISTRATION_ID_VERSION_UNIQUE', [+ 'applicationRegistrationId',+ 'version',+])+@Index('IDX_APP_REG_VERSION_TARBALL_FILE_ID', ['tarballFileId'])+@Check(+ 'CHK_APP_REG_VERSION_NPM_HAS_SOURCE_PACKAGE',+ `"sourceType" <> 'npm' OR "sourcePackage" IS NOT NULL`,+)+export class ApplicationRegistrationVersionEntity {+ @PrimaryGeneratedColumn('uuid')+ id: string;++ @Column({ nullable: false, type: 'uuid' })+ applicationRegistrationId: string;++ @ManyToOne(+ () => ApplicationRegistrationEntity,+ (applicationRegistration) => applicationRegistration.versions,+ { onDelete: 'CASCADE', nullable: false },+ )+ @JoinColumn({ name: 'applicationRegistrationId' })+ applicationRegistration: Relation<ApplicationRegistrationEntity>;++ @Column({ nullable: false, type: 'varchar' })+ version: string;++ @Column({ nullable: false, type: 'varchar' })+ sourceType: ApplicationRegistrationSourceType;++ @Column({ nullable: true, type: 'varchar' })+ sourcePackage: string | null;++ @Column({ nullable: true, type: 'uuid' })+ tarballFileId: string | null;++ @ManyToOne(() => FileEntity, { onDelete: 'SET NULL', nullable: true })+ @JoinColumn({ name: 'tarballFileId' })+ tarballFile: Relation<FileEntity> | null;++ @Column({ nullable: true, type: 'varchar' })+ tarballUrl: string | null;++ @Column({ type: 'timestamptz', nullable: false, default: () => 'now()' })+ publishedAt: Date;++ @CreateDateColumn({ type: 'timestamptz' })+ createdAt: Date;++ @UpdateDateColumn({ type: 'timestamptz' })+ updatedAt: Date;+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.module.tsnew file mode 100644index 00000000000..c4ee6c2fc90--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.module.ts@@ -0,0 +1,12 @@+import { Module } from '@nestjs/common';+import { TypeOrmModule } from '@nestjs/typeorm';++import { ApplicationRegistrationVersionEntity } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.entity';+import { ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';++@Module({+ imports: [TypeOrmModule.forFeature([ApplicationRegistrationVersionEntity])],+ providers: [ApplicationRegistrationVersionService],+ exports: [ApplicationRegistrationVersionService],+})+export class ApplicationRegistrationVersionModule {}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.service.tsnew file mode 100644index 00000000000..455b11bc4bc--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-version/application-registration-version.service.ts@@ -0,0 +1,122 @@+import { Injectable, Logger } from '@nestjs/common';+import { InjectRepository } from '@nestjs/typeorm';++import { isDefined } from 'twenty-shared/utils';+import { type EntityManager, IsNull, Repository } from 'typeorm';++import { ApplicationRegistrationVersionEntity } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.entity';+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type FileEntity } from 'src/engine/core-modules/file/entities/file.entity';++export type CreateApplicationRegistrationVersionParams = {+ applicationRegistrationId: string;+ version: string;+ sourceType: ApplicationRegistrationSourceType;+ sourcePackage?: string | null;+ tarballFileId?: string | null;+ tarballUrl?: string | null;+};++@Injectable()+export class ApplicationRegistrationVersionService {+ private readonly logger = new Logger(+ ApplicationRegistrationVersionService.name,+ );++ constructor(+ @InjectRepository(ApplicationRegistrationVersionEntity)+ private readonly applicationRegistrationVersionRepository: Repository<ApplicationRegistrationVersionEntity>,+ ) {}++ async createApplicationRegistrationVersion(+ params: CreateApplicationRegistrationVersionParams,+ entityManager?: EntityManager,+ ): Promise<ApplicationRegistrationVersionEntity> {+ const repository =+ entityManager?.getRepository(ApplicationRegistrationVersionEntity) ??+ this.applicationRegistrationVersionRepository;+ const insertResult = await repository+ .createQueryBuilder()+ .insert()+ .values({+ applicationRegistrationId: params.applicationRegistrationId,+ version: params.version,+ sourceType: params.sourceType,+ sourcePackage: params.sourcePackage ?? null,+ tarballFileId: params.tarballFileId ?? null,+ tarballUrl: params.tarballUrl ?? null,+ publishedAt: new Date(),+ })+ .orIgnore()+ .execute();++ if (insertResult.raw.length > 0) {+ this.logger.log(+ `Recorded version ${params.version} of registration ${params.applicationRegistrationId}`,+ );+ }++ return repository.findOneOrFail({+ where: {+ applicationRegistrationId: params.applicationRegistrationId,+ version: params.version,+ },+ });+ }++ async ensureNpmVersion({+ applicationRegistrationId,+ version,+ sourcePackage,+ tarballUrl,+ }: {+ applicationRegistrationId: string;+ version: string;+ sourcePackage: string | null;+ tarballUrl: string;+ }): Promise<void> {+ const publishedVersion = await this.createApplicationRegistrationVersion({+ applicationRegistrationId,+ version,+ sourceType: ApplicationRegistrationSourceType.NPM,+ sourcePackage,+ tarballUrl,+ });++ if (!isDefined(publishedVersion.tarballUrl)) {+ await this.applicationRegistrationVersionRepository.update(+ { id: publishedVersion.id, tarballUrl: IsNull() },+ { tarballUrl },+ );+ }+ }++ async findOneByApplicationRegistrationIdAndVersion({+ applicationRegistrationId,+ version,+ }: {+ applicationRegistrationId: string;+ version: string;+ }): Promise<ApplicationRegistrationVersionEntity | null> {+ return this.applicationRegistrationVersionRepository.findOne({+ where: { applicationRegistrationId, version },+ });+ }++ async isTarballFileReferenced(tarballFileId: string): Promise<boolean> {+ return this.applicationRegistrationVersionRepository.exists({+ where: { tarballFileId },+ });+ }++ async findTarballFilesOfRegistration(+ applicationRegistrationId: string,+ ): Promise<FileEntity[]> {+ const versions = await this.applicationRegistrationVersionRepository.find({+ where: { applicationRegistrationId },+ relations: { tarballFile: true },+ });++ return versions.map(({ tarballFile }) => tarballFile).filter(isDefined);+ }+}diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.tsindex 527777a7557..918ea14c48f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/__tests__/application-registration-upsert-from-catalog.spec.ts@@ -11,11 +11,13 @@ import { ApplicationRegistrationEntity } from 'src/engine/core-modules/applicatiimport { ApplicationRegistrationExceptionCode } from 'src/engine/core-modules/application/application-registration/application-registration.exception';import { ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';+import { ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';import { CoreEntityCacheService } from 'src/engine/core-entity-cache/services/core-entity-cache.service';+import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { ServerFileStorageService } from 'src/engine/core-modules/file-storage/services/server-file-storage.service';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';@@ -65,6 +67,12 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {const module: TestingModule = await Test.createTestingModule({providers: [ApplicationRegistrationService,+ {+ provide: ApplicationRegistrationVersionService,+ useValue: {+ findTarballFilesOfRegistration: jest.fn().mockResolvedValue([]),+ },+ },ApplicationRegistrationLookupService,{provide: getRepositoryToken(ApplicationRegistrationEntity),@@ -86,6 +94,10 @@ describe('ApplicationRegistrationService - upsertFromCatalog', () => {provide: ApplicationRegistrationAssetUrlService,useValue: { resolveAssetUrls: jest.fn() },},+ {+ provide: FileStorageService,+ useValue: { deleteByFileId: jest.fn() },+ },{provide: ServerFileStorageService,useValue: { write: jest.fn(), delete: jest.fn() },diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.tsindex 8c28623f4ec..409b9afdae8 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.entity.ts@@ -18,6 +18,7 @@ import {import { UUIDScalarType } from 'src/engine/api/graphql/workspace-schema-builder/graphql-types/scalars';import { type Manifest } from 'twenty-shared/application';import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { ApplicationRegistrationVersionEntity } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.entity';import { type ApplicationRegistrationGalleryImage } from 'src/engine/core-modules/application/application-registration/types/application-registration-gallery-image.type';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';@@ -235,6 +236,13 @@ export class ApplicationRegistrationEntity {)variables: Relation<ApplicationRegistrationVariableEntity[]>;+ @OneToMany(+ () => ApplicationRegistrationVersionEntity,+ (version) => version.applicationRegistration,+ { onDelete: 'CASCADE' },+ )+ versions: Relation<ApplicationRegistrationVersionEntity[]>;+@Column({ type: 'jsonb', nullable: true })@WasIntroducedInUpgrade({upgradeCommandName:diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.tsindex 7e39ec72612..9d453d7463f 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.module.ts@@ -12,6 +12,7 @@ import { ApplicationRegistrationResolver } from 'src/engine/core-modules/applicaimport { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { ApplicationRegistrationSummaryResolver } from 'src/engine/core-modules/application/application-registration/application-registration-summary.resolver';import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';+import { ApplicationRegistrationVersionModule } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.module';import { ApplicationTarballService } from 'src/engine/core-modules/application/application-registration/application-tarball.service';import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';@@ -41,6 +42,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheModule } from 'src/engine/metadataFileEntity,]),ApplicationRegistrationVariableModule,+ ApplicationRegistrationVersionModule,ApplicationLookupModule,ApplicationRegistrationLookupModule,ApplicationModule,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.tsindex 62df974fc14..4c538bbdb82 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts@@ -10,6 +10,7 @@ import {TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,type Manifest,} from 'twenty-shared/application';+import { FileFolder } from 'twenty-shared/types';import { isDefined, isNonEmptyArray, isValidUuid } from 'twenty-shared/utils';import { WorkspaceActivationStatus } from 'twenty-shared/workspace';import {@@ -27,6 +28,10 @@ import { MARKETPLACE_CATALOG_CACHE_ENTITY_ID } from 'src/engine/core-modules/appimport { MARKETPLACE_VETTED_APPLICATIONS } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant';import { ALL_OAUTH_SCOPES } from 'src/engine/core-modules/application/application-oauth/constants/oauth-scopes';import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';+import {+ ApplicationRegistrationVersionService,+ type CreateApplicationRegistrationVersionParams,+} from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { findReservedVariableNamesInApplicationManifest } from 'src/engine/core-modules/application/utils/find-reserved-variable-names-in-application-manifest.util';import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.service';import { ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';@@ -67,6 +72,7 @@ import {} from 'src/engine/core-modules/application/jobs/upgrade-applications.job-constants';import { validateRedirectUri } from 'src/engine/core-modules/auth/utils/validate-redirect-uri.util';import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';+import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { ServerFileStorageService } from 'src/engine/core-modules/file-storage/services/server-file-storage.service';import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';@@ -125,6 +131,8 @@ export class ApplicationRegistrationService {private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,private readonly applicationRegistrationAssetUrlService: ApplicationRegistrationAssetUrlService,private readonly serverFileStorageService: ServerFileStorageService,+ private readonly fileStorageService: FileStorageService,+ private readonly applicationRegistrationVersionService: ApplicationRegistrationVersionService,private readonly cacheLockService: CacheLockService,private readonly coreEntityCacheService: CoreEntityCacheService,private readonly metricsService: MetricsService,@@ -643,9 +651,14 @@ export class ApplicationRegistrationService {preventVersionDowngrade = false,registrationBeforeUpdate,additionalFields,+ publishedVersion,}: {applicationRegistrationId: string;manifest: Manifest;+ publishedVersion?: Omit<+ CreateApplicationRegistrationVersionParams,+ 'applicationRegistrationId'+ >;sourceType?: ApplicationRegistrationSourceType;// null clears the stored version; undefined leaves it untouched.latestAvailableVersion?: string | null;@@ -735,6 +748,13 @@ export class ApplicationRegistrationService {entityManager,);}++ if (isDefined(publishedVersion)) {+ await this.applicationRegistrationVersionService.createApplicationRegistrationVersion(+ { ...publishedVersion, applicationRegistrationId },+ entityManager,+ );+ }},);@@ -780,6 +800,32 @@ export class ApplicationRegistrationService {);}+ const versionTarballFiles =+ await this.applicationRegistrationVersionService.findTarballFilesOfRegistration(+ applicationRegistrationId,+ );+ const registrationWithTarball =+ await this.applicationRegistrationRepository.findOneOrFail({+ where: { id: applicationRegistrationId },+ select: { id: true, tarballFile: { id: true, workspaceId: true } },+ relations: { tarballFile: true },+ });+ const files = [+ ...versionTarballFiles,+ registrationWithTarball.tarballFile,+ ].filter(isDefined);+ const tarballFiles = new Map(+ files.map(({ id, workspaceId }) => [id, workspaceId]),+ );++ for (const [fileId, workspaceId] of tarballFiles) {+ if (!isDefined(workspaceId)) {+ continue;+ }++ await this.deleteTarballFileSilently({ fileId, workspaceId });+ }+await this.applicationRegistrationRepository.delete(applicationRegistrationId,);@@ -794,6 +840,26 @@ export class ApplicationRegistrationService {return true;}+ async deleteTarballFileSilently({+ fileId,+ workspaceId,+ }: {+ fileId: string;+ workspaceId: string;+ }): Promise<void> {+ try {+ await this.fileStorageService.deleteByFileId({+ fileId,+ workspaceId,+ fileFolder: FileFolder.AppTarball,+ });+ } catch (error) {+ this.logger.warn(+ `Failed to delete tarball file ${fileId} of workspace ${workspaceId}: ${error instanceof Error ? error.message : String(error)}`,+ );+ }+ }+async rotateClientSecret({applicationRegistrationId,ownerWorkspaceId,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.tsindex 49a461334bf..659f0c6e6bb 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-tarball.service.ts@@ -20,6 +20,7 @@ import {import { extractTarballSecurely } from 'src/engine/core-modules/application/application-package/utils/extract-tarball-securely.util';import { readJsonFile } from 'src/engine/core-modules/application/application-package/utils/read-json-file.util';import { resolvePackageContentDir } from 'src/engine/core-modules/application/application-package/utils/tarball-utils';+import { ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { ApplicationRegistrationAssetService } from 'src/engine/core-modules/application/application-registration/application-registration-asset.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import {@@ -31,6 +32,7 @@ import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/appliimport { fromManifestApplicationToDisplayFields } from 'src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util';import { getTarballUploadCompletionLockName } from 'src/engine/core-modules/application/application-registration/utils/get-tarball-upload-completion-lock-name.util';import { ApplicationService } from 'src/engine/core-modules/application/application.service';+import { CacheLockService } from 'src/engine/core-modules/cache-lock/cache-lock.service';import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';import {@@ -46,12 +48,26 @@ import type { ApplicationManifest, Manifest } from 'twenty-shared/application';const TARBALL_FILE_NAME = 'app.tar.gz';+const APPLICATION_TARBALL_PUBLISH_LOCK_OPTIONS = {+ ttl: 60_000,+ ms: 500,+ maxRetries: 120,+};+type ExtractedTarball = {contentDir: string;manifest: { application: ApplicationManifest };packageJson: { version: string; engines?: { twenty?: string } } | null;};+type RegisterExtractedTarballParams = {+ extractedTarball: ExtractedTarball;+ ownerWorkspaceId: string;+ storeTarballFile: (+ appRegistration: ApplicationRegistrationEntity,+ ) => Promise<Pick<FileEntity, 'id'>>;+};+@Injectable()export class ApplicationTarballService {private readonly logger = new Logger(ApplicationTarballService.name);@@ -67,7 +83,9 @@ export class ApplicationTarballService {private readonly applicationService: ApplicationService,private readonly applicationVersionValidationService: ApplicationVersionValidationService,private readonly applicationRegistrationService: ApplicationRegistrationService,+ private readonly applicationRegistrationVersionService: ApplicationRegistrationVersionService,private readonly postgresAdvisoryLockService: PostgresAdvisoryLockService,+ private readonly cacheLockService: CacheLockService,) {}async uploadTarball(params: {@@ -215,11 +233,17 @@ export class ApplicationTarballService {// where the previous attempt stopped and reruns those idempotent steps.private async resumeAttachedRegistration({appRegistration,- extractedTarball: { contentDir, manifest },+ extractedTarball: { contentDir, manifest, packageJson },}: {appRegistration: ApplicationRegistrationEntity;extractedTarball: ExtractedTarball;}): Promise<ApplicationRegistrationEntity> {+ await this.recordPublishedTarballVersion({+ appRegistration,+ version: packageJson?.version ?? null,+ tarballFileId: appRegistration.tarballFileId,+ });+await this.applicationRegistrationAssetService.storeRegistrationAssets({applicationRegistrationId: appRegistration.id,manifestApplication: manifest.application,@@ -247,17 +271,24 @@ export class ApplicationTarballService {});}- private async registerExtractedTarball({+ private async registerExtractedTarball(+ params: RegisterExtractedTarballParams,+ ): Promise<ApplicationRegistrationEntity> {+ const { universalIdentifier } =+ params.extractedTarball.manifest.application;++ return this.cacheLockService.withLock(+ () => this.registerExtractedTarballExclusively(params),+ `application-tarball-publish:${params.ownerWorkspaceId}:${universalIdentifier}`,+ APPLICATION_TARBALL_PUBLISH_LOCK_OPTIONS,+ );+ }++ private async registerExtractedTarballExclusively({extractedTarball: { contentDir, manifest, packageJson },ownerWorkspaceId,storeTarballFile,- }: {- extractedTarball: ExtractedTarball;- ownerWorkspaceId: string;- storeTarballFile: (- appRegistration: ApplicationRegistrationEntity,- ) => Promise<Pick<FileEntity, 'id'>>;- }): Promise<ApplicationRegistrationEntity> {+ }: RegisterExtractedTarballParams): Promise<ApplicationRegistrationEntity> {const universalIdentifier = manifest.application.universalIdentifier;const existingRegistration = await this.appRegistrationRepository.findOne({@@ -273,7 +304,7 @@ export class ApplicationTarballService {const previousTarballFileId = existingRegistration?.tarballFileId ?? null;const appRegistration = isDefined(existingRegistration)- ? this.assertTarballCanReplaceRegistration({+ ? await this.assertTarballCanReplaceRegistration({registration: existingRegistration,incomingVersion: packageJson?.version,universalIdentifier,@@ -281,24 +312,39 @@ export class ApplicationTarballService {: await this.createTarballRegistration({universalIdentifier,manifest,- packageJsonVersion: packageJson?.version ?? null,ownerWorkspaceId,});const savedFile = await storeTarballFile(appRegistration);- await this.applicationRegistrationService.updateFromManifest({- applicationRegistrationId: appRegistration.id,- manifest: manifest as Manifest,- sourceType: ApplicationRegistrationSourceType.TARBALL,- latestAvailableVersion: packageJson?.version ?? null,- additionalFields: {- tarballFileId: savedFile.id,- isListed: false,- isVetted: false,+ try {+ await this.applicationRegistrationService.updateFromManifest({+ applicationRegistrationId: appRegistration.id,+ manifest: manifest as Manifest,+ sourceType: ApplicationRegistrationSourceType.TARBALL,+ latestAvailableVersion: packageJson?.version ?? null,+ additionalFields: {+ tarballFileId: savedFile.id,+ isListed: false,+ isVetted: false,+ ownerWorkspaceId,+ },+ publishedVersion: isDefined(packageJson?.version)+ ? {+ version: packageJson.version,+ sourceType: ApplicationRegistrationSourceType.TARBALL,+ tarballFileId: savedFile.id,+ }+ : undefined,+ });+ } catch (error) {+ await this.deleteTarballFileUnlessAttached({+ fileId: savedFile.id,ownerWorkspaceId,- },- });+ });++ throw error;+ }await this.applicationRegistrationAssetService.storeRegistrationAssets({applicationRegistrationId: appRegistration.id,@@ -333,11 +379,14 @@ export class ApplicationTarballService {if (isDefined(previousTarballFileId) &&- previousTarballFileId !== savedFile.id+ previousTarballFileId !== savedFile.id &&+ !(await this.applicationRegistrationVersionService.isTarballFileReferenced(+ previousTarballFileId,+ ))) {- await this.deleteTarballFileSilently({+ await this.applicationRegistrationService.deleteTarballFileSilently({fileId: previousTarballFileId,- ownerWorkspaceId,+ workspaceId: ownerWorkspaceId,});}@@ -346,6 +395,36 @@ export class ApplicationTarballService {});}+ private async recordPublishedTarballVersion({+ appRegistration,+ version,+ tarballFileId,+ }: {+ appRegistration: Pick<+ ApplicationRegistrationEntity,+ 'id' | 'universalIdentifier'+ >;+ version: string | null;+ tarballFileId: string | null;+ }): Promise<void> {+ if (!isDefined(version)) {+ this.logger.warn(+ `Tarball of app ${appRegistration.universalIdentifier} declares no package.json version; no version record kept`,+ );++ return;+ }++ await this.applicationRegistrationVersionService.createApplicationRegistrationVersion(+ {+ applicationRegistrationId: appRegistration.id,+ version,+ sourceType: ApplicationRegistrationSourceType.TARBALL,+ tarballFileId,+ },+ );+ }+private async withTempDir<TResult>(run: (tempDir: string) => Promise<TResult>,): Promise<TResult> {@@ -407,6 +486,20 @@ export class ApplicationTarballService {);}+ if (isDefined(packageJson?.version)) {+ const validation =+ this.applicationVersionValidationService.validatePackageVersion(+ packageJson.version,+ );++ if (!validation.allowed) {+ throw new ApplicationRegistrationException(+ validation.message,+ ApplicationRegistrationExceptionCode.INVALID_INPUT,+ );+ }+ }+const versionValidation =await this.applicationVersionValidationService.validateServerCompatibility(packageJson?.engines?.twenty,@@ -428,7 +521,7 @@ export class ApplicationTarballService {};}- private assertTarballCanReplaceRegistration({+ private async assertTarballCanReplaceRegistration({registration,incomingVersion,universalIdentifier,@@ -436,7 +529,7 @@ export class ApplicationTarballService {registration: ApplicationRegistrationEntity;incomingVersion: string | undefined;universalIdentifier: string;- }): ApplicationRegistrationEntity {+ }): Promise<ApplicationRegistrationEntity> {if (registration.sourceType !== ApplicationRegistrationSourceType.LOCAL &®istration.sourceType !== ApplicationRegistrationSourceType.TARBALL@@ -470,18 +563,33 @@ export class ApplicationTarballService {}}+ if (+ isDefined(incomingVersion) &&+ isDefined(+ await this.applicationRegistrationVersionService.findOneByApplicationRegistrationIdAndVersion(+ {+ applicationRegistrationId: registration.id,+ version: incomingVersion,+ },+ ),+ )+ ) {+ throw new ApplicationRegistrationException(+ `Cannot deploy ${universalIdentifier}@${incomingVersion}: this version is already published. Please bump the version in package.json.`,+ ApplicationRegistrationExceptionCode.VERSION_ALREADY_EXISTS,+ );+ }+return registration;}private async createTarballRegistration({universalIdentifier,manifest,- packageJsonVersion,ownerWorkspaceId,}: {universalIdentifier: string;manifest: { application?: ApplicationManifest };- packageJsonVersion: string | null;ownerWorkspaceId: string;}): Promise<ApplicationRegistrationEntity> {return this.applicationRegistrationService.create({@@ -490,7 +598,7 @@ export class ApplicationTarballService {sourceType: ApplicationRegistrationSourceType.TARBALL,manifest,...fromManifestApplicationToDisplayFields(manifest.application),- latestAvailableVersion: packageJsonVersion,+ latestAvailableVersion: null,isListed: false,isVetted: false,oAuthClientId: v4(),@@ -524,14 +632,15 @@ export class ApplicationTarballService {await this.findOwnerCustomApplicationUniversalIdentifier(ownerWorkspaceId,);+ const fileId = v4();return this.fileStorageService.writeFile({sourceFile: tarballBuffer,- resourcePath: `${appRegistration.id}/${TARBALL_FILE_NAME}`,+ resourcePath: `${appRegistration.id}/${fileId}/${TARBALL_FILE_NAME}`,fileFolder: FileFolder.AppTarball,applicationUniversalIdentifier,workspaceId: ownerWorkspaceId,- fileId: appRegistration.tarballFileId ?? v4(),+ fileId,settings: {isTemporaryFile: false,toDelete: false,@@ -551,31 +660,19 @@ export class ApplicationTarballService {ownerWorkspaceId,});- if (isDefined(attachedRegistration)) {+ if (+ isDefined(attachedRegistration) ||+ (await this.applicationRegistrationVersionService.isTarballFileReferenced(+ fileId,+ ))+ ) {return;}- await this.deleteTarballFileSilently({ fileId, ownerWorkspaceId });- }-- private async deleteTarballFileSilently({- fileId,- ownerWorkspaceId,- }: {- fileId: string;- ownerWorkspaceId: string;- }): Promise<void> {- try {- await this.fileStorageService.deleteByFileId({- fileId,- workspaceId: ownerWorkspaceId,- fileFolder: FileFolder.AppTarball,- });- } catch (error) {- this.logger.warn(- `Failed to delete tarball file ${fileId} of workspace ${ownerWorkspaceId}: ${error instanceof Error ? error.message : String(error)}`,- );- }+ await this.applicationRegistrationService.deleteTarballFileSilently({+ fileId,+ workspaceId: ownerWorkspaceId,+ });}private async readAssetFromContentDir(diff --git a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.tsindex 15b9bbd622e..3c5e8f51f10 100644--- a/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts+++ b/packages/twenty-server/src/engine/workspace-manager/types/all-non-workspace-related-entity.type.ts@@ -2,6 +2,7 @@ import { type Equal, type Expect } from 'twenty-shared/testing';import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';import { type ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';+import { type ApplicationRegistrationVersionEntity } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.entity';import { type BillingMeterEntity } from 'src/engine/core-modules/billing/entities/billing-meter.entity';import { type BillingPriceEntity } from 'src/engine/core-modules/billing/entities/billing-price.entity';import { type BillingProductEntity } from 'src/engine/core-modules/billing/entities/billing-product.entity';@@ -21,6 +22,7 @@ export type AllNonWorkspaceRelatedEntity =| IndexFieldMetadataEntity| ApplicationRegistrationEntity| ApplicationRegistrationVariableEntity+ | ApplicationRegistrationVersionEntity| BillingMeterEntity| BillingPriceEntity| BillingProductEntitydiff --git a/packages/twenty-server/test/integration/metadata/suites/application-registration/application-registration-versions.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application-registration/application-registration-versions.integration-spec.tsnew file mode 100644index 00000000000..8cdf700c366--- /dev/null+++ b/packages/twenty-server/test/integration/metadata/suites/application-registration/application-registration-versions.integration-spec.ts@@ -0,0 +1,197 @@+import crypto from 'crypto';++import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { type ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';++import { type ApplicationRegistrationVersionEntity } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.entity';+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';+import { createAppTarball } from 'test/integration/metadata/suites/application/utils/create-app-tarball.util';+import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';+import { type DataSource } from 'typeorm';++import {+ SEED_APPLE_WORKSPACE_ID,+ SEED_YCOMBINATOR_WORKSPACE_ID,+} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++jest.setTimeout(120000);++const PUBLISHED_VERSIONS = ['1.0.0', '1.1.0+build.7'] as const;+const LATEST_PUBLISHED_VERSION =+ PUBLISHED_VERSIONS[PUBLISHED_VERSIONS.length - 1];+const PUBLISHED_VERSIONS_NEWEST_FIRST = [...PUBLISHED_VERSIONS].reverse();++describe('Application registration versions', () => {+ const universalIdentifier = crypto.randomUUID();+ const roleUniversalIdentifier = crypto.randomUUID();+ const tarballByVersion: Record<string, Buffer> = {};++ let ds: DataSource;+ let applicationRegistrationId: string;++ const buildTarball = (version: string): Promise<Buffer> =>+ createAppTarball({+ 'manifest.json': JSON.stringify(+ buildBaseManifest({+ appId: universalIdentifier,+ roleId: roleUniversalIdentifier,+ }),+ ),+ 'package.json': JSON.stringify({+ name: 'test-registration-versions',+ version,+ }),+ });++ const findVersions = (): Promise<ApplicationRegistrationVersionEntity[]> =>+ ds.query(+ `SELECT * FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1+ ORDER BY "publishedAt" DESC, "createdAt" DESC`,+ [applicationRegistrationId],+ );++ beforeAll(async () => {+ jest.useRealTimers();+ ds = global.testDataSource;++ for (const version of PUBLISHED_VERSIONS) {+ tarballByVersion[version] = await buildTarball(version);++ const { data, errors } = await uploadAppTarball({+ tarballBuffer: tarballByVersion[version],+ universalIdentifier,+ });++ expect(errors).toBeUndefined();++ applicationRegistrationId = data.uploadAppTarball.id;+ }+ });++ afterAll(async () => {+ await ds.query(+ `DELETE FROM core."file" WHERE id IN (+ SELECT "tarballFileId" FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1+ )`,+ [applicationRegistrationId],+ );++ await cleanupApplicationAndAppRegistration({+ applicationUniversalIdentifier: universalIdentifier,+ });++ jest.useFakeTimers();+ });++ it('records one version per publish with its stored artifact', async () => {+ const versions = await findVersions();++ expect(versions.map(({ version }) => version)).toEqual(+ PUBLISHED_VERSIONS_NEWEST_FIRST,+ );++ for (const version of versions) {+ expect(version).toMatchObject({+ applicationRegistrationId,+ sourceType: 'tarball',+ sourcePackage: null,+ tarballUrl: null,+ });+ expect(version.tarballFileId).toEqual(expect.any(String));+ }++ expect(+ new Set(versions.map(({ tarballFileId }) => tarballFileId)).size,+ ).toBe(PUBLISHED_VERSIONS.length);+ });++ it('keeps every published artifact in storage', async () => {+ const versions = await findVersions();++ const files = await ds.query(+ `SELECT id, status FROM core."file" WHERE id = ANY($1)`,+ [versions.map(({ tarballFileId }) => tarballFileId)],+ );++ expect(files).toHaveLength(PUBLISHED_VERSIONS.length);+ expect(+ files.every(({ status }: { status: string }) => status === 'UPLOADED'),+ ).toBe(true);+ });++ it('finds the published version through the installed registration and version', async () => {+ const { errors } = await installApplication({+ input: { universalIdentifier },+ });++ expect(errors).toBeUndefined();++ const latestVersion = (await findVersions()).find(+ ({ version }) => version === LATEST_PUBLISHED_VERSION,+ );++ const [application] = await ds.query(+ `SELECT application.version, version.id AS "publishedVersionId"+ FROM core.application AS application+ JOIN core."applicationRegistrationVersion" AS version+ ON version."applicationRegistrationId" = application."applicationRegistrationId"+ AND version.version = application.version+ WHERE application."universalIdentifier" = $1 AND application."workspaceId" = $2`,+ [universalIdentifier, SEED_APPLE_WORKSPACE_ID],+ );++ expect(application).toEqual({+ version: LATEST_PUBLISHED_VERSION,+ publishedVersionId: latestVersion?.id,+ });+ });++ it('refuses an npm version recorded without its package name', async () => {+ await expect(+ ds.query(+ `INSERT INTO core."applicationRegistrationVersion"+ ("applicationRegistrationId", version, "sourceType")+ VALUES ($1, '2.0.0', 'npm')`,+ [applicationRegistrationId],+ ),+ ).rejects.toThrow('CHK_APP_REG_VERSION_NPM_HAS_SOURCE_PACKAGE');+ });++ it('deletes retained tarballs from their original workspace after an ownership transfer', async () => {+ const tarballFileIds = (await findVersions()).map(+ ({ tarballFileId }) => tarballFileId,+ );++ await ds.query(+ 'UPDATE core."applicationRegistration" SET "workspaceId" = $1 WHERE id = $2',+ [SEED_YCOMBINATOR_WORKSPACE_ID, applicationRegistrationId],+ );++ const deleted =+ await getAppProviderByClassName<ApplicationRegistrationService>(+ 'ApplicationRegistrationService',+ ).delete({+ applicationRegistrationId,+ ownerWorkspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,+ });++ expect(deleted).toBe(true);++ const remainingFiles = await ds.query(+ `SELECT id FROM core."file" WHERE id = ANY($1)`,+ [tarballFileIds],+ );+ const remainingVersions = await ds.query(+ `SELECT id FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1`,+ [applicationRegistrationId],+ );++ expect(remainingFiles).toEqual([]);+ expect(remainingVersions).toEqual([]);+ });+});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/direct-app-tarball-upload.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/direct-app-tarball-upload.integration-spec.tsindex 0e8197fd5d3..755bfb27f96 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/direct-app-tarball-upload.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/direct-app-tarball-upload.integration-spec.ts@@ -2,8 +2,10 @@ import crypto from 'crypto';import gql from 'graphql-tag';import { type ApplicationRegistrationAssetService } from 'src/engine/core-modules/application/application-registration/application-registration-asset.service';+import { type ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { type ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { completeAppTarballUpload } from 'test/integration/metadata/suites/application/utils/complete-app-tarball-upload.util';+import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';import { createAppTarball } from 'test/integration/metadata/suites/application/utils/create-app-tarball.util';import {type AppTarballUploadTarget,@@ -133,6 +135,15 @@ describe('Direct app tarball upload', () => {return row ?? null;};+ const findVersionRows = async (registrationId: string) =>+ ds.query(+ `SELECT version, "sourceType", "tarballFileId"+ FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1+ ORDER BY version`,+ [registrationId],+ );+beforeAll(() => {jest.useRealTimers();ds = global.testDataSource;@@ -187,6 +198,14 @@ describe('Direct app tarball upload', () => {expect(file.mimeType).toBe('application/gzip');expect(file.path).toBe(`app-tarball/${uploadTarget.fileId}.gz`);expect(Number(file.size)).toBe(tarball.length);++ expect(await findVersionRows(data!.completeAppTarballUpload.id)).toEqual([+ {+ version: '1.0.0',+ sourceType: 'tarball',+ tarballFileId: uploadTarget.fileId,+ },+ ]);});it('answers a repeated completion with the same registration', async () => {@@ -208,7 +227,7 @@ describe('Direct app tarball upload', () => {);});- it('replaces the previous tarball on a new version and drops it', async () => {+ it('points the registration at the new tarball and keeps the previous version artifact', async () => {const universalIdentifier = crypto.randomUUID();const first = await deployTarball(@@ -226,17 +245,123 @@ describe('Direct app tarball upload', () => {first.completion.data?.completeAppTarballUpload.id,);- const registration = await findRegistrationRow(- first.completion.data!.completeAppTarballUpload.id,- );+ const registrationId = first.completion.data!.completeAppTarballUpload.id;+ const registration = await findRegistrationRow(registrationId);expect(registration.tarballFileId).toBe(second.uploadTarget.fileId);expect(registration.latestAvailableVersion).toBe('1.1.0');- expect(await findFileRow(first.uploadTarget.fileId)).toBeNull();+ expect((await findFileRow(first.uploadTarget.fileId)).status).toBe(+ 'UPLOADED',+ );expect((await findFileRow(second.uploadTarget.fileId)).status).toBe('UPLOADED',);++ expect(await findVersionRows(registrationId)).toMatchObject([+ { version: '1.0.0', tarballFileId: first.uploadTarget.fileId },+ { version: '1.1.0', tarballFileId: second.uploadTarget.fileId },+ ]);+ });++ it('keeps an earlier version artifact when its completion is replayed after a newer version', async () => {+ const universalIdentifier = crypto.randomUUID();++ const first = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.0.0' }),+ );+ const second = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.1.0' }),+ );++ expect(first.completion.errors).toBeUndefined();+ expect(second.completion.errors).toBeUndefined();++ const { errors } = await completeAppTarballUpload({+ fileId: first.uploadTarget.fileId,+ expectToFail: true,+ });++ expect(+ errors?.some((error: { message: string }) =>+ error.message.includes(+ 'version must be higher than the currently deployed version',+ ),+ ),+ ).toBe(true);++ expect((await findFileRow(first.uploadTarget.fileId)).status).toBe(+ 'UPLOADED',+ );+ expect(+ await findVersionRows(first.completion.data!.completeAppTarballUpload.id),+ ).toMatchObject([+ { version: '1.0.0', tarballFileId: first.uploadTarget.fileId },+ { version: '1.1.0', tarballFileId: second.uploadTarget.fileId },+ ]);+ });++ it('refuses to publish a recorded version again after an unversioned upload', async () => {+ const universalIdentifier = crypto.randomUUID();++ const first = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.0.0' }),+ );++ expect(first.completion.errors).toBeUndefined();++ const unversioned = await deployTarball(+ await createAppTarball({+ 'manifest.json': buildManifest(universalIdentifier),+ 'package.json': JSON.stringify({ name: 'direct-tarball-app' }),+ }),+ );++ expect(unversioned.completion.errors).toBeUndefined();++ const registrationId = first.completion.data!.completeAppTarballUpload.id;++ expect(+ (await findRegistrationRow(registrationId)).latestAvailableVersion,+ ).toBeNull();++ const republished = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.0.0' }),+ { expectToFail: true },+ );++ expect(+ republished.completion.errors?.some((error: { message: string }) =>+ error.message.includes('already published'),+ ),+ ).toBe(true);++ expect(await findFileRow(republished.uploadTarget.fileId)).toBeNull();+ expect(await findVersionRows(registrationId)).toMatchObject([+ { version: '1.0.0', tarballFileId: first.uploadTarget.fileId },+ ]);+ });++ it('refuses a first upload whose version is not semver and drops the promoted file', async () => {+ const universalIdentifier = crypto.randomUUID();++ const { uploadTarget, completion } = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: 'banana' }),+ { expectToFail: true },+ );++ expect(+ completion.errors?.some((error: { message: string }) =>+ error.message.includes('Must be a valid semver version'),+ ),+ ).toBe(true);+ expect(await findFileRow(uploadTarget.fileId)).toBeNull();+ expect(+ await ds.query(+ `SELECT id FROM core."applicationRegistration" WHERE "universalIdentifier" = $1`,+ [universalIdentifier],+ ),+ ).toEqual([]);});it('refuses a version that does not progress and drops the promoted file', async () => {@@ -263,11 +388,13 @@ describe('Direct app tarball upload', () => {expect(await findFileRow(second.uploadTarget.fileId)).toBeNull();- const registration = await findRegistrationRow(- first.completion.data!.completeAppTarballUpload.id,- );+ const registrationId = first.completion.data!.completeAppTarballUpload.id;+ const registration = await findRegistrationRow(registrationId);expect(registration.tarballFileId).toBe(first.uploadTarget.fileId);+ expect(await findVersionRows(registrationId)).toMatchObject([+ { version: '1.0.0', tarballFileId: first.uploadTarget.fileId },+ ]);});it('registers a promoted upload whose registration was lost', async () => {@@ -396,6 +523,125 @@ describe('Direct app tarball upload', () => {}});+ it('rolls back a publish when version recording fails and accepts a fresh upload of the same version', async () => {+ const universalIdentifier = crypto.randomUUID();++ const first = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.0.0' }),+ );++ expect(first.completion.errors).toBeUndefined();++ const createApplicationRegistrationVersionSpy = jest+ .spyOn(+ getAppProviderByClassName<ApplicationRegistrationVersionService>(+ 'ApplicationRegistrationVersionService',+ ),+ 'createApplicationRegistrationVersion',+ )+ .mockRejectedValueOnce(new Error('Database unavailable'));++ try {+ const second = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.1.0' }),+ { expectToFail: true },+ );++ expect(second.completion.errors).toBeDefined();++ const registrationId = first.completion.data!.completeAppTarballUpload.id;++ expect((await findRegistrationRow(registrationId)).tarballFileId).toBe(+ first.uploadTarget.fileId,+ );+ expect(+ (await findRegistrationRow(registrationId)).latestAvailableVersion,+ ).toBe('1.0.0');+ expect(await findFileRow(second.uploadTarget.fileId)).toBeNull();+ expect(await findVersionRows(registrationId)).toMatchObject([+ { version: '1.0.0' },+ ]);++ const retry = await deployTarball(+ await buildValidTarball({ universalIdentifier, version: '1.1.0' }),+ );++ expect(retry.completion.errors).toBeUndefined();+ expect(retry.completion.data?.completeAppTarballUpload.id).toBe(+ registrationId,+ );+ expect(await findVersionRows(registrationId)).toMatchObject([+ { version: '1.0.0', tarballFileId: first.uploadTarget.fileId },+ { version: '1.1.0', tarballFileId: retry.uploadTarget.fileId },+ ]);+ } finally {+ createApplicationRegistrationVersionSpy.mockRestore();+ }+ });++ it.each(['registration update', 'version insert'])(+ 'cleans up a direct upload after a failed %s and allows the same version to be retried',+ async (failurePoint) => {+ const universalIdentifier = crypto.randomUUID();+ const tarball = await buildValidTarball({+ universalIdentifier,+ version: '1.0.0',+ });+ const failure =+ failurePoint === 'registration update'+ ? jest+ .spyOn(+ getAppProviderByClassName<ApplicationRegistrationService>(+ 'ApplicationRegistrationService',+ ),+ 'updateFromManifest',+ )+ .mockRejectedValueOnce(new Error('Registration update failed'))+ : jest+ .spyOn(+ getAppProviderByClassName<ApplicationRegistrationVersionService>(+ 'ApplicationRegistrationVersionService',+ ),+ 'createApplicationRegistrationVersion',+ )+ .mockRejectedValueOnce(new Error('Version insert failed'));++ try {+ const failed = await uploadAppTarball({+ tarballBuffer: tarball,+ expectToFail: true,+ });+ expect(failed.errors).toBeDefined();+ const [registration] = await ds.query(+ 'SELECT id, "latestAvailableVersion", "tarballFileId" FROM core."applicationRegistration" WHERE "universalIdentifier" = $1',+ [universalIdentifier],+ );+ createdRegistrationIds.push(registration.id);+ expect(registration).toMatchObject({+ latestAvailableVersion: null,+ tarballFileId: null,+ });+ expect(await findVersionRows(registration.id)).toEqual([]);+ expect(+ await ds.query('SELECT id FROM core.file WHERE path LIKE $1', [+ `%${registration.id}/%`,+ ]),+ ).toEqual([]);++ const retry = await uploadAppTarball({ tarballBuffer: tarball });+ expect(retry.errors).toBeUndefined();+ expect(retry.data.uploadAppTarball.id).toBe(registration.id);+ const stored = await findRegistrationRow(registration.id);+ createdFileIds.push(stored.tarballFileId);+ expect(await findVersionRows(registration.id)).toMatchObject([+ { version: '1.0.0', tarballFileId: stored.tarballFileId },+ ]);+ } finally {+ failure.mockRestore();+ }+ },+ );+it('refuses a completion that overlaps another completion of the same upload', async () => {const uploadTarget = await sendToStorage(await buildValidTarball({diff --git a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.tsindex 7cb75d7e206..e6c3e4fe8c6 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/marketplace-catalog-sync.integration-spec.ts@@ -7,9 +7,11 @@ import { gql } from 'graphql-tag';import request from 'supertest';import * as tar from 'tar';import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';+import { buildNpmRegistryPackage } from 'test/integration/metadata/suites/application/utils/build-npm-registry-package.util';import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';import { findApplicationRegistrationByUniversalIdentifier } from 'test/integration/metadata/suites/application/utils/find-application-registration-by-universal-identifier.util';import { insertCatalogApplicationRegistration } from 'test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util';+import { stubNpmRegistry } from 'test/integration/metadata/suites/application/utils/stub-npm-registry.util';import { syncMarketplaceCatalogFromRegistryPackage } from 'test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util';import { upsertApplicationRegistrationFromCatalog } from 'test/integration/metadata/suites/application/utils/upsert-application-registration-from-catalog.util';import { makeAdminPanelApiRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';@@ -17,9 +19,12 @@ import { getAppProviderByClassName } from 'test/integration/utils/get-app-providimport { type DataSource } from 'typeorm';import { MARKETPLACE_VETTED_APPLICATIONS } from 'src/engine/core-modules/application/application-marketplace/constants/marketplace-vetted-applications.constant';+import { type ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';+import { type ApplicationPackageFetcherService } from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';import { type ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';import { type ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';+import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';const TEST_WORKSPACE_ID = SEED_APPLE_WORKSPACE_ID;@@ -584,7 +589,6 @@ describe('Marketplace Catalog Sync (integration)', () => {describe('catalog sync versions', () => {const SOURCE_PACKAGE = '@test/versioned-app';-const buildCatalogParams = ({universalIdentifier,name,@@ -695,6 +699,204 @@ describe('Marketplace Catalog Sync (integration)', () => {});});+ it('records each catalog version once with the registry tarball URL', async () => {+ const universalIdentifier = crypto.randomUUID();+ const registrationId = await insertCatalogRegistration({+ universalIdentifier,+ name: 'Versioned App',+ sourcePackage: SOURCE_PACKAGE,+ latestAvailableVersion: '1.0.0',+ });+ const tarballUrl = `https://registry.example.com/${SOURCE_PACKAGE}/-/versioned-app-2.0.0.tgz`;+ const syncVersionTwo = () =>+ syncMarketplaceCatalogFromRegistryPackage({+ packageName: SOURCE_PACKAGE,+ version: '2.0.0',+ manifest: buildBaseManifest({+ appId: universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ tarballUrl,+ });+ const findVersionRows = () =>+ ds.query(+ `SELECT version, "sourceType", "sourcePackage", "tarballUrl"+ FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1`,+ [registrationId],+ );++ await syncVersionTwo();++ const registryLookup = jest.spyOn(+ getAppProviderByClassName<ApplicationPackageFetcherService>(+ 'ApplicationPackageFetcherService',+ ),+ 'findRegistryTarballUrl',+ );++ try {+ await syncMarketplaceCatalogFromRegistryPackage({+ packageName: SOURCE_PACKAGE,+ version: '2.0.0',+ manifest: buildBaseManifest({+ appId: universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ shouldStubRegistryTarball: false,+ });+ expect(registryLookup).not.toHaveBeenCalled();+ } finally {+ registryLookup.mockRestore();+ }++ expect(await findVersionRows()).toEqual([+ {+ version: '2.0.0',+ sourceType: 'npm',+ sourcePackage: SOURCE_PACKAGE,+ tarballUrl,+ },+ ]);+ });++ it('fills the registry details of a version recorded without them', async () => {+ const universalIdentifier = crypto.randomUUID();+ const registrationId = await insertCatalogRegistration({+ universalIdentifier,+ name: 'Versioned App',+ sourcePackage: SOURCE_PACKAGE,+ latestAvailableVersion: '1.0.0',+ });++ await ds.query(+ `INSERT INTO core."applicationRegistrationVersion"+ ("applicationRegistrationId", version, "sourceType", "sourcePackage")+ VALUES ($1, '1.0.0', 'npm', $2)`,+ [registrationId, SOURCE_PACKAGE],+ );++ const tarballUrl = `https://registry.example.com/${SOURCE_PACKAGE}/-/versioned-app-1.0.0.tgz`;++ await syncMarketplaceCatalogFromRegistryPackage({+ packageName: SOURCE_PACKAGE,+ version: '1.0.0',+ manifest: buildBaseManifest({+ appId: universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ tarballUrl,+ });++ expect(+ await ds.query(+ `SELECT version, "tarballUrl"+ FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1`,+ [registrationId],+ ),+ ).toEqual([+ {+ version: '1.0.0',+ tarballUrl,+ },+ ]);+ });++ it('leaves a version unrecorded until the registry provides its artifact', async () => {+ const universalIdentifier = crypto.randomUUID();+ const registrationId = await insertCatalogRegistration({+ universalIdentifier,+ name: 'Versioned App',+ sourcePackage: SOURCE_PACKAGE,+ latestAvailableVersion: '1.0.0',+ });+ const syncVersionTwo = (tarballUrl: string | null) =>+ syncMarketplaceCatalogFromRegistryPackage({+ packageName: SOURCE_PACKAGE,+ version: '2.0.0',+ manifest: buildBaseManifest({+ appId: universalIdentifier,+ roleId: crypto.randomUUID(),+ }),+ tarballUrl,+ });+ const countVersionRows = async (): Promise<number> => {+ const [{ count }] = await ds.query(+ `SELECT count(*)::int AS count FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1`,+ [registrationId],+ );++ return count;+ };++ await syncVersionTwo(null);++ expect(await countVersionRows()).toBe(0);+ expect(+ await findApplicationRegistrationByUniversalIdentifier({+ universalIdentifier,+ }),+ ).toMatchObject({ latestAvailableVersion: '2.0.0' });++ await syncVersionTwo(+ `https://registry.example.com/${SOURCE_PACKAGE}/-/versioned-app-2.0.0.tgz`,+ );++ expect(await countVersionRows()).toBe(1);+ });++ it('leaves a version unrecorded when the registry metadata describes another package', async () => {+ const universalIdentifier = crypto.randomUUID();+ const registrationId = await insertCatalogRegistration({+ universalIdentifier,+ name: 'Versioned App',+ sourcePackage: SOURCE_PACKAGE,+ latestAvailableVersion: '1.0.0',+ });+ const registryBaseUrl = getAppProviderByClassName<TwentyConfigService>(+ 'TwentyConfigService',+ )+ .get('APP_REGISTRY_URL')+ .replace(/\/$/, '');+ const manifest = buildBaseManifest({+ appId: universalIdentifier,+ roleId: crypto.randomUUID(),+ });+ const registryStub = stubNpmRegistry(+ await buildNpmRegistryPackage({+ registryBaseUrl,+ packageName: SOURCE_PACKAGE,+ version: '2.0.0',+ manifestJson: JSON.stringify(manifest),+ metadataName: '@test/substitute-app',+ }),+ );++ try {+ await syncMarketplaceCatalogFromRegistryPackage({+ packageName: SOURCE_PACKAGE,+ version: '2.0.0',+ manifest,+ shouldStubRegistryTarball: false,+ });+ } finally {+ registryStub.restore();+ }++ expect(registryStub.requestedUrls).toEqual([+ `${registryBaseUrl}/${encodeURIComponent(SOURCE_PACKAGE)}/2.0.0`,+ ]);+ expect(+ await ds.query(+ `SELECT id FROM core."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = $1`,+ [registrationId],+ ),+ ).toEqual([]);+ });+it('sets the version on a registration that has none', async () => {const universalIdentifier = crypto.randomUUID();@@ -762,6 +964,56 @@ describe('Marketplace Catalog Sync (integration)', () => {).toMatchObject({ logoFileId: null });});+ it('stores assets and retries the version when version recording fails', async () => {+ const universalIdentifier = crypto.randomUUID();+ const registrationId = await insertCatalogRegistration({+ universalIdentifier,+ name: 'Pinned App',+ sourcePackage: '@test/pinned-app',+ });+ const recordVersion = jest+ .spyOn(+ getAppProviderByClassName<ApplicationRegistrationVersionService>(+ 'ApplicationRegistrationVersionService',+ ),+ 'createApplicationRegistrationVersion',+ )+ .mockRejectedValueOnce(new Error('version insert failed'));+ const sync = () =>+ syncMarketplaceCatalogFromRegistryPackage({+ packageName: '@test/pinned-app',+ version: '2.0.0',+ manifest: buildManifestWithLogo(universalIdentifier),+ asset: LOGO_PNG,+ tarballUrl: 'https://registry.example.com/pinned-app-2.0.0.tgz',+ });++ try {+ await sync();+ expect(+ await findApplicationRegistrationByUniversalIdentifier({+ universalIdentifier,+ }),+ ).toMatchObject({ logoFileId: expect.any(String) });+ expect(+ await ds.query(+ 'SELECT id FROM core."applicationRegistrationVersion" WHERE "applicationRegistrationId" = $1',+ [registrationId],+ ),+ ).toHaveLength(0);++ await sync();+ expect(+ await ds.query(+ 'SELECT version FROM core."applicationRegistrationVersion" WHERE "applicationRegistrationId" = $1',+ [registrationId],+ ),+ ).toEqual([{ version: '2.0.0' }]);+ } finally {+ recordVersion.mockRestore();+ }+ });+it('stores assets from the package the registration is bound to', async () => {const universalIdentifier = crypto.randomUUID();diff --git a/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.tsindex 523454e68d1..f84bbab3d6f 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/npm-application-install-package-identity.integration-spec.ts@@ -8,14 +8,17 @@ import {import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';import { insertCatalogApplicationRegistration } from 'test/integration/metadata/suites/application/utils/insert-catalog-application-registration.util';import { installApplication } from 'test/integration/metadata/suites/application/utils/install-application.util';+import { uninstallApplication } from 'test/integration/metadata/suites/application/utils/uninstall-application.util';import {type NpmRegistryStub,stubNpmRegistry,} from 'test/integration/metadata/suites/application/utils/stub-npm-registry.util';import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';+import { type ApplicationRegistrationVersionService } from 'src/engine/core-modules/application/application-registration-version/application-registration-version.service';import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';import { type TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';const PACKAGE_NAME = '@twenty-test/install-identity-app';const APP_UNIVERSAL_IDENTIFIER = 'b4a1a0e2-1b6a-4b2f-9c58-0d2a5d5b6f10';@@ -31,6 +34,45 @@ const expectPackageResolutionFailure = (errors: BaseGraphQLError[]) => {expect(errors[0].extensions.subCode).toBe('PACKAGE_RESOLUTION_FAILED');};+const deleteRecordedVersions = async (): Promise<void> => {+ await globalThis.testDataSource.query(+ `DELETE FROM core."applicationRegistrationVersion" WHERE "applicationRegistrationId" IN (+ SELECT id FROM core."applicationRegistration" WHERE "universalIdentifier" = $1+ )`,+ [APP_UNIVERSAL_IDENTIFIER],+ );+};++const insertRecordedVersion = async (tarballUrl: string): Promise<void> => {+ await globalThis.testDataSource.query(+ `INSERT INTO core."applicationRegistrationVersion"+ ("applicationRegistrationId", version, "sourceType", "sourcePackage", "tarballUrl")+ SELECT id, $2, 'npm', $3, $4 FROM core."applicationRegistration"+ WHERE "universalIdentifier" = $1`,+ [APP_UNIVERSAL_IDENTIFIER, VALID_VERSION, PACKAGE_NAME, tarballUrl],+ );+};++const getApplicationRegistrationVersionService = () =>+ getAppProviderByClassName<ApplicationRegistrationVersionService>(+ 'ApplicationRegistrationVersionService',+ );++const findInstalledApplication = async (): Promise<+ { publishedVersionId: string | null } | undefined+> => {+ const [application] = await globalThis.testDataSource.query(+ `SELECT version.id AS "publishedVersionId" FROM core.application AS application+ LEFT JOIN core."applicationRegistrationVersion" AS version+ ON version."applicationRegistrationId" = application."applicationRegistrationId"+ AND version.version = application.version+ WHERE application."universalIdentifier" = $1 AND application."workspaceId" = $2`,+ [APP_UNIVERSAL_IDENTIFIER, SEED_APPLE_WORKSPACE_ID],+ );++ return application;+};+describe('npm application install package identity (integration)', () => {let registryBaseUrl: string;let activeStub: NpmRegistryStub | undefined;@@ -164,21 +206,109 @@ describe('npm application install package identity (integration)', () => {expectPackageResolutionFailure(errors);});- it('installs a package whose identity and digest match the registration', async () => {- const stub = stubNpmRegistry(await buildRegistryPackage());+ it('reuses an already published npm version', async () => {+ const registryPackage = await buildRegistryPackage();- activeStub = stub;+ activeStub = stubNpmRegistry(registryPackage);+ await insertRecordedVersion(registryPackage.tarballUrl);- const { data, errors } = await installApplication({- input: {+ try {+ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ });++ expect(errors).toBeUndefined();+ const application = await findInstalledApplication();+ const [recordedVersion] = await globalThis.testDataSource.query(+ `SELECT id FROM core."applicationRegistrationVersion" WHERE id = $1`,+ [application?.publishedVersionId],+ );++ expect(recordedVersion).toEqual({+ id: application?.publishedVersionId,+ });+ } finally {+ await uninstallApplication({universalIdentifier: APP_UNIVERSAL_IDENTIFIER,- version: VALID_VERSION,- },- expectToFail: false,- });+ });+ await deleteRecordedVersions();+ }+ });- expect(errors).toBeUndefined();- expect(data.installApplication.id).toBeDefined();- expect(stub.requestedUrls[0]).toBe(expectedMetadataUrl());+ it('rolls a fresh install back when its version cannot be recorded', async () => {+ activeStub = stubNpmRegistry(await buildRegistryPackage());++ const createApplicationRegistrationVersionSpy = jest+ .spyOn(+ getApplicationRegistrationVersionService(),+ 'createApplicationRegistrationVersion',+ )+ .mockRejectedValueOnce(new Error('version insert failed'));++ try {+ const { errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: true,+ });++ expect(errors).toHaveLength(1);+ expect(createApplicationRegistrationVersionSpy).toHaveBeenCalledTimes(1);+ expect(await findInstalledApplication()).toBeUndefined();+ } finally {+ createApplicationRegistrationVersionSpy.mockRestore();+ }+ });++ it('installs the tarball provided by the npm registry', async () => {+ const registryPackage = await buildRegistryPackage();++ const stub = stubNpmRegistry(registryPackage);++ activeStub = stub;++ try {+ const { data, errors } = await installApplication({+ input: {+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ version: VALID_VERSION,+ },+ expectToFail: false,+ });++ expect(errors).toBeUndefined();+ expect(data.installApplication.id).toBeDefined();+ expect(stub.requestedUrls[0]).toBe(expectedMetadataUrl());++ const application = await findInstalledApplication();++ expect(application).toBeDefined();++ const [installedVersion] = await globalThis.testDataSource.query(+ `SELECT id, version, "sourceType", "sourcePackage", "tarballUrl", "tarballFileId"+ FROM core."applicationRegistrationVersion"+ WHERE id = $1`,+ [application?.publishedVersionId],+ );++ expect(installedVersion).toEqual({+ id: application?.publishedVersionId,+ version: VALID_VERSION,+ sourceType: 'npm',+ sourcePackage: PACKAGE_NAME,+ tarballUrl: registryPackage.tarballUrl,+ tarballFileId: null,+ });+ } finally {+ await uninstallApplication({+ universalIdentifier: APP_UNIVERSAL_IDENTIFIER,+ });+ await deleteRecordedVersions();+ }});});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.tsindex e7d1380fd7e..f795ddd5360 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/utils/sync-marketplace-catalog-from-registry-package.util.ts@@ -3,6 +3,7 @@ import { type Manifest } from 'twenty-shared/application';import { type MarketplaceCatalogSyncService } from 'src/engine/core-modules/application/application-marketplace/marketplace-catalog-sync.service';import { type MarketplaceService } from 'src/engine/core-modules/application/application-marketplace/marketplace.service';+import { type ApplicationPackageFetcherService } from 'src/engine/core-modules/application/application-package/application-package-fetcher.service';// Runs the catalog sync against a registry that serves a single package, so// the test never reaches npm.@@ -11,11 +12,15 @@ export const syncMarketplaceCatalogFromRegistryPackage = async ({version,manifest,asset = null,+ tarballUrl = null,+ shouldStubRegistryTarball = true,}: {packageName: string;version: string;manifest: Manifest;asset?: Buffer | null;+ tarballUrl?: string | null;+ shouldStubRegistryTarball?: boolean;}): Promise<void> => {const marketplaceService =getAppProviderByClassName<MarketplaceService>('MarketplaceService');@@ -31,6 +36,16 @@ export const syncMarketplaceCatalogFromRegistryPackage = async ({const fetchAssetFromRegistryCdnSpy = jest.spyOn(marketplaceService, 'fetchAssetFromRegistryCdn').mockResolvedValue(asset);+ const findRegistryTarballUrlSpy = shouldStubRegistryTarball+ ? jest+ .spyOn(+ getAppProviderByClassName<ApplicationPackageFetcherService>(+ 'ApplicationPackageFetcherService',+ ),+ 'findRegistryTarballUrl',+ )+ .mockResolvedValue(tarballUrl)+ : undefined;try {await getAppProviderByClassName<MarketplaceCatalogSyncService>(@@ -40,5 +55,6 @@ export const syncMarketplaceCatalogFromRegistryPackage = async ({fetchAppsFromRegistrySpy.mockRestore();fetchManifestFromRegistryCdnSpy.mockRestore();fetchAssetFromRegistryCdnSpy.mockRestore();+ findRegistryTarballUrlSpy?.mockRestore();}};diff --git a/packages/twenty-server/test/integration/upgrade/suites/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.integration-spec.tsnew file mode 100644index 00000000000..10dbedfc64d--- /dev/null+++ b/packages/twenty-server/test/integration/upgrade/suites/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions.integration-spec.ts@@ -0,0 +1,234 @@+import { type DataSource, type QueryRunner } from 'typeorm';+import { v4 } from 'uuid';++import { BackfillApplicationRegistrationVersionsSlowInstanceCommand } from 'src/database/commands/upgrade-version-command/2-48/2-48-instance-command-slow-1792077361238-backfill-application-registration-versions';+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++jest.useRealTimers();++const PUBLISHED_AT = new Date('2026-09-01T10:00:00.000Z');++type RegistrationRow = {+ sourceType: string;+ latestAvailableVersion: string | null;+ sourcePackage?: string | null;+ tarballFileId?: string | null;+ deletedAt?: Date | null;+};++describe('2-48 slow instance command 1792077361238 - BackfillApplicationRegistrationVersionsSlowInstanceCommand (integration)', () => {+ const command =+ new BackfillApplicationRegistrationVersionsSlowInstanceCommand();+ let queryRunner: QueryRunner;++ const runBackfill = () =>+ command.runDataMigration(queryRunner.manager as unknown as DataSource);++ const insertTarballFile = async (): Promise<string> => {+ const [{ id }] = await queryRunner.query(+ `INSERT INTO "core"."file" ("workspaceId", size, path)+ VALUES ($1, 1, $2) RETURNING id`,+ [SEED_APPLE_WORKSPACE_ID, `app-tarball/${v4()}.tgz`],+ );++ return id;+ };++ const insertRegistration = async ({+ sourceType,+ latestAvailableVersion,+ sourcePackage = null,+ tarballFileId = null,+ deletedAt = null,+ }: RegistrationRow): Promise<string> => {+ const [{ id }] = await queryRunner.query(+ `INSERT INTO "core"."applicationRegistration"+ ("universalIdentifier", name, "oAuthClientId", "sourceType", "sourcePackage",+ "latestAvailableVersion", "tarballFileId", "workspaceId", "updatedAt", "deletedAt")+ VALUES ($1, 'Backfill test app', $2, $3, $4, $5, $6, $7, $8, $9)+ RETURNING id`,+ [+ v4(),+ v4(),+ sourceType,+ sourcePackage,+ latestAvailableVersion,+ tarballFileId,+ SEED_APPLE_WORKSPACE_ID,+ PUBLISHED_AT,+ deletedAt,+ ],+ );++ return id;+ };++ const insertApplication = async ({+ applicationRegistrationId,+ version,+ }: {+ applicationRegistrationId: string;+ version: string;+ }): Promise<string> => {+ const [{ id }] = await queryRunner.query(+ `INSERT INTO "core"."application"+ ("universalIdentifier", name, "sourcePath", "workspaceId", "applicationRegistrationId", version)+ VALUES ($1, 'Backfill test app', 'backfill-test-app', $2, $3, $4)+ RETURNING id`,+ [v4(), SEED_APPLE_WORKSPACE_ID, applicationRegistrationId, version],+ );++ return id;+ };++ const findVersions = (applicationRegistrationIds: string[]) =>+ queryRunner.query(+ `SELECT id, "applicationRegistrationId", version, "sourceType", "sourcePackage",+ "tarballFileId", "tarballUrl", "publishedAt"+ FROM "core"."applicationRegistrationVersion"+ WHERE "applicationRegistrationId" = ANY($1::uuid[])+ ORDER BY version`,+ [applicationRegistrationIds],+ );++ const findLinkedVersionId = async (+ applicationId: string,+ ): Promise<string | null> => {+ const [{ versionId }] = await queryRunner.query(+ `SELECT version.id AS "versionId" FROM core.application AS application+ LEFT JOIN core."applicationRegistrationVersion" AS version+ ON version."applicationRegistrationId" = application."applicationRegistrationId"+ AND version.version = application.version+ WHERE application.id = $1`,+ [applicationId],+ );++ return versionId;+ };++ beforeEach(async () => {+ queryRunner = global.testDataSource.createQueryRunner();+ await queryRunner.connect();+ await queryRunner.startTransaction();+ });++ afterEach(async () => {+ await queryRunner.rollbackTransaction();+ await queryRunner.release();+ });++ it('records the latest published version and finds installs through their registration and version', async () => {+ const tarballFileId = await insertTarballFile();+ const tarballRegistrationId = await insertRegistration({+ sourceType: 'tarball',+ latestAvailableVersion: '1.2.0',+ tarballFileId,+ });+ const npmRegistrationId = await insertRegistration({+ sourceType: 'npm',+ latestAvailableVersion: '3.0.0',+ sourcePackage: '@acme/backfill-app',+ });+ const applicationAtLatestVersionId = await insertApplication({+ applicationRegistrationId: tarballRegistrationId,+ version: '1.2.0',+ });+ const applicationAtOlderVersionId = await insertApplication({+ applicationRegistrationId: npmRegistrationId,+ version: '2.0.0',+ });++ await runBackfill();++ const [tarballVersion] = await findVersions([tarballRegistrationId]);+ const [npmVersion] = await findVersions([npmRegistrationId]);++ expect(tarballVersion).toEqual({+ id: expect.any(String),+ applicationRegistrationId: tarballRegistrationId,+ version: '1.2.0',+ sourceType: 'tarball',+ sourcePackage: null,+ tarballFileId,+ tarballUrl: null,+ publishedAt: PUBLISHED_AT,+ });+ expect(npmVersion).toEqual({+ id: expect.any(String),+ applicationRegistrationId: npmRegistrationId,+ version: '3.0.0',+ sourceType: 'npm',+ sourcePackage: '@acme/backfill-app',+ tarballFileId: null,+ tarballUrl: null,+ publishedAt: PUBLISHED_AT,+ });+ expect(await findLinkedVersionId(applicationAtLatestVersionId)).toBe(+ tarballVersion.id,+ );+ expect(await findLinkedVersionId(applicationAtOlderVersionId)).toBeNull();+ });++ it('skips registrations that have no published version to record', async () => {+ const skippedRegistrationIds = [+ await insertRegistration({+ sourceType: 'local',+ latestAvailableVersion: '1.0.0',+ }),+ await insertRegistration({+ sourceType: 'oauth-only',+ latestAvailableVersion: '1.0.0',+ }),+ await insertRegistration({+ sourceType: 'npm',+ latestAvailableVersion: null,+ sourcePackage: '@acme/unpublished-app',+ }),+ await insertRegistration({+ sourceType: 'tarball',+ latestAvailableVersion: '1.0.0',+ tarballFileId: await insertTarballFile(),+ deletedAt: PUBLISHED_AT,+ }),+ ];++ await runBackfill();++ expect(await findVersions(skippedRegistrationIds)).toEqual([]);+ });++ it('keeps an already recorded version untouched and can run again without duplicating it', async () => {+ const registrationId = await insertRegistration({+ sourceType: 'npm',+ latestAvailableVersion: '1.0.0',+ sourcePackage: '@acme/recorded-app',+ });+ const [{ id: recordedVersionId }] = await queryRunner.query(+ `INSERT INTO "core"."applicationRegistrationVersion"+ ("applicationRegistrationId", version, "sourceType", "sourcePackage", "tarballUrl")+ VALUES ($1, '1.0.0', 'npm', '@acme/recorded-app', $2)+ RETURNING id`,+ [+ registrationId,+ 'https://registry.npmjs.org/@acme/recorded-app/-/recorded-app-1.0.0.tgz',+ ],+ );+ const applicationId = await insertApplication({+ applicationRegistrationId: registrationId,+ version: '1.0.0',+ });++ await runBackfill();+ await runBackfill();++ expect(await findVersions([registrationId])).toEqual([+ expect.objectContaining({+ id: recordedVersionId,+ version: '1.0.0',+ tarballUrl:+ 'https://registry.npmjs.org/@acme/recorded-app/-/recorded-app-1.0.0.tgz',+ }),+ ]);+ expect(await findLinkedVersionId(applicationId)).toBe(recordedVersionId);+ });+});