unleash-server 4.2.0-2 → 4.2.0-beta.1

package/dist/lib/app.js

@@ -24,82 +24,82 @@ const no_authentication_1 = __importDefault(require("./middleware/no-authenticat
 const secure_headers_1 = __importDefault(require("./middleware/secure-headers"));
 const rewriteHTML_1 = require("./util/rewriteHTML");
 function getApp(config, stores, services, eventBus, unleashSession) {
-    const app = (0, express_1.default)();
+    const app = express_1.default();
     const baseUriPath = config.server.baseUriPath || '';
     let indexHTML = fs_1.default
         .readFileSync(path_1.default.join(unleash_frontend_1.publicFolder, 'index.html'))
         .toString();
-    indexHTML = (0, rewriteHTML_1.rewriteHTML)(indexHTML, baseUriPath);
+    indexHTML = rewriteHTML_1.rewriteHTML(indexHTML, baseUriPath);
     app.set('trust proxy', true);
     app.disable('x-powered-by');
     app.set('port', config.server.port);
     app.locals.baseUriPath = baseUriPath;
     if (config.server.serverMetrics && eventBus) {
-        app.use((0, response_time_metrics_1.responseTimeMetrics)(eventBus));
+        app.use(response_time_metrics_1.responseTimeMetrics(eventBus));
     }
-    app.use((0, request_logger_1.default)(config));
+    app.use(request_logger_1.default(config));
     if (typeof config.preHook === 'function') {
         config.preHook(app, config, services);
     }
     if (process.env.NODE_ENV === 'development') {
-        app.use((0, cors_1.default)());
+        app.use(cors_1.default());
     }
-    app.use((0, compression_1.default)());
-    app.use((0, cookie_parser_1.default)());
+    app.use(compression_1.default());
+    app.use(cookie_parser_1.default());
     app.use(express_1.default.json({ strict: false }));
     if (unleashSession) {
         app.use(unleashSession);
     }
-    app.use((0, secure_headers_1.default)(config));
+    app.use(secure_headers_1.default(config));
     app.use(express_1.default.urlencoded({ extended: true }));
-    app.use((0, serve_favicon_1.default)(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
+    app.use(serve_favicon_1.default(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
     app.use(baseUriPath, express_1.default.static(unleash_frontend_1.publicFolder, { index: false }));
     if (config.enableOAS) {
         app.use(`${baseUriPath}/oas`, express_1.default.static('docs/api/oas'));
     }
     switch (config.authentication.type) {
         case option_1.IAuthType.OPEN_SOURCE: {
-            app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
-            (0, oss_authentication_1.default)(app, config.server.baseUriPath);
+            app.use(baseUriPath, api_token_middleware_1.default(config, services));
+            oss_authentication_1.default(app, config.server.baseUriPath);
             break;
         }
         case option_1.IAuthType.ENTERPRISE: {
-            app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
+            app.use(baseUriPath, api_token_middleware_1.default(config, services));
             config.authentication.customAuthHandler(app, config, services);
             break;
         }
         case option_1.IAuthType.HOSTED: {
-            app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
+            app.use(baseUriPath, api_token_middleware_1.default(config, services));
             config.authentication.customAuthHandler(app, config, services);
             break;
         }
         case option_1.IAuthType.DEMO: {
-            app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
-            (0, demo_authentication_1.default)(app, config.server.baseUriPath, services);
+            app.use(baseUriPath, api_token_middleware_1.default(config, services));
+            demo_authentication_1.default(app, config.server.baseUriPath, services);
             break;
         }
         case option_1.IAuthType.CUSTOM: {
-            app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));
+            app.use(baseUriPath, api_token_middleware_1.default(config, services));
             config.authentication.customAuthHandler(app, config, services);
             break;
         }
         case option_1.IAuthType.NONE: {
-            (0, no_authentication_1.default)(baseUriPath, app);
+            no_authentication_1.default(baseUriPath, app);
             break;
         }
         default: {
-            (0, demo_authentication_1.default)(app, config.server.baseUriPath, services);
+            demo_authentication_1.default(app, config.server.baseUriPath, services);
             break;
         }
     }
-    app.use(baseUriPath, (0, rbac_middleware_1.default)(config, stores, services.accessService));
+    app.use(baseUriPath, rbac_middleware_1.default(config, stores, services.accessService));
     if (typeof config.preRouterHook === 'function') {
         config.preRouterHook(app, config, services, stores);
     }
     // Setup API routes
     app.use(`${baseUriPath}/`, new routes_1.default(config, services).router);
     if (process.env.NODE_ENV !== 'production') {
-        app.use((0, errorhandler_1.default)());
+        app.use(errorhandler_1.default());
     }
     app.get(`${baseUriPath}`, (req, res) => {
         res.send(indexHTML);

package/dist/lib/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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"}

package/dist/lib/app.test.js

@@ -12,13 +12,13 @@ jest.mock('./routes', () => class Index {
 });
 const getApp = require('./app');
 test('should not throw when valid config', () => {
-    const config = (0, test_config_1.createTestConfig)();
+    const config = test_config_1.createTestConfig();
     const app = getApp(config, {}, {});
     expect(typeof app.listen).toBe('function');
 });
 test('should call preHook', () => {
     let called = 0;
-    const config = (0, test_config_1.createTestConfig)({
+    const config = test_config_1.createTestConfig({
         preHook: () => {
             called++;
         },
@@ -28,7 +28,7 @@ test('should call preHook', () => {
 });
 test('should call preRouterHook', () => {
     let called = 0;
-    const config = (0, test_config_1.createTestConfig)({
+    const config = test_config_1.createTestConfig({
         preRouterHook: () => {
             called++;
         },

package/dist/lib/app.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/lib/app.test.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,4DAA8D;AAE9D,IAAI,CAAC,IAAI,CACL,UAAU,EACV,GAAG,EAAE,CACD,MAAM,KAAK;IACP,MAAM;QACF,OAAO,iBAAO,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;CACJ,CACR,CAAC;AAEF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,OAAO,EAAE,GAAG,EAAE;YACV,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,aAAa,EAAE,GAAG,EAAE;YAChB,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}
+{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/lib/app.test.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,4DAA8D;AAE9D,IAAI,CAAC,IAAI,CACL,UAAU,EACV,GAAG,EAAE,CACD,MAAM,KAAK;IACP,MAAM;QACF,OAAO,iBAAO,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;CACJ,CACR,CAAC;AAEF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,MAAM,GAAG,8BAAgB,EAAE,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,8BAAgB,CAAC;QAC5B,OAAO,EAAE,GAAG,EAAE;YACV,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,8BAAgB,CAAC;QAC5B,aAAa,EAAE,GAAG,EAAE;YAChB,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}

package/dist/lib/create-config.js

@@ -86,7 +86,7 @@ const defaultServerOption = {
     pipe: undefined,
     host: process.env.HTTP_HOST,
     port: safeNumber(process.env.HTTP_PORT || process.env.PORT, 4242),
-    baseUriPath: (0, format_base_uri_1.formatBaseUri)(process.env.BASE_URI_PATH),
+    baseUriPath: format_base_uri_1.formatBaseUri(process.env.BASE_URI_PATH),
     unleashUrl: process.env.UNLEASH_URL || 'http://localhost:4242',
     serverMetrics: true,
     keepAliveTimeout: 60 * 1000,
@@ -140,24 +140,24 @@ const formatServerOptions = (serverOptions) => {
     /* eslint-disable-next-line */
     return {
         ...serverOptions,
-        baseUriPath: (0, format_base_uri_1.formatBaseUri)(serverOptions.baseUriPath),
+        baseUriPath: format_base_uri_1.formatBaseUri(serverOptions.baseUriPath),
     };
 };
 function createConfig(options) {
     let extraDbOptions = {};
     if (options.databaseUrl) {
-        extraDbOptions = (0, pg_connection_string_1.parse)(options.databaseUrl);
+        extraDbOptions = pg_connection_string_1.parse(options.databaseUrl);
     }
     else if (process.env.DATABASE_URL) {
-        extraDbOptions = (0, pg_connection_string_1.parse)(process.env.DATABASE_URL);
+        extraDbOptions = pg_connection_string_1.parse(process.env.DATABASE_URL);
     }
     let fileDbOptions = {};
     if (options.databaseUrlFile && fs.existsSync(options.databaseUrlFile)) {
-        fileDbOptions = (0, pg_connection_string_1.parse)(fs.readFileSync(options.databaseUrlFile, 'utf-8'));
+        fileDbOptions = pg_connection_string_1.parse(fs.readFileSync(options.databaseUrlFile, 'utf-8'));
     }
     else if (process.env.DATABASE_URL_FILE &&
         fs.existsSync(process.env.DATABASE_URL_FILE)) {
-        fileDbOptions = (0, pg_connection_string_1.parse)(fs.readFileSync(process.env.DATABASE_URL_FILE, 'utf-8'));
+        fileDbOptions = pg_connection_string_1.parse(fs.readFileSync(process.env.DATABASE_URL_FILE, 'utf-8'));
     }
     const db = mergeAll([
         defaultDbOptions,
@@ -170,8 +170,8 @@ function createConfig(options) {
         options.session,
     ]);
     const logLevel = options.logLevel || logger_1.LogLevel[process.env.LOG_LEVEL] || logger_1.LogLevel.error;
-    const getLogger = options.getLogger || (0, logger_1.getDefaultLogProvider)(logLevel);
-    (0, logger_1.validateLogProvider)(getLogger);
+    const getLogger = options.getLogger || logger_1.getDefaultLogProvider(logLevel);
+    logger_1.validateLogProvider(getLogger);
     const server = mergeAll([
         defaultServerOption,
         formatServerOptions(options.server),
@@ -192,6 +192,9 @@ function createConfig(options) {
         options.import,
     ]);
     const experimental = options.experimental || {};
+    if (safeBoolean(process.env.EXP_METRICS_V2, false)) {
+        experimental.metricsV2 = { enabled: true };
+    }
     const email = mergeAll([defaultEmail, options.email]);
     let listen;
     if (server.pipe) {

package/dist/lib/create-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":"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"}

package/dist/lib/db/client-instance-store.js

@@ -9,6 +9,7 @@ const COLUMNS = [
     'client_ip',
     'last_seen',
     'created_at',
+    'environment',
 ];
 const TABLE = 'client_instances';
 const ONE_DAY = 24 * 61 * 60 * 1000;
@@ -19,6 +20,7 @@ const mapRow = (row) => ({
     clientIp: row.client_ip,
     lastSeen: row.last_seen,
     createdAt: row.created_at,
+    environment: row.environment,
 });
 const mapToDb = (client) => ({
     app_name: client.appName,
@@ -26,6 +28,7 @@ const mapToDb = (client) => ({
     sdk_version: client.sdkVersion || '',
     client_ip: client.clientIp,
     last_seen: client.lastSeen || 'now()',
+    environment: client.environment || 'default',
 });
 class ClientInstanceStore {
     constructor(db, eventBus, getLogger) {
@@ -52,7 +55,7 @@ class ClientInstanceStore {
         const rows = instances.map(mapToDb);
         await this.db(TABLE)
             .insert(rows)
-            .onConflict(['app_name', 'instance_id'])
+            .onConflict(['app_name', 'instance_id', 'environment'])
             .merge();
     }
     async delete({ appName, instanceId, }) {
@@ -78,7 +81,7 @@ class ClientInstanceStore {
         const stopTimer = this.metricTimer('insert');
         await this.db(TABLE)
             .insert(mapToDb(details))
-            .onConflict(['app_name', 'instance_id'])
+            .onConflict(['app_name', 'instance_id', 'environment'])
             .merge();
         stopTimer();
     }

package/dist/lib/db/client-instance-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-instance-store.js","sourceRoot":"","sources":["../../../src/lib/db/client-instance-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-instance-store.js","sourceRoot":"","sources":["../../../src/lib/db/client-instance-store.ts"],"names":[],"mappings":"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"}

package/dist/lib/db/client-metrics-store-v2.d.ts

@@ -0,0 +1,19 @@
+import { Knex } from 'knex';
+import { LogProvider } from '../logger';
+import { IClientMetricsEnv, IClientMetricsEnvKey, IClientMetricsStoreV2 } from '../types/stores/client-metrics-store-v2';
+export declare function roundDownToHour(date: Date): Date;
+export declare class ClientMetricsStoreV2 implements IClientMetricsStoreV2 {
+    private db;
+    private logger;
+    constructor(db: Knex, getLogger: LogProvider);
+    get(key: IClientMetricsEnvKey): Promise<IClientMetricsEnv>;
+    getAll(query?: Object): Promise<IClientMetricsEnv[]>;
+    exists(key: IClientMetricsEnvKey): Promise<boolean>;
+    delete(key: IClientMetricsEnvKey): Promise<void>;
+    deleteAll(): Promise<void>;
+    destroy(): void;
+    batchInsertMetrics(metrics: IClientMetricsEnv[]): Promise<void>;
+    getMetricsForFeatureToggle(featureName: string, hoursBack?: number): Promise<IClientMetricsEnv[]>;
+    getSeenAppsForFeatureToggle(featureName: string, hoursBack?: number): Promise<string[]>;
+    clearMetrics(hoursAgo: number): Promise<void>;
+}

package/dist/lib/db/client-metrics-store-v2.js

@@ -0,0 +1,126 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClientMetricsStoreV2 = exports.roundDownToHour = void 0;
+const notfound_error_1 = __importDefault(require("../error/notfound-error"));
+const TABLE = 'client_metrics_env';
+function roundDownToHour(date) {
+    return new Date(date.getTime() - (date.getTime() % 3600000));
+}
+exports.roundDownToHour = roundDownToHour;
+const fromRow = (row) => ({
+    featureName: row.feature_name,
+    appName: row.app_name,
+    environment: row.environment,
+    timestamp: row.timestamp,
+    yes: row.yes,
+    no: row.no,
+});
+const toRow = (metric) => ({
+    feature_name: metric.featureName,
+    app_name: metric.appName,
+    environment: metric.environment,
+    timestamp: roundDownToHour(metric.timestamp),
+    yes: metric.yes,
+    no: metric.no,
+});
+class ClientMetricsStoreV2 {
+    constructor(db, getLogger) {
+        this.db = db;
+        this.logger = getLogger('client-metrics-store-v2.js');
+    }
+    async get(key) {
+        const row = await this.db(TABLE)
+            .where({
+            feature_name: key.featureName,
+            app_name: key.appName,
+            environment: key.environment,
+            timestamp: roundDownToHour(key.timestamp),
+        })
+            .first();
+        if (row) {
+            return fromRow(row);
+        }
+        throw new notfound_error_1.default(`Could not find metric`);
+    }
+    async getAll(query = {}) {
+        const rows = await this.db(TABLE)
+            .select('*')
+            .where(query);
+        return rows.map(fromRow);
+    }
+    async exists(key) {
+        try {
+            await this.get(key);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    async delete(key) {
+        return this.db(TABLE)
+            .where({
+            feature_name: key.featureName,
+            app_name: key.appName,
+            environment: key.environment,
+            timestamp: roundDownToHour(key.timestamp),
+        })
+            .del();
+    }
+    deleteAll() {
+        return this.db(TABLE).del();
+    }
+    destroy() {
+        // Nothing to do!
+    }
+    // this function will collapse metrics before sending it to the database.
+    async batchInsertMetrics(metrics) {
+        if (!metrics || metrics.length == 0) {
+            return;
+        }
+        const rows = metrics.map(toRow);
+        const batch = rows.reduce((prev, curr) => {
+            // eslint-disable-next-line prettier/prettier
+            const key = `${curr.feature_name}_${curr.app_name}_${curr.environment}_${curr.timestamp.getTime()}`;
+            if (prev[key]) {
+                prev[key].yes += curr.yes;
+                prev[key].no += curr.no;
+            }
+            else {
+                prev[key] = curr;
+            }
+            return prev;
+        }, {});
+        // Consider rewriting to SQL batch!
+        const insert = this.db(TABLE)
+            .insert(Object.values(batch))
+            .toQuery();
+        const query = `${insert.toString()} ON CONFLICT (feature_name, app_name, environment, timestamp) DO UPDATE SET "yes" = "client_metrics_env"."yes" + EXCLUDED.yes, "no" = "client_metrics_env"."no" + EXCLUDED.no`;
+        await this.db.raw(query);
+    }
+    async getMetricsForFeatureToggle(featureName, hoursBack = 24) {
+        const rows = await this.db(TABLE)
+            .select('*')
+            .where({ feature_name: featureName })
+            .andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`);
+        return rows.map(fromRow);
+    }
+    async getSeenAppsForFeatureToggle(featureName, hoursBack = 24) {
+        return this.db(TABLE)
+            .distinct()
+            .where({ feature_name: featureName })
+            .andWhereRaw(`timestamp >= NOW() - INTERVAL '${hoursBack} hours'`)
+            .pluck('app_name')
+            .orderBy('app_name');
+    }
+    async clearMetrics(hoursAgo) {
+        return this.db(TABLE)
+            .whereRaw(`timestamp <= NOW() - INTERVAL '${hoursAgo} hours'`)
+            .del();
+    }
+}
+exports.ClientMetricsStoreV2 = ClientMetricsStoreV2;
+//# sourceMappingURL=client-metrics-store-v2.js.map

package/dist/lib/db/client-metrics-store-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../src/lib/db/client-metrics-store-v2.ts"],"names":[],"mappings":"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"}

package/dist/lib/db/db-pool.js

@@ -4,7 +4,7 @@ exports.createDb = void 0;
 const knex_1 = require("knex");
 function createDb({ db, getLogger, }) {
     const logger = getLogger('db-pool.js');
-    return (0, knex_1.knex)({
+    return knex_1.knex({
         client: 'pg',
         version: db.version,
         connection: db,

package/dist/lib/db/db-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"db-pool.js","sourceRoot":"","sources":["../../../src/lib/db/db-pool.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAGlC,SAAgB,QAAQ,CAAC,EACrB,EAAE,EACF,SAAS,GAC8B;IACvC,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,OAAO,IAAA,WAAI,EAAC;QACR,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,EAAE,CAAC,OAAO;QACnB,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,UAAU,EAAE,EAAE,CAAC,MAAM;QACrB,gBAAgB,EAAE,IAAI;QACtB,GAAG,EAAE;YACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;YACjC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAC/B,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;SACpC;KACJ,CAAC,CAAC;AACP,CAAC;AAlBD,4BAkBC;AAED,6BAA6B;AAC7B,MAAM,CAAC,OAAO,GAAG;IACb,QAAQ;CACX,CAAC"}
+{"version":3,"file":"db-pool.js","sourceRoot":"","sources":["../../../src/lib/db/db-pool.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAGlC,SAAgB,QAAQ,CAAC,EACrB,EAAE,EACF,SAAS,GAC8B;IACvC,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,CAAC;IACvC,OAAO,WAAI,CAAC;QACR,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,EAAE,CAAC,OAAO;QACnB,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,EAAE,CAAC,IAAI;QACb,UAAU,EAAE,EAAE,CAAC,MAAM;QACrB,gBAAgB,EAAE,IAAI;QACtB,GAAG,EAAE;YACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;YACjC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAC/B,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;SACpC;KACJ,CAAC,CAAC;AACP,CAAC;AAlBD,4BAkBC;AAED,6BAA6B;AAC7B,MAAM,CAAC,OAAO,GAAG;IACb,QAAQ;CACX,CAAC"}

package/dist/lib/db/environment-store.js

@@ -103,14 +103,14 @@ class EnvironmentStore {
     }
     async update(env, name) {
         const updatedEnv = await this.db(TABLE)
-            .update((0, snakeCase_1.snakeCaseKeys)(env))
+            .update(snakeCase_1.snakeCaseKeys(env))
             .where({ name, protected: false })
             .returning(COLUMNS);
         return mapRow(updatedEnv[0]);
     }
     async create(env) {
         const row = await this.db(TABLE)
-            .insert((0, snakeCase_1.snakeCaseKeys)(env))
+            .insert(snakeCase_1.snakeCaseKeys(env))
             .returning(COLUMNS);
         return mapRow(row[0]);
     }

package/dist/lib/db/environment-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":";;;;;AAGA,4EAAmD;AACnD,oDAA2C;AAE3C,6EAAoD;AAEpD,iDAAkD;AAWlD,MAAM,OAAO,GAAG;IACZ,MAAM;IACN,MAAM;IACN,YAAY;IACZ,YAAY;IACZ,SAAS;IACT,WAAW;CACd,CAAC;AAEF,SAAS,MAAM,CAAC,GAAuB;IACnC,OAAO;QACH,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;KAC3B,CAAC;AACN,CAAC;AAED,SAAS,UAAU,CAAC,GAAiB;IACjC,OAAO;QACH,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,UAAU,EAAE,GAAG,CAAC,SAAS;QACzB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,SAAS,EAAE,GAAG,CAAC,SAAS;KAC3B,CAAC;AACN,CAAC;AAED,MAAM,KAAK,GAAG,cAAc,CAAC;AAE7B,MAAqB,gBAAgB;IAOjC,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAsB;QAChE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,CACpB,wBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,uBAAO,EAAE;YACvC,KAAK,EAAE,aAAa;YACpB,MAAM;SACT,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,YAA4B;QAE5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC5B,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aACpC,SAAS,CAAC,OAAO,CAAC;aAClB,UAAU,CAAC,MAAM,CAAC;aAClB,MAAM,EAAE,CAAC;QAEd,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aAC/C,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;aACpB,KAAK,EAAE,CAAC;QACb,IAAI,GAAG,EAAE;YACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;SACtB;QACD,MAAM,IAAI,wBAAa,CAAC,yCAAyC,GAAG,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAc;QACvB,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aACtC,MAAM,CAAC,GAAG,CAAC;aACX,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACzC,IAAI,KAAK,EAAE;YACP,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,KAAK,6BAA6B,EAClE,CAAC,IAAI,CAAC,CACT,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAY;QACxB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aAC/C,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;aACf,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,wBAAa,CACnB,wCAAwC,IAAI,EAAE,CACjD,CAAC;SACL;QACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,cAAc,CAChB,EAAU,EACV,KAAa,EACb,KAAsB;QAEtB,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aACnC,MAAM,CAAC;YACJ,CAAC,KAAK,CAAC,EAAE,KAAK;SACjB,CAAC;aACD,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAU,EAAE,KAAa;QAC3C,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aACnC,MAAM,CAAC;YACJ,UAAU,EAAE,KAAK;SACpB,CAAC;aACD,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CACR,GAA6C,EAC7C,IAAY;QAEZ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aACtD,MAAM,CAAC,IAAA,yBAAa,EAAC,GAAG,CAAC,CAAC;aAC1B,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;aACjC,SAAS,CAAqB,OAAO,CAAC,CAAC;QAE5C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAuB;QAChC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAqB,KAAK,CAAC;aAC/C,MAAM,CAAC,IAAA,yBAAa,EAAC,GAAG,CAAC,CAAC;aAC1B,SAAS,CAAqB,OAAO,CAAC,CAAC;QAE5C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IACjE,CAAC;IAED,OAAO,KAAU,CAAC;CACrB;AAxHD,mCAwHC"}
+{"version":3,"file":"environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/environment-store.ts"],"names":[],"mappings":"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"}

package/dist/lib/db/event-store.test.js

@@ -7,7 +7,7 @@ const knex_1 = __importDefault(require("knex"));
 const event_store_1 = __importDefault(require("./event-store"));
 const no_logger_1 = __importDefault(require("../../test/fixtures/no-logger"));
 test('Trying to get events if db fails should yield empty list', async () => {
-    const db = (0, knex_1.default)({
+    const db = knex_1.default({
         client: 'pg',
     });
     const store = new event_store_1.default(db, no_logger_1.default);
@@ -15,7 +15,7 @@ test('Trying to get events if db fails should yield empty list', async () => {
     expect(events.length).toBe(0);
 });
 test('Trying to get events by name if db fails should yield empty list', async () => {
-    const db = (0, knex_1.default)({
+    const db = knex_1.default({
         client: 'pg',
     });
     const store = new event_store_1.default(db, no_logger_1.default);

package/dist/lib/db/event-store.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-store.test.js","sourceRoot":"","sources":["../../../src/lib/db/event-store.test.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,gEAAuC;AACvC,8EAAsD;AAEtD,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,EAAE,GAAG,IAAA,cAAI,EAAC;QACZ,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,mBAAS,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,EAAE,GAAG,IAAA,cAAI,EAAC;QACZ,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,mBAAS,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IACxE,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"event-store.test.js","sourceRoot":"","sources":["../../../src/lib/db/event-store.test.ts"],"names":[],"mappings":";;;;;AAAA,gDAAwB;AACxB,gEAAuC;AACvC,8EAAsD;AAEtD,IAAI,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IACxE,MAAM,EAAE,GAAG,cAAI,CAAC;QACZ,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,mBAAS,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC;IACvC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;IAChF,MAAM,EAAE,GAAG,cAAI,CAAC;QACZ,MAAM,EAAE,IAAI;KACf,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,mBAAS,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;IACxE,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC"}

package/dist/lib/db/feature-environment-store.d.ts

@@ -15,6 +15,7 @@ export declare class FeatureEnvironmentStore implements IFeatureEnvironmentStore
     exists({ featureName, environment, }: FeatureEnvironmentKey): Promise<boolean>;
     get({ featureName, environment, }: FeatureEnvironmentKey): Promise<IFeatureEnvironment>;
     getAll(): Promise<IFeatureEnvironment[]>;
+    disableEnvironmentIfNoStrategies(featureName: string, environment: string): Promise<void>;
     addEnvironmentToFeature(featureName: string, environment: string, enabled?: boolean): Promise<void>;
     disconnectFeatures(environment: string, project: string): Promise<void>;
     featureHasEnvironment(environment: string, featureName: string): Promise<boolean>;

package/dist/lib/db/feature-environment-store.js

@@ -7,7 +7,10 @@ exports.FeatureEnvironmentStore = void 0;
 const metrics_helper_1 = __importDefault(require("../util/metrics-helper"));
 const metric_events_1 = require("../metric-events");
 const notfound_error_1 = __importDefault(require("../error/notfound-error"));
-const T = { featureEnvs: 'feature_environments' };
+const T = {
+    featureEnvs: 'feature_environments',
+    featureStrategies: 'feature_strategies',
+};
 class FeatureEnvironmentStore {
     constructor(db, eventBus, getLogger) {
         this.db = db;
@@ -54,6 +57,15 @@ class FeatureEnvironmentStore {
             environment: r.environment,
         }));
     }
+    async disableEnvironmentIfNoStrategies(featureName, environment) {
+        const result = await this.db.raw(`SELECT EXISTS (SELECT 1 FROM ${T.featureStrategies} WHERE feature_name = ? AND environment = ?) AS enabled`, [featureName, environment]);
+        const { enabled } = result.rows[0];
+        if (!enabled) {
+            await this.db(T.featureEnvs)
+                .update({ enabled: false })
+                .where({ feature_name: featureName, environment });
+        }
+    }
     async addEnvironmentToFeature(featureName, environment, enabled = false) {
         await this.db('feature_environments')
             .insert({ feature_name: featureName, environment, enabled })

package/dist/lib/db/feature-environment-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"feature-environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-environment-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"feature-environment-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-environment-store.ts"],"names":[],"mappings":"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"}