feat: add microshield-token-parser

package.json

@@ -36,6 +36,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
+    "@list-kr/microshield-token-parser": "^1.0.2",
     "@types/node": "^20.12.12",
     "crypto-random-string": "^5.0.0",
     "parse-domain": "^8.0.2"

sources/banner-ios-recovery.txt

@@ -196,6 +196,10 @@
 // @description:ja     microShieldはAdGuard、uBlock Origin、Brave、ABPの環境でAd-Shieldを広範囲に回避します。
 //
 // @grant        GM.xmlHttpRequest
+// @grant        GM.getValue
+// @grant        GM.setValue
+// @grant        GM.listValues
+// @grant        GM.deleteValue
 // @run-at       document-end
 // ==/UserScript==
 // Original Srouce Code:

sources/banner.txt

@@ -196,6 +196,10 @@
 // @description:ja     microShieldはAdGuard、uBlock Origin、Brave、ABPの環境でAd-Shieldを広範囲に回避します。
 //
 // @grant        GM.xmlHttpRequest
+// @grant        GM.getValue
+// @grant        GM.setValue
+// @grant        GM.listValues
+// @grant        GM.deleteValue
 // @run-at       document-start
 // ==/UserScript==
 // Original Srouce Code:

sources/src/GM.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 export type GM = {
-	getValue(key: string, defaultValue: undefined): Promise<string | undefined>
+	getValue<T>(key: string, defaultValue: T): Promise<string | T>
 	setValue(key: string, value: string): Promise<void>
 	deleteValue(key: string): Promise<void>
 	listValues(): Promise<string[]>

sources/src/adshield/resources.ts

@@ -1,6 +1,7 @@
 import {UnprotectedFetch} from '../utils/secret.js'
 import {GetRandomAdShieldHost} from './validators.js'
 import type {GM} from '../GM.js'
+import { AdvancedExtractor } from '@list-kr/microshield-token-parser'
 
 declare const GM: GM
 
@@ -27,7 +28,18 @@ export const GetResourceToken = async (ScriptUrl: string) => {
 
 	if (Match === null) {
 		const ResponseHash = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-1', new TextEncoder().encode(Text)))).map(Block =>Block.toString(16).padStart(2, '0')).join('')
-		return await GetResourceTokenFromCDN(ResponseHash)
+		try {
+			return await GetResourceTokenFromCDN(ResponseHash)
+		}
+		catch {
+			if (await GM.getValue(ResponseHash, null) === null) {
+				const Token = new AdvancedExtractor(Text).GetToken()
+				await GM.setValue(ResponseHash, Token)
+				return Token
+			} else {
+				return await GM.getValue(ResponseHash, null)
+			}
+		}
 	}
 
 	return Match[0]

sources/src/index-ios-recovery.ts

@@ -6,6 +6,7 @@ import {CreateDebug} from './utils/logger.js'
 import {ProtectFunctionDescriptors} from './utils/secret.js'
 import {ProtectStorageApis} from './utils/storage.js'
 import {HasSubstringSetsInString} from './utils/string.js'
+import { CheckVersion } from './utils/ucache.js'
 
 type unsafeWindow = typeof window
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -82,5 +83,5 @@ const Bootstrap = () => {
 	// 		Observe()
 	// 	})
 }
-
+CheckVersion()
 Bootstrap()

sources/src/index.ts

@@ -6,6 +6,7 @@ import {CreateDebug} from './utils/logger.js'
 import {ProtectFunctionDescriptors} from './utils/secret.js'
 import {ProtectStorageApis} from './utils/storage.js'
 import {HasSubstringSetsInString} from './utils/string.js'
+import { CheckVersion } from './utils/ucache.js'
 
 type unsafeWindow = typeof window
 // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -83,4 +84,5 @@ const Bootstrap = () => {
 		})
 }
 
+CheckVersion()
 Bootstrap()

sources/src/utils/ucache.ts

@@ -0,0 +1,14 @@
+import type {GM} from '../GM.js'
+
+declare const GM: GM
+
+export async function CheckVersion() {
+  if (await GM.getValue('version', null) === null) {
+    await GM.setValue('version', GM.info.script.version)
+  } else if (await GM.getValue('version', null) !== GM.info.script.version) {
+    for (const Key of await GM.listValues()) {
+      await GM.deleteValue(Key)
+    }
+    await GM.setValue('version', GM.info.script.version)
+  }
+}