unleash-server 4.1.4 → 4.2.0-beta.1

package/dist/lib/addons/webhook-definition.js

@@ -43,9 +43,17 @@ const webhookDefinition = {
         events_1.FEATURE_CREATED,
         events_1.FEATURE_UPDATED,
         events_1.FEATURE_ARCHIVED,
+        events_1.FEATURE_METADATA_UPDATED,
         events_1.FEATURE_REVIVED,
         events_1.FEATURE_STALE_ON,
         events_1.FEATURE_STALE_OFF,
+        events_1.FEATURE_ENVIRONMENT_ENABLED,
+        events_1.FEATURE_ENVIRONMENT_DISABLED,
+        events_1.FEATURE_STRATEGY_REMOVE,
+        events_1.FEATURE_STRATEGY_UPDATE,
+        events_1.FEATURE_STRATEGY_ADD,
+        events_1.FEATURE_METADATA_UPDATED,
+        events_1.FEATURE_PROJECT_CHANGE,
     ],
 };
 exports.default = webhookDefinition;

package/dist/lib/addons/webhook-definition.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhook-definition.js","sourceRoot":"","sources":["../../../src/lib/addons/webhook-definition.ts"],"names":[],"mappings":";;AAAA,4CAOyB;AAGzB,MAAM,iBAAiB,GAAqB;IACxC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,WAAW,EACP,mFAAmF;IACvF,gBAAgB,EAAE,gDAAgD;IAClE,UAAU,EAAE;QACR;YACI,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,aAAa;YAC1B,WAAW,EACP,qGAAqG;YACzG,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAClB;QACD;YACI,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,cAAc;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EACP,4EAA4E;YAChF,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;QACD;YACI,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE;;;;;EAKvB;YACU,WAAW,EACP,8LAA8L;YAClM,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;KACJ;IACD,MAAM,EAAE;QACJ,wBAAe;QACf,wBAAe;QACf,yBAAgB;QAChB,wBAAe;QACf,yBAAgB;QAChB,0BAAiB;KACpB;CACJ,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"webhook-definition.js","sourceRoot":"","sources":["../../../src/lib/addons/webhook-definition.ts"],"names":[],"mappings":";;AAAA,4CAcyB;AAGzB,MAAM,iBAAiB,GAAqB;IACxC,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,WAAW,EACP,mFAAmF;IACvF,gBAAgB,EAAE,gDAAgD;IAClE,UAAU,EAAE;QACR;YACI,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,aAAa;YAC1B,WAAW,EACP,qGAAqG;YACzG,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAClB;QACD;YACI,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,cAAc;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,WAAW,EACP,4EAA4E;YAChF,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;QACD;YACI,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,eAAe;YAC5B,WAAW,EAAE;;;;;EAKvB;YACU,WAAW,EACP,8LAA8L;YAClM,IAAI,EAAE,WAAW;YACjB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,KAAK;SACnB;KACJ;IACD,MAAM,EAAE;QACJ,wBAAe;QACf,wBAAe;QACf,yBAAgB;QAChB,iCAAwB;QACxB,wBAAe;QACf,yBAAgB;QAChB,0BAAiB;QACjB,oCAA2B;QAC3B,qCAA4B;QAC5B,gCAAuB;QACvB,gCAAuB;QACvB,6BAAoB;QACpB,iCAAwB;QACxB,+BAAsB;KACzB;CACJ,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}

package/dist/lib/app.test.js

