feat: combine services enterprise

Unleash · Feb 22, 2024 · 9b3d9fc · 9b3d9fc
1 parent 0ccfc29
commit 9b3d9fc
Show file tree

Hide file tree

Showing 22 changed files with 47 additions and 46 deletions.
diff --git a/src/lib/app.ts b/src/lib/app.ts
@@ -35,7 +35,9 @@ export default async function getApp(
     services: IUnleashServices,
     unleashSession?: RequestHandler,
     db?: Knex,
-): Promise<Application> {
+): Promise<{ app: Application; services: unknown; stores: unknown }> {
+    let combinedServices = services;
+    let combinedStores = stores;
     const app = express();
 
     const baseUriPath = config.server.baseUriPath || '';
@@ -179,7 +181,11 @@ export default async function getApp(
     );
 
     if (typeof config.preRouterHook === 'function') {
-        config.preRouterHook(app, config, services, stores, db);
+        const { services: enterpriseServices, stores: enterpriseStores } =
+            config.preRouterHook(app, config, services, stores, db);
+
+        combinedServices = enterpriseServices;
+        combinedStores = enterpriseStores;
     }
 
     // Setup API routes
@@ -212,5 +218,5 @@ export default async function getApp(
         res.send(indexHTML);
     });
 
-    return app;
+    return { app, stores: combinedStores, services: combinedServices };
 }
diff --git a/src/lib/features/client-feature-toggles/tests/client-feature-toggle.e2e.test.ts b/src/lib/features/client-feature-toggles/tests/client-feature-toggle.e2e.test.ts
@@ -21,7 +21,7 @@ async function getSetup() {
     });
     const services = createServices(stores, config);
 
