message-verify 1.0.1-beta.4 → 1.0.1-beta.41

package/dist/index.d.ts

@@ -1,3 +1,4 @@
-import { ModalConfig } from './utils/type.js';
+import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 export declare const initFingerprint: () => Promise<string>;
-export declare const createMessageVerifyModal: (modalProps: ModalConfig) => void;
+export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
+export declare const VerifyHandler: (modalProps: VerifyModalConfig) => Promise<any>;

package/dist/index.js

@@ -2,31 +2,31 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import ReactDOM from 'react-dom/client';
 import VerifyModal from './verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
-let cachedFingerprint = null;
+import ReLoginModal from './relogin-modal.js';
+let fingerprintPromise = null; // 用 Promise 本身作为缓存
 export const initFingerprint = async () => {
-    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 = null;
-export const createMessageVerifyModal = (modalProps) => {
+const createMessageVerifyModal = (modalProps) => {
     const container = document.createElement('div');
-    container.id = 'antd-modal-container';
     document.body.appendChild(container);
     modalRoot = ReactDOM.createRoot(container);
     modalRoot.render(_jsx(VerifyModal, { props: {
@@ -37,6 +37,16 @@ export const createMessageVerifyModal = (modalProps) => {
             }
         } }));
 };
+// 新增 relogin 弹窗创建方法
+export const createReLoginModal = (modalProps) => {
+    const container = document.createElement('div');
+    container.id = 'antd-modal-container';
+    document.body.appendChild(container);
+    modalRoot = ReactDOM.createRoot(container);
+    modalRoot.render(_jsx(ReLoginModal, { props: {
+            ...modalProps,
+        } }));
+};
 const destroyModal = () => {
     if (modalRoot) {
         modalRoot.unmount();
@@ -44,3 +54,22 @@ const destroyModal = () => {
         modalRoot = null;
     }
 };
+export const VerifyHandler = (modalProps) => {
+    const { data, config, http, verifyPromise } = modalProps || {};
+    const toEmpty = () => {
+        verifyPromise.current = null;
+    };
+    if (!verifyPromise.current) {
+        verifyPromise.current = new Promise((resolve, reject) => {
+            createMessageVerifyModal({
+                data,
+                config,
+                http,
+                apiResolve: resolve,
+                apiReject: reject,
+                apiPromiseToEmpty: toEmpty,
+            });
+        }).finally(toEmpty);
+    }
+    return verifyPromise.current;
+};

package/dist/locales/en.d.ts

@@ -7,5 +7,9 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
+    accountAlert: string;
+    alertContent: string;
+    ok: string;
+    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/en.js

@@ -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/dist/locales/id.d.ts

@@ -7,5 +7,9 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
+    accountAlert: string;
+    alertContent: string;
+    ok: string;
+    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/id.js

@@ -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/dist/locales/zh.d.ts

@@ -7,5 +7,9 @@ declare const _default: {
     sendFailed: string;
     reSend: string;
     countDownSecound: string;
+    accountAlert: string;
+    alertContent: string;
+    ok: string;
+    chidoriOpenPro: string;
 };
 export default _default;

package/dist/locales/zh.js

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

package/dist/main.js

@@ -1,22 +1,17 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 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": {
         "silentJSONParsing": true,
         "forcedJSONParsing": true,
         "clarifyTimeoutError": false
     },
-    "transformRequest": [
-        null
-    ],
-    "transformResponse": [
-        null
-    ],
     "timeout": 0,
     "xsrfCookieName": "XSRF-TOKEN",
     "xsrfHeaderName": "X-XSRF-TOKEN",
@@ -25,9 +20,7 @@ const config = {
     "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"
+        "Content-Type": "application/json"
     },
     "url": "/classification/admin/level/edit",
     "method": "post",
@@ -43,12 +36,12 @@ const config = {
     "data": "{\"id\":1,\"classificationName\":\"个人基本概况信息\",\"classificationLevel\":2}",
     "baseURL": "http://localhost:62888"
 };
-createRoot(document.getElementById('root')).render(_jsx(_Fragment, { children: _jsx("button", { onClick: () => createMessageVerifyModal({
-            data,
-            config,
-            response: {
-                config
-            },
-            lang: 'en',
-            http: axios,
-        }), children: "Show verify Modal" }) }));
+const promise = { current: null };
+createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
+                return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
+            }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
+                goLogin: () => {
+                    console.log('goLogin');
+                },
+                lang: 'zh',
+            }), children: "Show login Modal" })] }));

package/dist/relogin-modal.d.ts

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

