message-verify 1.0.1-beta.32 → 1.0.1-beta.33

package/dist/index.js

@@ -3,29 +3,22 @@ import ReactDOM from 'react-dom/client';
 import VerifyModal from './verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './relogin-modal.js';
-let cachedFingerprint = null;
+let fingerprintPromise = null; // 用 Promise 本身作为缓存
 export const initFingerprint = async () => {
-    // console.log('cachedFingerprint', cachedFingerprint);
-    if (cachedFingerprint) {
-        // 已有缓存，直接返回 Promise
-        return Promise.resolve(cachedFingerprint);
-    }
-    // 首次异步获取并缓存
-    return new Promise((resolve) => {
-        Fingerprint2.get(function (components) {
-            console.log('components', components);
-            const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
-            const values = components
-                .filter(component => includeKeys.includes(component.key))
-                .map(component => component.value)
-                .join('###');
-            console.log('values', values);
-            const fingerprint = Fingerprint2.x64hash128(values, 31);
-            console.log('fingerprint', fingerprint);
-            cachedFingerprint = fingerprint;
-            resolve(fingerprint);
+    if (!fingerprintPromise) {
+        fingerprintPromise = new Promise((resolve) => {
+            Fingerprint2.get(components => {
+                const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
+                const values = components
+                    .filter(c => includeKeys.includes(c.key))
+                    .map(c => c.value)
+                    .join('###');
+                const fingerprint = Fingerprint2.x64hash128(values, 31);
+                resolve(fingerprint);
+            });
         });
-    });
+    }
+    return fingerprintPromise;
 };
 let modalRoot = null;
 export const createMessageVerifyModal = (modalProps) => {

package/dist/main.js

@@ -4,7 +4,8 @@ import { createMessageVerifyModal, initFingerprint, createReLoginModal } from '.
 import { axios } from '@yqg/resource';
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
 const fp = await initFingerprint();
-console.log(fp);
+const fp2 = await initFingerprint();
+console.log(fp, fp2);
 const config = {
     "transitional": {
         "silentJSONParsing": true,

package/dist/verify-modal.js

@@ -11,7 +11,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     const [captchaImage, setCaptchaImage] = useState('');
     const [captchCode, setCaptchCode] = useState('');
     const [captchaKey, setCaptchaKey] = useState('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiReject } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
@@ -64,6 +64,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     };
     return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
             setVisible(false);
+            apiReject();
             props.onClose?.();
         }, children: [_jsx("div", { style: { fontSize: 14, color: '#666' }, children: t('alreadySend', lang, { phone: mobile }) }), _jsxs("div", { style: { display: 'flex', alignItems: 'center', gap: 8, marginTop: 12 }, children: [_jsx(Input.OTP, { length: 6, value: otp, onChange: async (val) => {
                             setOtp(val);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "1.0.1-beta.32",
+  "version": "1.0.1-beta.33",
   "type": "module",
   "main": "dist/index.js",
   "dependencies": {

package/src/index.tsx

@@ -4,29 +4,23 @@ import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './relogin-modal.js';
 import { ModalConfig, LoginModalConfig } from './utils/type.js';
 
-let cachedFingerprint: string | null = null;
+let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
+
 export const initFingerprint = async (): Promise<string> => {
-  // console.log('cachedFingerprint', cachedFingerprint);
-    if (cachedFingerprint) {
-        // 已有缓存，直接返回 Promise
-        return Promise.resolve(cachedFingerprint);
-    }
-    // 首次异步获取并缓存
-    return new Promise((resolve) => {
-        Fingerprint2.get(function (components) {
-          console.log('components', components);
-            const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
-            const values = components
-                .filter(component => includeKeys.includes(component.key))
-                .map(component => component.value)
-                .join('###');
-            console.log('values', values);
-            const fingerprint = Fingerprint2.x64hash128(values, 31);
-            console.log('fingerprint', fingerprint);
-            cachedFingerprint = fingerprint;
-            resolve(fingerprint);
+    if (!fingerprintPromise) {
+        fingerprintPromise = new Promise((resolve) => {
+            Fingerprint2.get(components => {
+                const includeKeys = ['userAgent', 'deviceMemory', 'cpuClass', 'hardwareConcurrency', 'platform'];
+                const values = components
+                    .filter(c => includeKeys.includes(c.key))
+                    .map(c => c.value)
+                    .join('###');
+                const fingerprint = Fingerprint2.x64hash128(values, 31);
+                resolve(fingerprint);
+            });
         });
-    });
+    }
+    return fingerprintPromise;
 };
 
 let modalRoot: ReactDOM.Root | null = null

package/src/main.tsx

@@ -5,7 +5,8 @@ import { axios } from '@yqg/resource';
 const data = "{\"mobile\":\"188****4035\",\"verifyCodeKey\":\"3f025b33-988e-47c0-950d-6beb776d043f\",\"needValid\":true,\"step\":2,\"message\":\"需要填写验证码\"}";
 
 const fp = await initFingerprint();
-console.log(fp);
+const fp2 = await initFingerprint();
+console.log(fp, fp2);
 
 const config = {
     "transitional": {

package/src/verify-modal.tsx

@@ -12,7 +12,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
     const [captchaImage, setCaptchaImage] = useState<string>('');
     const [captchCode, setCaptchCode] = useState<string>('');
     const [captchaKey, setCaptchaKey] = useState<string>('');
-    const { data, http, lang, api = '/admin/sms/send', config, apiResolve } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiReject } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
 
@@ -72,6 +72,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             visible={visible}
             onClose={() => {
                 setVisible(false);
+                apiReject();
                 props.onClose?.();
             }}
         >