js: add moduleInfo method

jeffpeng3 · Sep 14, 2024 · d03a289 · d03a289
1 parent b9449be
commit d03a289
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5 deletions.
diff --git a/js/README.md b/js/README.md
@@ -109,3 +109,12 @@ Show a toast message.
 import { toast } from 'kernelsu';
 toast('Hello, world!');
 ```
+
+### moduleInfo
+
+Get Module path.
+```javascript
+import { moduleInfo } from 'kernelsu';
+// print moduleId in console
+console.log(moduleInfo());
+```
diff --git a/js/index.d.ts b/js/index.d.ts
@@ -37,9 +37,12 @@ declare function fullScreen(isFullScreen: boolean);
 
 declare function toast(message: string);
 
+declare function moduleInfo(): string;
+
 export {
     exec,
     spawn,
     fullScreen,
-    toast
+    toast,
+    moduleInfo
 }
diff --git a/js/index.js b/js/index.js
@@ -113,3 +113,7 @@ export function fullScreen(isFullScreen) {
 export function toast(message) {
   ksu.toast(message);
 }
+
+export function moduleInfo() {
+  return ksu.moduleInfo();
+}
diff --git a/js/package.json b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kernelsu",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Library for KernelSU's module WebUI",
   "main": "index.js",
   "types": "index.d.ts",

diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/webui/WebUIActivity.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/webui/WebUIActivity.kt
@@ -29,7 +29,8 @@ class WebUIActivity : ComponentActivity() {
         val prefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
         WebView.setWebContentsDebuggingEnabled(prefs.getBoolean("enable_web_debugging", false))
 
-        val webRoot = File("/data/adb/modules/${moduleId}/webroot")
+        val moduleDir = "/data/adb/modules/${moduleId}"
+        val webRoot = File("${moduleDir}/webroot")
         val rootShell = createRootShell(true).also { this.rootShell = it }
         val webViewAssetLoader = WebViewAssetLoader.Builder()
             .setDomain("mui.kernelsu.org")
@@ -52,7 +53,7 @@ class WebUIActivity : ComponentActivity() {
             settings.javaScriptEnabled = true
             settings.domStorageEnabled = true
             settings.allowFileAccess = false
-            webviewInterface = WebViewInterface(this@WebUIActivity, this)
+            webviewInterface = WebViewInterface(this@WebUIActivity, this, moduleDir)
             addJavascriptInterface(webviewInterface, "ksu")
             setWebViewClient(webViewClient)
             loadUrl("https://mui.kernelsu.org/index.html")

diff --git a/manager/app/src/main/java/me/weishu/kernelsu/ui/webui/WebViewInterface.kt b/manager/app/src/main/java/me/weishu/kernelsu/ui/webui/WebViewInterface.kt
@@ -14,13 +14,15 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import com.topjohnwu.superuser.CallbackList
 import com.topjohnwu.superuser.ShellUtils
+import me.weishu.kernelsu.ui.util.listModules
 import me.weishu.kernelsu.ui.util.createRootShell
 import me.weishu.kernelsu.ui.util.withNewRootShell
 import org.json.JSONArray
 import org.json.JSONObject
 import java.util.concurrent.CompletableFuture
+import java.io.File
 
-class WebViewInterface(val context: Context, private val webView: WebView) {
+class WebViewInterface(val context: Context, private val webView: WebView, private val modDir: String) {
 
     @JavascriptInterface
     fun exec(cmd: String): String {
@@ -170,6 +172,21 @@ class WebViewInterface(val context: Context, private val webView: WebView) {
         }
     }
 
+    @JavascriptInterface
+    fun moduleInfo(): String {
+        val moduleInfos = JSONArray(listModules())
+        var currentModuleInfo = JSONObject()
+        val moduleId = File(modDir).getName()
+        for (i in 0 until moduleInfos.length()) {
+            val currentInfo = moduleInfos.getJSONObject(i)
+
+            if (currentInfo.getString("id") == moduleId) {
+                currentModuleInfo = moduleInfo;
+                break;
+            }
+        }
+        return currentModuleInfo.toString();
+    }
 }
 
 fun hideSystemUI(window: Window) {