@rxdrag/website-lib-core 0.0.49 → 0.0.51

package/src/entify/lib/index.ts

@@ -1,29 +1,30 @@
-export * from "./toQueryOptions";
-export * from "./createEntifyClient";
-export * from "./newAvatarQueryOptions";
-export * from "./newOgImageQueryOptions";
-export * from "./newQueryPostOptions";
-export * from "./newQueryProductOptions";
-export * from "./newQueryProductsMediaOptions";
-export * from "./queryEntityList";
-export * from "./queryFeaturedProducts";
-export * from "./queryLangs";
-export * from "./queryLatestPosts";
-export * from "./queryOneEntity";
-export * from "./queryOnePostById";
-export * from "./queryOnePostCategoryBySlug";
-export * from "./queryOnePostBySlug";
-export * from "./queryOneProductById";
-export * from "./queryOneProductBySlug";
-export * from "./queryOneProductCategoryBySlug";
-export * from "./queryOneUser";
-export * from "./queryPostCategories";
-export * from "./queryPosts";
-export * from "./queryProductCategories";
-export * from "./queryProducts";
-export * from "./queryProductsInMenu";
-export * from "./queryUserPosts";
-export * from "./queryWebSiteSettings";
-export * from "./upsertEntity";
-export * from "./fulltextSearch";
-export * from "./sendEmail";
+export * from "./toQueryOptions";
+export * from "./createEntifyClient";
+export * from "./newAvatarQueryOptions";
+export * from "./newOgImageQueryOptions";
+export * from "./newQueryPostOptions";
+export * from "./newQueryProductOptions";
+export * from "./newQueryProductsMediaOptions";
+export * from "./queryEntityList";
+export * from "./queryFeaturedProducts";
+export * from "./queryLangs";
+export * from "./queryLatestPosts";
+export * from "./queryOneEntity";
+export * from "./queryOnePostById";
+export * from "./queryOnePostCategoryBySlug";
+export * from "./queryOnePostBySlug";
+export * from "./queryOneProductById";
+export * from "./queryOneProductBySlug";
+export * from "./queryOneProductCategoryBySlug";
+export * from "./queryOneUser";
+export * from "./queryPostCategories";
+export * from "./queryPosts";
+export * from "./queryProductCategories";
+export * from "./queryProducts";
+export * from "./queryProductsInMenu";
+export * from "./queryUserPosts";
+export * from "./queryWebSiteSettings";
+export * from "./upsertEntity";
+export * from "./fulltextSearch";
+export * from "./sendEmail";
+export * from "./createUploadCredentials";

package/src/entify/lib/newQueryProductOptions.ts

