@windrun-huaiin/third-ui 7.6.1 → 10.0.0

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

@@ -1,8 +1,10 @@
 "use client";
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { createContext, useContext, useState, useRef, useEffect } from 'react';
-import { useFingerprint } from './use-fingerprint.mjs';
 import { globalLucideIcons } from '@windrun-huaiin/base-ui/components/server';
+import { cn } from '@windrun-huaiin/lib/utils';
+import { createContext, useContext, useState, useRef, useEffect, useMemo } from 'react';
+import { useFingerprint } from './use-fingerprint.mjs';
+import { CopyableText } from '@windrun-huaiin/base-ui/ui';
 
 const FingerprintContext = createContext(undefined);
 /**
@@ -44,77 +46,166 @@ function withFingerprint(Component, config) {
  * 组件：显示用户状态和积分信息（用于调试）
  */
 function FingerprintStatus() {
-    const { fingerprintId, xUser, xCredit, xSubscription, isLoading, isInitialized, error } = useFingerprintContext();
+    const { fingerprintId, xUser, xCredit, xSubscription, error } = useFingerprintContext();
     const [isOpen, setIsOpen] = useState(false);
     const modalRef = useRef(null);
-    const handleToggle = () => {
-        setIsOpen(!isOpen);
-    };
+    const handleToggle = () => setIsOpen(prev => !prev);
     const handleBackdropClick = (e) => {
-        if (e.target === e.currentTarget) {
+        if (e.target === e.currentTarget)
             setIsOpen(false);
-        }
     };
     useEffect(() => {
         const handleEscKey = (e) => {
-            if (e.key === 'Escape' && isOpen) {
+            if (e.key === 'Escape' && isOpen)
                 setIsOpen(false);
-            }
         };
-        if (isOpen) {
+        if (isOpen)
             document.addEventListener('keydown', handleEscKey);
-        }
-        return () => {
-            document.removeEventListener('keydown', handleEscKey);
-        };
+        return () => document.removeEventListener('keydown', handleEscKey);
     }, [isOpen]);
-    // 确保 xUser 更新后才渲染内容
     useEffect(() => {
         if (xUser && !xUser.fingerprintId) {
             console.warn('xUser.fingerprintId is missing:', xUser);
         }
     }, [xUser]);
-    return (jsxs(Fragment, { children: [jsx("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)',
-                }, children: jsx(globalLucideIcons.BTC, { size: 24, style: {
-                        color: 'white',
-                        transform: isOpen ? 'rotate(180deg)' : 'rotate(0deg)',
-                        transition: 'transform 0.3s ease',
-                    } }) }), isOpen && (jsxs(Fragment, { children: [jsx("div", { onClick: handleBackdropClick, style: {
-                            position: 'fixed',
-                            top: 0,
-                            left: 0,
-                            width: '100%',
-                            height: '100%',
-                            background: 'rgba(0, 0, 0, 0.5)',
-                            zIndex: 9998,
-                        } }), jsxs("div", { ref: modalRef, style: {
-                            position: 'fixed',
-                            top: '70px',
-                            left: '10px',
-                            background: '#f0f0f0',
-                            padding: '15px',
-                            borderRadius: '5px',
-                            fontSize: '12px',
-                            fontFamily: 'monospace',
-                            maxWidth: '500px',
-                            zIndex: 9999,
-                            border: '1px solid #ccc',
-                            boxShadow: '0 4px 12px rgba(0, 0, 0, 0.2)',
-                        }, children: [jsx("h4", { style: { margin: '0 0 5px 0' }, children: "Fingerprint Debug" }), jsxs("div", { children: [jsx("strong", { children: "FP_ID:" }), " ", fingerprintId || 'None'] }), jsxs("div", { children: [jsx("strong", { children: "Loading:" }), " ", isLoading ? 'Yes' : 'No'] }), jsxs("div", { children: [jsx("strong", { children: "Initialized:" }), " ", isInitialized ? 'Yes' : 'No'] }), error && jsxs("div", { style: { color: 'red' }, children: [jsx("strong", { children: "Error:" }), " ", error] }), xUser && (jsxs("div", { children: [jsx("strong", { children: "user_id:" }), " ", xUser.userId || 'None', " ", jsx("br", {}), jsx("strong", { children: "fingerprintId:" }), " ", xUser.fingerprintId || 'None', " ", jsx("br", {}), jsx("strong", { children: "clerk_user_id:" }), " ", xUser.clerkUserId || 'None', " ", jsx("br", {}), jsx("strong", { children: "email:" }), " ", xUser.email || 'None', " ", jsx("br", {})] })), xCredit && (jsxs("div", { children: [jsx("strong", { children: "Credits:" }), " ", xCredit.balanceFree, " Free + ", xCredit.balancePaid, " Paid = ", xCredit.totalBalance, " Total"] })), jsx("div", { children: xSubscription ? (jsxs(Fragment, { children: [jsx("strong", { children: "user_id:" }), " ", xSubscription.userId, " ", jsx("br", {}), jsx("strong", { children: "pay_subscription_id:" }), " ", xSubscription.paySubscriptionId || 'None', " ", jsx("br", {}), jsx("strong", { children: "price_id:" }), " ", xSubscription.priceId || 'None', " ", jsx("br", {}), jsx("strong", { children: "price_name:" }), " ", xSubscription.priceName || 'None', " ", jsx("br", {}), jsx("strong", { children: "status:" }), " ", xSubscription.status || 'Free', " ", jsx("br", {}), jsx("strong", { children: "credits_allocated:" }), " ", xSubscription.creditsAllocated || '', " ", jsx("br", {}), jsx("strong", { children: "sub_period_start:" }), " ", xSubscription.subPeriodStart || '', " ", jsx("br", {}), jsx("strong", { children: "sub_period_end:" }), " ", xSubscription.subPeriodEnd || '', " ", jsx("br", {})] })) : (jsx("strong", { children: "No Subscription, Default as Hobby Plan" })) })] })] }))] }));
+    const creditBuckets = useMemo(() => {
+        if (!xCredit)
+            return [];
+        return [
+            {
+                key: 'paid',
+                label: '订阅积分',
+                icon: jsx(globalLucideIcons.Settings2, { className: "size-4 text-green-500 dark:text-green-300" }),
+                balance: xCredit.balancePaid,
+                total: xCredit.totalPaidLimit,
+                start: xCredit.paidStart,
+                end: xCredit.paidEnd,
+            },
+            {
+                key: 'oneTimePaid',
+                label: '一次性积分',
+                icon: jsx(globalLucideIcons.Coins, { className: "size-4 text-amber-500 dark:text-amber-300" }),
+                balance: xCredit.balanceOneTimePaid,
+                total: xCredit.totalOneTimePaidLimit,
+                start: xCredit.oneTimePaidStart,
+                end: xCredit.oneTimePaidEnd,
+            },
+            {
+                key: 'free',
+                label: '免费积分',
+                icon: jsx(globalLucideIcons.Gift, { className: "size-4 text-purple-500 dark:text-purple-300" }),
+                balance: xCredit.balanceFree,
+                total: xCredit.totalFreeLimit,
+                start: xCredit.freeStart,
+                end: xCredit.freeEnd,
+            },
+        ];
+    }, [xCredit]);
+    const subscriptionStatus = useMemo(() => {
+        var _a, _b;
+        if (!xSubscription) {
+            return {
+                status: '未订阅',
+                priceName: '--',
+                creditsAllocated: '--',
+                period: '无记录',
+            };
+        }
+        return {
+            status: (_a = xSubscription.status) !== null && _a !== void 0 ? _a : '--',
+            priceName: (_b = xSubscription.priceName) !== null && _b !== void 0 ? _b : '--',
+            creditsAllocated: typeof xSubscription.creditsAllocated === 'number'
+                ? formatNumber(xSubscription.creditsAllocated)
+                : '--',
+            period: formatRangeText(xSubscription.subPeriodStart, xSubscription.subPeriodEnd),
+        };
+    }, [xSubscription]);
+    const userStatus = (xUser === null || xUser === void 0 ? void 0 : xUser.status) || '--';
+    const totalCredits = formatNumber(xCredit === null || xCredit === void 0 ? void 0 : xCredit.totalBalance);
+    const subStatus = subscriptionStatus.status;
+    return (jsxs(Fragment, { children: [!isOpen && (jsx("button", { onClick: handleToggle, type: "button", "aria-label": "Fingerprint debug panel", className: cn('fixed left-2 top-2 md:left-2 md:top-3 z-10000 inline-flex size-8 md:size-11 items-center justify-center rounded-full', 'bg-linear-to-r from-purple-400 to-pink-500 hover:from-purple-500 hover:to-pink-600 dark:from-purple-500 dark:to-pink-600 dark:hover:from-purple-600 dark:hover:to-pink-700 text-white rounded-full shadow-lg hover:shadow-xl transition-all duration-300'), children: jsx(globalLucideIcons.Lightbulb, { className: "size-6 text-white" }) })), isOpen && (jsxs(Fragment, { children: [jsx("div", { onClick: handleBackdropClick, className: "fixed inset-0 z-9998 bg-black/60 backdrop-blur-sm" }), jsxs("div", { ref: modalRef, className: cn('fixed inset-3 z-9999 mx-auto w-[min(95vw,520px)] overflow-y-auto rounded-2xl border', 'border-slate-200/70 bg-white/95 p-4 shadow-2xl backdrop-blur-sm', 'font-sans text-sm text-slate-700 dark:border-white/12 dark:bg-slate-950/95 dark:text-slate-200', 'sm:inset-auto md:left-2 sm:top-1 md:right-auto sm:w-[min(520px,95vw)] sm:p-5'), children: [jsx("header", { className: "mb-4", children: jsxs("div", { className: "flex items-start justify-between gap-3", children: [jsxs("div", { className: "flex items-center gap-2 text-base font-bold tracking-wider text-purple-600 dark:text-purple-500", children: [jsx(globalLucideIcons.ShieldUser, { className: "size-4" }), "Fingerprint Debug Panel"] }), jsx("button", { type: "button", "aria-label": "Close fingerprint panel", className: "rounded-full p-2 text-slate-500 transition hover:bg-slate-100 hover:text-slate-700 dark:text-slate-300 dark:hover:bg-white/10 dark:hover:text-white", onClick: () => setIsOpen(false), children: jsx(globalLucideIcons.X, { className: "size-4" }) })] }) }), jsxs("section", { className: "space-y-1", children: [jsx(PanelSection, { icon: jsx(globalLucideIcons.Fingerprint, { className: "size-4" }), title: "\u7528\u6237\u4FE1\u606F", rightInfo: jsx(StatusTag, { value: userStatus }), items: [
+                                            { label: '用户ID', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || '' }) },
+                                            { label: '用户昵称', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.userName) || '' }) },
+                                            { label: 'FingerprintID', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.fingerprintId) || fingerprintId || '' }) },
+                                            { label: 'Clerk用户', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.clerkUserId) || '' }) },
+                                            { label: '邮箱', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.email) || '' }) },
+                                            { label: 'Stripe客户', value: jsx(CopyableText, { text: (xUser === null || xUser === void 0 ? void 0 : xUser.stripeCusId) || '' }) },
+                                            { label: '创建时间', value: (xUser === null || xUser === void 0 ? void 0 : xUser.createdAt) || '--' },
+                                        ] }), jsxs("div", { className: "space-y-2 rounded-xl border border-slate-200/70 bg-white/80 p-4 shadow-sm dark:border-white/12 dark:bg-slate-900/50", children: [jsx(PanelHeader, { icon: jsx(globalLucideIcons.Gem, { className: "size-4" }), title: "\u79EF\u5206\u4FE1\u606F", rightInfo: jsx("span", { className: "text-purple-600 dark:text-purple-500 font-semibold", children: totalCredits }) }), jsx("div", { className: "space-y-3", children: creditBuckets.length > 0 ? (creditBuckets.map((bucket) => {
+                                                    const percent = Math.round(computeProgress(bucket.balance, bucket.total) * 100);
+                                                    return (jsxs("div", { className: "rounded-lg border border-slate-200/70 bg-white/70 p-3 dark:border-white/10 dark:bg-slate-900/40", children: [jsxs("div", { className: "flex items-center justify-between text-xs font-medium text-slate-600 dark:text-slate-300", children: [jsxs("div", { className: "flex items-center gap-1.5", children: [bucket.icon, jsx("span", { children: bucket.label })] }), jsxs("span", { className: "font-semibold text-slate-700 dark:text-slate-100", children: [formatNumber(bucket.balance), " / ", formatNumber(bucket.total)] })] }), jsx("div", { className: "mt-2 h-1.5 w-full rounded-full bg-slate-200 dark:bg-slate-800", children: jsx("div", { className: "h-full rounded-full bg-linear-to-r from-purple-500 via-pink-500 to-rose-400 transition-[width]", style: { width: `${percent}%` } }) }), jsxs("div", { className: "mt-2 flex items-center justify-between text-[11px] text-slate-500 dark:text-slate-400", children: [jsx("span", { children: formatRangeText(bucket.start, bucket.end) }), jsxs("span", { children: [percent, "%"] })] })] }, bucket.key));
+                                                })) : (jsx(EmptyPlaceholder, { label: "\u6682\u65E0\u79EF\u5206\u6570\u636E", icon: jsx(globalLucideIcons.DatabaseZap, { className: "size-4" }) })) })] }), jsx(PanelSection, { icon: jsx(globalLucideIcons.Bell, { className: "size-4" }), title: "\u8BA2\u9605\u4FE1\u606F", rightInfo: jsx(StatusTag, { value: subStatus }), items: [
+                                            { label: '订阅方案', value: subscriptionStatus.priceName },
+                                            { label: '有效期', value: subscriptionStatus.period },
+                                            { label: '分配额度', value: subscriptionStatus.creditsAllocated },
+                                            { label: '订阅ID', value: jsx(CopyableText, { text: (xSubscription === null || xSubscription === void 0 ? void 0 : xSubscription.paySubscriptionId) || '' }) },
+                                            { label: 'OrderID', value: jsx(CopyableText, { text: (xSubscription === null || xSubscription === void 0 ? void 0 : xSubscription.orderId) || '' }) },
+                                            { label: 'Price ID', value: jsx(CopyableText, { text: (xSubscription === null || xSubscription === void 0 ? void 0 : xSubscription.priceId) || '' }) },
+                                        ] }), error && (jsxs("div", { className: "flex items-start gap-2 rounded-xl border border-amber-200 bg-amber-50 p-3 text-xs text-amber-600 shadow-sm dark:border-amber-500/40 dark:bg-amber-500/10 dark:text-amber-200", children: [jsx(globalLucideIcons.X, { className: "mt-0.5 size-4" }), jsx("span", { children: error })] }))] })] })] }))] }));
+}
+/* ==================== 新增辅助组件 ==================== */
+// 标题行：左侧图标+标题，右侧信息（右对齐）
+function PanelHeader({ icon, title, rightInfo }) {
+    return (jsxs("div", { className: "flex items-center justify-between mb-3", children: [jsxs("div", { className: "flex items-center gap-2 text-sm font-semibold text-slate-700 dark:text-slate-100", children: [jsx("span", { className: "flex size-6 items-center justify-center rounded-full bg-slate-100 text-slate-600 dark:bg-slate-800 dark:text-slate-300", children: icon }), jsx("span", { className: "rounded-full bg-purple-100 px-2 py-1 text-xs font-bold text-purple-600 dark:bg-purple-500/20 dark:text-purple-100", children: title })] }), jsx("span", { className: "text-sm font-medium text-slate-600 dark:text-slate-300", children: rightInfo })] }));
+}
+function PanelSection({ icon, title, rightInfo, items }) {
+    return (jsxs("div", { className: "rounded-xl border border-slate-200/70 bg-white/85 p-4 shadow-sm dark:border-white/12 dark:bg-slate-900/45", children: [jsx(PanelHeader, { icon: icon, title: title, rightInfo: rightInfo }), jsx("dl", { className: "grid grid-cols-1 gap-y-1.5 text-xs text-slate-500 dark:text-slate-300", children: items.map((item) => (jsxs("div", { className: "flex items-center justify-between gap-3", children: [jsx("dt", { className: "text-slate-400 dark:text-slate-500", children: item.label }), jsx("dd", { className: "text-right font-medium text-slate-600 dark:text-slate-100", children: item.value })] }, item.label))) })] }));
+}
+function EmptyPlaceholder({ label, icon }) {
+    return (jsxs("div", { className: "flex items-center justify-center gap-2 rounded-lg border border-dashed border-slate-200 bg-slate-50 py-6 text-xs text-slate-400 dark:border-white/10 dark:bg-slate-900/30 dark:text-slate-500", children: [icon, jsx("span", { children: label })] }));
+}
+function formatNumber(value) {
+    if (typeof value !== 'number' || Number.isNaN(value))
+        return '--';
+    return new Intl.NumberFormat('zh-CN', { maximumFractionDigits: 0 }).format(value);
+}
+function computeProgress(balance, total) {
+    if (typeof balance !== 'number' || typeof total !== 'number' || Number.isNaN(balance) || Number.isNaN(total) || total <= 0) {
+        return 0;
+    }
+    const ratio = balance / total;
+    if (!Number.isFinite(ratio))
+        return 0;
+    return Math.min(Math.max(ratio, 0), 1);
+}
+function formatRangeText(start, end) {
+    const safeStart = start && start.trim() ? start : '';
+    const safeEnd = end && end.trim() ? end : '';
+    if (!safeStart && !safeEnd) {
+        return '无记录';
+    }
+    if (!safeStart) {
+        return safeEnd;
+    }
+    if (!safeEnd) {
+        return safeStart;
+    }
+    return `${safeStart} - ${safeEnd}`;
+}
+function StatusTag({ value }) {
+    if (!value)
+        return jsx("span", { className: "text-slate-400", children: "None" });
+    const normalized = value.toLowerCase();
+    const colorMap = {
+        // 绿色：正常/活跃
+        registered: 'bg-green-100 text-green-700 dark:bg-green-500/20 dark:text-green-300',
+        active: 'bg-green-100 text-green-700 dark:bg-green-500/20 dark:text-green-300',
+        trialing: 'bg-green-100 text-green-700 dark:bg-green-500/20 dark:text-green-300',
+        // 灰色：失效/删除
+        canceled: 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400',
+        frozen: 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400',
+        deleted: 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400',
+        expired: 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400',
+        past_due: 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400',
+        // 橙色：待处理/异常
+        pending: 'bg-amber-100 text-amber-700 dark:bg-amber-500/20 dark:text-amber-300',
+        failed: 'bg-amber-100 text-amber-700 dark:bg-amber-500/20 dark:text-amber-300',
+        unpaid: 'bg-amber-100 text-amber-700 dark:bg-amber-500/20 dark:text-amber-300',
+        incomplete: 'bg-amber-100 text-amber-700 dark:bg-amber-500/20 dark:text-amber-300',
+    };
+    const defaultColor = 'bg-slate-100 text-slate-600 dark:bg-slate-700 dark:text-slate-400';
+    const badgeClass = colorMap[normalized] || defaultColor;
+    return (jsx("span", { className: cn('inline-block rounded-full px-2 py-0.5 text-xs capitalize font-medium', badgeClass), children: value }));
 }
 
 export { FingerprintProvider, FingerprintStatus, useFingerprintContext, useFingerprintContextSafe, withFingerprint };

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

