@stigg/node-server-sdk 4.10.0 → 4.12.0

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 (95) hide show
  1. package/dist/api/entitlements/entitlementsApi.d.ts +3 -4
  2. package/dist/api/entitlements/entitlementsApi.js +3 -8
  3. package/dist/client.d.ts +11 -1
  4. package/dist/client.js +26 -4
  5. package/dist/clientInitialization.js +8 -7
  6. package/dist/configuration.d.ts +2 -21
  7. package/dist/configuration.js +1 -1
  8. package/dist/models.d.ts +30 -6
  9. package/dist/models.js +12 -2
  10. package/dist/services/ApiCacheMapper.d.ts +15 -0
  11. package/dist/services/ApiCacheMapper.js +96 -0
  12. package/dist/services/EdgeApiClient.d.ts +1 -2
  13. package/dist/services/EdgeApiClient.js +1 -7
  14. package/dist/services/LegacyEventPayloadMapper.d.ts +15 -0
  15. package/dist/services/LegacyEventPayloadMapper.js +102 -0
  16. package/dist/services/cache/CacheMapper.d.ts +16 -0
  17. package/dist/services/cache/CacheMapper.js +3 -0
  18. package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.d.ts +3 -3
  19. package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.js +4 -3
  20. package/dist/services/cache/accessDeniedReasonMapper.d.ts +3 -0
  21. package/dist/services/cache/accessDeniedReasonMapper.js +16 -0
  22. package/dist/services/cache/cacheKeysHelpers.d.ts +9 -0
  23. package/dist/services/cache/cacheKeysHelpers.js +55 -0
  24. package/dist/services/cache/cacheService.d.ts +10 -28
  25. package/dist/services/cache/entities/cachedEntitlement.d.ts +20 -0
  26. package/dist/services/cache/entities/cachedEntitlement.js +53 -0
  27. package/dist/services/cache/entities/calculatedEntitlement.d.ts +34 -0
  28. package/dist/services/cache/entities/calculatedEntitlement.js +3 -0
  29. package/dist/services/cache/entities/entitlementQuery.d.ts +8 -0
  30. package/dist/services/cache/entities/entitlementQuery.js +3 -0
  31. package/dist/services/cache/entities/entitlementsMap.d.ts +33 -0
  32. package/dist/services/cache/entities/entitlementsMap.js +92 -0
  33. package/dist/services/cache/entities/index.d.ts +6 -0
  34. package/dist/services/cache/entities/index.js +12 -0
  35. package/dist/services/cache/entities/usageData.d.ts +11 -0
  36. package/dist/services/cache/entities/usageData.js +9 -0
  37. package/dist/services/cache/extractWithDependencies.d.ts +12 -0
  38. package/dist/services/cache/extractWithDependencies.js +37 -0
  39. package/dist/services/cache/freshness/EntitlementsFreshener.d.ts +11 -0
  40. package/dist/services/cache/freshness/EntitlementsFreshener.js +27 -0
  41. package/dist/services/cache/freshness/transformers/CreditAccessPropagator.d.ts +15 -0
  42. package/dist/services/cache/freshness/transformers/CreditAccessPropagator.js +67 -0
  43. package/dist/services/cache/freshness/transformers/UsagePeriodReset.d.ts +11 -0
  44. package/dist/services/cache/freshness/transformers/UsagePeriodReset.js +45 -0
  45. package/dist/services/cache/inMemoryCacheService.d.ts +19 -14
  46. package/dist/services/cache/inMemoryCacheService.js +44 -69
  47. package/dist/services/cache/index.d.ts +13 -0
  48. package/dist/services/cache/index.js +38 -0
  49. package/dist/services/cache/redis/distributedLocks.d.ts +4 -3
  50. package/dist/services/cache/redis/distributedLocks.js +5 -4
  51. package/dist/services/cache/redisCacheService.constants.d.ts +1 -1
  52. package/dist/services/cache/redisCacheService.constants.js +3 -3
  53. package/dist/services/cache/redisCacheService.d.ts +54 -17
  54. package/dist/services/cache/redisCacheService.js +293 -159
  55. package/dist/services/cache/types/cacheInstrumentation.d.ts +37 -0
  56. package/dist/services/cache/types/cacheInstrumentation.js +3 -0
  57. package/dist/services/cache/types/cacheResponse.d.ts +26 -0
  58. package/dist/services/cache/types/cacheResponse.js +19 -0
  59. package/dist/services/cache/types/cacheServiceParams.d.ts +20 -0
  60. package/dist/services/cache/types/cacheServiceParams.js +3 -0
  61. package/dist/services/cache/types/entitlementFeature.d.ts +19 -0
  62. package/dist/services/cache/types/entitlementFeature.js +3 -0
  63. package/dist/services/cache/types/entitlementsMapTransformer.d.ts +4 -0
  64. package/dist/services/cache/types/entitlementsMapTransformer.js +3 -0
  65. package/dist/services/cache/types/logger.d.ts +6 -0
  66. package/dist/services/cache/types/logger.js +3 -0
  67. package/dist/services/cache/types/redisConfiguration.d.ts +39 -0
  68. package/dist/services/cache/types/redisConfiguration.js +14 -0
  69. package/dist/services/entitlementDecisionService.d.ts +14 -2
  70. package/dist/services/entitlementDecisionService.js +41 -14
  71. package/dist/services/entitlementsService.d.ts +26 -23
  72. package/dist/services/entitlementsService.js +126 -110
  73. package/dist/services/entitlementsService.utils.d.ts +1 -28
  74. package/dist/services/entitlementsService.utils.js +1 -17
  75. package/dist/services/eventEmitter.d.ts +1 -1
  76. package/dist/services/eventEmitterCacheInstrumentation.d.ts +9 -0
  77. package/dist/services/eventEmitterCacheInstrumentation.js +19 -0
  78. package/dist/services/inMemoryEntitlementsService.d.ts +5 -6
  79. package/dist/services/inMemoryEntitlementsService.js +52 -59
  80. package/dist/services/redisEntitlementsService.d.ts +5 -4
  81. package/dist/services/redisEntitlementsService.js +2 -2
  82. package/dist/types.d.ts +2 -0
  83. package/dist/utils/ModelMapper.d.ts +8 -7
  84. package/dist/utils/ModelMapper.js +17 -3
  85. package/dist/{services/cache → utils}/calculateUsagePeriod.js +1 -1
  86. package/package.json +18 -1
  87. package/dist/services/cache/cachedEntitlement.d.ts +0 -29
  88. package/dist/services/cache/cachedEntitlement.js +0 -10
  89. package/dist/services/cacheInstrumentation.d.ts +0 -18
  90. package/dist/services/cacheInstrumentation.js +0 -19
  91. package/dist/utils/CacheMapper.d.ts +0 -6
  92. package/dist/utils/CacheMapper.js +0 -57
  93. package/dist/utils/cacheKeysHelpers.d.ts +0 -7
  94. package/dist/utils/cacheKeysHelpers.js +0 -42
  95. /package/dist/{services/cache → utils}/calculateUsagePeriod.d.ts +0 -0
