@filteringdev/tinyshield 3.5.2 → 3.6.0

package/dist/index.js

@@ -9,10 +9,13 @@
  */
 const Win = typeof unsafeWindow !== 'undefined' ? unsafeWindow : window;
 import { CheckDepthInASWeakMap } from './as-weakmap.js';
+import { SafeArrayToString } from './safe-ArrayToString.js';
 export const OriginalRegExpTest = Win.RegExp.prototype.test;
 export function RunTinyShieldUserscript(BrowserWindow, UserscriptName = 'tinyShield') {
-    const OriginalArrayToString = BrowserWindow.Array.prototype.toString;
     const OriginalRegExpTest = BrowserWindow.RegExp.prototype.test;
+    const OriginalArrayMap = BrowserWindow.Array.prototype.map;
+    const OriginalString = BrowserWindow.String;
+    const OriginalArrayJoin = BrowserWindow.Array.prototype.join;
     const ProtectedFunctionStrings = ['toString', 'get', 'set'];
     BrowserWindow.Function.prototype.toString = new Proxy(BrowserWindow.Function.prototype.toString, {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
@@ -35,7 +38,7 @@ export function RunTinyShieldUserscript(BrowserWindow, UserscriptName = 'tinyShi
             if (Args.length > 0 && typeof Args[0] !== 'function') {
                 return Reflect.apply(Target, ThisArg, Args);
             }
-            let ArgText = OriginalArrayToString.call(Args);
+            let ArgText = SafeArrayToString(Args, { OriginalArrayMap, OriginalString, OriginalArrayJoin });
             if (ASInitPositiveRegExps.filter(ASInitPositiveRegExp => ASInitPositiveRegExp.filter(Index => OriginalRegExpTest.call(Index, ArgText)).length >= 2).length === 1) {
                 console.debug(`[${UserscriptName}]: Map.prototype.get:`, ThisArg, Args);
                 throw new Error();
@@ -55,12 +58,7 @@ export function RunTinyShieldUserscript(BrowserWindow, UserscriptName = 'tinyShi
     BrowserWindow.Map.prototype.set = new Proxy(BrowserWindow.Map.prototype.set, {
         apply(Target, ThisArg, Args) {
             let ArgText = '';
-            try {
-                ArgText = OriginalArrayToString.call(Args);
-            }
-            catch {
-                console.warn(`[${UserscriptName}]: Map.prototype.set:`, ThisArg, Args);
-            }
+            ArgText = SafeArrayToString(Args, { OriginalArrayMap, OriginalString, OriginalArrayJoin });
             if (ASReinsertedAdvInvenPositiveRegExps.filter(ASReinsertedAdvInvenPositiveRegExp => ASReinsertedAdvInvenPositiveRegExp.filter(Index => OriginalRegExpTest.call(Index, ArgText)).length >= 3).length === 1) {
                 console.debug(`[${UserscriptName}]: Map.prototype.set:`, ThisArg, Args);
                 throw new Error();

package/dist/safe-ArrayToString.d.ts

@@ -0,0 +1,7 @@
+type OriginalAPI = {
+    OriginalArrayMap: typeof Array.prototype.map;
+    OriginalString: typeof String;
+    OriginalArrayJoin: typeof Array.prototype.join;
+};
+export declare function SafeArrayToString(This: unknown[], OriginalAPI: OriginalAPI): string;
+export {};

package/dist/safe-ArrayToString.js

@@ -0,0 +1,4 @@
+export function SafeArrayToString(This, OriginalAPI) {
+    const Mapped = OriginalAPI.OriginalArrayMap.call(This, (Value) => OriginalAPI.OriginalString(Value));
+    return OriginalAPI.OriginalArrayJoin.call(Mapped);
+}

package/dist/tinyShield.user.js

@@ -8,7 +8,7 @@
 // @downloadURL  https://cdn.jsdelivr.net/npm/@filteringdev/tinyshield@latest/dist/tinyShield.user.js
 // @license      MPL-2.0
 //
-// @version      3.5.2
+// @version      3.6.0
 // @author       PiQuark6046 and contributors
 //
 // @grant        unsafeWindow
@@ -3142,6 +3142,8 @@
 // @match      *://*.celebritynetworth.com/*
 // @match      *://sugarspunrun.com/*
 // @match      *://*.sugarspunrun.com/*
+// @match      *://tcdb.com/*
+// @match      *://*.tcdb.com/*
 // @match      *://mtgdecks.net/*
 // @match      *://*.mtgdecks.net/*
 // @match      *://preppykitchen.com/*
@@ -4078,6 +4080,8 @@
 // @match      *://*.evolvingtable.com/*
 // @match      *://runtothefinish.com/*
 // @match      *://*.runtothefinish.com/*
+// @match      *://unboundwellness.com/*
+// @match      *://*.unboundwellness.com/*
 // @match      *://neighborfoodblog.com/*
 // @match      *://*.neighborfoodblog.com/*
 // @match      *://fortressofsolitude.co.za/*
@@ -4186,6 +4190,8 @@
 // @match      *://*.navylookout.com/*
 // @match      *://apetogentleman.com/*
 // @match      *://*.apetogentleman.com/*
+// @match      *://ffxnow.com/*
+// @match      *://*.ffxnow.com/*
 // @match      *://thecookiedoughdiaries.com/*
 // @match      *://*.thecookiedoughdiaries.com/*
 // @match      *://fashionbeans.com/*
@@ -4724,6 +4730,8 @@
 // @match      *://*.whiteonricecouple.com/*
 // @match      *://anoregoncottage.com/*
 // @match      *://*.anoregoncottage.com/*
+// @match      *://foodstruct.com/*
+// @match      *://*.foodstruct.com/*
 // @match      *://sweetsimplevegan.com/*
 // @match      *://*.sweetsimplevegan.com/*
 // @match      *://lynnswayoflife.com/*
@@ -4872,6 +4880,8 @@
 // @match      *://*.ketocookingchristian.com/*
 // @match      *://gardeninthekitchen.com/*
 // @match      *://*.gardeninthekitchen.com/*
+// @match      *://alxnow.com/*
+// @match      *://*.alxnow.com/*
 // @match      *://droidgamers.com/*
 // @match      *://*.droidgamers.com/*
 // @match      *://hanjancrochet.com/*
@@ -4908,6 +4918,8 @@
 // @match      *://*.suebeehomemaker.com/*
 // @match      *://attractionsmagazine.com/*
 // @match      *://*.attractionsmagazine.com/*
+// @match      *://travelawaits.com/*
+// @match      *://*.travelawaits.com/*
 // @match      *://wendypolisi.com/*
 // @match      *://*.wendypolisi.com/*
 // @match      *://onmykidsplate.com/*
@@ -10522,6 +10534,8 @@
 // @match      *://*.gundamcard.gg/*
 // @match      *://hermitcrabanswers.com/*
 // @match      *://*.hermitcrabanswers.com/*
+// @match      *://holistichealthherbalist.com/*
+// @match      *://*.holistichealthherbalist.com/*
 // @match      *://homeoomph.com/*
 // @match      *://*.homeoomph.com/*
 // @match      *://iteachtoo.com/*
@@ -12022,6 +12036,8 @@
 // @match      *://*.heraldm.com/*
 // @match      *://razzball.com/*
 // @match      *://*.razzball.com/*
+// @match      *://geo.fr/*
+// @match      *://*.geo.fr/*
 // @match      *://freeconvert.com/*
 // @match      *://*.freeconvert.com/*
 // @match      *://pcgamebenchmark.com/*
@@ -13132,6 +13148,8 @@
 // @match      *://*.yahoo.com/*
 // @match      *://quizlet.com/*
 // @match      *://*.quizlet.com/*
+// @match      *://apnews.com/*
+// @match      *://*.apnews.com/*
 // @match      *://neowin.net/*
 // @match      *://*.neowin.net/*
 // @match      *://cboard.net/*
@@ -13202,6 +13220,8 @@
 // @match      *://*.references.be/*
 // @match      *://roleplayer.me/*
 // @match      *://*.roleplayer.me/*
+// @match      *://rotowire.com/*
+// @match      *://*.rotowire.com/*
 // @match      *://statecollege.com/*
 // @match      *://*.statecollege.com/*
 // @match      *://szamoldki.hu/*
@@ -13653,7 +13673,7 @@
 // ==/UserScript==
 
 
-(()=>{function s(t,a){let u=new Set(a);return new Set(t.filter(l=>u.has(l))).size}function z(t){if(typeof t[0]!="object"||s(["device","id","imp","regs","site","source"],Object.keys(t[0]))<5)return!1;let a=/^[0-9]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+\/[a-z0-9-\(\)]+\/[a-zA-Z0-9_]+_slot[0-9]+_+/;return!(typeof Object.keys(t[0]).find(r=>typeof t[0][r]=="object"&&Array.isArray(t[0][r])&&t[0][r].filter(l=>typeof l=="object"&&Object.keys(l).filter(y=>typeof y=="string"&&Z.call(a,y))).length>=1)>"u")}var k=typeof unsafeWindow<"u"?unsafeWindow:window,Z=k.RegExp.prototype.test;function m(t,a="tinyShield"){let u=t.Array.prototype.toString,r=t.RegExp.prototype.test,l=["toString","get","set"];t.Function.prototype.toString=new Proxy(t.Function.prototype.toString,{apply(o,n,e){return l.includes(n.name)?`function ${n.name}() { [native code] }`:Reflect.apply(o,n,e)}});let y=[[/[a-zA-Z0-9]+ *=> *{ *const *[a-zA-Z0-9]+ *= *[a-zA-Z0-9]+ *; *if/,/===? *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+\( *[0-9a-z]+ *\) *\] *\) *return *[a-zA-Z0-9]+ *\( *{ *('|")?inventoryId('|")? *:/,/{ *('|")?inventoryId('|")? *: *this *\[[a-zA-Z0-9]+ *\( *[0-9a-z]+ *\) *\] *, *\.\.\. *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+ *\( *[0-9a-z]+ * *\) *\] *} *\)/]];t.Map.prototype.get=new Proxy(t.Map.prototype.get,{apply(o,n,e){if(e.length>0&&typeof e[0]!="function")return Reflect.apply(o,n,e);let p=u.call(e);if(y.filter(i=>i.filter(f=>r.call(f,p)).length>=2).length===1)throw console.debug(`[${a}]: Map.prototype.get:`,n,e),new Error;return Reflect.apply(o,n,e)}});let d=[[/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/,/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/,/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/],[/[a-z0-9A-Z]+\.setAttribute\( *('|")onload('|") *, *('|")! *async *function\( *\) *\{ *let */,/confirm\( *[A-Za-z0-9]+ *\) *\) *{ *const *[A-Za-z0-9]+ *= *new *[A-Za-z0-9]+\.URL\(('|")https:\/\/report\.error-report\.com\//,/\.forEach *\( *\( *[A-Za-z0-9]+ *=> *[A-Za-z0-9]+\.remove *\( *\) *\) *\) *\) *, *[0-9a-f]+ *\) *; *const *[A-Za-z0-9]+ *= *await *\( *await *fetch *\(/]];t.Map.prototype.set=new Proxy(t.Map.prototype.set,{apply(o,n,e){let p="";try{p=u.call(e)}catch{console.warn(`[${a}]: Map.prototype.set:`,n,e)}if(d.filter(i=>i.filter(f=>r.call(f,p)).length>=3).length===1)throw console.debug(`[${a}]: Map.prototype.set:`,n,e),new Error;return Reflect.apply(o,n,e)}}),t.WeakMap.prototype.set=new Proxy(t.WeakMap.prototype.set,{apply(o,n,e){if(z(e))throw console.debug(`[${a}]: WeakMap.prototype.set:`,n,e),new Error;return Reflect.apply(o,n,e)}});let c=[[/async *\( *\) *=> *{ *const *[A-Za-z0-9]+ *= *[A-Za-z0-9]+ *; *await *[A-Za-z0-9]+ *\( *\)/,/; *await *[A-Za-z0-9]+ *\( *\) *, *[A-Za-z0-9]+ *\( *! *1 *, *new *Error *\( *[A-Za-z0-9]+ *\( *[0-9a-f]+ *\) *\) *\) *}/,/ *\) *\) *\) *}/]];t.setTimeout=new Proxy(t.setTimeout,{apply(o,n,e){if(c.filter(p=>p.filter(i=>i.test(e[0].toString())).length>=3).length===1){console.debug(`[${a}]: setTimeout:`,e);return}return Reflect.apply(o,n,e)}}),t.setInterval=new Proxy(t.setInterval,{apply(o,n,e){if(c.filter(p=>p.filter(i=>i.test(e[0].toString())).length>=3).length===1){console.debug(`[${a}]: setInterval:`,e);return}return Reflect.apply(o,n,e)}})}m(k);})();
+(()=>{function g(t,o){let i=new Set(o);return new Set(t.filter(l=>i.has(l))).size}function z(t){if(typeof t[0]!="object"||g(["device","id","imp","regs","site","source"],Object.keys(t[0]))<5)return!1;let o=/^[0-9]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+\/[a-z0-9-\(\)]+\/[a-zA-Z0-9_]+_slot[0-9]+_+/;return!(typeof Object.keys(t[0]).find(r=>typeof t[0][r]=="object"&&Array.isArray(t[0][r])&&t[0][r].filter(l=>typeof l=="object"&&Object.keys(l).filter(u=>typeof u=="string"&&k.call(o,u))).length>=1)>"u")}function c(t,o){let i=o.OriginalArrayMap.call(t,r=>o.OriginalString(r));return o.OriginalArrayJoin.call(i)}var Z=typeof unsafeWindow<"u"?unsafeWindow:window,k=Z.RegExp.prototype.test;function w(t,o="tinyShield"){let i=t.RegExp.prototype.test,r=t.Array.prototype.map,l=t.String,u=t.Array.prototype.join,m=["toString","get","set"];t.Function.prototype.toString=new Proxy(t.Function.prototype.toString,{apply(a,n,e){return m.includes(n.name)?`function ${n.name}() { [native code] }`:Reflect.apply(a,n,e)}});let A=[[/[a-zA-Z0-9]+ *=> *{ *const *[a-zA-Z0-9]+ *= *[a-zA-Z0-9]+ *; *if/,/===? *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+\( *[0-9a-z]+ *\) *\] *\) *return *[a-zA-Z0-9]+ *\( *{ *('|")?inventoryId('|")? *:/,/{ *('|")?inventoryId('|")? *: *this *\[[a-zA-Z0-9]+ *\( *[0-9a-z]+ *\) *\] *, *\.\.\. *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+ *\( *[0-9a-z]+ * *\) *\] *} *\)/]];t.Map.prototype.get=new Proxy(t.Map.prototype.get,{apply(a,n,e){if(e.length>0&&typeof e[0]!="function")return Reflect.apply(a,n,e);let p=c(e,{OriginalArrayMap:r,OriginalString:l,OriginalArrayJoin:u});if(A.filter(y=>y.filter(f=>i.call(f,p)).length>=2).length===1)throw console.debug(`[${o}]: Map.prototype.get:`,n,e),new Error;return Reflect.apply(a,n,e)}});let S=[[/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/,/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/,/inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+/],[/[a-z0-9A-Z]+\.setAttribute\( *('|")onload('|") *, *('|")! *async *function\( *\) *\{ *let */,/confirm\( *[A-Za-z0-9]+ *\) *\) *{ *const *[A-Za-z0-9]+ *= *new *[A-Za-z0-9]+\.URL\(('|")https:\/\/report\.error-report\.com\//,/\.forEach *\( *\( *[A-Za-z0-9]+ *=> *[A-Za-z0-9]+\.remove *\( *\) *\) *\) *\) *, *[0-9a-f]+ *\) *; *const *[A-Za-z0-9]+ *= *await *\( *await *fetch *\(/]];t.Map.prototype.set=new Proxy(t.Map.prototype.set,{apply(a,n,e){let p="";if(p=c(e,{OriginalArrayMap:r,OriginalString:l,OriginalArrayJoin:u}),S.filter(y=>y.filter(f=>i.call(f,p)).length>=3).length===1)throw console.debug(`[${o}]: Map.prototype.set:`,n,e),new Error;return Reflect.apply(a,n,e)}}),t.WeakMap.prototype.set=new Proxy(t.WeakMap.prototype.set,{apply(a,n,e){if(z(e))throw console.debug(`[${o}]: WeakMap.prototype.set:`,n,e),new Error;return Reflect.apply(a,n,e)}});let s=[[/async *\( *\) *=> *{ *const *[A-Za-z0-9]+ *= *[A-Za-z0-9]+ *; *await *[A-Za-z0-9]+ *\( *\)/,/; *await *[A-Za-z0-9]+ *\( *\) *, *[A-Za-z0-9]+ *\( *! *1 *, *new *Error *\( *[A-Za-z0-9]+ *\( *[0-9a-f]+ *\) *\) *\) *}/,/ *\) *\) *\) *}/]];t.setTimeout=new Proxy(t.setTimeout,{apply(a,n,e){if(s.filter(p=>p.filter(y=>y.test(e[0].toString())).length>=3).length===1){console.debug(`[${o}]: setTimeout:`,e);return}return Reflect.apply(a,n,e)}}),t.setInterval=new Proxy(t.setInterval,{apply(a,n,e){if(s.filter(p=>p.filter(y=>y.test(e[0].toString())).length>=3).length===1){console.debug(`[${o}]: setInterval:`,e);return}return Reflect.apply(a,n,e)}})}w(Z);})();
 /*!
  * @license MPL-2.0
  * This Source Code Form is subject to the terms of the Mozilla Public

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@filteringdev/tinyshield",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -27,9 +27,14 @@
     "url": "git+https://github.com/FilteringDev/tinyShield.git"
   },
   "license": "MPL-2.0",
-  "packageManager": "npm@11.5.1+",
   "workspaces": [
     "userscript",
     "builder"
-  ]
+  ],
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^8.56.0",
+    "@typescript-eslint/parser": "^8.56.0",
+    "eslint": "^9.39.2",
+    "typescript-eslint": "^8.56.0"
+  }
 }