[0.1.10] Fix use of modern ES features for some Safari/iPhone versi…

…ons (#21)

* Specifically target `es6`, avoid optional chaining, bump to `0.1.10`

* Avoid the use of spread operator

* Increase timeouts in sdktest, handle context cancellation after timeout

CHANGELOG.md

@@ -1,5 +1,10 @@
 # changelog
 
+## 0.1.10
+
+* Fix use of ES features in non-compat build, which caused Safari 11.1 and 12.1 to fail to load the SDK.
+* The minified bundle size has been reduced (4%).
+
 ## 0.1.9
 
 * Fix `deviceorientation` and `devicemotion` deprecation warnings in Firefox browsers on desktop.

build.sh

@@ -17,11 +17,11 @@ version=$(node -p "require('./package.json').version")
 # echo "Building version $version"
 
 # Build site and library entry
-esbuild src/entry/sdk.ts --bundle --outfile=build/bundle/sdk.js --format=esm --define:SDK_VERSION=\"$version\" --legal-comments=eof
+esbuild src/entry/sdk.ts --bundle --outfile=build/bundle/sdk.js --format=esm --target=es6 --define:SDK_VERSION=\"$version\" --legal-comments=eof
 
-esbuild src/entry/site.ts --bundle --outfile=build/bundle/site.js --define:SDK_VERSION=\"$version\" --legal-comments=eof
-esbuild src/entry/recaptcha-site.ts --bundle --outfile=build/bundle/contrib/recaptcha-site.js --define:SDK_VERSION=\"$version\" --legal-comments=eof
-esbuild src/entry/hcaptcha-site.ts --bundle --outfile=build/bundle/contrib/hcaptcha-site.js --define:SDK_VERSION=\"$version\" --legal-comments=eof
+esbuild src/entry/site.ts --bundle --outfile=build/bundle/site.js --target=es6 --define:SDK_VERSION=\"$version\" --legal-comments=eof
+esbuild src/entry/recaptcha-site.ts --bundle --outfile=build/bundle/contrib/recaptcha-site.js --target=es6 --define:SDK_VERSION=\"$version\" --legal-comments=eof
+esbuild src/entry/hcaptcha-site.ts --bundle --outfile=build/bundle/contrib/hcaptcha-site.js --target=es6 --define:SDK_VERSION=\"$version\" --legal-comments=eof
 
 # Babelize the site bundle
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@friendlycaptcha/sdk",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "In-browser SDK for Friendly Captcha v2 (currently in preview only)",
   "main": "dist/sdk.js",
   "type": "module",
@@ -32,11 +32,11 @@
     "@babel/cli": "^7.19.3",
     "@babel/core": "^7.19.3",
     "@babel/preset-env": "^7.19.3",
-    "idb-keyval": "^6.2.0",
     "@microsoft/api-documenter": "^7.23.13",
     "@microsoft/api-extractor": "^7.38.4",
     "ava": "^6.0.0",
     "esbuild": "^0.19.8",
+    "idb-keyval": "^6.2.0",
     "indexeddbshim": "^10.1.0",
     "license-check-and-add": "^4.0.5",
     "prettier": "^3.0.0",

sdktest/autotest/print.go

@@ -15,6 +15,18 @@ import (
 func (r *TestRunner) PrintTestResult(tr *TestResult) {
 	timing := color.HiBlackString(fmt.Sprintf("(%s)", tr.Timing))
 
+	if errors.Is(tr.InternalError, context.DeadlineExceeded) {
+		fmt.Fprintf(
+			color.Output,
+			"%s %s %s %s\n",
+			color.HiRedString("ERROR Timeout exceeded"),
+			tr.Name,
+			timing,
+			color.YellowString(tr.Message),
+		)
+		return
+	}
+
 	switch tr.Status {
 	case "fail":
 		// In serve mode we display a link to click for quick debugging
@@ -52,6 +64,12 @@ func (r *TestRunner) PrintTestResult(tr *TestResult) {
 	case "skip":
 		fmt.Fprintf(color.Output, "%s %s %s\n", color.YellowString("SKIP"), color.HiBlackString(tr.Name), timing)
 	default: // Should never happen
-		fmt.Fprintf(color.Output, "%s %s %s\n", color.HiRedString("ERROR Invalid Test Result status: "), tr.Name, timing)
+		fmt.Fprintf(
+			color.Output,
+			"%s %s %s\n",
+			color.HiRedString("ERROR Invalid Test Result status: "),
+			tr.Name,
+			timing,
+		)
 	}
 }

sdktest/sdktest.example.yaml

@@ -15,5 +15,5 @@ autotest:
   browser_exec_path: ""
   headless: false
   serve: false # Keep HTTP server alive (allows for links to failed tests).
-  timeout: "10000ms"
+  timeout: "30000ms"
   concurrency: 2

sdktest/sdktestlib/framework.ts

@@ -10,7 +10,7 @@ import { SDKTestObject } from "./test";
 import { SDKTestResult, SDKTestSuiteResult, TestFunction, TestOpts, TestStatus, TestSuiteEntry } from "./types";
 import { SDKTestWidget, TestCaseResultWidget } from "./widget";
 
-const DEFAULT_TIMEOUT = 5000;
+const DEFAULT_TIMEOUT = 20_000;
 
 export class SDKTestFramework {
   private widget: SDKTestWidget;

src/compat/common.ts

@@ -132,7 +132,6 @@ export class CommonCompatSDK {
       ...el.dataset,
       ...params,
       element: el,
-      sitekey: params?.sitekey,
       language: this.params.hl || undefined,
     });
 

src/sdk/widgetHandle.ts

@@ -148,7 +148,7 @@ export class WidgetHandle {
    */
   public destroy() {
     this.isDestroyed = true;
-    this.hiddenFormEl?.remove();
+    this.hiddenFormEl && this.hiddenFormEl.remove();
     this.hiddenFormEl = undefined;
     this.setState({ response: ".DESTROYED", state: "destroyed" });
     this._destroy();

src/signals/collectStacktrace.ts

@@ -5,6 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
+import { mergeObject } from "../util/object";
 import { windowPerformanceNow } from "../util/performance";
 
 /**
@@ -148,10 +149,13 @@ export const takeRecords = (function () {
     } catch (e) {}
 
     try {
-      Object.defineProperty(target, prop, {
-        ...descriptor,
-        [hasGetterOrSetter ? "get" : "value"]: newAccessor,
-      });
+      const newDescriptor = mergeObject({}, descriptor);
+      if (hasGetterOrSetter) {
+        newDescriptor.get = newAccessor;
+      } else {
+        newDescriptor.value = newAccessor;
+      }
+      Object.defineProperty(target, prop, newDescriptor);
       origPatchMap.set(newAccessor, hasGetterOrSetter ? descriptor.get : descriptor.value);
     } catch (e) {}
   });