@@ -14,24 +14,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.EntitlementsService = exports.accessDeniedReasonMap = void 0;
17
+ exports.EntitlementsService = void 0;
18
18
  const entitlementsApi_1 = __importDefault(require("../api/entitlements/entitlementsApi"));
19
- const models_1 = require("../models");
20
19
  const ModelMapper_1 = require("../utils/ModelMapper");
21
20
  const entitlementDecisionService_1 = require("./entitlementDecisionService");
21
+ const cache_1 = require("./cache");
22
22
  const lodash_1 = require("lodash");
23
23
  const dateUtils_1 = require("../utils/dateUtils");
24
- const sdk_1 = require("@stigg/api-client-js/src/generated/sdk");
25
- const CacheMapper_1 = __importDefault(require("../utils/CacheMapper"));
26
- const entitlementsService_utils_1 = require("./entitlementsService.utils");
24
+ const cache_2 = require("./cache");
27
25
  const featureTypes_1 = require("../utils/featureTypes");
28
- const cachedEntitlement_1 = __importDefault(require("./cache/cachedEntitlement"));
29
- const calculateUsagePeriod_1 = require("./cache/calculateUsagePeriod");
30
- exports.accessDeniedReasonMap = {
31
- [sdk_1.EntitlementsStateAccessDeniedReason.CustomerNotFound]: sdk_1.AccessDeniedReason.CustomerNotFound,
32
- [sdk_1.EntitlementsStateAccessDeniedReason.NoActiveSubscription]: sdk_1.AccessDeniedReason.NoActiveSubscription,
33
- [sdk_1.EntitlementsStateAccessDeniedReason.CustomerIsArchived]: sdk_1.AccessDeniedReason.CustomerIsArchived,
34
- };
35
26
  class EntitlementsService {
36
27
  constructor(client, loggerService, edgeApiClient, cacheService, entitlementsTimeout) {
37
28
  this.loggerService = loggerService;
@@ -39,18 +30,21 @@ class EntitlementsService {
39
30
  this.entitlementsTimeout = entitlementsTimeout;
40
31
  this.isInitialized = false;
41
32
  this.modelMapper = new ModelMapper_1.ModelMapper();
42
- this.cacheMapper = new CacheMapper_1.default();
43
33
  this.entitlementsApi = new entitlementsApi_1.default(client, edgeApiClient, loggerService);
44
34
  }
45
- async getBooleanEntitlement(customerRefId, featureRefId, fallbackEntitlement, resourceId, options) {
46
- const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, 'getBooleanEntitlement');
47
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, entitlement);
35
+ async getBooleanEntitlement(customerId, featureRefId, fallbackEntitlement, resourceId, options) {
36
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Feature, id: featureRefId }, customerId, resourceId, 'getBooleanEntitlement');
37
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
38
+ entitlementType: cache_1.EntitlementType.Feature,
39
+ accessDeniedReason,
40
+ entitlement,
41
+ });
48
42
  if (entitlement && !(0, featureTypes_1.isBoolean)(entitlement.calculatedEntitlement.feature)) {
49
- return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: sdk_1.AccessDeniedReason.FeatureTypeMismatch });
43
+ return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: cache_1.AccessDeniedReason.FeatureTypeMismatch });
50
44
  }
