@adtrackify/at-service-common 3.0.30 → 3.0.32

package/dist/cjs/services/db/tracking-events-db-service.d.ts

@@ -1,17 +1,17 @@
-import { AdClickInfo, TrackingEvent, TrackingEventRecord } from '@adtrackify/at-tracking-event-types';
-export interface LatestSessionResponseData {
-    pixelId?: string;
-    identityId?: string;
-    sessionId?: string;
-    click?: AdClickInfo;
-}
-export declare class TrackingEventsDbService {
-    TABLE_NAME: string;
-    KEY_NAME: string;
-    constructor(tableName: string);
-    getLatestSessionByIpAddressUserAgent: (indexName: string, ipAddressUserAgent: string, hostname?: string) => Promise<LatestSessionResponseData>;
-    getTrackingEventsByPixelIdEventName: (indexName: string, pixelId: string, eventName: string, limit?: number, afterCollectedAt?: string) => Promise<TrackingEventRecord[]>;
-    getTrackingEventCountByPixelId: (indexName: string, pixelId: string, offsetInMinutes?: number) => Promise<number>;
-    getTrackingEvent: (eventId: string) => Promise<TrackingEventRecord | null>;
-    putTrackingEvent: (trackingEvent: TrackingEvent, ttlInDays?: number) => Promise<import("@aws-sdk/lib-dynamodb").PutCommandOutput | null | undefined>;
-}
+import { AdClickInfo, TrackingEvent, TrackingEventRecord } from '@adtrackify/at-tracking-event-types';
+export interface LatestSessionResponseData {
+    pixelId?: string;
+    identityId?: string;
+    sessionId?: string;
+    click?: AdClickInfo;
+}
+export declare class TrackingEventsDbService {
+    TABLE_NAME: string;
+    KEY_NAME: string;
+    constructor(tableName: string);
+    getLatestSessionByIpAddressUserAgent: (indexName: string, ipAddressUserAgent: string, hostname?: string) => Promise<LatestSessionResponseData>;
+    getTrackingEventsByPixelIdEventName: (indexName: string, pixelId: string, eventName: string, limit?: number, afterCollectedAt?: string) => Promise<TrackingEventRecord[]>;
+    getTrackingEventCountByPixelId: (indexName: string, pixelId: string, offsetInMinutes?: number) => Promise<number>;
+    getTrackingEvent: (eventId: string) => Promise<TrackingEventRecord | null>;
+    putTrackingEvent: (trackingEvent: TrackingEvent, ttlInDays?: number) => Promise<import("@aws-sdk/lib-dynamodb").PutCommandOutput | null | undefined>;
+}

package/dist/cjs/services/db/tracking-events-db-service.js

