message-verify 1.0.1-beta.74 → 1.0.1-beta.8

package/src/index.tsx

@@ -1,96 +1,72 @@
 import ReactDOM from 'react-dom/client'
-import VerifyModal from './modal/verify-modal.js'
+import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
-import ReLoginModal from './modal/relogin-modal.js';
-import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
-import eventEmitter from './utils/eventEmitter.js';
+import ReLoginModal from './relogin-modal.js';
+import { ModalConfig, LoginModalConfig } from './utils/type.js';
 
-let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
-let modalRoot: ReactDOM.Root | null = null
+let cachedFingerprint: string | null = null;
 export const initFingerprint = async (): Promise<string> => {
-    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);
-            });
-        });
+    if (cachedFingerprint) {
+        // 已有缓存，直接返回 Promise
+        return Promise.resolve(cachedFingerprint);
     }
-    return fingerprintPromise;
+    // 首次异步获取并缓存
+    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);
+        });
+    });
 };
 
-const destroyModal = (modalId: string) => {
-    if (modalRoot) {
-        modalRoot.unmount()
-        document.getElementById(modalId)?.remove()
-        modalRoot = null
-    }
-}
+let modalRoot: ReactDOM.Root | null = null
 
-const creatModal = (modalProps: VerifyModalConfig | LoginModalConfig, modalId: string, ModalDom: any) => {
-    destroyModal(modalId);
-    const container = document.createElement('div')
-    container.id = modalId
-    document.body.appendChild(container)
+export const createMessageVerifyModal = (modalProps: ModalConfig) => {
+  const container = document.createElement('div')
+  container.id = 'antd-modal-container'
+  document.body.appendChild(container)
 
-    modalRoot = ReactDOM.createRoot(container)
-    modalRoot.render(
-        <ModalDom
-            props={{
-                ...modalProps,
-                onClose: () => {
-                    destroyModal(modalId);
-                }
-            }}
-        />
-    )
+  modalRoot = ReactDOM.createRoot(container)
+  modalRoot.render(
+    <VerifyModal
+      props={{
+        ...modalProps,
+        onClose: () => {
+          modalProps.onClose?.()
+          destroyModal()
+        }
+      }}
+    />
+  )
 }
 
-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);
+  const container = document.createElement('div')
+  container.id = 'antd-modal-container'
+  document.body.appendChild(container)
+
+  modalRoot = ReactDOM.createRoot(container)
+  modalRoot.render(
+    <ReLoginModal
+      props={{
+        ...modalProps,
+      }}
+    />
+  )
 }
 
-export const VerifyHandler = {
-    _currentUrl: '',
-    createModal: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => {
-        VerifyHandler._currentUrl = config?.url as string || '';
-        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;
-    },
-    getResponse: (response: any) => {
-        if (VerifyHandler._currentUrl === response?.config?.url) {
-            eventEmitter.emit('response', response?.data?.status?.code ?? -1);
-        }
-        return response;
-    }
-};
+const destroyModal = () => {
+  if (modalRoot) {
+    modalRoot.unmount()
+    document.getElementById('antd-modal-container')?.remove()
+    modalRoot = null
+  }
+}

package/src/locales/en.ts

@@ -6,10 +6,5 @@ export default {
     sendSuccess: 'Successfully sent',
     sendFailed: 'Send failed',
     reSend: 'Resend',
-    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',
-    verifyFail: 'Validation failed'
+    countDownSecound: '{countdown} seconds'
 };

package/src/locales/id.ts

@@ -6,10 +6,5 @@ export default {
     sendSuccess: 'Berhasil dikirim',
     sendFailed: 'Gagal mengirim',
     reSend: 'Kirim Ulang',
-    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',
-    verifyFail: 'Autentikasi gagal'
+    countDownSecound: '{countdown} detik'
 };

package/src/locales/zh.ts

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

package/src/main.tsx

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

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

@@ -1,23 +1,21 @@
 import { useState } from 'react'
-import { Modal, Button } from '../compoments/index.js'
-import { LoginModalConfig } from '../utils/type.js';
-import t from '../utils/i18n.js'
+import { Modal, Button } from './compoments/index.js'
+import { LoginModalConfig } from './utils/type.js';
 
 const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
-    const { goLogin, lang, onClose: destroyModal } = props || {};
+    const { goLogin } = 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
@@ -25,15 +23,16 @@ const ReLoginModal = ({ props }: { props: LoginModalConfig }) => {
                         background: '#1677ff',
                         color: '#fff',
                         border: 'none',
-                        width: 80,
-                        height: 36,
-                        fontSize: 14,
+                        width: 160,
+                        height: 44,
+                        fontSize: 18,
+                        fontWeight: 500,
                         borderRadius: 8,
                         boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
                     }}
                     onClick={onClose}
                 >
-                    {t('ok', lang)}
+                    好的
                 </Button>
             </div>
         </Modal>

package/src/utils/type.ts

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

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

