Skip to content

The open alternative to Salesforce, designed for AI.

Repair application dependency checksums that do not match the stored files (#29571)

Paul Rastoin2b5e8cfd8af2
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-upgrade-version-command.module.ts
index 68539eb3185..29565c30f1c 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-upgrade-version-command.module.ts
@@ -6,6 +6,8 @@ import { EnableDirectMessagePairIdentityCommand } from 'src/database/commands/up
import { MakeAgentTurnThreadOptionalCommand } from 'src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793697418663-make-agent-turn-thread-optional.command';
import { InlineWorkflowStepAgentsCommand } from 'src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793697418665-inline-workflow-step-agents.command';
import { RenameEmailsTabToMessagesCommand } from 'src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793707166734-rename-emails-tab-to-messages.command';
+import { RepairApplicationDependencyChecksumsCommand } from 'src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793720039867-repair-application-dependency-checksums.command';
+import { ApplicationPackageModule } from 'src/engine/core-modules/application/application-package/application-package.module';
import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
@@ -15,6 +17,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
@Module({
imports: [
ApplicationModule,
+ ApplicationPackageModule,
FeatureFlagModule,
WorkspaceCacheModule,
WorkspaceIteratorModule,
@@ -27,6 +30,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
MakeAgentTurnThreadOptionalCommand,
InlineWorkflowStepAgentsCommand,
RenameEmailsTabToMessagesCommand,
+ RepairApplicationDependencyChecksumsCommand,
],
})
export class V2_56_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793720039867-repair-application-dependency-checksums.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793720039867-repair-application-dependency-checksums.command.ts
new file mode 100644
index 00000000000..5fb676eda31
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/2-56-workspace-command-1793720039867-repair-application-dependency-checksums.command.ts
@@ -0,0 +1,116 @@
+import { Command } from 'nest-commander';
+import { FileFolder } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { computeRepairedDependencyChecksums } from 'src/database/commands/upgrade-version-command/2-56/utils/compute-repaired-dependency-checksums.util';
+import { ApplicationDependencyFilesService } from 'src/engine/core-modules/application/application-package/application-dependency-files.service';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { type FlatApplication } from 'src/engine/core-modules/application/types/flat-application.type';
+import { FileStorageService } from 'src/engine/core-modules/file-storage/services/file-storage.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+
+@RegisteredWorkspaceCommand('2.56.0', 1793720039867)
+@Command({
+ name: 'upgrade:2-56:repair-application-dependency-checksums',
+ description:
+ 'Recompute application dependency checksums that do not match the stored package.json and yarn.lock',
+})
+export class RepairApplicationDependencyChecksumsCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly applicationService: ApplicationService,
+ private readonly applicationDependencyFilesService: ApplicationDependencyFilesService,
+ private readonly fileStorageService: FileStorageService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const { flatApplicationMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatApplicationMaps',
+ ]);
+
+ const flatApplications = Object.values(flatApplicationMaps.byId).filter(
+ (flatApplication): flatApplication is FlatApplication =>
+ isDefined(flatApplication) && !isDefined(flatApplication.deletedAt),
+ );
+
+ for (const flatApplication of flatApplications) {
+ try {
+ await this.repairApplicationDependencyChecksums({
+ workspaceId,
+ flatApplication,
+ isDryRun: options.dryRun ?? false,
+ });
+ } catch (error) {
+ this.logger.error(
+ `Workspace ${workspaceId}: failed to repair dependency checksums of application ${flatApplication.universalIdentifier}: ${
+ error instanceof Error ? error.message : String(error)
+ }`,
+ );
+ }
+ }
+ }
+
+ private async repairApplicationDependencyChecksums({
+ workspaceId,
+ flatApplication,
+ isDryRun,
+ }: {
+ workspaceId: string;
+ flatApplication: FlatApplication;
+ isDryRun: boolean;
+ }): Promise<void> {
+ const applicationIdentifier = {
+ workspaceId,
+ applicationUniversalIdentifier: flatApplication.universalIdentifier,
+ };
+
+ const isPackageJsonStored = await this.fileStorageService.checkFileExists({
+ ...applicationIdentifier,
+ fileFolder: FileFolder.Dependencies,
+ resourcePath: 'package.json',
+ });
+
+ if (!isPackageJsonStored) {
+ return;
+ }
+
+ const { packageJsonContent, yarnLockContent } =
+ await this.applicationDependencyFilesService.getDependencyContents(
+ applicationIdentifier,
+ );
+
+ const repairedChecksums = computeRepairedDependencyChecksums({
+ declaredChecksums: flatApplication,
+ packageJsonContent,
+ yarnLockContent,
+ });
+
+ if (!isDefined(repairedChecksums)) {
+ return;
+ }
+
+ this.logger.log(
+ `${isDryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: application ${flatApplication.universalIdentifier} package.json checksum ${flatApplication.packageJsonChecksum} -> ${repairedChecksums.packageJsonChecksum}, yarn.lock checksum ${flatApplication.yarnLockChecksum} -> ${repairedChecksums.yarnLockChecksum}`,
+ );
+
+ if (isDryRun) {
+ return;
+ }
+
+ await this.applicationService.update(flatApplication.id, {
+ workspaceId,
+ ...repairedChecksums,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/__tests__/compute-repaired-dependency-checksums.util.spec.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/__tests__/compute-repaired-dependency-checksums.util.spec.ts
new file mode 100644
index 00000000000..0243841a039
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/__tests__/compute-repaired-dependency-checksums.util.spec.ts
@@ -0,0 +1,91 @@
+import { computeRepairedDependencyChecksums } from 'src/database/commands/upgrade-version-command/2-56/utils/compute-repaired-dependency-checksums.util';
+import { computeApplicationPackageChecksums } from 'src/engine/core-modules/application/application-package/utils/compute-application-package-checksums.util';
+import { computeLegacyApplicationPackageChecksums } from 'src/engine/core-modules/application/application-package/utils/compute-legacy-application-package-checksums.util';
+
+const PACKAGE_JSON_CONTENT = '{\n "name": "app",\n "version": "1.0.0"\n}\n';
+const YARN_LOCK_CONTENT = '__metadata:\n version: 8\n';
+
+const STORED_FILES_CHECKSUMS = computeApplicationPackageChecksums({
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+});
+
+describe('computeRepairedDependencyChecksums', () => {
+ it('returns undefined when the declared checksums match the stored files', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: STORED_FILES_CHECKSUMS,
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('returns undefined when the declared checksums match the legacy md5 of the stored files', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: computeLegacyApplicationPackageChecksums({
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+ }),
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('returns undefined when no yarn.lock is stored and package.json matches', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: {
+ packageJsonChecksum: STORED_FILES_CHECKSUMS.packageJsonChecksum,
+ yarnLockChecksum: 'stale-yarn-lock-checksum',
+ },
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: null,
+ }),
+ ).toBeUndefined();
+ });
+
+ it('returns the stored files checksums when the yarn.lock checksum is stale', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: {
+ packageJsonChecksum: STORED_FILES_CHECKSUMS.packageJsonChecksum,
+ yarnLockChecksum: 'stale-yarn-lock-checksum',
+ },
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+ }),
+ ).toEqual(STORED_FILES_CHECKSUMS);
+ });
+
+ it('returns the stored files checksums when a yarn.lock is stored but none is declared', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: {
+ packageJsonChecksum: STORED_FILES_CHECKSUMS.packageJsonChecksum,
+ yarnLockChecksum: null,
+ },
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: YARN_LOCK_CONTENT,
+ }),
+ ).toEqual(STORED_FILES_CHECKSUMS);
+ });
+
+ it('returns the stored files checksums with a null yarn.lock checksum when package.json is stale and no yarn.lock is stored', () => {
+ expect(
+ computeRepairedDependencyChecksums({
+ declaredChecksums: {
+ packageJsonChecksum: 'stale-package-json-checksum',
+ yarnLockChecksum: 'stale-yarn-lock-checksum',
+ },
+ packageJsonContent: PACKAGE_JSON_CONTENT,
+ yarnLockContent: null,
+ }),
+ ).toEqual({
+ packageJsonChecksum: STORED_FILES_CHECKSUMS.packageJsonChecksum,
+ yarnLockChecksum: null,
+ });
+ });
+});
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/compute-repaired-dependency-checksums.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/compute-repaired-dependency-checksums.util.ts
new file mode 100644
index 00000000000..52c02dc8e51
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-56/utils/compute-repaired-dependency-checksums.util.ts
@@ -0,0 +1,33 @@
+import { computeApplicationPackageChecksums } from 'src/engine/core-modules/application/application-package/utils/compute-application-package-checksums.util';
+import { computeLegacyApplicationPackageChecksums } from 'src/engine/core-modules/application/application-package/utils/compute-legacy-application-package-checksums.util';
+import {
+ type DependencyChecksums,
+ isMatchingDependencyChecksums,
+} from 'src/engine/core-modules/application/application-package/utils/is-matching-dependency-checksums.util';
+
+export const computeRepairedDependencyChecksums = ({
+ declaredChecksums,
+ packageJsonContent,
+ yarnLockContent,
+}: {
+ declaredChecksums: DependencyChecksums;
+ packageJsonContent: string;
+ yarnLockContent: string | null;
+}): DependencyChecksums | undefined => {
+ const storedFilesChecksums = computeApplicationPackageChecksums({
+ packageJsonContent,
+ yarnLockContent,
+ });
+
+ const isDeclaredChecksumsAccepted = [
+ storedFilesChecksums,
+ computeLegacyApplicationPackageChecksums({
+ packageJsonContent,
+ yarnLockContent,
+ }),
+ ].some((filesChecksums) =>
+ isMatchingDependencyChecksums({ declaredChecksums, filesChecksums }),
+ );
+
+ return isDeclaredChecksumsAccepted ? undefined : storedFilesChecksums;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-package/application-dependency-files.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-package/application-dependency-files.service.ts
index ad62fac1a60..e94a0d140d8 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-package/application-dependency-files.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-package/application-dependency-files.service.ts
@@ -86,7 +86,7 @@ export class ApplicationDependencyFilesService {
return { packageJsonContent, yarnLockContent, storedFilesChecksums };
}
- private async getDependencyContents({
+ async getDependencyContents({
workspaceId,
applicationUniversalIdentifier,
}: ApplicationIdentifier): Promise<StoredDependencyFiles> {