@@ -1,135 +1,135 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TrackingEventsDbService = void 0;
-const clients_1 = require("../../clients");
-const helpers_1 = require("../../helpers");
-const luxon_1 = require("luxon");
-class TrackingEventsDbService {
-    TABLE_NAME;
-    KEY_NAME = 'eventId';
-    constructor(tableName) {
-        this.TABLE_NAME = tableName;
-    }
-    getLatestSessionByIpAddressUserAgent = async (indexName, ipAddressUserAgent, hostname) => {
-        try {
-            const params = {
-                TableName: this.TABLE_NAME,
-                IndexName: indexName,
-                KeyConditionExpression: 'ipAddressUserAgent = :ipAddressUserAgent',
-                ExpressionAttributeValues: {
-                    ':ipAddressUserAgent': ipAddressUserAgent,
-                },
-                ScanIndexForward: false
-            };
-            const results = await clients_1.DynamoDbClient.query(params);
-            let trackingEventRecord;
-            if (results?.Items && results.Items.length > 0) {
-                trackingEventRecord = results.Items.find((item) => {
-                    const _trackingEvent = item.trackingEvent;
-                    const _hostname = item?.hostname;
-                    if (hostname && _hostname === hostname && _trackingEvent.context?.identity?.identityId && _trackingEvent.context.properties?.sessionId) {
-                        return true;
-                    }
-                    else if (_trackingEvent.context?.identity?.identityId && _trackingEvent.context.properties?.sessionId) {
-                        return true;
-                    }
-                    else {
-                        return false;
-                    }
-                });
-            }
-            if (trackingEventRecord) {
-                const trackingEvent = trackingEventRecord.trackingEvent;
-                return {
-                    pixelId: trackingEvent?.pixelId,
-                    identityId: trackingEvent.context?.identity?.identityId,
-                    sessionId: trackingEvent.context?.properties?.sessionId,
-                    click: trackingEvent.context?.properties?.click
-                };
-            }
-            else {
-                return {};
-            }
-        }
-        catch (e) {
-            helpers_1.Logger.error('Failed to getLastTrackingEventByIpAddressUserAgent', { e });
-            return {};
-        }
-    };
-    getTrackingEventsByPixelIdEventName = async (indexName, pixelId, eventName, limit, afterCollectedAt) => {
-        const query = {
-            TableName: this.TABLE_NAME,
-            IndexName: indexName,
-            KeyConditionExpression: 'pixelIdEventName = :pixelIdEventName',
-            ExpressionAttributeValues: {
-                ':pixelIdEventName': `${pixelId}_${eventName}`,
-            },
-            ScanIndexForward: false,
-        };
-        if (limit) {
-            query.Limit = limit;
-        }
-        if (afterCollectedAt) {
-            query.KeyConditionExpression += ' and collectedAt > :collectedAt';
-            query.ExpressionAttributeValues[':collectedAt'] = afterCollectedAt;
-        }
-        const trackingEventsResponse = await clients_1.DynamoDbClient.query(query);
-        return trackingEventsResponse?.Items ?? [];
-    };
-    getTrackingEventCountByPixelId = async (indexName, pixelId, offsetInMinutes = 30) => {
-        try {
-            const pastDateTime = luxon_1.DateTime.now().minus({ minutes: offsetInMinutes }).toISO();
-            const params = {
-                TableName: this.TABLE_NAME,
-                IndexName: indexName,
-                KeyConditionExpression: 'pixelId = :pixelId and collectedAt > :collectedAt',
-                ExpressionAttributeValues: {
-                    ':pixelId': pixelId,
-                    ':collectedAt': pastDateTime
-                }
-            };
-            const results = await clients_1.DynamoDbClient.query(params);
-            return results?.Items?.length ?? 0;
-        }
-        catch (e) {
-            helpers_1.Logger.error('Failed to getTrackingEventCountByPixelId', { e });
-            return 0;
-        }
-    };
-    getTrackingEvent = async (eventId) => {
-        try {
-            const eventRecord = await clients_1.DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, eventId);
-            return eventRecord;
-        }
-        catch (e) {
-            helpers_1.Logger.error('Failed to getTrackingEvent', { e });
-            return null;
-        }
-    };
-    putTrackingEvent = async (trackingEvent, ttlInDays) => {
-        if (!trackingEvent.context?.properties?.ipAddress || !trackingEvent.context?.properties?.userAgent)
-            return;
-        const pageURL = trackingEvent?.context?.properties?.page?.url;
-        const parsedPageURL = new URL(pageURL);
-        const hostname = parsedPageURL?.hostname;
-        const trackingEventsTableTTLDays = ttlInDays || 15;
-        const expiredAt = luxon_1.DateTime.now().plus({ days: trackingEventsTableTTLDays }).toSeconds();
-        const trackingEventRecord = {
-            eventId: trackingEvent.id,
-            eventName: trackingEvent.name,
-            trackingEvent,
-            pixelId: trackingEvent?.pixelId,
-            pixelIdEventName: `${trackingEvent.pixelId}_${trackingEvent.name}`,
-            ipAddressUserAgent: `${trackingEvent.context?.properties?.ipAddress}_${trackingEvent.context?.properties?.userAgent}`,
-            hostname,
-            identityId: trackingEvent?.context?.identity?.identityId,
-            sessionId: trackingEvent?.context?.properties?.sessionId,
-            collectedAt: trackingEvent.collectedAt,
-            expiredAt,
-        };
-        helpers_1.Logger.debug('Put tracking event', { trackingEventRecord, expiredAtType: typeof expiredAt });
-        return await clients_1.DynamoDbClient.safePut(this.TABLE_NAME, trackingEventRecord);
-    };
-}
-exports.TrackingEventsDbService = TrackingEventsDbService;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrackingEventsDbService = void 0;
+const clients_1 = require("../../clients");
+const helpers_1 = require("../../helpers");
+const luxon_1 = require("luxon");
+class TrackingEventsDbService {
+    TABLE_NAME;
+    KEY_NAME = 'eventId';
+    constructor(tableName) {
+        this.TABLE_NAME = tableName;
+    }
+    getLatestSessionByIpAddressUserAgent = async (indexName, ipAddressUserAgent, hostname) => {
+        try {
+            const params = {
+                TableName: this.TABLE_NAME,
+                IndexName: indexName,
+                KeyConditionExpression: 'ipAddressUserAgent = :ipAddressUserAgent',
+                ExpressionAttributeValues: {
+                    ':ipAddressUserAgent': ipAddressUserAgent,
+                },
+                ScanIndexForward: false
+            };
+            const results = await clients_1.DynamoDbClient.query(params);
+            let trackingEventRecord;
+            if (results?.Items && results.Items.length > 0) {
+                trackingEventRecord = results.Items.find((item) => {
+                    const _trackingEvent = item.trackingEvent;
+                    const _hostname = item?.hostname;
+                    if (hostname && _hostname === hostname && _trackingEvent.context?.identity?.identityId && _trackingEvent.context.properties?.sessionId) {
+                        return true;
+                    }
+                    else if (_trackingEvent.context?.identity?.identityId && _trackingEvent.context.properties?.sessionId) {
+                        return true;
+                    }
+                    else {
+                        return false;
+                    }
+                });
+            }
+            if (trackingEventRecord) {
+                const trackingEvent = trackingEventRecord.trackingEvent;
+                return {
+                    pixelId: trackingEvent?.pixelId,
+                    identityId: trackingEvent.context?.identity?.identityId,
+                    sessionId: trackingEvent.context?.properties?.sessionId,
+                    click: trackingEvent.context?.properties?.click
+                };
+            }
+            else {
+                return {};
+            }
+        }
+        catch (e) {
+            helpers_1.Logger.error('Failed to getLastTrackingEventByIpAddressUserAgent', { e });
+            return {};
+        }
+    };
+    getTrackingEventsByPixelIdEventName = async (indexName, pixelId, eventName, limit, afterCollectedAt) => {
+        const query = {
+            TableName: this.TABLE_NAME,
+            IndexName: indexName,
+            KeyConditionExpression: 'pixelIdEventName = :pixelIdEventName',
+            ExpressionAttributeValues: {
+                ':pixelIdEventName': `${pixelId}_${eventName}`,
+            },
+            ScanIndexForward: false,
+        };
+        if (limit) {
+            query.Limit = limit;
+        }
+        if (afterCollectedAt) {
+            query.KeyConditionExpression += ' and collectedAt > :collectedAt';
+            query.ExpressionAttributeValues[':collectedAt'] = afterCollectedAt;
+        }
+        const trackingEventsResponse = await clients_1.DynamoDbClient.query(query);
+        return trackingEventsResponse?.Items ?? [];
+    };
+    getTrackingEventCountByPixelId = async (indexName, pixelId, offsetInMinutes = 30) => {
+        try {
+            const pastDateTime = luxon_1.DateTime.now().minus({ minutes: offsetInMinutes }).toISO();
+            const params = {
+                TableName: this.TABLE_NAME,
+                IndexName: indexName,
+                KeyConditionExpression: 'pixelId = :pixelId and collectedAt > :collectedAt',
+                ExpressionAttributeValues: {
+                    ':pixelId': pixelId,
+                    ':collectedAt': pastDateTime
+                }
+            };
+            const results = await clients_1.DynamoDbClient.query(params);
+            return results?.Items?.length ?? 0;
+        }
+        catch (e) {
+            helpers_1.Logger.error('Failed to getTrackingEventCountByPixelId', { e });
+            return 0;
+        }
+    };
+    getTrackingEvent = async (eventId) => {
+        try {
+            const eventRecord = await clients_1.DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, eventId);
+            return eventRecord;
+        }
+        catch (e) {
+            helpers_1.Logger.error('Failed to getTrackingEvent', { e });
+            return null;
+        }
+    };
+    putTrackingEvent = async (trackingEvent, ttlInDays) => {
+        if (!trackingEvent.context?.properties?.ipAddress || !trackingEvent.context?.properties?.userAgent)
+            return;
+        const pageURL = trackingEvent?.context?.properties?.page?.url;
+        const parsedPageURL = new URL(pageURL);
+        const hostname = parsedPageURL?.hostname;
+        const trackingEventsTableTTLDays = ttlInDays || 15;
+        const expiredAt = luxon_1.DateTime.now().plus({ days: trackingEventsTableTTLDays }).toSeconds();
+        const trackingEventRecord = {
+            eventId: trackingEvent.id,
+            eventName: trackingEvent.name,
+            trackingEvent,
+            pixelId: trackingEvent?.pixelId,
+            pixelIdEventName: `${trackingEvent.pixelId}_${trackingEvent.name}`,
+            ipAddressUserAgent: `${trackingEvent.context?.properties?.ipAddress}_${trackingEvent.context?.properties?.userAgent}`,
+            hostname,
+            identityId: trackingEvent?.context?.identity?.identityId,
+            sessionId: trackingEvent?.context?.properties?.sessionId,
+            collectedAt: trackingEvent.collectedAt,
+            expiredAt,
+        };
+        helpers_1.Logger.debug('Put tracking event', { trackingEventRecord, expiredAtType: typeof expiredAt });
+        return await clients_1.DynamoDbClient.safePut(this.TABLE_NAME, trackingEventRecord);
+    };
+}
+exports.TrackingEventsDbService = TrackingEventsDbService;
 //# sourceMappingURL=tracking-events-db-service.js.map