51
45
  if (!entitlement) {
52
46
  this.loggerService.log(`No entitlement for boolean feature found`, {
53
- customerRefId,
47
+ customerId,
54
48
  resourceId,
55
49
  featureRefId,
56
50
  accessDeniedReason: decision.accessDeniedReason,
@@ -59,15 +53,19 @@ class EntitlementsService {
59
53
  }
60
54
  return this.modelMapper.mapBooleanEntitlement(entitlement, decision);
61
55
  }
62
- async getNumericEntitlement(customerRefId, featureRefId, fallbackEntitlement, resourceId, options) {
63
- const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, 'getNumericEntitlement');
64
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, entitlement);
56
+ async getNumericEntitlement(customerId, featureRefId, fallbackEntitlement, resourceId, options) {
57
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Feature, id: featureRefId }, customerId, resourceId, 'getNumericEntitlement');
58
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
59
+ entitlementType: cache_1.EntitlementType.Feature,
60
+ accessDeniedReason,
61
+ entitlement,
62
+ });
65
63
  if (entitlement && !(0, featureTypes_1.isNumeric)(entitlement.calculatedEntitlement.feature)) {
66
- return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: sdk_1.AccessDeniedReason.FeatureTypeMismatch });
64
+ return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: cache_1.AccessDeniedReason.FeatureTypeMismatch });
67
65
  }
68
66
  if (!entitlement) {
69
67
  this.loggerService.log(`No entitlement for numeric feature found`, {
70
- customerRefId,
68
+ customerId,
71
69
  resourceId,
72
70
  featureRefId,
73
71
  accessDeniedReason: decision.accessDeniedReason,
@@ -76,17 +74,21 @@ class EntitlementsService {
76
74
  }
77
75
  return this.modelMapper.mapNumericEntitlement(entitlement, decision);
78
76
  }
79
- async getMeteredEntitlement(customerRefId, featureRefId, fallbackEntitlement, resourceId, options) {
77
+ async getMeteredEntitlement(customerId, featureRefId, fallbackEntitlement, resourceId, options) {
80
78
  const requestUsage = options === null || options === void 0 ? void 0 : options.requestedUsage;
81
- const { entitlement: originalEntitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, 'getMeteredEntitlement');
82
- const entitlement = this.handleUsagePeriodOver(originalEntitlement);
83
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, entitlement, requestUsage);
79
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Feature, id: featureRefId }, customerId, resourceId, 'getMeteredEntitlement');
80
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
81
+ entitlementType: cache_1.EntitlementType.Feature,
82
+ accessDeniedReason,
83
+ entitlement,
84
+ requestedUsage: requestUsage,
85
+ });
84
86
  if (entitlement && !(0, featureTypes_1.isMetered)(entitlement.calculatedEntitlement.feature)) {
85
- return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: sdk_1.AccessDeniedReason.FeatureTypeMismatch });
87
+ return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: cache_1.AccessDeniedReason.FeatureTypeMismatch });
86
88
  }
87
89
  if (!entitlement) {
88
90
  this.loggerService.log(`No entitlement for metered feature found`, {
89
- customerRefId,
91
+ customerId,
90
92
  resourceId,
91
93
  featureRefId,
92
94
  accessDeniedReason: decision.accessDeniedReason,
@@ -95,16 +97,21 @@ class EntitlementsService {
95
97
  }
96
98
  return this.modelMapper.mapMeteredEntitlement(entitlement, decision, requestUsage);
97
99
  }
98
- async getEnumEntitlement(customerRefId, featureRefId, fallbackEntitlement, resourceId, options) {
100
+ async getEnumEntitlement(customerId, featureRefId, fallbackEntitlement, resourceId, options) {
99
101
  const requestedValues = options === null || options === void 0 ? void 0 : options.requestedValues;
100
- const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, 'getEnumEntitlement');
101
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, entitlement, 0, requestedValues);
102
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Feature, id: featureRefId }, customerId, resourceId, 'getEnumEntitlement');
103
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
104
+ entitlementType: cache_1.EntitlementType.Feature,
105
+ accessDeniedReason,
106
+ entitlement,
107
+ requestedValues,
108
+ });
102
109
  if (entitlement && !(0, featureTypes_1.isEnum)(entitlement.calculatedEntitlement.feature)) {
103
- return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: sdk_1.AccessDeniedReason.FeatureTypeMismatch });
110
+ return Object.assign(Object.assign({}, fallbackEntitlement), { accessDeniedReason: cache_1.AccessDeniedReason.FeatureTypeMismatch });
104
111
  }
