slider-captcha-sdk 1.0.18 → 1.0.20

package/dist/index.esm.js

@@ -10,22 +10,22 @@ class PopupSliderCaptcha {
     sliderSize: 38,
     maxRetries: 3,
     timeout: 30000,
-    apiUrl: "/api/captcha",
-    verifyUrl: "/api/captcha/verify",
+    apiUrl: '/api/captcha',
+    verifyUrl: '/api/captcha/verify',
     throttleDelay: 16,
     clickMaskClose: false
   }
 
   static CSS_CLASSES = {
-    overlay: "slider-captcha-overlay",
-    modal: "slider-captcha-modal",
-    header: "slider-captcha-header",
-    container: "slider-captcha-container",
-    track: "slider-captcha-track",
-    btn: "slider-captcha-btn",
-    hint: "slider-captcha-hint",
-    loading: "slider-captcha-loading",
-    error: "slider-captcha-error"
+    overlay: 'slider-captcha-overlay',
+    modal: 'slider-captcha-modal',
+    header: 'slider-captcha-header',
+    container: 'slider-captcha-container',
+    track: 'slider-captcha-track',
+    btn: 'slider-captcha-btn',
+    hint: 'slider-captcha-hint',
+    loading: 'slider-captcha-loading',
+    error: 'slider-captcha-error'
   }
 
   // 优化：提取CSS样式为独立方法，减少主体代码长度
@@ -42,7 +42,6 @@ class PopupSliderCaptcha {
     THROTTLE_DELAY: 16
   }
 