package/dist/cjs/services/eventbridge-integration-service.d.ts

@@ -1,9 +1,9 @@
-import { EventBridgeClient } from '../clients/generic/eventbridge-client.js';
-import { Message, TemplatedMessage } from 'postmark';
-export declare class EventBridgeIntegrationService {
-    eventBridgeClient: EventBridgeClient;
-    EVENT_BUS_NAME: string;
-    constructor(eventBusName: string);
-    sendPostmarkEmailEvent: (eventSource: string, postmarkMessage: Message, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
-    sendPostmarkTemplatedEmailEvent: (eventSource: string, postmarkMessage: TemplatedMessage, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
-}
+import { EventBridgeClient } from '../clients/generic/eventbridge-client.js';
+import { Message, TemplatedMessage } from 'postmark';
+export declare class EventBridgeIntegrationService {
+    eventBridgeClient: EventBridgeClient;
+    EVENT_BUS_NAME: string;
+    constructor(eventBusName: string);
+    sendPostmarkEmailEvent: (eventSource: string, postmarkMessage: Message, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
+    sendPostmarkTemplatedEmailEvent: (eventSource: string, postmarkMessage: TemplatedMessage, postmarkServerToken: string) => Promise<import("@aws-sdk/client-eventbridge").PutEventsCommandOutput>;
+}

package/dist/cjs/services/eventbridge-integration-service.js

@@ -1,29 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventBridgeIntegrationService = void 0;
-const eventbridge_client_js_1 = require("../clients/generic/eventbridge-client.js");
-const event_detail_types_js_1 = require("../types/internal-events/event-detail-types.js");
-class EventBridgeIntegrationService {
-    eventBridgeClient;
-    EVENT_BUS_NAME;
-    constructor(eventBusName) {
-        this.eventBridgeClient = new eventbridge_client_js_1.EventBridgeClient(eventBusName);
-        this.EVENT_BUS_NAME = eventBusName;
-    }
-    sendPostmarkEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
-        return await this.eventBridgeClient.buildAndSendEvent(eventSource, event_detail_types_js_1.ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
-            postmarkMessage,
-            postmarkRequestType: event_detail_types_js_1.PostmarkRequestType.SINGLE_EMAIL,
-            postmarkServerToken
-        });
-    };
-    sendPostmarkTemplatedEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
-        return await this.eventBridgeClient.buildAndSendEvent(eventSource, event_detail_types_js_1.ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
-            postmarkMessage,
-            postmarkRequestType: event_detail_types_js_1.PostmarkRequestType.TEMPLATE_EMAIL,
-            postmarkServerToken
-        });
-    };
-}
-exports.EventBridgeIntegrationService = EventBridgeIntegrationService;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EventBridgeIntegrationService = void 0;
+const eventbridge_client_js_1 = require("../clients/generic/eventbridge-client.js");
+const event_detail_types_js_1 = require("../types/internal-events/event-detail-types.js");
+class EventBridgeIntegrationService {
+    eventBridgeClient;
+    EVENT_BUS_NAME;
+    constructor(eventBusName) {
+        this.eventBridgeClient = new eventbridge_client_js_1.EventBridgeClient(eventBusName);
+        this.EVENT_BUS_NAME = eventBusName;
+    }
+    sendPostmarkEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
+        return await this.eventBridgeClient.buildAndSendEvent(eventSource, event_detail_types_js_1.ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
+            postmarkMessage,
+            postmarkRequestType: event_detail_types_js_1.PostmarkRequestType.SINGLE_EMAIL,
+            postmarkServerToken
+        });
+    };
+    sendPostmarkTemplatedEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
+        return await this.eventBridgeClient.buildAndSendEvent(eventSource, event_detail_types_js_1.ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
+            postmarkMessage,
+            postmarkRequestType: event_detail_types_js_1.PostmarkRequestType.TEMPLATE_EMAIL,
+            postmarkServerToken
+        });
+    };
+}
+exports.EventBridgeIntegrationService = EventBridgeIntegrationService;
 //# sourceMappingURL=eventbridge-integration-service.js.map

