@stigg/node-server-sdk 3.34.0 → 3.36.0

package/dist/services/entitlementsService.js

@@ -1,9 +1,20 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntitlementsService = exports.entitlementsResponse = void 0;
+exports.EntitlementsService = void 0;
 const entitlementCheckReportingService_1 = require("./entitlementCheckReportingService");
 const entitlementsApi_1 = __importDefault(require("../api/entitlements/entitlementsApi"));
 const models_1 = require("../models");
@@ -12,16 +23,7 @@ const entitlementDecisionService_1 = require("./entitlementDecisionService");
 const lodash_1 = require("lodash");
 const dateUtils_1 = require("../utils/dateUtils");
 const CacheMapper_1 = __importDefault(require("../utils/CacheMapper"));
-exports.entitlementsResponse = {
-    cacheHit: (entitlements) => ({
-        entitlements,
-        customerExists: true,
-    }),
-    cacheMiss: () => ({
-        entitlements: null,
-        customerExists: false,
-    }),
-};
+const entitlementsService_utils_1 = require("./entitlementsService.utils");
 class EntitlementsService {
     constructor(client, loggerService, batchedGraphqlClient, edgeApiClient, cacheService) {
         this.loggerService = loggerService;
@@ -113,22 +115,40 @@ class EntitlementsService {
         return this.modelMapper.mapMeteredEntitlement(entitlement, decision, requestUsage);
     }
     async getCustomerAndEntitlementFromCacheOrRefetch(featureRefId, customerRefId, resourceId, triggeredBy) {
-        const loadFromCache = () => this.tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId);
-        let { entitlement, customerExists } = await loadFromCache();
-        if (!customerExists || !this.isInitialized) {
-            ({ entitlement, customerExists } = await this.refetchEntitlementsAfterCacheMiss({
+        var _a;
+        const result = await this.cacheService.getCustomerEntitlement(featureRefId, customerRefId, resourceId);
+        let { entitlement, customerExists } = result;
+        if (result.cacheMiss || !this.isInitialized) {
+            const postMissResult = await this.refetchEntitlementsAfterCacheMiss({
                 customerId: customerRefId,
                 resourceId,
+                refetchGlobalCustomer: result.globalCustomerMissing,
                 triggeredBy,
-                loadFromCache,
-                transformApiResult: ({ entitlements, customerExists }) => ({
-                    entitlement: (entitlements === null || entitlements === void 0 ? void 0 : entitlements.get(featureRefId)) || null,
-                    customerExists: customerExists,
-                }),
-            }));
+            });
+            entitlement = ((_a = postMissResult.entitlements) === null || _a === void 0 ? void 0 : _a.get(featureRefId)) || null;
+            customerExists = postMissResult.customerExists;
         }
         return { entitlement, customerExists };
     }
+    async getCustomerEntitlements(customerRefId, resourceId) {
+        const result = await this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
+        let { entitlements, customerExists } = result;
+        if (result.cacheMiss || !this.isInitialized) {
+            ({ entitlements, customerExists } = await this.refetchEntitlementsAfterCacheMiss({
+                customerId: customerRefId,
+                resourceId,
+                refetchGlobalCustomer: result.globalCustomerMissing,
+                triggeredBy: 'getCustomerEntitlements',
+            }));
+        }
+        if (!entitlements) {
+            return [];
+        }
+        return Array.from(entitlements.values()).map((value) => {
+            const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(customerExists, value);
+            return this.modelMapper.mapEntitlement(value, decision);
+        });
+    }
     async reportUsage(input) {
         const result = await this.entitlementsApi.reportUsage(input);
         if (result.data) {
@@ -148,13 +168,19 @@ class EntitlementsService {
     reportEvent(input) {
         return this.entitlementsApi.reportEvent(input);
     }
-    async tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId) {
-        const { entitlements, customerExists } = await this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
-        if (!customerExists) {
-            return { customerExists: false, entitlement: null };
+    async refetchEntitlementsAfterCacheMiss(params) {
+        const { customerId, resourceId, triggeredBy, refetchGlobalCustomer } = params;
+        const refetchPromise = this.refetchEntityEntitlementsAfterCacheMiss(params);
+        if ((0, lodash_1.isNil)(resourceId) || !refetchGlobalCustomer) {
+            return refetchPromise;
         }
-        const entitlement = (entitlements === null || entitlements === void 0 ? void 0 : entitlements.get(featureRefId)) || null;
-        return { customerExists: true, entitlement };
+        const globalCustomerRefetchPromise = this.refetchEntityEntitlementsAfterCacheMiss({
+            customerId,
+            resourceId: undefined,
+            triggeredBy,
+        });
+        const [resourceResult] = await Promise.all([refetchPromise, globalCustomerRefetchPromise]);
+        return resourceResult;
     }
     async refetchEntitlements({ customerId, resourceId, skipEdge, triggeredBy, }) {
         this.loggerService.log(`Re-fetching entitlements`, {
@@ -164,31 +190,23 @@ class EntitlementsService {
             triggeredBy,
         });
         const entitlementsResult = await this.entitlementsApi.getEntitlements(customerId, resourceId, skipEdge);
-        if ((0, lodash_1.isEmpty)(entitlementsResult.data.entitlements)) {
-            return { entitlements: null, customerExists: false };
-        }
-        const { entitlements = null } = (await this.setEntitlements({
+        const entitlements = await this.setEntitlements({
             entitlements: entitlementsResult.data.entitlements,
             customerId,
             resourceId,
-        })) || {};
-        return entitlements ? exports.entitlementsResponse.cacheHit(entitlements) : exports.entitlementsResponse.cacheMiss();
+        });
+        return entitlementsService_utils_1.entitlementsResponseMapper.cacheHit(entitlements);
     }
-    async setEntitlements({ entitlements, customerId, resourceId, }) {
-        var _a;
+    async setEntitlementsIfExists(options) {
+        const { entitlements } = options, rest = __rest(options, ["entitlements"]);
         if ((0, lodash_1.isNil)(entitlements)) {
             return Promise.resolve(null);
         }
-        const entitlementsUpdatedAt = (_a = entitlements.find((entitlement) => (entitlement === null || entitlement === void 0 ? void 0 : entitlement.entitlementUpdatedAt) && (0, dateUtils_1.isValidDate)(entitlement === null || entitlement === void 0 ? void 0 : entitlement.entitlementUpdatedAt))) === null || _a === void 0 ? void 0 : _a.entitlementUpdatedAt;
-        if (!entitlementsUpdatedAt) {
-            this.loggerService.debug(`Failed to find entitlements updated at timestamp for customer`, {
-                customerId,
-                resourceId,
-            });
-        }
-        const entitlementsUpdatedAtTimestamp = entitlementsUpdatedAt
-            ? new Date(entitlementsUpdatedAt).getTime()
-            : new Date().getTime();
+        return this.setEntitlements(Object.assign({ entitlements }, rest));
+    }
+    async setEntitlements(params) {
+        const { entitlements, customerId, resourceId } = params;
+        const entitlementsUpdatedAtTimestamp = this.getEntitlementsUpdatedAtTimestamp(params);
         const featureIdToUsageTimestamp = new Map(entitlements
             .filter((entitlement) => {
             var _a, _b;
@@ -202,12 +220,29 @@ class EntitlementsService {
         const cachedEntitlements = this.cacheMapper.mapCachedEntitlements(entitlements);
         // optimistically update the cache
         try {
-            await this.cacheService.setCustomer(customerId, cachedEntitlements, resourceId, entitlementsUpdatedAtTimestamp, featureIdToUsageTimestamp);
+            await this.cacheService.setCustomer(customerId, cachedEntitlements, resourceId, entitlementsUpdatedAtTimestamp.getTime(), featureIdToUsageTimestamp);
         }
         catch (err) {
             this.loggerService.error('Failed to set customer entitlements in cache (soft ignored)', err);
         }
-        return { entitlements: cachedEntitlements };
+        return cachedEntitlements;
+    }
+    getEntitlementsUpdatedAtTimestamp({ entitlements, customerId, resourceId, }) {
+        if ((0, lodash_1.isEmpty)(entitlements)) {
+            // empty entitlements means we don't have a timestamp
+            return entitlementsService_utils_1.DATE_IN_FAR_PAST;
+        }
+        const entitlementsUpdatedAt = entitlements
+            .map(({ entitlementUpdatedAt }) => entitlementUpdatedAt)
+            .find((entitlementUpdatedAt) => (0, dateUtils_1.isValidDate)(entitlementUpdatedAt));
+        if (!entitlementsUpdatedAt) {
+            this.loggerService.error(`Failed to find entitlements updated at timestamp for customer`, {
+                customerId,
+                resourceId,
+            });
+            return new Date();
+        }
+        return new Date(entitlementsUpdatedAt);
     }
     tryTrackEntitlementCheck(shouldTrack, featureRefId, customerRefId, resourceRefId, result, requestedUsage) {
         if (!shouldTrack) {
@@ -219,8 +254,8 @@ class EntitlementsService {
         if ((0, lodash_1.isNil)(currentUsage)) {
             return;
         }
-        const response = await this.cacheService.getCustomerEntitlements(customerId, resourceId || undefined);
-        if (!response.customerExists) {
+        const response = await this.cacheService.getCustomerEntitlement(featureId, customerId, resourceId || undefined);
+        if (response.cacheMiss) {
             return;
         }
         await this.cacheService.updateFeatureUsage({
@@ -234,4 +269,4 @@ class EntitlementsService {
     }
 }
 exports.EntitlementsService = EntitlementsService;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}

package/dist/services/entitlementsService.utils.d.ts

@@ -0,0 +1,43 @@
+import CachedEntitlement from './cache/cachedEntitlement';
+export declare type GetEntitlementsOperations = 'getBooleanEntitlement' | 'getNumericEntitlement' | 'getMeteredEntitlement' | 'getCustomerEntitlements';
+export declare type RefetchEntitlementsTriggeredBy = GetEntitlementsOperations | 'updateSubscription' | 'cancelSubscription' | 'createSubscription' | 'reloadEntitlements';
+export declare const DATE_IN_FAR_PAST: Date;
+export declare type EntitlementsMap = Map<string, CachedEntitlement>;
+export declare type EntitlementsResponseCacheHit = {
+    cacheMiss: false;
+    entitlements: EntitlementsMap;
+    customerExists: boolean;
+    globalCustomerMissing: false;
+};
+export declare type EntitlementsResponseCacheMiss = {
+    cacheMiss: true;
+    entitlements: null;
+    customerExists: false;
+    globalCustomerMissing: boolean;
+};
+export declare type EntitlementsResponse = EntitlementsResponseCacheHit | EntitlementsResponseCacheMiss;
+export declare type EntitlementResponse = {
+    cacheMiss: boolean;
+    customerExists: boolean;
+    entitlement: CachedEntitlement | null;
+    globalCustomerMissing: boolean;
+};
+export declare const doesCustomerExist: (entitlements: EntitlementsMap) => boolean;
+export declare const entitlementsResponseMapper: {
+    cacheHit: (entitlements: EntitlementsMap) => EntitlementsResponseCacheHit;
+    cacheMiss: (globalCustomerMissing?: boolean) => EntitlementsResponseCacheMiss;
+};
+export declare type RefetchEntityEntitlementsAfterCacheMissParams = {
+    customerId: string;
+    resourceId: string | undefined;
+    triggeredBy: GetEntitlementsOperations;
+};
+export declare type RefetchEntitlementsAfterCacheMissParams = RefetchEntityEntitlementsAfterCacheMissParams & {
+    refetchGlobalCustomer: boolean;
+};
+export declare type RefetchEntitlementsParams = {
+    customerId: string;
+    resourceId: string | undefined;
+    skipEdge?: boolean;
+    triggeredBy: RefetchEntitlementsTriggeredBy;
+};

package/dist/services/entitlementsService.utils.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.entitlementsResponseMapper = exports.doesCustomerExist = exports.DATE_IN_FAR_PAST = void 0;
+const lodash_1 = require("lodash");
+exports.DATE_IN_FAR_PAST = new Date(0);
+// The getEntitlements API returns empty list for both:
+//   * customer not found
+//   * customer exists but doesn't have any subscriptions.
+// So the SDK side can't differentiate between them, and as a
+// compromise we consider empty entitlements as customer not found.
+const doesCustomerExist = (entitlements) => !(0, lodash_1.isEmpty)(entitlements);
+exports.doesCustomerExist = doesCustomerExist;
+exports.entitlementsResponseMapper = {
+    cacheHit: (entitlements) => ({
+        cacheMiss: false,
+        entitlements,
+        customerExists: (0, exports.doesCustomerExist)(entitlements),
+        globalCustomerMissing: false,
+    }),
+    cacheMiss: (globalCustomerMissing = false) => ({
+        cacheMiss: true,
+        entitlements: null,
+        customerExists: false,
+        globalCustomerMissing,
+    }),
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50aXRsZW1lbnRzU2VydmljZS51dGlscy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9lbnRpdGxlbWVudHNTZXJ2aWNlLnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUFpQztBQWlCcEIsUUFBQSxnQkFBZ0IsR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztBQTJCNUMsdURBQXVEO0FBQ3ZELHlCQUF5QjtBQUN6QiwwREFBMEQ7QUFDMUQsNkRBQTZEO0FBQzdELG1FQUFtRTtBQUM1RCxNQUFNLGlCQUFpQixHQUFHLENBQUMsWUFBNkIsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFBLGdCQUFPLEVBQUMsWUFBWSxDQUFDLENBQUM7QUFBOUUsUUFBQSxpQkFBaUIscUJBQTZEO0FBRTlFLFFBQUEsMEJBQTBCLEdBQUc7SUFDeEMsUUFBUSxFQUFFLENBQUMsWUFBNkIsRUFBZ0MsRUFBRSxDQUFDLENBQUM7UUFDMUUsU0FBUyxFQUFFLEtBQUs7UUFDaEIsWUFBWTtRQUNaLGNBQWMsRUFBRSxJQUFBLHlCQUFpQixFQUFDLFlBQVksQ0FBQztRQUMvQyxxQkFBcUIsRUFBRSxLQUFLO0tBQzdCLENBQUM7SUFDRixTQUFTLEVBQUUsQ0FBQyxxQkFBcUIsR0FBRyxLQUFLLEVBQWlDLEVBQUUsQ0FBQyxDQUFDO1FBQzVFLFNBQVMsRUFBRSxJQUFJO1FBQ2YsWUFBWSxFQUFFLElBQUk7UUFDbEIsY0FBYyxFQUFFLEtBQUs7UUFDckIscUJBQXFCO0tBQ3RCLENBQUM7Q0FDSCxDQUFDIn0=

package/dist/services/inMemoryEntitlementsService.d.ts

@@ -1,9 +1,10 @@
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
 import { LoggerService } from './loggerService';
 import { TypedEventEmitter } from './eventEmitter';
-import { EntitlementsService, RefetchEntitlementsAfterCacheMissProps } from './entitlementsService';
+import { EntitlementsService } from './entitlementsService';
 import { InMemoryCacheService } from './cache/inMemoryCacheService';
 import { EdgeApiClient } from './EdgeApiClient';
+import { RefetchEntityEntitlementsAfterCacheMissParams } from './entitlementsService.utils';
 export declare class InMemoryEntitlementsService extends EntitlementsService {
     protected readonly cacheService: InMemoryCacheService;
     private readonly eventEmitter;
@@ -19,6 +20,5 @@ export declare class InMemoryEntitlementsService extends EntitlementsService {
     private isErrorRecoverable;
     clearCache(): void;
     private onPackagePublished;
-    getCustomerEntitlementsWithUsage(customerRefId: string, resourceId: string | undefined): Promise<import("..").Entitlement[]>;
-    protected refetchEntitlementsAfterCacheMiss<T>(props: RefetchEntitlementsAfterCacheMissProps<T>): Promise<T>;
+    protected refetchEntityEntitlementsAfterCacheMiss(params: RefetchEntityEntitlementsAfterCacheMissParams): Promise<import("./entitlementsService.utils").EntitlementsResponseCacheHit>;
 }

package/dist/services/inMemoryEntitlementsService.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryEntitlementsService = void 0;
 const sdk_1 = require("@stigg/api-client-js/src/generated/sdk");
 const entitlementsService_1 = require("./entitlementsService");
-const entitlementDecisionService_1 = require("./entitlementDecisionService");
 const ReuseOngoingExecution_1 = require("../utils/decorators/ReuseOngoingExecution");
 const lodash_1 = require("lodash");
 const WS_ERROR_RECONNECT_INTERVAL_MS = 5 * 1000;
@@ -125,33 +124,12 @@ class InMemoryEntitlementsService extends entitlementsService_1.EntitlementsServ
         }
         this.eventEmitter.emit('packagePublished', result.data.packagePublished);
     }
-    async getCustomerEntitlementsWithUsage(customerRefId, resourceId) {
-        const loadFromCache = () => this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
-        let { entitlements, customerExists } = loadFromCache();
-        if (!customerExists || !this.isInitialized) {
-            ({ entitlements, customerExists } = await this.refetchEntitlementsAfterCacheMiss({
-                customerId: customerRefId,
-                resourceId,
-                triggeredBy: 'getCustomerEntitlementsWithUsage',
-                loadFromCache,
-                transformApiResult: (x) => x,
-            }));
-        }
-        if (!entitlements) {
-            return [];
-        }
-        return Array.from(entitlements.values()).map((value) => {
-            const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(customerExists, value);
-            return this.modelMapper.mapEntitlement(value, decision);
-        });
-    }
-    async refetchEntitlementsAfterCacheMiss(props) {
-        const response = await this.refetchEntitlements(props);
-        return props.transformApiResult(response);
+    async refetchEntityEntitlementsAfterCacheMiss(params) {
+        return this.refetchEntitlements(params);
     }
 }
 __decorate([
     (0, ReuseOngoingExecution_1.ReuseOngoingExecution)(({ customerId, resourceId }) => (0, lodash_1.compact)([customerId, resourceId]).join(':'))
-], InMemoryEntitlementsService.prototype, "refetchEntitlementsAfterCacheMiss", null);
+], InMemoryEntitlementsService.prototype, "refetchEntityEntitlementsAfterCacheMiss", null);
 exports.InMemoryEntitlementsService = InMemoryEntitlementsService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5NZW1vcnlFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL2luTWVtb3J5RW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFDQSxnRUFLZ0Q7QUFHaEQsK0RBQW9HO0FBSXBHLDZFQUEwRTtBQUMxRSxxRkFBa0Y7QUFDbEYsbUNBQWlDO0FBRWpDLE1BQU0sOEJBQThCLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUVoRCxNQUFhLDJCQUE0QixTQUFRLHlDQUFtQjtJQUtsRSxZQUNxQixZQUFrQyxFQUNyRCxNQUEyQyxFQUMzQyxvQkFBeUQsRUFDeEMsWUFBK0IsRUFDaEQsYUFBNEIsRUFDNUIsYUFBbUM7UUFFbkMsS0FBSyxDQUFDLE1BQU0sRUFBRSxhQUFhLEVBQUUsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBUDdELGlCQUFZLEdBQVosWUFBWSxDQUFzQjtRQUdwQyxpQkFBWSxHQUFaLFlBQVksQ0FBbUI7UUFSMUMsNkJBQXdCLEdBQWtDLElBQUksQ0FBQztRQUMvRCxzQkFBaUIsR0FBa0MsSUFBSSxDQUFDO1FBQ3hELHFCQUFnQixHQUFrQyxJQUFJLENBQUM7SUFXL0QsQ0FBQztJQUVRLElBQUk7UUFDWCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO1FBRTNELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUVmLElBQUksQ0FBQyx3QkFBd0IsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLDRCQUE0QixFQUFFLENBQUMsU0FBUyxDQUMzRixDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLHFCQUFxQixDQUFDLEtBQUssQ0FBQyxFQUM1QyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxDQUMx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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5NZW1vcnlFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL2luTWVtb3J5RW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFDQSxnRUFLZ0Q7QUFHaEQsK0RBQTREO0FBSzVELHFGQUFrRjtBQUNsRixtQ0FBaUM7QUFHakMsTUFBTSw4QkFBOEIsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDO0FBRWhELE1BQWEsMkJBQTRCLFNBQVEseUNBQW1CO0lBS2xFLFlBQ3FCLFlBQWtDLEVBQ3JELE1BQTJDLEVBQzNDLG9CQUF5RCxFQUN4QyxZQUErQixFQUNoRCxhQUE0QixFQUM1QixhQUFtQztRQUVuQyxLQUFLLENBQUMsTUFBTSxFQUFFLGFBQWEsRUFBRSxvQkFBb0IsRUFBRSxhQUFhLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFQN0QsaUJBQVksR0FBWixZQUFZLENBQXNCO1FBR3BDLGlCQUFZLEdBQVosWUFBWSxDQUFtQjtRQVIxQyw2QkFBd0IsR0FBa0MsSUFBSSxDQUFDO1FBQy9ELHNCQUFpQixHQUFrQyxJQUFJLENBQUM7UUFDeEQscUJBQWdCLEdBQWtDLElBQUksQ0FBQztJQVcvRCxDQUFDO0lBRVEsSUFBSTtRQUNYLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLGtDQUFrQyxDQUFDLENBQUM7UUFFM0QsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRWYsSUFBSSxDQUFDLHdCQUF3QixHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsNEJBQTRCLEVBQUUsQ0FBQyxTQUFTLENBQzNGLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMscUJBQXFCLENBQUMsS0FBSyxDQUFDLEVBQzVDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsR0FBRyxDQUFDLENBQzFDLENBQUM7UUFFRixJ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

package/dist/services/redisEntitlementsService.d.ts

@@ -1,21 +1,16 @@
-import { EntitlementsService, RefetchEntitlementsAfterCacheMissProps } from './entitlementsService';
+import { EntitlementsService } from './entitlementsService';
+import { RefetchEntityEntitlementsAfterCacheMissParams } from './entitlementsService.utils';
 import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
 import { LoggerService } from './loggerService';
 import { RedisCacheService } from './cache/redisCacheService';
 import { EdgeApiClient } from './EdgeApiClient';
-import CachedEntitlement from './cache/cachedEntitlement';
 export declare class RedisEntitlementsService extends EntitlementsService {
     protected readonly cacheService: RedisCacheService;
     protected readonly graphqlClient: ApolloClient<NormalizedCacheObject>;
     protected readonly loggerService: LoggerService;
     protected readonly batchedGraphClient: ApolloClient<NormalizedCacheObject>;
     constructor(cacheService: RedisCacheService, graphqlClient: ApolloClient<NormalizedCacheObject>, loggerService: LoggerService, batchedGraphClient: ApolloClient<NormalizedCacheObject>, edgeApiClient: EdgeApiClient | null);
-    protected tryGetCacheCustomerAndEntitlement(featureRefId: string, customerRefId: string, resourceId?: string): Promise<{
-        customerExists: boolean;
-        entitlement: CachedEntitlement | null;
-    }>;
-    getCustomerEntitlementsWithUsage(customerRefId: string, resourceId: string | undefined): Promise<import("..").Entitlement[]>;
-    protected refetchEntitlementsAfterCacheMiss<T>({ loadFromCache, transformApiResult, ...restProps }: RefetchEntitlementsAfterCacheMissProps<T>): Promise<T>;
+    protected refetchEntityEntitlementsAfterCacheMiss(params: RefetchEntityEntitlementsAfterCacheMissParams): Promise<import("./entitlementsService.utils").EntitlementsResponse>;
     clearCache(): Promise<void>;
     init(): void | Promise<void>;
     cleanup(): void | Promise<void>;

package/dist/services/redisEntitlementsService.js

@@ -5,25 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisEntitlementsService = void 0;
 const entitlementsService_1 = require("./entitlementsService");
-const entitlementDecisionService_1 = require("./entitlementDecisionService");
 const ReuseOngoingExecution_1 = require("../utils/decorators/ReuseOngoingExecution");
 const lodash_1 = require("lodash");
-const isMetered_1 = require("../utils/isMetered");
-const identityFn = (x) => x;
 class RedisEntitlementsService extends entitlementsService_1.EntitlementsService {
     constructor(cacheService, graphqlClient, loggerService, batchedGraphClient, edgeApiClient) {
         super(graphqlClient, loggerService, batchedGraphClient, edgeApiClient, cacheService);
@@ -33,59 +19,18 @@ class RedisEntitlementsService extends entitlementsService_1.EntitlementsService
         this.batchedGraphClient = batchedGraphClient;
         this.isInitialized = true; // redis is always considered as initialized
     }
-    async tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId) {
-        const result = await super.tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId);
-        const { customerExists } = result;
-        let { entitlement } = result;
-        if ((0, isMetered_1.isMetered)(entitlement === null || entitlement === void 0 ? void 0 : entitlement.calculatedEntitlement.feature)) {
-            const featureUsageData = await this.cacheService.getFeatureUsage(customerRefId, featureRefId, resourceId);
-            if (featureUsageData === null) {
-                this.loggerService.error('Failed to find metered feature usage - considering it as cache miss', {
-                    customerRefId,
-                    featureRefId,
-                });
-                return { customerExists: false, entitlement: null };
-            }
-            const cachedFeatureUsage = JSON.parse(featureUsageData);
-            const { calculatedEntitlement, featureUsage } = entitlement;
-            entitlement = { calculatedEntitlement, featureUsage: Object.assign(Object.assign({}, featureUsage), cachedFeatureUsage) };
-        }
-        return { customerExists, entitlement };
-    }
-    async getCustomerEntitlementsWithUsage(customerRefId, resourceId) {
-        const loadFromCache = () => this.cacheService.getCustomerEntitlementsWithUsage(customerRefId, resourceId);
-        let { entitlements, customerExists } = await loadFromCache();
-        if (!customerExists) {
-            ({ entitlements, customerExists } = await this.refetchEntitlementsAfterCacheMiss({
-                customerId: customerRefId,
-                resourceId,
-                triggeredBy: 'getCustomerEntitlementsWithUsage',
-                loadFromCache,
-                transformApiResult: identityFn,
-            }));
-        }
-        if (!entitlements) {
-            return [];
-        }
-        return Array.from(entitlements.values()).map((entitlement) => {
-            const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(customerExists, entitlement);
-            return this.modelMapper.mapEntitlement(entitlement, decision);
-        });
-    }
-    async refetchEntitlementsAfterCacheMiss(_a) {
-        var { loadFromCache, transformApiResult } = _a, restProps = __rest(_a, ["loadFromCache", "transformApiResult"]);
-        const { customerId, resourceId } = restProps;
+    async refetchEntityEntitlementsAfterCacheMiss(params) {
         const { distributedRefetchEntitlementsService } = this.cacheService;
-        const reloadFromApi = () => this.refetchEntitlements(restProps);
         if (!distributedRefetchEntitlementsService) {
-            const response = await reloadFromApi();
-            return transformApiResult(response);
+            return this.refetchEntitlements(params);
         }
+        const { customerId, resourceId } = params;
+        const reloadFromApi = () => this.refetchEntitlements(params);
+        const loadFromCache = () => this.cacheService.getCustomerEntitlements(customerId, resourceId);
         return distributedRefetchEntitlementsService.executeOnceAcrossMultipleProcesses({
             customerId,
             resourceId,
             reloadFromApi,
-            transformApiResult,
             loadFromCache,
         });
     }
@@ -103,6 +48,6 @@ class RedisEntitlementsService extends entitlementsService_1.EntitlementsService
 }
 __decorate([
     (0, ReuseOngoingExecution_1.ReuseOngoingExecution)(({ customerId, resourceId }) => (0, lodash_1.compact)([customerId, resourceId]).join(':'))
-], RedisEntitlementsService.prototype, "refetchEntitlementsAfterCacheMiss", null);
+], RedisEntitlementsService.prototype, "refetchEntityEntitlementsAfterCacheMiss", null);
 exports.RedisEntitlementsService = RedisEntitlementsService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL3JlZGlzRW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLCtEQUFvRztBQUlwRyw2RUFBMEU7QUFHMUUscUZBQWtGO0FBQ2xGLG1DQUFpQztBQUNqQyxrREFBK0M7QUFFL0MsTUFBTSxVQUFVLEdBQUcsQ0FBSSxDQUFJLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUVsQyxNQUFhLHdCQUF5QixTQUFRLHlDQUFtQjtJQUMvRCxZQUNxQixZQUErQixFQUMvQixhQUFrRCxFQUNsRCxhQUE0QixFQUM1QixrQkFBdUQsRUFDMUUsYUFBbUM7UUFFbkMsS0FBSyxDQUFDLGFBQWEsRUFBRSxhQUFhLEVBQUUsa0JBQWtCLEVBQUUsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBTmxFLGlCQUFZLEdBQVosWUFBWSxDQUFtQjtRQUMvQixrQkFBYSxHQUFiLGFBQWEsQ0FBcUM7UUFDbEQsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFxQztRQUkxRSxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxDQUFDLDRDQUE0QztJQUN6RSxDQUFDO0lBRWtCLEtBQUssQ0FBQyxpQ0FBaUMsQ0FDeEQsWUFBb0IsRUFDcEIsYUFBcUIsRUFDckIsVUFBbUI7UUFFbkIsTUFBTSxNQUFNLEdBQUcsTUFBTSxLQUFLLENBQUMsaUNBQWlDLENBQUMsWUFBWSxFQUFFLGFBQWEsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUV0RyxNQUFNLEVBQUUsY0FBYyxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBQ2xDLElBQUksRUFBRSxXQUFXLEVBQUUsR0FBRyxNQUFNLENBQUM7UUFFN0IsSUFBSSxJQUFBLHFCQUFTLEVBQUMsV0FBVyxhQUFYLFdBQVcs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL3JlZGlzRW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwrREFBNEQ7QUFNNUQscUZBQWtGO0FBQ2xGLG1DQUFpQztBQUVqQyxNQUFhLHdCQUF5QixTQUFRLHlDQUFtQjtJQUMvRCxZQUNxQixZQUErQixFQUMvQixhQUFrRCxFQUNsRCxhQUE0QixFQUM1QixrQkFBdUQsRUFDMUUsYUFBbUM7UUFFbkMsS0FBSyxDQUFDLGFBQWEsRUFBRSxhQUFhLEVBQUUsa0JBQWtCLEVBQUUsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBTmxFLGlCQUFZLEdBQVosWUFBWSxDQUFtQjtRQUMvQixrQkFBYSxHQUFiLGFBQWEsQ0FBcUM7UUFDbEQsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFxQztRQUkxRSxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxDQUFDLDRDQUE0QztJQUN6RSxDQUFDO0lBS2tCLEtBQUssQ0FBQyx1Q0FBdUMsQ0FDOUQsTUFBcUQ7UUFFckQsTUFBTSxFQUFFLHFDQUFxQyxFQUFFLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQztRQUNwRSxJQUFJLENBQUMscUNBQXFDLEVBQUU7WUFDMUMsT0FBTyxJQUFJLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLENBQUM7U0FDekM7UUFFRCxNQUFNLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLE1BQU0sQ0FBQztRQUMxQyxNQUFNLGFBQWEsR0FBRyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0QsTUFBTSxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyx1QkFBdUIsQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFFOUYsT0FBTyxxQ0FBcUMsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RSxVQUFVO1lBQ1YsVUFBVTtZQUNWLGFBQWE7WUFDYixhQUFhO1NBQ2QsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVRLFVBQVU7UUFDakIsNENBQTRDO1FBQzVDLE9BQU8sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFUSxJQUFJO1FBQ1gsa0VBQWtFO1FBQ2xFLE9BQU87SUFDVCxDQUFDO0lBRVEsT0FBTztRQUNkLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0NBQ0Y7QUFqQ0M7SUFIQyxJQUFBLDZDQUFxQixFQUFDLENBQUMsRUFBRSxVQUFVLEVBQUUsVUFBVSxFQUFpRCxFQUFFLEVBQUUsQ0FDbkcsSUFBQSxnQkFBTyxFQUFDLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUM1Qzt1RkFtQkE7QUFqQ0gsNERBZ0RDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stigg/node-server-sdk",
-  "version": "3.34.0",
+  "version": "3.36.0",
   "description": "Stigg server-side node SDK",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",