@@ -20,3 +20,19 @@ export declare function generateServerFingerprintId(): string;
  * 便捷方法，适用于Next.js API路由
  */
 export declare function extractFingerprintFromNextRequest(request: Request): string | null;
+type NextHeadersLike = Pick<Headers, 'forEach'>;
+type NextCookiesLike = {
+    getAll(): Array<{
+        name: string;
+        value: string;
+    }>;
+};
+/**
+ * 从Next.js runtime提供的headers/cookies实例里提取fingerprint ID
+ * 供App Router服务端组件和Server Actions直接复用
+ */
+export declare function extractFingerprintFromNextStores(params: {
+    headers: NextHeadersLike;
+    cookies: NextCookiesLike;
+}): string | null;
+export {};

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

@@ -69,7 +69,25 @@ function extractFingerprintFromNextRequest(request) {
     });
     return extractFingerprintId(headers, cookies, query);
 }
+/**
+ * 从Next.js runtime提供的headers/cookies实例里提取fingerprint ID
+ * 供App Router服务端组件和Server Actions直接复用
+ */
+function extractFingerprintFromNextStores(params) {
+    const cookieMap = params.cookies
+        .getAll()
+        .reduce((acc, cookie) => {
+        acc[cookie.name] = cookie.value;
+        return acc;
+    }, {});
+    const headerMap = {};
+    params.headers.forEach((value, key) => {
+        headerMap[key] = value;
+    });
+    return extractFingerprintId(headerMap, cookieMap);
+}
 
 exports.extractFingerprintFromNextRequest = extractFingerprintFromNextRequest;
