@deflectbot/deflect-sdk 1.1.4 → 1.1.6

package/dist/index.js

@@ -10,9 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 class Deflect {
     constructor() {
         window.Deflect = window.Deflect || {};
-        window.Deflect.siteKey = window.Deflect.siteKey || "";
-        window.Deflect.sessionId = window.Deflect.sessionId || "";
         window.Deflect.extraArgs = window.Deflect.extraArgs || {};
+        // Setup readiness handshake
+        if (!window.Deflect.ready) {
+            let resolveFn;
+            const promise = new Promise((resolve) => {
+                resolveFn = resolve;
+            });
+            window.Deflect.ready = {
+                promise,
+                resolve: () => resolveFn(),
+            };
+        }
     }
     configure(params) {
         if (!params.siteKey) {
@@ -22,6 +31,7 @@ class Deflect {
     }
     solveChallenge() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!window.Deflect.siteKey) {
                 throw new Error("API key (siteKey) is missing in configuration");
             }
@@ -34,10 +44,16 @@ class Deflect {
             if (sessionId) {
                 window.Deflect.sessionId = sessionId;
             }
-            const scriptText = yield response.text();
             const scriptEl = document.createElement("script");
-            scriptEl.textContent = scriptText;
+            scriptEl.type = "module";
+            const blob = new Blob([yield response.text()], { type: "text/javascript" });
+            scriptEl.src = URL.createObjectURL(blob);
             document.head.appendChild(scriptEl);
+            yield new Promise((resolve, reject) => {
+                scriptEl.onload = () => resolve();
+                scriptEl.onerror = () => reject("Failed to load the Deflect script");
+            });
+            yield ((_a = window.Deflect.ready) === null || _a === void 0 ? void 0 : _a.promise);
             if (typeof window.Deflect === "undefined" ||
                 typeof window.Deflect.getToken !== "function") {
                 throw new Error("Deflect script did not load properly");

package/eslint.config.mjs

@@ -1,12 +1,12 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import tseslint from "typescript-eslint";
-
-
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  {files: ["**/*.{js,mjs,cjs,ts}"]},
-  {languageOptions: { globals: globals.browser }},
-  pluginJs.configs.recommended,
-  ...tseslint.configs.recommended,
+import globals from "globals";
+import pluginJs from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  {files: ["**/*.{js,mjs,cjs,ts}"]},
+  {languageOptions: { globals: globals.browser }},
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deflectbot/deflect-sdk",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",

package/src/index.ts

@@ -6,9 +6,19 @@ interface DeflectConfig {
 class Deflect {
   constructor() {
     window.Deflect = window.Deflect || {};
-    window.Deflect.siteKey = window.Deflect.siteKey || "";
-    window.Deflect.sessionId = window.Deflect.sessionId || "";
     window.Deflect.extraArgs = window.Deflect.extraArgs || {};
+
+    // Setup readiness handshake
+    if (!window.Deflect.ready) {
+      let resolveFn: () => void;
+      const promise = new Promise<void>((resolve) => {
+        resolveFn = resolve;
+      });
+      window.Deflect.ready = {
+        promise,
+        resolve: () => resolveFn(),
+      };
+    }
   }
 
   configure(params: DeflectConfig): void {
@@ -24,11 +34,12 @@ class Deflect {
     }
   
     const scriptUrl = `https://js.deflect.bot/main.js?sitekey=${window.Deflect.siteKey}`;
-  
     const response = await fetch(scriptUrl);
+
     if (!response.ok) {
       throw new Error("Failed to fetch the Deflect script");
     }
+
     const sessionId = response.headers.get("session_id");
     if (sessionId) {
       window.Deflect.sessionId = sessionId;
@@ -36,9 +47,9 @@ class Deflect {
   
     const scriptEl = document.createElement("script");
     scriptEl.type = "module";
+
     const blob = new Blob([await response.text()], { type: "text/javascript" });
-    const blobUrl = URL.createObjectURL(blob);
-    scriptEl.src = blobUrl;
+    scriptEl.src = URL.createObjectURL(blob);
   
     document.head.appendChild(scriptEl);
   
@@ -46,6 +57,8 @@ class Deflect {
       scriptEl.onload = () => resolve();
       scriptEl.onerror = () => reject("Failed to load the Deflect script");
     });
+
+    await window.Deflect.ready?.promise;
   
     if (
       typeof window.Deflect === "undefined" ||