message-verify 1.0.1-beta.61 → 1.0.1-beta.62

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
 export declare const initFingerprint: () => Promise<string>;
 export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
+export declare const getResponse: (response: any) => any;
 export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi, response }: VerifyModalConfig) => Promise<any>;

package/dist/index.js

@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client';
 import VerifyModal from './modal/verify-modal.js';
 import Fingerprint2 from 'fingerprintjs2';
 import ReLoginModal from './modal/relogin-modal.js';
+import eventEmitter from './utils/eventEmitter';
 let fingerprintPromise = null; // 用 Promise 本身作为缓存
 let modalRoot = null;
 export const initFingerprint = async () => {
@@ -54,60 +55,33 @@ export const createReLoginModal = (modalProps) => {
     const reLoginModalId = 'relogin-modal-container';
     creatModal(modalProps, reLoginModalId, ReLoginModal);
 };
-let cachedResolve = null;
-let cachedReject = null;
+let fetchUrl = '';
+export const getResponse = (response) => {
+    // if (fetchUrl === response.config.url) {
+    console.log('VerifyHandler getResponse =>', response, fetchUrl);
+    eventEmitter.emit('response', response?.data?.status?.code || -1);
+    return response;
+    // }
+};
 export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi, response }) => {
     console.log('VerifyHandler =>', response);
+    fetchUrl = config?.url || '';
     const toEmpty = () => {
         verifyPromise.current = null;
-        cachedResolve = null;
-        cachedReject = null;
     };
-    // if (!verifyPromise.current) {
-    //     verifyPromise.current = new Promise((resolve, reject) => {
-    //     createMessageVerifyModal({
-    //       data,
-    //       config,
-    //       http,
-    //       apiResolve: resolve,
-    //       apiReject: reject,
-    //       apiPromiseToEmpty: toEmpty,
-    //       sendApi,
-    //       response
-    //     } as VerifyModalConfig);
-    //   }).finally(toEmpty);
-    // }
     if (!verifyPromise.current) {
         verifyPromise.current = new Promise((resolve, reject) => {
-            // 只缓存第一次的 resolve/reject
-            if (!cachedResolve)
-                cachedResolve = resolve;
-            if (!cachedReject)
-                cachedReject = reject;
             createMessageVerifyModal({
                 data,
                 config,
                 http,
-                apiResolve: cachedResolve,
-                apiReject: cachedReject,
+                apiResolve: resolve,
+                apiReject: reject,
                 apiPromiseToEmpty: toEmpty,
                 sendApi,
                 response
             });
         }).finally(toEmpty);
     }
-    else {
-        // 已有 modal，更新其余参数（假设 modal 支持 props 更新）
-        createMessageVerifyModal({
-            data,
-            config,
-            http,
-            apiResolve: cachedResolve,
-            apiReject: cachedReject,
-            apiPromiseToEmpty: toEmpty,
-            sendApi,
-            response
-        });
-    }
     return verifyPromise.current;
 };

package/dist/modal/verify-modal.js

@@ -4,6 +4,7 @@ import { Modal, Input, Button, message } from '../compoments/index.js';
 import Api from '../utils/resource.js';
 import t from '../utils/i18n.js';
 import { axios } from '@yqg/resource';
+import eventEmitter from '../utils/eventEmitter';
 const CreateMessageVerifyModal = ({ props }) => {
     const [visible, setVisible] = useState(true);
     const [countdown, setCountdown] = useState(60);
@@ -11,6 +12,7 @@ const CreateMessageVerifyModal = ({ props }) => {
     const [captchaImage, setCaptchaImage] = useState('');
     const [captchCode, setCaptchCode] = useState('');
     const [captchaKey, setCaptchaKey] = useState('');
+    const [resCode, setResCode] = useState(-1);
     const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
@@ -46,6 +48,17 @@ const CreateMessageVerifyModal = ({ props }) => {
                 clearInterval(timer);
         };
     }, [visible, countdown]);
