@splitsoftware/splitio-commons 1.4.1-rc.1 → 1.4.1-rc.2

package/cjs/storages/inMemory/EventsCacheInMemory.js

@@ -37,10 +37,10 @@ var EventsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    EventsCacheInMemory.prototype.pop = function () {
+    EventsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.queue;
         this.clear();
-        return data;
+        return toMerge ? toMerge.concat(data) : data;
     };
     /**
      * Check if the cache is empty.

package/cjs/storages/inMemory/ImpressionCountsCacheInMemory.js

@@ -23,9 +23,18 @@ var ImpressionCountsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    ImpressionCountsCacheInMemory.prototype.pop = function () {
+    ImpressionCountsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.cache;
         this.clear();
+        if (toMerge) {
+            Object.keys(data).forEach(function (key) {
+                if (toMerge[key])
+                    toMerge[key] += data[key];
+                else
+                    toMerge[key] = data[key];
+            });
+            return toMerge;
+        }
         return data;
     };
     /**

package/cjs/storages/inMemory/ImpressionsCacheInMemory.js

@@ -35,10 +35,10 @@ var ImpressionsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    ImpressionsCacheInMemory.prototype.pop = function () {
+    ImpressionsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.queue;
         this.clear();
-        return data;
+        return toMerge ? toMerge.concat(data) : data;
     };
     /**
      * Check if the cache is empty.

package/cjs/sync/submitters/submitter.js

@@ -12,13 +12,9 @@ function submitterFactory(log, postClient, sourceCache, postRate, dataName, from
     var retries = 0;
     var data;
     function postData() {
-        if (!data) {
-            if (sourceCache.isEmpty())
-                return Promise.resolve();
-            // we clear the cache to track new items, while `data` is used for retries
-            data = sourceCache.pop();
-        }
-        // @ts-ignore
+        if (sourceCache.isEmpty() && !data)
+            return Promise.resolve();
+        data = sourceCache.pop(data);
         var dataCountMessage = typeof data.length === 'number' ? data.length + " " + dataName : dataName;
         log[debugLogs ? 'debug' : 'info'](constants_1.SUBMITTERS_PUSH, [dataCountMessage]);
         var jsonPayload = JSON.stringify(fromCacheToPayload ? fromCacheToPayload(data) : data);

package/esm/storages/inMemory/EventsCacheInMemory.js

@@ -34,10 +34,10 @@ var EventsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    EventsCacheInMemory.prototype.pop = function () {
+    EventsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.queue;
         this.clear();
-        return data;
+        return toMerge ? toMerge.concat(data) : data;
     };
     /**
      * Check if the cache is empty.

package/esm/storages/inMemory/ImpressionCountsCacheInMemory.js

@@ -20,9 +20,18 @@ var ImpressionCountsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    ImpressionCountsCacheInMemory.prototype.pop = function () {
+    ImpressionCountsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.cache;
         this.clear();
+        if (toMerge) {
+            Object.keys(data).forEach(function (key) {
+                if (toMerge[key])
+                    toMerge[key] += data[key];
+                else
+                    toMerge[key] = data[key];
+            });
+            return toMerge;
+        }
         return data;
     };
     /**

package/esm/storages/inMemory/ImpressionsCacheInMemory.js

@@ -32,10 +32,10 @@ var ImpressionsCacheInMemory = /** @class */ (function () {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    ImpressionsCacheInMemory.prototype.pop = function () {
+    ImpressionsCacheInMemory.prototype.pop = function (toMerge) {
         var data = this.queue;
         this.clear();
-        return data;
+        return toMerge ? toMerge.concat(data) : data;
     };
     /**
      * Check if the cache is empty.

package/esm/sync/submitters/submitter.js

@@ -9,13 +9,9 @@ export function submitterFactory(log, postClient, sourceCache, postRate, dataNam
     var retries = 0;
     var data;
     function postData() {
-        if (!data) {
-            if (sourceCache.isEmpty())
-                return Promise.resolve();
-            // we clear the cache to track new items, while `data` is used for retries
-            data = sourceCache.pop();
-        }
-        // @ts-ignore
+        if (sourceCache.isEmpty() && !data)
+            return Promise.resolve();
+        data = sourceCache.pop(data);
         var dataCountMessage = typeof data.length === 'number' ? data.length + " " + dataName : dataName;
         log[debugLogs ? 'debug' : 'info'](SUBMITTERS_PUSH, [dataCountMessage]);
         var jsonPayload = JSON.stringify(fromCacheToPayload ? fromCacheToPayload(data) : data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.4.1-rc.1",
+  "version": "1.4.1-rc.2",
   "description": "Split Javascript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/listeners/browser.ts

@@ -89,7 +89,7 @@ export class BrowserSignalListener implements ISignalListener {
     if (this.syncManager.pushManager) this.syncManager.pushManager.stop();
   }
 
-  private _flushData<TState>(url: string, cache: IRecorderCacheProducerSync<TState>, postService: (body: string) => Promise<IResponse>, fromCacheToPayload?: (cacheData: TState) => any, extraMetadata?: {}) {
+  private _flushData<T>(url: string, cache: IRecorderCacheProducerSync<T>, postService: (body: string) => Promise<IResponse>, fromCacheToPayload?: (cacheData: T) => any, extraMetadata?: {}) {
     // if there is data in cache, send it to backend
     if (!cache.isEmpty()) {
       const dataPayload = fromCacheToPayload ? fromCacheToPayload(cache.pop()) : cache.pop();

package/src/storages/inMemory/EventsCacheInMemory.ts

@@ -48,10 +48,10 @@ export class EventsCacheInMemory implements IEventsCacheSync {
   /**
    * Pop the collected data, used as payload for posting.
    */
-  pop() {
+  pop(toMerge?: SplitIO.EventData[]) {
     const data = this.queue;
     this.clear();
-    return data;
+    return toMerge ? toMerge.concat(data) : data;
   }
 
   /**

package/src/storages/inMemory/ImpressionCountsCacheInMemory.ts

@@ -25,9 +25,16 @@ export class ImpressionCountsCacheInMemory implements IImpressionCountsCacheSync
   /**
    * Pop the collected data, used as payload for posting.
    */
-  pop() {
+  pop(toMerge?: Record<string, number>) {
     const data = this.cache;
     this.clear();
+    if (toMerge) {
+      Object.keys(data).forEach((key) => {
+        if (toMerge[key]) toMerge[key] += data[key];
+        else toMerge[key] = data[key];
+      });
+      return toMerge;
+    }
     return data;
   }
 

package/src/storages/inMemory/ImpressionsCacheInMemory.ts

@@ -43,10 +43,10 @@ export class ImpressionsCacheInMemory implements IImpressionsCacheSync {
   /**
    * Pop the collected data, used as payload for posting.
    */
-  pop() {
+  pop(toMerge?: ImpressionDTO[]) {
     const data = this.queue;
     this.clear();
-    return data;
+    return toMerge ? toMerge.concat(data) : data;
   }
 
   /**

package/src/storages/types.ts

@@ -302,7 +302,7 @@ export interface IRecorderCacheProducerSync<T> {
   /* Clears cache data */
   clear(): void
   /* Pops cache data */
-  pop(): T
+  pop(toMerge?: T): T
 }
 
 
@@ -352,7 +352,7 @@ export interface IImpressionCountsCacheSync extends IRecorderCacheProducerSync<R
 
   // Used by impressions count submitter in standalone and producer mode
   isEmpty(): boolean // check if cache is empty. Return true if the cache was just created or cleared.
-  pop(): Record<string, number> // pop cache data
+  pop(toMerge?: Record<string, number> ): Record<string, number> // pop cache data
 }
 
 

package/src/sync/submitters/submitter.ts

@@ -8,28 +8,24 @@ import { IResponse } from '../../services/types';
 /**
  * Base function to create submitters, such as ImpressionsSubmitter and EventsSubmitter
  */
-export function submitterFactory<TState>(
+export function submitterFactory<T>(
   log: ILogger,
   postClient: (body: string) => Promise<IResponse>,
-  sourceCache: IRecorderCacheProducerSync<TState>,
+  sourceCache: IRecorderCacheProducerSync<T>,
   postRate: number,
   dataName: string,
-  fromCacheToPayload?: (cacheData: TState) => any,
+  fromCacheToPayload?: (cacheData: T) => any,
   maxRetries: number = 0,
   debugLogs?: boolean // true for telemetry submitters
 ): ISyncTask<[], void> {
 
   let retries = 0;
-  let data: TState | undefined;
+  let data: any;
 
   function postData(): Promise<any> {
-    if (!data) {
-      if (sourceCache.isEmpty()) return Promise.resolve();
-      // we clear the cache to track new items, while `data` is used for retries
-      data = sourceCache.pop();
-    }
+    if (sourceCache.isEmpty() && !data) return Promise.resolve();
+    data = sourceCache.pop(data);
 
-    // @ts-ignore
     const dataCountMessage = typeof data.length === 'number' ? `${data.length} ${dataName}` : dataName;
     log[debugLogs ? 'debug' : 'info'](SUBMITTERS_PUSH, [dataCountMessage]);
 

package/types/storages/inMemory/EventsCacheInMemory.d.ts

@@ -23,7 +23,7 @@ export declare class EventsCacheInMemory implements IEventsCacheSync {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    pop(): SplitIO.EventData[];
+    pop(toMerge?: SplitIO.EventData[]): SplitIO.EventData[];
     /**
      * Check if the cache is empty.
      */

package/types/storages/inMemory/ImpressionCountsCacheInMemory.d.ts

@@ -12,7 +12,7 @@ export declare class ImpressionCountsCacheInMemory implements IImpressionCountsC
     /**
      * Pop the collected data, used as payload for posting.
      */
-    pop(): Record<string, number>;
+    pop(toMerge?: Record<string, number>): Record<string, number>;
     /**
      * Clear the data stored on the cache.
      */

package/types/storages/inMemory/ImpressionsCacheInMemory.d.ts

@@ -22,7 +22,7 @@ export declare class ImpressionsCacheInMemory implements IImpressionsCacheSync {
     /**
      * Pop the collected data, used as payload for posting.
      */
-    pop(): ImpressionDTO[];
+    pop(toMerge?: ImpressionDTO[]): ImpressionDTO[];
     /**
      * Check if the cache is empty.
      */

package/types/storages/types.d.ts

@@ -266,7 +266,7 @@ export interface IEventsCacheBase {
 export interface IRecorderCacheProducerSync<T> {
     isEmpty(): boolean;
     clear(): void;
-    pop(): T;
+    pop(toMerge?: T): T;
 }
 export interface IImpressionsCacheSync extends IImpressionsCacheBase, IRecorderCacheProducerSync<ImpressionDTO[]> {
     track(data: ImpressionDTO[]): void;
@@ -295,7 +295,7 @@ export interface IEventsCacheAsync extends IEventsCacheBase, IRecorderCacheProdu
 export interface IImpressionCountsCacheSync extends IRecorderCacheProducerSync<Record<string, number>> {
     track(featureName: string, timeFrame: number, amount: number): void;
     isEmpty(): boolean;
-    pop(): Record<string, number>;
+    pop(toMerge?: Record<string, number>): Record<string, number>;
 }
 /**
  * Telemetry storage interface for standalone and partial consumer modes.

package/types/sync/submitters/submitter.d.ts

@@ -5,7 +5,7 @@ import { IResponse } from '../../services/types';
 /**
  * Base function to create submitters, such as ImpressionsSubmitter and EventsSubmitter
  */
-export declare function submitterFactory<TState>(log: ILogger, postClient: (body: string) => Promise<IResponse>, sourceCache: IRecorderCacheProducerSync<TState>, postRate: number, dataName: string, fromCacheToPayload?: (cacheData: TState) => any, maxRetries?: number, debugLogs?: boolean): ISyncTask<[], void>;
+export declare function submitterFactory<T>(log: ILogger, postClient: (body: string) => Promise<IResponse>, sourceCache: IRecorderCacheProducerSync<T>, postRate: number, dataName: string, fromCacheToPayload?: (cacheData: T) => any, maxRetries?: number, debugLogs?: boolean): ISyncTask<[], void>;
 /**
  * Decorates a provided submitter with a first execution window
  */