@stigg/node-server-sdk 3.77.0 → 3.78.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.
- package/dist/services/EdgeApiClient.js +4 -2
- package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.d.ts +3 -4
- package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.js +8 -9
- package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.utils.d.ts +0 -3
- package/dist/services/cache/RedisSingleExecutionService/RedisSingleExecution.utils.js +2 -4
- package/dist/services/cache/redis/distributedLocks.d.ts +14 -0
- package/dist/services/cache/redis/distributedLocks.js +75 -0
- package/dist/services/cache/redisCacheService.constants.d.ts +0 -1
- package/dist/services/cache/redisCacheService.constants.js +2 -3
- package/dist/services/cache/redisCacheService.d.ts +1 -1
- package/dist/services/cache/redisCacheService.js +12 -16
- package/package.json +2 -2
|
@@ -101,7 +101,9 @@ class EdgeApiClient {
|
|
|
101
101
|
retryCondition: (error) => this.canRetryRequest(error),
|
|
102
102
|
retryDelay: (retryNumber, error) => axios_retry_1.default.exponentialDelay(retryNumber, error, 2000),
|
|
103
103
|
shouldResetTimeout: false,
|
|
104
|
-
onRetry: async (retryCount, error, requestConfig) => this.loggerService.log(`Retrying request ${requestConfig.url} - attempt ${retryCount}
|
|
104
|
+
onRetry: async (retryCount, error, requestConfig) => this.loggerService.log(`Retrying request ${requestConfig.url} - attempt ${retryCount}`, {
|
|
105
|
+
previousError: error.message,
|
|
106
|
+
}),
|
|
105
107
|
});
|
|
106
108
|
}
|
|
107
109
|
canRetryRequest(error) {
|
|
@@ -110,4 +112,4 @@ class EdgeApiClient {
|
|
|
110
112
|
}
|
|
111
113
|
}
|
|
112
114
|
exports.EdgeApiClient = EdgeApiClient;
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRWRnZUFwaUNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9FZGdlQXBpQ2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxrREFBb0Y7QUFDcEYsOENBQXFFO0FBUXJFLDREQUE4RDtBQUU5RCw4REFBcUM7QUFDckMsMkNBQTZCO0FBQzdCLDZDQUErQjtBQUMvQixtQ0FBb0Q7QUFFcEQsTUFBTSxtQkFBbUIsR0FBRyxDQUFDLENBQUM7QUFVOUIsTUFBYSxhQUFhO0lBR3hCLFlBQ21CLE1BQWtDLEVBQ2xDLGFBQTRCO1FBRDVCLFdBQU0sR0FBTixNQUFNLENBQTRCO1FBQ2xDLGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBRTdDLE1BQU0sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLEdBQUcsTUFBTSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBa0MsRUFBRSxhQUE0QjtRQUM1RSxPQUFPLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLElBQUksYUFBYSxDQUFDLE1BQU0sRUFBRSxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQzdFLENBQUM7SUFFRCxVQUFVLENBQ1IsU0FBa0IsRUFDbEIsa0JBQTJCLEVBQzNCLHVCQUFpQyxFQUNqQyxrQkFBNEI7UUFFNUIsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFDbEQsTUFBTSxpQ0FBaUMsR0FBRywyQkFBMkIsdUJBQXVCLEVBQUUsQ0FBQztRQUUvRixJQUFJLEdBQUcsR0FBRyxNQUFNLE1BQU0saUJBQWlCLGlDQUFpQyxFQUFF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
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import Redis from 'ioredis';
|
|
2
|
-
import Redlock from 'redlock';
|
|
3
2
|
import { LoggerService } from '../../loggerService';
|
|
4
3
|
import { OperationContext, NotificationContext } from './RedisSingleExecution.utils';
|
|
5
4
|
import { CacheInstrumentation } from '../../cacheInstrumentation';
|
|
5
|
+
import { DistributedLocks } from '../redis/distributedLocks';
|
|
6
6
|
/**
|
|
7
7
|
* This class manages the execution of operations in a distributed environment (using Redis).
|
|
8
8
|
* It ensures that an operation is executed only once across multiple processes, and handles notifications between processes.
|
|
@@ -12,15 +12,14 @@ export declare class RedisSingleExecutionService {
|
|
|
12
12
|
private readonly environmentPrefix;
|
|
13
13
|
private readonly notificationTimeoutMs;
|
|
14
14
|
private readonly redisClient;
|
|
15
|
-
private readonly
|
|
15
|
+
private readonly distributedLocks;
|
|
16
16
|
private readonly loggerService;
|
|
17
17
|
private readonly cacheInstrumentation;
|
|
18
18
|
private readonly subscribeClient;
|
|
19
19
|
private readonly pendingNotifications;
|
|
20
|
-
constructor(operationName: string, environmentPrefix: string, notificationTimeoutMs: number, redisClient: Redis,
|
|
20
|
+
constructor(operationName: string, environmentPrefix: string, notificationTimeoutMs: number, redisClient: Redis, distributedLocks: DistributedLocks, loggerService: LoggerService, cacheInstrumentation: CacheInstrumentation);
|
|
21
21
|
executeOnceAcrossMultipleProcesses<Response>(context: OperationContext<Response>): Promise<Response>;
|
|
22
22
|
waitForNotificationAndLoadFromCache<Response>({ customerId, resourceId, reloadFromApi, loadFromCache }: OperationContext<Response>, { cancelNotificationSubscription, notificationPromise }: NotificationContext): Promise<Response>;
|
|
23
|
-
private isLockTakenByAnotherClientError;
|
|
24
23
|
private subscribeForNotification;
|
|
25
24
|
private createNotificationPromise;
|
|
26
25
|
private unsubscribeChannel;
|
|
@@ -7,7 +7,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.RedisSingleExecutionService = void 0;
|
|
10
|
-
const redlock_1 = require("redlock");
|
|
11
10
|
const cacheKeysHelpers_1 = require("../../../utils/cacheKeysHelpers");
|
|
12
11
|
const lodash_1 = require("lodash");
|
|
13
12
|
const ReuseOngoingExecution_1 = require("../../../utils/decorators/ReuseOngoingExecution");
|
|
@@ -20,12 +19,12 @@ class RedisSingleExecutionService {
|
|
|
20
19
|
constructor(operationName, environmentPrefix,
|
|
21
20
|
// This timeout duration should be slightly longer than the total
|
|
22
21
|
// elapsed time of all retry attempts for the API data fetch request.
|
|
23
|
-
notificationTimeoutMs, redisClient,
|
|
22
|
+
notificationTimeoutMs, redisClient, distributedLocks, loggerService, cacheInstrumentation) {
|
|
24
23
|
this.operationName = operationName;
|
|
25
24
|
this.environmentPrefix = environmentPrefix;
|
|
26
25
|
this.notificationTimeoutMs = notificationTimeoutMs;
|
|
27
26
|
this.redisClient = redisClient;
|
|
28
|
-
this.
|
|
27
|
+
this.distributedLocks = distributedLocks;
|
|
29
28
|
this.loggerService = loggerService;
|
|
30
29
|
this.cacheInstrumentation = cacheInstrumentation;
|
|
31
30
|
this.pendingNotifications = new Map();
|
|
@@ -44,7 +43,7 @@ class RedisSingleExecutionService {
|
|
|
44
43
|
const { notify, cancelNotificationSubscription } = notificationContext;
|
|
45
44
|
const lockKey = (0, cacheKeysHelpers_1.buildLockKey)(this.environmentPrefix, customerId, resourceId, this.operationName);
|
|
46
45
|
try {
|
|
47
|
-
const response = await this.
|
|
46
|
+
const response = await this.distributedLocks.usingSingleAttempt(lockKey, async () => {
|
|
48
47
|
// At this point, this process has the responsibility to fetch data from
|
|
49
48
|
// the API, cache it, and then notify other clients to continue their execution.
|
|
50
49
|
// no need to listen anymore as this process is the one who will notify later
|
|
@@ -57,7 +56,10 @@ class RedisSingleExecutionService {
|
|
|
57
56
|
return response;
|
|
58
57
|
}
|
|
59
58
|
catch (err) {
|
|
60
|
-
if (this.
|
|
59
|
+
if (await this.distributedLocks.isReadOnlyReplicaError(err)) {
|
|
60
|
+
throw new Error(`Redis is read-only. Cannot ${this.operationName}`);
|
|
61
|
+
}
|
|
62
|
+
if (this.distributedLocks.isLockTakenByAnotherClientError(err)) {
|
|
61
63
|
// At this point, another process is responsible for fetching data from
|
|
62
64
|
// the API and caching it. This process waits until the data fetching and
|
|
63
65
|
// caching is complete, then retrieves the data from the cache.
|
|
@@ -84,9 +86,6 @@ class RedisSingleExecutionService {
|
|
|
84
86
|
throw err;
|
|
85
87
|
}
|
|
86
88
|
}
|
|
87
|
-
isLockTakenByAnotherClientError(err) {
|
|
88
|
-
return err instanceof redlock_1.ExecutionError && err.message.includes('unable to achieve a quorum');
|
|
89
|
-
}
|
|
90
89
|
async subscribeForNotification(context) {
|
|
91
90
|
const { customerId, resourceId } = context;
|
|
92
91
|
const notificationChannel = (0, lodash_1.compact)([this.environmentPrefix, this.operationName, customerId, resourceId]).join(':');
|
|
@@ -181,4 +180,4 @@ __decorate([
|
|
|
181
180
|
(0, ReuseOngoingExecution_1.ReuseOngoingExecution)(({ customerId, resourceId }) => (0, lodash_1.compact)([customerId, resourceId]).join(':'))
|
|
182
181
|
], RedisSingleExecutionService.prototype, "executeOnceAcrossMultipleProcesses", null);
|
|
183
182
|
exports.RedisSingleExecutionService = RedisSingleExecutionService;
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVkaXNTaW5nbGVFeGVjdXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvY2FjaGUvUmVkaXNTaW5nbGVFeGVjdXRpb25TZXJ2aWNlL1JlZGlzU2luZ2xlRXhlY3V0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUVBLHNFQUErRDtBQUMvRCxtQ0FBaUM7QUFDakMsMkZBQXdGO0FBQ3hGLDZFQU9zQztBQUl0Qzs7O0dBR0c7QUFDSCxNQUFhLDJCQUEyQjtJQUl0QyxZQUNtQixhQUFxQixFQUNyQixpQkFBeUI7SUFDMUMsaUVBQWlFO0lBQ2pFLHFFQUFxRTtJQUNwRCxxQkFBNkIsRUFDN0IsV0FBa0IsRUFDbEIsZ0JBQWtDLEVBQ2xDLGFBQTRCLEVBQzVCLG9CQUEwQztRQVIxQyxrQkFBYSxHQUFiLGFBQWEsQ0FBUTtRQUNyQixzQkFBaUIsR0FBakIsaUJBQWlCLENBQVE7UUFHekIsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUFRO1FBQzdCLGdCQUFXLEdBQVgsV0FBVyxDQUFPO1FBQ2xCLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBa0I7UUFDbEMsa0JBQWEsR0FBYixhQUFhLENBQWU7UUFDNUIseUJBQW9CLEdBQXBCLG9CQUFvQixDQUFzQjtRQVg1Qyx5QkFBb0IsR0FBRyxJQUFJLEdBQUcsRUFBNkIsQ0FBQztRQWEzRSxJQUFJLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUMvQyxJQUFJLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUN2QyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxnQ0FBZ0MsRUFBRSxHQUFHLENBQUMsQ0FBQztZQUNoRSxJQUFJLENBQUMsb0JBQW9CLENBQUMscUJBQXFCLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVB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
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { OptionalPromise } from '../../../types';
|
|
2
|
-
import { Settings } from 'redlock';
|
|
3
2
|
export declare type OperationContext<Response> = {
|
|
4
3
|
customerId: string;
|
|
5
4
|
resourceId: string | undefined;
|
|
@@ -15,8 +14,6 @@ export declare type NotificationPayload = {
|
|
|
15
14
|
error?: string;
|
|
16
15
|
};
|
|
17
16
|
export declare type CallbackFn = (payload: NotificationPayload) => void;
|
|
18
|
-
export declare const LOCK_DURATION = 5000;
|
|
19
|
-
export declare const LOCK_NO_RETRY_SETTINGS: Partial<Settings>;
|
|
20
17
|
export declare class TimeoutError extends Error {
|
|
21
18
|
constructor();
|
|
22
19
|
}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RemoteExecutionError = exports.TimeoutError =
|
|
4
|
-
exports.LOCK_DURATION = 5000;
|
|
5
|
-
exports.LOCK_NO_RETRY_SETTINGS = { retryCount: 0 };
|
|
3
|
+
exports.RemoteExecutionError = exports.TimeoutError = void 0;
|
|
6
4
|
class TimeoutError extends Error {
|
|
7
5
|
constructor() {
|
|
8
6
|
super('Waiting for notification timed out');
|
|
@@ -15,4 +13,4 @@ class RemoteExecutionError extends Error {
|
|
|
15
13
|
}
|
|
16
14
|
}
|
|
17
15
|
exports.RemoteExecutionError = RemoteExecutionError;
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVkaXNTaW5nbGVFeGVjdXRpb24udXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvY2FjaGUvUmVkaXNTaW5nbGVFeGVjdXRpb25TZXJ2aWNlL1JlZGlzU2luZ2xlRXhlY3V0aW9uLnV0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXNCQSxNQUFhLFlBQWEsU0FBUSxLQUFLO0lBQ3JDO1FBQ0UsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7SUFDOUMsQ0FBQztDQUNGO0FBSkQsb0NBSUM7QUFFRCxNQUFhLG9CQUFxQixTQUFRLEtBQUs7SUFDN0MsWUFBWSxPQUFlO1FBQ3pCLEtBQUssQ0FBQyx5Q0FBeUMsT0FBTyxFQUFFLENBQUMsQ0FBQztJQUM1RCxDQUFDO0NBQ0Y7QUFKRCxvREFJQyJ9
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import Redis from 'ioredis';
|
|
2
|
+
import { LoggerService } from '../../loggerService';
|
|
3
|
+
import { CacheInstrumentation } from '../../cacheInstrumentation';
|
|
4
|
+
export declare class DistributedLocks {
|
|
5
|
+
private readonly redisClient;
|
|
6
|
+
private readonly loggerService;
|
|
7
|
+
private readonly redlock;
|
|
8
|
+
constructor(redisClient: Redis, loggerService: LoggerService, cacheInstrumentation: CacheInstrumentation);
|
|
9
|
+
usingSingleAttempt<T>(lockKey: string, handler: () => Promise<T>): Promise<T>;
|
|
10
|
+
using<T>(lockKey: string, handler: () => Promise<T>): Promise<T>;
|
|
11
|
+
isLockTakenByAnotherClientError(err: any): boolean;
|
|
12
|
+
isReadOnlyReplicaError(err: any): Promise<boolean | "" | undefined>;
|
|
13
|
+
cleanup(): Promise<void>;
|
|
14
|
+
}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
+
exports.DistributedLocks = void 0;
|
|
23
|
+
const redlock_1 = __importStar(require("redlock"));
|
|
24
|
+
const LOCK_DURATION = 5000;
|
|
25
|
+
const LOCK_NO_RETRY_SETTINGS = { retryCount: 0 };
|
|
26
|
+
class DistributedLocks {
|
|
27
|
+
constructor(redisClient, loggerService, cacheInstrumentation) {
|
|
28
|
+
this.redisClient = redisClient;
|
|
29
|
+
this.loggerService = loggerService;
|
|
30
|
+
this.redlock = new redlock_1.default([redisClient]);
|
|
31
|
+
this.redlock.on('clientError', (err) => {
|
|
32
|
+
this.loggerService.error('Redis client error: ', err);
|
|
33
|
+
cacheInstrumentation.trackRedisClientError({ error: err, clientName: 'redlock' });
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
async usingSingleAttempt(lockKey, handler) {
|
|
37
|
+
return this.redlock.using([lockKey], LOCK_DURATION, LOCK_NO_RETRY_SETTINGS, handler);
|
|
38
|
+
}
|
|
39
|
+
async using(lockKey, handler) {
|
|
40
|
+
try {
|
|
41
|
+
// first - try to acquire the lock without retrying in order to identify
|
|
42
|
+
// cases that the redis instance is read-only
|
|
43
|
+
return await this.usingSingleAttempt(lockKey, handler);
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
// if first attempt failed on redis instance is read-only,
|
|
47
|
+
// then we don't want to wait for it
|
|
48
|
+
if (await this.isReadOnlyReplicaError(error)) {
|
|
49
|
+
throw new Error(`Redis is read-only. Cannot acquire distributed lock`);
|
|
50
|
+
}
|
|
51
|
+
// if the lock is acquired, now wait for it to be available
|
|
52
|
+
if (this.isLockTakenByAnotherClientError(error)) {
|
|
53
|
+
return this.redlock.using([lockKey], LOCK_DURATION, handler);
|
|
54
|
+
}
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
isLockTakenByAnotherClientError(err) {
|
|
59
|
+
return err instanceof redlock_1.ExecutionError && err.message.includes('unable to achieve a quorum');
|
|
60
|
+
}
|
|
61
|
+
async isReadOnlyReplicaError(err) {
|
|
62
|
+
var _a;
|
|
63
|
+
if (!(err instanceof redlock_1.ExecutionError)) {
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
const { votesAgainst } = await err.attempts[0];
|
|
67
|
+
const message = (_a = votesAgainst.get(this.redisClient)) === null || _a === void 0 ? void 0 : _a.message;
|
|
68
|
+
return message && message.includes(`You can't write against a read only replica`);
|
|
69
|
+
}
|
|
70
|
+
async cleanup() {
|
|
71
|
+
await this.redlock.quit();
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
exports.DistributedLocks = DistributedLocks;
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGlzdHJpYnV0ZWRMb2Nrcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9jYWNoZS9yZWRpcy9kaXN0cmlidXRlZExvY2tzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFBNEQ7QUFLNUQsTUFBTSxhQUFhLEdBQUcsSUFBSSxDQUFDO0FBQzNCLE1BQU0sc0JBQXNCLEdBQXNCLEVBQUUsVUFBVSxFQUFFLENBQUMsRUFBRSxDQUFDO0FBRXBFLE1BQWEsZ0JBQWdCO0lBRzNCLFlBQ21CLFdBQWtCLEVBQ2xCLGFBQTRCLEVBQzdDLG9CQUEwQztRQUZ6QixnQkFBVyxHQUFYLFdBQVcsQ0FBTztRQUNsQixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUc3QyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksaUJBQU8sQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFFMUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsYUFBYSxFQUFFLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDckMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsc0JBQXNCLEVBQUUsR0FBRyxDQUFDLENBQUM7WUFDdEQsb0JBQW9CLENBQUMscUJBQXFCLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO1FBQ3BGLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELEtBQUssQ0FBQyxrQkFBa0IsQ0FBSSxPQUFlLEVBQUUsT0FBeUI7UUFDcEUsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLGFBQWEsRUFBRSxzQkFBc0IsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUN2RixDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBSSxPQUFlLEVBQUUsT0FBeUI7UUFDdkQsSUFBSTtZQUNGLHdFQUF3RTtZQUN4RSw2Q0FBNkM7WUFDN0MsT0FBTyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7U0FDeEQ7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLDBEQUEwRDtZQUMxRCxvQ0FBb0M7WUFDcEMsSUFBSSxNQUFNLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxLQUFLLENBQUMsRUFBRTtnQkFDNUMsTUFBTSxJQUFJLEtBQUssQ0FBQyxxREFBcUQsQ0FBQyxDQUFDO2FBQ3hFO1lBRUQsMkRBQTJEO1lBQzNELElBQUksSUFBSSxDQUFDLCtCQUErQixDQUFDLEtBQUssQ0FBQyxFQUFFO2dCQUMvQyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsYUFBYSxFQUFFLE9BQU8sQ0FBQyxDQUFDO2FBQzlEO1lBRUQsTUFBTSxLQUFLLENBQUM7U0FDYjtJQUNILENBQUM7SUFFRCwrQkFBK0IsQ0FBQyxHQUFRO1FBQ3RDLE9BQU8sR0FBRyxZQUFZLHdCQUFjLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsNEJBQTRCLENBQUMsQ0FBQztJQUM3RixDQUFDO0lBRUQsS0FBSyxDQUFDLHNCQUFzQixDQUFDLEdBQVE7O1FBQ25DLElBQUksQ0FBQyxDQUFDLEdBQUcsWUFBWSx3QkFBYyxDQUFDLEVBQUU7WUFDcEMsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUNELE1BQU0sRUFBRSxZQUFZLEVBQUUsR0FBRyxNQUFNLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0MsTUFBTSxPQUFPLEdBQUcsTUFBQSxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsMENBQUUsT0FBTyxDQUFDO1FBQzVELE9BQU8sT0FBTyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsNkNBQTZDLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBekRELDRDQXlEQyJ9
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export declare const TIMESTAMP_SUFFIX = "timestamp";
|
|
2
|
-
export declare const LOCK_DURATION = 5000;
|
|
3
2
|
export declare const DEFAULT_TTL_SECS: number;
|
|
4
3
|
export declare const REFETCH_OPERATION_NAME = "refetchEntityEntitlementsAfterCacheMiss";
|
|
5
4
|
export declare const REFETCH_NOTIFICATION_BUFFER_MS = 500;
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.REFETCH_NOTIFICATION_BUFFER_MS = exports.REFETCH_OPERATION_NAME = exports.DEFAULT_TTL_SECS = exports.
|
|
3
|
+
exports.REFETCH_NOTIFICATION_BUFFER_MS = exports.REFETCH_OPERATION_NAME = exports.DEFAULT_TTL_SECS = exports.TIMESTAMP_SUFFIX = void 0;
|
|
4
4
|
exports.TIMESTAMP_SUFFIX = 'timestamp';
|
|
5
|
-
exports.LOCK_DURATION = 5000;
|
|
6
5
|
exports.DEFAULT_TTL_SECS = 7 * 24 * 60 * 60;
|
|
7
6
|
exports.REFETCH_OPERATION_NAME = 'refetchEntityEntitlementsAfterCacheMiss';
|
|
8
7
|
exports.REFETCH_NOTIFICATION_BUFFER_MS = 500;
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNDYWNoZVNlcnZpY2UuY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL2NhY2hlL3JlZGlzQ2FjaGVTZXJ2aWNlLmNvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLGdCQUFnQixHQUFHLFdBQVcsQ0FBQztBQUMvQixRQUFBLGdCQUFnQixHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQztBQUVwQyxRQUFBLHNCQUFzQixHQUFHLHlDQUF5QyxDQUFDO0FBQ25FLFFBQUEsOEJBQThCLEdBQUcsR0FBRyxDQUFDIn0=
|
|
@@ -11,7 +11,7 @@ export declare class RedisCacheService implements CacheService {
|
|
|
11
11
|
private readonly environmentPrefix;
|
|
12
12
|
private readonly ttl;
|
|
13
13
|
private readonly redisClient;
|
|
14
|
-
private readonly
|
|
14
|
+
private readonly distributedLocks;
|
|
15
15
|
readonly distributedRefetchEntitlementsService: RedisSingleExecutionService | undefined;
|
|
16
16
|
constructor(options: Required<ClientConfiguration>, loggerService: LoggerService, cacheInstrumentation: CacheInstrumentation);
|
|
17
17
|
/**
|
|
@@ -7,12 +7,12 @@ exports.RedisCacheService = void 0;
|
|
|
7
7
|
const cachedEntitlement_1 = __importDefault(require("./cachedEntitlement"));
|
|
8
8
|
const ioredis_1 = __importDefault(require("ioredis"));
|
|
9
9
|
const lodash_1 = require("lodash");
|
|
10
|
-
const redlock_1 = __importDefault(require("redlock"));
|
|
11
10
|
const cacheKeysHelpers_1 = require("../../utils/cacheKeysHelpers");
|
|
12
11
|
const RedisSingleExecutionService_1 = require("./RedisSingleExecutionService");
|
|
13
12
|
const entitlementsService_utils_1 = require("../entitlementsService.utils");
|
|
14
13
|
const redisCacheService_constants_1 = require("./redisCacheService.constants");
|
|
15
14
|
const featureTypes_1 = require("../../utils/featureTypes");
|
|
15
|
+
const distributedLocks_1 = require("./redis/distributedLocks");
|
|
16
16
|
const GRACE_CONNECT_TIMEOUT_MS = 250;
|
|
17
17
|
const READY_STATUSES = ['connect', 'ready'];
|
|
18
18
|
class RedisCacheService {
|
|
@@ -22,13 +22,9 @@ class RedisCacheService {
|
|
|
22
22
|
const { redis: redisOptions, entitlementsTimeout } = options;
|
|
23
23
|
const { environmentPrefix, ttl = redisCacheService_constants_1.DEFAULT_TTL_SECS, distributedEntitlementsFetching = {} } = redisOptions;
|
|
24
24
|
this.redisClient = new ioredis_1.default(redisOptions);
|
|
25
|
-
this.
|
|
25
|
+
this.distributedLocks = new distributedLocks_1.DistributedLocks(this.redisClient, loggerService, cacheInstrumentation);
|
|
26
26
|
this.environmentPrefix = environmentPrefix;
|
|
27
27
|
this.ttl = ttl;
|
|
28
|
-
this.redlock.on('clientError', (err) => {
|
|
29
|
-
this.loggerService.error('Redis client error: ', err);
|
|
30
|
-
this.cacheInstrumentation.trackRedisClientError({ error: err, clientName: 'redlock' });
|
|
31
|
-
});
|
|
32
28
|
this.redisClient.on('error', (err) => {
|
|
33
29
|
this.loggerService.error('Redis client error: ', err);
|
|
34
30
|
this.cacheInstrumentation.trackRedisClientError({ error: err, clientName: 'redis' });
|
|
@@ -42,7 +38,7 @@ class RedisCacheService {
|
|
|
42
38
|
if (!distributedEntitlementsFetching.disabled) {
|
|
43
39
|
const { notificationBufferMs = redisCacheService_constants_1.REFETCH_NOTIFICATION_BUFFER_MS } = distributedEntitlementsFetching;
|
|
44
40
|
const notificationTimeoutMs = entitlementsTimeout + notificationBufferMs;
|
|
45
|
-
this.distributedRefetchEntitlementsService = new RedisSingleExecutionService_1.RedisSingleExecutionService(redisCacheService_constants_1.REFETCH_OPERATION_NAME, this.environmentPrefix, notificationTimeoutMs, this.redisClient, this.
|
|
41
|
+
this.distributedRefetchEntitlementsService = new RedisSingleExecutionService_1.RedisSingleExecutionService(redisCacheService_constants_1.REFETCH_OPERATION_NAME, this.environmentPrefix, notificationTimeoutMs, this.redisClient, this.distributedLocks, this.loggerService, this.cacheInstrumentation);
|
|
46
42
|
}
|
|
47
43
|
}
|
|
48
44
|
/**
|
|
@@ -87,7 +83,7 @@ class RedisCacheService {
|
|
|
87
83
|
return READY_STATUSES.includes(this.redisClient.status);
|
|
88
84
|
}
|
|
89
85
|
async updateFeatureUsage(params) {
|
|
90
|
-
return this.executeSafely(false, async () => {
|
|
86
|
+
return this.executeSafely('updateFeatureUsage', false, async () => {
|
|
91
87
|
const item = this.getFeatureUsageItemToUpdate(params);
|
|
92
88
|
await this.updateCacheItems([item]);
|
|
93
89
|
return true;
|
|
@@ -106,9 +102,9 @@ class RedisCacheService {
|
|
|
106
102
|
};
|
|
107
103
|
}
|
|
108
104
|
async setCustomer(customerId, customerEntitlements, resourceId, entitlementsTimestamp, featureIdToUsageTimestamp) {
|
|
109
|
-
return this.executeSafely(undefined, async () => {
|
|
105
|
+
return this.executeSafely('setCustomer', undefined, async () => {
|
|
110
106
|
const lockKey = (0, cacheKeysHelpers_1.buildLockKey)(this.environmentPrefix, customerId, resourceId);
|
|
111
|
-
await this.
|
|
107
|
+
await this.distributedLocks.using(lockKey, async () => {
|
|
112
108
|
const entitlementsItem = {
|
|
113
109
|
messageTimestamp: new Date(entitlementsTimestamp),
|
|
114
110
|
key: (0, cacheKeysHelpers_1.buildCustomerKey)(this.environmentPrefix, customerId, resourceId),
|
|
@@ -204,7 +200,7 @@ class RedisCacheService {
|
|
|
204
200
|
return true;
|
|
205
201
|
}
|
|
206
202
|
async getCustomerEntitlements(customerId, resourceId) {
|
|
207
|
-
return this.executeSafely(entitlementsService_utils_1.entitlementsResponseMapper.cacheMiss(), async () => {
|
|
203
|
+
return this.executeSafely('getCustomerEntitlements', entitlementsService_utils_1.entitlementsResponseMapper.cacheMiss(), async () => {
|
|
208
204
|
const response = await this.getCustomerEntitlementsWithoutUsage(customerId, resourceId);
|
|
209
205
|
if (response.cacheMiss) {
|
|
210
206
|
return response;
|
|
@@ -314,11 +310,11 @@ class RedisCacheService {
|
|
|
314
310
|
}
|
|
315
311
|
async cleanup() {
|
|
316
312
|
var _a;
|
|
317
|
-
await this.
|
|
313
|
+
await this.distributedLocks.cleanup();
|
|
318
314
|
await ((_a = this.distributedRefetchEntitlementsService) === null || _a === void 0 ? void 0 : _a.cleanup());
|
|
319
315
|
}
|
|
320
316
|
async getCustomerEntitlement(featureId, customerId, resourceId) {
|
|
321
|
-
return this.executeSafely({
|
|
317
|
+
return this.executeSafely('getCustomerEntitlement', {
|
|
322
318
|
cacheMiss: true,
|
|
323
319
|
customerExists: false,
|
|
324
320
|
entitlement: null,
|
|
@@ -355,7 +351,7 @@ class RedisCacheService {
|
|
|
355
351
|
}
|
|
356
352
|
return new cachedEntitlement_1.default(calculatedEntitlement, Object.assign(Object.assign({}, featureUsage), cachedUsage));
|
|
357
353
|
}
|
|
358
|
-
async executeSafely(defaultValue, operation) {
|
|
354
|
+
async executeSafely(operationName, defaultValue, operation) {
|
|
359
355
|
if (!this.isClientConnected()) {
|
|
360
356
|
return defaultValue;
|
|
361
357
|
}
|
|
@@ -363,10 +359,10 @@ class RedisCacheService {
|
|
|
363
359
|
return await operation();
|
|
364
360
|
}
|
|
365
361
|
catch (error) {
|
|
366
|
-
this.loggerService.error(
|
|
362
|
+
this.loggerService.error(`Redis cache service: got error during ${operationName} (silent ignore it)`, error.stack);
|
|
367
363
|
return defaultValue;
|
|
368
364
|
}
|
|
369
365
|
}
|
|
370
366
|
}
|
|
371
367
|
exports.RedisCacheService = RedisCacheService;
|
|
372
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"redisCacheService.js","sourceRoot":"","sources":["../../../src/services/cache/redisCacheService.ts"],"names":[],"mappings":"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"}
|
|
368
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"redisCacheService.js","sourceRoot":"","sources":["../../../src/services/cache/redisCacheService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stigg/node-server-sdk",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.78.0",
|
|
4
4
|
"description": "Stigg server-side node SDK",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"npm-run-all": "^4.1.5",
|
|
76
76
|
"prettier": "^2.1.1",
|
|
77
77
|
"pretty-quick": "^3.1.3",
|
|
78
|
-
"redis-memory-server": "^0.
|
|
78
|
+
"redis-memory-server": "^0.12.1",
|
|
79
79
|
"standard-version": "^9.0.0",
|
|
80
80
|
"ts-jest": "^27.0.7",
|
|
81
81
|
"ts-node": "^9.0.0",
|