From 729424bf6578b89acc74e3a89094feec8dfbe177 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Fri, 18 Mar 2022 01:40:05 +0800
Subject: [PATCH] Added function in YukiHookModuleStatus were "executorName"
 and "executorVersion"

---
 .idea/misc.xml                                |  1 +
 .../demo_module/ui/MainActivity.kt            |  4 +-
 .../src/main/res/layout/activity_main.xml     |  2 +
 .../YukiHookXposedProcessor.kt                | 28 ++++++++++++--
 .../hook/xposed/YukiHookModuleStatus.kt       | 38 +++++++++++++++++++
 5 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 29e61399..7a24290b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,7 @@
       <map>
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.4169230769230769" />
         <entry key="app_demo/src/main/res/layout/activity_main.xml" value="0.4375" />
+        <entry key="demo-module/src/main/res/layout/activity_main.xml" value="0.4375" />
         <entry key="demo/src/main/res/layout/activity_main.xml" value="0.4375" />
         <entry key="module_demo/src/main/res/layout/activity_main.xml" value="0.4375" />
       </map>
diff --git a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/MainActivity.kt b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/MainActivity.kt
index 7459d986..d3f6d90f 100644
--- a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/MainActivity.kt
+++ b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/ui/MainActivity.kt
@@ -44,7 +44,9 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        findViewById<TextView>(R.id.module_demo_text).text = "Module is Active -> ${YukiHookModuleStatus.isActive()}"
+        findViewById<TextView>(R.id.module_demo_text).text = "Module is Active -> ${YukiHookModuleStatus.isActive()}\n" +
+                "Hook Framework -> ${YukiHookModuleStatus.executorName}\n" +
+                "API Version -> ${YukiHookModuleStatus.executorVersion}"
         findViewById<EditText>(R.id.module_demo_edit_text).also {
             it.setText(modulePrefs.getString(key = "test_data"))
             findViewById<Button>(R.id.module_demo_button).setOnClickListener { _ ->
diff --git a/demo-module/src/main/res/layout/activity_main.xml b/demo-module/src/main/res/layout/activity_main.xml
index c8b1f567..6c78a3ad 100644
--- a/demo-module/src/main/res/layout/activity_main.xml
+++ b/demo-module/src/main/res/layout/activity_main.xml
@@ -12,6 +12,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
+        android:gravity="center"
+        android:lineSpacingExtra="6dp"
         android:text="sample"
         android:textSize="20sp" />
 
diff --git a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt
index 3d01b003..5cb6849b 100644
--- a/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt
+++ b/yukihookapi-ksp-xposed/src/api/kotlin/com/highcapable/yukihookapi_ksp_xposed/YukiHookXposedProcessor.kt
@@ -227,6 +227,7 @@ class YukiHookXposedProcessor : SymbolProcessorProvider {
                                 "import de.robv.android.xposed.IXposedHookLoadPackage\n" +
                                 "import de.robv.android.xposed.XC_MethodReplacement\n" +
                                 "import de.robv.android.xposed.XposedHelpers\n" +
+                                "import de.robv.android.xposed.XposedBridge\n" +
                                 "import de.robv.android.xposed.callbacks.XC_LoadPackage\n" +
                                 "import $packageName.$className\n" +
                                 "\n" +
@@ -244,12 +245,12 @@ class YukiHookXposedProcessor : SymbolProcessorProvider {
                                 "\n" +
                                 "    override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam?) {\n" +
                                 "        if (lpparam == null) return\n" +
-                                "        runCatching {\n" +
+                                "        try {\n" +
                                 "            $className().onHook()\n" +
-                                "        }.onFailure {\n" +
-                                "            loggerE(tag = \"YukiHookAPI\", msg = \"YukiHookAPI try to load HookEntryClass failed\", e = it)\n" +
+                                "        } catch (e: Throwable) {\n" +
+                                "            loggerE(tag = \"YukiHookAPI\", msg = \"YukiHookAPI try to load HookEntryClass failed\", e = e)\n" +
                                 "        }\n" +
-                                "        if (lpparam.packageName == \"$realPackageName\")\n" +
+                                "        if (lpparam.packageName == \"$realPackageName\") {\n" +
                                 "            XposedHelpers.findAndHookMethod(\n" +
                                 "                YukiHookModuleStatus::class.java.name,\n" +
                                 "                lpparam.classLoader,\n" +
@@ -257,6 +258,25 @@ class YukiHookXposedProcessor : SymbolProcessorProvider {
                                 "                object : XC_MethodReplacement() {\n" +
                                 "                    override fun replaceHookedMethod(param: MethodHookParam?) = true\n" +
                                 "                })\n" +
+                                "            XposedHelpers.findAndHookMethod(\n" +
+                                "                YukiHookModuleStatus::class.java.name,\n" +
+                                "                lpparam.classLoader,\n" +
+                                "                \"getXposedBridgeTag\",\n" +
+                                "                object : XC_MethodReplacement() {\n" +
+                                "                    override fun replaceHookedMethod(param: MethodHookParam?) = try {\n" +
+                                "                        XposedBridge::class.java.getDeclaredField(\"TAG\").apply { isAccessible = true }.get(null) as String\n" +
+                                "                    } catch (_: Throwable) {\n" +
+                                "                        \"invalid\"\n" +
+                                "                    }\n" +
+                                "                })\n" +
+                                "            XposedHelpers.findAndHookMethod(\n" +
+                                "                YukiHookModuleStatus::class.java.name,\n" +
+                                "                lpparam.classLoader,\n" +
+                                "                \"getXposedVersion\",\n" +
+                                "                object : XC_MethodReplacement() {\n" +
+                                "                    override fun replaceHookedMethod(param: MethodHookParam?) = XposedBridge.getXposedVersion()\n" +
+                                "                })\n" +
+                                "        }\n" +
                                 "        YukiHookAPI.modulePackageName = \"$realPackageName\"\n" +
                                 "        YukiHookAPI.onXposedLoaded(lpparam)\n" +
                                 "    }\n" +
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/YukiHookModuleStatus.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/YukiHookModuleStatus.kt
index 52de3751..f624f4bb 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/YukiHookModuleStatus.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/xposed/YukiHookModuleStatus.kt
@@ -29,18 +29,56 @@ package com.highcapable.yukihookapi.hook.xposed
 
 import androidx.annotation.Keep
 import com.highcapable.yukihookapi.hook.log.yLoggerI
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus.executorName
+import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus.executorVersion
 import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus.isActive
+import de.robv.android.xposed.XposedBridge
 
 /**
  * 这是一个 Xposed 模块 Hook 状态类
  *
  * 我们需要监听自己的模块是否被激活 - 可直接调用这个类的 [isActive] 方法
  *
+ * 调用 [executorName] 来获取当前 Hook 框架的名称
+ *
+ * 调用 [executorVersion] 来获取当前 Hook 框架的版本
+ *
  * 详情请参考 [判断自身激活状态](https://github.com/fankes/YukiHookAPI/wiki#%E5%88%A4%E6%96%AD%E8%87%AA%E8%BA%AB%E6%BF%80%E6%B4%BB%E7%8A%B6%E6%80%81)
  */
 @Keep
 object YukiHookModuleStatus {
 
+    /**
+     * 获取当前 Hook 框架的名称
+     *
+     * 从 [XposedBridge] 获取 TAG
+     * @return [String] 模块未激活会返回 unknown
+     */
+    val executorName
+        get() = getXposedBridgeTag().replace(oldValue = "Bridge", newValue = "").replace(oldValue = "-", newValue = "").trim()
+
+    /**
+     * 获取当前 Hook 框架的版本
+     *
+     * 获取 [XposedBridge.getXposedVersion]
+     * @return [Int] 模块未激活会返回 -1
+     */
+    val executorVersion get() = getXposedVersion()
+
+    /**
+     * 此方法经过 Hook 后返回 [XposedBridge.getXposedVersion]
+     * @return [Int]
+     */
+    @Keep
+    private fun getXposedVersion() = -1
+
+    /**
+     * 此方法经过 Hook 后返回 [XposedBridge] 的 TAG
+     * @return [String]
+     */
+    @Keep
+    private fun getXposedBridgeTag() = "unknown"
+
     /**
      * 此方法经过 Hook 后返回 true 即模块已激活
      * @return [Boolean]