@splitsoftware/splitio-commons 2.1.1-rc.0 → 2.1.1-rc.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.
Files changed (187) hide show
  1. package/CHANGES.txt +7 -0
  2. package/README.md +0 -1
  3. package/cjs/evaluator/combiners/and.js +6 -2
  4. package/cjs/evaluator/combiners/ifelseif.js +6 -6
  5. package/cjs/evaluator/condition/index.js +5 -6
  6. package/cjs/evaluator/index.js +7 -7
  7. package/cjs/evaluator/matchers/index.js +1 -3
  8. package/cjs/evaluator/matchers/matcherTypes.js +0 -1
  9. package/cjs/evaluator/matchersTransform/index.js +0 -4
  10. package/cjs/evaluator/parser/index.js +2 -2
  11. package/cjs/evaluator/value/sanitize.js +0 -1
  12. package/cjs/logger/constants.js +3 -4
  13. package/cjs/logger/messages/debug.js +2 -3
  14. package/cjs/logger/messages/error.js +1 -1
  15. package/cjs/logger/messages/warn.js +2 -2
  16. package/cjs/readiness/readinessManager.js +6 -0
  17. package/cjs/sdkClient/client.js +29 -19
  18. package/cjs/sdkClient/clientAttributesDecoration.js +19 -25
  19. package/cjs/sdkClient/clientInputValidation.js +28 -26
  20. package/cjs/services/splitApi.js +2 -2
  21. package/cjs/storages/AbstractSplitsCacheAsync.js +0 -7
  22. package/cjs/storages/AbstractSplitsCacheSync.js +2 -12
  23. package/cjs/storages/KeyBuilder.js +0 -9
  24. package/cjs/storages/KeyBuilderCS.js +4 -4
  25. package/cjs/storages/KeyBuilderSS.js +0 -3
  26. package/cjs/storages/dataLoader.js +3 -2
  27. package/cjs/storages/inLocalStorage/SplitsCacheInLocal.js +23 -76
  28. package/cjs/storages/inLocalStorage/index.js +5 -7
  29. package/cjs/storages/inLocalStorage/validateCache.js +79 -0
  30. package/cjs/storages/inMemory/InMemoryStorage.js +0 -3
  31. package/cjs/storages/inMemory/InMemoryStorageCS.js +0 -4
  32. package/cjs/storages/inRedis/index.js +0 -2
  33. package/cjs/storages/pluggable/index.js +2 -3
  34. package/cjs/storages/utils.js +1 -0
  35. package/cjs/sync/offline/syncTasks/fromObjectSyncTask.js +3 -2
  36. package/cjs/sync/polling/fetchers/splitChangesFetcher.js +2 -2
  37. package/cjs/sync/polling/pollingManagerCS.js +7 -7
  38. package/cjs/sync/polling/updaters/mySegmentsUpdater.js +2 -2
  39. package/cjs/sync/polling/updaters/segmentChangesUpdater.js +1 -1
  40. package/cjs/sync/polling/updaters/splitChangesUpdater.js +33 -60
  41. package/cjs/sync/streaming/SSEHandler/index.js +0 -1
  42. package/cjs/sync/streaming/UpdateWorkers/SplitsUpdateWorker.js +77 -106
  43. package/cjs/sync/streaming/constants.js +1 -2
  44. package/cjs/sync/streaming/pushManager.js +16 -3
  45. package/cjs/sync/submitters/impressionsSubmitter.js +3 -2
  46. package/cjs/sync/syncManagerOnline.js +10 -5
  47. package/cjs/trackers/strategy/strategyDebug.js +2 -0
  48. package/cjs/trackers/strategy/strategyOptimized.js +3 -0
  49. package/cjs/utils/constants/index.js +2 -3
  50. package/cjs/utils/inputValidation/eventProperties.js +12 -1
  51. package/cjs/utils/inputValidation/index.js +3 -1
  52. package/cjs/utils/settingsValidation/storage/storageCS.js +1 -1
  53. package/esm/evaluator/combiners/and.js +6 -2
  54. package/esm/evaluator/combiners/ifelseif.js +7 -7
  55. package/esm/evaluator/condition/index.js +5 -6
  56. package/esm/evaluator/index.js +7 -7
  57. package/esm/evaluator/matchers/index.js +1 -3
  58. package/esm/evaluator/matchers/matcherTypes.js +0 -1
  59. package/esm/evaluator/matchersTransform/index.js +0 -4
  60. package/esm/evaluator/parser/index.js +2 -2
  61. package/esm/evaluator/value/sanitize.js +0 -1
  62. package/esm/logger/constants.js +0 -1
  63. package/esm/logger/messages/debug.js +2 -3
  64. package/esm/logger/messages/error.js +1 -1
  65. package/esm/logger/messages/warn.js +2 -2
  66. package/esm/readiness/readinessManager.js +6 -0
  67. package/esm/sdkClient/client.js +29 -19
  68. package/esm/sdkClient/clientAttributesDecoration.js +19 -25
  69. package/esm/sdkClient/clientInputValidation.js +29 -27
  70. package/esm/services/splitApi.js +2 -2
  71. package/esm/storages/AbstractSplitsCacheAsync.js +0 -7
  72. package/esm/storages/AbstractSplitsCacheSync.js +2 -12
  73. package/esm/storages/KeyBuilder.js +0 -9
  74. package/esm/storages/KeyBuilderCS.js +4 -4
  75. package/esm/storages/KeyBuilderSS.js +0 -3
  76. package/esm/storages/dataLoader.js +2 -1
  77. package/esm/storages/inLocalStorage/SplitsCacheInLocal.js +23 -76
  78. package/esm/storages/inLocalStorage/index.js +5 -7
  79. package/esm/storages/inLocalStorage/validateCache.js +75 -0
  80. package/esm/storages/inMemory/InMemoryStorage.js +0 -3
  81. package/esm/storages/inMemory/InMemoryStorageCS.js +0 -4
  82. package/esm/storages/inRedis/index.js +0 -2
  83. package/esm/storages/pluggable/index.js +2 -3
  84. package/esm/storages/utils.js +1 -0
  85. package/esm/sync/offline/syncTasks/fromObjectSyncTask.js +3 -2
  86. package/esm/sync/polling/fetchers/splitChangesFetcher.js +2 -2
  87. package/esm/sync/polling/pollingManagerCS.js +7 -7
  88. package/esm/sync/polling/updaters/mySegmentsUpdater.js +2 -2
  89. package/esm/sync/polling/updaters/segmentChangesUpdater.js +1 -1
  90. package/esm/sync/polling/updaters/splitChangesUpdater.js +34 -61
  91. package/esm/sync/streaming/SSEHandler/index.js +1 -2
  92. package/esm/sync/streaming/UpdateWorkers/SplitsUpdateWorker.js +73 -102
  93. package/esm/sync/streaming/constants.js +0 -1
  94. package/esm/sync/streaming/pushManager.js +19 -6
  95. package/esm/sync/submitters/impressionsSubmitter.js +3 -2
  96. package/esm/sync/syncManagerOnline.js +10 -5
  97. package/esm/trackers/strategy/strategyDebug.js +2 -0
  98. package/esm/trackers/strategy/strategyOptimized.js +3 -0
  99. package/esm/utils/constants/index.js +1 -2
  100. package/esm/utils/inputValidation/eventProperties.js +10 -0
  101. package/esm/utils/inputValidation/index.js +1 -0
  102. package/esm/utils/settingsValidation/storage/storageCS.js +1 -1
  103. package/package.json +1 -1
  104. package/src/dtos/types.ts +8 -32
  105. package/src/evaluator/Engine.ts +1 -1
  106. package/src/evaluator/combiners/and.ts +4 -5
  107. package/src/evaluator/combiners/ifelseif.ts +9 -7
  108. package/src/evaluator/condition/engineUtils.ts +1 -1
  109. package/src/evaluator/condition/index.ts +12 -12
  110. package/src/evaluator/index.ts +7 -7
  111. package/src/evaluator/matchers/index.ts +1 -3
  112. package/src/evaluator/matchers/matcherTypes.ts +0 -1
  113. package/src/evaluator/matchersTransform/index.ts +0 -3
  114. package/src/evaluator/parser/index.ts +3 -3
  115. package/src/evaluator/types.ts +2 -2
  116. package/src/evaluator/value/index.ts +2 -2
  117. package/src/evaluator/value/sanitize.ts +4 -5
  118. package/src/logger/constants.ts +0 -1
  119. package/src/logger/messages/debug.ts +2 -3
  120. package/src/logger/messages/error.ts +1 -1
  121. package/src/logger/messages/warn.ts +2 -2
  122. package/src/readiness/readinessManager.ts +5 -0
  123. package/src/sdkClient/client.ts +31 -21
  124. package/src/sdkClient/clientAttributesDecoration.ts +20 -27
  125. package/src/sdkClient/clientInputValidation.ts +30 -27
  126. package/src/sdkManager/index.ts +1 -1
  127. package/src/services/splitApi.ts +2 -2
  128. package/src/services/types.ts +1 -1
  129. package/src/storages/AbstractSplitsCacheAsync.ts +0 -8
  130. package/src/storages/AbstractSplitsCacheSync.ts +3 -14
  131. package/src/storages/KeyBuilder.ts +0 -12
  132. package/src/storages/KeyBuilderCS.ts +5 -5
  133. package/src/storages/KeyBuilderSS.ts +0 -4
  134. package/src/storages/dataLoader.ts +3 -1
  135. package/src/storages/inLocalStorage/SplitsCacheInLocal.ts +26 -87
  136. package/src/storages/inLocalStorage/index.ts +8 -12
  137. package/src/storages/inLocalStorage/validateCache.ts +91 -0
  138. package/src/storages/inMemory/InMemoryStorage.ts +0 -3
  139. package/src/storages/inMemory/InMemoryStorageCS.ts +0 -4
  140. package/src/storages/inRedis/index.ts +0 -2
  141. package/src/storages/pluggable/index.ts +2 -3
  142. package/src/storages/types.ts +2 -37
  143. package/src/storages/utils.ts +1 -0
  144. package/src/sync/offline/syncTasks/fromObjectSyncTask.ts +6 -5
  145. package/src/sync/polling/fetchers/splitChangesFetcher.ts +1 -2
  146. package/src/sync/polling/fetchers/types.ts +0 -1
  147. package/src/sync/polling/pollingManagerCS.ts +7 -7
  148. package/src/sync/polling/types.ts +2 -2
  149. package/src/sync/polling/updaters/mySegmentsUpdater.ts +2 -2
  150. package/src/sync/polling/updaters/segmentChangesUpdater.ts +1 -1
  151. package/src/sync/polling/updaters/splitChangesUpdater.ts +43 -71
  152. package/src/sync/streaming/SSEHandler/index.ts +1 -2
  153. package/src/sync/streaming/SSEHandler/types.ts +2 -2
  154. package/src/sync/streaming/UpdateWorkers/SplitsUpdateWorker.ts +68 -98
  155. package/src/sync/streaming/constants.ts +0 -1
  156. package/src/sync/streaming/parseUtils.ts +2 -2
  157. package/src/sync/streaming/pushManager.ts +18 -6
  158. package/src/sync/streaming/types.ts +2 -3
  159. package/src/sync/submitters/impressionsSubmitter.ts +3 -2
  160. package/src/sync/submitters/types.ts +23 -33
  161. package/src/sync/syncManagerOnline.ts +11 -5
  162. package/src/trackers/strategy/strategyDebug.ts +2 -0
  163. package/src/trackers/strategy/strategyOptimized.ts +3 -0
  164. package/src/utils/constants/index.ts +1 -2
  165. package/src/utils/inputValidation/eventProperties.ts +10 -0
  166. package/src/utils/inputValidation/index.ts +1 -0
  167. package/src/utils/lang/index.ts +2 -2
  168. package/src/utils/settingsValidation/storage/storageCS.ts +1 -1
  169. package/types/splitio.d.ts +128 -36
  170. package/cjs/evaluator/matchers/rbsegment.js +0 -43
  171. package/cjs/storages/inLocalStorage/RBSegmentsCacheInLocal.js +0 -117
  172. package/cjs/storages/inMemory/RBSegmentsCacheInMemory.js +0 -61
  173. package/cjs/storages/inRedis/RBSegmentsCacheInRedis.js +0 -64
  174. package/cjs/storages/pluggable/RBSegmentsCachePluggable.js +0 -64
  175. package/cjs/utils/constants/browser.js +0 -5
  176. package/esm/evaluator/matchers/rbsegment.js +0 -39
  177. package/esm/storages/inLocalStorage/RBSegmentsCacheInLocal.js +0 -114
  178. package/esm/storages/inMemory/RBSegmentsCacheInMemory.js +0 -58
  179. package/esm/storages/inRedis/RBSegmentsCacheInRedis.js +0 -61
  180. package/esm/storages/pluggable/RBSegmentsCachePluggable.js +0 -61
  181. package/esm/utils/constants/browser.js +0 -2
  182. package/src/evaluator/matchers/rbsegment.ts +0 -61
  183. package/src/storages/inLocalStorage/RBSegmentsCacheInLocal.ts +0 -136
  184. package/src/storages/inMemory/RBSegmentsCacheInMemory.ts +0 -68
  185. package/src/storages/inRedis/RBSegmentsCacheInRedis.ts +0 -79
  186. package/src/storages/pluggable/RBSegmentsCachePluggable.ts +0 -76
  187. package/src/utils/constants/browser.ts +0 -2
