@adtrackify/at-service-common 3.1.2 → 3.1.4

package/dist/esm/services/db/shopify-products-cache-db-service.js

@@ -1,61 +1,104 @@
-import { DynamoDbClient, ShopifyClient } from '../../clients';
-import { compressJSON, decompressJSON, getCurrentTimestamp } from '../../libs';
-import { DateTime } from 'luxon';
-import { Logger } from '../../helpers';
-export class ShopifyProductsCacheDbService {
-    TABLE_NAME;
-    KEY_NAME;
-    constructor(tableName, keyName) {
-        this.TABLE_NAME = tableName;
-        this.KEY_NAME = keyName;
-    }
-    getShopifyProductCache = async (pixelId, productId) => {
-        try {
-            const cachedProduct = await DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, `${pixelId}_${productId}`);
-            if (cachedProduct) {
-                cachedProduct.product = decompressJSON(cachedProduct.productCompressed);
-                return cachedProduct;
-            }
-            return null;
-        }
-        catch (error) {
-            Logger.error('Failed to get shopify product from cache', { keyName: this.KEY_NAME, pixelId, productId, error });
-            return null;
-        }
-    };
-    putShopifyProductCache = async (pixelId, productId, product, ttlInDays) => {
-        const ttl = ttlInDays || 7;
-        const expiresAt = DateTime.now().plus({ days: ttl }).toSeconds();
-        const shopifyProductCache = {
-            pixelId_productId: `${pixelId}_${productId}`,
-            pixelId,
-            productId,
-            productCompressed: compressJSON(product),
-            createdAt: getCurrentTimestamp(),
-            expiresAt
-        };
-        return await DynamoDbClient.safePut(this.TABLE_NAME, shopifyProductCache);
-    };
-    lookupShopifyProductCache = async (pixelId, shop, accessToken, productId) => {
-        try {
-            const cachedShopifyProduct = await this.getShopifyProductCache(pixelId, productId);
-            if (cachedShopifyProduct) {
-                return cachedShopifyProduct.product;
-            }
-            else {
-                const productRes = await ShopifyClient.getProduct(shop, accessToken, productId);
-                if (productRes?.product) {
-                    const product = productRes.product;
-                    await this.putShopifyProductCache(pixelId, productId, product);
-                    return product;
-                }
-            }
-            return null;
-        }
-        catch (error) {
-            Logger.error('Failed to lookup shopify product cache', { error });
-            return null;
-        }
-    };
-}
+import { DynamoDbClient, ShopifyClient } from '../../clients';
+import { compressJSON, decompressJSON, getCurrentTimestamp } from '../../libs';
+import { DateTime } from 'luxon';
+import { Logger } from '../../helpers';
+export class ShopifyProductsCacheDbService {
+    TABLE_NAME;
+    KEY_NAME;
+    constructor(tableName, keyName) {
+        this.TABLE_NAME = tableName;
+        this.KEY_NAME = keyName;
+    }
+    getShopifyProductWithCachingREST = async (pixelId, shop, accessToken, productId) => {
+        try {
+            const cachedShopifyProduct = await this.getShopifyProductFromCacheREST(pixelId, productId);
+            if (cachedShopifyProduct) {
+                return cachedShopifyProduct.product;
+            }
+            else {
+                const productRes = await ShopifyClient.getProductREST(shop, accessToken, productId);
+                if (productRes.status === 200 && productRes?.data?.product) {
+                    const product = productRes.data.product;
+                    await this.putShopifyProductCacheREST(pixelId, productId, product);
+                    return product;
+                }
+            }
+            return null;
+        }
+        catch (error) {
+            Logger.error('Failed lookupShopifyProductCacheREST', { error });
+            return null;
+        }
+    };
+    getShopifyProductFromCacheREST = async (pixelId, productId) => {
+        try {
+            const cachedProduct = await DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, `${pixelId}_${productId}`);
+            if (cachedProduct) {
+                cachedProduct.product = decompressJSON(cachedProduct.productCompressed);
+                return cachedProduct;
+            }
+            return null;
+        }
+        catch (error) {
+            Logger.error('Failed getShopifyProductCacheREST', { keyName: this.KEY_NAME, pixelId, productId, error });
+            return null;
+        }
+    };
+    putShopifyProductCacheREST = async (pixelId, productId, product, ttlInDays) => {
+        const ttl = ttlInDays || 7;
+        const expiresAt = DateTime.now().plus({ days: ttl }).toSeconds();
+        const shopifyProductCache = {
+            pixelId_productId: `${pixelId}_${productId}`,
+            pixelId,
+            productId,
+            productCompressed: compressJSON(product),
+            createdAt: getCurrentTimestamp(),
+            expiresAt
+        };
+        return await DynamoDbClient.safePut(this.TABLE_NAME, shopifyProductCache);
+    };
+    getShopifyProductWithCachingGraphQL = async (pixelId, shop, accessToken, productId) => {
+        try {
+            const cachedShopifyProduct = await this.getShopifyProductFromCacheGraphQL(pixelId, productId);
+            if (cachedShopifyProduct) {
+                return cachedShopifyProduct;
+            }
+            else {
+                const productRes = await ShopifyClient.getProductGraphQL(shop, accessToken, productId);
+                if (productRes?.product) {
+                    Logger.info('getShopifyProductWithCachingGraphQL - productRes', { productRes });
+                    const product = productRes.product;
+                    return product;
+                }
+            }
+            return null;
+        }
+        catch (error) {
+            Logger.error('Failed getShopifyProductWithCachingGraphQL', { error });
+            return null;
+        }
+    };
+    putShopifyProductCacheGraphQL = async (pixelId, productId, product, ttlInDays) => {
+        const ttl = ttlInDays || 7;
+        const expiresAt = DateTime.now().plus({ days: ttl }).toSeconds();
+        const shopifyProductCache = {
+            pixelId_productId: `${pixelId}_${productId}`,
+            pixelId,
+            productId,
+            productCompressed: compressJSON(product),
+            createdAt: getCurrentTimestamp(),
+            expiresAt
+        };
+        return shopifyProductCache;
+    };
+    getShopifyProductFromCacheGraphQL = async (pixelId, productId) => {
+        try {
+            return null;
+        }
+        catch (error) {
+            Logger.error('Failed getShopifyProductCacheGraphQL', { keyName: this.KEY_NAME, pixelId, productId, error });
+            return null;
+        }
+    };
+}
 //# sourceMappingURL=shopify-products-cache-db-service.js.map

