feat: remove inactive applications (#9835)

src/lib/db/client-applications-store.ts

@@ -449,4 +449,16 @@ export default class ClientApplicationsStore
             }));
         }
     };
+
+    async removeInactiveApplications(): Promise<number> {
+        const rows = await this.db(TABLE)
+            .whereRaw("seen_at < now() - interval '30 days'")
+            .del();
+
+        if (rows > 0) {
+            this.logger.debug(`Deleted ${rows} applications`);
+        }
+
+        return rows;
+    }
 }

src/lib/features/metrics/instance/instance-service.ts

@@ -298,6 +298,13 @@ export default class ClientInstanceService {
         return this.clientInstanceStore.removeInstancesOlderThanTwoDays();
     }
 
+    async removeInactiveApplications(): Promise<number> {
+        if (this.flagResolver.isEnabled('removeInactiveApplications')) {
+            return this.clientApplicationsStore.removeInactiveApplications();
+        }
+        return 0;
+    }
+
     async getOutdatedSdks(): Promise<OutdatedSdksSchema['sdks']> {
         const sdkApps = await this.clientInstanceStore.groupApplicationsBySdk();
 

src/lib/features/scheduler/schedule-services.ts

@@ -78,6 +78,14 @@ export const scheduleServices = async (
         'removeInstancesOlderThanTwoDays',
     );
 
+    schedulerService.schedule(
+        clientInstanceService.removeInactiveApplications.bind(
+            clientInstanceService,
+        ),
+        hoursToMilliseconds(24),
+        'removeInactiveApplications',
+    );
+
     schedulerService.schedule(
         clientInstanceService.bulkAdd.bind(clientInstanceService),
         secondsToMilliseconds(5),

src/lib/types/experimental.ts

@@ -69,7 +69,8 @@ export type IFlagKey =
     | 'newStrategyDropdown'
     | 'flagsOverviewSearch'
     | 'flagsReleaseManagementUI'
-    | 'cleanupReminder';
+    | 'cleanupReminder'
+    | 'removeInactiveApplications';
 
 export type IFlags = Partial<{ [key in IFlagKey]: boolean | Variant }>;
 
@@ -330,6 +331,10 @@ const flags: IFlags = {
         process.env.UNLEASH_EXPERIMENTAL_CLEANUP_REMINDER,
         false,
     ),
+    removeInactiveApplications: parseEnvVarBoolean(
+        process.env.UNLEASH_EXPERIMENTAL_REMOVE_INACTIVE_APPLICATIONS,
+        false,
+    ),
 };
 
 export const defaultExperimentalOptions: IExperimentalOptions = {

src/lib/types/stores/client-applications-store.ts

@@ -44,4 +44,5 @@ export interface IClientApplicationsStore
     getUnannounced(): Promise<IClientApplication[]>;
     setUnannouncedToAnnounced(): Promise<IClientApplication[]>;
     getApplicationOverview(appName: string): Promise<IApplicationOverview>;
+    removeInactiveApplications(): Promise<number>;
 }

src/test/e2e/stores/client-application-store.e2e.test.ts

@@ -6,6 +6,7 @@ import type {
     IUnleashStores,
 } from '../../../lib/types';
 import type { IClientApplication } from '../../../lib/types/stores/client-applications-store';
+import { subDays } from 'date-fns';
 
 let db: ITestDb;
 let stores: IUnleashStores;
@@ -175,3 +176,33 @@ test('Multi row merge also works', async () => {
         expect(s!.icon).toBe('red');
     });
 });
+
+test('Remove inactive applications', async () => {
+    const clientRegistration = {
+        appName: faker.internet.domainName(),
+        instanceId: faker.datatype.uuid(),
+        strategies: ['default'],
+        started: Date.now(),
+        interval: faker.datatype.number(),
+        sdkVersion: '3.11.2',
+        icon: '',
+        description: faker.company.catchPhrase(),
+        color: faker.internet.color(),
+    };
+
+    await clientApplicationsStore.upsert({
+        ...clientRegistration,
+        lastSeen: subDays(Date.now(), 29),
+    });
+    const noRemovedItems =
+        await clientApplicationsStore.removeInactiveApplications();
+    expect(noRemovedItems).toBe(0);
+
+    await clientApplicationsStore.upsert({
+        ...clientRegistration,
+        lastSeen: subDays(Date.now(), 30),
+    });
+    const removedItems =
+        await clientApplicationsStore.removeInactiveApplications();
+    expect(removedItems).toBe(1);
+});

src/test/fixtures/fake-client-applications-store.ts

@@ -82,4 +82,8 @@ export default class FakeClientApplicationsStore
     getApplicationOverview(appName: string): Promise<IApplicationOverview> {
         throw new Error('Method not implemented.');
     }
+
+    async removeInactiveApplications(): Promise<number> {
+        return 0;
+    }
 }