message-verify 1.0.1-beta.5 → 1.0.1-beta.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "1.0.1-beta.5",
+  "version": "1.0.1-beta.50",
   "type": "module",
   "main": "dist/index.js",
   "dependencies": {
@@ -29,6 +29,7 @@
     "build": "tsc -b",
     "analyze": "vite build",
     "lint": "eslint .",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "release:beta": "pnpm version prerelease --preid=beta && pnpm run build && pnpm publish"
   }
 }

package/src/index.tsx

@@ -1,55 +1,85 @@
 import ReactDOM from 'react-dom/client'
-import VerifyModal from './verify-modal.js'
+import VerifyModal from './modal/verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
-import { ModalConfig } from './utils/type.js';
+import ReLoginModal from './modal/relogin-modal.js';
+import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 
-let cachedFingerprint: string | null = null;
+let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
+let modalRoot: ReactDOM.Root | null = null
 export const initFingerprint = async (): Promise<string> => {
-    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('###');
-            const fingerprint = Fingerprint2.x64hash128(values, 31);
-            cachedFingerprint = fingerprint;
-            resolve(fingerprint);
+    console.log('fingerprintPromise:', fingerprintPromise);
+    if (!fingerprintPromise) {
+        fingerprintPromise = new Promise((resolve) => {
+            Fingerprint2.get(components => {
+                const includeKeys = ['userAgent', 'cpuClass', 'hardwareConcurrency', 'platform'];
+                console.log('components:', components);
+                const values = components
+                    .filter(c => includeKeys.includes(c.key))
+                    .map(c => c.value)
+                    .join('###');
+                console.log('values:', values);
+                const fingerprint = Fingerprint2.x64hash128(values, 31);
+                console.log('fingerprint:', fingerprint);
+                resolve(fingerprint);
+            });
         });
-    });
+    }
+    return fingerprintPromise;
 };
 
-let modalRoot: ReactDOM.Root | null = null
+const destroyModal = (modalId: string) => {
+    if (modalRoot) {
+        modalRoot.unmount()
+        document.getElementById(modalId)?.remove()
+        modalRoot = null
+    }
+}
 
-export const createMessageVerifyModal = (modalProps: ModalConfig) => {
-  const container = document.createElement('div')
-  container.id = 'antd-modal-container'
-  document.body.appendChild(container)
+const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom:any) => {
+    destroyModal(modalId);
+    const container = document.createElement('div')
+    container.id = modalId
+    document.body.appendChild(container)
 
-  modalRoot = ReactDOM.createRoot(container)
-  modalRoot.render(
-    <VerifyModal
-      props={{
-        ...modalProps,
-        onClose: () => {
-          modalProps.onClose?.()
-          destroyModal()
-        }
-      }}
-    />
-  )
+    modalRoot = ReactDOM.createRoot(container)
+    modalRoot.render(
+        <ModalDom
+            props={{
+                ...modalProps,
+                onClose: () => {
+                    destroyModal(modalId);
+                }
+            }}
+        />
+    )
 }
 
-const destroyModal = () => {
-  if (modalRoot) {
-    modalRoot.unmount()
-    document.getElementById('antd-modal-container')?.remove()
-    modalRoot = null
-  }
-}
+const createMessageVerifyModal = (modalProps: VerifyModalConfig) => {
+    const verifyModalId = 'verify-modal-container';
+    creatModal(modalProps, verifyModalId, VerifyModal);
+}
+// 新增 relogin 弹窗创建方法
+export const createReLoginModal = (modalProps: LoginModalConfig) => {
+    const reLoginModalId = 'relogin-modal-container';
+    creatModal(modalProps, reLoginModalId, ReLoginModal);
+}
+
+export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
+    const toEmpty = () => {
+      verifyPromise.current = null;
+    };
+    if (!verifyPromise.current) {
+        verifyPromise.current = new Promise((resolve, reject) => {
+        createMessageVerifyModal({
+          data,
+          config,
+          http,
+          apiResolve: resolve,
+          apiReject: reject,
+          apiPromiseToEmpty: toEmpty,
+          sendApi
+        } as VerifyModalConfig);
+      }).finally(toEmpty);
+    }
+    return verifyPromise.current;
+  };

package/src/locales/en.ts