package/dist/esm/services/db/shopify-products-cache-db-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"shopify-products-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/shopify-products-cache-db-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,MAAM,OAAO,6BAA6B;IACjC,UAAU,CAAS;IACnB,QAAQ,CAAS;IAExB,YAAY,SAAiB,EAAE,OAAe;QAC5C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAEM,sBAAsB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAiB,EAAE,EAAE;QAC3E,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,GAAG,OAAO,IAAI,SAAS,EAAE,CAAC,CAAC;YAC9G,IAAI,aAAa,EAAE;gBACjB,aAAa,CAAC,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;gBACxE,OAAO,aAAa,CAAC;aACtB;YACD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAChH,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;IAEK,sBAAsB,GAAG,KAAK,EAAE,OAAe,EAAE,SAAiB,EAAE,OAAyB,EAAE,SAAkB,EAAE,EAAE;QAC1H,MAAM,GAAG,GAAG,SAAS,IAAI,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;QAEjE,MAAM,mBAAmB,GAAG;YAC1B,iBAAiB,EAAE,GAAG,OAAO,IAAI,SAAS,EAAE;YAC5C,OAAO;YACP,SAAS;YACT,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC;YACxC,SAAS,EAAE,mBAAmB,EAAE;YAChC,SAAS;SACV,CAAC;QACF,OAAO,MAAM,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IAC5E,CAAC,CAAC;IAEK,yBAAyB,GAAG,KAAK,EAAE,OAAe,EAAE,IAAY,EAAE,WAAmB,EAAE,SAAiB,EAAoC,EAAE;QACnJ,IAAI;YACF,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACnF,IAAI,oBAAoB,EAAE;gBACxB,OAAO,oBAAoB,CAAC,OAA2B,CAAC;aACzD;iBAAM;gBACL,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;gBAChF,IAAI,UAAU,EAAE,OAAO,EAAE;oBACvB,MAAM,OAAO,GAAG,UAAU,CAAC,OAA2B,CAAC;oBACvD,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;oBAC/D,OAAO,OAAO,CAAC;iBAChB;aACF;YAED,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC;SACb;IACH,CAAC,CAAC;CACH"}
+{"version":3,"file":"shopify-products-cache-db-service.js","sourceRoot":"","sources":["../../../../src/services/db/shopify-products-cache-db-service.ts"],"names":[],"mappings":"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"}

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

