@windrun-huaiin/third-ui 7.2.0 → 7.2.2

package/dist/clerk/fingerprint/fingerprint-client.js

@@ -2,14 +2,13 @@
 
 var tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.2/node_modules/tslib/tslib.es6.js');
 var fingerprintShared = require('./fingerprint-shared.js');
+var fp_esm = require('../../node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.js');
 
 /**
  * Fingerprint Client Utilities
  * 客户端专用的指纹生成和管理逻辑
  * 只能在浏览器环境中使用
  */
-// Dynamic import to avoid SSR issues
-let FingerprintJS = null;
 /**
  * 生成基于真实浏览器特征的fingerprint ID
  * 使用FingerprintJS收集浏览器特征并生成唯一标识
@@ -33,13 +32,8 @@ function generateFingerprintId() {
             return cookieId;
         }
         try {
-            // 等待FingerprintJS加载完成
-            if (!FingerprintJS) {
-                const module = yield Promise.resolve().then(function () { return require('../../node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.js'); });
-                FingerprintJS = module.default;
-            }
             // 使用FingerprintJS生成基于浏览器特征的指纹
-            const fp = yield FingerprintJS.load();
+            const fp = yield fp_esm.default.load();
             const result = yield fp.get();
             const fingerprintId = `fp_${result.visitorId}`;
             // 存储到localStorage和cookie
@@ -123,7 +117,7 @@ function createFingerprintHeaders() {
     return tslib_es6.__awaiter(this, void 0, void 0, function* () {
         const fingerprintId = yield getOrGenerateFingerprintId();
         return {
-            'x-fingerprint-id': fingerprintId,
+            FINGERPRINT_HEADER_NAME: fingerprintId,
         };
     });
 }

package/dist/clerk/fingerprint/fingerprint-client.mjs

@@ -1,13 +1,12 @@
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.2/node_modules/tslib/tslib.es6.mjs';
 import { FINGERPRINT_STORAGE_KEY, isValidFingerprintId, FINGERPRINT_COOKIE_NAME } from './fingerprint-shared.mjs';
+import index from '../../node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.mjs';
 
 /**
  * Fingerprint Client Utilities
  * 客户端专用的指纹生成和管理逻辑
  * 只能在浏览器环境中使用
  */
-// Dynamic import to avoid SSR issues
-let FingerprintJS = null;
 /**
  * 生成基于真实浏览器特征的fingerprint ID
  * 使用FingerprintJS收集浏览器特征并生成唯一标识
@@ -31,13 +30,8 @@ function generateFingerprintId() {
             return cookieId;
         }
         try {
-            // 等待FingerprintJS加载完成
-            if (!FingerprintJS) {
-                const module = yield import('../../node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.mjs');
-                FingerprintJS = module.default;
-            }
             // 使用FingerprintJS生成基于浏览器特征的指纹
-            const fp = yield FingerprintJS.load();
+            const fp = yield index.load();
             const result = yield fp.get();
             const fingerprintId = `fp_${result.visitorId}`;
             // 存储到localStorage和cookie
@@ -121,7 +115,7 @@ function createFingerprintHeaders() {
     return __awaiter(this, void 0, void 0, function* () {
         const fingerprintId = yield getOrGenerateFingerprintId();
         return {
-            'x-fingerprint-id': fingerprintId,
+            FINGERPRINT_HEADER_NAME: fingerprintId,
         };
     });
 }

package/dist/clerk/fingerprint/fingerprint-shared.d.ts

@@ -2,7 +2,7 @@
  * Fingerprint Shared Utilities
  * 客户端和服务端共享的常量、类型和验证逻辑
  */
-export declare const FINGERPRINT_STORAGE_KEY = "diaomao_fingerprint_id";
+export declare const FINGERPRINT_STORAGE_KEY = "x_fingerprint_id";
 export declare const FINGERPRINT_HEADER_NAME = "x-fingerprint-id";
 export declare const FINGERPRINT_COOKIE_NAME = "fingerprint_id";
 /**
@@ -11,7 +11,7 @@ export declare const FINGERPRINT_COOKIE_NAME = "fingerprint_id";
  */
 export declare function isValidFingerprintId(fingerprintId: string): boolean;
 export declare const FINGERPRINT_CONSTANTS: {
-    readonly STORAGE_KEY: "diaomao_fingerprint_id";
+    readonly STORAGE_KEY: "x_fingerprint_id";
     readonly HEADER_NAME: "x-fingerprint-id";
     readonly COOKIE_NAME: "fingerprint_id";
 };

