unleash-server 4.16.0 → 4.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/app.js +1 -1
- package/dist/lib/app.js.map +1 -1
- package/dist/lib/middleware/api-token-middleware.js +1 -1
- package/dist/lib/middleware/api-token-middleware.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.test.js +4 -0
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/services/client-metrics/last-seen-service.d.ts +13 -0
- package/dist/lib/services/client-metrics/last-seen-service.js +33 -0
- package/dist/lib/services/client-metrics/last-seen-service.js.map +1 -0
- package/dist/lib/services/client-metrics/metrics-service-v2.d.ts +3 -1
- package/dist/lib/services/client-metrics/metrics-service-v2.js +11 -9
- package/dist/lib/services/client-metrics/metrics-service-v2.js.map +1 -1
- package/dist/lib/services/index.js +4 -1
- package/dist/lib/services/index.js.map +1 -1
- package/dist/lib/types/services.d.ts +2 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js +39 -0
- package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/last-seen-service.e2e.test.d.ts +1 -0
- package/dist/test/e2e/services/last-seen-service.e2e.test.js +114 -0
- package/dist/test/e2e/services/last-seen-service.e2e.test.js.map +1 -0
- package/frontend/build/index.html +1 -1
- package/frontend/build/static/{FeatureMetricsChart.1c936764.js → FeatureMetricsChart.d9ed62c2.js} +1 -1
- package/frontend/build/static/{Playground.b0fca55a.js → Playground.d18468f7.js} +1 -1
- package/frontend/build/static/{index.b187adcd.js → index.6b9d5894.js} +75 -75
- package/package.json +1 -1
package/dist/lib/app.js
CHANGED
|
@@ -60,7 +60,7 @@ async function getApp(config, stores, services, unleashSession) {
|
|
|
60
60
|
// Support CORS preflight requests for the frontend endpoints.
|
|
61
61
|
// Preflight requests should not have Authorization headers,
|
|
62
62
|
// so this must be handled before the API token middleware.
|
|
63
|
-
app.options(
|
|
63
|
+
app.options(`${baseUriPath}/api/frontend*`, (0, conditional_middleware_1.conditionalMiddleware)(() => config.flagResolver.isEnabled('embedProxy'), (0, cors_origin_middleware_1.corsOriginMiddleware)(services)));
|
|
64
64
|
app.use(baseUriPath, (0, pat_middleware_1.default)(config, services));
|
|
65
65
|
switch (config.authentication.type) {
|
|
66
66
|
case option_1.IAuthType.OPEN_SOURCE: {
|
package/dist/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const isProxyApi = ({ path }) => {
|
|
|
12
12
|
}
|
|
13
13
|
// Handle all our current proxy paths which will redirect to the new
|
|
14
14
|
// embedded proxy endpoint
|
|
15
|
-
return (path.startsWith('/api/
|
|
15
|
+
return (path.startsWith('/api/proxy') ||
|
|
16
16
|
path.startsWith('/api/development/proxy') ||
|
|
17
17
|
path.startsWith('/api/production/proxy') ||
|
|
18
18
|
path.startsWith('/api/frontend'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-token-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/api-token-middleware.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,yDAAyD;AAIzD,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC7B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5B,IAAI,CAAC,IAAI,EAAE;QACP,OAAO;KACV;IAED,oEAAoE;IACpE,0BAA0B;IAC1B,OAAO,CACH,IAAI,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"api-token-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/api-token-middleware.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,yDAAyD;AAIzD,MAAM,WAAW,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC7B,OAAO,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;IAC5B,IAAI,CAAC,IAAI,EAAE;QACP,OAAO;KACV;IAED,oEAAoE;IACpE,0BAA0B;IAC1B,OAAO,CACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACzC,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACxC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CACnC,CAAC;AACN,CAAC,CAAC;AAEW,QAAA,wBAAwB,GACjC,kEAAkE,CAAC;AAEvE,MAAM,mBAAmB,GAAG,CACxB,EACI,SAAS,EACT,cAAc,EACd,YAAY,GACwD,EACxE,EAAE,eAAe,EAAO,EACrB,EAAE;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,0BAA0B,CAAC,CAAC;IACrD,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAE9C,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;QAChC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC;KACrC;IAED,OAAO,CAAC,GAAiB,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACpC,IAAI,GAAG,CAAC,IAAI,EAAE;YACV,OAAO,IAAI,EAAE,CAAC;SACjB;QAED,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE;gBAChC,MAAM,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBAC1D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAY,CAAC;gBAE1C,IAAI,OAAO,EAAE;oBACT,IACI,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;wBAC9C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBAC/C,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ;4BACtB,CAAC,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAC5C;wBACE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;4BACjB,OAAO,EAAE,gCAAwB;yBACpC,CAAC,CAAC;wBACH,OAAO;qBACV;oBACD,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;iBACtB;aACJ;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACvB;QAED,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,mBAAmB,CAAC"}
|
|
@@ -17,6 +17,7 @@ async function getSetup(opts) {
|
|
|
17
17
|
return {
|
|
18
18
|
request: (0, supertest_1.default)(app),
|
|
19
19
|
stores,
|
|
20
|
+
services,
|
|
20
21
|
destroy: () => {
|
|
21
22
|
services.versionService.destroy();
|
|
22
23
|
services.clientInstanceService.destroy();
|
|
@@ -26,12 +27,14 @@ async function getSetup(opts) {
|
|
|
26
27
|
}
|
|
27
28
|
let request;
|
|
28
29
|
let stores;
|
|
30
|
+
let services;
|
|
29
31
|
let destroy;
|
|
30
32
|
beforeEach(async () => {
|
|
31
33
|
const setup = await getSetup();
|
|
32
34
|
request = setup.request;
|
|
33
35
|
stores = setup.stores;
|
|
34
36
|
destroy = setup.destroy;
|
|
37
|
+
services = setup.services;
|
|
35
38
|
});
|
|
36
39
|
afterEach(() => {
|
|
37
40
|
destroy();
|
|
@@ -189,6 +192,7 @@ test('should set lastSeen on toggle', async () => {
|
|
|
189
192
|
},
|
|
190
193
|
})
|
|
191
194
|
.expect(202);
|
|
195
|
+
await services.lastSeenService.store();
|
|
192
196
|
const toggle = await stores.featureToggleStore.get('toggleLastSeen');
|
|
193
197
|
expect(toggle.lastSeenAt).toBeTruthy();
|
|
194
198
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,yEAAwD;AACxD,oDAA+B;AAC/B,kEAAoE;AACpE,iEAA2E;AAC3E,6CAAgD;AAGhD,KAAK,UAAU,QAAQ,CAAC,IAAsB;IAC1C,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAE9B,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC,IAAI,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAEnD,OAAO;QACH,OAAO,EAAE,IAAA,mBAAS,EAAC,GAAG,CAAC;QACvB,MAAM;QACN,OAAO,EAAE,GAAG,EAAE;YACV,QAAQ,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;YAClC,QAAQ,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;YACzC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QACvC,CAAC;KACJ,CAAC;AACN,CAAC;AAED,IAAI,OAAO,CAAC;AACZ,IAAI,MAAsB,CAAC;AAC3B,IAAI,OAAO,CAAC;AAEZ,UAAU,CAAC,KAAK,IAAI,EAAE;IAClB,MAAM,KAAK,GAAG,MAAM,QAAQ,EAAE,CAAC;IAC/B,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;IACxB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IACtB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { IUnleashConfig } from '../../server-impl';
|
|
2
|
+
import { IUnleashStores } from '../../types';
|
|
3
|
+
import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
|
|
4
|
+
export declare class LastSeenService {
|
|
5
|
+
private timers;
|
|
6
|
+
private lastSeenToggles;
|
|
7
|
+
private logger;
|
|
8
|
+
private featureToggleStore;
|
|
9
|
+
constructor({ featureToggleStore }: Pick<IUnleashStores, 'featureToggleStore'>, config: IUnleashConfig, lastSeenInterval?: number);
|
|
10
|
+
store(): Promise<number>;
|
|
11
|
+
updateLastSeen(clientMetrics: IClientMetricsEnv[]): void;
|
|
12
|
+
destroy(): void;
|
|
13
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LastSeenService = void 0;
|
|
4
|
+
const date_fns_1 = require("date-fns");
|
|
5
|
+
class LastSeenService {
|
|
6
|
+
constructor({ featureToggleStore }, config, lastSeenInterval = (0, date_fns_1.secondsToMilliseconds)(30)) {
|
|
7
|
+
this.timers = [];
|
|
8
|
+
this.lastSeenToggles = new Set();
|
|
9
|
+
this.featureToggleStore = featureToggleStore;
|
|
10
|
+
this.logger = config.getLogger('/services/client-metrics/last-seen-service.ts');
|
|
11
|
+
this.timers.push(setInterval(() => this.store(), lastSeenInterval).unref());
|
|
12
|
+
}
|
|
13
|
+
async store() {
|
|
14
|
+
const count = this.lastSeenToggles.size;
|
|
15
|
+
if (count > 0) {
|
|
16
|
+
const lastSeenToggles = [...this.lastSeenToggles];
|
|
17
|
+
this.lastSeenToggles = new Set();
|
|
18
|
+
this.logger.debug(`Updating last seen for ${lastSeenToggles.length} toggles`);
|
|
19
|
+
await this.featureToggleStore.setLastSeen(lastSeenToggles);
|
|
20
|
+
}
|
|
21
|
+
return count;
|
|
22
|
+
}
|
|
23
|
+
updateLastSeen(clientMetrics) {
|
|
24
|
+
clientMetrics
|
|
25
|
+
.filter((clientMetric) => clientMetric.yes > 0 || clientMetric.no > 0)
|
|
26
|
+
.forEach((clientMetric) => this.lastSeenToggles.add(clientMetric.featureName));
|
|
27
|
+
}
|
|
28
|
+
destroy() {
|
|
29
|
+
this.timers.forEach(clearInterval);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.LastSeenService = LastSeenService;
|
|
33
|
+
//# sourceMappingURL=last-seen-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAOjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAAgB,IAAI,GAAG,EAAE,CAAC;QAW7C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,+CAA+C,CAClD,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAC5D,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QACxC,IAAI,KAAK,GAAG,CAAC,EAAE;YACX,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAClD,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,0BAA0B,eAAe,CAAC,MAAM,UAAU,CAC7D,CAAC;YACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;SAC9D;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,aAAkC;QAC7C,aAAa;aACR,MAAM,CACH,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,IAAI,YAAY,CAAC,EAAE,GAAG,CAAC,CAChE;aACA,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CACrD,CAAC;IACV,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AAlDD,0CAkDC"}
|
|
@@ -5,14 +5,16 @@ import { ToggleMetricsSummary } from '../../types/models/metrics';
|
|
|
5
5
|
import { IClientMetricsEnv } from '../../types/stores/client-metrics-store-v2';
|
|
6
6
|
import ApiUser from '../../types/api-user';
|
|
7
7
|
import User from '../../types/user';
|
|
8
|
+
import { LastSeenService } from './last-seen-service';
|
|
8
9
|
export default class ClientMetricsServiceV2 {
|
|
9
10
|
private config;
|
|
10
11
|
private timers;
|
|
11
12
|
private unsavedMetrics;
|
|
12
13
|
private clientMetricsStoreV2;
|
|
13
14
|
private featureToggleStore;
|
|
15
|
+
private lastSeenService;
|
|
14
16
|
private logger;
|
|
15
|
-
constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, config: IUnleashConfig, bulkInterval?: number);
|
|
17
|
+
constructor({ featureToggleStore, clientMetricsStoreV2, }: Pick<IUnleashStores, 'featureToggleStore' | 'clientMetricsStoreV2'>, config: IUnleashConfig, lastSeenService: LastSeenService, bulkInterval?: number);
|
|
16
18
|
registerClientMetrics(data: IClientApp, clientIp: string): Promise<void>;
|
|
17
19
|
bulkAdd(): Promise<void>;
|
|
18
20
|
getFeatureToggleMetricsSummary(featureName: string): Promise<ToggleMetricsSummary>;
|
|
@@ -10,11 +10,12 @@ const api_user_1 = __importDefault(require("../../types/api-user"));
|
|
|
10
10
|
const api_token_1 = require("../../types/models/api-token");
|
|
11
11
|
const collapseHourlyMetrics_1 = require("../../util/collapseHourlyMetrics");
|
|
12
12
|
class ClientMetricsServiceV2 {
|
|
13
|
-
constructor({ featureToggleStore, clientMetricsStoreV2, }, config, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
|
|
13
|
+
constructor({ featureToggleStore, clientMetricsStoreV2, }, config, lastSeenService, bulkInterval = (0, date_fns_1.secondsToMilliseconds)(5)) {
|
|
14
14
|
this.timers = [];
|
|
15
15
|
this.unsavedMetrics = [];
|
|
16
16
|
this.featureToggleStore = featureToggleStore;
|
|
17
17
|
this.clientMetricsStoreV2 = clientMetricsStoreV2;
|
|
18
|
+
this.lastSeenService = lastSeenService;
|
|
18
19
|
this.config = config;
|
|
19
20
|
this.logger = config.getLogger('/services/client-metrics/client-metrics-service-v2.ts');
|
|
20
21
|
this.timers.push(setInterval(() => {
|
|
@@ -26,28 +27,28 @@ class ClientMetricsServiceV2 {
|
|
|
26
27
|
}
|
|
27
28
|
async registerClientMetrics(data, clientIp) {
|
|
28
29
|
const value = await schema_1.clientMetricsSchema.validateAsync(data);
|
|
29
|
-
const toggleNames = Object.keys(value.bucket.toggles)
|
|
30
|
-
|
|
31
|
-
await this.featureToggleStore.setLastSeen(toggleNames);
|
|
32
|
-
}
|
|
30
|
+
const toggleNames = Object.keys(value.bucket.toggles).filter((name) => !(value.bucket.toggles[name].yes === 0 &&
|
|
31
|
+
value.bucket.toggles[name].no === 0));
|
|
33
32
|
this.logger.debug(`got metrics from ${clientIp}`);
|
|
34
|
-
const clientMetrics = toggleNames
|
|
35
|
-
.map((name) => ({
|
|
33
|
+
const clientMetrics = toggleNames.map((name) => ({
|
|
36
34
|
featureName: name,
|
|
37
35
|
appName: value.appName,
|
|
38
36
|
environment: value.environment,
|
|
39
37
|
timestamp: value.bucket.start,
|
|
40
38
|
yes: value.bucket.toggles[name].yes,
|
|
41
39
|
no: value.bucket.toggles[name].no,
|
|
42
|
-
}))
|
|
43
|
-
.filter((item) => !(item.yes === 0 && item.no === 0));
|
|
40
|
+
}));
|
|
44
41
|
if (this.config.flagResolver.isEnabled('batchMetrics')) {
|
|
45
42
|
this.unsavedMetrics = (0, collapseHourlyMetrics_1.collapseHourlyMetrics)([
|
|
46
43
|
...this.unsavedMetrics,
|
|
47
44
|
...clientMetrics,
|
|
48
45
|
]);
|
|
46
|
+
this.lastSeenService.updateLastSeen(clientMetrics);
|
|
49
47
|
}
|
|
50
48
|
else {
|
|
49
|
+
if (toggleNames.length > 0) {
|
|
50
|
+
await this.featureToggleStore.setLastSeen(toggleNames);
|
|
51
|
+
}
|
|
51
52
|
await this.clientMetricsStoreV2.batchInsertMetrics(clientMetrics);
|
|
52
53
|
}
|
|
53
54
|
this.config.eventBus.emit(events_1.CLIENT_METRICS, value);
|
|
@@ -102,6 +103,7 @@ class ClientMetricsServiceV2 {
|
|
|
102
103
|
}
|
|
103
104
|
destroy() {
|
|
104
105
|
this.timers.forEach(clearInterval);
|
|
106
|
+
this.lastSeenService.destroy();
|
|
105
107
|
}
|
|
106
108
|
}
|
|
107
109
|
exports.default = ClientMetricsServiceV2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":";;;;;AASA,qCAA+C;AAC/C,uCAAsE;AAEtE,+CAAoD;AACpD,oEAA2C;AAC3C,4DAAmD;AAEnD,4EAAyE;
|
|
1
|
+
{"version":3,"file":"metrics-service-v2.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/metrics-service-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,12 +39,14 @@ const proxy_service_1 = require("./proxy-service");
|
|
|
39
39
|
const edge_service_1 = __importDefault(require("./edge-service"));
|
|
40
40
|
const pat_service_1 = __importDefault(require("./pat-service"));
|
|
41
41
|
const public_signup_token_service_1 = require("./public-signup-token-service");
|
|
42
|
+
const last_seen_service_1 = require("./client-metrics/last-seen-service");
|
|
42
43
|
const createServices = (stores, config) => {
|
|
43
44
|
const groupService = new group_service_1.GroupService(stores, config);
|
|
44
45
|
const accessService = new access_service_1.AccessService(stores, config, groupService);
|
|
45
46
|
const apiTokenService = new api_token_service_1.ApiTokenService(stores, config);
|
|
46
47
|
const clientInstanceService = new instance_service_1.default(stores, config);
|
|
47
|
-
const
|
|
48
|
+
const lastSeenService = new last_seen_service_1.LastSeenService(stores, config);
|
|
49
|
+
const clientMetricsServiceV2 = new metrics_service_v2_1.default(stores, config, lastSeenService);
|
|
48
50
|
const contextService = new context_service_1.default(stores, config);
|
|
49
51
|
const emailService = new email_service_1.EmailService(config.email, config.getLogger);
|
|
50
52
|
const eventService = new event_service_1.default(stores, config);
|
|
@@ -125,6 +127,7 @@ const createServices = (stores, config) => {
|
|
|
125
127
|
edgeService,
|
|
126
128
|
patService,
|
|
127
129
|
publicSignupTokenService,
|
|
130
|
+
lastSeenService,
|
|
128
131
|
};
|
|
129
132
|
};
|
|
130
133
|
exports.createServices = createServices;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":";;;;;;AACA,kFAAwD;AACxD,oEAA2C;AAC3C,sEAA6C;AAE7C,wEAA+C;AAC/C,oEAA2C;AAC3C,yFAAsE;AACtE,6FAAyE;AACzE,0EAAgD;AAChD,gEAAuC;AACvC,0EAAiD;AACjD,oEAA2C;AAC3C,wEAA+C;AAC/C,wEAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,2DAAsD;AACtD,kEAAyC;AACzC,gFAAsD;AACtD,wEAA+C;AAC/C,wEAA+C;AAC/C,oFAA0D;AAC1D,sFAA4D;AAC5D,gFAAuD;AACvD,gFAAsD;AACtD,sFAA4D;AAC5D,gFAAsD;AACtD,uDAAmD;AACnD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAyD;AACzD,mDAA+C;AAC/C,mDAA+C;AAC/C,kEAAyC;AACzC,gEAAuC;AACvC,+EAAyE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/services/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ import { ProxyService } from '../services/proxy-service';
|
|
|
33
33
|
import EdgeService from '../services/edge-service';
|
|
34
34
|
import PatService from '../services/pat-service';
|
|
35
35
|
import { PublicSignupTokenService } from '../services/public-signup-token-service';
|
|
36
|
+
import { LastSeenService } from '../services/client-metrics/last-seen-service';
|
|
36
37
|
export interface IUnleashServices {
|
|
37
38
|
accessService: AccessService;
|
|
38
39
|
addonService: AddonService;
|
|
@@ -70,4 +71,5 @@ export interface IUnleashServices {
|
|
|
70
71
|
openApiService: OpenApiService;
|
|
71
72
|
clientSpecService: ClientSpecService;
|
|
72
73
|
patService: PatService;
|
|
74
|
+
lastSeenService: LastSeenService;
|
|
73
75
|
}
|
|
@@ -91,4 +91,43 @@ test('should pick up environment from token', async () => {
|
|
|
91
91
|
expect(metrics[0].environment).toBe('test');
|
|
92
92
|
expect(metrics[0].appName).toBe('some-fancy-app');
|
|
93
93
|
});
|
|
94
|
+
test('should set lastSeen for toggles with metrics', async () => {
|
|
95
|
+
const start = Date.now();
|
|
96
|
+
await app.services.featureToggleServiceV2.createFeatureToggle('default', { name: 't1' }, 'tester');
|
|
97
|
+
await app.services.featureToggleServiceV2.createFeatureToggle('default', { name: 't2' }, 'tester');
|
|
98
|
+
const token = await app.services.apiTokenService.createApiToken({
|
|
99
|
+
type: api_token_1.ApiTokenType.CLIENT,
|
|
100
|
+
project: 'default',
|
|
101
|
+
environment: 'default',
|
|
102
|
+
username: 'tester',
|
|
103
|
+
});
|
|
104
|
+
await app.request
|
|
105
|
+
.post('/api/client/metrics')
|
|
106
|
+
.set('Authorization', token.secret)
|
|
107
|
+
.send({
|
|
108
|
+
appName: 'some-fancy-app',
|
|
109
|
+
instanceId: '1',
|
|
110
|
+
bucket: {
|
|
111
|
+
start: Date.now(),
|
|
112
|
+
stop: Date.now(),
|
|
113
|
+
toggles: {
|
|
114
|
+
t1: {
|
|
115
|
+
yes: 100,
|
|
116
|
+
no: 50,
|
|
117
|
+
},
|
|
118
|
+
t2: {
|
|
119
|
+
yes: 0,
|
|
120
|
+
no: 0,
|
|
121
|
+
},
|
|
122
|
+
},
|
|
123
|
+
},
|
|
124
|
+
})
|
|
125
|
+
.expect(202);
|
|
126
|
+
await app.services.clientMetricsServiceV2.bulkAdd();
|
|
127
|
+
await app.services.lastSeenService.store();
|
|
128
|
+
const t1 = await db.stores.featureToggleStore.get('t1');
|
|
129
|
+
const t2 = await db.stores.featureToggleStore.get('t2');
|
|
130
|
+
expect(t1.lastSeenAt.getTime()).toBeGreaterThanOrEqual(start);
|
|
131
|
+
expect(t2.lastSeenAt).toBeDefined();
|
|
132
|
+
});
|
|
94
133
|
//# sourceMappingURL=metricsV2.e2e.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metricsV2.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/metricsV2.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metricsV2.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/client/metricsV2.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const test_config_1 = require("../../config/test-config");
|
|
7
|
+
const database_init_1 = __importDefault(require("../helpers/database-init"));
|
|
8
|
+
const last_seen_service_1 = require("../../../lib/services/client-metrics/last-seen-service");
|
|
9
|
+
let stores;
|
|
10
|
+
let db;
|
|
11
|
+
let config;
|
|
12
|
+
beforeAll(async () => {
|
|
13
|
+
config = (0, test_config_1.createTestConfig)();
|
|
14
|
+
db = await (0, database_init_1.default)('last_seen_service_serial', config.getLogger);
|
|
15
|
+
stores = db.stores;
|
|
16
|
+
});
|
|
17
|
+
beforeEach(async () => {
|
|
18
|
+
await stores.featureToggleStore.deleteAll();
|
|
19
|
+
});
|
|
20
|
+
afterAll(async () => {
|
|
21
|
+
await db.destroy();
|
|
22
|
+
});
|
|
23
|
+
test('Should update last seen for known toggles', async () => {
|
|
24
|
+
const service = new last_seen_service_1.LastSeenService(stores, config);
|
|
25
|
+
const time = Date.now();
|
|
26
|
+
await stores.featureToggleStore.create('default', { name: 'ta1' });
|
|
27
|
+
const metrics = [
|
|
28
|
+
{
|
|
29
|
+
featureName: 'ta1',
|
|
30
|
+
appName: 'some-App',
|
|
31
|
+
environment: 'default',
|
|
32
|
+
timestamp: new Date(time),
|
|
33
|
+
yes: 1,
|
|
34
|
+
no: 0,
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
featureName: 'ta2',
|
|
38
|
+
appName: 'some-App',
|
|
39
|
+
environment: 'default',
|
|
40
|
+
timestamp: new Date(time),
|
|
41
|
+
yes: 1,
|
|
42
|
+
no: 0,
|
|
43
|
+
},
|
|
44
|
+
];
|
|
45
|
+
service.updateLastSeen(metrics);
|
|
46
|
+
await service.store();
|
|
47
|
+
const t1 = await stores.featureToggleStore.get('ta1');
|
|
48
|
+
expect(t1.lastSeenAt.getTime()).toBeGreaterThan(time);
|
|
49
|
+
service.destroy();
|
|
50
|
+
});
|
|
51
|
+
test('Should not update last seen toggles with 0 metrics', async () => {
|
|
52
|
+
// jest.useFakeTimers();
|
|
53
|
+
const service = new last_seen_service_1.LastSeenService(stores, config, 30);
|
|
54
|
+
const time = Date.now();
|
|
55
|
+
await stores.featureToggleStore.create('default', { name: 'tb1' });
|
|
56
|
+
await stores.featureToggleStore.create('default', { name: 'tb2' });
|
|
57
|
+
const metrics = [
|
|
58
|
+
{
|
|
59
|
+
featureName: 'tb1',
|
|
60
|
+
appName: 'some-App',
|
|
61
|
+
environment: 'default',
|
|
62
|
+
timestamp: new Date(time),
|
|
63
|
+
yes: 1,
|
|
64
|
+
no: 0,
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
featureName: 'tb2',
|
|
68
|
+
appName: 'some-App',
|
|
69
|
+
environment: 'default',
|
|
70
|
+
timestamp: new Date(time),
|
|
71
|
+
yes: 0,
|
|
72
|
+
no: 0,
|
|
73
|
+
},
|
|
74
|
+
];
|
|
75
|
+
service.updateLastSeen(metrics);
|
|
76
|
+
// bypass interval waiting
|
|
77
|
+
await service.store();
|
|
78
|
+
const t1 = await stores.featureToggleStore.get('tb1');
|
|
79
|
+
const t2 = await stores.featureToggleStore.get('tb2');
|
|
80
|
+
expect(t2.lastSeenAt).toBeNull();
|
|
81
|
+
expect(t1.lastSeenAt.getTime()).toBeGreaterThanOrEqual(time);
|
|
82
|
+
service.destroy();
|
|
83
|
+
});
|
|
84
|
+
test('Should not update anything for 0 toggles', async () => {
|
|
85
|
+
// jest.useFakeTimers();
|
|
86
|
+
const service = new last_seen_service_1.LastSeenService(stores, config, 30);
|
|
87
|
+
const time = Date.now();
|
|
88
|
+
await stores.featureToggleStore.create('default', { name: 'tb1' });
|
|
89
|
+
await stores.featureToggleStore.create('default', { name: 'tb2' });
|
|
90
|
+
const metrics = [
|
|
91
|
+
{
|
|
92
|
+
featureName: 'tb1',
|
|
93
|
+
appName: 'some-App',
|
|
94
|
+
environment: 'default',
|
|
95
|
+
timestamp: new Date(time),
|
|
96
|
+
yes: 0,
|
|
97
|
+
no: 0,
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
featureName: 'tb2',
|
|
101
|
+
appName: 'some-App',
|
|
102
|
+
environment: 'default',
|
|
103
|
+
timestamp: new Date(time),
|
|
104
|
+
yes: 0,
|
|
105
|
+
no: 0,
|
|
106
|
+
},
|
|
107
|
+
];
|
|
108
|
+
service.updateLastSeen(metrics);
|
|
109
|
+
// bypass interval waiting
|
|
110
|
+
const count = await service.store();
|
|
111
|
+
expect(count).toBe(0);
|
|
112
|
+
service.destroy();
|
|
113
|
+
});
|
|
114
|
+
//# sourceMappingURL=last-seen-service.e2e.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"last-seen-service.e2e.test.js","sourceRoot":"","sources":["../../../../src/test/e2e/services/last-seen-service.e2e.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
href="https://fonts.googleapis.com/css2?family=Sen:wght@400;700;800&display=swap"
|
|
16
16
|
rel="stylesheet"
|
|
17
17
|
/>
|
|
18
|
-
<script type="module" crossorigin src="/static/index.
|
|
18
|
+
<script type="module" crossorigin src="/static/index.6b9d5894.js"></script>
|
|
19
19
|
<link rel="stylesheet" href="/static/index.8ff70acc.css">
|
|
20
20
|
</head>
|
|
21
21
|
<body>
|