-    app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/features/metrics/instance/metrics.test.ts b/src/lib/features/metrics/instance/metrics.test.ts
@@ -21,7 +21,7 @@ async function getSetup(opts?: IUnleashOptions) {
     db = await dbInit('metrics', config.getLogger);
 
     const services = createServices(db.stores, config, db.rawDatabase);
-    const app = await getApp(config, db.stores, services);
+    const { app } = await getApp(config, db.stores, services);
     return {
         request: supertest(app),
         stores: db.stores,

diff --git a/src/lib/features/metrics/instance/register.test.ts b/src/lib/features/metrics/instance/register.test.ts
@@ -10,7 +10,7 @@ async function getSetup() {
     const stores = createStores();
     const config = createTestConfig();
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         request: supertest(app),

diff --git a/src/lib/features/playground/playground.test.ts b/src/lib/features/playground/playground.test.ts
@@ -23,7 +23,7 @@ async function getSetup() {
         experimental: { flags: { strictSchemaValidation: true } },
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
     return { base, request: supertest(app) };
 }
 describe('toggle generator', () => {

diff --git a/src/lib/middleware/oss-authentication.test.ts b/src/lib/middleware/oss-authentication.test.ts
@@ -27,7 +27,7 @@ async function getSetup(preRouterHook) {
     const stores = createStores();
     const services = createServices(stores, config);
     const unleashSession = sessionDb(config, {} as Knex);
-    const app = await getApp(config, stores, services, unleashSession);
+    const { app } = await getApp(config, stores, services, unleashSession);
 
     return {
         base,

diff --git a/src/lib/proxy/proxy-repository.ts b/src/lib/proxy/proxy-repository.ts
@@ -1,10 +1,7 @@
 import EventEmitter from 'events';
 import { RepositoryInterface } from 'unleash-client/lib/repository';
 import { Segment } from 'unleash-client/lib/strategy/strategy';
-import {
-    EnhancedFeatureInterface,
-    FeatureInterface,
-} from 'unleash-client/lib/feature';
+import { FeatureInterface } from 'unleash-client/lib/feature';
 import { IApiUser } from '../types/api-user';
 import { IUnleashConfig, IUnleashServices, IUnleashStores } from '../types';
 import {
@@ -67,15 +64,10 @@ export class ProxyRepository
         this.configurationRevisionService =
             services.configurationRevisionService;
         this.token = token;
-        this.onUpdateRevisionEvent = this.onUpdateRevisionEvent.bind(this);
+        this.onAnyEvent = this.onAnyEvent.bind(this);
         this.interval = config.frontendApi.refreshIntervalInMs;
     }
 
-    getTogglesWithSegmentData(): EnhancedFeatureInterface[] {
-        // TODO: add real implementation
-        return [];
-    }
-
     getSegment(id: number): Segment | undefined {
         return this.segments.find((segment) => segment.id === id);
     }
@@ -95,20 +87,14 @@ export class ProxyRepository
 
         // Reload cached token data whenever something relevant has changed.
         // For now, simply reload all the data on any EventStore event.
-        this.configurationRevisionService.on(
-            UPDATE_REVISION,
-            this.onUpdateRevisionEvent,
-        );
+        this.configurationRevisionService.on(UPDATE_REVISION, this.onAnyEvent);
 
         this.emit(UnleashEvents.Ready);
         this.emit(UnleashEvents.Changed);
     }
 
     stop(): void {
-        this.configurationRevisionService.off(
-            UPDATE_REVISION,
-            this.onUpdateRevisionEvent,
-        );
+        this.configurationRevisionService.off(UPDATE_REVISION, this.onAnyEvent);
         this.running = false;
     }
 
@@ -136,16 +122,20 @@ export class ProxyRepository
             this.features = await this.featuresForToken();
             this.segments = await this.segmentsForToken();
         } catch (e) {
-            this.logger.error('Cannot load data for token', e);
+            this.logger.error(e);
         }
     }
 
     private randomizeDelay(floor: number, ceiling: number): number {
         return Math.floor(Math.random() * (ceiling - floor) + floor);
     }
 
-    private async onUpdateRevisionEvent() {
-        await this.loadDataForToken();
+    private async onAnyEvent() {
+        try {
+            await this.loadDataForToken();
+        } catch (error) {
+            this.logger.error(error);
+        }
     }
 
     private async featuresForToken(): Promise<FeatureInterface[]> {

diff --git a/src/lib/routes/admin-api/api-token.test.ts b/src/lib/routes/admin-api/api-token.test.ts
@@ -26,7 +26,7 @@ async function getSetup(adminTokenKillSwitchEnabled: boolean) {
         enabled: true,
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/config.test.ts b/src/lib/routes/admin-api/config.test.ts
@@ -25,7 +25,7 @@ async function getSetup() {
     const stores = createStores();
     const services = createServices(stores, config);
 
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/context.test.ts b/src/lib/routes/admin-api/context.test.ts
@@ -16,7 +16,7 @@ async function getSetup() {
     const stores = createStores();
 
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/email.test.ts b/src/lib/routes/admin-api/email.test.ts
@@ -15,7 +15,7 @@ async function getSetup() {
     });
 
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/events.test.ts b/src/lib/routes/admin-api/events.test.ts
@@ -20,7 +20,7 @@ async function getSetup(anonymise: boolean = false) {
         experimental: { flags: { anonymiseEventLog: anonymise } },
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/metrics.test.ts b/src/lib/routes/admin-api/metrics.test.ts
@@ -14,7 +14,7 @@ async function getSetup() {
         preRouterHook: perms.hook,
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         request: supertest(app),

diff --git a/src/lib/routes/admin-api/public-signup.test.ts b/src/lib/routes/admin-api/public-signup.test.ts
@@ -23,7 +23,7 @@ describe('Public Signup API', () => {
         };
 
         const services = createServices(stores, config);
-        const app = await getApp(config, stores, services);
+        const { app } = await getApp(config, stores, services);
 
         await stores.roleStore.create({
             name: RoleName.VIEWER,

diff --git a/src/lib/routes/admin-api/strategy.test.ts b/src/lib/routes/admin-api/strategy.test.ts
@@ -14,7 +14,7 @@ async function getSetup() {
         preRouterHook: perms.hook,
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base: randomBase,

diff --git a/src/lib/routes/admin-api/tag.test.ts b/src/lib/routes/admin-api/tag.test.ts
@@ -16,7 +16,7 @@ async function getSetup() {
         preRouterHook: perms.hook,
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         base,

diff --git a/src/lib/routes/admin-api/user/user.test.ts b/src/lib/routes/admin-api/user/user.test.ts
@@ -29,7 +29,7 @@ async function getSetup() {
         server: { baseUriPath: base },
     });
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
     return {
         base,
         userStore: stores.userStore,

diff --git a/src/lib/routes/backstage.test.ts b/src/lib/routes/backstage.test.ts
@@ -11,7 +11,7 @@ test('should enable prometheus', async () => {
     const config = createTestConfig();
     const services = createServices(stores, config);
 
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     const request = supertest(app);
 

diff --git a/src/lib/routes/health-check.test.ts b/src/lib/routes/health-check.test.ts
@@ -11,7 +11,7 @@ async function getSetup() {
     const stores = createStores();
     const config = createTestConfig();
     const services = createServices(stores, config);
-    const app = await getApp(config, stores, services);
+    const { app } = await getApp(config, stores, services);
 
     return {
         request: supertest(app),

diff --git a/src/lib/routes/public-invite.test.ts b/src/lib/routes/public-invite.test.ts
@@ -30,7 +30,7 @@ describe('Public Signup API', () => {
         };
 
         const services = createServices(stores, config);
-        const app = await getApp(config, stores, services);
+        const { app } = await getApp(config, stores, services);
 
         await stores.roleStore.create({
             name: RoleName.VIEWER,

diff --git a/src/lib/server-impl.ts b/src/lib/server-impl.ts
@@ -20,6 +20,7 @@ import {
     RoleName,
     CustomAuthHandler,
     SYSTEM_USER,
+    IUnleashStores,
 } from './types';
 
 import User, { IUser } from './types/user';
@@ -68,7 +69,11 @@ async function createApp(
         const secret = await stores.settingStore.get<string>('unleash.secret');
         config.server.secret = secret!;
     }
-    const app = await getApp(config, stores, services, unleashSession, db);
+    const {
+        app,
+        services: combinedServices,
+        stores: combinedStores,
+    } = await getApp(config, stores, services, unleashSession, db);
 
     await metricsMonitor.startMonitoring(
         config,
@@ -80,9 +85,9 @@ async function createApp(
         db,
     );
     const unleash: Omit<IUnleash, 'stop'> = {
-        stores,
+        stores: combinedStores as IUnleashStores,
         eventBus: config.eventBus,
-        services,
+        services: combinedServices as IUnleashServices,
         app,
         config,
         version: serverVersion,

diff --git a/src/test/e2e/helpers/test-helper.ts b/src/test/e2e/helpers/test-helper.ts
@@ -323,7 +323,7 @@ async function createApp(
     const unleashSession = sessionDb(config, undefined);
     const emitter = new EventEmitter();
     emitter.setMaxListeners(0);
-    const app = await getApp(config, stores, services, unleashSession, db);
+    const { app } = await getApp(config, stores, services, unleashSession, db);
     const request = supertest.agent(app);
 
     const destroy = async () => {