package/dist/clerk/fingerprint/fingerprint-shared.js

@@ -5,7 +5,7 @@
  * 客户端和服务端共享的常量、类型和验证逻辑
  */
 // Fingerprint ID的存储键和header名
-const FINGERPRINT_STORAGE_KEY = 'diaomao_fingerprint_id';
+const FINGERPRINT_STORAGE_KEY = 'x_fingerprint_id';
 const FINGERPRINT_HEADER_NAME = 'x-fingerprint-id';
 const FINGERPRINT_COOKIE_NAME = 'fingerprint_id';
 /**

package/dist/clerk/fingerprint/fingerprint-shared.mjs

@@ -3,7 +3,7 @@
  * 客户端和服务端共享的常量、类型和验证逻辑
  */
 // Fingerprint ID的存储键和header名
-const FINGERPRINT_STORAGE_KEY = 'diaomao_fingerprint_id';
+const FINGERPRINT_STORAGE_KEY = 'x_fingerprint_id';
 const FINGERPRINT_HEADER_NAME = 'x-fingerprint-id';
 const FINGERPRINT_COOKIE_NAME = 'fingerprint_id';
 /**

package/dist/clerk/fingerprint/types.d.ts

@@ -5,6 +5,8 @@
 export interface AnonymousUser {
     userId: string;
     fingerprintId: string;
+    clerkUserId: string;
+    email: string;
     status: string;
     createdAt: string;
 }

package/dist/clerk/fingerprint/use-fingerprint.js

@@ -23,13 +23,7 @@ function useFingerprint(config) {
         if (typeof window === 'undefined')
             return null;
         try {
-            // 优先检查现有ID
-            const existingId = fingerprintClient.getFingerprintId();
-            if (existingId) {
-                setFingerprintIdState(existingId);
-                return existingId;
-            }
-            // 生成新的fingerprint ID
+            // 优先检查现有ID, 没有就生成新的fingerprint ID
             const currentFingerprintId = yield fingerprintClient.getOrGenerateFingerprintId();
             setFingerprintIdState(currentFingerprintId);
             return currentFingerprintId;

package/dist/clerk/fingerprint/use-fingerprint.mjs

@@ -1,7 +1,7 @@
 "use client";
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.2/node_modules/tslib/tslib.es6.mjs';
 import { useState, useCallback, useEffect } from 'react';
-import { createFingerprintHeaders, setFingerprintId, getFingerprintId, getOrGenerateFingerprintId } from './fingerprint-client.mjs';
+import { createFingerprintHeaders, setFingerprintId, getOrGenerateFingerprintId } from './fingerprint-client.mjs';
 
 /**
  * Hook for managing fingerprint ID and anonymous user data
@@ -21,13 +21,7 @@ function useFingerprint(config) {
         if (typeof window === 'undefined')
             return null;
         try {
-            // 优先检查现有ID
-            const existingId = getFingerprintId();
-            if (existingId) {
-                setFingerprintIdState(existingId);
-                return existingId;
-            }
-            // 生成新的fingerprint ID
+            // 优先检查现有ID, 没有就生成新的fingerprint ID
             const currentFingerprintId = yield getOrGenerateFingerprintId();
             setFingerprintIdState(currentFingerprintId);
             return currentFingerprintId;

package/dist/node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.js

@@ -613,34 +613,6 @@ function loadSources(sources, sourceOptions, excludeSources, loopReleaseInterval
         });
     };
 }
-/**
- * Modifies an entropy source by transforming its returned value with the given function.
- * Keeps the source properties: sync/async, 1/2 stages.
- *
- * Warning for package users:
- * This function is out of Semantic Versioning, i.e. can change unexpectedly. Usage is at your own risk.
- */
-function transformSource(source, transformValue) {
-    var transformLoadResult = function (loadResult) {
-        if (isFinalResultLoaded(loadResult)) {
-            return transformValue(loadResult);
-        }
-        return function () {
-            var getResult = loadResult();
-            if (isPromise(getResult)) {
-                return getResult.then(transformValue);
-            }
-            return transformValue(getResult);
-        };
-    };
-    return function (options) {
-        var loadResult = source(options);
-        if (isPromise(loadResult)) {
-            return loadResult.then(transformLoadResult);
-        }
-        return transformLoadResult(loadResult);
-    };
-}
 
 /*
  * Functions to help with features that vary through browsers
@@ -3215,9 +3187,6 @@ function load(options) {
 // The default export is a syntax sugar (`import * as FP from '...' → import FP from '...'`).
 // It should contain all the public exported values.
 var index = { load: load, hashComponents: hashComponents, componentsToDebugString: componentsToDebugString };
-// The exports below are for private usage. They may change unexpectedly. Use them at your own risk.
-/** Not documented, out of Semantic Versioning, usage is at your own risk */
-var murmurX64Hash128 = x64hash128;
 
 exports.componentsToDebugString = componentsToDebugString;
 exports.default = index;
