@splitsoftware/splitio-commons 1.8.2-rc.0 → 1.8.2-rc.2

package/src/storages/pluggable/SplitsCachePluggable.ts

@@ -29,19 +29,15 @@ export class SplitsCachePluggable extends AbstractSplitsCacheAsync {
   }
 
   private _decrementCounts(split: ISplit) {
-    if (split.trafficTypeName) {
-      const ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-      return this.wrapper.decr(ttKey).then(count => {
-        if (count === 0) return this.wrapper.del(ttKey);
-      });
-    }
+    const ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
+    return this.wrapper.decr(ttKey).then(count => {
+      if (count === 0) return this.wrapper.del(ttKey);
+    });
   }
 
   private _incrementCounts(split: ISplit) {
-    if (split.trafficTypeName) {
-      const ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
-      return this.wrapper.incr(ttKey);
-    }
+    const ttKey = this.keys.buildTrafficTypeKey(split.trafficTypeName);
+    return this.wrapper.incr(ttKey);
   }
 
   /**
@@ -54,20 +50,23 @@ export class SplitsCachePluggable extends AbstractSplitsCacheAsync {
     return this.wrapper.get(splitKey).then(splitFromStorage => {
 
       // handling parsing error
-      let parsedPreviousSplit, stringifiedNewSplit;
+      let parsedPreviousSplit: ISplit, stringifiedNewSplit;
       try {
         parsedPreviousSplit = splitFromStorage ? JSON.parse(splitFromStorage) : undefined;
         stringifiedNewSplit = JSON.stringify(split);
       } catch (e) {
-        throw new Error('Error parsing split definition: ' + e);
+        throw new Error('Error parsing feature flag definition: ' + e);
       }
 
-      return Promise.all([
-        this.wrapper.set(splitKey, stringifiedNewSplit),
-        this._incrementCounts(split),
-        // If it's an update, we decrement the traffic type and segment count of the existing split,
-        parsedPreviousSplit && this._decrementCounts(parsedPreviousSplit)
-      ]);
+      return this.wrapper.set(splitKey, stringifiedNewSplit).then(() => {
+        // avoid unnecessary increment/decrement operations
+        if (parsedPreviousSplit && parsedPreviousSplit.trafficTypeName === split.trafficTypeName) return;
+
+        // update traffic type counts
+        return this._incrementCounts(split).then(() => {
+          if (parsedPreviousSplit) return this._decrementCounts(parsedPreviousSplit);
+        });
+      });
     }).then(() => true);
   }
 

package/src/sync/polling/updaters/segmentChangesUpdater.ts

@@ -98,7 +98,7 @@ export function segmentChangesUpdaterFactory(
           // If the operation is forbidden, it may be due to permissions. Destroy the SDK instance.
           // @TODO although factory status is destroyed, synchronization is not stopped
           if (readiness) readiness.destroy();
-          log.error(`${LOG_PREFIX_INSTANTIATION}: you passed a client-side type authorizationKey, please grab an Api Key from the Split web console that is of type Server-side.`);
+          log.error(`${LOG_PREFIX_INSTANTIATION}: you passed a client-side type authorizationKey, please grab an SDK Key from the Split user interface that is of type server-side.`);
         } else {
           log.warn(`${LOG_PREFIX_SYNC_SEGMENTS}Error while doing fetch of segments. ${error}`);
         }

package/src/sync/polling/updaters/splitChangesUpdater.ts

@@ -7,7 +7,6 @@ import { timeout } from '../../../utils/promise/timeout';
 import { SDK_SPLITS_ARRIVED, SDK_SPLITS_CACHE_LOADED } from '../../../readiness/constants';
 import { ILogger } from '../../../logger/types';
 import { SYNC_SPLITS_FETCH, SYNC_SPLITS_NEW, SYNC_SPLITS_REMOVED, SYNC_SPLITS_SEGMENTS, SYNC_SPLITS_FETCH_FAILS, SYNC_SPLITS_FETCH_RETRY } from '../../../logger/constants';
-import { _Map } from '../../../utils/lang/maps';
 
 type ISplitChangesUpdater = (noCache?: boolean, till?: number) => Promise<boolean>
 
@@ -52,25 +51,20 @@ interface ISplitMutations {
  * Exported for testing purposes.
  */
 export function computeSplitsMutation(entries: ISplit[]): ISplitMutations {
-  const uniqueEntries = new _Map();
-  entries.forEach(split => {
-    const prevSplit = uniqueEntries.get(split.name);
-    if (!prevSplit || prevSplit.changeNumber < split.changeNumber) uniqueEntries.set(split.name, split);
-  });
-
   const segments = new _Set<string>();
-  const computed = { added: [], removed: [], segments: [] } as ISplitMutations;
-  uniqueEntries.forEach((split) => {
+  const computed = entries.reduce((accum, split) => {
     if (split.status === 'ACTIVE') {
-      computed.added.push([split.name, split]);
+      accum.added.push([split.name, split]);
 
       parseSegments(split).forEach((segmentName: string) => {
         segments.add(segmentName);
       });
     } else {
-      computed.removed.push(split.name);
+      accum.removed.push(split.name);
     }
-  });
+
+    return accum;
+  }, { added: [], removed: [], segments: [] } as ISplitMutations);
 
   computed.segments = setToArray(segments);
 

package/src/sync/streaming/pushManager.ts

@@ -139,7 +139,7 @@ export function pushManagerFactory(
 
         log.error(ERROR_STREAMING_AUTH, [error.message]);
 
-        // Handle 4XX HTTP errors: 401 (invalid API Key) or 400 (using incorrect API Key, i.e., client-side API Key on server-side)
+        // Handle 4XX HTTP errors: 401 (invalid SDK Key) or 400 (using incorrect SDK Key, i.e., client-side SDK Key on server-side)
         if (error.statusCode >= 400 && error.statusCode < 500) {
           telemetryTracker.streamingEvent(AUTH_REJECTION);
           pushEmitter.emit(PUSH_NONRETRYABLE_ERROR);

package/src/sync/submitters/telemetrySubmitter.ts

@@ -33,8 +33,8 @@ function getActiveFactories() {
 }
 
 function getRedundantActiveFactories() {
-  return Object.keys(usedKeysMap).reduce((acum, apiKey) => {
-    return acum + usedKeysMap[apiKey] - 1;
+  return Object.keys(usedKeysMap).reduce((acum, sdkKey) => {
+    return acum + usedKeysMap[sdkKey] - 1;
   }, 0);
 }