@adtrackify/at-service-common 3.0.72 → 3.0.74
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/cjs/services/db/identity-cache-db-service.d.ts +5 -7
- package/dist/cjs/services/db/identity-cache-db-service.js +84 -57
- package/dist/cjs/services/db/identity-cache-db-service.js.map +1 -1
- package/dist/esm/services/db/identity-cache-db-service.d.ts +5 -7
- package/dist/esm/services/db/identity-cache-db-service.js +85 -58
- package/dist/esm/services/db/identity-cache-db-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventIdentity } from '@adtrackify/at-tracking-event-types';
|
|
2
|
-
import { IdentityClient } from '../../clients';
|
|
3
|
-
import { RedisClient } from '../../clients/generic/redis-client';
|
|
2
|
+
import { CacheLambdaClient, IdentityClient } from '../../clients';
|
|
4
3
|
export interface IdentityCache {
|
|
5
4
|
identityId: string;
|
|
6
5
|
request?: EventIdentity;
|
|
@@ -14,12 +13,11 @@ export declare class IdentityCacheDbService {
|
|
|
14
13
|
TABLE_KEY: string;
|
|
15
14
|
TTL_IN_MONTHS: number;
|
|
16
15
|
identityClient: IdentityClient;
|
|
17
|
-
|
|
18
|
-
constructor(
|
|
16
|
+
cacheLambdaClient: CacheLambdaClient;
|
|
17
|
+
constructor(cacheLambdaFunctionArn: string, tableName: string, tableKey: string, baseApiUrl: string, cacheTtlInMonths?: number);
|
|
19
18
|
getIdentityWithCaching: (pixelId: string, incomingIdentity?: EventIdentity) => Promise<EventIdentity | undefined>;
|
|
20
|
-
updateIdentityCacheRedis: (pixelId: string, request: EventIdentity, response: EventIdentity) => Promise<
|
|
21
|
-
|
|
22
|
-
deleteIdentityCacheDynamoDb: (incomingIdentity: EventIdentity, resolvedIdentity: EventIdentity) => Promise<void>;
|
|
19
|
+
updateIdentityCacheRedis: (pixelId: string, request: EventIdentity, response: EventIdentity) => Promise<import("../../clients").CacheRequestCommandResponse[] | undefined>;
|
|
20
|
+
private getIdentityCache;
|
|
23
21
|
getIdentityFromCache(pixelId: string, incomingIdentity: EventIdentity): Promise<{
|
|
24
22
|
resolvedIdentity: EventIdentity | undefined;
|
|
25
23
|
updateCache: boolean;
|
|
@@ -4,7 +4,6 @@ exports.IdentityCacheDbService = void 0;
|
|
|
4
4
|
const clients_1 = require("../../clients");
|
|
5
5
|
const libs_1 = require("../../libs");
|
|
6
6
|
const helpers_1 = require("../../helpers");
|
|
7
|
-
const redis_client_1 = require("../../clients/generic/redis-client");
|
|
8
7
|
const identity_cache_helper_1 = require("../../helpers/identity-cache-helper");
|
|
9
8
|
const DEFAULT_CACHE_TTL_IN_MONTHS = 6;
|
|
10
9
|
const IDENTITY_CACHE_TTL_IN_SECONDS = 60 * 60 * 24 * 30 * 6;
|
|
@@ -13,11 +12,11 @@ class IdentityCacheDbService {
|
|
|
13
12
|
TABLE_KEY;
|
|
14
13
|
TTL_IN_MONTHS;
|
|
15
14
|
identityClient;
|
|
16
|
-
|
|
17
|
-
constructor(
|
|
15
|
+
cacheLambdaClient;
|
|
16
|
+
constructor(cacheLambdaFunctionArn, tableName, tableKey, baseApiUrl, cacheTtlInMonths) {
|
|
18
17
|
this.TABLE_NAME = tableName;
|
|
19
18
|
this.TABLE_KEY = tableKey;
|
|
20
|
-
this.
|
|
19
|
+
this.cacheLambdaClient = new clients_1.CacheLambdaClient(cacheLambdaFunctionArn);
|
|
21
20
|
if (cacheTtlInMonths) {
|
|
22
21
|
this.TTL_IN_MONTHS = cacheTtlInMonths;
|
|
23
22
|
}
|
|
@@ -63,39 +62,60 @@ class IdentityCacheDbService {
|
|
|
63
62
|
response,
|
|
64
63
|
updatedAt: (0, libs_1.getCurrentTimestamp)(),
|
|
65
64
|
};
|
|
65
|
+
const setCacheCommands = [];
|
|
66
66
|
const cacheKey = `identId_${pixelId}_${response.identityId}`;
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
setCacheCommands.push({
|
|
68
|
+
cacheKey,
|
|
69
|
+
commandType: 'set',
|
|
70
|
+
data: JSON.stringify(identityCache),
|
|
71
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
72
|
+
});
|
|
69
73
|
if (request?.identityId) {
|
|
70
74
|
const cacheKey = `identId_${pixelId}_${request.identityId}`;
|
|
71
|
-
|
|
72
|
-
|
|
75
|
+
setCacheCommands.push({
|
|
76
|
+
cacheKey,
|
|
77
|
+
commandType: 'set',
|
|
78
|
+
data: JSON.stringify(identityCache),
|
|
79
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
80
|
+
});
|
|
73
81
|
}
|
|
74
82
|
if (response?.traits?.emails && response?.traits?.emails?.length > 0) {
|
|
75
83
|
for (let i = 0; i < response.traits.emails.length; i++) {
|
|
76
84
|
const cacheKey = `identEmail_${pixelId}_${response.traits.emails[i]}`;
|
|
77
|
-
|
|
78
|
-
|
|
85
|
+
setCacheCommands.push({
|
|
86
|
+
cacheKey,
|
|
87
|
+
commandType: 'set',
|
|
88
|
+
data: JSON.stringify(identityCache),
|
|
89
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
90
|
+
});
|
|
79
91
|
}
|
|
80
92
|
}
|
|
81
93
|
if (response?.traits?.userIds && response?.traits?.userIds?.length > 0) {
|
|
82
94
|
for (let i = 0; i < response.traits.userIds.length; i++) {
|
|
83
95
|
const cacheKey = `identUserId_${pixelId}_${response.traits.userIds[i]}`;
|
|
84
|
-
|
|
85
|
-
|
|
96
|
+
setCacheCommands.push({
|
|
97
|
+
cacheKey,
|
|
98
|
+
commandType: 'set',
|
|
99
|
+
data: JSON.stringify(identityCache),
|
|
100
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
101
|
+
});
|
|
86
102
|
}
|
|
87
103
|
}
|
|
104
|
+
const start = performance.now();
|
|
105
|
+
const res = await this.cacheLambdaClient.batchInvoke(setCacheCommands);
|
|
106
|
+
const end = performance.now();
|
|
107
|
+
helpers_1.Logger.debug('updated identity cache', { res, duration: end - start });
|
|
108
|
+
return res;
|
|
88
109
|
};
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
if (resolvedIdentity?.identityId) {
|
|
97
|
-
await clients_1.DynamoDbClient.safeDelete(this.TABLE_NAME, this.TABLE_KEY, resolvedIdentity?.identityId);
|
|
110
|
+
getIdentityCache = async (cacheKey) => {
|
|
111
|
+
const start = performance.now();
|
|
112
|
+
const cacheResponse = await this.cacheLambdaClient.invokeGet(cacheKey);
|
|
113
|
+
const end = performance.now();
|
|
114
|
+
helpers_1.Logger.debug('getIdentityCache', { cacheKey, cacheResponse, duration: end - start });
|
|
115
|
+
if (cacheResponse && cacheResponse.responseData) {
|
|
116
|
+
return JSON.parse(cacheResponse.responseData);
|
|
98
117
|
}
|
|
118
|
+
return undefined;
|
|
99
119
|
};
|
|
100
120
|
async getIdentityFromCache(pixelId, incomingIdentity) {
|
|
101
121
|
try {
|
|
@@ -107,13 +127,12 @@ class IdentityCacheDbService {
|
|
|
107
127
|
if (incomingIdentity?.identityId) {
|
|
108
128
|
const cacheKey = `identId_${pixelId}_${incomingIdentity.identityId}`;
|
|
109
129
|
helpers_1.Logger.debug(' try lookup with identityId', { cacheKey });
|
|
110
|
-
const cachedIdentity = await this.
|
|
130
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
111
131
|
if (cachedIdentity) {
|
|
112
132
|
helpers_1.Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
resolvedIdentity = identityCache.response;
|
|
133
|
+
if (!(0, identity_cache_helper_1.isIdentityCacheStale)(cachedIdentity, incomingIdentity)) {
|
|
134
|
+
helpers_1.Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
135
|
+
resolvedIdentity = cachedIdentity.response;
|
|
117
136
|
}
|
|
118
137
|
}
|
|
119
138
|
}
|
|
@@ -121,13 +140,12 @@ class IdentityCacheDbService {
|
|
|
121
140
|
for (let i = 0; i < incomingIdentity.traits.emails.length; i++) {
|
|
122
141
|
const cacheKey = `identEmail_${pixelId}_${incomingIdentity.traits.emails[i]}`;
|
|
123
142
|
helpers_1.Logger.debug(' try lookup with email', { cacheKey });
|
|
124
|
-
const cachedIdentity = await this.
|
|
143
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
125
144
|
if (cachedIdentity) {
|
|
126
145
|
helpers_1.Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
resolvedIdentity = identityCache.response;
|
|
146
|
+
if (!(0, identity_cache_helper_1.isIdentityCacheStale)(cachedIdentity, incomingIdentity)) {
|
|
147
|
+
helpers_1.Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
148
|
+
resolvedIdentity = cachedIdentity.response;
|
|
131
149
|
updateCache = true;
|
|
132
150
|
break;
|
|
133
151
|
}
|
|
@@ -138,28 +156,18 @@ class IdentityCacheDbService {
|
|
|
138
156
|
for (let i = 0; i < incomingIdentity.traits.userIds.length; i++) {
|
|
139
157
|
const cacheKey = `identUserId_${pixelId}_${incomingIdentity.traits.userIds[i]}`;
|
|
140
158
|
helpers_1.Logger.debug(' try lookup with userId', { cacheKey });
|
|
141
|
-
const cachedIdentity = await this.
|
|
159
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
142
160
|
if (cachedIdentity) {
|
|
143
161
|
helpers_1.Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
resolvedIdentity = identityCache.response;
|
|
162
|
+
if (!(0, identity_cache_helper_1.isIdentityCacheStale)(cachedIdentity, incomingIdentity)) {
|
|
163
|
+
helpers_1.Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
164
|
+
resolvedIdentity = cachedIdentity.response;
|
|
148
165
|
updateCache = true;
|
|
149
166
|
break;
|
|
150
167
|
}
|
|
151
168
|
}
|
|
152
169
|
}
|
|
153
170
|
}
|
|
154
|
-
if (!resolvedIdentity) {
|
|
155
|
-
const identityCache = incomingIdentity?.identityId ? await this.getIdentityCacheFromDynamoDb(incomingIdentity?.identityId) : undefined;
|
|
156
|
-
if (identityCache) {
|
|
157
|
-
if (!(0, identity_cache_helper_1.isIdentityCacheStale)(identityCache, incomingIdentity)) {
|
|
158
|
-
resolvedIdentity = identityCache.response;
|
|
159
|
-
updateCache = true;
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
171
|
return { resolvedIdentity, updateCache };
|
|
164
172
|
}
|
|
165
173
|
catch (err) {
|
|
@@ -169,36 +177,55 @@ class IdentityCacheDbService {
|
|
|
169
177
|
}
|
|
170
178
|
async deleteIdentityCache(pixelId, incomingIdentity, resolvedIdentity) {
|
|
171
179
|
await this.deleteIdentityCacheRedis(pixelId, incomingIdentity, resolvedIdentity);
|
|
172
|
-
await this.deleteIdentityCacheDynamoDb(incomingIdentity, resolvedIdentity);
|
|
173
180
|
}
|
|
174
181
|
async deleteIdentityCacheRedis(pixelId, incomingIdentity, resolvedIdentity) {
|
|
175
182
|
try {
|
|
176
183
|
if (!pixelId) {
|
|
177
184
|
return;
|
|
178
185
|
}
|
|
179
|
-
const
|
|
186
|
+
const deleteCacheCommands = [];
|
|
180
187
|
if (incomingIdentity?.traits?.emails && incomingIdentity?.traits?.emails?.length > 0) {
|
|
181
|
-
|
|
188
|
+
const cmds = incomingIdentity.traits.emails.map(email => ({
|
|
189
|
+
cacheKey: `identEmail_${pixelId}_${email}`,
|
|
190
|
+
commandType: 'delete',
|
|
191
|
+
}));
|
|
192
|
+
deleteCacheCommands.push(...cmds);
|
|
182
193
|
}
|
|
183
194
|
if (incomingIdentity?.traits?.userIds && incomingIdentity?.traits?.userIds.length > 0) {
|
|
184
|
-
|
|
195
|
+
const cmds = incomingIdentity.traits.userIds.map(userId => ({
|
|
196
|
+
cacheKey: `identUserId_${pixelId}_${userId}`,
|
|
197
|
+
commandType: 'delete',
|
|
198
|
+
}));
|
|
199
|
+
deleteCacheCommands.push(...cmds);
|
|
185
200
|
}
|
|
186
201
|
if (incomingIdentity?.identityId) {
|
|
187
|
-
|
|
202
|
+
deleteCacheCommands.push({
|
|
203
|
+
cacheKey: `identId_${pixelId}_${incomingIdentity.identityId}`,
|
|
204
|
+
commandType: 'delete',
|
|
205
|
+
});
|
|
188
206
|
}
|
|
189
207
|
if (resolvedIdentity?.traits?.emails && resolvedIdentity?.traits?.emails.length > 0) {
|
|
190
|
-
|
|
208
|
+
const cmds = resolvedIdentity.traits.emails.map(email => ({
|
|
209
|
+
cacheKey: `identEmail_${pixelId}_${email}`,
|
|
210
|
+
commandType: 'delete',
|
|
211
|
+
}));
|
|
212
|
+
deleteCacheCommands.push(...cmds);
|
|
191
213
|
}
|
|
192
214
|
if (resolvedIdentity?.traits?.userIds && resolvedIdentity?.traits?.userIds.length > 0) {
|
|
193
|
-
|
|
215
|
+
const cmds = resolvedIdentity.traits.userIds.map(userId => ({
|
|
216
|
+
cacheKey: `identUserId_${pixelId}_${userId}`,
|
|
217
|
+
commandType: 'delete',
|
|
218
|
+
}));
|
|
219
|
+
deleteCacheCommands.push(...cmds);
|
|
194
220
|
}
|
|
195
221
|
if (resolvedIdentity?.identityId) {
|
|
196
|
-
|
|
222
|
+
deleteCacheCommands.push({
|
|
223
|
+
cacheKey: `identId_${pixelId}_${resolvedIdentity.identityId}`,
|
|
224
|
+
commandType: 'delete',
|
|
225
|
+
});
|
|
197
226
|
}
|
|
198
|
-
if (
|
|
199
|
-
|
|
200
|
-
await this.redisClient.del(keysToDelete[i]);
|
|
201
|
-
}
|
|
227
|
+
if (deleteCacheCommands.length > 0) {
|
|
228
|
+
await this.cacheLambdaClient.batchInvoke(deleteCacheCommands);
|
|
202
229
|
}
|
|
203
230
|
}
|
|
204
231
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/identity-cache-db-service.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"identity-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/identity-cache-db-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { EventIdentity } from '@adtrackify/at-tracking-event-types';
|
|
2
|
-
import { IdentityClient } from '../../clients';
|
|
3
|
-
import { RedisClient } from '../../clients/generic/redis-client';
|
|
2
|
+
import { CacheLambdaClient, IdentityClient } from '../../clients';
|
|
4
3
|
export interface IdentityCache {
|
|
5
4
|
identityId: string;
|
|
6
5
|
request?: EventIdentity;
|
|
@@ -14,12 +13,11 @@ export declare class IdentityCacheDbService {
|
|
|
14
13
|
TABLE_KEY: string;
|
|
15
14
|
TTL_IN_MONTHS: number;
|
|
16
15
|
identityClient: IdentityClient;
|
|
17
|
-
|
|
18
|
-
constructor(
|
|
16
|
+
cacheLambdaClient: CacheLambdaClient;
|
|
17
|
+
constructor(cacheLambdaFunctionArn: string, tableName: string, tableKey: string, baseApiUrl: string, cacheTtlInMonths?: number);
|
|
19
18
|
getIdentityWithCaching: (pixelId: string, incomingIdentity?: EventIdentity) => Promise<EventIdentity | undefined>;
|
|
20
|
-
updateIdentityCacheRedis: (pixelId: string, request: EventIdentity, response: EventIdentity) => Promise<
|
|
21
|
-
|
|
22
|
-
deleteIdentityCacheDynamoDb: (incomingIdentity: EventIdentity, resolvedIdentity: EventIdentity) => Promise<void>;
|
|
19
|
+
updateIdentityCacheRedis: (pixelId: string, request: EventIdentity, response: EventIdentity) => Promise<import("../../clients").CacheRequestCommandResponse[] | undefined>;
|
|
20
|
+
private getIdentityCache;
|
|
23
21
|
getIdentityFromCache(pixelId: string, incomingIdentity: EventIdentity): Promise<{
|
|
24
22
|
resolvedIdentity: EventIdentity | undefined;
|
|
25
23
|
updateCache: boolean;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CacheLambdaClient, IdentityClient } from '../../clients';
|
|
2
2
|
import { getCurrentTimestamp } from '../../libs';
|
|
3
3
|
import { Logger } from '../../helpers';
|
|
4
|
-
import { RedisClient } from '../../clients/generic/redis-client';
|
|
5
4
|
import { isIdentityCacheStale } from '../../helpers/identity-cache-helper';
|
|
6
5
|
const DEFAULT_CACHE_TTL_IN_MONTHS = 6;
|
|
7
6
|
const IDENTITY_CACHE_TTL_IN_SECONDS = 60 * 60 * 24 * 30 * 6;
|
|
@@ -10,11 +9,11 @@ export class IdentityCacheDbService {
|
|
|
10
9
|
TABLE_KEY;
|
|
11
10
|
TTL_IN_MONTHS;
|
|
12
11
|
identityClient;
|
|
13
|
-
|
|
14
|
-
constructor(
|
|
12
|
+
cacheLambdaClient;
|
|
13
|
+
constructor(cacheLambdaFunctionArn, tableName, tableKey, baseApiUrl, cacheTtlInMonths) {
|
|
15
14
|
this.TABLE_NAME = tableName;
|
|
16
15
|
this.TABLE_KEY = tableKey;
|
|
17
|
-
this.
|
|
16
|
+
this.cacheLambdaClient = new CacheLambdaClient(cacheLambdaFunctionArn);
|
|
18
17
|
if (cacheTtlInMonths) {
|
|
19
18
|
this.TTL_IN_MONTHS = cacheTtlInMonths;
|
|
20
19
|
}
|
|
@@ -60,39 +59,60 @@ export class IdentityCacheDbService {
|
|
|
60
59
|
response,
|
|
61
60
|
updatedAt: getCurrentTimestamp(),
|
|
62
61
|
};
|
|
62
|
+
const setCacheCommands = [];
|
|
63
63
|
const cacheKey = `identId_${pixelId}_${response.identityId}`;
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
setCacheCommands.push({
|
|
65
|
+
cacheKey,
|
|
66
|
+
commandType: 'set',
|
|
67
|
+
data: JSON.stringify(identityCache),
|
|
68
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
69
|
+
});
|
|
66
70
|
if (request?.identityId) {
|
|
67
71
|
const cacheKey = `identId_${pixelId}_${request.identityId}`;
|
|
68
|
-
|
|
69
|
-
|
|
72
|
+
setCacheCommands.push({
|
|
73
|
+
cacheKey,
|
|
74
|
+
commandType: 'set',
|
|
75
|
+
data: JSON.stringify(identityCache),
|
|
76
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
77
|
+
});
|
|
70
78
|
}
|
|
71
79
|
if (response?.traits?.emails && response?.traits?.emails?.length > 0) {
|
|
72
80
|
for (let i = 0; i < response.traits.emails.length; i++) {
|
|
73
81
|
const cacheKey = `identEmail_${pixelId}_${response.traits.emails[i]}`;
|
|
74
|
-
|
|
75
|
-
|
|
82
|
+
setCacheCommands.push({
|
|
83
|
+
cacheKey,
|
|
84
|
+
commandType: 'set',
|
|
85
|
+
data: JSON.stringify(identityCache),
|
|
86
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
87
|
+
});
|
|
76
88
|
}
|
|
77
89
|
}
|
|
78
90
|
if (response?.traits?.userIds && response?.traits?.userIds?.length > 0) {
|
|
79
91
|
for (let i = 0; i < response.traits.userIds.length; i++) {
|
|
80
92
|
const cacheKey = `identUserId_${pixelId}_${response.traits.userIds[i]}`;
|
|
81
|
-
|
|
82
|
-
|
|
93
|
+
setCacheCommands.push({
|
|
94
|
+
cacheKey,
|
|
95
|
+
commandType: 'set',
|
|
96
|
+
data: JSON.stringify(identityCache),
|
|
97
|
+
expires: IDENTITY_CACHE_TTL_IN_SECONDS,
|
|
98
|
+
});
|
|
83
99
|
}
|
|
84
100
|
}
|
|
101
|
+
const start = performance.now();
|
|
102
|
+
const res = await this.cacheLambdaClient.batchInvoke(setCacheCommands);
|
|
103
|
+
const end = performance.now();
|
|
104
|
+
Logger.debug('updated identity cache', { res, duration: end - start });
|
|
105
|
+
return res;
|
|
85
106
|
};
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if (resolvedIdentity?.identityId) {
|
|
94
|
-
await DynamoDbClient.safeDelete(this.TABLE_NAME, this.TABLE_KEY, resolvedIdentity?.identityId);
|
|
107
|
+
getIdentityCache = async (cacheKey) => {
|
|
108
|
+
const start = performance.now();
|
|
109
|
+
const cacheResponse = await this.cacheLambdaClient.invokeGet(cacheKey);
|
|
110
|
+
const end = performance.now();
|
|
111
|
+
Logger.debug('getIdentityCache', { cacheKey, cacheResponse, duration: end - start });
|
|
112
|
+
if (cacheResponse && cacheResponse.responseData) {
|
|
113
|
+
return JSON.parse(cacheResponse.responseData);
|
|
95
114
|
}
|
|
115
|
+
return undefined;
|
|
96
116
|
};
|
|
97
117
|
async getIdentityFromCache(pixelId, incomingIdentity) {
|
|
98
118
|
try {
|
|
@@ -104,13 +124,12 @@ export class IdentityCacheDbService {
|
|
|
104
124
|
if (incomingIdentity?.identityId) {
|
|
105
125
|
const cacheKey = `identId_${pixelId}_${incomingIdentity.identityId}`;
|
|
106
126
|
Logger.debug(' try lookup with identityId', { cacheKey });
|
|
107
|
-
const cachedIdentity = await this.
|
|
127
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
108
128
|
if (cachedIdentity) {
|
|
109
129
|
Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
resolvedIdentity = identityCache.response;
|
|
130
|
+
if (!isIdentityCacheStale(cachedIdentity, incomingIdentity)) {
|
|
131
|
+
Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
132
|
+
resolvedIdentity = cachedIdentity.response;
|
|
114
133
|
}
|
|
115
134
|
}
|
|
116
135
|
}
|
|
@@ -118,13 +137,12 @@ export class IdentityCacheDbService {
|
|
|
118
137
|
for (let i = 0; i < incomingIdentity.traits.emails.length; i++) {
|
|
119
138
|
const cacheKey = `identEmail_${pixelId}_${incomingIdentity.traits.emails[i]}`;
|
|
120
139
|
Logger.debug(' try lookup with email', { cacheKey });
|
|
121
|
-
const cachedIdentity = await this.
|
|
140
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
122
141
|
if (cachedIdentity) {
|
|
123
142
|
Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
resolvedIdentity = identityCache.response;
|
|
143
|
+
if (!isIdentityCacheStale(cachedIdentity, incomingIdentity)) {
|
|
144
|
+
Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
145
|
+
resolvedIdentity = cachedIdentity.response;
|
|
128
146
|
updateCache = true;
|
|
129
147
|
break;
|
|
130
148
|
}
|
|
@@ -135,28 +153,18 @@ export class IdentityCacheDbService {
|
|
|
135
153
|
for (let i = 0; i < incomingIdentity.traits.userIds.length; i++) {
|
|
136
154
|
const cacheKey = `identUserId_${pixelId}_${incomingIdentity.traits.userIds[i]}`;
|
|
137
155
|
Logger.debug(' try lookup with userId', { cacheKey });
|
|
138
|
-
const cachedIdentity = await this.
|
|
156
|
+
const cachedIdentity = await this.getIdentityCache(cacheKey);
|
|
139
157
|
if (cachedIdentity) {
|
|
140
158
|
Logger.debug(' found cached identity', { cacheKey, cachedIdentity });
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
resolvedIdentity = identityCache.response;
|
|
159
|
+
if (!isIdentityCacheStale(cachedIdentity, incomingIdentity)) {
|
|
160
|
+
Logger.debug('cache not stale', { cacheKey, cachedIdentity });
|
|
161
|
+
resolvedIdentity = cachedIdentity.response;
|
|
145
162
|
updateCache = true;
|
|
146
163
|
break;
|
|
147
164
|
}
|
|
148
165
|
}
|
|
149
166
|
}
|
|
150
167
|
}
|
|
151
|
-
if (!resolvedIdentity) {
|
|
152
|
-
const identityCache = incomingIdentity?.identityId ? await this.getIdentityCacheFromDynamoDb(incomingIdentity?.identityId) : undefined;
|
|
153
|
-
if (identityCache) {
|
|
154
|
-
if (!isIdentityCacheStale(identityCache, incomingIdentity)) {
|
|
155
|
-
resolvedIdentity = identityCache.response;
|
|
156
|
-
updateCache = true;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
168
|
return { resolvedIdentity, updateCache };
|
|
161
169
|
}
|
|
162
170
|
catch (err) {
|
|
@@ -166,36 +174,55 @@ export class IdentityCacheDbService {
|
|
|
166
174
|
}
|
|
167
175
|
async deleteIdentityCache(pixelId, incomingIdentity, resolvedIdentity) {
|
|
168
176
|
await this.deleteIdentityCacheRedis(pixelId, incomingIdentity, resolvedIdentity);
|
|
169
|
-
await this.deleteIdentityCacheDynamoDb(incomingIdentity, resolvedIdentity);
|
|
170
177
|
}
|
|
171
178
|
async deleteIdentityCacheRedis(pixelId, incomingIdentity, resolvedIdentity) {
|
|
172
179
|
try {
|
|
173
180
|
if (!pixelId) {
|
|
174
181
|
return;
|
|
175
182
|
}
|
|
176
|
-
const
|
|
183
|
+
const deleteCacheCommands = [];
|
|
177
184
|
if (incomingIdentity?.traits?.emails && incomingIdentity?.traits?.emails?.length > 0) {
|
|
178
|
-
|
|
185
|
+
const cmds = incomingIdentity.traits.emails.map(email => ({
|
|
186
|
+
cacheKey: `identEmail_${pixelId}_${email}`,
|
|
187
|
+
commandType: 'delete',
|
|
188
|
+
}));
|
|
189
|
+
deleteCacheCommands.push(...cmds);
|
|
179
190
|
}
|
|
180
191
|
if (incomingIdentity?.traits?.userIds && incomingIdentity?.traits?.userIds.length > 0) {
|
|
181
|
-
|
|
192
|
+
const cmds = incomingIdentity.traits.userIds.map(userId => ({
|
|
193
|
+
cacheKey: `identUserId_${pixelId}_${userId}`,
|
|
194
|
+
commandType: 'delete',
|
|
195
|
+
}));
|
|
196
|
+
deleteCacheCommands.push(...cmds);
|
|
182
197
|
}
|
|
183
198
|
if (incomingIdentity?.identityId) {
|
|
184
|
-
|
|
199
|
+
deleteCacheCommands.push({
|
|
200
|
+
cacheKey: `identId_${pixelId}_${incomingIdentity.identityId}`,
|
|
201
|
+
commandType: 'delete',
|
|
202
|
+
});
|
|
185
203
|
}
|
|
186
204
|
if (resolvedIdentity?.traits?.emails && resolvedIdentity?.traits?.emails.length > 0) {
|
|
187
|
-
|
|
205
|
+
const cmds = resolvedIdentity.traits.emails.map(email => ({
|
|
206
|
+
cacheKey: `identEmail_${pixelId}_${email}`,
|
|
207
|
+
commandType: 'delete',
|
|
208
|
+
}));
|
|
209
|
+
deleteCacheCommands.push(...cmds);
|
|
188
210
|
}
|
|
189
211
|
if (resolvedIdentity?.traits?.userIds && resolvedIdentity?.traits?.userIds.length > 0) {
|
|
190
|
-
|
|
212
|
+
const cmds = resolvedIdentity.traits.userIds.map(userId => ({
|
|
213
|
+
cacheKey: `identUserId_${pixelId}_${userId}`,
|
|
214
|
+
commandType: 'delete',
|
|
215
|
+
}));
|
|
216
|
+
deleteCacheCommands.push(...cmds);
|
|
191
217
|
}
|
|
192
218
|
if (resolvedIdentity?.identityId) {
|
|
193
|
-
|
|
219
|
+
deleteCacheCommands.push({
|
|
220
|
+
cacheKey: `identId_${pixelId}_${resolvedIdentity.identityId}`,
|
|
221
|
+
commandType: 'delete',
|
|
222
|
+
});
|
|
194
223
|
}
|
|
195
|
-
if (
|
|
196
|
-
|
|
197
|
-
await this.redisClient.del(keysToDelete[i]);
|
|
198
|
-
}
|
|
224
|
+
if (deleteCacheCommands.length > 0) {
|
|
225
|
+
await this.cacheLambdaClient.batchInvoke(deleteCacheCommands);
|
|
199
226
|
}
|
|
200
227
|
}
|
|
201
228
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/identity-cache-db-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"identity-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/identity-cache-db-service.ts"],"names":[],"mappings":"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"}
|