@@ -1,13 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.splitChangesUpdaterFactory = exports.computeMutation = exports.parseSegments = void 0;
3
+ exports.splitChangesUpdaterFactory = exports.computeSplitsMutation = exports.parseSegments = void 0;
4
4
  var timeout_1 = require("../../../utils/promise/timeout");
5
5
  var constants_1 = require("../../../readiness/constants");
6
6
  var constants_2 = require("../../../logger/constants");
7
7
  var lang_1 = require("../../../utils/lang");
8
8
  var constants_3 = require("../../../utils/constants");
9
9
  var sets_1 = require("../../../utils/lang/sets");
10
- var constants_4 = require("../../streaming/constants");
11
10
  // Checks that all registered segments have been fetched (changeNumber !== -1 for every segment).
12
11
  // Returns a promise that could be rejected.
13
12
  // @TODO review together with Segments and MySegments storage APIs
@@ -22,14 +21,13 @@ function checkAllSegmentsExist(segments) {
22
21
  * Collect segments from a raw split definition.
23
22
  * Exported for testing purposes.
24
23
  */
25
- function parseSegments(ruleEntity, matcherType) {
26
- if (matcherType === void 0) { matcherType = constants_3.IN_SEGMENT; }
27
- var _a = ruleEntity, conditions = _a.conditions, excluded = _a.excluded;
28
- var segments = new Set(excluded && excluded.segments);
24
+ function parseSegments(_a) {
25
+ var conditions = _a.conditions;
26
+ var segments = new Set();
29
27
  for (var i = 0; i < conditions.length; i++) {
30
28
  var matchers = conditions[i].matcherGroup.matchers;
31
29
  matchers.forEach(function (matcher) {
32
- if (matcher.matcherType === matcherType)
30
+ if (matcher.matcherType === constants_3.IN_SEGMENT)
33
31
  segments.add(matcher.userDefinedSegmentMatcherData.segmentName);
34
32
  });
35
33
  }
@@ -60,21 +58,24 @@ function matchFilters(featureFlag, filters) {
60
58
  * i.e., an object with added splits, removed splits and used segments.
61
59
  * Exported for testing purposes.
62
60
  */
63
- function computeMutation(rules, segments, filters) {
64
- return rules.reduce(function (accum, ruleEntity) {
65
- if (ruleEntity.status === 'ACTIVE' && (!filters || matchFilters(ruleEntity, filters))) {
66
- accum.added.push(ruleEntity);
67
- parseSegments(ruleEntity).forEach(function (segmentName) {
61
+ function computeSplitsMutation(entries, filters) {
62
+ var segments = new Set();
63
+ var computed = entries.reduce(function (accum, split) {
64
+ if (split.status === 'ACTIVE' && matchFilters(split, filters)) {
65
+ accum.added.push(split);
66
+ parseSegments(split).forEach(function (segmentName) {
68
67
  segments.add(segmentName);
69
68
  });
70
69
  }
71
70
  else {
72
- accum.removed.push(ruleEntity);
71
+ accum.removed.push(split);
73
72
  }
74
73
  return accum;
75
- }, { added: [], removed: [] });
74
+ }, { added: [], removed: [], segments: [] });
75
+ computed.segments = (0, sets_1.setToArray)(segments);
76
+ return computed;
76
77
  }
77
- exports.computeMutation = computeMutation;
78
+ exports.computeSplitsMutation = computeSplitsMutation;
78
79
  /**
79
80
  * factory of SplitChanges updater, a task that:
80
81
  * - fetches split changes using `splitChangesFetcher`
@@ -92,7 +93,7 @@ exports.computeMutation = computeMutation;
92
93
  function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFiltersValidation, splitsEventEmitter, requestTimeoutBeforeReady, retriesOnFailureBeforeReady, isClientSide) {
93
94
  if (requestTimeoutBeforeReady === void 0) { requestTimeoutBeforeReady = 0; }
94
95
  if (retriesOnFailureBeforeReady === void 0) { retriesOnFailureBeforeReady = 0; }
95
- var splits = storage.splits, rbSegments = storage.rbSegments, segments = storage.segments;
96
+ var splits = storage.splits, segments = storage.segments;
96
97
  var startingUp = true;
97
98
  /** timeout decorator for `splitChangesFetcher` promise */
98
99
  function _promiseDecorator(promise) {
@@ -107,48 +108,29 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
107
108
  * @param noCache - true to revalidate data to fetch
108
109
  * @param till - query param to bypass CDN requests
109
110
  */
110
- return function splitChangesUpdater(noCache, till, instantUpdate) {
111
+ return function splitChangesUpdater(noCache, till, splitUpdateNotification) {
111
112
  /**
112
113
  * @param since - current changeNumber at splitsCache
113
114
  * @param retry - current number of retry attempts
114
115
  */
115
- function _splitChangesUpdater(sinces, retry) {
116
+ function _splitChangesUpdater(since, retry) {
116
117
  if (retry === void 0) { retry = 0; }
117
- var since = sinces[0], rbSince = sinces[1];
118
- log.debug(constants_2.SYNC_SPLITS_FETCH, sinces);
119
- var fetcherPromise = Promise.resolve(instantUpdate ?
120
- instantUpdate.type === constants_4.SPLIT_UPDATE ?
121
- // IFFU edge case: a change to a flag that adds an IN_RULE_BASED_SEGMENT matcher that is not present yet
122
- Promise.resolve(rbSegments.contains(parseSegments(instantUpdate.payload, constants_3.IN_RULE_BASED_SEGMENT))).then(function (contains) {
123
- return contains ?
124
- { ff: { d: [instantUpdate.payload], t: instantUpdate.changeNumber } } :
125
- splitChangesFetcher(since, noCache, till, rbSince, _promiseDecorator);
126
- }) :
127
- { rbs: { d: [instantUpdate.payload], t: instantUpdate.changeNumber } } :
128
- splitChangesFetcher(since, noCache, till, rbSince, _promiseDecorator))
118
+ log.debug(constants_2.SYNC_SPLITS_FETCH, [since]);
119
+ return Promise.resolve(splitUpdateNotification ?
120
+ { splits: [splitUpdateNotification.payload], till: splitUpdateNotification.changeNumber } :
121
+ splitChangesFetcher(since, noCache, till, _promiseDecorator))
129
122
  .then(function (splitChanges) {
130
123
  startingUp = false;
131
- var usedSegments = new Set();
132
- var ffUpdate = false;
133
- if (splitChanges.ff) {
134
- var _a = computeMutation(splitChanges.ff.d, usedSegments, splitFiltersValidation), added = _a.added, removed = _a.removed;
135
- log.debug(constants_2.SYNC_SPLITS_UPDATE, [added.length, removed.length]);
136
- ffUpdate = splits.update(added, removed, splitChanges.ff.t);
137
- }
138
- var rbsUpdate = false;
139
- if (splitChanges.rbs) {
140
- var _b = computeMutation(splitChanges.rbs.d, usedSegments), added = _b.added, removed = _b.removed;
141
- log.debug(constants_2.SYNC_RBS_UPDATE, [added.length, removed.length]);
142
- rbsUpdate = rbSegments.update(added, removed, splitChanges.rbs.t);
143
- }
144
- return Promise.all([ffUpdate, rbsUpdate,
145
- // @TODO if at least 1 segment fetch fails due to 404 and other segments are updated in the storage, SDK_UPDATE is not emitted
146
- segments.registerSegments((0, sets_1.setToArray)(usedSegments))
124
+ var mutation = computeSplitsMutation(splitChanges.splits, splitFiltersValidation);
125
+ log.debug(constants_2.SYNC_SPLITS_UPDATE, [mutation.added.length, mutation.removed.length, mutation.segments.length]);
126
+ return Promise.all([
127
+ splits.update(mutation.added, mutation.removed, splitChanges.till),
128
+ segments.registerSegments(mutation.segments)
147
129
  ]).then(function (_a) {
148
- var ffChanged = _a[0], rbsChanged = _a[1];
130
+ var isThereUpdate = _a[0];
149
131
  if (splitsEventEmitter) {
150
132
  // To emit SDK_SPLITS_ARRIVED for server-side SDK, we must check that all registered segments have been fetched
151
- return Promise.resolve(!splitsEventEmitter.splitsArrived || ((ffChanged || rbsChanged) && (isClientSide || checkAllSegmentsExist(segments))))
133
+ return Promise.resolve(!splitsEventEmitter.splitsArrived || (since !== splitChanges.till && isThereUpdate && (isClientSide || checkAllSegmentsExist(segments))))
152
134
  .catch(function () { return false; } /** noop. just to handle a possible `checkAllSegmentsExist` rejection, before emitting SDK event */)
153
135
  .then(function (emitSplitsArrivedEvent) {
154
136
  // emit SDK events
@@ -165,25 +147,16 @@ function splitChangesUpdaterFactory(log, splitChangesFetcher, storage, splitFilt
165
147
  if (startingUp && retriesOnFailureBeforeReady > retry) {
166
148
  retry += 1;
167
149
  log.info(constants_2.SYNC_SPLITS_FETCH_RETRY, [retry, error]);
168
- return _splitChangesUpdater(sinces, retry);
150
+ return _splitChangesUpdater(since, retry);
169
151
  }
170
152
  else {
171
153
  startingUp = false;
172
154
  }
173
155
  return false;
174
156
  });
175
- // After triggering the requests, if we have cached splits information let's notify that to emit SDK_READY_FROM_CACHE.
176
- // Wrapping in a promise since checkCache can be async.
177
- if (splitsEventEmitter && startingUp) {
178
- Promise.resolve(splits.checkCache()).then(function (isCacheReady) {
179
- if (isCacheReady)
180
- splitsEventEmitter.emit(constants_1.SDK_SPLITS_CACHE_LOADED);
181
- });
182
- }
183
- return fetcherPromise;
184
157
  }
185
- // `getChangeNumber` never rejects or throws error
186
- return Promise.all([splits.getChangeNumber(), rbSegments.getChangeNumber()]).then(_splitChangesUpdater);
158
+ var sincePromise = Promise.resolve(splits.getChangeNumber()); // `getChangeNumber` never rejects or throws error
159
+ return sincePromise.then(_splitChangesUpdater);
187
160
  };
188
161
  }
189
162
  exports.splitChangesUpdaterFactory = splitChangesUpdaterFactory;
@@ -78,7 +78,6 @@ function SSEHandlerFactory(log, pushEmitter, telemetryTracker) {
78
78
  case constants_1.MEMBERSHIPS_MS_UPDATE:
79
79
  case constants_1.MEMBERSHIPS_LS_UPDATE:
80
80
  case constants_1.SPLIT_KILL:
81
- case constants_1.RB_SEGMENT_UPDATE:
82
81
  pushEmitter.emit(parsedData.type, parsedData);
83
82
  break;
84
83
  /* occupancy & control events, handled by NotificationManagerKeeper */
@@ -1,135 +1,106 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.SplitsUpdateWorker = void 0;
4
- var constants_1 = require("../../../logger/constants");
5
- var constants_2 = require("../../../readiness/constants");
4
+ var constants_1 = require("../../../readiness/constants");
6
5
  var Backoff_1 = require("../../../utils/Backoff");
7
- var constants_3 = require("../../../utils/constants");
8
- var constants_4 = require("../constants");
9
- var parseUtils_1 = require("../parseUtils");
10
- var constants_5 = require("./constants");
6
+ var constants_2 = require("../../../utils/constants");
7
+ var constants_3 = require("./constants");
11
8
  /**
12
9
  * SplitsUpdateWorker factory
13
10
  */
14
- function SplitsUpdateWorker(log, storage, splitsSyncTask, splitsEventEmitter, telemetryTracker, segmentsSyncTask) {
15
- var ff = SplitsUpdateWorker(storage.splits);
16
- var rbs = SplitsUpdateWorker(storage.rbSegments);
17
- function SplitsUpdateWorker(cache) {
18
- var maxChangeNumber = -1;
19
- var handleNewEvent = false;
20
- var isHandlingEvent;
21
- var cdnBypass;
22
- var instantUpdate;
23
- var backoff = new Backoff_1.Backoff(__handleSplitUpdateCall, constants_5.FETCH_BACKOFF_BASE, constants_5.FETCH_BACKOFF_MAX_WAIT);
24
- function __handleSplitUpdateCall() {
25
- isHandlingEvent = true;
26
- if (maxChangeNumber > cache.getChangeNumber()) {
27
- handleNewEvent = false;
28
- // fetch splits revalidating data if cached
29
- splitsSyncTask.execute(true, cdnBypass ? maxChangeNumber : undefined, instantUpdate).then(function () {
30
- if (!isHandlingEvent)
31
- return; // halt if `stop` has been called
32
- if (handleNewEvent) {
33
- __handleSplitUpdateCall();
11
+ function SplitsUpdateWorker(log, splitsCache, splitsSyncTask, splitsEventEmitter, telemetryTracker, segmentsSyncTask) {
12
+ var maxChangeNumber = 0;
13
+ var handleNewEvent = false;
14
+ var isHandlingEvent;
15
+ var cdnBypass;
16
+ var payload;
17
+ var backoff = new Backoff_1.Backoff(__handleSplitUpdateCall, constants_3.FETCH_BACKOFF_BASE, constants_3.FETCH_BACKOFF_MAX_WAIT);
18
+ function __handleSplitUpdateCall() {
19
+ isHandlingEvent = true;
20
+ if (maxChangeNumber > splitsCache.getChangeNumber()) {
21
+ handleNewEvent = false;
22
+ var splitUpdateNotification_1 = payload ? { payload: payload, changeNumber: maxChangeNumber } : undefined;
23
+ // fetch splits revalidating data if cached
24
+ splitsSyncTask.execute(true, cdnBypass ? maxChangeNumber : undefined, splitUpdateNotification_1).then(function () {
25
+ if (!isHandlingEvent)
26
+ return; // halt if `stop` has been called
27
+ if (handleNewEvent) {
28
+ __handleSplitUpdateCall();
29
+ }
30
+ else {
31
+ if (splitUpdateNotification_1)
32
+ telemetryTracker.trackUpdatesFromSSE(constants_2.SPLITS);
33
+ // fetch new registered segments for server-side API. Not retrying on error
34
+ if (segmentsSyncTask)
35
+ segmentsSyncTask.execute(true);
36
+ var attempts = backoff.attempts + 1;
37
+ if (maxChangeNumber <= splitsCache.getChangeNumber()) {
38
+ log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
39
+ isHandlingEvent = false;
40
+ return;
41
+ }
42
+ if (attempts < constants_3.FETCH_BACKOFF_MAX_RETRIES) {
43
+ backoff.scheduleCall();
44
+ return;
45
+ }
46
+ if (cdnBypass) {
47
+ log.debug("No changes fetched after " + attempts + " attempts with CDN bypassed.");
48
+ isHandlingEvent = false;
34
49
  }
35
50
  else {
36
- if (instantUpdate)
37
- telemetryTracker.trackUpdatesFromSSE(constants_3.SPLITS);
38
- // fetch new registered segments for server-side API. Not retrying on error
39
- if (segmentsSyncTask)
40
- segmentsSyncTask.execute(true);
41
- var attempts = backoff.attempts + 1;
42
- if (ff.isSync() && rbs.isSync()) {
43
- log.debug("Refresh completed" + (cdnBypass ? ' bypassing the CDN' : '') + " in " + attempts + " attempts.");
44
- isHandlingEvent = false;
45
- return;
46
- }
47
- if (attempts < constants_5.FETCH_BACKOFF_MAX_RETRIES) {
48
- backoff.scheduleCall();
49
- return;
50
- }
51
- if (cdnBypass) {
52
- log.debug("No changes fetched after " + attempts + " attempts with CDN bypassed.");
53
- isHandlingEvent = false;
54
- }
55
- else {
56
- backoff.reset();
57
- cdnBypass = true;
58
- __handleSplitUpdateCall();
59
- }
51
+ backoff.reset();
52
+ cdnBypass = true;
53
+ __handleSplitUpdateCall();
60
54
  }
61
- });
62
- }
63
- else {
64
- isHandlingEvent = false;
65
- }
66
- }
67
- return {
68
- /**
69
- * Invoked by NotificationProcessor on SPLIT_UPDATE or RB_SEGMENT_UPDATE event
70
- *
71
- * @param changeNumber - change number of the notification
72
- */
73
- put: function (_a, payload) {
74
- var changeNumber = _a.changeNumber, pcn = _a.pcn, type = _a.type;
75
- var currentChangeNumber = cache.getChangeNumber();
76
- if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
77
- return;
78
- maxChangeNumber = changeNumber;
79
- handleNewEvent = true;
80
- cdnBypass = false;
81
- instantUpdate = undefined;
82
- if (payload && currentChangeNumber === pcn) {
83
- instantUpdate = { payload: payload, changeNumber: changeNumber, type: type };
84
55
  }
85
- if (backoff.timeoutID || !isHandlingEvent)
86
- __handleSplitUpdateCall();
87
- backoff.reset();
88
- },
89
- stop: function () {
90
- isHandlingEvent = false;
91
- backoff.reset();
92
- },
93
- isSync: function () {
94
- return maxChangeNumber <= cache.getChangeNumber();
95
- }
96
- };
56
+ });
57
+ }
58
+ else {
59
+ isHandlingEvent = false;
60
+ }
61
+ }
62
+ /**
63
+ * Invoked by NotificationProcessor on SPLIT_UPDATE event
64
+ *
65
+ * @param changeNumber - change number of the SPLIT_UPDATE notification
66
+ */
67
+ function put(_a, _payload) {
68
+ var changeNumber = _a.changeNumber, pcn = _a.pcn;
69
+ var currentChangeNumber = splitsCache.getChangeNumber();
70
+ if (changeNumber <= currentChangeNumber || changeNumber <= maxChangeNumber)
71
+ return;
72
+ maxChangeNumber = changeNumber;
73
+ handleNewEvent = true;
74
+ cdnBypass = false;
75
+ payload = undefined;
76
+ if (_payload && currentChangeNumber === pcn) {
77
+ payload = _payload;
78
+ }
79
+ if (backoff.timeoutID || !isHandlingEvent)
80
+ __handleSplitUpdateCall();
81
+ backoff.reset();
97
82
  }
98
83
  return {
99
- put: function (parsedData) {
100
- if (parsedData.d && parsedData.c !== undefined) {
101
- try {
102
- var payload = (0, parseUtils_1.parseFFUpdatePayload)(parsedData.c, parsedData.d);
103
- if (payload) {
104
- (parsedData.type === constants_4.RB_SEGMENT_UPDATE ? rbs : ff).put(parsedData, payload);
105
- return;
106
- }
107
- }
108
- catch (e) {
109
- log.warn(constants_1.STREAMING_PARSING_SPLIT_UPDATE, [parsedData.type, e]);
110
- }
111
- }
112
- (parsedData.type === constants_4.RB_SEGMENT_UPDATE ? rbs : ff).put(parsedData);
113
- },
84
+ put: put,
114
85
  /**
115
86
  * Invoked by NotificationProcessor on SPLIT_KILL event
116
87
  *
117
- * @param changeNumber - change number of the notification
88
+ * @param changeNumber - change number of the SPLIT_UPDATE notification
118
89
  * @param splitName - name of split to kill
119
90
  * @param defaultTreatment - default treatment value
120
91
  */
121
92
  killSplit: function (_a) {
122
93
  var changeNumber = _a.changeNumber, splitName = _a.splitName, defaultTreatment = _a.defaultTreatment;
123
- if (storage.splits.killLocally(splitName, defaultTreatment, changeNumber)) {
94
+ if (splitsCache.killLocally(splitName, defaultTreatment, changeNumber)) {
124
95
  // trigger an SDK_UPDATE if Split was killed locally
125
- splitsEventEmitter.emit(constants_2.SDK_SPLITS_ARRIVED, true);
96
+ splitsEventEmitter.emit(constants_1.SDK_SPLITS_ARRIVED, true);
126
97
  }
127
98
  // queues the SplitChanges fetch (only if changeNumber is newer)
128
- ff.put({ changeNumber: changeNumber });
99
+ put({ changeNumber: changeNumber });
129
100
  },
130
101
  stop: function () {
131
- ff.stop();
132
- rbs.stop();
102
+ isHandlingEvent = false;
103
+ backoff.reset();
133
104
  }
134
105
  };
135
106
  }
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ControlType = exports.OCCUPANCY = exports.CONTROL = exports.RB_SEGMENT_UPDATE = exports.SPLIT_UPDATE = exports.SPLIT_KILL = exports.SEGMENT_UPDATE = exports.MEMBERSHIPS_LS_UPDATE = exports.MEMBERSHIPS_MS_UPDATE = exports.PUSH_SUBSYSTEM_DOWN = exports.PUSH_SUBSYSTEM_UP = exports.PUSH_RETRYABLE_ERROR = exports.PUSH_NONRETRYABLE_ERROR = exports.SECONDS_BEFORE_EXPIRATION = void 0;
3
+ exports.ControlType = exports.OCCUPANCY = exports.CONTROL = exports.SPLIT_UPDATE = exports.SPLIT_KILL = exports.SEGMENT_UPDATE = exports.MEMBERSHIPS_LS_UPDATE = exports.MEMBERSHIPS_MS_UPDATE = exports.PUSH_SUBSYSTEM_DOWN = exports.PUSH_SUBSYSTEM_UP = exports.PUSH_RETRYABLE_ERROR = exports.PUSH_NONRETRYABLE_ERROR = exports.SECONDS_BEFORE_EXPIRATION = void 0;
4
4
  // time for refresh token
5
5
  exports.SECONDS_BEFORE_EXPIRATION = 600;
6
6
  // Internal SDK events, subscribed by SyncManager and PushManager
@@ -30,7 +30,6 @@ exports.MEMBERSHIPS_LS_UPDATE = 'MEMBERSHIPS_LS_UPDATE';
30
30
  exports.SEGMENT_UPDATE = 'SEGMENT_UPDATE';
31
31
  exports.SPLIT_KILL = 'SPLIT_KILL';
32
32
  exports.SPLIT_UPDATE = 'SPLIT_UPDATE';
33
- exports.RB_SEGMENT_UPDATE = 'RB_SEGMENT_UPDATE';
34
33
  // Control-type push notifications, handled by NotificationKeeper
35
34
  exports.CONTROL = 'CONTROL';
36
35
  exports.OCCUPANCY = 'OCCUPANCY';
@@ -46,7 +46,7 @@ function pushManagerFactory(params, pollingManager) {
46
46
  // MySegmentsUpdateWorker (client-side) are initiated in `add` method
47
47
  var segmentsUpdateWorker = userKey ? undefined : (0, SegmentsUpdateWorker_1.SegmentsUpdateWorker)(log, pollingManager.segmentsSyncTask, storage.segments);
48
48
  // For server-side we pass the segmentsSyncTask, used by SplitsUpdateWorker to fetch new segments
49
- var splitsUpdateWorker = (0, SplitsUpdateWorker_1.SplitsUpdateWorker)(log, storage, pollingManager.splitsSyncTask, readiness.splits, telemetryTracker, userKey ? undefined : pollingManager.segmentsSyncTask);
49
+ var splitsUpdateWorker = (0, SplitsUpdateWorker_1.SplitsUpdateWorker)(log, storage.splits, pollingManager.splitsSyncTask, readiness.splits, telemetryTracker, userKey ? undefined : pollingManager.segmentsSyncTask);
50
50
  // [Only for client-side] map of hashes to user keys, to dispatch membership update events to the corresponding MySegmentsUpdateWorker
51
51
  var userKeyHashes = {};
52
52
  // [Only for client-side] map of user keys to their corresponding hash64 and MySegmentsUpdateWorkers.
@@ -182,8 +182,21 @@ function pushManagerFactory(params, pollingManager) {
182
182
  });
183
183
  /** Functions related to synchronization (Queues and Workers in the spec) */
184
184
  pushEmitter.on(constants_1.SPLIT_KILL, splitsUpdateWorker.killSplit);
185
- pushEmitter.on(constants_1.SPLIT_UPDATE, splitsUpdateWorker.put);
186
- pushEmitter.on(constants_1.RB_SEGMENT_UPDATE, splitsUpdateWorker.put);
185
+ pushEmitter.on(constants_1.SPLIT_UPDATE, function (parsedData) {
186
+ if (parsedData.d && parsedData.c !== undefined) {
187
+ try {
188
+ var payload = (0, parseUtils_1.parseFFUpdatePayload)(parsedData.c, parsedData.d);
189
+ if (payload) {
190
+ splitsUpdateWorker.put(parsedData, payload);
191
+ return;
192
+ }
193
+ }
194
+ catch (e) {
195
+ log.warn(constants_2.STREAMING_PARSING_SPLIT_UPDATE, [e]);
196
+ }
197
+ }
198
+ splitsUpdateWorker.put(parsedData);
199
+ });
187
200
  function handleMySegmentsUpdate(parsedData) {
188
201
  switch (parsedData.u) {
189
202
  case types_1.UpdateStrategy.BoundedFetchRequest: {
@@ -22,8 +22,9 @@ function fromImpressionsCollector(sendLabels, data) {
22
22
  m: entry.time,
23
23
  c: entry.changeNumber,
24
24
  r: sendLabels ? entry.label : undefined,
25
- b: entry.bucketingKey ? entry.bucketingKey : undefined,
26
- pt: entry.pt ? entry.pt : undefined // Previous time
25
+ b: entry.bucketingKey,
26
+ pt: entry.pt,
27
+ properties: entry.properties // Properties
27
28
  };
28
29
  return keyImpression;
29
30
  })
@@ -6,6 +6,7 @@ var constants_1 = require("./streaming/constants");
6
6
  var constants_2 = require("../logger/constants");
7
7
  var consent_1 = require("../consent");
8
8
  var constants_3 = require("../utils/constants");
9
+ var constants_4 = require("../readiness/constants");
9
10
  /**
10
11
  * Online SyncManager factory.
11
12
  * Can be used for server-side API, and client-side API with or without multiple clients.
@@ -19,7 +20,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
19
20
  * SyncManager factory for modular SDK
20
21
  */
21
22
  return function (params) {
22
- var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker;
23
+ var settings = params.settings, _a = params.settings, log = _a.log, streamingEnabled = _a.streamingEnabled, syncEnabled = _a.sync.enabled, telemetryTracker = params.telemetryTracker, storage = params.storage, readiness = params.readiness;
23
24
  /** Polling Manager */
24
25
  var pollingManager = pollingManagerFactory && pollingManagerFactory(params);
25
26
  /** Push Manager */
@@ -67,6 +68,11 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
67
68
  */
68
69
  start: function () {
69
70
  running = true;
71
+ if (startFirstTime) {
72
+ var isCacheLoaded = storage.validateCache ? storage.validateCache() : false;
73
+ if (isCacheLoaded)
74
+ Promise.resolve().then(function () { readiness.splits.emit(constants_4.SDK_SPLITS_CACHE_LOADED); });
75
+ }
70
76
  // start syncing splits and segments
71
77
  if (pollingManager) {
72
78
  // If synchronization is disabled pushManager and pollingManager should not start
@@ -75,7 +81,6 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
75
81
  // Doesn't call `syncAll` when the syncManager is resuming
76
82
  if (startFirstTime) {
77
83
  pollingManager.syncAll();
78
- startFirstTime = false;
79
84
  }
80
85
  pushManager.start();
81
86
  }
@@ -86,12 +91,12 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
86
91
  else {
87
92
  if (startFirstTime) {
88
93
  pollingManager.syncAll();
89
- startFirstTime = false;
90
94
  }
91
95
  }
92
96
  }
93
97
  // start periodic data recording (events, impressions, telemetry).
94
98
  submitterManager.start(!(0, consent_1.isConsentGranted)(settings));
99
+ startFirstTime = false;
95
100
  },
96
101
  /**
97
102
  * Method used to stop/pause the syncManager.
@@ -125,7 +130,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
125
130
  if (pushManager) {
126
131
  if (pollingManager.isRunning()) {
127
132
  // if doing polling, we must start the periodic fetch of data
128
- if (storage.splits.usesSegments() || storage.rbSegments.usesSegments())
133
+ if (storage.splits.usesSegments())
129
134
  mySegmentsSyncTask.start();
130
135
  }
131
136
  else {
@@ -135,7 +140,7 @@ function syncManagerOnlineFactory(pollingManagerFactory, pushManagerFactory) {
135
140
  }
136
141
  }
137
142
  else {
138
- if (storage.splits.usesSegments() || storage.rbSegments.usesSegments())
143
+ if (storage.splits.usesSegments())
139
144
  mySegmentsSyncTask.start();
140
145
  }
141
146
  }
@@ -10,6 +10,8 @@ exports.strategyDebugFactory = void 0;
10
10
  function strategyDebugFactory(impressionsObserver) {
11
11
  return {
12
12
  process: function (impression) {
13
+ if (impression.properties)
14
+ return true;
13
15
  impression.pt = impressionsObserver.testAndSet(impression);
14
16
  return true;
15
17
  }
@@ -12,6 +12,9 @@ var time_1 = require("../../utils/time");
12
12
  function strategyOptimizedFactory(impressionsObserver, impressionCounts) {
13
13
  return {
14
14
  process: function (impression) {
15
+ // DEBUG mode without previous time, for impressions with properties
16
+ if (impression.properties)
17
+ return true;
15
18
  impression.pt = impressionsObserver.testAndSet(impression);
16
19
  var now = Date.now();
17
20
  // Increments impression counter per featureName
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MEMBERSHIPS = exports.SEGMENT = exports.TOKEN = exports.TELEMETRY = exports.EVENTS = exports.IMPRESSIONS_COUNT = exports.IMPRESSIONS = exports.SPLITS = exports.NONE_ENUM = exports.DEBUG_ENUM = exports.OPTIMIZED_ENUM = exports.CONSUMER_PARTIAL_ENUM = exports.CONSUMER_ENUM = exports.STANDALONE_ENUM = exports.DEDUPED = exports.DROPPED = exports.QUEUED = exports.NAMES_FN_LABEL = exports.SPLITS_FN_LABEL = exports.SPLIT_FN_LABEL = exports.TRACK_FN_LABEL = exports.GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SETS = exports.GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SET = exports.GET_TREATMENTS_BY_FLAG_SETS = exports.GET_TREATMENTS_BY_FLAG_SET = exports.GET_TREATMENTS_WITH_CONFIG = exports.GET_TREATMENT_WITH_CONFIG = exports.GET_TREATMENTS = exports.GET_TREATMENT = exports.CONSENT_UNKNOWN = exports.CONSENT_DECLINED = exports.CONSENT_GRANTED = exports.STORAGE_PLUGGABLE = exports.STORAGE_REDIS = exports.STORAGE_LOCALSTORAGE = exports.STORAGE_MEMORY = exports.CONSUMER_PARTIAL_MODE = exports.CONSUMER_MODE = exports.PRODUCER_MODE = exports.STANDALONE_MODE = exports.LOCALHOST_MODE = exports.NONE = exports.OPTIMIZED = exports.DEBUG = exports.SPLIT_EVENT = exports.SPLIT_IMPRESSION = exports.NA = exports.UNKNOWN = exports.CONTROL_WITH_CONFIG = exports.CONTROL = void 0;
4
- exports.IN_RULE_BASED_SEGMENT = exports.IN_LARGE_SEGMENT = exports.IN_SEGMENT = exports.FLAG_SPEC_VERSION = exports.PAUSED = exports.ENABLED = exports.DISABLED = exports.NON_REQUESTED = exports.REQUESTED = exports.POLLING = exports.STREAMING = exports.AUTH_REJECTION = exports.SYNC_MODE_UPDATE = exports.ABLY_ERROR = exports.TOKEN_REFRESH = exports.SSE_CONNECTION_ERROR = exports.STREAMING_STATUS = exports.OCCUPANCY_SEC = exports.OCCUPANCY_PRI = exports.CONNECTION_ESTABLISHED = exports.TRACK = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSETS = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSET = exports.TREATMENTS_BY_FLAGSETS = exports.TREATMENTS_BY_FLAGSET = exports.TREATMENTS_WITH_CONFIG = exports.TREATMENT_WITH_CONFIG = exports.TREATMENTS = exports.TREATMENT = void 0;
4
+ exports.IN_LARGE_SEGMENT = exports.IN_SEGMENT = exports.FLAG_SPEC_VERSION = exports.PAUSED = exports.ENABLED = exports.DISABLED = exports.NON_REQUESTED = exports.REQUESTED = exports.POLLING = exports.STREAMING = exports.AUTH_REJECTION = exports.SYNC_MODE_UPDATE = exports.ABLY_ERROR = exports.TOKEN_REFRESH = exports.SSE_CONNECTION_ERROR = exports.STREAMING_STATUS = exports.OCCUPANCY_SEC = exports.OCCUPANCY_PRI = exports.CONNECTION_ESTABLISHED = exports.TRACK = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSETS = exports.TREATMENTS_WITH_CONFIG_BY_FLAGSET = exports.TREATMENTS_BY_FLAGSETS = exports.TREATMENTS_BY_FLAGSET = exports.TREATMENTS_WITH_CONFIG = exports.TREATMENT_WITH_CONFIG = exports.TREATMENTS = exports.TREATMENT = void 0;
5
5
  // Special treatments
6
6
  exports.CONTROL = 'control';
7
7
  exports.CONTROL_WITH_CONFIG = {
@@ -90,8 +90,7 @@ exports.NON_REQUESTED = 1;
90
90
  exports.DISABLED = 0;
91
91
  exports.ENABLED = 1;
92
92
  exports.PAUSED = 2;
93
- exports.FLAG_SPEC_VERSION = '1.3';
93
+ exports.FLAG_SPEC_VERSION = '1.2';
94
94
  // Matcher types
95
95
  exports.IN_SEGMENT = 'IN_SEGMENT';
96
96
  exports.IN_LARGE_SEGMENT = 'IN_LARGE_SEGMENT';
97
- exports.IN_RULE_BASED_SEGMENT = 'IN_RULE_BASED_SEGMENT';
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.validateEventProperties = void 0;
3
+ exports.validateEvaluationOptions = exports.validateEventProperties = void 0;
4
4
  var lang_1 = require("../lang");
5
5
  var objectAssign_1 = require("../lang/objectAssign");
6
6
  var constants_1 = require("../../logger/constants");
@@ -61,3 +61,14 @@ function validateEventProperties(log, maybeProperties, method) {
61
61
  return output;
62
62
  }
63
63
  exports.validateEventProperties = validateEventProperties;
64
+ function validateEvaluationOptions(log, maybeOptions, method) {
65
+ if ((0, lang_1.isObject)(maybeOptions)) {
66
+ var properties = validateEventProperties(log, maybeOptions.properties, method).properties;
67
+ return properties && Object.keys(properties).length > 0 ? { properties: properties } : undefined;
68
+ }
69
+ else if (maybeOptions) {
70
+ log.error(constants_1.ERROR_NOT_PLAIN_OBJECT, [method, 'evaluation options']);
71
+ }
72
+ return undefined;
73
+ }
74
+ exports.validateEvaluationOptions = validateEvaluationOptions;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.validatePreloadedData = exports.validateTrafficTypeExistence = exports.validateSplitExistence = exports.validateIfOperational = exports.validateIfNotDestroyed = exports.validateTrafficType = exports.validateSplits = exports.validateSplit = exports.validateKey = exports.validateEventProperties = exports.validateEventValue = exports.validateEvent = exports.validateAttributes = exports.releaseApiKey = exports.validateAndTrackApiKey = exports.validateApiKey = void 0;
3
+ exports.validateEvaluationOptions = exports.validatePreloadedData = exports.validateTrafficTypeExistence = exports.validateSplitExistence = exports.validateIfOperational = exports.validateIfNotDestroyed = exports.validateTrafficType = exports.validateSplits = exports.validateSplit = exports.validateKey = exports.validateEventProperties = exports.validateEventValue = exports.validateEvent = exports.validateAttributes = exports.releaseApiKey = exports.validateAndTrackApiKey = exports.validateApiKey = void 0;
4
4
  var apiKey_1 = require("./apiKey");
5
5
  Object.defineProperty(exports, "validateApiKey", { enumerable: true, get: function () { return apiKey_1.validateApiKey; } });
6
6
  Object.defineProperty(exports, "validateAndTrackApiKey", { enumerable: true, get: function () { return apiKey_1.validateAndTrackApiKey; } });
@@ -30,3 +30,5 @@ var trafficTypeExistence_1 = require("./trafficTypeExistence");
30
30
  Object.defineProperty(exports, "validateTrafficTypeExistence", { enumerable: true, get: function () { return trafficTypeExistence_1.validateTrafficTypeExistence; } });
31
31
  var preloadedData_1 = require("./preloadedData");
32
32
  Object.defineProperty(exports, "validatePreloadedData", { enumerable: true, get: function () { return preloadedData_1.validatePreloadedData; } });
33
+ var eventProperties_2 = require("./eventProperties");
34
+ Object.defineProperty(exports, "validateEvaluationOptions", { enumerable: true, get: function () { return eventProperties_2.validateEvaluationOptions; } });
@@ -6,7 +6,7 @@ var constants_1 = require("../../../logger/constants");
6
6
  var constants_2 = require("../../../utils/constants");
7
7
  function __InLocalStorageMockFactory(params) {
8
8
  var result = (0, InMemoryStorageCS_1.InMemoryStorageCSFactory)(params);
9
- result.splits.checkCache = function () { return true; }; // to emit SDK_READY_FROM_CACHE
9
+ result.validateCache = function () { return true; }; // to emit SDK_READY_FROM_CACHE
10
10
  return result;
11
11
  }
12
12
  exports.__InLocalStorageMockFactory = __InLocalStorageMockFactory;
@@ -8,8 +8,12 @@ export function andCombinerContext(log, matchers) {
8
8
  log.debug(ENGINE_COMBINER_AND, [hasMatchedAll]);
9
9
  return hasMatchedAll;
10
10
  }
11
- return function andCombiner(key, attributes, splitEvaluator) {
12
- var matcherResults = matchers.map(function (matcher) { return matcher(key, attributes, splitEvaluator); });
11
+ return function andCombiner() {
12
+ var params = [];
13
+ for (var _i = 0; _i < arguments.length; _i++) {
14
+ params[_i] = arguments[_i];
15
+ }
16
+ var matcherResults = matchers.map(function (matcher) { return matcher.apply(void 0, params); });
13
17
  // If any matching result is a thenable we should use Promise.all
14
18
  if (findIndex(matcherResults, thenable) !== -1) {
15
19
  return Promise.all(matcherResults).then(andResults);