@@ -1,23 +1,20 @@
-import { useRef, 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 { 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';
-import eventEmitter from '../utils/eventEmitter.js';
 
-const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
+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, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
+    const { data, http, lang, api='/admin/sms/send', response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
-    const resolveRef = useRef<any>(null);
-    const rejectRef = useRef<any>(null);
 
     const getKey = async () => {
         try {
@@ -28,11 +25,10 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
                 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);
+        } 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);
         }
     }
@@ -52,41 +48,19 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
         };
     }, [visible, countdown]);
 
-
-    useEffect(() => {
-        const handler = (data: any) => {
-            // 这里处理收到的数据
-            console.log('收到 response 事件:', data);
-            if (data === 0) {
-                resolveRef.current({
-                    code: data,
-                });
-            } else {
-                rejectRef.current({
-                    code: data,
-                });
-            }
-          };
-          eventEmitter.on('response', handler);
-          return () => {
-            eventEmitter.off('response', handler);
-          };
-    }, []);
-
     const handleResend = async () => {
         const formData = new FormData();
         formData.append('captchaKey', captchaKey);
         formData.append('captcha', captchCode);
         // 重新发送验证码
-        const res = await axios.post(sendApi, formData) || {};
-        const { code } = res.data?.status || {};
+        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);
-        setOtp('');
     }
 
     return (
@@ -95,8 +69,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
             visible={visible}
             onClose={() => {
                 setVisible(false);
-                apiPromiseToEmpty?.();
-                onClose?.();
+                props.onClose?.();
             }}
         >
             <div style={{ fontSize: 14, color: '#666' }}>{t('alreadySend', lang, { phone: mobile })}</div>
@@ -108,32 +81,26 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
                     onChange={async (val) => {
                         setOtp(val);
                         if (val.length === 6) {
-                            try {
-                                const res = await new Promise((resolve, reject) => {
-                                    resolveRef.current = resolve;
-                                    rejectRef.current = reject;
-                                    http({
-                                        ...config,
-                                        headers: {
-                                            ...http.defaults.headers.common,
-                                            'sms-code': val,
-                                            'sms-code-key': verifyCodeKey,
-                                            'Content-Type': config.headers['Content-Type'],
-                                        }
-                                    });
-                                }) as any;
-                                if (res?.code === 0 || res?.data?.status?.code === 0) {
-                                    apiResolve(res);
-                                    setVisible(false);
-                                } else {
-                                    message.error(t('verifyFail', lang));
-                                    setOtp('');
+                            const {data: {status: {code, detail} = {}}} = response || {};
+                            http({
+                                ...response?.config,
+                                headers: {
+                                    ...http.defaults.headers.common,
+                                    'sms-code': val,
+                                    'sms-code-key': verifyCodeKey,
+                                    'Content-Type': response?.config.headers['Content-Type'],
                                 }
-                            } catch (error) {
-                                console.warn('catch=>error', error);
-                                message.error(t('verifyFail', lang));
-                                setOtp('');
+                            }) as any;
+                            console.log('=>response===>', response);
+                            if(code !== 0) {
+                                const detailObj = JSON.parse(detail || '{}');
+                                message.error(detailObj?.message || t('verifyFailed', lang));
+                                return;
+                            } else {
+                                message.success(t('verifySuccess', lang));
+                                // setVisible(false);
                             }
+                            setVisible(false);
                         }
                     }} />
                 <Button
@@ -157,7 +124,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
                     {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>
     );
 };

package/dist/modal/relogin-modal.d.ts

@@ -1,5 +0,0 @@
-import { LoginModalConfig } from '../utils/type.js';
-declare const ReLoginModal: ({ props }: {
-    props: LoginModalConfig;
-}) => import("react/jsx-runtime.js").JSX.Element;
-export default ReLoginModal;

package/dist/modal/relogin-modal.js

@@ -1,24 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from 'react';
-import { Modal, Button } from '../compoments/index.js';
-import t from '../utils/i18n.js';
-const ReLoginModal = ({ props }) => {
-    const { goLogin, lang, onClose: destroyModal } = props || {};
-    const [visible, setVisible] = useState(true);
-    const onClose = () => {
-        setVisible(false);
-        goLogin();
-        destroyModal?.();
-    };
-    return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: t('accountAlert', lang) }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: t('alertContent', lang) }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
-                        background: '#1677ff',
-                        color: '#fff',
-                        border: 'none',
-                        width: 80,
-                        height: 36,
-                        fontSize: 14,
-                        borderRadius: 8,
-                        boxShadow: '0 2px 8px rgba(22,119,255,0.08)',
-                    }, onClick: onClose, children: t('ok', lang) }) })] }));
-};
-export default ReLoginModal;

package/dist/modal/verify-modal.d.ts

@@ -1,5 +0,0 @@
-import { VerifyModalConfig } from '../utils/type.js';
-declare const CreateMessageVerifyModal: ({ props }: {
-    props: VerifyModalConfig;
-}) => import("react/jsx-runtime.js").JSX.Element;
-export default CreateMessageVerifyModal;