@internetarchive/recaptcha-manager 1.0.0 → 2.0.1

package/dist/test/recaptcha-manager.test.js

@@ -51,13 +51,52 @@ describe('ReCaptcha Management', () => {
             expect(recaptcha1).to.equal(recaptcha2);
         });
         it('loads the recaptcha library if needed', async () => {
+            // Mock lazy loader that mimics the grecaptcha script calling the callback on load
+            const mockLazyLoaderWithCallback = new MockLazyLoaderService(() => {
+                window.grecaptcha = new MockGrecaptcha({
+                    mode: 'success',
+                });
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                window.grecaptchaLoadedCallback();
+            });
             const recaptchaManager = new RecaptchaManager({
-                lazyLoader: mockLazyLoader,
+                lazyLoader: mockLazyLoaderWithCallback,
                 defaultSiteKey: '123',
+                timeout: 100,
             });
             await recaptchaManager.getRecaptchaWidget();
-            const loadUrl = mockLazyLoader.loadScriptSrc;
-            expect(loadUrl === null || loadUrl === void 0 ? void 0 : loadUrl.includes('recaptcha/api.js?onload=grecaptchaLoadedCallback')).to.be.true;
+            const loadUrl = mockLazyLoaderWithCallback.loadScriptSrc;
+            expect(loadUrl === null || loadUrl === void 0 ? void 0 : loadUrl.includes('https://www.recaptcha.net/recaptcha/api.js?onload=grecaptchaLoadedCallback')).to.be.true;
+        });
+        it('rejects after specified timeout if grecaptcha fails to execute callback', async () => {
+            const recaptchaManager = new RecaptchaManager({
+                lazyLoader: mockLazyLoader,
+                defaultSiteKey: '123',
+                timeout: 100,
+            });
+            try {
+                await recaptchaManager.getRecaptchaWidget();
+                expect.fail('recaptcha load did not time out as expected');
+            }
+            catch (err) {
+                expect(err).to.be.instanceOf(Error);
+                expect(err.message).to.equal('grecaptcha failed to execute callback');
+            }
+        });
+        it('can set the timeout delay', async () => {
+            const recaptchaManager = new RecaptchaManager({
+                lazyLoader: mockLazyLoader,
+                defaultSiteKey: '123',
+            });
+            recaptchaManager.setTimeoutDelay(1);
+            try {
+                await recaptchaManager.getRecaptchaWidget();
+                expect.fail('recaptcha load did not time out as expected');
+            }
+            catch (err) {
+                expect(err).to.be.instanceOf(Error);
+                expect(err.message).to.equal('grecaptcha failed to execute callback');
+            }
         });
     });
     describe('ReCaptcha Widget', () => {

package/dist/test/recaptcha-manager.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"recaptcha-manager.test.js","sourceRoot":"","sources":["../../test/recaptcha-manager.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from '@open-wc/testing';\nimport { MockGrecaptcha } from './mock-grecaptcha';\nimport { RecaptchaManager } from '../src/recaptcha-manager';\nimport { MockLazyLoaderService } from './mock-lazy-loader';\n\nconst mockLazyLoader = new MockLazyLoaderService();\n\ndescribe('ReCaptcha Management', () => {\n  describe('ReCaptcha Manager', () => {\n    it('can return recaptchas', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n      const result = await recaptcha.execute();\n      expect(result).to.equal('foo');\n    });\n\n    it('throws an error if no site key found', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n      });\n      try {\n        await recaptchaManager.getRecaptchaWidget();\n        expect.fail('should not get here');\n      } catch (e) {\n        expect((e as Error).message).to.equal(\n          'The reCaptcha widget requires a site key',\n        );\n      }\n    });\n\n    it('returns a cached version if one already exists for a given site key', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha1 = await recaptchaManager.getRecaptchaWidget();\n      const recaptcha2 = await recaptchaManager.getRecaptchaWidget();\n      expect(recaptcha1).to.equal(recaptcha2);\n    });\n\n    it('loads the recaptcha library if needed', async () => {\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        defaultSiteKey: '123',\n      });\n      await recaptchaManager.getRecaptchaWidget();\n      const loadUrl = mockLazyLoader.loadScriptSrc;\n      expect(\n        loadUrl?.includes('recaptcha/api.js?onload=grecaptchaLoadedCallback'),\n      ).to.be.true;\n    });\n  });\n\n  describe('ReCaptcha Widget', () => {\n    it('can error properly like a Promise', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'error',\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      try {\n        await recaptcha.execute();\n        expect.fail('should not get here');\n      } catch (error) {\n        expect((error as Error).message).to.equal('error');\n      }\n    });\n\n    it('can expire properly like a Promise', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'expired',\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      try {\n        await recaptcha.execute();\n        expect.fail('should not get here');\n      } catch (error) {\n        expect((error as Error).message).to.equal('expired');\n      }\n    });\n\n    it('resets the captcha after execution', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n        addDelay: true,\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(1);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(2);\n    });\n\n    // there's no way to know if the user has dismissed the captcha so if another execution\n    // comes through while the captcha is still active, it will be reset\n    it('resets the captcha if another execution gets called', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n        addDelay: true,\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(2);\n    });\n  });\n});\n"]}
+{"version":3,"file":"recaptcha-manager.test.js","sourceRoot":"","sources":["../../test/recaptcha-manager.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from '@open-wc/testing';\nimport { MockGrecaptcha } from './mock-grecaptcha';\nimport { RecaptchaManager } from '../src/recaptcha-manager';\nimport { MockLazyLoaderService } from './mock-lazy-loader';\n\nconst mockLazyLoader = new MockLazyLoaderService();\n\ndescribe('ReCaptcha Management', () => {\n  describe('ReCaptcha Manager', () => {\n    it('can return recaptchas', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n      const result = await recaptcha.execute();\n      expect(result).to.equal('foo');\n    });\n\n    it('throws an error if no site key found', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n      });\n      try {\n        await recaptchaManager.getRecaptchaWidget();\n        expect.fail('should not get here');\n      } catch (e) {\n        expect((e as Error).message).to.equal(\n          'The reCaptcha widget requires a site key',\n        );\n      }\n    });\n\n    it('returns a cached version if one already exists for a given site key', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n      });\n      mockGrecaptcha.response = 'foo';\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha1 = await recaptchaManager.getRecaptchaWidget();\n      const recaptcha2 = await recaptchaManager.getRecaptchaWidget();\n      expect(recaptcha1).to.equal(recaptcha2);\n    });\n\n    it('loads the recaptcha library if needed', async () => {\n      // Mock lazy loader that mimics the grecaptcha script calling the callback on load\n      const mockLazyLoaderWithCallback = new MockLazyLoaderService(() => {\n        window.grecaptcha = new MockGrecaptcha({\n          mode: 'success',\n        });\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        (window as any).grecaptchaLoadedCallback();\n      });\n\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoaderWithCallback,\n        defaultSiteKey: '123',\n        timeout: 100,\n      });\n\n      await recaptchaManager.getRecaptchaWidget();\n      const loadUrl = mockLazyLoaderWithCallback.loadScriptSrc;\n      expect(\n        loadUrl?.includes(\n          'https://www.recaptcha.net/recaptcha/api.js?onload=grecaptchaLoadedCallback',\n        ),\n      ).to.be.true;\n    });\n\n    it('rejects after specified timeout if grecaptcha fails to execute callback', async () => {\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        defaultSiteKey: '123',\n        timeout: 100,\n      });\n\n      try {\n        await recaptchaManager.getRecaptchaWidget();\n        expect.fail('recaptcha load did not time out as expected');\n      } catch (err) {\n        expect(err).to.be.instanceOf(Error);\n        expect((err as Error).message).to.equal(\n          'grecaptcha failed to execute callback',\n        );\n      }\n    });\n\n    it('can set the timeout delay', async () => {\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        defaultSiteKey: '123',\n      });\n\n      recaptchaManager.setTimeoutDelay(1);\n\n      try {\n        await recaptchaManager.getRecaptchaWidget();\n        expect.fail('recaptcha load did not time out as expected');\n      } catch (err) {\n        expect(err).to.be.instanceOf(Error);\n        expect((err as Error).message).to.equal(\n          'grecaptcha failed to execute callback',\n        );\n      }\n    });\n  });\n\n  describe('ReCaptcha Widget', () => {\n    it('can error properly like a Promise', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'error',\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      try {\n        await recaptcha.execute();\n        expect.fail('should not get here');\n      } catch (error) {\n        expect((error as Error).message).to.equal('error');\n      }\n    });\n\n    it('can expire properly like a Promise', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'expired',\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      try {\n        await recaptcha.execute();\n        expect.fail('should not get here');\n      } catch (error) {\n        expect((error as Error).message).to.equal('expired');\n      }\n    });\n\n    it('resets the captcha after execution', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n        addDelay: true,\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(1);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(2);\n    });\n\n    // there's no way to know if the user has dismissed the captcha so if another execution\n    // comes through while the captcha is still active, it will be reset\n    it('resets the captcha if another execution gets called', async () => {\n      const mockGrecaptcha = new MockGrecaptcha({\n        mode: 'success',\n        addDelay: true,\n      });\n      const recaptchaManager = new RecaptchaManager({\n        lazyLoader: mockLazyLoader,\n        grecaptchaLibrary: mockGrecaptcha,\n        defaultSiteKey: '123',\n      });\n      const recaptcha = await recaptchaManager.getRecaptchaWidget();\n\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(0);\n      await recaptcha.execute();\n      expect(mockGrecaptcha.resetCallCount).to.equal(2);\n    });\n  });\n});\n"]}

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "AGPL-3.0-only",
   "author": "Internet Archive",
-  "version": "1.0.0",
+  "version": "2.0.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "scripts": {
@@ -28,6 +28,7 @@
   "devDependencies": {
     "@open-wc/eslint-config": "^12.0.3",
     "@open-wc/testing": "^4.0.0",
+    "@types/grecaptcha": "^2",
     "@types/mocha": "^10.0.10",
     "@typescript-eslint/eslint-plugin": "^8.19.1",
     "@typescript-eslint/parser": "^8.19.1",
@@ -70,7 +71,6 @@
   },
   "dependencies": {
     "lit": "^2.8.0",
-    "@internetarchive/lazy-loader-service": "^0.2.0",
-    "@types/grecaptcha": "^2"
+    "@internetarchive/lazy-loader-service": "^0.2.0"
   }
 }

