@adtrackify/at-service-common 3.0.76 → 3.0.78
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.
|
@@ -31,7 +31,6 @@ class IpDataLookupService {
|
|
|
31
31
|
};
|
|
32
32
|
lookupIP = async (ipAddress) => {
|
|
33
33
|
try {
|
|
34
|
-
const expiresAt = luxon_1.DateTime.now().plus({ days: 15 }).toSeconds();
|
|
35
34
|
if (!ipAddress || (0, net_1.isIP)(ipAddress) === 0) {
|
|
36
35
|
helpers_1.Logger.warn('Unable to lookup IP. Invalid Ip Address', { ipAddress });
|
|
37
36
|
return null;
|
|
@@ -43,6 +42,7 @@ class IpDataLookupService {
|
|
|
43
42
|
return cachedResult.lookupResponse;
|
|
44
43
|
}
|
|
45
44
|
const lookupResponse = await this.getLookupApi(ipAddress);
|
|
45
|
+
const expires = 60 * 60 * 24 * 15;
|
|
46
46
|
let lookupTableRecord;
|
|
47
47
|
if (cachedResult) {
|
|
48
48
|
lookupTableRecord = {
|
|
@@ -50,22 +50,16 @@ class IpDataLookupService {
|
|
|
50
50
|
lookupResponse,
|
|
51
51
|
updatedAt: (0, libs_1.getCurrentTimestamp)(),
|
|
52
52
|
};
|
|
53
|
-
if (!cachedResult?.expiresAt) {
|
|
54
|
-
const expiresAt = luxon_1.DateTime.now().plus({ days: 15 }).toSeconds();
|
|
55
|
-
lookupTableRecord.expiresAt = expiresAt;
|
|
56
|
-
}
|
|
57
53
|
}
|
|
58
54
|
else {
|
|
59
|
-
const expiresAt = luxon_1.DateTime.now().plus({ days: 15 }).toSeconds();
|
|
60
55
|
lookupTableRecord = {
|
|
61
56
|
ipAddress,
|
|
62
57
|
lookupResponse,
|
|
63
58
|
createdAt: (0, libs_1.getCurrentTimestamp)(),
|
|
64
|
-
updatedAt: (0, libs_1.getCurrentTimestamp)()
|
|
65
|
-
expiresAt
|
|
59
|
+
updatedAt: (0, libs_1.getCurrentTimestamp)()
|
|
66
60
|
};
|
|
67
61
|
}
|
|
68
|
-
await this.cacheLambdaClient.invokeSet(`ipdata-${ipAddress}`, JSON.stringify(lookupTableRecord),
|
|
62
|
+
await this.cacheLambdaClient.invokeSet(`ipdata-${ipAddress}`, JSON.stringify(lookupTableRecord), expires);
|
|
69
63
|
return lookupResponse;
|
|
70
64
|
}
|
|
71
65
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC,wCAAiE;AACjE,wCAAoC;AACpC,kCAA8C;AAC9C,6BAA2B;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAU3E,MAAa,mBAAmB;IAEV;IADpB,iBAAiB,CAAoB;IACrC,YAAoB,sBAA8B;QAA9B,2BAAsB,GAAtB,sBAAsB,CAAQ;QAChD,IAAI,CAAC,iBAAiB,GAAG,IAAI,2BAAiB,CAAC,sBAAsB,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACzE,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;YAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;YACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;SACpC;QAAC,OAAO,KAAK,EAAE;YACd,gBAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;IACF,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC,CAAA;IACD,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACrE,IAAI;YACF,
|
|
1
|
+
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC,wCAAiE;AACjE,wCAAoC;AACpC,kCAA8C;AAC9C,6BAA2B;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAU3E,MAAa,mBAAmB;IAEV;IADpB,iBAAiB,CAAoB;IACrC,YAAoB,sBAA8B;QAA9B,2BAAsB,GAAtB,sBAAsB,CAAQ;QAChD,IAAI,CAAC,iBAAiB,GAAG,IAAI,2BAAiB,CAAC,sBAAsB,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACzE,IAAI;YACF,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;YAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;YACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;SACpC;QAAC,OAAO,KAAK,EAAE;YACd,gBAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;IACF,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC,CAAA;IACD,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACrE,IAAI;YACF,IAAI,CAAC,SAAS,IAAI,IAAA,UAAI,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;gBACvC,gBAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;gBACtE,OAAO,IAAI,CAAC;aACb;YAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACvD,MAAM,YAAY,GAAG,aAAa,EAAE,YAAY,CAAC;YACjD,MAAM,mBAAmB,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;YACvF,IAAI,YAAY,IAAI,YAAY,EAAE,SAAS,GAAG,mBAAmB,EAAE;gBACjE,OAAO,YAAY,CAAC,cAAc,CAAC;aACpC;YAED,MAAM,cAAc,GAA0B,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YAEjF,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;YAClC,IAAI,iBAAsC,CAAC;YAC3C,IAAI,YAAY,EAAE;gBAChB,iBAAiB,GAAG;oBAClB,GAAG,YAAY;oBACf,cAAc;oBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;iBACjC,CAAC;aACH;iBAAM;gBACL,iBAAiB,GAAG;oBAClB,SAAS;oBACT,cAAc;oBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;oBAChC,SAAS,EAAE,IAAA,0BAAmB,GAAE;iBACjC,CAAC;aACH;YACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,SAAS,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC,CAAC;YAE1G,OAAO,cAAc,CAAC;SACvB;QAAC,OAAO,CAAC,EAAE;YACV,gBAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;CACH;AA5DD,kDA4DC"}
|
|
@@ -28,7 +28,6 @@ export class IpDataLookupService {
|
|
|
28
28
|
};
|
|
29
29
|
lookupIP = async (ipAddress) => {
|
|
30
30
|
try {
|
|
31
|
-
const expiresAt = DateTime.now().plus({ days: 15 }).toSeconds();
|
|
32
31
|
if (!ipAddress || isIP(ipAddress) === 0) {
|
|
33
32
|
Logger.warn('Unable to lookup IP. Invalid Ip Address', { ipAddress });
|
|
34
33
|
return null;
|
|
@@ -40,6 +39,7 @@ export class IpDataLookupService {
|
|
|
40
39
|
return cachedResult.lookupResponse;
|
|
41
40
|
}
|
|
42
41
|
const lookupResponse = await this.getLookupApi(ipAddress);
|
|
42
|
+
const expires = 60 * 60 * 24 * 15;
|
|
43
43
|
let lookupTableRecord;
|
|
44
44
|
if (cachedResult) {
|
|
45
45
|
lookupTableRecord = {
|
|
@@ -47,22 +47,16 @@ export class IpDataLookupService {
|
|
|
47
47
|
lookupResponse,
|
|
48
48
|
updatedAt: getCurrentTimestamp(),
|
|
49
49
|
};
|
|
50
|
-
if (!cachedResult?.expiresAt) {
|
|
51
|
-
const expiresAt = DateTime.now().plus({ days: 15 }).toSeconds();
|
|
52
|
-
lookupTableRecord.expiresAt = expiresAt;
|
|
53
|
-
}
|
|
54
50
|
}
|
|
55
51
|
else {
|
|
56
|
-
const expiresAt = DateTime.now().plus({ days: 15 }).toSeconds();
|
|
57
52
|
lookupTableRecord = {
|
|
58
53
|
ipAddress,
|
|
59
54
|
lookupResponse,
|
|
60
55
|
createdAt: getCurrentTimestamp(),
|
|
61
|
-
updatedAt: getCurrentTimestamp()
|
|
62
|
-
expiresAt
|
|
56
|
+
updatedAt: getCurrentTimestamp()
|
|
63
57
|
};
|
|
64
58
|
}
|
|
65
|
-
await this.cacheLambdaClient.invokeSet(`ipdata-${ipAddress}`, JSON.stringify(lookupTableRecord),
|
|
59
|
+
await this.cacheLambdaClient.invokeSet(`ipdata-${ipAddress}`, JSON.stringify(lookupTableRecord), expires);
|
|
66
60
|
return lookupResponse;
|
|
67
61
|
}
|
|
68
62
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAU3E,MAAM,OAAO,mBAAmB;IAEV;IADpB,iBAAiB,CAAoB;IACrC,YAAoB,sBAA8B;QAA9B,2BAAsB,GAAtB,sBAAsB,CAAQ;QAChD,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;IACzE,CAAC;IAED,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACzE,IAAI;YACF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;YACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;SACpC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;IACF,UAAU,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;QACvC,OAAO,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,SAAS,EAAE,CAAC,CAAC;IACjE,CAAC,CAAA;IACD,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;QACrE,IAAI;YACF,
|
|
1
|
+
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":"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"}
|