@umituz/web-traffic 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/web-traffic",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Web analytics tracking library. Event tracking, pageviews, sessions, device info, and UTM parameter support.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/tracking/application/tracking-command.service.ts

@@ -74,23 +74,23 @@ export class TrackingCommandService {
       const sessionIdVo = new SessionId(sessionId);
       const pageviewId = EventId.generate();
 
+      // Get session first to get siteId
+      let session = await this.sessionRepo.findById(sessionIdVo);
+      if (!session) {
+        throw new Error('Session not found');
+      }
+
       const utmParameters = utmParams ? new UTMParameters(utmParams) : null;
 
       const pageview = new Pageview({
         id: pageviewId,
         sessionId: sessionIdVo,
-        siteId: new SessionId(data.sessionId).getSiteId(),
+        siteId: session.siteId,
         path,
         referrer,
         utmParameters,
       });
 
-      // Get or create session
-      let session = await this.sessionRepo.findById(sessionIdVo);
-      if (!session) {
-        throw new Error('Session not found');
-      }
-
       session.addPageview(pageview);
       await this.pageviewRepo.save(pageview);
       await this.sessionRepo.save(session);

package/src/infrastructure/tracking/web-traffic.service.ts

@@ -103,7 +103,8 @@ class WebTrafficService {
     if (!this.sessionRepo) return;
 
     const deviceId = this.getOrCreateDeviceId();
-    const existingSession = await this.sessionRepo.findActive(deviceId);
+    const SESSION_TIMEOUT_MS = 30 * 60 * 1000; // 30 minutes
+    const existingSession = await this.sessionRepo.findActive(deviceId, SESSION_TIMEOUT_MS);
 
     if (existingSession) {
       this.currentSession = existingSession;

package/src/presentation/context.tsx

@@ -3,8 +3,7 @@
  * @description React context provider for web-traffic tracking
  */
 
-import type { createContext } from 'react';
-import { createContext, useContext, useEffect, useMemo, type ReactNode } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, type ReactNode } from 'react';
 import { webTrafficService, type WebTrafficConfig } from '../infrastructure/tracking/web-traffic.service';
 import type { WebTrafficContextValue, TrackingCommandResult } from './hooks';
 
@@ -33,8 +32,9 @@ export function WebTrafficProvider({ children, config }: WebTrafficProviderProps
         return webTrafficService.trackPageView(path);
       },
       isInitialized: webTrafficService.isInitialized(),
+      config,
     }),
-    []
+    [config]
   );
 
   return <TrackingContext.Provider value={value}>{children}</TrackingContext.Provider>;

package/src/presentation/hooks.ts

@@ -16,10 +16,13 @@ export interface TrackingCommandResult {
   error?: string;
 }
 
+import type { WebTrafficConfig } from '../infrastructure/tracking/web-traffic.service';
+
 export interface WebTrafficContextValue {
   readonly trackEvent: (name: string, properties?: Record<string, unknown>) => Promise<TrackingCommandResult>;
   readonly trackPageView: (path?: string) => Promise<TrackingCommandResult>;
   readonly isInitialized: boolean;
+  readonly config: WebTrafficConfig;
 }
 
 export function useWebTraffic(): WebTrafficContextValue {
@@ -35,6 +38,7 @@ export function useWebTraffic(): WebTrafficContextValue {
         return webTrafficService.trackPageView(path);
       }, []),
       isInitialized: webTrafficService.isInitialized(),
+      config: { apiKey: '' }, // Fallback - context should always be used
     };
   }
 
@@ -45,6 +49,7 @@ export function useAnalytics(query: AnalyticsQuery) {
   const [data, setData] = useState<AnalyticsData | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<Error | null>(null);
+  const { config } = useWebTraffic();
 
   useEffect(() => {
     let cancelled = false;
@@ -53,10 +58,9 @@ export function useAnalytics(query: AnalyticsQuery) {
       setLoading(true);
       setError(null);
 
-      // Note: You'll need to initialize this with proper config
       const repo = new HTTPAnalyticsRepository({
-        apiUrl: 'https://analytics.umituz.com',
-        apiKey: 'your-api-key', // This should come from config
+        apiUrl: config.apiUrl ?? 'https://analytics.umituz.com',
+        apiKey: config.apiKey,
       });
 
       const result = await repo.getAnalytics(query);
@@ -72,7 +76,7 @@ export function useAnalytics(query: AnalyticsQuery) {
     return () => {
       cancelled = true;
     };
-  }, [query]);
+  }, [query, config]);
 
   return { data, loading, error };
 }