unleash-server 4.15.0-beta.0 → 4.15.0-beta.3

package/dist/lib/app.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const unleash_frontend_1 = require("unleash-frontend");
 const express_1 = __importDefault(require("express"));
-const cors_1 = __importDefault(require("cors"));
 const compression_1 = __importDefault(require("compression"));
 const serve_favicon_1 = __importDefault(require("serve-favicon"));
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
 const path_1 = __importDefault(require("path"));
 const errorhandler_1 = __importDefault(require("errorhandler"));
 const response_time_metrics_1 = require("./middleware/response-time-metrics");
+const cors_origin_middleware_1 = require("./middleware/cors-origin-middleware");
 const rbac_middleware_1 = __importDefault(require("./middleware/rbac-middleware"));
 const api_token_middleware_1 = __importDefault(require("./middleware/api-token-middleware"));
 const option_1 = require("./types/option");
@@ -37,9 +37,6 @@ async function getApp(config, stores, services, unleashSession) {
     if (typeof config.preHook === 'function') {
         config.preHook(app, config, services);
     }
-    if (process.env.NODE_ENV === 'development') {
-        app.use((0, cors_1.default)());
-    }
     app.use((0, compression_1.default)());
     app.use((0, cookie_parser_1.default)());
     app.use(express_1.default.json({ strict: false }));
@@ -57,6 +54,13 @@ async function getApp(config, stores, services, unleashSession) {
     if (config.enableOAS && services.openApiService) {
         services.openApiService.useDocs(app);
     }
+    if (config.experimental.embedProxy &&
+        config.frontendApiOrigins.length > 0) {
+        // Support CORS preflight requests for the frontend endpoints.
+        // Preflight requests should not have Authorization headers,
+        // so this must be handled before the API token middleware.
+        app.options('/api/frontend*', (0, cors_origin_middleware_1.corsOriginMiddleware)(config.frontendApiOrigins));
+    }
     switch (config.authentication.type) {
         case option_1.IAuthType.OPEN_SOURCE: {
             app.use(baseUriPath, (0, api_token_middleware_1.default)(config, services));

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/create-config.js

@@ -37,7 +37,7 @@ const format_base_uri_1 = require("./util/format-base-uri");
 const date_fns_1 = require("date-fns");
 const events_1 = __importDefault(require("events"));
 const api_token_1 = require("./types/models/api-token");
-const env_1 = require("./util/env");
+const parseEnvVar_1 = require("./util/parseEnvVar");
 const segments_1 = require("./util/segments");
 const safeToUpper = (s) => (s ? s.toUpperCase() : s);
 function authTypeFromString(s, defaultType = option_1.IAuthType.OPEN_SOURCE) {
@@ -48,7 +48,11 @@ function mergeAll(objects) {
     return deepmerge_1.default.all(objects.filter((i) => i));
 }
 function loadExperimental(options) {
-    return options.experimental || {};
+    return {
+        ...options.experimental,
+        embedProxy: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_EMBED_PROXY, Boolean(options.experimental?.embedProxy)),
+        batchMetrics: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.UNLEASH_EXPERIMENTAL_BATCH_METRICS, Boolean(options.experimental?.batchMetrics)),
+    };
 }
 const defaultClientCachingOptions = {
     enabled: true,
@@ -57,10 +61,10 @@ const defaultClientCachingOptions = {
 function loadClientCachingOptions(options) {
     let envs = {};
     if (process.env.CLIENT_FEATURE_CACHING_MAXAGE) {
-        envs.maxAge = (0, env_1.parseEnvVarNumber)(process.env.CLIENT_FEATURE_CACHING_MAXAGE, 600);
+        envs.maxAge = (0, parseEnvVar_1.parseEnvVarNumber)(process.env.CLIENT_FEATURE_CACHING_MAXAGE, 600);
     }
     if (process.env.CLIENT_FEATURE_CACHING_ENABLED) {
-        envs.enabled = (0, env_1.parseEnvVarBoolean)(process.env.CLIENT_FEATURE_CACHING_ENABLED, true);
+        envs.enabled = (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.CLIENT_FEATURE_CACHING_ENABLED, true);
     }
     return mergeAll([
         defaultClientCachingOptions,
@@ -85,7 +89,7 @@ const defaultDbOptions = {
     user: process.env.DATABASE_USERNAME,
     password: process.env.DATABASE_PASSWORD,
     host: process.env.DATABASE_HOST,
-    port: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_PORT, 5432),
+    port: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.DATABASE_PORT, 5432),
     database: process.env.DATABASE_NAME || 'unleash',
     ssl: process.env.DATABASE_SSL != null
         ? JSON.parse(process.env.DATABASE_SSL)
@@ -94,10 +98,10 @@ const defaultDbOptions = {
     version: process.env.DATABASE_VERSION,
     acquireConnectionTimeout: (0, date_fns_1.secondsToMilliseconds)(30),
     pool: {
-        min: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MIN, 0),
-        max: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MAX, 4),
-        idleTimeoutMillis: (0, env_1.parseEnvVarNumber)(process.env.DATABASE_POOL_IDLE_TIMEOUT_MS, (0, date_fns_1.secondsToMilliseconds)(30)),
-        ...((0, env_1.parseEnvVarBoolean)(process.env.ALLOW_NON_STANDARD_DB_DATES, false)
+        min: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MIN, 0),
+        max: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.DATABASE_POOL_MAX, 4),
+        idleTimeoutMillis: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.DATABASE_POOL_IDLE_TIMEOUT_MS, (0, date_fns_1.secondsToMilliseconds)(30)),
+        ...((0, parseEnvVar_1.parseEnvVarBoolean)(process.env.ALLOW_NON_STANDARD_DB_DATES, false)
             ? { afterCreate: dateHandlingCallback }
             : {}),
         propagateCreateError: false,
@@ -107,15 +111,15 @@ const defaultDbOptions = {
     applicationName: process.env.DATABASE_APPLICATION_NAME || 'unleash',
 };
 const defaultSessionOption = {
-    ttlHours: (0, env_1.parseEnvVarNumber)(process.env.SESSION_TTL_HOURS, 48),
-    clearSiteDataOnLogout: (0, env_1.parseEnvVarBoolean)(process.env.SESSION_CLEAR_SITE_DATA_ON_LOGOUT, true),
+    ttlHours: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.SESSION_TTL_HOURS, 48),
+    clearSiteDataOnLogout: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.SESSION_CLEAR_SITE_DATA_ON_LOGOUT, true),
     cookieName: 'unleash-session',
     db: true,
 };
 const defaultServerOption = {
     pipe: undefined,
     host: process.env.HTTP_HOST,
-    port: (0, env_1.parseEnvVarNumber)(process.env.HTTP_PORT || process.env.PORT, 4242),
+    port: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.HTTP_PORT || process.env.PORT, 4242),
     baseUriPath: (0, format_base_uri_1.formatBaseUri)(process.env.BASE_URI_PATH),
     cdnPrefix: process.env.CDN_PREFIX,
     unleashUrl: process.env.UNLEASH_URL || 'http://localhost:4242',
@@ -123,16 +127,16 @@ const defaultServerOption = {
     keepAliveTimeout: (0, date_fns_1.minutesToMilliseconds)(1),
     headersTimeout: (0, date_fns_1.secondsToMilliseconds)(61),
     enableRequestLogger: false,
-    gracefulShutdownEnable: (0, env_1.parseEnvVarBoolean)(process.env.GRACEFUL_SHUTDOWN_ENABLE, true),
-    gracefulShutdownTimeout: (0, env_1.parseEnvVarNumber)(process.env.GRACEFUL_SHUTDOWN_TIMEOUT, (0, date_fns_1.secondsToMilliseconds)(1)),
+    gracefulShutdownEnable: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.GRACEFUL_SHUTDOWN_ENABLE, true),
+    gracefulShutdownTimeout: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.GRACEFUL_SHUTDOWN_TIMEOUT, (0, date_fns_1.secondsToMilliseconds)(1)),
     secret: process.env.UNLEASH_SECRET || 'super-secret',
 };
 const defaultVersionOption = {
     url: process.env.UNLEASH_VERSION_URL || 'https://version.unleash.run',
-    enable: (0, env_1.parseEnvVarBoolean)(process.env.CHECK_VERSION, true),
+    enable: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.CHECK_VERSION, true),
 };
 const defaultAuthentication = {
-    enableApiToken: (0, env_1.parseEnvVarBoolean)(process.env.AUTH_ENABLE_API_TOKEN, true),
+    enableApiToken: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.AUTH_ENABLE_API_TOKEN, true),
     type: authTypeFromString(process.env.AUTH_TYPE),
     customAuthHandler: default_custom_auth_deny_all_1.defaultCustomAuthDenyAll,
     createAdminUser: true,
