message-verify 1.0.1-beta.67 → 1.0.1-beta.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/index.d.ts +4 -2
  2. package/dist/index.js +7 -13
  3. package/dist/main.js +1 -1
  4. package/dist/modal/verify-modal.js +1 -33
  5. package/dist/utils/type.d.ts +0 -1
  6. package/package.json +1 -1
  7. package/src/index.tsx +9 -15
  8. package/src/main.tsx +1 -1
  9. package/src/modal/verify-modal.tsx +3 -35
  10. package/src/utils/type.ts +0 -1
package/dist/index.d.ts CHANGED
@@ -1,5 +1,7 @@
1
1
  import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
2
2
  export declare const initFingerprint: () => Promise<string>;
3
3
  export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
4
- export declare const getResponse: (response: any) => any;
5
- export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi, response }: VerifyModalConfig) => Promise<any>;
4
+ export declare const VerifyHandler: {
5
+ ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig): Promise<any>;
6
+ getResponse(response: any): any;
7
+ };
package/dist/index.js CHANGED
@@ -55,17 +55,7 @@ export const createReLoginModal = (modalProps) => {
55
55
  const reLoginModalId = 'relogin-modal-container';
56
56
  creatModal(modalProps, reLoginModalId, ReLoginModal);
57
57
  };
58
- let fetchUrl = '';
59
- export const getResponse = (response) => {
60
- // if (fetchUrl === response.config.url) {
61
- console.log('VerifyHandler getResponse =>', response, fetchUrl);
62
- eventEmitter.emit('response', response?.data?.status?.code ?? -1);
63
- return response;
64
- // }
65
- };
66
- export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi, response }) => {
67
- console.log('VerifyHandler =>', response);
68
- fetchUrl = config?.url || '';
58
+ export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi }) => {
69
59
  const toEmpty = () => {
70
60
  verifyPromise.current = null;
71
61
  };
@@ -78,10 +68,14 @@ export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi, resp
78
68
  apiResolve: resolve,
79
69
  apiReject: reject,
80
70
  apiPromiseToEmpty: toEmpty,
81
- sendApi,
82
- response
71
+ sendApi
83
72
  });
84
73
  }).finally(toEmpty);
85
74
  }
86
75
  return verifyPromise.current;
87
76
  };
77
+ // 获取当前触发接口response
78
+ VerifyHandler.getResponse = (response) => {
79
+ eventEmitter.emit('response', response?.data?.status?.code ?? -1);
80
+ return response;
81
+ };
package/dist/main.js CHANGED
@@ -38,7 +38,7 @@ const config = {
38
38
  };
39
39
  const promise = { current: null };
40
40
  createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
41
- return VerifyHandler({ data, config, http: axios, verifyPromise: promise, response: {} });
41
+ return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
42
42
  }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
43
43
  goLogin: () => {
44
44
  console.log('goLogin');
package/dist/modal/verify-modal.js CHANGED
@@ -12,8 +12,7 @@ const CreateMessageVerifyModal = ({ props }) => {
12
12
  const [captchaImage, setCaptchaImage] = useState('');
13
13
  const [captchCode, setCaptchCode] = useState('');
14
14
  const [captchaKey, setCaptchaKey] = useState('');
15
- const [resCode, setResCode] = useState(-1);
16
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
15
+ const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
17
16
  const dataObj = JSON.parse(data || '{}');
18
17
  const { mobile, verifyCodeKey } = dataObj || {};
19
18
  const resolveRef = useRef(null);
@@ -64,7 +63,6 @@ const CreateMessageVerifyModal = ({ props }) => {
64
63
  code: data,
65
64
  });
66
65
  }
67
- setResCode(data);
68
66
  };
69
67
  eventEmitter.on('response', handler);