+exports.extractFingerprintFromNextStores = extractFingerprintFromNextStores;
 exports.extractFingerprintId = extractFingerprintId;
 exports.generateServerFingerprintId = generateServerFingerprintId;

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

@@ -67,5 +67,22 @@ function extractFingerprintFromNextRequest(request) {
     });
     return extractFingerprintId(headers, cookies, query);
 }
+/**
+ * 从Next.js runtime提供的headers/cookies实例里提取fingerprint ID
+ * 供App Router服务端组件和Server Actions直接复用
+ */
+function extractFingerprintFromNextStores(params) {
+    const cookieMap = params.cookies
+        .getAll()
+        .reduce((acc, cookie) => {
+        acc[cookie.name] = cookie.value;
+        return acc;
+    }, {});
+    const headerMap = {};
+    params.headers.forEach((value, key) => {
+        headerMap[key] = value;
+    });
+    return extractFingerprintId(headerMap, cookieMap);
+}
 
-export { extractFingerprintFromNextRequest, extractFingerprintId, generateServerFingerprintId };
+export { extractFingerprintFromNextRequest, extractFingerprintFromNextStores, extractFingerprintId, generateServerFingerprintId };

package/dist/clerk/fingerprint/server.js

@@ -11,5 +11,6 @@ exports.FINGERPRINT_HEADER_NAME = fingerprintShared.FINGERPRINT_HEADER_NAME;
 exports.FINGERPRINT_STORAGE_KEY = fingerprintShared.FINGERPRINT_STORAGE_KEY;
 exports.isValidFingerprintId = fingerprintShared.isValidFingerprintId;
 exports.extractFingerprintFromNextRequest = fingerprintServer.extractFingerprintFromNextRequest;