@@ -66,6 +66,7 @@ export function newQueryProductOptions(imagSize?: TSize) {
       }).attachment(
         new MediaQueryOptions([
           MediaFields.id,
+          MediaFields.mediaRef,
           MediaFields.description,
           MediaFields.name,
           MediaFields.extName,

package/src/entify/lib/queryLangs.ts

@@ -5,10 +5,10 @@ import {
   LangOrderBy,
   LangQueryOptions,
   LangAssciations,
-  ThemeQueryOptions,
-  ThemeFields,
+  ThemeBranchQueryOptions,
+  ThemeBranchFields,
   ThemeConfigFields,
-  ThemeAssciations,
+  ThemeBranchAssciations,
 } from "@rxdrag/rxcms-models";
 import { ListResult } from "@rxdrag/entify-lib";
 import { EnvVariables } from "../types";
@@ -34,9 +34,9 @@ export async function queryLangs(envVariables: EnvVariables) {
       },
     })
       .themes(
-        new ThemeQueryOptions([ThemeFields.id, ThemeFields.name], {
+        new ThemeBranchQueryOptions([ThemeBranchFields.id, ThemeBranchFields.name], {
           where: {
-            [ThemeAssciations.website]: {
+            [ThemeBranchAssciations.website]: {
               id: {
                 _eq: envVariables.websiteId,
               },

package/src/entify/lib/queryLatestPosts.ts

@@ -10,6 +10,7 @@ import {
   UserQueryOptions,
   UserFields,
   PublishableStatus,
+  PostCategoryFields,
 } from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { EnvVariables, TSize } from "../types";
@@ -54,10 +55,17 @@ export async function queryLatestPosts(
         },
       }
     )
+      .category([
+        PostCategoryFields.id,
+        PostCategoryFields.slug,
+        PostCategoryFields.name,
+      ])
       .cover(
         new MediaQueryOptions().file([
           "thumbnail",
-          `resize(width:${coverSize?.width || 480}, height:${coverSize?.height || 180})`,
+          `resize(width:${coverSize?.width || 480}, height:${
+            coverSize?.height || 180
+          })`,
         ])
       )
       .author(

package/src/entify/lib/queryOneTheme.ts

@@ -1,10 +1,10 @@
 import {
-  Theme,
-  ThemeBoolExp,
-  ThemeOrderBy,
-  ThemeDistinctExp,
-  ThemeQueryOptions,
-  ThemeFields,
+  ThemeBranch,
+  ThemeBranchBoolExp,
+  ThemeBranchOrderBy,
+  ThemeBranchDistinctExp,
+  ThemeBranchQueryOptions,
+  ThemeBranchFields,
   ThemeConfigQueryOptions,
   ThemeConfigFields,
   MediaQueryOptions,
@@ -15,13 +15,13 @@ import { queryOneEntity } from "./queryOneEntity";
 
 export async function queryOneTheme(envVariables: EnvVariables) {
   return await queryOneEntity<
-    Theme,
-    ThemeBoolExp,
-    ThemeOrderBy,
-    ThemeDistinctExp
+    ThemeBranch,
+    ThemeBranchBoolExp,
+    ThemeBranchOrderBy,
+    ThemeBranchDistinctExp
   >(
-    new ThemeQueryOptions(
-      [ThemeFields.id, ThemeFields.name, ThemeFields.settings],
+    new ThemeBranchQueryOptions(
+      [ThemeBranchFields.id, ThemeBranchFields.name, ThemeBranchFields.settings],
       {
         where: {
           lang: {

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from "./astro";
 export * from "./entify";
 export * from "./component-logic";
 export * from "./motion";

package/src/react/components/Analytics/eventHandlers.ts

@@ -0,0 +1,173 @@
+// Analytics 事件处理函数
+import type { AnalyticsState, PageData } from './types';
+import { trackPageEvent, trackPageVisit } from './tracking';
+
+// 页面离开事件处理
+export function createPageLeaveHandler(
+  state: AnalyticsState,
+  pageData: PageData,
+  apiEndpoint: string,
+  debugLog: (...args: unknown[]) => void
+) {
+  return function handlePageLeave(eventSource?: string): void {
+    // 检查当前页面是否已经被跟踪离开
+    if (state.pageLeaveTracked) {
+      console.log(`Page leave already tracked, skipping (source: ${eventSource || 'unknown'})`);
+      return;
+    }
+
+    // 检查是否有页面访问记录，如果从来没有跟踪过任何页面则不发送离开事件
+    if (state.lastTrackTime === 0) {
+      console.log(`No page visit ever tracked, skipping page leave (source: ${eventSource || 'unknown'})`);
+      return;
+    }
+
+    console.log(`Page leaving, tracking pageLeave event (source: ${eventSource || 'unknown'})`);
+    state.pageLeaveTracked = true;
+    trackPageEvent("pageLeave", pageData, state, apiEndpoint, debugLog);
+  };
+}
+
+// Astro before-swap 事件处理
+export function createAstroBeforeSwapHandler(
+  handlePageLeave: (eventSource?: string) => void
+) {
+  return function handleAstroBeforeSwap(): void {
+    console.log("astro:before-swap triggered - page leaving");
+    handlePageLeave('astro:before-swap');
+  };
+}
+
+// Astro after-swap 事件处理
+export function createAstroAfterSwapHandler(
+  state: AnalyticsState,
+  pageData: PageData,
+  apiEndpoint: string,
+  debugLog: (...args: unknown[]) => void
+) {
+  return function handleAstroAfterSwap(): void {
+    console.log("astro:after-swap triggered");
+    state.isAstroEnvironment = true;
+
+    // 直接处理页面切换，不依赖 resetPageTracking
+    const newUrl = window.location.href;
+    if (newUrl !== state.currentPageUrl) {
+      console.log(
+        "URL changed in astro:after-swap from",
+        state.currentPageUrl,
+        "to",
+        newUrl
+      );
+
+      // 更新 referrer：页面切换时，referrer 是上一个页面
+      state.currentReferrer = state.currentPageUrl;
+      debugLog("Updated referrer to:", state.currentReferrer);
+
+      // 更新页面数据
+      // 更新页面状态
+      state.currentPageUrl = newUrl;
+      pageData.url = newUrl;
+      pageData.path = window.location.pathname;
+      pageData.start_time = Date.now();
+      state.pageLoadTime = Date.now();
+      state.isPageTracked = false; // 重置跟踪状态
+      // 注意：不重置 pageLeaveTracked，让它保持当前状态，避免影响离开事件
+      // 重置活跃时间追踪
+      state.activeTime = 0;
+      state.lastActiveTime = Date.now();
+      state.isPageVisible = !document.hidden;
+
+      // 直接发送统计
+      trackPageVisit(pageData, state, apiEndpoint, debugLog);
+      
+      // 新页面开始跟踪后，重置页面离开状态，为下次离开做准备
+      state.pageLeaveTracked = false;
+      
+      // 标记初始加载已处理，防止后续的初始加载事件重复处理
+      state.initialLoadHandled = true;
+    }
+  };
+}
+
+// 初始加载事件处理
+export function createInitialLoadHandler(
+  state: AnalyticsState,
+  pageData: PageData,
+  apiEndpoint: string,
+  debugLog: (...args: unknown[]) => void
+) {
+  return function handleInitialLoad(eventType: string): void {
+    console.log(
+      eventType + " triggered, isAstroEnvironment:",
+      state.isAstroEnvironment,
+      "initialLoadHandled:",
+      state.initialLoadHandled,
+      "isPageTracked:",
+      state.isPageTracked
+    );
+
+    // 如果初始加载已经处理过，跳过（可能是 astro:after-swap 已经处理了）
+    if (state.initialLoadHandled) {
+      console.log(`Skipping initial load - already handled (${eventType})`);
+      return;
+    }
+
+    // 如果页面已经被跟踪（可能是 astro:after-swap 已经处理了），跳过
+    if (state.isPageTracked) {
+      console.log(`Skipping initial load - page already tracked (${eventType})`);
+      return;
+    }
+
+    // 页面刷新或直接访问时，确保统计
+    state.initialLoadHandled = true;
+    console.log("Handling initial page load via", eventType);
+    trackPageVisit(pageData, state, apiEndpoint, debugLog);
+  };
+}
+
+// 页面可见性变化事件处理
+export function createVisibilityChangeHandler(state: AnalyticsState) {
+  return function handleVisibilityChange(): void {
+    const now = Date.now();
+
+    if (document.visibilityState === "visible") {
+      // 页面变为可见
+      console.log("Page became visible");
+      state.isPageVisible = true;
+      state.lastActiveTime = now;
+    } else {
+      // 页面变为隐藏
+      console.log("Page became hidden");
+      if (state.isPageVisible) {
+        // 更新活跃时间到隐藏前
+        state.activeTime += now - state.lastActiveTime;
+        console.log("Updated active time:", state.activeTime, "ms");
+      }
+      state.isPageVisible = false;
+    }
+  };
+}
+
+// 用户交互事件处理
+export function createUserInteractionHandler(state: AnalyticsState) {
+  return function handleUserInteraction(): void {
+    if (!state.isPageVisible || state.interactionThrottled) return;
+
+    const now = Date.now();
+    // 节流：最多每秒检查一次
+    if (now - state.lastInteractionTime < 1000) return;
+
+    state.lastInteractionTime = now;
+    state.interactionThrottled = true;
+
+    // 如果超过30秒没有交互，重置活跃时间计算
+    if (now - state.lastActiveTime > 30000) {
+      state.lastActiveTime = now;
+    }
+
+    // 解除节流
+    setTimeout(() => {
+      state.interactionThrottled = false;
+    }, 1000);
+  };
+}

package/src/react/components/Analytics/index.tsx

@@ -0,0 +1,21 @@
+import { useEffect } from 'react';
+import type { AnalyticsProps } from './types';
+import AnalyticsSingleton from './singleton';
+
+export function Analytics({
+  apiEndpoint = "/api/track-visitor"
+}: AnalyticsProps) {
+  useEffect(() => {
+    // 获取单例实例并初始化
+    const analytics = AnalyticsSingleton.getInstance(apiEndpoint);
+    analytics.init();
+
+    // 组件卸载时不清理单例，让它继续工作
+    return () => {
+      // 不做任何清理，让单例继续工作
+    };
+  }, [apiEndpoint]);
+
+  // 组件不渲染任何可见内容
+  return null;
+}

package/src/react/components/Analytics/singleton.ts

@@ -0,0 +1,214 @@
+// Analytics 单例管理器
+import type { AnalyticsState, PageData } from './types';
+import { 
+  createDebugLogger, 
+  generateId, 
+  getVisitorId 
+} from './utils';
+import { trackPageEvent } from './tracking';
+
+class AnalyticsSingleton {
+  private static instance: AnalyticsSingleton | null = null;
+  private initialized = false;
+  private state: AnalyticsState;
+  private pageData: PageData;
+  private apiEndpoint: string;
+  private debugLog: (...args: any[]) => void;
+  private eventHandlers: Array<() => void> = [];
+
+  private constructor(apiEndpoint: string) {
+    this.apiEndpoint = apiEndpoint;
+    this.debugLog = createDebugLogger();
+    
+    // 初始化访客和会话信息
+    const visitorId = getVisitorId();
+    let sessionId = sessionStorage.getItem('session_id');
+    if (!sessionId) {
+      sessionId = generateId('s');
+      sessionStorage.setItem('session_id', sessionId);
+    }
+
+    // 页面信息
+    this.pageData = {
+      visitor_id: visitorId,
+      session_id: sessionId,
+      url: window.location.href,
+      path: window.location.pathname,
+      referrer: document.referrer || null,
+      user_agent: navigator.userAgent,
+      start_time: Date.now(),
+    };
+
+    // 状态管理
+    this.state = {
+      isPageTracked: false,
+      currentPageUrl: window.location.href,
+      pageLoadTime: Date.now(),
+      lastTrackTime: 0,
+      currentReferrer: document.referrer || null,
+      activeTime: 0,
+      lastActiveTime: Date.now(),
+      isPageVisible: !document.hidden,
+      requestQueue: [],
+      isRequestPending: false,
+      isAstroEnvironment: false,
+      pageLeaveTracked: false,
+      initialLoadHandled: false,
+      interactionThrottled: false,
+      lastInteractionTime: 0,
+    };
+
+  }
+
+  static getInstance(apiEndpoint = "/api/track-visitor"): AnalyticsSingleton {
+    if (!AnalyticsSingleton.instance) {
+      AnalyticsSingleton.instance = new AnalyticsSingleton(apiEndpoint);
+    }
+    return AnalyticsSingleton.instance;
+  }
+
+  static reset(): void {
+    if (AnalyticsSingleton.instance) {
+      AnalyticsSingleton.instance.cleanup();
+      AnalyticsSingleton.instance = null;
+    }
+  }
+
+  init(): void {
+    if (this.initialized) {
+      return;
+    }
+
+    this.initialized = true;
+    this.setupEventListeners();
+    this.handleInitialPageLoad();
+  }
+
+  private setupEventListeners(): void {
+    // 页面离开事件
+    const handlePageLeave = () => {
+      if (this.state.pageLeaveTracked || this.state.lastTrackTime === 0) {
+        return;
+      }
+
+      this.state.pageLeaveTracked = true;
+      trackPageEvent("pageLeave", this.pageData, this.state, this.apiEndpoint, this.debugLog);
+    };
+
+    // 页面离开事件监听器
+    const handleBeforeUnload = () => handlePageLeave();
+    const handlePageHide = () => handlePageLeave();
+
+    window.addEventListener('beforeunload', handleBeforeUnload);
+    window.addEventListener('pagehide', handlePageHide);
+
+    // Astro 事件监听
+    const handleAstroBeforeSwap = () => {
+      handlePageLeave();
+    };
+
+    const handleAstroAfterSwap = () => {
+      this.state.isAstroEnvironment = true;
+
+      const newUrl = window.location.href;
+      if (newUrl !== this.state.currentPageUrl) {
+        // 更新 referrer：页面切换时，referrer 是上一个页面
+        this.state.currentReferrer = this.state.currentPageUrl;
+
+        // 更新页面状态
+        this.state.currentPageUrl = newUrl;
+        this.pageData.url = newUrl;
+        this.pageData.path = window.location.pathname;
+        this.pageData.start_time = Date.now();
+        this.state.pageLoadTime = Date.now();
+        this.state.isPageTracked = false;
+        this.state.pageLeaveTracked = false;
+        this.state.activeTime = 0;
+        this.state.lastActiveTime = Date.now();
+        this.state.isPageVisible = !document.hidden;
+
+        // 发送新页面统计
+        this.trackPageVisit();
+      }
+    };
+
+    document.addEventListener('astro:before-swap', handleAstroBeforeSwap);
+    document.addEventListener('astro:after-swap', handleAstroAfterSwap);
+
+    // 页面可见性变化
+    const handleVisibilityChange = () => {
+      const now = Date.now();
+      if (document.visibilityState === 'visible') {
+        this.state.isPageVisible = true;
+        this.state.lastActiveTime = now;
+      } else {
+        if (this.state.isPageVisible) {
+          this.state.activeTime += now - this.state.lastActiveTime;
+        }
+        this.state.isPageVisible = false;
+      }
+    };
+
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+
+    // 用户交互事件
+    const handleUserInteraction = () => {
+      if (!this.state.isPageVisible || this.state.interactionThrottled) return;
+
+      const now = Date.now();
+      if (now - this.state.lastInteractionTime < 1000) return;
+
+      this.state.lastInteractionTime = now;
+      this.state.interactionThrottled = true;
+
+      if (now - this.state.lastActiveTime > 30000) {
+        this.state.lastActiveTime = now;
+      }
+
+      setTimeout(() => {
+        this.state.interactionThrottled = false;
+      }, 1000);
+    };
+
+    const interactionEvents = ['click', 'keydown', 'scroll'];
+    interactionEvents.forEach((event) => {
+      document.addEventListener(event, handleUserInteraction, {
+        passive: true,
+        capture: false,
+      });
+    });
+
+    // 保存事件处理器引用，用于清理
+    this.eventHandlers = [
+      () => window.removeEventListener('beforeunload', handleBeforeUnload),
+      () => window.removeEventListener('pagehide', handlePageHide),
+      () => document.removeEventListener('astro:before-swap', handleAstroBeforeSwap),
+      () => document.removeEventListener('astro:after-swap', handleAstroAfterSwap),
+      () => document.removeEventListener('visibilitychange', handleVisibilityChange),
+      ...interactionEvents.map(event => 
+        () => document.removeEventListener(event, handleUserInteraction)
+      )
+    ];
+  }
+
+  private handleInitialPageLoad(): void {
+    if (this.state.isPageTracked || this.state.initialLoadHandled) {
+      return;
+    }
+
+    this.state.initialLoadHandled = true;
+    this.trackPageVisit();
+  }
+
+  private trackPageVisit(): void {
+    trackPageEvent("pageView", this.pageData, this.state, this.apiEndpoint, this.debugLog);
+  }
+
+  cleanup(): void {
+    this.eventHandlers.forEach(cleanup => cleanup());
+    this.eventHandlers = [];
+    this.initialized = false;
+  }
+}
+
+export default AnalyticsSingleton;