package/dist/relogin-modal.js

@@ -1,22 +1,23 @@
 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 }) => {
-    console.log('props', props);
+    const { goLogin, lang } = props || {};
     const [visible, setVisible] = useState(true);
     const onClose = () => {
         setVisible(false);
+        goLogin();
     };
-    return (_jsxs(Modal, { visible: visible, onClose: onClose, width: 420, children: [_jsx("div", { style: { fontWeight: 500, fontSize: 20, marginBottom: 24 }, children: "\u8D26\u53F7\u5B89\u5168\u63D0\u9192" }), _jsx("div", { style: { color: '#222', fontSize: 16, marginBottom: 40, lineHeight: '24px' }, children: "\u68C0\u6D4B\u5230\u60A8\u7684\u767B\u5F55\u73AF\u5883\u6216\u7F51\u7EDC\u4FE1\u606F\u6709\u53D8\u52A8\uFF0C\u4E3A\u4FDD\u969C\u8D26\u6237\u5B89\u5168\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\u9A8C\u8BC1\u8EAB\u4EFD" }), _jsx("div", { style: { display: 'flex', justifyContent: 'center' }, children: _jsx(Button, { style: {
+    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: 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, children: "\u597D\u7684" }) })] }));
+                    }, onClick: onClose, children: t('ok', lang) }) })] }));
 };
 export default ReLoginModal;

package/dist/utils/type.d.ts

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

package/dist/verify-modal.d.ts

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

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', response } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
@@ -58,37 +58,58 @@ const CreateMessageVerifyModal = ({ props }) => {
             return;
         }
         message.success(t('sendSuccess', lang));
+        // 重置倒计时、验证码
         setCountdown(60);
+        setOtp('');
     };
     return (_jsxs(Modal, { width: 420, visible: visible, onClose: () => {
             setVisible(false);
+            apiPromiseToEmpty?.();
             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);
                             if (val.length === 6) {
-                                const { data: { status: { code, detail } = {}, config } } = response || {};
-                                http({
-                                    ...config,
-                                    headers: {
-                                        ...http.defaults.headers.common,
-                                        'sms-code': val,
-                                        'sms-code-key': verifyCodeKey,
-                                        'Content-Type': config.headers['Content-Type'],
+                                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);
+                                            });
+                                        })
+                                    ]);
+                                    if (res?.data?.status?.code === 0) {
+                                        apiResolve(res);
+                                        setVisible(false);
+                                    }
+                                    else {
+                                        message.error('验证失败');
+                                        setOtp('');
                                     }
-                                });
-                                console.log(response, code, 'config');
-                                if (code !== 0) {
-                                    message.error(detail || t('verifyFailed', lang));
-                                    return;
                                 }
-                                else {
-                                    message.success(t('verifySuccess', lang));
-                                    setVisible(false);
+                                catch (error) {
+                                    console.warn('catch', error);
+                                    message.error('验证失败');
+                                    setOtp('');
                                 }
                             }
                         } }), _jsx(Button, { disabled: countdown > 0 || !captchCode, onClick: handleResend, style: { padding: '8px' }, children: countdown > 0 ? t('countDownSecound', lang, { countdown }) : t('reSend', lang) })] }), countdown > 0 ? null :
                 _jsxs("div", { style: { marginTop: 12, display: 'flex', alignItems: 'center' }, children: [_jsx(Input, { placeholder: t('pleaseEnterPicVerifyCode', lang), onChange: (e) => {
                                 setCaptchCode(e);
-                            }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) })] }));
+                            }, style: { width: 300 } }), captchaImage && _jsx("img", { src: captchaImage, alt: t('verifyCode', lang), style: { width: 100, height: 30, marginLeft: 8 }, onClick: getKey })] }), (countdown > 0 || captchCode) ? null : _jsx("div", { style: { fontSize: 14, color: 'red' }, children: t('pleaseEnterAndSend', lang) }), _jsx("div", { style: { fontSize: 14, color: '#666', marginTop: 12 }, children: t('chidoriOpenPro', lang) })] }));
 };
 export default CreateMessageVerifyModal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "message-verify",
-  "version": "1.0.1-beta.4",
+  "version": "1.0.1-beta.41",
   "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,92 @@
 import ReactDOM from 'react-dom/client'
 import VerifyModal from './verify-modal.js'
 import Fingerprint2 from 'fingerprintjs2';
-import { ModalConfig } from './utils/type.js';
+import ReLoginModal from './relogin-modal.js';
+import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
+
+let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
 
-let cachedFingerprint: string | 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
 