package/src/recaptcha-manager.ts

@@ -5,6 +5,11 @@ import {
 import { RecaptchaWidget, RecaptchaWidgetInterface } from './recaptcha-widget';
 
 export interface RecaptchaManagerInterface {
+  /**
+   * Changes the manager's timeout delay to the given number of milliseconds.
+   */
+  setTimeoutDelay(delay: number): void;
+
   /**
    * Load a recaptcha widget for a given site key or the default site key.
    */
@@ -15,20 +20,34 @@ export interface RecaptchaManagerInterface {
 }
 
 export class RecaptchaManager implements RecaptchaManagerInterface {
+  private static readonly DEFAULT_TIMEOUT = 10000;
+
   private lazyLoader: LazyLoaderServiceInterface;
 
   private defaultSiteKey?: string;
 
   private recaptchaCache: Record<string, RecaptchaWidget> = {};
 
+  /**
+   * How long in milliseconds to wait for the recaptcha library to load before timing out.
+   */
+  private timeout = RecaptchaManager.DEFAULT_TIMEOUT;
+
   constructor(options?: {
     defaultSiteKey?: string;
     lazyLoader?: LazyLoaderServiceInterface;
     grecaptchaLibrary?: ReCaptchaV2.ReCaptcha; // allows dependency injection or will be lazy loaded
+    timeout?: number;
   }) {
     this.defaultSiteKey = options?.defaultSiteKey;
     this.lazyLoader = options?.lazyLoader ?? new LazyLoaderService();
     this.grecaptchaLibraryCache = options?.grecaptchaLibrary;
+    this.timeout = options?.timeout ?? RecaptchaManager.DEFAULT_TIMEOUT;
+  }
+
+  /** @inheritdoc */
+  setTimeoutDelay(delay: number): void {
+    this.timeout = delay;
   }
 
   /** @inheritdoc */
@@ -58,7 +77,8 @@ export class RecaptchaManager implements RecaptchaManagerInterface {
   }
 
   /**
-   * Load the Recaptch library from Google.
+   * Load the Recaptcha library from Google's www.recaptcha.net mirror, which
+   * is reachable in regions where www.google.com is blocked.
    *
    * @returns Promise<ReCaptchaV2.ReCaptcha>
    */
@@ -66,7 +86,7 @@ export class RecaptchaManager implements RecaptchaManagerInterface {
     if (this.grecaptchaLibraryCache) {
       return this.grecaptchaLibraryCache;
     }
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (window as any).grecaptchaLoadedCallback = (): void => {
         setTimeout(() => {
@@ -78,8 +98,13 @@ export class RecaptchaManager implements RecaptchaManagerInterface {
         resolve(window.grecaptcha);
       };
 
+      setTimeout(
+        () => reject(new Error('grecaptcha failed to execute callback')),
+        this.timeout,
+      );
+
       this.lazyLoader.loadScript({
-        src: 'https://www.google.com/recaptcha/api.js?onload=grecaptchaLoadedCallback&render=explicit',
+        src: 'https://www.recaptcha.net/recaptcha/api.js?onload=grecaptchaLoadedCallback&render=explicit',
       });
     });
   }

package/test/mock-lazy-loader.ts

@@ -5,11 +5,12 @@ import {
   LazyLoaderServiceInterface,
 } from '@internetarchive/lazy-loader-service';
 import { Unsubscribe } from 'nanoevents';
-import { MockGrecaptcha } from './mock-grecaptcha';
 
 export class MockLazyLoaderService implements LazyLoaderServiceInterface {
   loadScriptSrc?: string;
 
+  constructor(private onloadFn: () => unknown = () => {}) {}
+
   on<E extends keyof LazyLoaderServiceEvents>(
     event: E,
     callback: LazyLoaderServiceEvents[E],
@@ -30,10 +31,6 @@ export class MockLazyLoaderService implements LazyLoaderServiceInterface {
     attributes?: Record<string, string>;
   }): Promise<void> {
     this.loadScriptSrc = options.src;
-    window.grecaptcha = new MockGrecaptcha({
-      mode: 'success',
-    });
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (window as any).grecaptchaLoadedCallback();
+    this.onloadFn();
   }
 }

package/test/recaptcha-manager.test.ts

@@ -57,16 +57,66 @@ describe('ReCaptcha Management', () => {
     });
 
     it('loads the recaptcha library if needed', async () => {
+      // Mock lazy loader that mimics the grecaptcha script calling the callback on load
+      const mockLazyLoaderWithCallback = new MockLazyLoaderService(() => {
+        window.grecaptcha = new MockGrecaptcha({
+          mode: 'success',
+        });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (window as any).grecaptchaLoadedCallback();
+      });
+
       const recaptchaManager = new RecaptchaManager({
-        lazyLoader: mockLazyLoader,
+        lazyLoader: mockLazyLoaderWithCallback,
         defaultSiteKey: '123',
+        timeout: 100,
       });
+
       await recaptchaManager.getRecaptchaWidget();
-      const loadUrl = mockLazyLoader.loadScriptSrc;
+      const loadUrl = mockLazyLoaderWithCallback.loadScriptSrc;
       expect(
-        loadUrl?.includes('recaptcha/api.js?onload=grecaptchaLoadedCallback'),
+        loadUrl?.includes(
+          'https://www.recaptcha.net/recaptcha/api.js?onload=grecaptchaLoadedCallback',
+        ),
       ).to.be.true;
     });
+
+    it('rejects after specified timeout if grecaptcha fails to execute callback', async () => {
+      const recaptchaManager = new RecaptchaManager({
+        lazyLoader: mockLazyLoader,
+        defaultSiteKey: '123',
+        timeout: 100,
+      });
+
+      try {
+        await recaptchaManager.getRecaptchaWidget();
+        expect.fail('recaptcha load did not time out as expected');
+      } catch (err) {
+        expect(err).to.be.instanceOf(Error);
+        expect((err as Error).message).to.equal(
+          'grecaptcha failed to execute callback',
+        );
+      }
+    });
+
+    it('can set the timeout delay', async () => {
+      const recaptchaManager = new RecaptchaManager({
+        lazyLoader: mockLazyLoader,
+        defaultSiteKey: '123',
+      });
+
+      recaptchaManager.setTimeoutDelay(1);
+
+      try {
+        await recaptchaManager.getRecaptchaWidget();
+        expect.fail('recaptcha load did not time out as expected');
+      } catch (err) {
+        expect(err).to.be.instanceOf(Error);
+        expect((err as Error).message).to.equal(
+          'grecaptcha failed to execute callback',
+        );
+      }
+    });
   });
 
   describe('ReCaptcha Widget', () => {