@adtrackify/at-service-common 1.2.1001 → 1.3.1
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/index.d.ts +1 -0
- package/dist/cjs/services/index.js +1 -0
- package/dist/cjs/services/index.js.map +1 -1
- package/dist/cjs/services/ipdata-lookup-service.d.ts +8 -0
- package/dist/cjs/services/ipdata-lookup-service.js +55 -0
- package/dist/cjs/services/ipdata-lookup-service.js.map +1 -0
- package/dist/esm/services/index.d.ts +1 -0
- package/dist/esm/services/index.js +1 -0
- package/dist/esm/services/index.js.map +1 -1
- package/dist/esm/services/ipdata-lookup-service.d.ts +8 -0
- package/dist/esm/services/ipdata-lookup-service.js +51 -0
- package/dist/esm/services/ipdata-lookup-service.js.map +1 -0
- package/package.json +3 -3
|
@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./eventbridge-integration-service.js"), exports);
|
|
18
|
+
__exportStar(require("./ipdata-lookup-service.js"), exports);
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uEAAqD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uEAAqD;AACrD,6DAA2C"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { IPDataResponse } from '@adtrackify/at-tracking-event-types';
|
|
2
|
+
export interface IPLookupTableRecord {
|
|
3
|
+
ipAddress: string;
|
|
4
|
+
lookupResponse: IPDataResponse | null;
|
|
5
|
+
createdAt: string;
|
|
6
|
+
updatedAt: string;
|
|
7
|
+
}
|
|
8
|
+
export declare const lookupIP: (ipAddress: string) => Promise<IPDataResponse | null>;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.lookupIP = void 0;
|
|
4
|
+
const luxon_1 = require("luxon");
|
|
5
|
+
const clients_1 = require("../clients");
|
|
6
|
+
const helpers_1 = require("../helpers");
|
|
7
|
+
const libs_1 = require("../libs");
|
|
8
|
+
const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
|
|
9
|
+
const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
|
|
10
|
+
const getLookupApi = async (ipAddress) => {
|
|
11
|
+
try {
|
|
12
|
+
const client = (0, clients_1.axiosHttpService)();
|
|
13
|
+
const url = `https://api.ipdata.co/${ipAddress}?api-key=${API_KEY}`;
|
|
14
|
+
const res = await client.get(url);
|
|
15
|
+
return res?.data;
|
|
16
|
+
}
|
|
17
|
+
catch (error) {
|
|
18
|
+
helpers_1.Logger.error('IPData Lookup API Failed', { error });
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
const lookupIP = async (ipAddress) => {
|
|
23
|
+
try {
|
|
24
|
+
const cachedResult = await clients_1.DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
|
|
25
|
+
const cacheExpirationDate = luxon_1.DateTime.utc().minus({ days: 2 }).toJSDate().toISOString();
|
|
26
|
+
if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
|
|
27
|
+
return cachedResult.lookupResponse;
|
|
28
|
+
}
|
|
29
|
+
const lookupResponse = await getLookupApi(ipAddress);
|
|
30
|
+
let lookupTableRecord;
|
|
31
|
+
if (cachedResult) {
|
|
32
|
+
lookupTableRecord = {
|
|
33
|
+
...cachedResult,
|
|
34
|
+
lookupResponse,
|
|
35
|
+
updatedAt: (0, libs_1.getCurrentTimestamp)(),
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
lookupTableRecord = {
|
|
40
|
+
ipAddress,
|
|
41
|
+
lookupResponse,
|
|
42
|
+
createdAt: (0, libs_1.getCurrentTimestamp)(),
|
|
43
|
+
updatedAt: (0, libs_1.getCurrentTimestamp)()
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
await clients_1.DynamoDbClient.safePut(IP_LOOKUP_TABLE_NAME, lookupTableRecord);
|
|
47
|
+
return lookupResponse;
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
helpers_1.Logger.error('Failed to lookup IP', { error: e });
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
53
|
+
};
|
|
54
|
+
exports.lookupIP = lookupIP;
|
|
55
|
+
//# sourceMappingURL=ipdata-lookup-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ipdata-lookup-service.js","sourceRoot":"","sources":["../../../src/services/ipdata-lookup-service.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAEjC,wCAA8D;AAC9D,wCAAoC;AACpC,kCAA8C;AAE9C,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAC3E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAA8B,CAAC;AASxE,MAAM,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAC/E,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,0BAAgB,GAAE,CAAC;QAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;QACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,gBAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAClF,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,wBAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,SAAS,CAAwB,CAAC;QACvH,MAAM,mBAAmB,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;QACvF,IAAI,YAAY,IAAI,YAAY,EAAE,SAAS,GAAG,mBAAmB,EAAE;YACjE,OAAO,YAAY,CAAC,cAAc,CAAC;SACpC;QAED,MAAM,cAAc,GAA0B,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAE5E,IAAI,iBAAsC,CAAC;QAC3C,IAAI,YAAY,EAAE;YAChB,iBAAiB,GAAG;gBAClB,GAAG,YAAY;gBACf,cAAc;gBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;aACjC,CAAC;SACH;aAAM;YACL,iBAAiB,GAAG;gBAClB,SAAS;gBACT,cAAc;gBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;gBAChC,SAAS,EAAE,IAAA,0BAAmB,GAAE;aACjC,CAAC;SACH;QACD,MAAM,wBAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACtE,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,gBAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;KACnD;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA/BW,QAAA,QAAQ,YA+BnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/services/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,4BAA4B,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { IPDataResponse } from '@adtrackify/at-tracking-event-types';
|
|
2
|
+
export interface IPLookupTableRecord {
|
|
3
|
+
ipAddress: string;
|
|
4
|
+
lookupResponse: IPDataResponse | null;
|
|
5
|
+
createdAt: string;
|
|
6
|
+
updatedAt: string;
|
|
7
|
+
}
|
|
8
|
+
export declare const lookupIP: (ipAddress: string) => Promise<IPDataResponse | null>;
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { DateTime } from 'luxon';
|
|
2
|
+
import { axiosHttpService, DynamoDbClient } from '../clients';
|
|
3
|
+
import { Logger } from '../helpers';
|
|
4
|
+
import { getCurrentTimestamp } from '../libs';
|
|
5
|
+
const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
|
|
6
|
+
const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
|
|
7
|
+
const getLookupApi = async (ipAddress) => {
|
|
8
|
+
try {
|
|
9
|
+
const client = axiosHttpService();
|
|
10
|
+
const url = `https://api.ipdata.co/${ipAddress}?api-key=${API_KEY}`;
|
|
11
|
+
const res = await client.get(url);
|
|
12
|
+
return res?.data;
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
Logger.error('IPData Lookup API Failed', { error });
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
export const lookupIP = async (ipAddress) => {
|
|
20
|
+
try {
|
|
21
|
+
const cachedResult = await DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
|
|
22
|
+
const cacheExpirationDate = DateTime.utc().minus({ days: 2 }).toJSDate().toISOString();
|
|
23
|
+
if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
|
|
24
|
+
return cachedResult.lookupResponse;
|
|
25
|
+
}
|
|
26
|
+
const lookupResponse = await getLookupApi(ipAddress);
|
|
27
|
+
let lookupTableRecord;
|
|
28
|
+
if (cachedResult) {
|
|
29
|
+
lookupTableRecord = {
|
|
30
|
+
...cachedResult,
|
|
31
|
+
lookupResponse,
|
|
32
|
+
updatedAt: getCurrentTimestamp(),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
lookupTableRecord = {
|
|
37
|
+
ipAddress,
|
|
38
|
+
lookupResponse,
|
|
39
|
+
createdAt: getCurrentTimestamp(),
|
|
40
|
+
updatedAt: getCurrentTimestamp()
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
await DynamoDbClient.safePut(IP_LOOKUP_TABLE_NAME, lookupTableRecord);
|
|
44
|
+
return lookupResponse;
|
|
45
|
+
}
|
|
46
|
+
catch (e) {
|
|
47
|
+
Logger.error('Failed to lookup IP', { error: e });
|
|
48
|
+
}
|
|
49
|
+
return null;
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=ipdata-lookup-service.js.map
|
|
@@ -0,0 +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,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAC3E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAA8B,CAAC;AASxE,MAAM,YAAY,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAC/E,IAAI;QACF,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,yBAAyB,SAAS,YAAY,OAAO,EAAE,CAAC;QACpE,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,GAAG,EAAE,IAAsB,CAAC;KACpC;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,SAAiB,EAAkC,EAAE;IAClF,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,WAAW,EAAE,SAAS,CAAwB,CAAC;QACvH,MAAM,mBAAmB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;QACvF,IAAI,YAAY,IAAI,YAAY,EAAE,SAAS,GAAG,mBAAmB,EAAE;YACjE,OAAO,YAAY,CAAC,cAAc,CAAC;SACpC;QAED,MAAM,cAAc,GAA0B,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC;QAE5E,IAAI,iBAAsC,CAAC;QAC3C,IAAI,YAAY,EAAE;YAChB,iBAAiB,GAAG;gBAClB,GAAG,YAAY;gBACf,cAAc;gBACd,SAAS,EAAE,mBAAmB,EAAE;aACjC,CAAC;SACH;aAAM;YACL,iBAAiB,GAAG;gBAClB,SAAS;gBACT,cAAc;gBACd,SAAS,EAAE,mBAAmB,EAAE;gBAChC,SAAS,EAAE,mBAAmB,EAAE;aACjC,CAAC;SACH;QACD,MAAM,cAAc,CAAC,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QACtE,OAAO,cAAc,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;KACnD;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adtrackify/at-service-common",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"description": "",
|
|
5
|
-
"type": "module",
|
|
6
5
|
"files": [
|
|
7
6
|
"dist/*"
|
|
8
7
|
],
|
|
9
8
|
"main": "./dist/cjs/index.js",
|
|
10
9
|
"module": "./dist/esm/index.js",
|
|
10
|
+
"type": "module",
|
|
11
11
|
"engines": {
|
|
12
12
|
"npm": ">=8.0.0 <9.0.0",
|
|
13
13
|
"node": ">=16.0.0 <18.14.2"
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"uuid": "^9.0.0"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@adtrackify/at-tracking-event-types": "^1.
|
|
52
|
+
"@adtrackify/at-tracking-event-types": "^1.2.2",
|
|
53
53
|
"@aws-sdk/client-cognito-identity-provider": "^3.282.0",
|
|
54
54
|
"@aws-sdk/client-dynamodb": "^3.278.0",
|
|
55
55
|
"@aws-sdk/client-eventbridge": "^3.278.0",
|