@captchafox/react 1.7.0 → 1.9.0

package/dist/index.cjs

@@ -134,6 +134,8 @@ var CaptchaFox = (0, import_react.forwardRef)(
     const firstRendered = (0, import_react.useRef)(false);
     const onReady = (0, import_react.useRef)();
     const executeTimeout = (0, import_react.useRef)();
+    const scriptErrorListener = (0, import_react.useRef)();
+    const hasScriptError = (0, import_react.useRef)(false);
     (0, import_react.useImperativeHandle)(
       ref,
       () => {
@@ -160,12 +162,21 @@ var CaptchaFox = (0, import_react.forwardRef)(
             setWidgetId(void 0);
             window.captchafox.remove(widgetId);
           },
-          execute: () => {
+          execute: () => __async(void 0, null, function* () {
+            if (hasScriptError.current) {
+              return Promise.reject(new RetryError());
+            }
             if (!isApiReady() || !widgetId) {
               return waitAndExecute();
             }
-            return window.captchafox.execute(widgetId);
-          }
+            try {
+              const token = yield window.captchafox.execute(widgetId);
+              return token;
+            } catch (error) {
+              const errorType = getErrorType(error);
+              return Promise.reject(errorType);
+            }
+          })
         };
       },
       [widgetId]
@@ -176,7 +187,9 @@ var CaptchaFox = (0, import_react.forwardRef)(
       }
     }, [widgetId]);
     (0, import_react.useEffect)(() => {
-      return () => clearTimeout(executeTimeout.current);
+      return () => {
+        clearEvents();
+      };
     }, []);
     (0, import_react.useEffect)(() => {
       if (!containerRef) return;
@@ -191,22 +204,41 @@ var CaptchaFox = (0, import_react.forwardRef)(
             yield renderCaptcha();
           }
         })).catch((err) => {
+          var _a;
           onError == null ? void 0 : onError(err);
+          hasScriptError.current = true;
+          (_a = scriptErrorListener.current) == null ? void 0 : _a.call(scriptErrorListener);
           console.error("[CaptchaFox] Could not load script:", err);
         });
       }
     }, [containerRef, sitekey, lang, mode]);
+    const clearEvents = () => {
+      clearTimeout(executeTimeout.current);
+    };
     const waitAndExecute = () => {
       return new Promise((resolve, reject) => {
+        scriptErrorListener.current = () => {
+          clearEvents();
+          reject(new RetryError());
+        };
         executeTimeout.current = setTimeout(() => {
           reject(new TimeoutError("Execute timed out"));
         }, executeTimeoutSeconds * 1e3);
         onReady.current = (id) => {
-          clearTimeout(executeTimeout.current);
-          window.captchafox.execute(id).then(resolve).catch(reject);
+          clearEvents();
+          window.captchafox.execute(id).then(resolve).catch((error) => {
+            const errorType = getErrorType(error);
+            reject(errorType);
+          });
         };
       });
     };
+    const getErrorType = (error) => {
+      if (error !== "challenge-aborted" && error !== "rate-limited") {
+        return new RetryError();
+      }
+      return error;
+    };
     const renderCaptcha = () => __async(void 0, null, function* () {
       var _a, _b, _c;
       (_a = window.captchafox) == null ? void 0 : _a.remove(widgetId);

package/dist/index.js

@@ -96,6 +96,8 @@ var CaptchaFox = forwardRef(
     const firstRendered = useRef(false);
     const onReady = useRef();
     const executeTimeout = useRef();
+    const scriptErrorListener = useRef();
+    const hasScriptError = useRef(false);
     useImperativeHandle(
       ref,
       () => {
@@ -122,12 +124,21 @@ var CaptchaFox = forwardRef(
             setWidgetId(void 0);
             window.captchafox.remove(widgetId);
           },
-          execute: () => {
+          execute: () => __async(void 0, null, function* () {
+            if (hasScriptError.current) {
+              return Promise.reject(new RetryError());
+            }
             if (!isApiReady() || !widgetId) {
               return waitAndExecute();
             }
-            return window.captchafox.execute(widgetId);
-          }
+            try {
+              const token = yield window.captchafox.execute(widgetId);
+              return token;
+            } catch (error) {
+              const errorType = getErrorType(error);
+              return Promise.reject(errorType);
+            }
+          })
         };
       },
       [widgetId]
@@ -138,7 +149,9 @@ var CaptchaFox = forwardRef(
       }
     }, [widgetId]);
     useEffect(() => {
-      return () => clearTimeout(executeTimeout.current);
+      return () => {
+        clearEvents();
+      };
     }, []);
     useEffect(() => {
       if (!containerRef) return;
@@ -153,22 +166,41 @@ var CaptchaFox = forwardRef(
             yield renderCaptcha();
           }
         })).catch((err) => {
+          var _a;
           onError == null ? void 0 : onError(err);
+          hasScriptError.current = true;
+          (_a = scriptErrorListener.current) == null ? void 0 : _a.call(scriptErrorListener);
           console.error("[CaptchaFox] Could not load script:", err);
         });
       }
     }, [containerRef, sitekey, lang, mode]);
+    const clearEvents = () => {
+      clearTimeout(executeTimeout.current);
+    };
     const waitAndExecute = () => {
       return new Promise((resolve, reject) => {
+        scriptErrorListener.current = () => {
+          clearEvents();
+          reject(new RetryError());
+        };
         executeTimeout.current = setTimeout(() => {
           reject(new TimeoutError("Execute timed out"));
         }, executeTimeoutSeconds * 1e3);
         onReady.current = (id) => {
-          clearTimeout(executeTimeout.current);
-          window.captchafox.execute(id).then(resolve).catch(reject);
+          clearEvents();
+          window.captchafox.execute(id).then(resolve).catch((error) => {
+            const errorType = getErrorType(error);
+            reject(errorType);
+          });
         };
       });
     };
+    const getErrorType = (error) => {
+      if (error !== "challenge-aborted" && error !== "rate-limited") {
+        return new RetryError();
+      }
+      return error;
+    };
     const renderCaptcha = () => __async(void 0, null, function* () {
       var _a, _b, _c;
       (_a = window.captchafox) == null ? void 0 : _a.remove(widgetId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@captchafox/react",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",