-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(
-    <VerifyModal
-      props={{
-        ...modalProps,
-        onClose: () => {
-          modalProps.onClose?.()
-          destroyModal()
-        }
-      }}
-    />
-  )
+const createMessageVerifyModal = (modalProps: VerifyModalConfig) => {
+    const container = document.createElement('div')
+    document.body.appendChild(container)
+
+    modalRoot = ReactDOM.createRoot(container)
+    modalRoot.render(
+        <VerifyModal
+            props={{
+                ...modalProps,
+                onClose: () => {
+                    modalProps.onClose?.()
+                    destroyModal()
+                }
+            }}
+        />
+    )
+}
+
+// 新增 relogin 弹窗创建方法
+export const createReLoginModal = (modalProps: LoginModalConfig) => {
+    const container = document.createElement('div')
+    container.id = 'antd-modal-container'
+    document.body.appendChild(container)
+
+    modalRoot = ReactDOM.createRoot(container)
+    modalRoot.render(
+        <ReLoginModal
+            props={{
+                ...modalProps,
+            }}
+        />
+    )
 }
 
 const destroyModal = () => {
-  if (modalRoot) {
-    modalRoot.unmount()
-    document.getElementById('antd-modal-container')?.remove()
-    modalRoot = null
-  }
-}
+    if (modalRoot) {
+        modalRoot.unmount()
+        document.getElementById('antd-modal-container')?.remove()
+        modalRoot = null
+    }
+}
+
+export const VerifyHandler = (modalProps: VerifyModalConfig): Promise<any> => {
+    const {data, config, http, verifyPromise} = modalProps || {};
+    const toEmpty = () => {
+      verifyPromise.current = null;
+    };
+    if (!verifyPromise.current) {
+        verifyPromise.current = new Promise((resolve, reject) => {
+        createMessageVerifyModal({
+          data,
+          config,
+          http,
+          apiResolve: resolve,
+          apiReject: reject,
+          apiPromiseToEmpty: toEmpty,
+        } as any);
+      }).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",
@@ -27,9 +22,7 @@ const config = {
     "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"
+        "Content-Type": "application/json"
     },
     "url": "/classification/admin/level/edit",
     "method": "post",
@@ -45,17 +38,21 @@ const config = {
     "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

@@ -1,20 +1,22 @@
 import { useState } from 'react'
 import { Modal, Button } from './compoments/index.js'
-import { ModalConfig } from './utils/type.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 } = props || {};
     const [visible, setVisible] = useState(true);
     const onClose = () => {
         setVisible(false);
+        goLogin();
     };
     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 +24,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/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: {
@@ -20,5 +20,13 @@ export type ModalConfig = {
         }
     };
     api?: string;
-    response: any;
+    apiReject?: any;
+    apiResolve?: any;
+    apiPromiseToEmpty?: () => void;
+    verifyPromise: {current: Promise<any> | null}
+}
+
+export type LoginModalConfig = {
+    goLogin: () => void;
+    lang?: 'zh' | 'en' | 'id';
 }

package/src/verify-modal.tsx

@@ -2,17 +2,17 @@ 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 { VerifyModalConfig } from './utils/type.js';
 import { axios } from '@yqg/resource';
 
-const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
+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, api='/admin/sms/send', response } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
 
@@ -25,10 +25,11 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                 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);
         }
     }
@@ -60,7 +61,9 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             return;
         }
         message.success(t('sendSuccess', lang));
+        // 重置倒计时、验证码
         setCountdown(60);
+        setOtp('');
     }
 
     return (
@@ -69,6 +72,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
             visible={visible}
             onClose={() => {
                 setVisible(false);
+                apiPromiseToEmpty?.();
                 props.onClose?.();
             }}
         >
@@ -81,23 +85,40 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                     onChange={async (val) => {
                         setOtp(val);
                         if (val.length === 6) {
-                            const {data: {status: {code, detail} = {}, config}} = response || {};
-                            http({
-                                ...config,
-                                headers: {
-                                    ...http.defaults.headers.common,
-                                    'sms-code': val,
-                                    'sms-code-key': verifyCodeKey,
-                                    'Content-Type': config.headers['Content-Type'],
+                            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('');
                                 }
-                            }) 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);
+                            } catch (error) {
+                                console.warn('catch', error);
+                                message.error('验证失败');
+                                setOtp('');
                             }
                         }
                     }} />
@@ -122,6 +143,7 @@ const CreateMessageVerifyModal = ({ props }: { props: ModalConfig }) => {
                     {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>
     );
 };