@@ -1,20 +1,20 @@
-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);
-    private processResult;
-    private processResults;
-    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>;
-    buildTrackingEventRecord: (trackingEvent: TrackingEvent, ttlInDays?: number) => TrackingEventRecord;
-    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);
+    private processResult;
+    private processResults;
+    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>;
+    buildTrackingEventRecord: (trackingEvent: TrackingEvent, ttlInDays?: number) => TrackingEventRecord;
+    putTrackingEvent: (trackingEvent: TrackingEvent, ttlInDays?: number) => Promise<import("@aws-sdk/lib-dynamodb").PutCommandOutput | null | undefined>;
+}

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

@@ -1,159 +1,159 @@
-import { DynamoDbClient } from '../../clients';
-import { Logger } from '../../helpers';
-import { DateTime } from 'luxon';
-import { compressJSON, decompressJSON } from '../../libs';
-export class TrackingEventsDbService {
-    TABLE_NAME;
-    KEY_NAME = 'eventId';
-    constructor(tableName) {
-        this.TABLE_NAME = tableName;
-    }
-    processResult = (trackingEventRecord) => {
-        if (trackingEventRecord?.trackingEventCompressed) {
-            const trackingEventDecompressed = decompressJSON(trackingEventRecord.trackingEventCompressed);
-            if (trackingEventDecompressed) {
-                trackingEventRecord.trackingEvent = trackingEventDecompressed;
-                delete trackingEventRecord?.trackingEventCompressed;
-            }
-        }
-        return trackingEventRecord;
-    };
-    processResults = (trackingEventRecords) => {
-        return trackingEventRecords.map((trackingEventRecord) => this.processResult(trackingEventRecord));
-    };
-    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 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) {
-                trackingEventRecord = this.processResult(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) {
-            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 result = await DynamoDbClient.query(query);
-        const trackingEventRecords = (result?.Items ?? []);
-        return this.processResults(trackingEventRecords);
-    };
-    getTrackingEventCountByPixelId = async (indexName, pixelId, offsetInMinutes = 30) => {
-        try {
-            const pastDateTime = 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 DynamoDbClient.query(params);
-            return results?.Items?.length ?? 0;
-        }
-        catch (e) {
-            Logger.error('Failed to getTrackingEventCountByPixelId', { e });
-            return 0;
-        }
-    };
-    getTrackingEvent = async (eventId) => {
-        try {
-            let trackingEventRecord = await DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, eventId);
-            trackingEventRecord = this.processResult(trackingEventRecord);
-            return trackingEventRecord;
-        }
-        catch (e) {
-            Logger.error('Failed to getTrackingEvent', { e });
-            return null;
-        }
-    };
-    buildTrackingEventRecord = (trackingEvent, ttlInDays) => {
-        const trackingEventCopy = JSON.parse(JSON.stringify(trackingEvent));
-        delete trackingEventCopy?.context?.properties?.enrichment?.ipLookupResponse;
-        const pageURL = trackingEventCopy?.context?.properties?.page?.url;
-        const parsedPageURL = new URL(pageURL);
-        const hostname = parsedPageURL?.hostname;
-        const trackingEventsTableTTLDays = ttlInDays || 15;
-        const expiredAt = DateTime.now().plus({ days: trackingEventsTableTTLDays }).toSeconds();
-        const trackingEventRecord = {
-            eventId: trackingEventCopy.id,
-            eventName: trackingEventCopy.name,
-            pixelId: trackingEventCopy?.pixelId,
-            pixelIdEventName: `${trackingEventCopy.pixelId}_${trackingEventCopy.name}`,
-            ipAddressUserAgent: `${trackingEventCopy.context?.properties?.ipAddress}_${trackingEventCopy.context?.properties?.userAgent}`,
-            hostname,
-            identityId: trackingEventCopy?.context?.identity?.identityId,
-            sessionId: trackingEventCopy?.context?.properties?.sessionId,
-            collectedAt: trackingEventCopy.collectedAt,
-            expiredAt,
-        };
-        const trackingEventCompressed = compressJSON(trackingEventCopy);
-        if (trackingEventCompressed) {
-            trackingEventRecord.trackingEventCompressed = trackingEventCompressed;
-        }
-        else {
-            trackingEventRecord.trackingEvent = trackingEventCopy;
-        }
-        return trackingEventRecord;
-    };
-    putTrackingEvent = async (trackingEvent, ttlInDays) => {
-        if (!trackingEvent.context?.properties?.ipAddress || !trackingEvent.context?.properties?.userAgent)
-            return;
-        const trackingEventRecord = this.buildTrackingEventRecord(trackingEvent, ttlInDays);
-        return await DynamoDbClient.safePut(this.TABLE_NAME, trackingEventRecord);
-    };
-}
+import { DynamoDbClient } from '../../clients';
+import { Logger } from '../../helpers';
+import { DateTime } from 'luxon';
+import { compressJSON, decompressJSON } from '../../libs';
+export class TrackingEventsDbService {
+    TABLE_NAME;
+    KEY_NAME = 'eventId';
+    constructor(tableName) {
+        this.TABLE_NAME = tableName;
+    }
+    processResult = (trackingEventRecord) => {
+        if (trackingEventRecord?.trackingEventCompressed) {
+            const trackingEventDecompressed = decompressJSON(trackingEventRecord.trackingEventCompressed);
+            if (trackingEventDecompressed) {
+                trackingEventRecord.trackingEvent = trackingEventDecompressed;
+                delete trackingEventRecord?.trackingEventCompressed;
+            }
+        }
+        return trackingEventRecord;
+    };
+    processResults = (trackingEventRecords) => {
+        return trackingEventRecords.map((trackingEventRecord) => this.processResult(trackingEventRecord));
+    };
+    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 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) {
+                trackingEventRecord = this.processResult(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) {
+            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 result = await DynamoDbClient.query(query);
+        const trackingEventRecords = (result?.Items ?? []);
+        return this.processResults(trackingEventRecords);
+    };
+    getTrackingEventCountByPixelId = async (indexName, pixelId, offsetInMinutes = 30) => {
+        try {
+            const pastDateTime = 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 DynamoDbClient.query(params);
+            return results?.Items?.length ?? 0;
+        }
+        catch (e) {
+            Logger.error('Failed to getTrackingEventCountByPixelId', { e });
+            return 0;
+        }
+    };
+    getTrackingEvent = async (eventId) => {
+        try {
+            let trackingEventRecord = await DynamoDbClient.safeGet(this.TABLE_NAME, this.KEY_NAME, eventId);
+            trackingEventRecord = this.processResult(trackingEventRecord);
+            return trackingEventRecord;
+        }
+        catch (e) {
+            Logger.error('Failed to getTrackingEvent', { e });
+            return null;
+        }
+    };
+    buildTrackingEventRecord = (trackingEvent, ttlInDays) => {
+        const trackingEventCopy = JSON.parse(JSON.stringify(trackingEvent));
+        delete trackingEventCopy?.context?.properties?.enrichment?.ipLookupResponse;
+        const pageURL = trackingEventCopy?.context?.properties?.page?.url;
+        const parsedPageURL = new URL(pageURL);
+        const hostname = parsedPageURL?.hostname;
+        const trackingEventsTableTTLDays = ttlInDays || 15;
+        const expiredAt = DateTime.now().plus({ days: trackingEventsTableTTLDays }).toSeconds();
+        const trackingEventRecord = {
+            eventId: trackingEventCopy.id,
+            eventName: trackingEventCopy.name,
+            pixelId: trackingEventCopy?.pixelId,
+            pixelIdEventName: `${trackingEventCopy.pixelId}_${trackingEventCopy.name}`,
+            ipAddressUserAgent: `${trackingEventCopy.context?.properties?.ipAddress}_${trackingEventCopy.context?.properties?.userAgent}`,
+            hostname,
+            identityId: trackingEventCopy?.context?.identity?.identityId,
+            sessionId: trackingEventCopy?.context?.properties?.sessionId,
+            collectedAt: trackingEventCopy.collectedAt,
+            expiredAt,
+        };
+        const trackingEventCompressed = compressJSON(trackingEventCopy);
+        if (trackingEventCompressed) {
+            trackingEventRecord.trackingEventCompressed = trackingEventCompressed;
+        }
+        else {
+            trackingEventRecord.trackingEvent = trackingEventCopy;
+        }
+        return trackingEventRecord;
+    };
+    putTrackingEvent = async (trackingEvent, ttlInDays) => {
+        if (!trackingEvent.context?.properties?.ipAddress || !trackingEvent.context?.properties?.userAgent)
+            return;
+        const trackingEventRecord = this.buildTrackingEventRecord(trackingEvent, ttlInDays);
+        return await DynamoDbClient.safePut(this.TABLE_NAME, trackingEventRecord);
+    };
+}
 //# sourceMappingURL=tracking-events-db-service.js.map