@@ -1,20 +1,24 @@
-'use strict';
-const express = require('express');
-const { createTestConfig } = require('../test/config/test-config');
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const test_config_1 = require("../test/config/test-config");
 jest.mock('./routes', () => class Index {
     router() {
-        return express.Router();
+        return express_1.default.Router();
     }
 });
 const getApp = require('./app');
 test('should not throw when valid config', () => {
-    const config = 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 = createTestConfig({
+    const config = test_config_1.createTestConfig({
         preHook: () => {
             called++;
         },
@@ -24,7 +28,7 @@ test('should call preHook', () => {
 });
 test('should call preRouterHook', () => {
     let called = 0;
-    const config = 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.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEnE,IAAI,CAAC,IAAI,CACL,UAAU,EACV,GAAG,EAAE,CACD,MAAM,KAAK;IACP,MAAM;QACF,OAAO,OAAO,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,gBAAgB,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,gBAAgB,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,gBAAgB,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"}
+{"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

@@ -114,7 +114,7 @@ const defaultImport = {
 const defaultEmail = {
     host: process.env.EMAIL_HOST,
     secure: safeBoolean(process.env.EMAIL_SECURE, false),
-    port: safeNumber(process.env.EMAIL_PORT, 567),
+    port: safeNumber(process.env.EMAIL_PORT, 587),
     sender: process.env.EMAIL_SENDER || 'noreply@unleash-hosted.com',
     smtpuser: process.env.EMAIL_USER,
     smtppass: process.env.EMAIL_PASSWORD,
@@ -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/api-token-store.d.ts

@@ -2,7 +2,8 @@
 import { EventEmitter } from 'events';
 import { Knex } from 'knex';
 import { LogProvider } from '../logger';
-import { IApiToken, IApiTokenCreate, IApiTokenStore } from '../types/stores/api-token-store';
+import { IApiTokenStore } from '../types/stores/api-token-store';
+import { IApiToken, IApiTokenCreate } from '../types/models/api-token';
 export declare class ApiTokenStore implements IApiTokenStore {
     private logger;
     private timer;

package/dist/lib/db/api-token-store.js

@@ -8,16 +8,21 @@ 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 TABLE = 'api_tokens';
+const ALL = '*';
 const toRow = (newToken) => ({
     username: newToken.username,
     secret: newToken.secret,
     type: newToken.type,
+    project: newToken.project === ALL ? undefined : newToken.project,
+    environment: newToken.environment === ALL ? undefined : newToken.environment,
     expires_at: newToken.expiresAt,
 });
 const toToken = (row) => ({
     secret: row.secret,
     username: row.username,
     type: row.type,
+    environment: row.environment ? row.environment : ALL,
+    project: row.project ? row.project : ALL,
     expiresAt: row.expires_at,
     createdAt: row.created_at,
 });

package/dist/lib/db/api-token-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-token-store.js","sourceRoot":"","sources":["../../../src/lib/db/api-token-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api-token-store.js","sourceRoot":"","sources":["../../../src/lib/db/api-token-store.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":";;;;;;AAQA,6EAAoD;AAWpD,MAAM,KAAK,GAAG,oBAAoB,CAAC;AAEnC,SAAgB,eAAe,CAAC,IAAU;IACtC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,0CAEC;AAED,MAAM,OAAO,GAAG,CAAC,GAA0B,EAAE,EAAE,CAAC,CAAC;IAC7C,WAAW,EAAE,GAAG,CAAC,YAAY;IAC7B,OAAO,EAAE,GAAG,CAAC,QAAQ;IACrB,WAAW,EAAE,GAAG,CAAC,WAAW;IAC5B,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,GAAG,EAAE,GAAG,CAAC,GAAG;IACZ,EAAE,EAAE,GAAG,CAAC,EAAE;CACb,CAAC,CAAC;AAEH,MAAM,KAAK,GAAG,CAAC,MAAyB,EAAE,EAAE,CAAC,CAAC;IAC1C,YAAY,EAAE,MAAM,CAAC,WAAW;IAChC,QAAQ,EAAE,MAAM,CAAC,OAAO;IACxB,WAAW,EAAE,MAAM,CAAC,WAAW;IAC/B,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC,GAAG;IACf,EAAE,EAAE,MAAM,CAAC,EAAE;CAChB,CAAC,CAAC;AAEH,MAAa,oBAAoB;IAK7B,YAAY,EAAQ,EAAE,SAAsB;QACxC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,4BAA4B,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAyB;QAC/B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aAClD,KAAK,CAAC;YACH,YAAY,EAAE,GAAG,CAAC,WAAW;YAC7B,QAAQ,EAAE,GAAG,CAAC,OAAO;YACrB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;SAC5C,CAAC;aACD,KAAK,EAAE,CAAC;QACb,IAAI,GAAG,EAAE;YACL,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;SACvB;QACD,MAAM,IAAI,wBAAa,CAAC,uBAAuB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aACnD,MAAM,CAAC,GAAG,CAAC;aACX,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAyB;QAClC,IAAI;YACA,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAyB;QAClC,OAAO,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aACvC,KAAK,CAAC;YACH,YAAY,EAAE,GAAG,CAAC,WAAW;YAC7B,QAAQ,EAAE,GAAG,CAAC,OAAO;YACrB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,SAAS,EAAE,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;SAC5C,CAAC;aACD,GAAG,EAAE,CAAC;IACf,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,OAAO;QACH,iBAAiB;IACrB,CAAC;IAED,yEAAyE;IACzE,KAAK,CAAC,kBAAkB,CAAC,OAA4B;QACjD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;YACjC,OAAO;SACV;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAEhC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrC,6CAA6C;YAC7C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YACpG,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;gBAC1B,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;aAC3B;iBAAM;gBACH,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aACpB;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,mCAAmC;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aAC/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aAC5B,OAAO,EAAE,CAAC;QAEf,MAAM,KAAK,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,+KAA+K,CAAC;QAClN,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC5B,WAAmB,EACnB,YAAoB,EAAE;QAEtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aACnD,MAAM,CAAC,GAAG,CAAC;aACX,KAAK,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;aACpC,WAAW,CAAC,kCAAkC,SAAS,SAAS,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC7B,WAAmB,EACnB,YAAoB,EAAE;QAEtB,OAAO,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aACvC,QAAQ,EAAE;aACV,KAAK,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;aACpC,WAAW,CAAC,kCAAkC,SAAS,SAAS,CAAC;aACjE,KAAK,CAAC,UAAU,CAAC;aACjB,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgB;QAC/B,OAAO,IAAI,CAAC,EAAE,CAAwB,KAAK,CAAC;aACvC,QAAQ,CAAC,kCAAkC,QAAQ,SAAS,CAAC;aAC7D,GAAG,EAAE,CAAC;IACf,CAAC;CACJ;AApHD,oDAoHC"}

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

@@ -15,6 +15,12 @@ export declare class ClientMetricsStore extends EventEmitter implements IClientM
     _startPoller(pollInterval: number): void;
     _fetchNewAndEmit(): void;
     _emitMetrics(metrics: IClientMetric[]): void;
+    /**
+     * Insert client metrics. In the future we will isolate "appName" and "environment"
+     * in separate columns in the database to make it easier to query the data.
+     *
+     * @param metrics sent from the client SDK.
+     */
     insert(metrics: IClientMetric): Promise<void>;
     destroy(): void;
     delete(key: number): Promise<void>;

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

@@ -50,7 +50,12 @@ class ClientMetricsStore extends events_1.default {
             metrics.forEach((m) => this.emit('metrics', m.metrics));
         }
     }
-    // Insert new client metrics
+    /**
+     * Insert client metrics. In the future we will isolate "appName" and "environment"
+     * in separate columns in the database to make it easier to query the data.
+     *
+     * @param metrics sent from the client SDK.
+     */
     async insert(metrics) {
         const stopTimer = this.startTimer('insert');
         await this.metricsDb.insert(metrics);

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

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

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

@@ -2,23 +2,23 @@
 import EventEmitter from 'events';
 import { Knex } from 'knex';
 import { LogProvider } from '../logger';
-import { IEnvironment } from '../types/model';
+import { IEnvironment, IEnvironmentCreate } from '../types/model';
 import { IEnvironmentStore } from '../types/stores/environment-store';
 export default class EnvironmentStore implements IEnvironmentStore {
     private logger;
     private db;
     private timer;
     constructor(db: Knex, eventBus: EventEmitter, getLogger: LogProvider);
+    importEnvironments(environments: IEnvironment[]): Promise<IEnvironment[]>;
     deleteAll(): Promise<void>;
     get(key: string): Promise<IEnvironment>;
-    getAll(): Promise<IEnvironment[]>;
+    getAll(query?: Object): Promise<IEnvironment[]>;
     exists(name: string): Promise<boolean>;
     getByName(name: string): Promise<IEnvironment>;
-    upsert(env: IEnvironment): Promise<IEnvironment>;
-    connectProject(environment: string, projectId: string): Promise<void>;
-    connectFeatures(environment: string, projectId: string): Promise<void>;
+    updateProperty(id: string, field: string, value: string | number): Promise<void>;
+    updateSortOrder(id: string, value: number): Promise<void>;
+    update(env: Pick<IEnvironment, 'type' | 'protected'>, name: string): Promise<IEnvironment>;
+    create(env: IEnvironmentCreate): Promise<IEnvironment>;
     delete(name: string): Promise<void>;
-    disconnectProjectFromEnv(environment: string, projectId: string): Promise<void>;
-    connectFeatureToEnvironmentsForProject(featureName: string, project_id: string): Promise<void>;
     destroy(): void;
 }

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

@@ -6,16 +6,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 snakeCase_1 = require("../util/snakeCase");
+const COLUMNS = [
+    'type',
+    'name',
+    'created_at',
+    'sort_order',
+    'enabled',
+    'protected',
+];
 function mapRow(row) {
     return {
         name: row.name,
-        displayName: row.display_name,
+        type: row.type,
+        sortOrder: row.sort_order,
+        enabled: row.enabled,
+        protected: row.protected,
     };
 }
-function mapInput(input) {
+function fieldToRow(env) {
     return {
-        name: input.name,
-        display_name: input.displayName,
+        name: env.name,
+        type: env.type,
+        sort_order: env.sortOrder,
+        enabled: env.enabled,
+        protected: env.protected,
     };
 }
 const TABLE = 'environments';
@@ -28,6 +43,14 @@ class EnvironmentStore {
             action,
         });
     }
+    async importEnvironments(environments) {
+        const rows = await this.db(TABLE)
+            .insert(environments.map(fieldToRow))
+            .returning(COLUMNS)
+            .onConflict('name')
+            .ignore();
+        return rows.map(mapRow);
+    }
     async deleteAll() {
         await this.db(TABLE).del();
     }
@@ -40,8 +63,14 @@ class EnvironmentStore {
         }
         throw new notfound_error_1.default(`Could not find environment with name: ${key}`);
     }
-    async getAll() {
-        const rows = await this.db(TABLE).select('*');
+    async getAll(query) {
+        let qB = this.db(TABLE)
+            .select('*')
+            .orderBy('sort_order', 'created_at');
+        if (query) {
+            qB = qB.where(query);
+        }
+        const rows = await qB;
         return rows.map(mapRow);
     }
     async exists(name) {
@@ -58,59 +87,35 @@ class EnvironmentStore {
         }
         return mapRow(row);
     }
-    async upsert(env) {
+    async updateProperty(id, field, value) {
         await this.db(TABLE)
-            .insert(mapInput(env))
-            .onConflict('name')
-            .merge();
-        return env;
-    }
-    async connectProject(environment, projectId) {
-        await this.db('project_environments').insert({
-            environment_name: environment,
-            project_id: projectId,
-        });
+            .update({
+            [field]: value,
+        })
+            .where({ name: id, protected: false });
     }
-    async connectFeatures(environment, projectId) {
-        const featuresToEnable = await this.db('features')
-            .select('name')
-            .where({
-            project: projectId,
-        });
-        const rows = featuresToEnable.map((f) => ({
-            environment,
-            feature_name: f.name,
-            enabled: false,
-        }));
-        if (rows.length > 0) {
-            await this.db('feature_environments')
-                .insert(rows)
-                .onConflict(['environment', 'feature_name'])
-                .ignore();
-        }
+    async updateSortOrder(id, value) {
+        await this.db(TABLE)
+            .update({
+            sort_order: value,
+        })
+            .where({ name: id });
     }
-    async delete(name) {
-        await this.db(TABLE).where({ name }).del();
+    async update(env, name) {
+        const updatedEnv = await this.db(TABLE)
+            .update(snakeCase_1.snakeCaseKeys(env))
+            .where({ name, protected: false })
+            .returning(COLUMNS);
+        return mapRow(updatedEnv[0]);
     }
-    async disconnectProjectFromEnv(environment, projectId) {
-        await this.db('project_environments')
-            .where({ environment_name: environment, project_id: projectId })
-            .del();
+    async create(env) {
+        const row = await this.db(TABLE)
+            .insert(snakeCase_1.snakeCaseKeys(env))
+            .returning(COLUMNS);
+        return mapRow(row[0]);
     }
-    async connectFeatureToEnvironmentsForProject(featureName, project_id) {
-        const environmentsToEnable = await this.db('project_environments')
-            .select('environment_name')
-            .where({ project_id });
-        await Promise.all(environmentsToEnable.map(async (env) => {
-            await this.db('feature_environments')
-                .insert({
-                environment: env.environment_name,
-                feature_name: featureName,
-                enabled: false,
-            })
-                .onConflict(['environment', 'feature_name'])
-                .ignore();
-        }));
+    async delete(name) {
+        await this.db(TABLE).where({ name, protected: false }).del();
     }
     destroy() { }
 }