unleash-server 5.4.2 → 5.4.3

package/dist/lib/services/client-metrics/last-seen-service.js

@@ -5,7 +5,7 @@ const date_fns_1 = require("date-fns");
 class LastSeenService {
     constructor({ featureToggleStore }, config, lastSeenInterval = (0, date_fns_1.secondsToMilliseconds)(30)) {
         this.timers = [];
-        this.lastSeenToggles = new Set();
+        this.lastSeenToggles = new Map();
         this.featureToggleStore = featureToggleStore;
         this.logger = config.getLogger('/services/client-metrics/last-seen-service.ts');
         this.timers.push(setInterval(() => this.store(), lastSeenInterval).unref());
@@ -13,8 +13,8 @@ class LastSeenService {
     async store() {
         const count = this.lastSeenToggles.size;
         if (count > 0) {
-            const lastSeenToggles = [...this.lastSeenToggles];
-            this.lastSeenToggles = new Set();
+            const lastSeenToggles = Array.from(this.lastSeenToggles.values());
+            this.lastSeenToggles = new Map();
             this.logger.debug(`Updating last seen for ${lastSeenToggles.length} toggles`);
             await this.featureToggleStore.setLastSeen(lastSeenToggles);
         }
@@ -22,11 +22,15 @@ class LastSeenService {
     }
     updateLastSeen(clientMetrics) {
         clientMetrics
+            .filter((clientMetric) => !this.lastSeenToggles.has(`${clientMetric.featureName}:${clientMetric.environment}`))
             .filter((clientMetric) => clientMetric.yes > 0 || clientMetric.no > 0)
-            .forEach((clientMetric) => this.lastSeenToggles.add({
-            featureName: clientMetric.featureName,
-            environment: clientMetric.environment,
-        }));
+            .forEach((clientMetric) => {
+            const key = `${clientMetric.featureName}:${clientMetric.environment}`;
+            this.lastSeenToggles.set(key, {
+                featureName: clientMetric.featureName,
+                environment: clientMetric.environment,
+            });
+        });
     }
     destroy() {
         this.timers.forEach(clearInterval);

package/dist/lib/services/client-metrics/last-seen-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAYjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAAuB,IAAI,GAAG,EAAE,CAAC;QAWpD,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;YACrB,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,WAAW,EAAE,YAAY,CAAC,WAAW;SACxC,CAAC,CACL,CAAC;IACV,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AArDD,0CAqDC"}
+{"version":3,"file":"last-seen-service.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AAYjD,MAAa,eAAe;IASxB,YACI,EAAE,kBAAkB,EAA8C,EAClE,MAAsB,EACtB,gBAAgB,GAAG,IAAA,gCAAqB,EAAC,EAAE,CAAC;QAXxC,WAAM,GAAqB,EAAE,CAAC;QAE9B,oBAAe,GAA+B,IAAI,GAAG,EAAE,CAAC;QAW5D,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,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YAClE,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAyB,CAAC;YACxD,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,CACb,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CACrB,GAAG,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,WAAW,EAAE,CAC5D,CACR;aACA,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;YACtB,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,WAAW,EAAE,CAAC;YACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE;gBAC1B,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,WAAW,EAAE,YAAY,CAAC,WAAW;aACxC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACX,CAAC;IAED,OAAO;QACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACJ;AA5DD,0CA4DC"}

package/dist/lib/services/client-metrics/last-seen-service.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/services/client-metrics/last-seen-service.test.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const store_1 = __importDefault(require("../../../test/fixtures/store"));
+const events_1 = __importDefault(require("events"));
+const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
+const last_seen_service_1 = require("./last-seen-service");
+function initLastSeenService(flagEnabled = true) {
+    const stores = (0, store_1.default)();
+    const eventBus = new events_1.default();
+    eventBus.emit = jest.fn();
+    const config = {
+        eventBus,
+        getLogger: no_logger_1.default,
+        flagResolver: {
+            isEnabled: () => {
+                return flagEnabled;
+            },
+        },
+    };
+    const lastSeenService = new last_seen_service_1.LastSeenService(stores, config);
+    return { lastSeenService, featureToggleStore: stores.featureToggleStore };
+}
+test('should not add duplicates per feature/environment', async () => {
+    const { lastSeenService, featureToggleStore } = initLastSeenService();
+    lastSeenService.updateLastSeen([
+        {
+            featureName: 'myFeature',
+            environment: 'development',
+            yes: 1,
+            no: 0,
+            appName: 'test',
+            timestamp: new Date(),
+        },
+    ]);
+    lastSeenService.updateLastSeen([
+        {
+            featureName: 'myFeature',
+            environment: 'development',
+            yes: 1,
+            no: 0,
+            appName: 'test',
+            timestamp: new Date(),
+        },
+    ]);
+    featureToggleStore.setLastSeen = jest.fn();
+    await lastSeenService.store();
+    expect(featureToggleStore.setLastSeen).toHaveBeenCalledWith([
+        {
+            environment: 'development',
+            featureName: 'myFeature',
+        },
+    ]);
+});
+//# sourceMappingURL=last-seen-service.test.js.map

package/dist/lib/services/client-metrics/last-seen-service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"last-seen-service.test.js","sourceRoot":"","sources":["../../../../src/lib/services/client-metrics/last-seen-service.test.ts"],"names":[],"mappings":";;;;;AAAA,yEAAwD;AACxD,oDAAkC;AAClC,iFAAyD;AAEzD,2DAAsD;AAEtD,SAAS,mBAAmB,CAAC,WAAW,GAAG,IAAI;IAC3C,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAE9B,MAAM,QAAQ,GAAG,IAAI,gBAAY,EAAE,CAAC;IACpC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAG;QACX,QAAQ;QACR,SAAS,EAAT,mBAAS;QACT,YAAY,EAAE;YACV,SAAS,EAAE,GAAG,EAAE;gBACZ,OAAO,WAAW,CAAC;YACvB,CAAC;SACJ;KACyB,CAAC;IAE/B,MAAM,eAAe,GAAG,IAAI,mCAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE5D,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE,CAAC;AAC9E,CAAC;AAED,IAAI,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;IACjE,MAAM,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAEtE,eAAe,CAAC,cAAc,CAAC;QAC3B;YACI,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,aAAa;YAC1B,GAAG,EAAE,CAAC;YACN,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB;KACJ,CAAC,CAAC;IAEH,eAAe,CAAC,cAAc,CAAC;QAC3B;YACI,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,aAAa;YAC1B,GAAG,EAAE,CAAC;YACN,EAAE,EAAE,CAAC;YACL,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,IAAI,IAAI,EAAE;SACxB;KACJ,CAAC,CAAC;IACH,kBAAkB,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IAC3C,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;IAE9B,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,oBAAoB,CAAC;QACxD;YACI,WAAW,EAAE,aAAa;YAC1B,WAAW,EAAE,WAAW;SAC3B;KACJ,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unleash-server",
   "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "keywords": [
     "unleash",
     "feature toggle",