70
68
  return () => {
@@ -95,29 +93,6 @@ const CreateMessageVerifyModal = ({ props }) => {
95
93
  setOtp(val);
96
94
  if (val.length === 6) {
97
95
  try {
98
- // const res = await Promise.race([
99
- // new Promise((resolve, reject) => {
100
- // setTimeout(() => {
101
- // reject(new Error('Timeout'));
102
- // }, 1000);
103
- // }),
104
- // new Promise((resolve, reject) => {
105
- // http({
106
- // ...config,
107
- // headers: {
108
- // ...http.defaults.headers.common,
109
- // 'sms-code': val,
110
- // 'sms-code-key': verifyCodeKey,
111
- // 'Content-Type': config.headers['Content-Type'],
112
- // }
113
- // }).then(res => {
114
- // console.log('VerifyHandler => then', response, resCode);
115
- // resolve(res);
116
- // }).catch(err => {
117
- // reject(err);
118
- // })
119
- // })
120
- // ]) as any;
121
96
  const res = await new Promise((resolve, reject) => {
122
97
  resolveRef.current = resolve;
123
98
  rejectRef.current = reject;
@@ -129,14 +104,8 @@ const CreateMessageVerifyModal = ({ props }) => {
129
104
  'sms-code-key': verifyCodeKey,
130
105
  'Content-Type': config.headers['Content-Type'],
131
106
  }
132
- }).then(res => {
133
- console.log('VerifyHandler => then', response, resCode);
134
- resolve(res);
135
- }).catch(err => {
136
- reject(err);
137
107
  });
138
108
  });
139
- console.log('res=====>', res);
140
109
  if (res?.code === 0 || res?.data?.status?.code === 0) {
141
110
  apiResolve(res);
142
111
  setVisible(false);
@@ -147,7 +116,6 @@ const CreateMessageVerifyModal = ({ props }) => {
147
116
  }
148
117
  }
149
118
  catch (error) {
150
- console.log('VerifyHandler => catch', response);
151
119
  console.warn('catch=>error', error);
152
120
  message.error(t('verifyFail', lang));
153
121
  setOtp('');
package/dist/utils/type.d.ts CHANGED
@@ -25,7 +25,6 @@ export type VerifyModalConfig = {
25
25
  verifyPromise: {
26
26
  current: Promise<any> | null;
27
27
  };
28
- response: any;
29
28
  };
30
29
  export type LoginModalConfig = {
31
30
  goLogin: () => void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.1-beta.67",
3
+ "version": "1.0.1-beta.69",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
package/src/index.tsx CHANGED
@@ -65,18 +65,7 @@ export const createReLoginModal = (modalProps: LoginModalConfig) => {
65
65
  creatModal(modalProps, reLoginModalId, ReLoginModal);
66
66
  }
67
67
 
68
- let fetchUrl: string = '';
69
- export const getResponse = (response: any) => {
70
- // if (fetchUrl === response.config.url) {
71
- console.log('VerifyHandler getResponse =>', response, fetchUrl);
72
- eventEmitter.emit('response', response?.data?.status?.code ?? -1);
73
- return response;
74
- // }
75
- }
76
-
77
- export const VerifyHandler = ({data, config, http, verifyPromise, sendApi, response}: VerifyModalConfig): Promise<any> => {
78
- console.log('VerifyHandler =>', response);
79
- fetchUrl = config?.url as string || '';
68
+ export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
80
69
  const toEmpty = () => {
81
70
  verifyPromise.current = null;
82
71
  };
@@ -89,10 +78,15 @@ export const VerifyHandler = ({data, config, http, verifyPromise, sendApi, respo
89
78
  apiResolve: resolve,
90
79
  apiReject: reject,
91
80
  apiPromiseToEmpty: toEmpty,
92
- sendApi,
93
- response
81
+ sendApi
94
82
  } as VerifyModalConfig);
95
83
  }).finally(toEmpty);
96
84
  }
97
85
  return verifyPromise.current;
98
- };
86
+ };
87
+
88
+ // 获取当前触发接口response
89
+ VerifyHandler.getResponse = (response: any) => {
90
+ eventEmitter.emit('response', response?.data?.status?.code ?? -1);
91
+ return response;
92
+ };
package/src/main.tsx CHANGED
@@ -43,7 +43,7 @@ const promise = {current: null};
43
43
  createRoot(document.getElementById('root')!).render(
44
44
  <>
45
45
  <button onClick={() => {
46
- return VerifyHandler({data, config, http: axios, verifyPromise: promise, response: {}});
46
+ return VerifyHandler({data, config, http: axios, verifyPromise: promise});
47
47
  }}>
48
48
  Show verify Modal
49
49
  </button>
package/src/modal/verify-modal.tsx CHANGED
@@ -13,8 +13,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
13
13
  const [captchaImage, setCaptchaImage] = useState<string>('');
14
14
  const [captchCode, setCaptchCode] = useState<string>('');
15
15
  const [captchaKey, setCaptchaKey] = useState<string>('');
16
- const [resCode, setResCode] = useState<number>(-1);
17
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
16
+ const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
18
17
  const dataObj = JSON.parse(data || '{}');
19
18
  const { mobile, verifyCodeKey } = dataObj || {};
20
19
  const resolveRef = useRef<any>(null);
@@ -67,13 +66,12 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
67
66
  code: data,
68
67
  });
