@captchafox/react 1.8.0 → 1.10.0

package/dist/index.cjs

@@ -127,13 +127,17 @@ var CaptchaFox = (0, import_react.forwardRef)(
     onVerify,
     onLoad,
     onFail,
-    onClose
+    onClose,
+    onChallengeChange,
+    onChallengeOpen
   }, ref) => {
     const [containerRef, setContainerRef] = (0, import_react.useState)();
     const [widgetId, setWidgetId] = (0, import_react.useState)();
     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,
       () => {
@@ -161,6 +165,9 @@ var CaptchaFox = (0, import_react.forwardRef)(
             window.captchafox.remove(widgetId);
           },
           execute: () => __async(void 0, null, function* () {
+            if (hasScriptError.current) {
+              return Promise.reject(new RetryError());
+            }
             if (!isApiReady() || !widgetId) {
               return waitAndExecute();
             }
@@ -182,7 +189,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;
@@ -197,18 +206,28 @@ 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);
+          clearEvents();
           window.captchafox.execute(id).then(resolve).catch((error) => {
             const errorType = getErrorType(error);
             reject(errorType);
@@ -235,7 +254,9 @@ var CaptchaFox = (0, import_react.forwardRef)(
         onError,
         onFail,
         onClose,
-        onVerify
+        onVerify,
+        onChallengeChange,
+        onChallengeOpen
       });
       if (!newWidgetId) {
         return;

package/dist/index.js

@@ -89,13 +89,17 @@ var CaptchaFox = forwardRef(
     onVerify,
     onLoad,
     onFail,
-    onClose
+    onClose,
+    onChallengeChange,
+    onChallengeOpen
   }, ref) => {
     const [containerRef, setContainerRef] = useState();
     const [widgetId, setWidgetId] = useState();
     const firstRendered = useRef(false);
     const onReady = useRef();
     const executeTimeout = useRef();
+    const scriptErrorListener = useRef();
+    const hasScriptError = useRef(false);
     useImperativeHandle(
       ref,
       () => {
@@ -123,6 +127,9 @@ var CaptchaFox = forwardRef(
             window.captchafox.remove(widgetId);
           },
           execute: () => __async(void 0, null, function* () {
+            if (hasScriptError.current) {
+              return Promise.reject(new RetryError());
+            }
             if (!isApiReady() || !widgetId) {
               return waitAndExecute();
             }
@@ -144,7 +151,9 @@ var CaptchaFox = forwardRef(
       }
     }, [widgetId]);
     useEffect(() => {
-      return () => clearTimeout(executeTimeout.current);
+      return () => {
+        clearEvents();
+      };
     }, []);
     useEffect(() => {
       if (!containerRef) return;
@@ -159,18 +168,28 @@ 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);
+          clearEvents();
           window.captchafox.execute(id).then(resolve).catch((error) => {
             const errorType = getErrorType(error);
             reject(errorType);
@@ -197,7 +216,9 @@ var CaptchaFox = forwardRef(
         onError,
         onFail,
         onClose,
-        onVerify
+        onVerify,
+        onChallengeChange,
+        onChallengeOpen
       });
       if (!newWidgetId) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@captchafox/react",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -35,7 +35,7 @@
     "react-dom": ">=16.8.0"
   },
   "dependencies": {
-    "@captchafox/types": "^1.3.0"
+    "@captchafox/types": "^1.4.0"
   },
   "devDependencies": {
     "@captchafox/tsconfig": "*",