feat: new func argument analyzer with RegExp

Author: piquark6046

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@list-kr/tinyshield",
-  "version": "1.5.58",
+  "version": "1.6.0",
   "description": "",
   "type": "module",
   "scripts": {

sources/banner.txt

@@ -8,7 +8,7 @@
 // @downloadURL  https://cdn.jsdelivr.net/npm/@list-kr/tinyshield@latest/dist/tinyShield.user.js
 // @license      MIT
 //
-// @version      1.5.58
+// @version      1.6.0
 // @author       PiQuark6046 and contributors
 //
 // @match        *://ygosu.com/*

sources/src/index.ts

@@ -5,7 +5,6 @@ declare const unsafeWindow: unsafeWindow
 const Win = typeof unsafeWindow !== 'undefined' ? unsafeWindow : window
 
 const OriginalArrayToString = Win.Array.prototype.toString
-const OriginalStringIncludes = Win.String.prototype.includes
 
 const ProtectedFunctionStrings = ['toString', 'get', 'set']
 
@@ -20,24 +19,30 @@ Win.Function.prototype.toString = new Proxy(Win.Function.prototype.toString, {
   }
 })
 
+const ASInitPositiveRegExps: RegExp[][] = [[
+  /[a-zA-Z0-9]+ *=> *{ *const *[a-zA-Z0-9]+ *= *[a-zA-Z0-9]+ *; *if/,
+  /===? *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+\( *[0-9]+ *\) *\] *\) *return *[a-zA-Z0-9]+ *\( *{ *inventoryId *:/,
+  /{ *inventoryId *: *this *\[[a-zA-Z0-9]+ *\( *[0-9]+ *\) *\] *, *\.\.\. *[a-zA-Z0-9]+ *\[ *[a-zA-Z0-9]+ *\( *[0-9]+ * *\) *\] *} *\)/
+]]
 Win.Map.prototype.get = new Proxy(Win.Map.prototype.get, {
   apply(Target: (key: unknown) => unknown, ThisArg: Map<unknown, unknown>, Args: [unknown]) {
-    let ArgText = ''
-    try {
-      ArgText = OriginalArrayToString.call(Args) as string
-    } catch {
-      console.warn('[tinyShield]: Map.prototype.get:', ThisArg, Args)
+    if (Args.length > 0 && typeof Args[0] !== 'function') {
+      return Reflect.apply(Target, ThisArg, Args)
     }
-    for (const Item of ['{"inventoryId":', '({inventoryId:this']) {
-      if (OriginalStringIncludes.call(ArgText, Item)) {
-        console.debug('[tinyShield]: Map.prototype.get:', ThisArg, Args)
-        throw new Error()
-      }
+
+    let ArgText = OriginalArrayToString.call(Args) as string
+    if (ASInitPositiveRegExps.filter(ASInitPositiveRegExp => ASInitPositiveRegExp.filter(Index => Index.test(ArgText)).length >= 2).length === 1) {
+      console.debug('[tinyShield]: Map.prototype.get:', ThisArg, Args)
+      throw new Error()
     }
+
     return Reflect.apply(Target, ThisArg, Args)
   }
 })
 
+const ASReinsertedAdvInvenPositiveRegExps: RegExp[][] = [[
+  new RegExp('inventory_id,[a-zA-Z0-9-]+\/[a-zA-Z0-9]+\/[a-zA-Z0-9]+')
+]]
 Win.Map.prototype.set = new Proxy(Win.Map.prototype.set, {
   apply(Target: (key: unknown, value: unknown) => Map<unknown, unknown>, ThisArg: Map<unknown, unknown>, Args: [unknown, unknown]) {
     let ArgText = ''
@@ -46,11 +51,9 @@ Win.Map.prototype.set = new Proxy(Win.Map.prototype.set, {
     } catch {
       console.warn('[tinyShield]: Map.prototype.get:', ThisArg, Args)
     }
-    for (const Item of ['inventory_id']) {
-      if (OriginalStringIncludes.call(ArgText, Item)) {
-        console.debug('[tinyShield]: Map.prototype.set:', ThisArg, Args)
-        throw new Error()
-      }
+    if (ASReinsertedAdvInvenPositiveRegExps.filter(ASReinsertedAdvInvenPositiveRegExp => ASReinsertedAdvInvenPositiveRegExp.filter(Index => Index.test(ArgText)).length >= 1).length === 1) {
+      console.debug('[tinyShield]: Map.prototype.set:', ThisArg, Args)
+      throw new Error()
     }
 
     return Reflect.apply(Target, ThisArg, Args)