@@ -6,5 +6,9 @@ export default {
     sendSuccess: 'Successfully sent',
     sendFailed: 'Send failed',
     reSend: 'Resend',
-    countDownSecound: '{countdown} seconds'
+    countDownSecound: '{countdown} seconds',
+    accountAlert: 'Account Security Alert',
+    alertContent: 'Changes have been detected in your login environment or network information.To ensure account security, please log in again to verify your identity.',
+    ok: 'OK',
+    chidoriOpenPro: 'Chidori has activated security protection for you'
 };

package/src/locales/id.ts

@@ -6,5 +6,9 @@ export default {
     sendSuccess: 'Berhasil dikirim',
     sendFailed: 'Gagal mengirim',
     reSend: 'Kirim Ulang',
-    countDownSecound: '{countdown} detik'
+    countDownSecound: '{countdown} detik',
+    accountAlert: 'Peringatan Keamanan Akun',
+    alertContent: 'Terdeteksi perubahan pada lingkungan login atau informasi jaringan Anda.Untuk menjaga keamanan akun, silakan login kembali untuk memverifikasi identitas Anda.',
+    ok: 'Baiklah',
+    chidoriOpenPro: 'chidori telah mengaktifkan keamanan untuk Anda'
 };

package/src/locales/zh.ts

@@ -6,5 +6,9 @@ export default {
     sendSuccess: '发送成功',
     sendFailed: '发送失败',
     reSend: '重新发送',
-    countDownSecound: '{countdown}秒'
+    countDownSecound: '{countdown}秒',
+    accountAlert: '账号安全提醒',
+    alertContent: '检测到您的登录环境或网络信息有变动，为保障账户安全，请重新登录验证身份',
+    ok: '好的',
+    chidoriOpenPro: 'chidori已为您开启安全防护'
 };

package/src/main.tsx

@@ -1,11 +1,12 @@
 import { createRoot } from 'react-dom/client';
-import { createMessageVerifyModal, initFingerprint } from './index.js'; // 或 './index'
+import { initFingerprint, createReLoginModal, VerifyHandler } from './index.js'; // 或 './index'
 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": {
@@ -13,12 +14,6 @@ const config = {
         "forcedJSONParsing": true,
         "clarifyTimeoutError": false
     },
-    "transformRequest": [
-        null
-    ],
-    "transformResponse": [
-        null
-    ],
     "timeout": 0,
     "xsrfCookieName": "XSRF-TOKEN",
     "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -26,10 +21,8 @@ const config = {
     "maxBodyLength": -1,
     "headers": {
         "Accept": "application/json, text/plain, */*",
-        "X-Device-Fingerprint": "185fcce88c629725321adf29daa5e444",
-        "Content-Type": "application/json",
-        "sms-code": "121212",
-        "sms-code-key": "212190c7-2f5e-4cc1-82ec-a242c2ab5425"
+        "X-Device-Fingerprint": "531f14c7176b16ebeb18e2b23d6bd124",
+        "Content-Type": "application/json"
     },
     "url": "/classification/admin/level/edit",
     "method": "post",
