Skip to content

Commit 13f947e

Browse files
committed
fix: incorrect try catch scope
1 parent 9030dd3 commit 13f947e

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@list-kr/tinyshield",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"description": "",
55
"type": "module",
66
"scripts": {

sources/banner.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// @downloadURL https://cdn.jsdelivr.net/npm/@list-kr/tinyshield@latest/dist/tinyShield.user.js
99
// @license MIT
1010
//
11-
// @version 1.4.0
11+
// @version 1.5.0
1212
// @author PiQuark6046 and contributors
1313
//
1414
// @match *://ygosu.com/*

sources/src/index.ts

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,37 @@ Win.Function.prototype.toString = new Proxy(Win.Function.prototype.toString, {
2222

2323
Win.Map.prototype.get = new Proxy(Win.Map.prototype.get, {
2424
apply(Target: (key: unknown) => unknown, ThisArg: Map<unknown, unknown>, Args: [unknown]) {
25+
let ArgText = ''
2526
try {
26-
let ArgText = OriginalArrayToString.call(Args) as string
27-
for (const Item of ['{"inventoryId":', '({inventoryId:this']) {
28-
if (OriginalStringIncludes.call(ArgText, Item)) {
29-
console.debug('[tinyShield]: Map.prototype.get:', ThisArg, Args)
30-
throw new Error()
31-
}
32-
}
27+
ArgText = OriginalArrayToString.call(Args) as string
28+
3329
} catch {
3430
console.warn('[tinyShield]: Map.prototype.get:', ThisArg, Args)
3531
}
36-
32+
for (const Item of ['{"inventoryId":', '({inventoryId:this']) {
33+
if (OriginalStringIncludes.call(ArgText, Item)) {
34+
console.debug('[tinyShield]: Map.prototype.get:', ThisArg, Args)
35+
throw new Error()
36+
}
37+
}
3738
return Reflect.apply(Target, ThisArg, Args)
3839
}
3940
})
4041

4142
Win.Map.prototype.set = new Proxy(Win.Map.prototype.set, {
4243
apply(Target: (key: unknown, value: unknown) => Map<unknown, unknown>, ThisArg: Map<unknown, unknown>, Args: [unknown, unknown]) {
44+
let ArgText = ''
4345
try {
44-
let ArgText = OriginalArrayToString.call(Args) as string
45-
for (const Item of ['inventory_id']) {
46-
if (OriginalStringIncludes.call(ArgText, Item)) {
47-
console.debug('[tinyShield]: Map.prototype.set:', ThisArg, Args)
48-
throw new Error()
49-
}
50-
}
46+
ArgText = OriginalArrayToString.call(Args) as string
5147
} catch {
5248
console.warn('[tinyShield]: Map.prototype.get:', ThisArg, Args)
5349
}
50+
for (const Item of ['inventory_id']) {
51+
if (OriginalStringIncludes.call(ArgText, Item)) {
52+
console.debug('[tinyShield]: Map.prototype.set:', ThisArg, Args)
53+
throw new Error()
54+
}
55+
}
5456

5557
return Reflect.apply(Target, ThisArg, Args)
5658
}

0 commit comments

Comments
 (0)