-  // 优化：添加错误类型枚举
   static ERROR_TYPES = {
     NETWORK_ERROR: 'NETWORK_ERROR',
     TIMEOUT_ERROR: 'TIMEOUT_ERROR',
@@ -52,7 +51,6 @@ class PopupSliderCaptcha {
   }
 
   constructor(options = {}) {
-    // 优化：合并默认配置，使用常量
     this.options = {
       ...PopupSliderCaptcha.DEFAULTS,
       ...options,
@@ -61,7 +59,6 @@ class PopupSliderCaptcha {
       throttleDelay: options.throttleDelay || PopupSliderCaptcha.CONSTANTS.THROTTLE_DELAY
     };
 
-    // 优化：初始化所有属性
     this.elements = {};
     this.state = this.createInitialState();
     this.captchaData = null;
@@ -74,10 +71,8 @@ class PopupSliderCaptcha {
     this.imageCache = new Map();
     this.abortController = null;
 
-    // 优化：使用箭头函数绑定this，避免重复bind调用
     this.throttledHandleMove = this.throttle((e) => this.handleMove(e), this.options.throttleDelay);
 
-    // 优化：添加错误处理
     try {
       this.init();
     } catch (error) {
@@ -86,7 +81,6 @@ class PopupSliderCaptcha {
     }
   }
 
-  // 优化：提取初始状态创建为独立方法
   createInitialState() {
     return {
       isVisible: false,
@@ -105,15 +99,14 @@ class PopupSliderCaptcha {
   }
 
   injectStyles() {
-    if (document.querySelector("#slider-captcha-styles")) return
+    if (document.querySelector('#slider-captcha-styles')) { return }
 
-    const style = document.createElement("style");
-    style.id = "slider-captcha-styles";
+    const style = document.createElement('style');
+    style.id = 'slider-captcha-styles';
     style.textContent = PopupSliderCaptcha.getStyles();
     document.head.appendChild(style);
   }
 
-  // 优化：简化元素创建逻辑
   createElements() {
     const { elements, options } = this;
 
@@ -153,19 +146,18 @@ class PopupSliderCaptcha {
     this.setInitialState();
   }
 
-  createElement(tag, className = "", textContent = "") {
+  createElement(tag, className = '', textContent = '') {
     const element = document.createElement(tag);
-    if (className) element.className = className;
-    if (textContent) element.textContent = textContent;
+    if (className) { element.className = className; }
+    if (textContent) { element.textContent = textContent; }
     return element
   }
 
-  // 优化：简化DOM组装逻辑
   assembleDOM() {
     const { elements } = this;
 
     // 组装头部
-    const headerButtons = this.createElement("div", "slider-captcha-header-buttons");
+    const headerButtons = this.createElement('div', 'slider-captcha-header-buttons');
     headerButtons.append(elements.refreshBtn, elements.closeBtn);
     elements.header.append(elements.title, headerButtons);
 
@@ -179,19 +171,10 @@ class PopupSliderCaptcha {
 
     // 组装滑块轨道
     elements.btn.appendChild(elements.icon);
-    elements.track.append(
-      elements.fingerAnimation,
-      elements.btn,
-      elements.hint
-    );
+    elements.track.append(elements.fingerAnimation, elements.btn, elements.hint);
 
     // 组装模态框
-    elements.modal.append(
-      elements.header,
-      elements.container,
-      elements.track,
-      elements.error
-    );
+    elements.modal.append(elements.header, elements.container, elements.track, elements.error);
 
     // 组装到覆盖层
     elements.overlay.appendChild(elements.modal);
@@ -200,24 +183,23 @@ class PopupSliderCaptcha {
 
   setInitialState() {
     // 批量设置初始状态
-    Object.assign(this.elements.container.style, { display: "none" });
-    Object.assign(this.elements.track.style, { display: "none" });
+    Object.assign(this.elements.container.style, { display: 'none' });
+    Object.assign(this.elements.track.style, { display: 'none' });
   }
 
-  // 优化：简化事件绑定
   bindEvents() {
     const { elements } = this;
 
     // 基础事件
-    this.addEventListener(elements.closeBtn, "click", () => this.hide());
-    this.addEventListener(elements.refreshBtn, "click", () => this.refresh());
-    this.addEventListener(elements.overlay, "click", (e) => {
-      if (e.target === elements.overlay && this.options.clickMaskClose) this.hide();
+    this.addEventListener(elements.closeBtn, 'click', () => this.hide());
+    this.addEventListener(elements.refreshBtn, 'click', () => this.refresh());
+    this.addEventListener(elements.overlay, 'click', (e) => {
+      if (e.target === elements.overlay && this.options.clickMaskClose) { this.hide(); }
     });
-    this.addEventListener(document, "keydown", (e) => {
-      if (e.key === "Escape" && this.state.isVisible) this.hide();
+    this.addEventListener(document, 'keydown', (e) => {
+      if (e.key === 'Escape' && this.state.isVisible) { this.hide(); }
     });
-    this.addEventListener(document, "visibilitychange", () => this.handleVisibilityChange());
+    this.addEventListener(document, 'visibilitychange', () => this.handleVisibilityChange());
 
     this.bindSliderEvents();
   }
@@ -231,19 +213,18 @@ class PopupSliderCaptcha {
     };
 
     // 滑块事件
-    this.addEventListener(elements.btn, "mousedown", handlers.start);
-    this.addEventListener(elements.btn, "touchstart", handlers.start);
-    this.addEventListener(elements.sliderImg, "mousedown", handlers.start);
-    this.addEventListener(elements.sliderImg, "touchstart", handlers.start);
-    this.addEventListener(document, "mousemove", handlers.move, { passive: false });
-    this.addEventListener(document, "touchmove", handlers.move, { passive: false });
-    this.addEventListener(document, "mouseup", handlers.end);
-    this.addEventListener(document, "touchend", handlers.end);
+    this.addEventListener(elements.btn, 'mousedown', handlers.start);
+    this.addEventListener(elements.btn, 'touchstart', handlers.start);
+    this.addEventListener(elements.sliderImg, 'mousedown', handlers.start);
+    this.addEventListener(elements.sliderImg, 'touchstart', handlers.start);
+    this.addEventListener(document, 'mousemove', handlers.move, { passive: false });
+    this.addEventListener(document, 'touchmove', handlers.move, { passive: false });
+    this.addEventListener(document, 'mouseup', handlers.end);
+    this.addEventListener(document, 'touchend', handlers.end);
   }
 
-  // 优化：改进事件管理
   addEventListener(element, event, handler, options = {}) {
-    if (!element || typeof handler !== 'function') return
+    if (!element || typeof handler !== 'function') { return }
 
     element.addEventListener(event, handler, options);
     this.eventListeners.push({ element, event, handler, options });
@@ -260,7 +241,6 @@ class PopupSliderCaptcha {
     this.eventListeners.length = 0;
   }
 
-  // 优化：缓存尺寸计算
   getDimensions() {
     if (!this.cachedDimensions) {
       const trackWidth = this.elements.track.offsetWidth;
@@ -280,9 +260,8 @@ class PopupSliderCaptcha {
     return Math.round(percentage * (this.options.width - this.options.sliderSize))
   }
 
-  // 优化：简化拖拽处理
   handleStart(e) {
-    if (!this.captchaData || this.state.isDragging || this.state.isLoading) return
+    if (!this.captchaData || this.state.isDragging || this.state.isLoading) { return }
 
     e.preventDefault();
     this.state.isDragging = true;
@@ -291,12 +270,12 @@ class PopupSliderCaptcha {
     this.times = [{ time: Date.now(), position: this.getPosition() }];
 
     this.setTransition(false);
-    this.updateUIState("dragging");
+    this.updateUIState('dragging');
     this.cachedDimensions = null; // 清除缓存
   }
 
   handleMove(e) {
-    if (!this.state.isDragging) return
+    if (!this.state.isDragging) { return }
     e.preventDefault();
 
     const clientX = this.getClientX(e);
@@ -307,12 +286,14 @@ class PopupSliderCaptcha {
     this.times.push({ time: Date.now(), position: this.getPosition() });
 
     // 优化：使用RAF批量更新
-    this.rafId && cancelAnimationFrame(this.rafId);
+    if (this.rafId) {
+      cancelAnimationFrame(this.rafId);
+    }
     this.rafId = requestAnimationFrame(() => this.updateSliderPosition());
   }
 
   handleEnd() {
-    if (!this.state.isDragging) return
+    if (!this.state.isDragging) { return }
 
     this.times.push({ time: Date.now(), position: this.getPosition() });
     this.state.isDragging = false;
@@ -333,11 +314,11 @@ class PopupSliderCaptcha {
   }
 
   getClientX(e) {
-    return e.type.includes("touch") ? e.touches[0].clientX : e.clientX
+    return e.type.includes('touch') ? e.touches[0].clientX : e.clientX
   }
 
   setTransition(enabled) {
-    const transition = enabled ? "all 0.3s ease" : "none";
+    const transition = enabled ? 'all 0.3s ease' : 'none';
     requestAnimationFrame(() => {
       this.elements.btn.style.transition = transition;
       this.elements.sliderImg.style.transition = transition;
@@ -349,38 +330,38 @@ class PopupSliderCaptcha {
     const { elements } = this;
     const updates = {
       dragging: () => {
-        elements.hint.style.opacity = "0";
-        elements.fingerAnimation.style.display = "none";
+        elements.hint.style.opacity = '0';
+        elements.fingerAnimation.style.display = 'none';
       },
       success: () => {
-        Object.assign(elements.btn.style, { background: "var(--sc-success)" });
-        Object.assign(elements.icon.style, { innerHTML: "✓", color: "white" });
-        elements.icon.innerHTML = "✓";
+        Object.assign(elements.btn.style, { background: 'var(--sc-success)' });
+        Object.assign(elements.icon.style, { innerHTML: '✓', color: 'white' });
+        elements.icon.innerHTML = '✓';
       },
       fail: () => {
-        Object.assign(elements.btn.style, { background: "var(--sc-danger)" });
-        Object.assign(elements.icon.style, { innerHTML: "✗", color: "white" });
-        elements.icon.innerHTML = "✗";
+        Object.assign(elements.btn.style, { background: 'var(--sc-danger)' });
+        Object.assign(elements.icon.style, { innerHTML: '✗', color: 'white' });
+        elements.icon.innerHTML = '✗';
       },
       reset: () => {
-        Object.assign(elements.btn.style, { background: "white" });
-        Object.assign(elements.icon.style, { color: "#666" });
-        elements.icon.innerHTML = "→";
-        elements.fingerAnimation.style.display = "block";
-        this.updateHintText("向右滑动完成验证", "var(--sc-text-light)");
+        Object.assign(elements.btn.style, { background: 'white' });
+        Object.assign(elements.icon.style, { color: '#666' });
+        elements.icon.innerHTML = '→';
+        elements.fingerAnimation.style.display = 'block';
+        this.updateHintText('向右滑动完成验证', 'var(--sc-text-light)');
       },
       loading: () => {
-        elements.hint.style.opacity = "0";
-        elements.fingerAnimation.style.display = "none";
-        Object.assign(elements.track.style, { pointerEvents: "none", opacity: "0.6" });
+        elements.hint.style.opacity = '0';
+        elements.fingerAnimation.style.display = 'none';
+        Object.assign(elements.track.style, { pointerEvents: 'none', opacity: '0.6' });
       }
     };
 
     if (updates[state]) {
       requestAnimationFrame(() => {
         updates[state]();
-        if (state !== "loading") {
-          Object.assign(elements.track.style, { pointerEvents: "auto", opacity: "1" });
+        if (state !== 'loading') {
+          Object.assign(elements.track.style, { pointerEvents: 'auto', opacity: '1' });
         }
       });
     }
@@ -389,7 +370,7 @@ class PopupSliderCaptcha {
   updateHintText(text, color) {
     requestAnimationFrame(() => {
       Object.assign(this.elements.hint, { textContent: text });
-      Object.assign(this.elements.hint.style, { color, opacity: "1" });
+      Object.assign(this.elements.hint.style, { color, opacity: '1' });
     });
   }
 
@@ -402,18 +383,18 @@ class PopupSliderCaptcha {
     requestAnimationFrame(() => {
       elements.btn.style.transform = `translateX(${state.currentX}px)`;
       elements.sliderImg.style.transform = `translateX(${pieceX}px)`;
-      elements.fingerAnimation.style.opacity = progress >= 0.8 ? "0" : "0.6";
+      elements.fingerAnimation.style.opacity = progress >= 0.8 ? '0' : '0.6';
     });
   }
 
   // 优化：简化显示/隐藏逻辑
   show() {
     this.state.isVisible = true;
-    this.elements.overlay.style.display = "flex";
+    this.elements.overlay.style.display = 'flex';
 
     requestAnimationFrame(() => {
-      this.elements.overlay.classList.add("show");
-      this.elements.modal.classList.add("show");
+      this.elements.overlay.classList.add('show');
+      this.elements.modal.classList.add('show');
     });
 
     this.loadCaptcha();
@@ -421,11 +402,11 @@ class PopupSliderCaptcha {
 
   hide() {
     this.state.isVisible = false;
-    this.elements.overlay.classList.remove("show");
-    this.elements.modal.classList.remove("show");
+    this.elements.overlay.classList.remove('show');
+    this.elements.modal.classList.remove('show');
 
     this.safeSetTimeout(() => {
-      this.elements.overlay.style.display = "none";
+      this.elements.overlay.style.display = 'none';
       document.body.removeChild(this.elements.overlay);
       this.reset();
       this.options.onClose?.();
@@ -471,9 +452,9 @@ class PopupSliderCaptcha {
       this.abortController = new AbortController();
 
       const response = await fetch(this.options.apiUrl, {
-        method: "POST",
+        method: 'POST',
         headers: {
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json',
           ...this.options.headers
         },
         body: JSON.stringify({
@@ -491,7 +472,7 @@ class PopupSliderCaptcha {
 
       // 优化：更严格的数据验证
       if (!this.validateCaptchaData(data)) {
-        throw new Error("验证码数据格式错误")
+        throw new Error('验证码数据格式错误')
       }
 
       this.captchaData = data.data;
@@ -500,7 +481,10 @@ class PopupSliderCaptcha {
     } catch (error) {
       if (error.name === 'AbortError') {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.TIMEOUT_ERROR, '请求被取消');
-      } else if (error.message.includes('Failed to fetch') || error.message.includes('NetworkError')) {
+      } else if (
+        error.message.includes('Failed to fetch') ||
+        error.message.includes('NetworkError')
+      ) {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.NETWORK_ERROR, '网络连接失败');
       } else {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.CAPTCHA_DATA_ERROR, error.message, error);
@@ -510,12 +494,21 @@ class PopupSliderCaptcha {
 
   // 优化：添加验证码数据验证方法
   validateCaptchaData(data) {
-    if (!data || typeof data !== 'object') return false
-
-    const requiredFields = ['canvasSrc', 'blockSrc', 'canvasWidth', 'canvasHeight', 'blockWidth', 'blockHeight', 'blockY', 'nonceStr'];
+    if (!data || typeof data !== 'object') { return false }
+
+    const requiredFields = [
+      'canvasSrc',
+      'blockSrc',
+      'canvasWidth',
+      'canvasHeight',
+      'blockWidth',
+      'blockHeight',
+      'blockY',
+      'nonceStr'
+    ];
     const dataObj = data.data || data;
 
-    return requiredFields.every(field => {
+    return requiredFields.every((field) => {
       const value = dataObj[field];
       return value !== null && value !== undefined && value !== ''
     })
@@ -525,6 +518,22 @@ class PopupSliderCaptcha {
     return new Promise((resolve, reject) => {
       let hasError = false;
 
+      // const _onLoad = () => {
+      //   if (hasError) { return }
+      //   loadedCount++
+      //   if (loadedCount === 2) {
+      //     this.hideLoading()
+      //     resolve()
+      //   }
+      // }
+      //
+      // const _onError = (error) => {
+      //   if (hasError) { return }
+      //   hasError = true
+      //   this.handleError(PopupSliderCaptcha.ERROR_TYPES.IMAGE_LOAD_ERROR, '图片加载失败', error)
+      //   reject(new Error('图片加载失败'))
+      // }
+
       // 优化：并行加载图片，提高性能
       const loadPromises = [
         this.loadImageAsync(this.elements.backgroundImg, this.captchaData.canvasSrc, {
@@ -571,16 +580,16 @@ class PopupSliderCaptcha {
         reject(new Error('图片加载超时'));
       }, 10000); // 10秒超时
 
-      imgElement.onload = () => {
+      imgElement.onload = function onImageLoad() {
         this.safeClearTimeout(timeoutId);
         this.imageCache.set(src, imgElement.cloneNode());
         resolve();
-      };
+      }.bind(this);
 
-      imgElement.onerror = (error) => {
+      imgElement.onerror = function onImageError(error) {
         this.safeClearTimeout(timeoutId);
         reject(error);
-      };
+      }.bind(this);
 
       imgElement.src = src;
       this.applyStyles(imgElement, styles);
@@ -590,7 +599,7 @@ class PopupSliderCaptcha {
   // 优化：提取样式应用逻辑
   applyStyles(element, styles) {
     Object.entries(styles).forEach(([key, value]) => {
-      element.style[key] = typeof value === "number" ? value + "px" : value;
+      element.style[key] = typeof value === 'number' ? `${value}px` : value;
     });
   }
 
@@ -598,31 +607,31 @@ class PopupSliderCaptcha {
   showLoading() {
     this.state.isLoading = true;
     this.batchUpdateStyles({
-      container: { display: "block" },
-      loadingText: { display: "flex" },
-      error: { display: "none" }
+      container: { display: 'block' },
+      loadingText: { display: 'flex' },
+      error: { display: 'none' }
     });
-    this.updateUIState("loading");
+    this.updateUIState('loading');
   }
 
   hideLoading() {
     this.state.isLoading = false;
-    this.batchUpdateStyles({ loadingText: { display: "none" } });
-    this.updateUIState("reset");
+    this.batchUpdateStyles({ loadingText: { display: 'none' } });
+    this.updateUIState('reset');
   }
 
   showCaptcha() {
     this.batchUpdateStyles({
-      container: { display: "block" },
-      track: { display: "block" },
-      error: { display: "none" }
+      container: { display: 'block' },
+      track: { display: 'block' },
+      error: { display: 'none' }
     });
   }
 
   showError(message) {
     this.hideLoading();
     this.batchUpdateStyles({
-      error: { display: "block", textContent: message }
+      error: { display: 'block', textContent: message }
     });
   }
 
@@ -646,7 +655,7 @@ class PopupSliderCaptcha {
 
   async verify() {
     if (!this.captchaData) {
-      this.onVerifyFail("验证码数据丢失");
+      this.onVerifyFail('验证码数据丢失');
       return
     }
 
@@ -658,9 +667,9 @@ class PopupSliderCaptcha {
       this.abortController = new AbortController();
 
       const response = await fetch(this.options.verifyUrl, {
-        method: "POST",
+        method: 'POST',
         headers: {
-          "Content-Type": "application/json",
+          'Content-Type': 'application/json',
           ...this.options.headers
         },
         body: JSON.stringify({
@@ -684,12 +693,15 @@ class PopupSliderCaptcha {
       if (this.isVerifySuccess(data)) {
         this.onVerifySuccess(data.data || data.result);
       } else {
-        this.onVerifyFail(data.message || data.msg || "验证失败，请重试！");
+        this.onVerifyFail(data.message || data.msg || '验证失败，请重试！');
       }
     } catch (error) {
       if (error.name === 'AbortError') {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.TIMEOUT_ERROR, '验证请求被取消');
-      } else if (error.message.includes('Failed to fetch') || error.message.includes('NetworkError')) {
+      } else if (
+        error.message.includes('Failed to fetch') ||
+        error.message.includes('NetworkError')
+      ) {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.NETWORK_ERROR, '网络连接失败');
       } else {
         this.handleError(PopupSliderCaptcha.ERROR_TYPES.VALIDATION_ERROR, error.message, error);
@@ -699,30 +711,32 @@ class PopupSliderCaptcha {
 
   // 优化：添加验证成功判断方法
   isVerifySuccess(data) {
-    if (!data || typeof data !== 'object') return false
+    if (!data || typeof data !== 'object') { return false }
 
     // 支持多种成功标识
     const successIndicators = [
-      data.code === "0",
+      data.code === '0',
       data.code === 0,
       data.success === true,
       data.status === 'success',
       data.result === true
     ];
 
-    return successIndicators.some(indicator => indicator === true)
+    return successIndicators.some((indicator) => indicator === true)
   }
 
   onVerifySuccess(ticket) {
-    const duration = this.dragStartTime ? Date.now() - this.dragStartTime : (Date.now() - this.startTime);
+    const duration = this.dragStartTime ?
+      Date.now() - this.dragStartTime :
+      Date.now() - this.startTime;
     const durationText = `验证成功！耗时：${(duration / 1000).toFixed(2)}s`;
 
-    this.updateUIState("success");
-    this.showFloatingTime(durationText, "success");
+    this.updateUIState('success');
+    this.showFloatingTime(durationText, 'success');
 
     this.safeSetTimeout(() => {
       this.options.onSuccess?.({
-        ticket: ticket,
+        ticket,
         timestamp: Date.now(),
         duration
       });
@@ -730,21 +744,21 @@ class PopupSliderCaptcha {
     }, 2000);
   }
 
-  showFloatingTime(text, type = "success") {
+  showFloatingTime(text, type = 'success') {
     const { elements } = this;
     elements.floatingTime.textContent = text;
     elements.floatingTime.className = `slider-captcha-floating-time ${type}`;
 
-    this.safeSetTimeout(() => elements.floatingTime.classList.add("show"), 100);
+    this.safeSetTimeout(() => elements.floatingTime.classList.add('show'), 100);
     this.safeSetTimeout(() => {
-      elements.floatingTime.className = "slider-captcha-floating-time";
+      elements.floatingTime.className = 'slider-captcha-floating-time';
     }, 2500); // 优化：延长显示时间，避免被reset清除
   }
 
   onVerifyFail(message) {
     this.state.retryCount++;
-    this.updateUIState("fail");
-    this.showFloatingTime(message, "fail");
+    this.updateUIState('fail');
+    this.showFloatingTime(message, 'fail');
 
     this.safeSetTimeout(() => {
       if (this.state.retryCount >= this.options.maxRetries) {
@@ -774,10 +788,10 @@ class PopupSliderCaptcha {
     // 重置UI
     requestAnimationFrame(() => {
       this.setTransition(true);
-      this.elements.btn.style.transform = "translateX(0px)";
-      this.elements.sliderImg.style.transform = "translateX(0px)";
-      this.updateUIState("reset");
-      this.elements.error.style.display = "none";
+      this.elements.btn.style.transform = 'translateX(0px)';
+      this.elements.sliderImg.style.transform = 'translateX(0px)';
+      this.updateUIState('reset');
+      this.elements.error.style.display = 'none';
     });
   }
 
@@ -805,7 +819,7 @@ class PopupSliderCaptcha {
   }
 
   clearAllTimers() {
-    this.timers.forEach(timer => {
+    this.timers.forEach((timer) => {
       clearTimeout(timer);
       clearInterval(timer);
     });
@@ -835,13 +849,15 @@ class PopupSliderCaptcha {
   // 工具函数：节流
   throttle(func, delay) {
     let lastCall = 0;
-    return function (...args) {
+    const throttledFunction = (...args) => {
       const now = Date.now();
       if (now - lastCall >= delay) {
         lastCall = now;
         return func.apply(this, args)
       }
-    }
+      return undefined
+    };
+    return throttledFunction
   }
 
   destroy() {
@@ -854,8 +870,8 @@ class PopupSliderCaptcha {
 
       // 恢复body样式
       if (document.body) {
-        document.body.style.userSelect = "";
-        document.body.style.cursor = "";
+        document.body.style.userSelect = '';
+        document.body.style.cursor = '';
       }
 
       // 清理所有定时器
@@ -883,7 +899,7 @@ class PopupSliderCaptcha {
       this.cachedDimensions = null;
 
       // 清空所有属性
-      Object.keys(this).forEach(key => {
+      Object.keys(this).forEach((key) => {
         if (key !== 'constructor') {
           this[key] = null;
         }
@@ -910,12 +926,12 @@ class PopupSliderCaptcha {
 }
 
 // 模块导出
-if (typeof module !== "undefined" && module.exports) {
+if (typeof module !== 'undefined' && module.exports) {
   module.exports = PopupSliderCaptcha;
   module.exports.default = PopupSliderCaptcha;
-} else if (typeof define === "function" && define.amd) {
+} else if (typeof define === 'function' && define.amd) {
   define([], () => PopupSliderCaptcha);
-} else if (typeof window !== "undefined") {
+} else if (typeof window !== 'undefined') {
   window.PopupSliderCaptcha = PopupSliderCaptcha;
   window.SliderCaptcha = PopupSliderCaptcha;
 }
@@ -928,14 +944,12 @@ var PopupSliderCaptcha$1 = PopupSliderCaptcha;
  * 提供密码加密和校验功能
  */
 class PasswordValidator {
-  // 优化：添加常量定义
   static CONSTANTS = {
     DEFAULT_TIMEOUT: 10000,
     CACHE_DURATION: 5 * 60 * 1000, // 5分钟缓存
     MIN_PASSWORD_LENGTH: 1
   }
 
-  // 优化：添加错误类型枚举
   static ERROR_TYPES = {
     NETWORK_ERROR: 'NETWORK_ERROR',
     TIMEOUT_ERROR: 'TIMEOUT_ERROR',
@@ -945,7 +959,6 @@ class PasswordValidator {
   }
 
   constructor(options = {}) {
-    // 优化：合并配置，使用常量
     this.options = {
       publicKeyUrl: options.publicKeyUrl || '/microservice/strongPassword/getPublicKey',
       validateUrl: options.validateUrl || '/microservice/strongPassword/checkPassword',
@@ -958,7 +971,6 @@ class PasswordValidator {
     // 缓存公钥，避免重复请求
     this.publicKeyCache = null;
     this.publicKeyExpiry = null;
-    this.abortController = null;
   }
 
   /**
@@ -972,25 +984,18 @@ class PasswordValidator {
     }
 
     try {
-      // 取消之前的请求
-      if (this.abortController) {
-        this.abortController.abort();
-      }
-      this.abortController = new AbortController();
-
       const response = await this.makeRequest(this.options.publicKeyUrl, {
-        method: 'GET',
-        signal: this.abortController.signal
+        method: 'GET'
       });
 
       if (!this.isSuccessResponse(response)) {
-        throw new Error('获取公钥失败：' + (response.message || response.msg || '未知错误'))
+        throw new Error(`获取公钥失败：${response.message || response.msg || '未知错误'}`)
       }
 
       // 验证公钥格式
       const publicKey = response.data || response.result;
-      if (!this.validatePublicKey(publicKey)) {
-        throw new Error('公钥格式无效')
+      if (!publicKey) {
+        throw new Error('公钥为空')
       }
 
       // 缓存公钥
@@ -1001,13 +1006,15 @@ class PasswordValidator {
     } catch (error) {
       console.error('获取公钥失败:', error);
       this.handleError(PasswordValidator.ERROR_TYPES.PUBLIC_KEY_ERROR, error.message, error);
-      throw new Error('获取公钥失败: ' + error.message)
+      throw new Error(`获取公钥失败: ${error.message}`)
     }
   }
 
   // 优化：添加响应成功判断方法
   isSuccessResponse(response) {
-    if (!response || typeof response !== 'object') return false
+    if (!response || typeof response !== 'object') {
+      return false
+    }
 
     const successIndicators = [
       response.code === '0',
@@ -1017,18 +1024,9 @@ class PasswordValidator {
       response.result === true
     ];
 
-    return successIndicators.some(indicator => indicator === true)
-  }
-
-  // 优化：添加公钥验证方法
-  validatePublicKey(publicKey) {
-    if (!publicKey || typeof publicKey !== 'string') return false
-
-    // 基本的RSA公钥格式检查
-    return true
+    return successIndicators.some((indicator) => indicator === true)
   }
 
-  // 优化：添加统一错误处理方法
   handleError(errorType, message, originalError = null) {
     const errorMessages = {
       [PasswordValidator.ERROR_TYPES.NETWORK_ERROR]: '网络连接失败，请检查网络设置',
@@ -1060,7 +1058,6 @@ class PasswordValidator {
    */
   encryptPassword(password, publicKey) {
     try {
-      // 优化：输入验证
       if (!password) {
         throw new Error('密码不能为空')
       }
@@ -1073,7 +1070,6 @@ class PasswordValidator {
         throw new Error('公钥不能为空')
       }
 
-      // 使用导入的JSEncrypt进行RSA加密
       if (typeof JSEncrypt === 'undefined') {
         throw new Error('JSEncrypt库未正确加载，请确保已引入JSEncrypt库')
       }
@@ -1090,7 +1086,7 @@ class PasswordValidator {
     } catch (error) {
       console.error('密码加密失败:', error);
       this.handleError(PasswordValidator.ERROR_TYPES.ENCRYPTION_ERROR, error.message, error);
-      throw new Error('密码加密失败: ' + error.message)
+      throw new Error(`密码加密失败: ${error.message}`)
     }
   }
 
@@ -1103,13 +1099,8 @@ class PasswordValidator {
    */
   async validatePassword(password, userName, additionalData = {}) {
     try {
-      // 优化：输入验证
-      if (!password ) {
-        throw new Error('密码不能为空')
-      }
-
-      if (!userName) {
-        throw new Error('用户名不能为空')
+      if (!password || !userName) {
+        throw new Error('用户名密码不能为空')
       }
 
       // 1. 获取公钥
@@ -1122,14 +1113,13 @@ class PasswordValidator {
       const response = await this.makeRequest(this.options.validateUrl, {
         method: 'POST',
         body: JSON.stringify({
-          userName: userName,
+          userName,
           password: encryptedPassword,
           timestamp: Date.now(),
           ...additionalData
         })
       });
 
-      // 优化：统一返回格式
       return {
         success: this.isSuccessResponse(response),
         data: response.data || response.result,
@@ -1156,7 +1146,7 @@ class PasswordValidator {
         success: false,
         message: error.message || '密码校验失败',
         code: errorType,
-        error: error
+        error
       }
     }
   }
@@ -1168,14 +1158,11 @@ class PasswordValidator {
    * @returns {Promise<Object>} 响应结果
    */
   async makeRequest(url, options = {}) {
-    // 优化：使用实例的abortController
-    if (this.abortController) {
-      this.abortController.abort();
-    }
-    this.abortController = new AbortController();
+    // 优化：为每个请求创建独立的AbortController，避免多个请求互相取消
+    const abortController = new AbortController();
 
     const timeoutId = setTimeout(() => {
-      this.abortController.abort();
+      abortController.abort();
     }, this.options.timeout);
 
     try {
@@ -1186,7 +1173,7 @@ class PasswordValidator {
           ...this.options.headers,
           ...options.headers
         },
-        signal: this.abortController.signal
+        signal: abortController.signal
       });
 
       clearTimeout(timeoutId);
@@ -1238,31 +1225,13 @@ class PasswordValidator {
     this.clearCache();
   }
 
-  /**
-   * 取消当前请求
-   */
-  cancelRequest() {
-    if (this.abortController) {
-      this.abortController.abort();
-      this.abortController = null;
-    }
-  }
-
-  /**
-   * 检查是否正在请求中
-   * @returns {boolean} 是否正在请求
-   */
-  isRequesting() {
-    return this.abortController && !this.abortController.signal.aborted
-  }
-
   /**
    * 获取缓存状态
    * @returns {Object} 缓存状态信息
    */
   getCacheStatus() {
     return {
-      hasCache: !!this.publicKeyCache,
+      hasCache: Boolean(this.publicKeyCache),
       isExpired: this.publicKeyExpiry ? Date.now() > this.publicKeyExpiry : true,
       expiryTime: this.publicKeyExpiry,
       remainingTime: this.publicKeyExpiry ? Math.max(0, this.publicKeyExpiry - Date.now()) : 0
@@ -1274,9 +1243,6 @@ class PasswordValidator {
    */
   destroy() {
     try {
-      // 取消所有进行中的请求
-      this.cancelRequest();
-
       // 清除缓存
       this.clearCache();
 
@@ -1305,15 +1271,14 @@ function createPasswordValidator(options) {
 /**
  * 快速校验密码的便捷函数
  * @param {string} password 密码
+ * @param {string} userName 用户名
  * @param {Object} options 配置选项
  * @param {Object} additionalData 额外数据
  * @returns {Promise<Object>} 校验结果
  */
-async function validatePassword(password, options = {}, additionalData = {}) {
+function validatePassword(password, userName, options = {}, additionalData = {}) {
   const validator = new PasswordValidator(options);
-  // 修复：添加userName参数，可以从additionalData中提取或设为空字符串
-  const userName = additionalData.userName || '';
-  return await validator.validatePassword(password, userName, additionalData)
+  return validator.validatePassword(password, userName, additionalData)
 }
 
 // 导入滑块验证码组件（使用默认导入）