69
68
  }
70
- setResCode(data);
71
69
  };
72
70
  eventEmitter.on('response', handler);
73
71
  return () => {
74
72
  eventEmitter.off('response', handler);
75
73
  };
76
- }, [])
74
+ }, []);
77
75
 
78
76
  const handleResend = async () => {
79
77
  const formData = new FormData();
@@ -112,29 +110,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
112
110
  setOtp(val);
113
111
  if (val.length === 6) {
114
112
  try {
115
- // const res = await Promise.race([
116
- // new Promise((resolve, reject) => {
117
- // setTimeout(() => {
118
- // reject(new Error('Timeout'));
119
- // }, 1000);
120
- // }),
121
- // new Promise((resolve, reject) => {
122
- // http({
123
- // ...config,
124
- // headers: {
125
- // ...http.defaults.headers.common,
126
- // 'sms-code': val,
127
- // 'sms-code-key': verifyCodeKey,
128
- // 'Content-Type': config.headers['Content-Type'],
129
- // }
130
- // }).then(res => {
131
- // console.log('VerifyHandler => then', response, resCode);
132
- // resolve(res);
133
- // }).catch(err => {
134
- // reject(err);
135
- // })
136
- // })
137
- // ]) as any;
138
113
  const res = await new Promise((resolve, reject) => {
139
114
  resolveRef.current = resolve;
140
115
  rejectRef.current = reject;
@@ -146,14 +121,8 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
146
121
  'sms-code-key': verifyCodeKey,
147
122
  'Content-Type': config.headers['Content-Type'],
148
123
  }
149
- }).then(res => {
150
- console.log('VerifyHandler => then', response, resCode);
151
- resolve(res);
152
- }).catch(err => {
153
- reject(err);
154
- })
124
+ });
155
125
  }) as any;
156
- console.log('res=====>', res);
157
126
  if (res?.code === 0 || res?.data?.status?.code === 0) {
158
127
  apiResolve(res);
159
128
  setVisible(false);
@@ -162,7 +131,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
162
131
  setOtp('');
163
132
  }
164
133
  } catch (error) {
165
- console.log('VerifyHandler => catch', response);
166
134
  console.warn('catch=>error', error);
167
135
  message.error(t('verifyFail', lang));
168
136
  setOtp('');
package/src/utils/type.ts CHANGED
@@ -24,7 +24,6 @@ export type VerifyModalConfig = {
24
24
  apiResolve?: any;
25
25
  apiPromiseToEmpty?: () => void;
26
26
  verifyPromise: {current: Promise<any> | null}
27
- response: any;
28
27
  }
29
28
 
30
29
  export type LoginModalConfig = {