Merge pull request #4 from TON-Commerce/release/v1.0.3

Release/v1.0.3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tonsolutions/analytics-react",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "./lib/index.сjs",
   "module": "./lib/index.mjs",
   "types": "./lib/index.d.ts",

src/builders/event.builder.ts

@@ -6,6 +6,7 @@ import {
 } from '../constants';
 import { EventType } from '../enum/event-type.enum';
 import { EventPushHandler } from '../event-push-handler';
+import { getCurrentUTCTimestamp } from '../helpers/date.helper';
 import { encryptMessage } from '../helpers/encryption.helper';
 import { IEventBuilder } from '../interfaces';
 import { TelegramWebAppData } from '../models';
@@ -115,6 +116,7 @@ export class EventBuilder implements IEventBuilder {
   async track(
     eventName: string,
     eventProperties: Record<string, any>,
+    sessionIdentifier?: string,
   ): Promise<void> {
     if (eventName === null) {
       throw new Error('Event name is not set.');
@@ -147,9 +149,10 @@ export class EventBuilder implements IEventBuilder {
       this.data.platform,
       this.data.chat_type || 'N/A',
       this.data.chat_instance || '0',
-      Math.floor(Date.now() / 1000).toString(),
+      getCurrentUTCTimestamp(),
       eventName.startsWith(DEFAULT_SYSTEM_EVENT_PREFIX),
       eventProperties.wallet || undefined,
+      sessionIdentifier,
     );
 
     return this.pushHandler.push(event);

src/components/TwaAnalyticsProvider.tsx

@@ -10,6 +10,7 @@ import { EventBuilder } from '../builders';
 import { loadTelegramWebAppData } from '../telegram/telegram';
 import { TonConnectStorageData } from '../models/tonconnect-storage-data';
 import { EventType } from '../enum/event-type.enum';
+import { getCurrentUTCTimestamp } from '../helpers/date.helper';
 
 export type TwaAnalyticsProviderOptions = {
   projectId: string;
@@ -62,9 +63,13 @@ const TwaAnalyticsProvider: FunctionComponent<TwaAnalyticsProviderProps> = ({
 
   useEffect(() => {
     const locationPath = location.pathname;
-    eventBuilder.track(`${EventType.PageView} ${locationPath}`, {
-      path: locationPath,
-    });
+    eventBuilder.track(
+      `${EventType.PageView} ${locationPath}`,
+      {
+        path: locationPath,
+      },
+      getCurrentUTCTimestamp(),
+    );
   }, []);
 
   useEffect(() => {

src/helpers/date.helper.ts

@@ -0,0 +1,3 @@
+export const getCurrentUTCTimestamp = (): string => {
+  return Math.floor(Date.now() / 1000).toString();
+};

src/types/event.ts

@@ -25,4 +25,5 @@ export interface BaseEvent {
   timestamp: string;
   isAutocapture: boolean;
   wallet: string | undefined;
+  sessionIdentifier?: string;
 }

src/utils/create-event.ts

@@ -13,6 +13,7 @@ export const createEvent = (
   timestamp: string,
   isAutocapture: boolean,
   wallet: string | undefined,
+  sessionIdentifier?: string,
 ): BaseEvent => {
   return {
     eventType: eventName,
@@ -27,5 +28,6 @@ export const createEvent = (
     timestamp,
     isAutocapture,
     wallet,
+    sessionIdentifier,
   };
 };