package/dist/cjs/services/index.d.ts

@@ -1,5 +1,5 @@
-export * from './eventbridge-integration-service.js';
-export * from './ipdata-lookup-service.js';
-export * from './log-event-service.js';
-export * from './metric-event-service.js';
-export * from './db';
+export * from './eventbridge-integration-service.js';
+export * from './ipdata-lookup-service.js';
+export * from './log-event-service.js';
+export * from './metric-event-service.js';
+export * from './db';

package/dist/cjs/services/index.js

@@ -1,22 +1,22 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./eventbridge-integration-service.js"), exports);
-__exportStar(require("./ipdata-lookup-service.js"), exports);
-__exportStar(require("./log-event-service.js"), exports);
-__exportStar(require("./metric-event-service.js"), exports);
-__exportStar(require("./db"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./eventbridge-integration-service.js"), exports);
+__exportStar(require("./ipdata-lookup-service.js"), exports);
+__exportStar(require("./log-event-service.js"), exports);
+__exportStar(require("./metric-event-service.js"), exports);
+__exportStar(require("./db"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/services/ipdata-lookup-service.d.ts

@@ -1,8 +1,9 @@
-import { IPDataResponse } from '@adtrackify/at-tracking-event-types';
-export interface IPLookupTableRecord {
-    ipAddress: string;
-    lookupResponse: IPDataResponse | null;
-    createdAt: string;
-    updatedAt: string;
-}
-export declare const lookupIP: (ipAddress: string) => Promise<IPDataResponse | null>;
+import { IPDataResponse } from '@adtrackify/at-tracking-event-types';
+export interface IPLookupTableRecord {
+    ipAddress: string;
+    lookupResponse: IPDataResponse | null;
+    createdAt: string;
+    updatedAt: string;
+    expiresAt?: number;
+}
+export declare const lookupIP: (ipAddress: string) => Promise<IPDataResponse | null>;

package/dist/cjs/services/ipdata-lookup-service.js

@@ -1,60 +1,66 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookupIP = void 0;
-const luxon_1 = require("luxon");
-const clients_1 = require("../clients");
-const helpers_1 = require("../helpers");
-const libs_1 = require("../libs");
-const net_1 = require("net");
-const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
-const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
-const getLookupApi = async (ipAddress) => {
-    try {
-        const client = (0, clients_1.axiosHttpService)();
-        const url = `https://api.ipdata.co/${ipAddress}?api-key=${API_KEY}`;
-        const res = await client.get(url);
-        return res?.data;
-    }
-    catch (error) {
-        helpers_1.Logger.error('IPData Lookup API Failed', { error });
-        return null;
-    }
-};
-const lookupIP = async (ipAddress) => {
-    try {
-        if (!ipAddress || (0, net_1.isIP)(ipAddress) === 0) {
-            helpers_1.Logger.warn('Unable to lookup IP.  Invalid Ip Address', { ipAddress });
-            return null;
-        }
-        const cachedResult = await clients_1.DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
-        const cacheExpirationDate = luxon_1.DateTime.utc().minus({ days: 6 }).toJSDate().toISOString();
-        if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
-            return cachedResult.lookupResponse;
-        }
-        const lookupResponse = await getLookupApi(ipAddress);
-        let lookupTableRecord;
-        if (cachedResult) {
-            lookupTableRecord = {
-                ...cachedResult,
-                lookupResponse,
-                updatedAt: (0, libs_1.getCurrentTimestamp)(),
-            };
-        }
-        else {
-            lookupTableRecord = {
-                ipAddress,
-                lookupResponse,
-                createdAt: (0, libs_1.getCurrentTimestamp)(),
-                updatedAt: (0, libs_1.getCurrentTimestamp)()
-            };
-        }
-        await clients_1.DynamoDbClient.safePut(IP_LOOKUP_TABLE_NAME, lookupTableRecord);
-        return lookupResponse;
-    }
-    catch (e) {
-        helpers_1.Logger.error('Failed to lookup IP', { error: e });
-        return null;
-    }
-};
-exports.lookupIP = lookupIP;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lookupIP = void 0;
+const luxon_1 = require("luxon");
+const clients_1 = require("../clients");
+const helpers_1 = require("../helpers");
+const libs_1 = require("../libs");
+const net_1 = require("net");
+const API_KEY = 'aae45f1e1f97ecf79bdc2bef3e96ef71961c4cb977c3085429b421bc';
+const IP_LOOKUP_TABLE_NAME = process.env.IP_LOOKUP_TABLE_NAME;
+const getLookupApi = async (ipAddress) => {
+    try {
+        const client = (0, clients_1.axiosHttpService)();
+        const url = `https://api.ipdata.co/${ipAddress}?api-key=${API_KEY}`;
+        const res = await client.get(url);
+        return res?.data;
+    }
+    catch (error) {
+        helpers_1.Logger.error('IPData Lookup API Failed', { error });
+        return null;
+    }
+};
+const lookupIP = async (ipAddress) => {
+    try {
+        if (!ipAddress || (0, net_1.isIP)(ipAddress) === 0) {
+            helpers_1.Logger.warn('Unable to lookup IP.  Invalid Ip Address', { ipAddress });
+            return null;
+        }
+        const cachedResult = await clients_1.DynamoDbClient.safeGet(IP_LOOKUP_TABLE_NAME, 'ipAddress', ipAddress);
+        const cacheExpirationDate = luxon_1.DateTime.utc().minus({ days: 6 }).toJSDate().toISOString();
+        if (cachedResult && cachedResult?.updatedAt > cacheExpirationDate) {
+            return cachedResult.lookupResponse;
+        }
+        const lookupResponse = await getLookupApi(ipAddress);
+        let lookupTableRecord;
+        if (cachedResult) {
+            lookupTableRecord = {
+                ...cachedResult,
+                lookupResponse,
+                updatedAt: (0, libs_1.getCurrentTimestamp)(),
+            };
+            if (!cachedResult?.expiresAt) {
+                const expiresAt = luxon_1.DateTime.now().plus({ days: 15 }).toSeconds();
+                lookupTableRecord.expiresAt = expiresAt;
+            }
+        }
+        else {
+            const expiresAt = luxon_1.DateTime.now().plus({ days: 15 }).toSeconds();
+            lookupTableRecord = {
+                ipAddress,
+                lookupResponse,
+                createdAt: (0, libs_1.getCurrentTimestamp)(),
+                updatedAt: (0, libs_1.getCurrentTimestamp)(),
+                expiresAt
+            };
+        }
+        await clients_1.DynamoDbClient.safePut(IP_LOOKUP_TABLE_NAME, lookupTableRecord);
+        return lookupResponse;
+    }
+    catch (e) {
+        helpers_1.Logger.error('Failed to lookup IP', { error: e });
+        return null;
+    }
+};
+exports.lookupIP = lookupIP;
 //# sourceMappingURL=ipdata-lookup-service.js.map

package/dist/cjs/services/ipdata-lookup-service.js.map

@@ -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;AAC9C,6BAA2B;AAE3B,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,IAAI,CAAC,SAAS,IAAI,IAAA,UAAI,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACvC,gBAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC;SACb;QACD,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;QAClD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAnCW,QAAA,QAAQ,YAmCnB"}
+{"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;AAC9C,6BAA2B;AAE3B,MAAM,OAAO,GAAG,0DAA0D,CAAC;AAC3E,MAAM,oBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAA8B,CAAC;AAUxE,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,IAAI,CAAC,SAAS,IAAI,IAAA,UAAI,EAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACvC,gBAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC;SACb;QACD,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;YACF,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE;gBAC5B,MAAM,SAAS,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;gBAChE,iBAAiB,CAAC,SAAS,GAAG,SAAS,CAAC;aACzC;SACF;aAAM;YACL,MAAM,SAAS,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;YAChE,iBAAiB,GAAG;gBAClB,SAAS;gBACT,cAAc;gBACd,SAAS,EAAE,IAAA,0BAAmB,GAAE;gBAChC,SAAS,EAAE,IAAA,0BAAmB,GAAE;gBAChC,SAAS;aACV,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;QAClD,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAzCW,QAAA,QAAQ,YAyCnB"}

package/dist/cjs/services/log-event-service.d.ts

@@ -1,9 +1,9 @@
-import { EventContext, LOG_EVENT_NAME, LogEvent, LogEventData, LogLevel, LogStorage } from '@adtrackify/at-tracking-event-types';
-export declare class LogEventService {
-    private eventBridgeClient;
-    private eventDetail;
-    constructor(eventBusName: string);
-    log: (source: string, pixelId: string, context: EventContext, logEventName: LOG_EVENT_NAME, logEventData: LogEventData, logId?: string) => Promise<void>;
-    buildLogEvent: (pixelId: string, context: EventContext, logEventName: LOG_EVENT_NAME, logEventData: LogEventData, logId?: string) => LogEvent;
-    buildLogEventData: (source: string, service: string, logLevel: LogLevel, message: string, logData?: any, logStorage?: LogStorage) => LogEventData;
-}
+import { EventContext, LOG_EVENT_NAME, LogEvent, LogEventData, LogLevel, LogStorage } from '@adtrackify/at-tracking-event-types';
+export declare class LogEventService {
+    private eventBridgeClient;
+    private eventDetail;
+    constructor(eventBusName: string);
+    log: (source: string, pixelId: string, context: EventContext, logEventName: LOG_EVENT_NAME, logEventData: LogEventData, logId?: string) => Promise<void>;
+    buildLogEvent: (pixelId: string, context: EventContext, logEventName: LOG_EVENT_NAME, logEventData: LogEventData, logId?: string) => LogEvent;
+    buildLogEventData: (source: string, service: string, logLevel: LogLevel, message: string, logData?: any, logStorage?: LogStorage) => LogEventData;
+}