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

package/.arcconfig

@@ -1,5 +1,4 @@
 {
-  "project.name": "message-verify",
   "phabricator.uri": "https://code.yangqianguan.com/",
   "lint.engine": "YqgWebDiffLintEngine"
 }

package/dist/compoments/button.js

@@ -3,6 +3,8 @@ const Button = ({ disabled, onClick, children, style }) => {
     const handleClick = (e) => {
         if (!disabled) {
             onClick?.(e);
+            // 这里可以记录点击事件
+            console.log('按钮被点击');
         }
     };
     return (_jsx("button", { disabled: disabled, onClick: handleClick, style: {

package/dist/index.d.ts

@@ -1,8 +1,4 @@
-import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
+import { ModalConfig, 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: {
-    _currentUrl: string;
-    createModal: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => Promise<any>;
-    getResponse: (response: any) => any;
-};

package/dist/index.js

@@ -1,86 +1,57 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 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 eventEmitter from './utils/eventEmitter.js';
-let fingerprintPromise = null; // 用 Promise 本身作为缓存
-let modalRoot = null;
+import ReLoginModal from './relogin-modal.js';
+let cachedFingerprint = null;
 export const initFingerprint = async () => {
-    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;
-};
-const destroyModal = (modalId) => {
-    if (modalRoot) {
-        modalRoot.unmount();
-        document.getElementById(modalId)?.remove();
-        modalRoot = null;
+    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);
+        });
+    });
 };
-const creatModal = (modalProps, modalId, ModalDom) => {
-    destroyModal(modalId);
+let modalRoot = null;
+export const createMessageVerifyModal = (modalProps) => {
     const container = document.createElement('div');
-    container.id = modalId;
+    container.id = 'antd-modal-container';
     document.body.appendChild(container);
     modalRoot = ReactDOM.createRoot(container);
-    modalRoot.render(_jsx(ModalDom, { props: {
+    modalRoot.render(_jsx(VerifyModal, { props: {
             ...modalProps,
             onClose: () => {
-                destroyModal(modalId);
+                modalProps.onClose?.();
+                destroyModal();
             }
         } }));
 };
-const createMessageVerifyModal = (modalProps) => {
-    const verifyModalId = 'verify-modal-container';
-    creatModal(modalProps, verifyModalId, VerifyModal);
-};
 // 新增 relogin 弹窗创建方法
 export const createReLoginModal = (modalProps) => {
-    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(_jsx(ReLoginModal, { props: {
+            ...modalProps,
+        } }));
 };
-export const VerifyHandler = {
-    _currentUrl: '',
-    createModal: ({ data, config, http, verifyPromise, sendApi }) => {
-        VerifyHandler._currentUrl = config?.url || '';
-        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
-                });
-            }).finally(toEmpty);
-        }
-        return verifyPromise.current;
-    },
-    getResponse: (response) => {
-        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/dist/locales/en.d.ts

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

package/dist/locales/en.js

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

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

package/dist/locales/id.js

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

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

package/dist/locales/zh.js

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

package/dist/main.js

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

package/dist/relogin-modal.js

@@ -1,23 +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 }) => {
-    const { goLogin, lang } = props || {};
+    const { goLogin } = 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: 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: {
+    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: {
                         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, children: t('ok', lang) }) })] }));
+                    }, onClick: onClose, children: "\u597D\u7684" }) })] }));
 };
 export default ReLoginModal;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.tsx","../src/main.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/modal/relogin-modal.tsx","../src/modal/verify-modal.tsx","../src/utils/eventemitter.ts","../src/utils/i18n.ts","../src/utils/resource.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}
+{"root":["../src/index.tsx","../src/main.tsx","../src/relogin-modal.tsx","../src/resource.ts","../src/verify-modal.tsx","../src/vite-env.d.ts","../src/compoments/button.tsx","../src/compoments/index.ts","../src/compoments/input.tsx","../src/compoments/message.tsx","../src/compoments/modal.tsx","../src/locales/en.ts","../src/locales/id.ts","../src/locales/zh.ts","../src/utils/i18n.ts","../src/utils/status.ts","../src/utils/type.ts"],"version":"5.7.3"}

package/dist/utils/type.d.ts

@@ -1,4 +1,4 @@
-export type VerifyModalConfig = {
+export type ModalConfig = {
     data: string;
     onClose?: () => void;
     config: {
@@ -7,7 +7,7 @@ export type VerifyModalConfig = {
         };
         [key: string]: unknown;
     };
-    lang?: 'zh' | 'en' | 'id';
+    lang: 'zh' | 'en' | 'id';
     http: {
         (params: object): Promise<unknown>;
         defaults: {
@@ -18,16 +18,9 @@ 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/dist/verify-modal.d.ts

@@ -1,5 +1,5 @@
-import { VerifyModalConfig } from './utils/type.js';
+import { ModalConfig } from './utils/type.js';
 declare const CreateMessageVerifyModal: ({ props }: {
-    props: VerifyModalConfig;
+    props: ModalConfig;
 }) => 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, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty } = props || {};
+    const { data, http, lang, api = '/admin/sms/send', response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
     const getKey = async () => {
@@ -51,65 +51,46 @@ const CreateMessageVerifyModal = ({ props }) => {
         formData.append('captchaKey', captchaKey);
         formData.append('captcha', captchCode);
         // 重新发送验证码
-        const res = await axios.post(sendApi, formData);
+        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 (_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) {
-                                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('');
+                                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'],
                                     }
+                                });
+                                console.log('=>response===>', response);
+                                if (code !== 0) {
+                                    const detailObj = JSON.parse(detail || '{}');
+                                    message.error(detailObj?.message || t('verifyFailed', lang));
+                                    return;
                                 }
-                                catch (error) {
-                                    console.warn('catch', error);
-                                    message.error('验证失败');
-                                    setOtp('');
+                                else {
+                                    message.success(t('verifySuccess', lang));
+                                    // setVisible(false);
                                 }
+                                setVisible(false);
                             }
                         } }), _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) }), _jsx("div", { style: { fontSize: 14, color: '#666', marginTop: 12 }, children: t('chidoriOpenPro', 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) })] }));
 };
 export default CreateMessageVerifyModal;

package/package.json

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

package/src/compoments/button.tsx

@@ -11,6 +11,8 @@ const Button: React.FC<CustomButtonProps> = ({ disabled, onClick, children, styl
     const handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
         if (!disabled) {
             onClick?.(e);
+            // 这里可以记录点击事件
+            console.log('按钮被点击');
         }
     };