+exports.extractFingerprintFromNextStores = fingerprintServer.extractFingerprintFromNextStores;
 exports.extractFingerprintId = fingerprintServer.extractFingerprintId;
 exports.generateServerFingerprintId = fingerprintServer.generateServerFingerprintId;

package/dist/clerk/fingerprint/server.mjs

@@ -1,2 +1,2 @@
 export { FINGERPRINT_CONSTANTS, FINGERPRINT_COOKIE_NAME, FINGERPRINT_HEADER_NAME, FINGERPRINT_STORAGE_KEY, isValidFingerprintId } from './fingerprint-shared.mjs';
-export { extractFingerprintFromNextRequest, extractFingerprintId, generateServerFingerprintId } from './fingerprint-server.mjs';
+export { extractFingerprintFromNextRequest, extractFingerprintFromNextStores, extractFingerprintId, generateServerFingerprintId } from './fingerprint-server.mjs';

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

@@ -4,21 +4,34 @@
  */
 export interface XUser {
     userId: string;
+    userName: string;
     fingerprintId: string;
     clerkUserId: string;
+    stripeCusId: string;
     email: string;
     status: string;
     createdAt: string;
 }
 export interface XCredit {
     balanceFree: number;
+    totalFreeLimit: number;
+    freeStart: string;
+    freeEnd: string;
     balancePaid: number;
+    totalPaidLimit: number;
+    paidStart: string;
+    paidEnd: string;
+    balanceOneTimePaid: number;
+    totalOneTimePaidLimit: number;
+    oneTimePaidStart: string;
+    oneTimePaidEnd: string;
     totalBalance: number;
 }
 export interface XSubscription {
     id: bigint;
     userId: string;
     paySubscriptionId: string | null;
+    orderId: string | null;
     priceId: string | null;
     priceName: string | null;
     status: string;
@@ -31,8 +44,6 @@ export interface FingerprintConfig {
     apiEndpoint: string;
     /** Whether to automatically initialize the user on load */
     autoInitialize?: boolean;
-    /** Initial credits for new users */
-    initialCredits?: number;
 }
 export interface UseFingerprintResult {
     fingerprintId: string | null;

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

@@ -1,7 +1,7 @@
 "use client";
 'use strict';
 
-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 tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
 var React = require('react');
 var fingerprintClient = require('./fingerprint-client.js');
 

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

@@ -1,5 +1,5 @@
 "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 { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
 import { useState, useCallback, useEffect } from 'react';
 import { getOrGenerateFingerprintId, createFingerprintHeaders } from './fingerprint-client.mjs';
 

package/dist/clerk/index.d.ts

@@ -1,4 +1,5 @@
 export * from './clerk-provider-client';
 export * from './signup-with-fingerprint-client';
 export * from './signin-with-fingerprint-client';
-export * from './clerk-page-generator-client';
+export * from './signup-button-with-fingerprint-client';
+export * from './clerk-page-context-generator';

package/dist/clerk/index.js

@@ -4,12 +4,14 @@
 var clerkProviderClient = require('./clerk-provider-client.js');
 var signupWithFingerprintClient = require('./signup-with-fingerprint-client.js');
 var signinWithFingerprintClient = require('./signin-with-fingerprint-client.js');
-var clerkPageGeneratorClient = require('./clerk-page-generator-client.js');
+var signupButtonWithFingerprintClient = require('./signup-button-with-fingerprint-client.js');
+var clerkPageContextGenerator = require('./clerk-page-context-generator.js');
 
 
 
 exports.ClerkProviderClient = clerkProviderClient.ClerkProviderClient;
 exports.SignUpWithFingerprint = signupWithFingerprintClient.SignUpWithFingerprint;
 exports.SignInWithFingerprint = signinWithFingerprintClient.SignInWithFingerprint;
-exports.createSignInPageWithFingerprint = clerkPageGeneratorClient.createSignInPageWithFingerprint;
-exports.createSignUpPageWithFingerprint = clerkPageGeneratorClient.createSignUpPageWithFingerprint;
+exports.SignUpButtonWithFingerprint = signupButtonWithFingerprintClient.SignUpButtonWithFingerprint;
+exports.createSignInPageWithFingerprint = clerkPageContextGenerator.createSignInPageWithFingerprint;
+exports.createSignUpPageWithFingerprint = clerkPageContextGenerator.createSignUpPageWithFingerprint;

package/dist/clerk/index.mjs

@@ -2,4 +2,5 @@
 export { ClerkProviderClient } from './clerk-provider-client.mjs';
 export { SignUpWithFingerprint } from './signup-with-fingerprint-client.mjs';
 export { SignInWithFingerprint } from './signin-with-fingerprint-client.mjs';
-export { createSignInPageWithFingerprint, createSignUpPageWithFingerprint } from './clerk-page-generator-client.mjs';
+export { SignUpButtonWithFingerprint } from './signup-button-with-fingerprint-client.mjs';
+export { createSignInPageWithFingerprint, createSignUpPageWithFingerprint } from './clerk-page-context-generator.mjs';

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

@@ -1,7 +1,7 @@
 "use client";
 'use strict';
 
-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 tslib_es6 = require('../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
 var jsxRuntime = require('react/jsx-runtime');
 var nextjs = require('@clerk/nextjs');
 var React = require('react');
@@ -18,8 +18,8 @@ function SignInWithFingerprint() {
     const { fingerprintId = null, xUser = null, isInitialized = false, initializeAnonymousUser = () => tslib_es6.__awaiter(this, void 0, void 0, function* () { }) } = fingerprintContext || {};
     // 准备传递给Clerk的metadata，包含匿名用户信息
     const unsafeMetadata = {
-        user_id: (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null, // 数据库中的user_id
-        fingerprint_id: fingerprintId || null, // 浏览器指纹ID
+        user_id: (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null,
+        fingerprint_id: fingerprintId || null,
     };
     // 确保匿名用户已初始化
     React.useEffect(() => {
@@ -29,19 +29,12 @@ function SignInWithFingerprint() {
     }, [fingerprintId, isInitialized, initializeAnonymousUser]);
     // 调试日志和处理登录逻辑
     React.useEffect(() => {
-        console.log('SignInWithFingerprint Debug:', {
+        console.log('SignInWithFingerprint on [redirect] DEBUG:', {
             fingerprintProvider: fingerprintContext ? 'Available' : 'Not found',
             fingerprintId: fingerprintId || 'Not generated',
             xUser: xUser ? 'Initialized' : 'Not initialized',
             clerkMetadata: unsafeMetadata
         });
-        if (xUser && fingerprintId) {
-            console.log('User signed in with existing anonymous data:', {
-                userId: xUser.userId,
-                fingerprintId,
-            });
-            // TODO: 实现数据合并逻辑
-        }
     }, [xUser, fingerprintId, fingerprintContext, unsafeMetadata]);
     return jsxRuntime.jsx(nextjs.SignIn, { unsafeMetadata: unsafeMetadata });
 }

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

@@ -1,5 +1,5 @@
 "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 { __awaiter } from '../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
 import { jsx } from 'react/jsx-runtime';
 import { SignIn } from '@clerk/nextjs';
 import { useEffect } from 'react';
@@ -16,8 +16,8 @@ function SignInWithFingerprint() {
     const { fingerprintId = null, xUser = null, isInitialized = false, initializeAnonymousUser = () => __awaiter(this, void 0, void 0, function* () { }) } = fingerprintContext || {};
     // 准备传递给Clerk的metadata，包含匿名用户信息
     const unsafeMetadata = {
-        user_id: (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null, // 数据库中的user_id
-        fingerprint_id: fingerprintId || null, // 浏览器指纹ID
+        user_id: (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null,
+        fingerprint_id: fingerprintId || null,
     };
     // 确保匿名用户已初始化
     useEffect(() => {
@@ -27,19 +27,12 @@ function SignInWithFingerprint() {
     }, [fingerprintId, isInitialized, initializeAnonymousUser]);
     // 调试日志和处理登录逻辑
     useEffect(() => {
-        console.log('SignInWithFingerprint Debug:', {
+        console.log('SignInWithFingerprint on [redirect] DEBUG:', {
             fingerprintProvider: fingerprintContext ? 'Available' : 'Not found',
             fingerprintId: fingerprintId || 'Not generated',
             xUser: xUser ? 'Initialized' : 'Not initialized',
             clerkMetadata: unsafeMetadata
         });
-        if (xUser && fingerprintId) {
-            console.log('User signed in with existing anonymous data:', {
-                userId: xUser.userId,
-                fingerprintId,
-            });
-            // TODO: 实现数据合并逻辑
-        }
     }, [xUser, fingerprintId, fingerprintContext, unsafeMetadata]);
     return jsx(SignIn, { unsafeMetadata: unsafeMetadata });
 }

package/dist/clerk/signup-button-with-fingerprint-client.d.ts

@@ -0,0 +1,6 @@
+interface SignUpButtonWithFingerprintProps {
+    mode: 'modal' | 'redirect';
+    signUp: string;
+}
+export declare function SignUpButtonWithFingerprint({ mode, signUp, }: SignUpButtonWithFingerprintProps): import("react/jsx-runtime").JSX.Element;
+export {};

package/dist/clerk/signup-button-with-fingerprint-client.js

@@ -0,0 +1,56 @@
+"use client";
+'use strict';
+
+var tslib_es6 = require('../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
+var jsxRuntime = require('react/jsx-runtime');
+var nextjs = require('@clerk/nextjs');
+var React = require('react');
+var fingerprintProvider = require('./fingerprint/fingerprint-provider.js');
+
+function SignUpButtonWithFingerprint({ mode, signUp, }) {
+    if (mode === 'redirect') {
+        return (
+        // 重定向模式则直接跳转到自定义注册页面
+        jsxRuntime.jsx(nextjs.SignUpButton, { children: jsxRuntime.jsx("button", { className: "w-16 sm:w-20 h-8 sm:h-9 px-1.5 sm:px-2 border border-gray-300 rounded-full hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-800 text-center text-xs sm:text-sm whitespace-nowrap", children: signUp }) }));
+    }
+    // 弹框模式则需要自定义注册按钮
+    const fingerprintContext = fingerprintProvider.useFingerprintContextSafe();
+    // 如果没有fingerprint context，使用默认值
+    const { fingerprintId = null, xUser = null, isInitialized = false, initializeAnonymousUser = () => tslib_es6.__awaiter(this, void 0, void 0, function* () { }) } = fingerprintContext || {};
+    const userId = (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null;
+    const unsafeMetadata = {
+        user_id: userId,
+        fingerprint_id: fingerprintId || null,
+    };
+    // 确保匿名用户已初始化
+    React.useEffect(() => {
+        if (!isInitialized && fingerprintId) {
+            initializeAnonymousUser();
+        }
+    }, [fingerprintId, isInitialized, initializeAnonymousUser]);
+    // 调试日志和处理注册逻辑
+    React.useEffect(() => {
+        console.log('SignUpWithFingerprint on [modal] DEBUG:', {
+            fingerprintProvider: fingerprintContext ? 'Available' : 'Not found',
+            fingerprintId: fingerprintId || 'Not generated',
+            xUser: xUser ? 'Initialized' : 'Not initialized',
+            clerkMetadata: unsafeMetadata
+        });
+    }, [xUser, fingerprintId, fingerprintContext, unsafeMetadata]);
+    const { openSignUp } = nextjs.useClerk();
+    const handleClick = () => {
+        openSignUp({
+            unsafeMetadata,
+        });
+        // 记录日志
+        console.log('SignUpButton on [modal] clicked', {
+            timestamp: new Date().toISOString(),
+            mode,
+            userId,
+            fingerprintId
+        });
+    };
+    return (jsxRuntime.jsx("button", { className: "w-16 sm:w-20 h-8 sm:h-9 px-1.5 sm:px-2 border border-gray-300 rounded-full hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-800 text-center text-xs sm:text-sm whitespace-nowrap", onClick: handleClick, children: signUp }));
+}
+
+exports.SignUpButtonWithFingerprint = SignUpButtonWithFingerprint;

package/dist/clerk/signup-button-with-fingerprint-client.mjs

@@ -0,0 +1,54 @@
+"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.3/node_modules/tslib/tslib.es6.mjs';
+import { jsx } from 'react/jsx-runtime';
+import { SignUpButton, useClerk } from '@clerk/nextjs';
+import { useEffect } from 'react';
+import { useFingerprintContextSafe } from './fingerprint/fingerprint-provider.mjs';
+
+function SignUpButtonWithFingerprint({ mode, signUp, }) {
+    if (mode === 'redirect') {
+        return (
+        // 重定向模式则直接跳转到自定义注册页面
+        jsx(SignUpButton, { children: jsx("button", { className: "w-16 sm:w-20 h-8 sm:h-9 px-1.5 sm:px-2 border border-gray-300 rounded-full hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-800 text-center text-xs sm:text-sm whitespace-nowrap", children: signUp }) }));
+    }
+    // 弹框模式则需要自定义注册按钮
+    const fingerprintContext = useFingerprintContextSafe();
+    // 如果没有fingerprint context，使用默认值
+    const { fingerprintId = null, xUser = null, isInitialized = false, initializeAnonymousUser = () => __awaiter(this, void 0, void 0, function* () { }) } = fingerprintContext || {};
+    const userId = (xUser === null || xUser === void 0 ? void 0 : xUser.userId) || null;
+    const unsafeMetadata = {
+        user_id: userId,
+        fingerprint_id: fingerprintId || null,
+    };
+    // 确保匿名用户已初始化
+    useEffect(() => {
+        if (!isInitialized && fingerprintId) {
+            initializeAnonymousUser();
+        }
+    }, [fingerprintId, isInitialized, initializeAnonymousUser]);
+    // 调试日志和处理注册逻辑
+    useEffect(() => {
+        console.log('SignUpWithFingerprint on [modal] DEBUG:', {
+            fingerprintProvider: fingerprintContext ? 'Available' : 'Not found',
+            fingerprintId: fingerprintId || 'Not generated',
+            xUser: xUser ? 'Initialized' : 'Not initialized',
+            clerkMetadata: unsafeMetadata
+        });
+    }, [xUser, fingerprintId, fingerprintContext, unsafeMetadata]);
+    const { openSignUp } = useClerk();
+    const handleClick = () => {
+        openSignUp({
+            unsafeMetadata,
+        });
+        // 记录日志
+        console.log('SignUpButton on [modal] clicked', {
+            timestamp: new Date().toISOString(),
+            mode,
+            userId,
+            fingerprintId
+        });
+    };
+    return (jsx("button", { className: "w-16 sm:w-20 h-8 sm:h-9 px-1.5 sm:px-2 border border-gray-300 rounded-full hover:bg-gray-100 dark:border-gray-600 dark:hover:bg-gray-800 text-center text-xs sm:text-sm whitespace-nowrap", onClick: handleClick, children: signUp }));
+}
+
+export { SignUpButtonWithFingerprint };