@sv443-network/userutils 8.3.0 → 8.3.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sv443-network/userutils
 
+## 8.3.1
+
+### Patch Changes
+
+- 390110e: Throw an error when calling `interceptEvent()` on `window` or `unsafeWindow` on FireMonkey instead of crashing the entire page
+
 ## 8.3.0
 
 ### Minor Changes

package/README.md

@@ -622,6 +622,7 @@ If no predicate is specified, all events will be discarded.
 Calling this function will set the `Error.stackTraceLimit` to 100 (if it's not already higher) to ensure the stack trace is preserved.  
   
 ⚠️ This function should be called as soon as possible (I recommend using `@run-at document-start`), as it will only intercept events that are *attached* after this function is called.  
+⚠️ Due to this function modifying the `addEventListener` prototype, it might break execution of the page's main script if the userscript is running in an isolated context (like it does in FireMonkey). In that case, calling this function will throw an error.  
   
 <details><summary><b>Example - click to view</b></summary>
 
@@ -655,7 +656,8 @@ If no predicate is specified, all events will be discarded.
 This is essentially the same as [`interceptEvent()`](#interceptevent), but automatically uses the `unsafeWindow` (or falls back to regular `window`).  
   
 ⚠️ This function should be called as soon as possible (I recommend using `@run-at document-start`), as it will only intercept events that are *attached* after this function is called.  
-⚠️ In order for all events to be interceptable, the directive `@grant unsafeWindow` should be set.  
+⚠️ In order to have the best chance at intercepting events, the directive `@grant unsafeWindow` should be set.  
+⚠️ Due to this function modifying the `addEventListener` prototype, it might break execution of the page's main script if the userscript is running in an isolated context (like it does in FireMonkey). In that case, calling this function will throw an error.  
   
 <details><summary><b>Example - click to view</b></summary>
 
@@ -1769,12 +1771,13 @@ Usage:
 ```ts
 fetchAdvanced(input: string | Request | URL, options?: {
   timeout?: number,
-  // any other options from fetch() except for signal
+  // any other options from fetch()
 }): Promise<Response>
 ```
   
 A drop-in replacement for the native `fetch()` function that adds options like a timeout property.  
 The timeout will default to 10 seconds if left undefined. Set it to a negative number to disable the timeout.  
+Pass an [AbortController's signal](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) to the `signal` property to be able to abort the request before it finishes or the timeout kicks in.  
   
 <details><summary><b>Example - click to view</b></summary>
 

package/dist/index.global.js

@@ -8,7 +8,7 @@
 // ==UserLibrary==
 // @name         UserUtils
 // @description  Library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and more
-// @version      8.3.0
+// @version      8.3.1
 // @license      MIT
 // @copyright    Sv443 (https://github.com/Sv443)
 
@@ -247,13 +247,16 @@ var UserUtils = (function (exports) {
     }
   }
   function interceptEvent(eventObject, eventName, predicate = () => true) {
+    var _a;
+    if ((eventObject === window || eventObject === getUnsafeWindow()) && ((_a = GM == null ? void 0 : GM.info) == null ? void 0 : _a.scriptHandler) && GM.info.scriptHandler === "FireMonkey")
+      throw new Error("Intercepting window events is not supported on FireMonkey due to the isolated context the userscript runs in.");
     Error.stackTraceLimit = Math.max(Error.stackTraceLimit, 100);
     if (isNaN(Error.stackTraceLimit))
       Error.stackTraceLimit = 100;
     (function(original) {
       eventObject.__proto__.addEventListener = function(...args) {
-        var _a, _b;
-        const origListener = typeof args[1] === "function" ? args[1] : (_b = (_a = args[1]) == null ? void 0 : _a.handleEvent) != null ? _b : () => void 0;
+        var _a2, _b;
+        const origListener = typeof args[1] === "function" ? args[1] : (_b = (_a2 = args[1]) == null ? void 0 : _a2.handleEvent) != null ? _b : () => void 0;
         args[1] = function(...a) {
           if (args[0] === eventName && predicate(Array.isArray(a) ? a[0] : a))
             return;

package/dist/index.js

@@ -227,13 +227,16 @@ function openInNewTab(href, background) {
   }
 }
 function interceptEvent(eventObject, eventName, predicate = () => true) {
+  var _a;
+  if ((eventObject === window || eventObject === getUnsafeWindow()) && ((_a = GM == null ? void 0 : GM.info) == null ? void 0 : _a.scriptHandler) && GM.info.scriptHandler === "FireMonkey")
+    throw new Error("Intercepting window events is not supported on FireMonkey due to the isolated context the userscript runs in.");
   Error.stackTraceLimit = Math.max(Error.stackTraceLimit, 100);
   if (isNaN(Error.stackTraceLimit))
     Error.stackTraceLimit = 100;
   (function(original) {
     eventObject.__proto__.addEventListener = function(...args) {
-      var _a, _b;
-      const origListener = typeof args[1] === "function" ? args[1] : (_b = (_a = args[1]) == null ? void 0 : _a.handleEvent) != null ? _b : () => void 0;
+      var _a2, _b;
+      const origListener = typeof args[1] === "function" ? args[1] : (_b = (_a2 = args[1]) == null ? void 0 : _a2.handleEvent) != null ? _b : () => void 0;
       args[1] = function(...a) {
         if (args[0] === eventName && predicate(Array.isArray(a) ? a[0] : a))
           return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sv443-network/userutils",
   "libName": "UserUtils",
-  "version": "8.3.0",
+  "version": "8.3.1",
   "description": "Library with various utilities for userscripts - register listeners for when CSS selectors exist, intercept events, create persistent & synchronous data stores, modify the DOM more easily and more",
   "main": "dist/index.js",
   "module": "dist/index.js",