105
112
  if (!entitlement) {
106
113
  this.loggerService.log(`No entitlement for enum feature found`, {
107
- customerRefId,
114
+ customerId,
108
115
  resourceId,
109
116
  featureRefId,
110
117
  accessDeniedReason: decision.accessDeniedReason,
@@ -113,12 +120,44 @@ class EntitlementsService {
113
120
  }
114
121
  return this.modelMapper.mapEnumEntitlement(entitlement, decision, requestedValues);
115
122
  }
116
- async getEntitlement(customerRefId, featureRefId, fallbackEntitlement, resourceId, requestedUsage, requestedValues) {
117
- const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, 'getEntitlement');
118
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, entitlement, requestedUsage || 0, requestedValues);
123
+ async getCreditEntitlement(customerId, currencyId, resourceId) {
124
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Credit, id: currencyId }, customerId, resourceId, 'getCreditEntitlement');
125
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
126
+ entitlementType: cache_1.EntitlementType.Credit,
127
+ accessDeniedReason,
128
+ entitlement,
129
+ });
130
+ if (!entitlement) {
131
+ this.loggerService.log(`No entitlement for credit currency found`, {
132
+ customerId,
133
+ resourceId,
134
+ currencyId,
135
+ accessDeniedReason: decision.accessDeniedReason,
136
+ });
137
+ return {
138
+ hasAccess: false,
139
+ isFallback: false,
140
+ accessDeniedReason: decision.accessDeniedReason,
141
+ currency: { currencyId },
142
+ usageLimit: 0,
143
+ currentUsage: 0,
144
+ remaining: 0,
145
+ };
146
+ }
147
+ return this.modelMapper.mapCreditEntitlement(entitlement, decision);
148
+ }
149
+ async getEntitlement(customerId, featureRefId, fallbackEntitlement, resourceId, requestedUsage, requestedValues) {
150
+ const { entitlement, accessDeniedReason } = await this.getCustomerAndEntitlementFromCacheOrRefetch({ type: cache_1.EntitlementType.Feature, id: featureRefId }, customerId, resourceId, 'getEntitlement');
151
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
152
+ entitlementType: cache_1.EntitlementType.Feature,
153
+ accessDeniedReason,
154
+ entitlement,
155
+ requestedUsage,
156
+ requestedValues,
157
+ });
119
158
  if (!entitlement) {
120
159
  this.loggerService.log(`No entitlement for feature found`, {
121
- customerRefId,
160
+ customerId,
122
161
  resourceId,
123
162
  featureRefId,
124
163
  accessDeniedReason: decision.accessDeniedReason,
@@ -129,49 +168,30 @@ class EntitlementsService {
129
168
  }
130
169
  return this.modelMapper.mapEntitlement(entitlement, decision, requestedUsage, requestedValues);
131
170
  }
132
- handleUsagePeriodOver(entitlement) {
133
- const now = new Date();
134
- const wasPeriodOver = entitlement &&
135
- (0, featureTypes_1.isMetered)(entitlement.calculatedEntitlement.feature) &&
136
- entitlement.featureUsage.usagePeriodEnd &&
137
- entitlement.featureUsage.usagePeriodEnd < now.getTime();
138
- if (!wasPeriodOver) {
139
- return entitlement;
140
- }
141
- const { calculatedEntitlement, featureUsage } = entitlement;
142
- const { resetPeriod, usagePeriodAnchor } = featureUsage;
143
- let usagePeriodStart;
144
- let usagePeriodEnd;
145
- // Calculate new usage period
146
- if (usagePeriodAnchor && resetPeriod) {
147
- ({ usagePeriodStart, usagePeriodEnd } = (0, calculateUsagePeriod_1.calculateUsagePeriod)(new Date(usagePeriodAnchor), now, resetPeriod));
148
- }
149
- return new cachedEntitlement_1.default(calculatedEntitlement, Object.assign(Object.assign({}, featureUsage), { currentUsage: 0, usagePeriodStart: usagePeriodStart === null || usagePeriodStart === void 0 ? void 0 : usagePeriodStart.getTime(), usagePeriodEnd: usagePeriodEnd === null || usagePeriodEnd === void 0 ? void 0 : usagePeriodEnd.getTime() }));
150
- }
151
- async getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, triggeredBy) {
152
- var _a;
153
- const result = await this.cacheService.getCustomerEntitlement(featureRefId, customerRefId, resourceId);
171
+ async getCustomerAndEntitlementFromCacheOrRefetch(query, customerId, resourceId, triggeredBy) {
172
+ var _a, _b;
173
+ const result = await this.cacheService.getCustomerEntitlement({ query, customerId, resourceId });
154
174
  let { entitlement, accessDeniedReason } = result;
155
175
  const shouldRefetch = result.cacheMiss || !this.isInitialized || this.isEntitlementExpired(entitlement);
156
176
  if (shouldRefetch) {
157
177
  const postMissResult = await this.refetchEntitlementsAfterCacheMiss({
158
- customerId: customerRefId,
178
+ customerId,
159
179
  resourceId,
160
180
  refetchGlobalCustomer: result.globalCustomerMissing,
161
181
  triggeredBy,
162
182
  });
163
- entitlement = ((_a = postMissResult.entitlements) === null || _a === void 0 ? void 0 : _a.get(featureRefId)) || null;
183
+ entitlement = (_b = (_a = postMissResult.entitlements) === null || _a === void 0 ? void 0 : _a.get(query)) !== null && _b !== void 0 ? _b : null;
164
184
  accessDeniedReason = postMissResult.accessDeniedReason;
165
185
  }
166
186
  return { entitlement, accessDeniedReason };
167
187
  }
168
- async getCustomerEntitlements(customerRefId, resourceId) {
169
- const result = await this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
188
+ async getCustomerEntitlements(customerId, resourceId) {
189
+ const result = await this.cacheService.getCustomerEntitlements({ customerId, resourceId });
170
190
  let { entitlements, accessDeniedReason } = result;
171
191
  const shouldRefetch = result.cacheMiss || !this.isInitialized || this.areEntitlementsExpired(entitlements);
172
192
  if (shouldRefetch) {
173
193
  ({ entitlements, accessDeniedReason } = await this.refetchEntitlementsAfterCacheMiss({
174
- customerId: customerRefId,
194
+ customerId,
175
195
  resourceId,
176
196
  refetchGlobalCustomer: result.globalCustomerMissing,
177
197
  triggeredBy: 'getCustomerEntitlements',
@@ -180,9 +200,15 @@ class EntitlementsService {
180
200
  if (!entitlements) {
181
201
  return { entitlements: [], accessDeniedReason: accessDeniedReason !== null && accessDeniedReason !== void 0 ? accessDeniedReason : null };
182
202
  }
203
+ // Filter to feature entitlements only - credit entitlement mapping is out of scope for now
204
+ const featureEntitlements = entitlements.values().filter(cache_1.isFeatureEntitlement);
183
205
  return {
184
- entitlements: Array.from(entitlements.values()).map((value) => {
185
- const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(accessDeniedReason, value);
206
+ entitlements: featureEntitlements.map((value) => {
207
+ const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy({
208
+ entitlementType: cache_1.EntitlementType.Feature,
209
+ accessDeniedReason,
210
+ entitlement: value,
211
+ });
186
212
  return this.modelMapper.mapEntitlement(value, decision);
187
213
  }),
188
214
  accessDeniedReason: accessDeniedReason !== null && accessDeniedReason !== void 0 ? accessDeniedReason : null,
@@ -229,18 +255,15 @@ class EntitlementsService {
229
255
  triggeredBy,
230
256
  });
231
257
  const entitlementsResult = await this.entitlementsApi.getEntitlementsState(customerId, resourceId, skipEdge, this.entitlementsTimeout);
232
- const { entitlements, accessDeniedReason } = entitlementsResult.data.entitlementsState;
233
- let localAccessDeniedReason = null;
234
- if (accessDeniedReason) {
235
- localAccessDeniedReason = exports.accessDeniedReasonMap[accessDeniedReason];
236
- }
258
+ const { entitlementsV2: entitlements, accessDeniedReason } = entitlementsResult.data.entitlementsState;
259
+ const localAccessDeniedReason = (0, cache_1.mapAccessDeniedReason)(accessDeniedReason);
237
260
  const updatedEntitlements = await this.setEntitlements({
238
- entitlements: entitlements,
239
- accessDeniedReason: localAccessDeniedReason,
261
+ entitlements,
262
+ accessDeniedReason,
240
263
  customerId,
241
264
  resourceId,
242
265
  });
243
- return entitlementsService_utils_1.entitlementsResponseMapper.cacheHit(updatedEntitlements, localAccessDeniedReason);
266
+ return cache_2.entitlementsResponseMapper.cacheHit(updatedEntitlements, localAccessDeniedReason);
244
267
  }
245
268
  async setEntitlementsIfExists(options) {
246
269
  const { entitlements } = options, rest = __rest(options, ["entitlements"]);
@@ -251,31 +274,23 @@ class EntitlementsService {
251
274
  }
252
275
  async setEntitlements(params) {
253
276
  const { entitlements, accessDeniedReason, customerId, resourceId } = params;
254
- const entitlementsUpdatedAtTimestamp = this.getEntitlementsUpdatedAtTimestamp(params);
255
- const featureIdToUsageTimestamp = new Map(entitlements
256
- .filter((entitlement) => {
257
- var _a, _b;
258
- return ((_a = entitlement === null || entitlement === void 0 ? void 0 : entitlement.feature) === null || _a === void 0 ? void 0 : _a.meterType) &&
259
- ((_b = entitlement === null || entitlement === void 0 ? void 0 : entitlement.feature) === null || _b === void 0 ? void 0 : _b.meterType) !== models_1.MeterType.None &&
260
- (entitlement === null || entitlement === void 0 ? void 0 : entitlement.feature.refId) &&
261
- entitlement.usageUpdatedAt &&
262
- (0, dateUtils_1.isValidDate)(entitlement.usageUpdatedAt);
263
- })
264
- .map((entitlement) => { var _a; return [((_a = entitlement.feature) === null || _a === void 0 ? void 0 : _a.refId) || '', new Date(entitlement.usageUpdatedAt).getTime()]; }));
265
- const cachedEntitlements = this.cacheMapper.mapCachedEntitlements(entitlements);
266
- // optimistically update the cache
267
- try {
268
- await this.cacheService.setCustomer(customerId, cachedEntitlements, accessDeniedReason, resourceId, entitlementsUpdatedAtTimestamp.getTime(), featureIdToUsageTimestamp);
269
- }
270
- catch (err) {
271
- this.loggerService.error('Failed to set customer entitlements in cache (soft ignored)', err);
272
- }
273
- return cachedEntitlements;
277
+ const entitlementsUpdatedAtTimestamp = this.getEntitlementsUpdatedAtTimestamp({
278
+ entitlements,
279
+ customerId,
280
+ resourceId,
281
+ });
282
+ return this.cacheService.setCustomer({
283
+ customerId,
284
+ resourceId,
285
+ entitlements,
286
+ accessDeniedReason,
287
+ entitlementsTimestamp: entitlementsUpdatedAtTimestamp.getTime(),
288
+ });
274
289
  }
275
290
  getEntitlementsUpdatedAtTimestamp({ entitlements, customerId, resourceId, }) {
276
291
  if ((0, lodash_1.isEmpty)(entitlements)) {
277
292
  // empty entitlements means we don't have a timestamp
278
- return entitlementsService_utils_1.DATE_IN_FAR_PAST;
293
+ return cache_2.DATE_IN_FAR_PAST;
279
294
  }
280
295
  const entitlementsUpdatedAt = entitlements
281
296
  .map(({ entitlementUpdatedAt }) => entitlementUpdatedAt)
@@ -290,22 +305,23 @@ class EntitlementsService {
290
305
  return new Date(entitlementsUpdatedAt);
291
306
  }
292
307
  async updateFeatureUsage({ featureId, customerId, resourceId, currentUsage, usagePeriodStart, usagePeriodEnd, timestamp, }) {
293
- var _a, _b;
308
+ var _a, _b, _c, _d, _e;
294
309
  if ((0, lodash_1.isNil)(currentUsage)) {
295
310
  return;
296
311
  }
297
- const response = await this.cacheService.getCustomerEntitlement(featureId, customerId, resourceId || undefined);
298
- if (response.cacheMiss) {
299
- return;
300
- }
301
- await this.cacheService.updateFeatureUsage({
302
- featureId,
312
+ await this.cacheService.updateUsage({
303
313
  customerId,
304
- resourceId: resourceId || undefined,
305
- currentUsage,
306
- timestamp: new Date(timestamp),
307
- usagePeriodStart: (_a = (0, dateUtils_1.mapDate)(usagePeriodStart)) === null || _a === void 0 ? void 0 : _a.getTime(),
308
- usagePeriodEnd: (_b = (0, dateUtils_1.mapDate)(usagePeriodEnd)) === null || _b === void 0 ? void 0 : _b.getTime(),
314
+ resourceId,
315
+ entitlementReference: {
316
+ type: cache_1.EntitlementType.Feature,
317
+ id: featureId,
318
+ },
319
+ usageTimestamp: (_a = (0, dateUtils_1.mapDate)(timestamp)) !== null && _a !== void 0 ? _a : new Date(),
320
+ usage: {
321
+ currentUsage,
322
+ usagePeriodStart: (_c = (_b = (0, dateUtils_1.mapDate)(usagePeriodStart)) === null || _b === void 0 ? void 0 : _b.getTime()) !== null && _c !== void 0 ? _c : null,
323
+ usagePeriodEnd: (_e = (_d = (0, dateUtils_1.mapDate)(usagePeriodEnd)) === null || _d === void 0 ? void 0 : _d.getTime()) !== null && _e !== void 0 ? _e : null,
324
+ },
309
325
  });
310
326
  }
311
327
  async waitForInitialization() {
@@ -322,8 +338,8 @@ class EntitlementsService {
322
338
  if (!entitlements) {
323
339
  return false;
324
340
  }
325
- return Array.from(entitlements.values()).some((entitlement) => this.isEntitlementExpired(entitlement));
341
+ return entitlements.values().some((entitlement) => this.isEntitlementExpired(entitlement));
326
342
  }
327
343
  }
328
344
  exports.EntitlementsService = EntitlementsService;
329
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}
345
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}
@@ -1,32 +1,5 @@
1
- import CachedEntitlement from './cache/cachedEntitlement';
2
- import { AccessDeniedReason } from '../models';
3
- export type GetEntitlementsOperations = 'getBooleanEntitlement' | 'getNumericEntitlement' | 'getMeteredEntitlement' | 'getEnumEntitlement' | 'getEntitlement' | 'getCustomerEntitlements';
1
+ export type GetEntitlementsOperations = 'getBooleanEntitlement' | 'getNumericEntitlement' | 'getMeteredEntitlement' | 'getEnumEntitlement' | 'getCreditEntitlement' | 'getEntitlement' | 'getCustomerEntitlements';
4
2
  export type RefetchEntitlementsTriggeredBy = GetEntitlementsOperations | 'updateSubscription' | 'cancelSubscription' | 'createSubscription' | 'reloadEntitlements';
5
- export declare const DATE_IN_FAR_PAST: Date;
6
- export type EntitlementsMap = Map<string, CachedEntitlement>;
7
- export type EntitlementsResponseCacheHit = {
8
- cacheMiss: false;
9
- entitlements: EntitlementsMap;
10
- accessDeniedReason: AccessDeniedReason | null;
11
- globalCustomerMissing: false;
12
- };
13
- export type EntitlementsResponseCacheMiss = {
14
- cacheMiss: true;
15
- entitlements: null;
16
- accessDeniedReason: undefined;
17
- globalCustomerMissing: boolean;
18
- };
19
- export type EntitlementsResponse = EntitlementsResponseCacheHit | EntitlementsResponseCacheMiss;
20
- export type EntitlementResponse = {
21
- cacheMiss: boolean;
22
- accessDeniedReason?: AccessDeniedReason | null;
23
- entitlement: CachedEntitlement | null;
24
- globalCustomerMissing: boolean;
25
- };
26
- export declare const entitlementsResponseMapper: {
27
- cacheHit: (entitlements: EntitlementsMap, accessDeniedReason: AccessDeniedReason | null) => EntitlementsResponseCacheHit;
28
- cacheMiss: (globalCustomerMissing?: boolean) => EntitlementsResponseCacheMiss;
29
- };
30
3
  export type RefetchEntityEntitlementsAfterCacheMissParams = {
31
4
  customerId: string;
32
5
  resourceId: string | undefined;
@@ -1,19 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.entitlementsResponseMapper = exports.DATE_IN_FAR_PAST = void 0;
4
- exports.DATE_IN_FAR_PAST = new Date(0);
5
- exports.entitlementsResponseMapper = {
6
- cacheHit: (entitlements, accessDeniedReason) => ({
7
- cacheMiss: false,
8
- entitlements,
9
- accessDeniedReason,
10
- globalCustomerMissing: false,
11
- }),
12
- cacheMiss: (globalCustomerMissing = false) => ({
13
- cacheMiss: true,
14
- entitlements: null,
15
- accessDeniedReason: undefined,
16
- globalCustomerMissing,
17
- }),
18
- };
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50aXRsZW1lbnRzU2VydmljZS51dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9lbnRpdGxlbWVudHNTZXJ2aWNlLnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWtCYSxRQUFBLGdCQUFnQixHQUFHLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBMkIvQixRQUFBLDBCQUEwQixHQUFHO0lBQ3hDLFFBQVEsRUFBRSxDQUNSLFlBQTZCLEVBQzdCLGtCQUE2QyxFQUNmLEVBQUUsQ0FBQyxDQUFDO1FBQ2xDLFNBQVMsRUFBRSxLQUFLO1FBQ2hCLFlBQVk7UUFDWixrQkFBa0I7UUFDbEIscUJBQXFCLEVBQUUsS0FBSztLQUM3QixDQUFDO0lBQ0YsU0FBUyxFQUFFLENBQUMscUJBQXFCLEdBQUcsS0FBSyxFQUFpQyxFQUFFLENBQUMsQ0FBQztRQUM1RSxTQUFTLEVBQUUsSUFBSTtRQUNmLFlBQVksRUFBRSxJQUFJO1FBQ2xCLGtCQUFrQixFQUFFLFNBQVM7UUFDN0IscUJBQXFCO0tBQ3RCLENBQUM7Q0FDSCxDQUFDIn0=
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50aXRsZW1lbnRzU2VydmljZS51dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9lbnRpdGxlbWVudHNTZXJ2aWNlLnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
@@ -1,6 +1,6 @@
1
1
  import { TypedEmitter } from 'tiny-typed-emitter';
2
2
  import { CreditBalanceUpdatedPayloadFragment, EntitlementsUpdatedPayloadFragment, EntitlementUsageUpdatedFragment, PackagePublishedPayloadFragment } from '@stigg/api-client-js/src/generated/sdk';
3
- import { CacheHit, CacheMiss } from './cacheInstrumentation';
3
+ import { CacheHit, CacheMiss } from './cache';
4
4
  import { AxiosRequestConfig, AxiosResponse } from 'axios';
5
5
  export type NetworkRequestFailed = {
6
6
  errorMessage: string;
@@ -0,0 +1,9 @@
1
+ import { TypedEventEmitter } from './eventEmitter';
2
+ import { CacheInstrumentation, CacheHit, CacheMiss, RedisClientErrorData } from './cache';
3
+ export declare class EventEmitterCacheInstrumentation implements CacheInstrumentation {
4
+ private readonly eventEmitter;
5
+ constructor(eventEmitter: TypedEventEmitter);
6
+ trackHit(data: CacheHit): void;
7
+ trackMiss(data: CacheMiss): void;
8
+ trackRedisClientError(data: RedisClientErrorData): void;
9
+ }
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.EventEmitterCacheInstrumentation = void 0;
4
+ class EventEmitterCacheInstrumentation {
5
+ constructor(eventEmitter) {
6
+ this.eventEmitter = eventEmitter;
7
+ }
8
+ trackHit(data) {
9
+ this.eventEmitter.emit('cacheHit', data);
10
+ }
11
+ trackMiss(data) {
12
+ this.eventEmitter.emit('cacheMiss', data);
13
+ }
14
+ trackRedisClientError(data) {
15
+ this.eventEmitter.emit('redisClientError', data);
16
+ }
17
+ }
18
+ exports.EventEmitterCacheInstrumentation = EventEmitterCacheInstrumentation;
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXZlbnRFbWl0dGVyQ2FjaGVJbnN0cnVtZW50YXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvZXZlbnRFbWl0dGVyQ2FjaGVJbnN0cnVtZW50YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsTUFBYSxnQ0FBZ0M7SUFDM0MsWUFBNkIsWUFBK0I7UUFBL0IsaUJBQVksR0FBWixZQUFZLENBQW1CO0lBQUcsQ0FBQztJQUVoRSxRQUFRLENBQUMsSUFBYztRQUNyQixJQUFJLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELFNBQVMsQ0FBQyxJQUFlO1FBQ3ZCLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUM1QyxDQUFDO0lBRUQscUJBQXFCLENBQUMsSUFBMEI7UUFDOUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkQsQ0FBQztDQUNGO0FBZEQsNEVBY0MifQ==
@@ -2,25 +2,24 @@ import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
2
2
  import { LoggerService } from './loggerService';
3
3
  import { TypedEventEmitter } from './eventEmitter';
4
4
  import { EntitlementsService } from './entitlementsService';
5
- import { InMemoryCacheService } from './cache/inMemoryCacheService';
5
+ import { InMemoryCacheService } from './cache';
6
6
  import { EdgeApiClient } from './EdgeApiClient';
7
7
  import { RefetchEntityEntitlementsAfterCacheMissParams } from './entitlementsService.utils';
8
+ import { CacheableEntitlement } from './ApiCacheMapper';
8
9
  export declare class InMemoryEntitlementsService extends EntitlementsService {
9
- protected readonly cacheService: InMemoryCacheService;
10
+ protected readonly cacheService: InMemoryCacheService<CacheableEntitlement>;
10
11
  private readonly eventEmitter;
11
12
  private entitlementsSubscription;
12
13
  private usageSubscription;
13
14
  private packagePublished;
14
- private creditBalance;
15
- constructor(cacheService: InMemoryCacheService, client: ApolloClient<NormalizedCacheObject>, eventEmitter: TypedEventEmitter, loggerService: LoggerService, edgeApiClient: EdgeApiClient | null, entitlementsTimeout: number);
15
+ constructor(cacheService: InMemoryCacheService<CacheableEntitlement>, client: ApolloClient<NormalizedCacheObject>, eventEmitter: TypedEventEmitter, loggerService: LoggerService, edgeApiClient: EdgeApiClient | null, entitlementsTimeout: number);
16
16
  init(): void;
17
17
  private websocketErrorHandling;
18
18
  cleanup(): void;
19
19
  private onEntitlementsUpdated;
20
20
  private onUsageUpdated;
21
- private onCreditBalanceUpdated;
22
21
  private isErrorRecoverable;
23
22
  clearCache(): void;
24
23
  private onPackagePublished;
25
- protected refetchEntityEntitlementsAfterCacheMiss(params: RefetchEntityEntitlementsAfterCacheMissParams): Promise<import("./entitlementsService.utils").EntitlementsResponseCacheHit>;
24
+ protected refetchEntityEntitlementsAfterCacheMiss(params: RefetchEntityEntitlementsAfterCacheMissParams): Promise<import("./cache").EntitlementsResponseCacheHit>;
26
25
  }