@@ -140,13 +144,13 @@ const defaultAuthentication = {
 };
 const defaultImport = {
     file: process.env.IMPORT_FILE,
-    dropBeforeImport: (0, env_1.parseEnvVarBoolean)(process.env.IMPORT_DROP_BEFORE_IMPORT, false),
-    keepExisting: (0, env_1.parseEnvVarBoolean)(process.env.IMPORT_KEEP_EXISTING, false),
+    dropBeforeImport: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.IMPORT_DROP_BEFORE_IMPORT, false),
+    keepExisting: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.IMPORT_KEEP_EXISTING, false),
 };
 const defaultEmail = {
     host: process.env.EMAIL_HOST,
-    secure: (0, env_1.parseEnvVarBoolean)(process.env.EMAIL_SECURE, false),
-    port: (0, env_1.parseEnvVarNumber)(process.env.EMAIL_PORT, 587),
+    secure: (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.EMAIL_SECURE, false),
+    port: (0, parseEnvVar_1.parseEnvVarNumber)(process.env.EMAIL_PORT, 587),
     sender: process.env.EMAIL_SENDER || 'noreply@unleash-hosted.com',
     smtpuser: process.env.EMAIL_USER,
     smtppass: process.env.EMAIL_PASSWORD,
@@ -296,17 +300,19 @@ function createConfig(options) {
         listen = { host: server.host || undefined, port: server.port };
     }
     const secureHeaders = options.secureHeaders ||
-        (0, env_1.parseEnvVarBoolean)(process.env.SECURE_HEADERS, false);
-    const enableOAS = options.enableOAS || (0, env_1.parseEnvVarBoolean)(process.env.ENABLE_OAS, false);
+        (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.SECURE_HEADERS, false);
+    const enableOAS = options.enableOAS || (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.ENABLE_OAS, false);
     const disableLegacyFeaturesApi = options.disableLegacyFeaturesApi ||
-        (0, env_1.parseEnvVarBoolean)(process.env.DISABLE_LEGACY_FEATURES_API, false);
+        (0, parseEnvVar_1.parseEnvVarBoolean)(process.env.DISABLE_LEGACY_FEATURES_API, false);
     const additionalCspAllowedDomains = parseCspConfig(options.additionalCspAllowedDomains) ||
         parseCspEnvironmentVariables();
     const inlineSegmentConstraints = typeof options.inlineSegmentConstraints === 'boolean'
         ? options.inlineSegmentConstraints
         : true;
-    const segmentValuesLimit = (0, env_1.parseEnvVarNumber)(process.env.UNLEASH_SEGMENT_VALUES_LIMIT, segments_1.DEFAULT_SEGMENT_VALUES_LIMIT);
-    const strategySegmentsLimit = (0, env_1.parseEnvVarNumber)(process.env.UNLEASH_STRATEGY_SEGMENTS_LIMIT, segments_1.DEFAULT_STRATEGY_SEGMENTS_LIMIT);
+    const segmentValuesLimit = (0, parseEnvVar_1.parseEnvVarNumber)(process.env.UNLEASH_SEGMENT_VALUES_LIMIT, segments_1.DEFAULT_SEGMENT_VALUES_LIMIT);
+    const strategySegmentsLimit = (0, parseEnvVar_1.parseEnvVarNumber)(process.env.UNLEASH_STRATEGY_SEGMENTS_LIMIT, segments_1.DEFAULT_STRATEGY_SEGMENTS_LIMIT);
+    const frontendApiOrigins = options.frontendApiOrigins ||
+        (0, parseEnvVar_1.parseEnvVarStrings)(process.env.UNLEASH_FRONTEND_API_ORIGINS, []);
     const clientFeatureCaching = loadClientCachingOptions(options);
     return {
         db,
@@ -330,6 +336,7 @@ function createConfig(options) {
         eventBus: new events_1.default(),
         environmentEnableOverrides,
         additionalCspAllowedDomains,
+        frontendApiOrigins,
         inlineSegmentConstraints,
         segmentValuesLimit,
         strategySegmentsLimit,

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.js

@@ -24,6 +24,7 @@ const tokenRowReducer = (acc, tokenRow) => {
             environment: token.environment ? token.environment : ALL,
             expiresAt: token.expires_at,
             createdAt: token.created_at,
+            alias: token.alias,
         };
     }
     const currentToken = acc[tokenRow.secret];
@@ -42,6 +43,7 @@ const toRow = (newToken) => ({
     type: newToken.type,
     environment: newToken.environment === ALL ? undefined : newToken.environment,
     expires_at: newToken.expiresAt,
+    alias: newToken.alias || null,
 });
 const toTokens = (rows) => {
     const tokens = rows.reduce(tokenRowReducer, {});
@@ -78,7 +80,7 @@ class ApiTokenStore {
     makeTokenProjectQuery() {
         return this.db(`${TABLE} as tokens`)
             .leftJoin(`${API_LINK_TABLE} as token_project_link`, 'tokens.secret', 'token_project_link.secret')
-            .select('tokens.secret', 'username', 'type', 'expires_at', 'created_at', 'seen_at', 'environment', 'token_project_link.project');
+            .select('tokens.secret', 'username', 'type', 'expires_at', 'created_at', 'alias', 'seen_at', 'environment', 'token_project_link.project');
     }
     async insert(newToken) {
         const response = await this.db.transaction(async (tx) => {
@@ -93,6 +95,7 @@ class ApiTokenStore {
             await Promise.all(updateProjectTasks);
             return {
                 ...newToken,
+                alias: newToken.alias || null,
                 project: newToken.projects?.join(',') || '*',
                 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-metrics-store-v2.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientMetricsStoreV2 = void 0;
 const notfound_error_1 = __importDefault(require("../error/notfound-error"));
 const date_fns_1 = require("date-fns");
+const collapseHourlyMetrics_1 = require("../util/collapseHourlyMetrics");
 const TABLE = 'client_metrics_env';
 const fromRow = (row) => ({
     featureName: row.feature_name,
@@ -78,26 +79,14 @@ class ClientMetricsStoreV2 {
         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;
-        }, {});
+        const rows = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)(metrics).map(toRow);
         // Sort the rows to avoid deadlocks
-        const batchRow = Object.values(batch).sort((a, b) => a.feature_name.localeCompare(b.feature_name) ||
+        const sortedRows = rows.sort((a, b) => a.feature_name.localeCompare(b.feature_name) ||
             a.app_name.localeCompare(b.app_name) ||
             a.environment.localeCompare(b.environment));
         // Consider rewriting to SQL batch!
         const insert = this.db(TABLE)
-            .insert(batchRow)
+            .insert(sortedRows)
             .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);

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

@@ -1 +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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"}
+{"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/event-store.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
 import { Knex } from 'knex';
 import { IEvent, IBaseEvent } from '../types/events';
 import { LogProvider } from '../logger';
 import { IEventStore } from '../types/stores/event-store';
 import { ITag } from '../types/model';
+import { SearchEventsSchema } from '../openapi/spec/search-events-schema';
+import { AnyEventEmitter } from '../util/anyEventEmitter';
 export interface IEventTable {
     id: number;
     type: string;
@@ -17,7 +17,7 @@ export interface IEventTable {
     environment?: string;
     tags: ITag[];
 }
-declare class EventStore extends EventEmitter implements IEventStore {
+declare class EventStore extends AnyEventEmitter implements IEventStore {
     private db;
     private logger;
     constructor(db: Knex, getLogger: LogProvider);
@@ -30,9 +30,7 @@ declare class EventStore extends EventEmitter implements IEventStore {
     get(key: number): Promise<IEvent>;
     getAll(query?: Object): Promise<IEvent[]>;
     getEvents(query?: Object): Promise<IEvent[]>;
-    getEventsFilterByType(name: string): Promise<IEvent[]>;
-    getEventsFilterByProject(project: string): Promise<IEvent[]>;
-    getEventsForFeature(featureName: string): Promise<IEvent[]>;
+    searchEvents(search?: SearchEventsSchema): Promise<IEvent[]>;
     rowToEvent(row: IEventTable): IEvent;
     eventToDbRow(e: IBaseEvent): Omit<IEventTable, 'id' | 'created_at'>;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const events_1 = require("events");
-const events_2 = require("../types/events");
+const anyEventEmitter_1 = require("../util/anyEventEmitter");
 const EVENT_COLUMNS = [
     'id',
     'type',
@@ -15,7 +14,7 @@ const EVENT_COLUMNS = [
     'environment',
 ];
 const TABLE = 'events';
-class EventStore extends events_1.EventEmitter {
+class EventStore extends anyEventEmitter_1.AnyEventEmitter {
     constructor(db, getLogger) {
         super();
         this.db = db;
@@ -81,46 +80,37 @@ class EventStore extends events_1.EventEmitter {
             return [];
         }
     }
-    async getEventsFilterByType(name) {
-        try {
-            const rows = await this.db
-                .select(EVENT_COLUMNS)
-                .from(TABLE)
-                .limit(100)
-                .where('type', name)
-                .andWhere('id', '>=', this.db
-                .select(this.db.raw('coalesce(max(id),0) as id'))
-                .from(TABLE)
-                .where({ type: events_2.DROP_FEATURES }))
-                .orderBy('created_at', 'desc');
-            return rows.map(this.rowToEvent);
+    async searchEvents(search = {}) {
+        let query = this.db
+            .select(EVENT_COLUMNS)
+            .from(TABLE)
+            .limit(search.limit ?? 100)
+            .offset(search.offset ?? 0)
+            .orderBy('created_at', 'desc');
+        if (search.type) {
+            query = query.andWhere({
+                type: search.type,
+            });
         }
-        catch (err) {
-            this.logger.error(err);
-            return [];
+        if (search.project) {
+            query = query.andWhere({
+                project: search.project,
+            });
         }
-    }
-    async getEventsFilterByProject(project) {
-        try {
-            const rows = await this.db
-                .select(EVENT_COLUMNS)
-                .from(TABLE)
-                .where({ project })
-                .orderBy('created_at', 'desc');
-            return rows.map(this.rowToEvent);
+        if (search.feature) {
+            query = query.andWhere({
+                feature_name: search.feature,
+            });
         }
-        catch (err) {
-            return [];
+        if (search.query) {
+            query = query.where((where) => where
+                .orWhereRaw('type::text ILIKE ?', `%${search.query}%`)
+                .orWhereRaw('created_by::text ILIKE ?', `%${search.query}%`)
+                .orWhereRaw('data::text ILIKE ?', `%${search.query}%`)
+                .orWhereRaw('pre_data::text ILIKE ?', `%${search.query}%`));
         }
-    }
-    async getEventsForFeature(featureName) {
         try {
-            const rows = await this.db
-                .select(EVENT_COLUMNS)
-                .from(TABLE)
-                .where({ feature_name: featureName })
-                .orderBy('created_at', 'desc');
-            return rows.map(this.rowToEvent);
+            return (await query).map(this.rowToEvent);
         }
         catch (err) {
             return [];

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

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

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

@@ -25,7 +25,7 @@ test('Trying to get events by name if db fails should yield empty list', async (
         client: 'pg',
     });
     const store = new event_store_1.default(db, no_logger_1.default);
-    const events = await store.getEventsFilterByType('application-created');
+    const events = await store.searchEvents({ type: 'application-created' });
     expect(events).toBeTruthy();
     expect(events.length).toBe(0);
 });

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,SAAS,CAAC,GAAG,EAAE;IACX,mBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,GAAG,EAAE;IACV,mBAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,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,SAAS,CAAC,GAAG,EAAE;IACX,mBAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,GAAG,EAAE;IACV,mBAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,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,YAAY,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACzE,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-strategy-store.js

@@ -136,11 +136,11 @@ class FeatureStrategiesStore {
         const stopTimer = this.timer('getFeatureAdmin');
         const rows = await this.db('features')
             .select('features.name as name', 'features.description as description', 'features.type as type', 'features.project as project', 'features.stale as stale', 'features.variants as variants', 'features.impression_data as impression_data', 'features.created_at as created_at', 'features.last_seen_at as last_seen_at', 'feature_environments.enabled as enabled', 'feature_environments.environment as environment', 'environments.name as environment_name', 'environments.type as environment_type', 'environments.sort_order as environment_sort_order', 'feature_strategies.id as strategy_id', 'feature_strategies.strategy_name as strategy_name', 'feature_strategies.parameters as parameters', 'feature_strategies.constraints as constraints', 'feature_strategies.sort_order as sort_order')
-            .fullOuterJoin('feature_environments', 'feature_environments.feature_name', 'features.name')
-            .fullOuterJoin('feature_strategies', function () {
+            .leftJoin('feature_environments', 'feature_environments.feature_name', 'features.name')
+            .leftJoin('feature_strategies', function () {
             this.on('feature_strategies.feature_name', '=', 'feature_environments.feature_name').andOn('feature_strategies.environment', '=', 'feature_environments.environment');
         })
-            .fullOuterJoin('environments', 'feature_environments.environment', 'environments.name')
+            .leftJoin('environments', 'feature_environments.environment', 'environments.name')
             .where('features.name', featureName)
             .modify(feature_toggle_store_1.default.filterByArchived, archived);
         stopTimer();