@@ -3238,8 +3207,6 @@ exports.isTrident = isTrident;
 exports.isWebKit = isWebKit;
 exports.load = load;
 exports.loadSources = loadSources;
-exports.murmurX64Hash128 = murmurX64Hash128;
 exports.prepareForSources = prepareForSources;
 exports.sources = sources;
-exports.transformSource = transformSource;
 exports.withIframe = withIframe;

package/dist/node_modules/.pnpm/@fingerprintjs_fingerprintjs@4.6.2/node_modules/@fingerprintjs/fingerprintjs/dist/fp.esm.mjs

@@ -609,34 +609,6 @@ function loadSources(sources, sourceOptions, excludeSources, loopReleaseInterval
         });
     };
 }
-/**
- * Modifies an entropy source by transforming its returned value with the given function.
- * Keeps the source properties: sync/async, 1/2 stages.
- *
- * Warning for package users:
- * This function is out of Semantic Versioning, i.e. can change unexpectedly. Usage is at your own risk.
- */
-function transformSource(source, transformValue) {
-    var transformLoadResult = function (loadResult) {
-        if (isFinalResultLoaded(loadResult)) {
-            return transformValue(loadResult);
-        }
-        return function () {
-            var getResult = loadResult();
-            if (isPromise(getResult)) {
-                return getResult.then(transformValue);
-            }
-            return transformValue(getResult);
-        };
-    };
-    return function (options) {
-        var loadResult = source(options);
-        if (isPromise(loadResult)) {
-            return loadResult.then(transformLoadResult);
-        }
-        return transformLoadResult(loadResult);
-    };
-}
 
 /*
  * Functions to help with features that vary through browsers
@@ -3211,8 +3183,5 @@ function load(options) {
 // The default export is a syntax sugar (`import * as FP from '...' → import FP from '...'`).
 // It should contain all the public exported values.
 var index = { load: load, hashComponents: hashComponents, componentsToDebugString: componentsToDebugString };
-// The exports below are for private usage. They may change unexpectedly. Use them at your own risk.
-/** Not documented, out of Semantic Versioning, usage is at your own risk */
-var murmurX64Hash128 = x64hash128;
 
-export { componentsToDebugString, index as default, getFullscreenElement, getUnstableAudioFingerprint, getUnstableCanvasFingerprint, getUnstableScreenFrame, getUnstableScreenResolution, getWebGLContext, hashComponents, isAndroid, isChromium, isDesktopWebKit, isEdgeHTML, isGecko, isSamsungInternet, isTrident, isWebKit, load, loadSources, murmurX64Hash128, prepareForSources, sources, transformSource, withIframe };
+export { componentsToDebugString, index as default, getFullscreenElement, getUnstableAudioFingerprint, getUnstableCanvasFingerprint, getUnstableScreenFrame, getUnstableScreenResolution, getWebGLContext, hashComponents, isAndroid, isChromium, isDesktopWebKit, isEdgeHTML, isGecko, isSamsungInternet, isTrident, isWebKit, load, loadSources, prepareForSources, sources, withIframe };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windrun-huaiin/third-ui",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "Third-party integrated UI components for windrun-huaiin projects",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -75,8 +75,8 @@
     "mermaid": "^11.6.0",
     "react-medium-image-zoom": "^5.2.14",
     "zod": "^3.22.4",