@@ -44,18 +37,22 @@ const config = {
     "formInstance": {},
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
-};
+}
+
+const promise = {current: null};
 createRoot(document.getElementById('root')!).render(
     <>
-        <button onClick={() => createMessageVerifyModal({
-            data,
-            config,
-            response: {
-                config
+        <button onClick={() => {
+            return VerifyHandler({data, config, http: axios, verifyPromise: promise});
+        }}>
+            Show verify Modal 
+        </button>
+        <button  onClick={() => createReLoginModal({
+            goLogin: () => {
+                console.log('goLogin');
             },
-            lang: 'en',
-            http: axios,
+            lang: 'zh',
         })}>
-            Show verify Modal
+            Show login Modal
         </button>
     </>);

package/src/{relogin-modal.tsx → modal/relogin-modal.tsx}

@@ -1,20 +1,23 @@
 import { useState } from 'react'
-import { Modal, Button } from './compoments/index.js'
-import { ModalConfig } from './utils/type.js';
+import { Modal, Button } from '../compoments/index.js'
+import { LoginModalConfig } from '../utils/type.js';
+import t from '../utils/i18n.js'
 
-const ReLoginModal = ({ props }: { props: ModalConfig }) => {
-    console.log('props', props);
+const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
+    const { goLogin, lang, onClose: destroyModal } = props || {};
     const [visible, setVisible] = useState(true);
     const onClose = () => {
         setVisible(false);
+        goLogin();
+        destroyModal?.();
     };
     return (
         <Modal visible={visible} onClose={onClose} width={420}>
             <div style={{ fontWeight: 500, fontSize: 20, marginBottom: 24 }}>
-                账号安全提醒
+                {t('accountAlert', lang)}
             </div>
             <div style={{ color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }}>
-                检测到您的登录环境或网络信息有变动，为保障账户安全，请重新登录验证身份
+                {t('alertContent', lang)}
             </div>
             <div style={{ display: 'flex', justifyContent: 'center' }}>
                 <Button
@@ -22,16 +25,15 @@ const ReLoginModal = ({ props }: { props: ModalConfig }) => {
                         background: '#1677ff',
                         color: '#fff',
                         border: 'none',
-                        width: 160,
-                        height: 44,
-                        fontSize: 18,
-                        fontWeight: 500,
+                        width: 80,
+                        height: 36,
+                        fontSize: 14,
                         borderRadius: 8,
                         boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
                     }}
                     onClick={onClose}
                 >
-                    好的
+                    {t('ok', lang)}
                 </Button>
             </div>
         </Modal>

package/src/modal/verify-modal.tsx

@@ -0,0 +1,183 @@
+import { useEffect, useState } from 'react'
+import { Modal, Input, Button, message } from '../compoments/index.js'
+import Api from '../utils/resource.js'
+import t from '../utils/i18n.js'
+import { VerifyModalConfig } from '../utils/type.js';
+import { axios } from '@yqg/resource';
+
+const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
+    const [visible, setVisible] = useState(true);
+    const [countdown, setCountdown] = useState(60);
+    const [otp, setOtp] = useState('');
+    const [captchaImage, setCaptchaImage] = useState<string>('');
+    const [captchCode, setCaptchCode] = useState<string>('');
+    const [captchaKey, setCaptchaKey] = useState<string>('');
+    const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
+    const dataObj = JSON.parse(data || '{}');
+    const { mobile, verifyCodeKey } = dataObj || {};
+
+    const getKey = async () => {
+        try {
+            const res = await Api.getCaptchaKey();
+            const { body: key } = res.data || {};
+            setCaptchaKey(key);
+            if (key) {
+                const image = Api.getCaptchaImgUrl(key) as unknown;
+                setCaptchaImage(image as string);
+            }
+        } catch (err) {
+            const msg =
+                typeof err === 'object' && err !== null && 'message' in err
+                    ? (err as { message: string }).message
+                    : String(err);
+            message.error(msg as React.ReactNode);
+        }
+    }
+
+    useEffect(() => {
+        let timer: number | null = null;
+        if (visible && countdown > 0) {
+            timer = setInterval(() => {
+                setCountdown((prev) => prev - 1);
+            }, 1000);
+        }
+        if (countdown === 0) {
+            getKey();
+        }
+        return () => {
+            if (timer) clearInterval(timer);
+        };
+    }, [visible, countdown]);
+
+    const handleResend = async () => {
+        const formData = new FormData();
+        formData.append('captchaKey', captchaKey);
+        formData.append('captcha', captchCode);
+        // 重新发送验证码
+        const res = await axios.post(sendApi, formData);
+        const { code, detail } = res.data?.status || {};
+        if (code !== 0) {
+            message.error(detail || t('sendFailed', lang));
+            return;
+        }
+        message.success(t('sendSuccess', lang));
+        // 重置倒计时、验证码
+        setCountdown(60);
+        setOtp('');
+    }
+
+    return (
+        <Modal
+            width={420}
+            visible={visible}
+            onClose={() => {
+                setVisible(false);
+                apiPromiseToEmpty?.();
+                onClose?.();
+            }}
+        >
+            <div style={{ fontSize: 14, color: '#666' }}>{t('alreadySend', lang, { phone: mobile })}</div>
+
+            <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 12 }}>
+                <Input.OTP
+                    length={6}
+                    value={otp}
+                    onChange={async (val) => {
+                        setOtp(val);
+                        if (val.length === 6) {
+                            // try {
+                            //     const res = await Promise.race([
+                            //         new Promise((resolve, reject) => {
+                            //             setTimeout(() => {
+                            //                 reject(new Error('Timeout'));
+                            //             }, 1000);
+                            //         }),
+                            //         new Promise((resolve, reject) => {
+                            //             http({
+                            //                 ...config,
+                            //                 headers: {
+                            //                     ...http.defaults.headers.common,
+                            //                     'sms-code': val,
+                            //                     'sms-code-key': verifyCodeKey,
+                            //                     'Content-Type': config.headers['Content-Type'],
+                            //                 }
+                            //             }).then(res => {
+                            //                 resolve(res);
+                            //             }).catch(err => {
+                            //                 reject(err);
+                            //         })
+                            //     ]) as any;
+                            //     if (res?.data?.status?.code === 0) {
+                            //         apiResolve(res);
+                            //         setVisible(false);
+                            //     } else {
+                            //         message.error('验证失败');
+                            //         setOtp('');
+                            //     }
+                            // } catch (error) {
+                            //     console.warn('catch', error);
+                            //     message.error('验证失败');
+                            //     setOtp('');
+                            // }
+                            try {
+                                new Promise((resolve, reject) => {
+                                    http({
+                                        ...config,
+                                        headers: {
+                                            ...http.defaults.headers.common,
+                                            'sms-code': val,
+                                            'sms-code-key': verifyCodeKey,
+                                            'Content-Type': config.headers['Content-Type'],
+                                        }
+                                    }).then((res: any) => {
+                                        console.log('res', res);
+                                        console.log('res?.data?.status?.code', res?.data?.status?.code)
+                                        if (res?.data?.status?.code === 0) {
+                                            console.log('res?.data?.status?.code2', res?.data?.status?.code)
+                                            apiResolve(res);
+                                            setVisible(false);
+                                        } else {
+                                            console.log('res?.data?.status?.code3', res?.data?.status?.code)
+                                            message.error('验证失败');
+                                            setOtp('');
+                                        }
+                                        resolve(res);
+                                    }).catch(err => {
+                                        console.log('err', err)
+                                        reject(err);
+                                    })
+                                });
+                            } catch (error) {
+                                console.warn('catch=>error', error);
+                                message.error('验证失败');
+                                setOtp('');
+                            }
+                        }
+                    }} />
+                <Button
+                    disabled={countdown > 0 || !captchCode}
+                    onClick={handleResend}
+                    style={{ padding: '8px' }}
+                >
+                    {countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang)}
+                </Button>
+            </div>
+            {countdown > 0 ? null :
+                <div style={{ marginTop: 12, display: 'flex', alignItems: 'center' }}>
+                    <Input
+                        placeholder={t('pleaseEnterPicVerifyCode', lang)}
+                        onChange={(e) => {
+                            setCaptchCode(e as string)
+                        }}
+                        style={{ width: 300 }}
+                    />
+
+                    {captchaImage && <img src={captchaImage} alt={t('verifyCode', lang)} style={{ width: 100, height: 30, marginLeft: 8 }} onClick={getKey} />}
+                </div>}
+            {(countdown > 0 || captchCode) ? null : <div style={{ fontSize: 14, color: 'red' }}>{t('pleaseEnterAndSend', lang)}</div>}
+            <div style={{ fontSize: 14, color: '#666', marginTop: 12 }}>{t('chidoriOpenPro', lang)}</div>
+        </Modal>
+    );
+};
+
+export default CreateMessageVerifyModal;

package/src/utils/type.ts

@@ -1,5 +1,5 @@
 
-export type ModalConfig = {
+export type VerifyModalConfig = {
     data: string;
     onClose?: () => void
     config: {
@@ -8,7 +8,7 @@ export type ModalConfig = {
         };
         [key: string]: unknown;
     };
-    lang: 'zh' | 'en' | 'id';
+    lang?: 'zh' | 'en' | 'id';
     http: {
         (params: object): Promise<unknown>;
         defaults: {
@@ -19,6 +19,15 @@ export type ModalConfig = {
             }
         }
     };
-    api?: string;
-    response: any;
+    sendApi?: string;
+    apiReject?: any;
+    apiResolve?: any;
+    apiPromiseToEmpty?: () => void;
+    verifyPromise: {current: Promise<any> | null}
+}
+
+export type LoginModalConfig = {
+    goLogin: () => void;
+    onClose?: () => void
+    lang?: 'zh' | 'en' | 'id';
 }

package/src/verify-modal.tsx

@@ -1,129 +0,0 @@
-import { useEffect, useState } from 'react'
-import { Modal, Input, Button, message } from './compoments/index.js'
-import Api from './resource.js'
-import t from './utils/i18n.js'
-import { ModalConfig } from './utils/type.js';
-import { axios } from '@yqg/resource';
-
-const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
-    const [visible, setVisible] = useState(true);
-    const [countdown, setCountdown] = useState(60);
-    const [otp, setOtp] = useState('');
-    const [captchaImage, setCaptchaImage] = useState<string>('');
-    const [captchCode, setCaptchCode] = useState<string>('');
-    const [captchaKey, setCaptchaKey] = useState<string>('');
-    const { data, config, http, lang, api='/admin/sms/send', response } = props || {};
-    const dataObj = JSON.parse(data || '{}');
-    const { mobile, verifyCodeKey } = dataObj || {};
-
-    const getKey = async () => {
-        try {
-            const res = await Api.getCaptchaKey();
-            const { body: key } = res.data || {};
-            setCaptchaKey(key);
-            if (key) {
-                const image = Api.getCaptchaImgUrl(key) as unknown;
-                setCaptchaImage(image as string);
-            }
-        } catch (err) {const msg =
-            typeof err === 'object' && err !== null && 'message' in err
-                ? (err as {message: string}).message
-                : String(err);
-            message.error(msg as React.ReactNode);
-        }
-    }
-
-    useEffect(() => {
-        let timer: number | null = null;
-        if (visible && countdown > 0) {
-            timer = setInterval(() => {
-                setCountdown((prev) => prev - 1);
-            }, 1000);
-        }
-        if (countdown === 0) {
-            getKey();
-        }
-        return () => {
-            if (timer) clearInterval(timer);
-        };
-    }, [visible, countdown]);
-
-    const handleResend = async () => {
-        const formData = new FormData();
-        formData.append('captchaKey', captchaKey);
-        formData.append('captcha', captchCode);
-        // 重新发送验证码
-        const res = await axios.post(api, formData);
-        const { code, detail } = res.data?.status || {};
-        if (code !== 0) {
-            message.error(detail || t('sendFailed', lang));
-            return;
-        }
-        message.success(t('sendSuccess', lang));
-        setCountdown(60);
-    }
-
-    return (
-        <Modal
-            width={420}
-            visible={visible}
-            onClose={() => {
-                setVisible(false);
-                props.onClose?.();
-            }}
-        >
-            <div style={{ fontSize: 14, color: '#666' }}>{t('alreadySend', lang, { phone: mobile })}</div>
-
-            <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginTop: 12 }}>
-                <Input.OTP
-                    length={6}
-                    value={otp}
-                    onChange={async (val) => {
-                        setOtp(val);
-                        if (val.length === 6) {
-                            const {data: {status: {code, detail} = {}}} = response || {};
-                            http({
-                                ...config,
-                                headers: {
-                                    ...http.defaults.headers.common,
-                                    'sms-code': val,
-                                    'sms-code-key': verifyCodeKey,
-                                    'Content-Type': config.headers['Content-Type'],
-                                }
-                            }) as any;
-                            console.log(response, code, 'config');
-                            if(code !== 0) {
-                                message.error(detail || t('verifyFailed', lang));
-                                return;
-                            } else {
-                                message.success(t('verifySuccess', lang));
-                                setVisible(false);
-                            }
-                        }
-                    }} />
-                <Button
-                    disabled={countdown > 0 || !captchCode}
-                    onClick={handleResend}
-                    style={{ padding: '8px' }}
-                >
-                    {countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang)}
-                </Button>
-            </div>
-            {countdown > 0 ? null :
-                <div style={{ marginTop: 12, display: 'flex', alignItems: 'center' }}>
-                    <Input
-                        placeholder={t('pleaseEnterPicVerifyCode', lang)}
-                        onChange={(e) => {
-                            setCaptchCode(e as string)
-                        }}
-                        style={{ width: 300 }}
-                    />
-
-                    {captchaImage && <img src={captchaImage} alt={t('verifyCode', lang)} style={{ width: 100, height: 30, marginLeft: 8 }} onClick={getKey} />}
-                </div>}
-            {(countdown > 0 || captchCode) ? null : <div style={{ fontSize: 14, color: 'red' }}>{t('pleaseEnterAndSend', lang)}</div>}
-        </Modal>
-    );
-};
-
-export default CreateMessageVerifyModal;