+    useEffect(() => {
+        const handler = (data) => {
+            // 这里处理收到的数据
+            console.log('收到 response 事件:', data);
+            setResCode(data);
+        };
+        eventEmitter.on('response', handler);
+        return () => {
+            eventEmitter.off('response', handler);
+        };
+    }, []);
     const handleResend = async () => {
         const formData = new FormData();
         formData.append('captchaKey', captchaKey);
@@ -86,7 +99,7 @@ const CreateMessageVerifyModal = ({ props }) => {
                                                     'Content-Type': config.headers['Content-Type'],
                                                 }
                                             }).then(res => {
-                                                console.log('VerifyHandler => then', response);
+                                                console.log('VerifyHandler => then', response, resCode);
                                                 resolve(res);
                                             }).catch(err => {
                                                 reject(err);

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/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/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"}

package/dist/utils/eventEmitter.d.ts

@@ -0,0 +1,10 @@
+type Listener = (...args: any[]) => void;
+declare class EventEmitter {
+    private events;
+    on(event: string, listener: Listener): void;
+    off(event: string, listener: Listener): void;
+    emit(event: string, ...args: any[]): void;
+    once(event: string, listener: Listener): void;
+}
+declare const eventEmitter: EventEmitter;
+export default eventEmitter;

package/dist/utils/eventEmitter.js

@@ -0,0 +1,28 @@
+class EventEmitter {
+    events = {};
+    on(event, listener) {
+        if (!this.events[event]) {
+            this.events[event] = [];
+        }
+        this.events[event].push(listener);
+    }
+    off(event, listener) {
+        if (!this.events[event])
+            return;
+        this.events[event] = this.events[event].filter(l => l !== listener);
+    }
+    emit(event, ...args) {
+        if (!this.events[event])
+            return;
+        this.events[event].forEach(listener => listener(...args));
+    }
+    once(event, listener) {
+        const onceListener = (...args) => {
+            listener(...args);
+            this.off(event, onceListener);
+        };
+        this.on(event, onceListener);
+    }
+}
+const eventEmitter = new EventEmitter();
+export default eventEmitter;

package/package.json

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

package/src/index.tsx

@@ -3,6 +3,7 @@ import VerifyModal from './modal/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';
 
 let fingerprintPromise: Promise<string> | null = null; // 用 Promise 本身作为缓存
 let modalRoot: ReactDOM.Root | null = null
@@ -63,57 +64,35 @@ export const createReLoginModal = (modalProps: LoginModalConfig) => {
     const reLoginModalId = 'relogin-modal-container';
     creatModal(modalProps, reLoginModalId, ReLoginModal);
 }
-let cachedResolve: ((value: any) => void) | null = null;
-let cachedReject: ((reason?: any) => void) | null = null;
+
+let fetchUrl: string = '';
+export const getResponse = (response: any) => {
+    // if (fetchUrl === response.config.url) {
+    console.log('VerifyHandler getResponse =>', response, fetchUrl);
+    eventEmitter.emit('response', response?.data?.status?.code || -1);
+    return response;
+    // }
+}
+
 export const VerifyHandler = ({data, config, http, verifyPromise, sendApi, response}: VerifyModalConfig): Promise<any> => {
     console.log('VerifyHandler =>', response);
+    fetchUrl = config?.url as string || '';
     const toEmpty = () => {
       verifyPromise.current = null;
-      cachedResolve = null;
-      cachedReject = null;
     };
-    // if (!verifyPromise.current) {
-    //     verifyPromise.current = new Promise((resolve, reject) => {
-    //     createMessageVerifyModal({
-    //       data,
-    //       config,
-    //       http,
-    //       apiResolve: resolve,
-    //       apiReject: reject,
-    //       apiPromiseToEmpty: toEmpty,
-    //       sendApi,
-    //       response
-    //     } as VerifyModalConfig);
-    //   }).finally(toEmpty);
-    // }
     if (!verifyPromise.current) {
         verifyPromise.current = new Promise((resolve, reject) => {
-          // 只缓存第一次的 resolve/reject
-          if (!cachedResolve) cachedResolve = resolve;
-          if (!cachedReject) cachedReject = reject;
-          createMessageVerifyModal({
-            data,
-            config,
-            http,
-            apiResolve: cachedResolve,
-            apiReject: cachedReject,
-            apiPromiseToEmpty: toEmpty,
-            sendApi,
-            response
-          } as VerifyModalConfig);
-        }).finally(toEmpty);
-    } else {
-        // 已有 modal，更新其余参数（假设 modal 支持 props 更新）
         createMessageVerifyModal({
           data,
           config,
           http,
-          apiResolve: cachedResolve!,
-          apiReject: cachedReject!,
+          apiResolve: resolve,
+          apiReject: reject,
           apiPromiseToEmpty: toEmpty,
           sendApi,
           response
         } as VerifyModalConfig);
+      }).finally(toEmpty);
     }
     return verifyPromise.current;
   };

package/src/modal/verify-modal.tsx

@@ -4,6 +4,7 @@ import Api from '../utils/resource.js'
 import t from '../utils/i18n.js'
 import { VerifyModalConfig } from '../utils/type.js';
 import { axios } from '@yqg/resource';
+import eventEmitter from '../utils/eventEmitter';
 
 const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
     const [visible, setVisible] = useState(true);
@@ -12,6 +13,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
     const [captchaImage, setCaptchaImage] = useState<string>('');
     const [captchCode, setCaptchCode] = useState<string>('');
     const [captchaKey, setCaptchaKey] = useState<string>('');
+    const [resCode, setResCode] = useState<number>(-1);
     const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
     const dataObj = JSON.parse(data || '{}');
     const { mobile, verifyCodeKey } = dataObj || {};
@@ -49,6 +51,19 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
         };
     }, [visible, countdown]);
 
+
+    useEffect(() => {
+        const handler = (data: any) => {
+            // 这里处理收到的数据
+            console.log('收到 response 事件:', data);
+            setResCode(data);
+          };
+          eventEmitter.on('response', handler);
+          return () => {
+            eventEmitter.off('response', handler);
+          };
+    }, [])
+
     const handleResend = async () => {
         const formData = new FormData();
         formData.append('captchaKey', captchaKey);
@@ -102,7 +117,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
                                                 'Content-Type': config.headers['Content-Type'],
                                             }
                                         }).then(res => {
-                                            console.log('VerifyHandler => then', response);
+                                            console.log('VerifyHandler => then', response, resCode);
                                             resolve(res);
                                         }).catch(err => {
                                             reject(err);

package/src/utils/eventEmitter.ts

@@ -0,0 +1,33 @@
+type Listener = (...args: any[]) => void;
+
+class EventEmitter {
+  private events: Record<string, Listener[]> = {};
+
+  on(event: string, listener: Listener) {
+    if (!this.events[event]) {
+      this.events[event] = [];
+    }
+    this.events[event].push(listener);
+  }
+
+  off(event: string, listener: Listener) {
+    if (!this.events[event]) return;
+    this.events[event] = this.events[event].filter(l => l !== listener);
+  }
+
+  emit(event: string, ...args: any[]) {
+    if (!this.events[event]) return;
+    this.events[event].forEach(listener => listener(...args));
+  }
+
+  once(event: string, listener: Listener) {
+    const onceListener: Listener = (...args) => {
+      listener(...args);
+      this.off(event, onceListener);
+    };
+    this.on(event, onceListener);
+  }
+}
+
+const eventEmitter = new EventEmitter();
+export default eventEmitter;