-    "@windrun-huaiin/base-ui": "^8.1.1",
-    "@windrun-huaiin/lib": "^7.1.1"
+    "@windrun-huaiin/lib": "^7.1.1",
+    "@windrun-huaiin/base-ui": "^8.1.1"
   },
   "peerDependencies": {
     "react": "19.1.0",

package/src/clerk/fingerprint/fingerprint-client.ts

@@ -9,9 +9,7 @@ import {
   FINGERPRINT_COOKIE_NAME, 
   isValidFingerprintId 
 } from './fingerprint-shared';
-
-// Dynamic import to avoid SSR issues
-let FingerprintJS: any = null;
+import FingerprintJS from '@fingerprintjs/fingerprintjs';
 
 /**
  * 生成基于真实浏览器特征的fingerprint ID
@@ -38,12 +36,6 @@ export async function generateFingerprintId(): Promise<string> {
   }
 
   try {
-    // 等待FingerprintJS加载完成
-    if (!FingerprintJS) {
-      const module = await import('@fingerprintjs/fingerprintjs');
-      FingerprintJS = module.default;
-    }
-
     // 使用FingerprintJS生成基于浏览器特征的指纹
     const fp = await FingerprintJS.load();
     const result = await fp.get();
@@ -138,7 +130,7 @@ export async function getOrGenerateFingerprintId(): Promise<string> {
 export async function createFingerprintHeaders(): Promise<Record<string, string>> {
   const fingerprintId = await getOrGenerateFingerprintId();
   return {
-    'x-fingerprint-id': fingerprintId,
+    FINGERPRINT_HEADER_NAME : fingerprintId,
   };
 }
 

package/src/clerk/fingerprint/fingerprint-provider.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useState } from 'react';
 import { useFingerprint } from './use-fingerprint';
 import type { 
   FingerprintContextType, 
@@ -66,7 +66,7 @@ export function withFingerprint<P extends object>(
 /**
  * 组件：显示用户状态和积分信息（用于调试）
  */
-export function FingerprintDebugInfo() {
+export function FingerprintStatus() {
   const { 
     fingerprintId, 
     anonymousUser, 
@@ -76,39 +76,90 @@ export function FingerprintDebugInfo() {
     error 
   } = useFingerprintContext();
 
-  if (!process.env.NODE_ENV || process.env.NODE_ENV === 'production') {
-    return null;
-  }
+  const [isOpen, setIsOpen] = useState(false);
+
+  const handleToggle = () => {
+    setIsOpen(!isOpen);
+  };
 
   return (
-    <div style={{
-      position: 'fixed',
-      bottom: '10px',
-      right: '10px',
-      background: '#f0f0f0',
-      padding: '10px',
-      borderRadius: '5px',
-      fontSize: '12px',
-      fontFamily: 'monospace',
-      maxWidth: '300px',
-      zIndex: 9999,
-      border: '1px solid #ccc'
-    }}>
-      <h4 style={{ margin: '0 0 5px 0' }}>Fingerprint Debug</h4>
-      <div><strong>FP ID:</strong> {fingerprintId || 'None'}</div>
-      <div><strong>Loading:</strong> {isLoading ? 'Yes' : 'No'}</div>
-      <div><strong>Initialized:</strong> {isInitialized ? 'Yes' : 'No'}</div>
-      {error && <div style={{ color: 'red' }}><strong>Error:</strong> {error}</div>}
-      {anonymousUser && (
-        <div>
-          <strong>User ID:</strong> {anonymousUser.userId.slice(0, 8)}...
-        </div>
-      )}
-      {credits && (
-        <div>
-          <strong>Credits:</strong> {credits.balanceFree}F + {credits.balancePaid}P = {credits.totalBalance}
-        </div>
+    <>
+      <button
+        onClick={handleToggle}
+        style={{
+          position: 'fixed',
+          top: '10px',
+          left: '10px',
+          width: '50px',
+          height: '50px',
+          background: 'linear-gradient(135deg, #9b59b6, #e74c3c)',
+          borderRadius: '50%',
+          border: 'none',
+          cursor: 'pointer',
+          zIndex: 10000,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          boxShadow: '0 4px 8px rgba(0, 0, 0, 0.2)',
+        }}
+      >
+        <span style={{
+          fontSize: '24px',
+          color: 'white',
+          transform: isOpen ? 'rotate(180deg)' : 'rotate(0deg)',
+          transition: 'transform 0.3s ease',
+        }}>▼</span>
+      </button>
+
+      {isOpen && (
+        <>
+          <div
+            style={{
+              position: 'fixed',
+              top: 0,
+              left: 0,
+              width: '100%',
+              height: '100%',
+              background: 'rgba(0, 0, 0, 0.5)',
+              zIndex: 9998,
+            }}
+          />
+          <div
+            style={{
+              position: 'fixed',
+              top: '70px',
+              left: '10px',
+              background: '#f0f0f0',
+              padding: '15px',
+              borderRadius: '5px',
+              fontSize: '12px',
+              fontFamily: 'monospace',
+              maxWidth: '300px',
+              zIndex: 9999,
+              border: '1px solid #ccc',
+              boxShadow: '0 4px 12px rgba(0, 0, 0, 0.2)',
+            }}
+          >
+            <h4 style={{ margin: '0 0 5px 0' }}>Fingerprint Debug</h4>
+            <div><strong>FP_ID:</strong> {fingerprintId || 'None'}</div>
+            <div><strong>Loading:</strong> {isLoading ? 'Yes' : 'No'}</div>
+            <div><strong>Initialized:</strong> {isInitialized ? 'Yes' : 'No'}</div>
+            {error && <div style={{ color: 'red' }}><strong>Error:</strong> {error}</div>}
+            {anonymousUser && (
+              <div>
+                <strong>user_id:</strong> {anonymousUser.userId} <br/>
+                <strong>clerk_user_id:</strong> {anonymousUser.clerkUserId} <br/>
+                <strong>email:</strong> {anonymousUser.email || 'None'} <br/> {/* Fixed email field */}
+              </div>
+            )}
+            {credits && (
+              <div>
+                <strong>Credits:</strong> {credits.balanceFree} Free + {credits.balancePaid} Paid = {credits.totalBalance} Total
+              </div>
+            )}
+          </div>
+        </>
       )}
-    </div>
+    </>
   );
 }

package/src/clerk/fingerprint/fingerprint-shared.ts

@@ -4,9 +4,9 @@
  */
 
 // Fingerprint ID的存储键和header名
-export const FINGERPRINT_STORAGE_KEY = 'diaomao_fingerprint_id';
-export const FINGERPRINT_HEADER_NAME = 'x-fingerprint-id';
-export const FINGERPRINT_COOKIE_NAME = 'fingerprint_id';
+export const FINGERPRINT_STORAGE_KEY = '__x_fingerprint_id';
+export const FINGERPRINT_HEADER_NAME = 'x-fingerprint-id-v8';
+export const FINGERPRINT_COOKIE_NAME = '__x_fingerprint_id';
 
 /**
  * 验证fingerprint ID格式

package/src/clerk/fingerprint/types.ts

@@ -6,6 +6,8 @@
 export interface AnonymousUser {
   userId: string;
   fingerprintId: string;
+  clerkUserId: string,
+  email: string,
   status: string;
   createdAt: string;
 }

package/src/clerk/fingerprint/use-fingerprint.ts

@@ -3,7 +3,6 @@
 import { useState, useEffect, useCallback } from 'react';
 import { 
   getOrGenerateFingerprintId, 
-  getFingerprintId, 
   setFingerprintId,
   createFingerprintHeaders
 } from './fingerprint-client';
@@ -33,14 +32,7 @@ export function useFingerprint(config: FingerprintConfig): UseFingerprintResult
     if (typeof window === 'undefined') return null;
 
     try {
-      // 优先检查现有ID
-      const existingId = getFingerprintId();
-      if (existingId) {
-        setFingerprintIdState(existingId);
-        return existingId;
-      }
-
-      // 生成新的fingerprint ID
+      // 优先检查现有ID, 没有就生成新的fingerprint ID
       const currentFingerprintId = await getOrGenerateFingerprintId();
       setFingerprintIdState(currentFingerprintId);
       return currentFingerprintId;