package/dist/esm/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/esm/services/eventbridge-integration-service.js

@@ -1,25 +1,25 @@
-import { EventBridgeClient } from '../clients/generic/eventbridge-client.js';
-import { ADTRACKIFY_EVENT_BRIDGE_EVENTS, PostmarkRequestType } from '../types/internal-events/event-detail-types.js';
-export class EventBridgeIntegrationService {
-    eventBridgeClient;
-    EVENT_BUS_NAME;
-    constructor(eventBusName) {
-        this.eventBridgeClient = new EventBridgeClient(eventBusName);
-        this.EVENT_BUS_NAME = eventBusName;
-    }
-    sendPostmarkEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
-        return await this.eventBridgeClient.buildAndSendEvent(eventSource, ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
-            postmarkMessage,
-            postmarkRequestType: PostmarkRequestType.SINGLE_EMAIL,
-            postmarkServerToken
-        });
-    };
-    sendPostmarkTemplatedEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
-        return await this.eventBridgeClient.buildAndSendEvent(eventSource, ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
-            postmarkMessage,
-            postmarkRequestType: PostmarkRequestType.TEMPLATE_EMAIL,
-            postmarkServerToken
-        });
-    };
-}
+import { EventBridgeClient } from '../clients/generic/eventbridge-client.js';
+import { ADTRACKIFY_EVENT_BRIDGE_EVENTS, PostmarkRequestType } from '../types/internal-events/event-detail-types.js';
+export class EventBridgeIntegrationService {
+    eventBridgeClient;
+    EVENT_BUS_NAME;
+    constructor(eventBusName) {
+        this.eventBridgeClient = new EventBridgeClient(eventBusName);
+        this.EVENT_BUS_NAME = eventBusName;
+    }
+    sendPostmarkEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
+        return await this.eventBridgeClient.buildAndSendEvent(eventSource, ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
+            postmarkMessage,
+            postmarkRequestType: PostmarkRequestType.SINGLE_EMAIL,
+            postmarkServerToken
+        });
+    };
+    sendPostmarkTemplatedEmailEvent = async (eventSource, postmarkMessage, postmarkServerToken) => {
+        return await this.eventBridgeClient.buildAndSendEvent(eventSource, ADTRACKIFY_EVENT_BRIDGE_EVENTS.SEND_POSTMARK_EMAIL, {
+            postmarkMessage,
+            postmarkRequestType: PostmarkRequestType.TEMPLATE_EMAIL,
+            postmarkServerToken
+        });
+    };
+}
 //# sourceMappingURL=eventbridge-integration-service.js.map

package/dist/esm/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/esm/services/index.js

@@ -1,6 +1,6 @@
-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';
 //# sourceMappingURL=index.js.map