js: simplify the exec call

js/README.md

@@ -20,8 +20,11 @@ options:
 ```javascript
 import { exec } from 'kernelsu';
 
-const { stdout, stderr } = await exec('ls -l', { cwd: '/tmp'});
+const { errno, stdout, stderr } = await exec('ls -l', { cwd: '/tmp' });
-console.log(stdout);
+if (errno === 0) {
+    // success
+    console.log(stdout);
+}
 ```
 
 ### fullScreen

js/index.js

@@ -13,24 +13,13 @@ export function exec(command, options) {
     const callbackFuncName = getUniqueCallbackName();
 
     // Define the success callback function
-    window[callbackFuncName] = (stdout, stderr) => {
+    window[callbackFuncName] = (errno, stdout, stderr) => {
-      resolve({ stdout, stderr });
+      resolve({ errno, stdout, stderr });
       cleanup(callbackFuncName);
     };
 
-    // Define the failure callback function
+    function cleanup(successName) {
-    const errorFuncName = callbackFuncName + "_error";
-    window[errorFuncName] = (error) => {
-      reject(error);
-      cleanup(callbackFuncName, errorFuncName);
-    };
-
-    // Cleanup function to remove the callbacks
-    function cleanup(successName, errorName = successName) {
       delete window[successName];
-      if (errorName) {
-        delete window[errorName];
-      }
     }
 
     try {
@@ -38,19 +27,18 @@ export function exec(command, options) {
         command,
         JSON.stringify(options),
         callbackFuncName,
-        errorFuncName
       );
     } catch (error) {
       reject(error);
-      cleanup(callbackFuncName, errorFuncName);
+      cleanup(callbackFuncName);
     }
   });
 }
 
 export function fullScreen(isFullScreen) {
-    ksu.fullScreen(isFullScreen);
+  ksu.fullScreen(isFullScreen);
 }
 
 export function toast(message) {
-    ksu.toast(message);
+  ksu.toast(message);
-}
+}

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kernelsu",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Library for KernelSU's module WebUI",
   "main": "index.js",
   "scripts": {

manager/app/src/main/java/me/weishu/kernelsu/ui/screen/WebScreen.kt

@@ -79,16 +79,15 @@ class WebViewInterface(val context: Context, val webView: WebView) {
     }
 
     @JavascriptInterface
-    fun exec(cmd: String, successCallbackName: String, errorCallbackName: String) {
+    fun exec(cmd: String, callbackFunc: String) {
-        exec(cmd, null, successCallbackName, errorCallbackName)
+        exec(cmd, null, callbackFunc)
     }
 
     @JavascriptInterface
     fun exec(
         cmd: String,
         options: String?,
-        successCallbackName: String,
+        callbackFunc: String
-        errorCallbackName: String
     ) {
         val opts = if (options == null) JSONObject() else {
             JSONObject(options)
@@ -111,25 +110,17 @@ class WebViewInterface(val context: Context, val webView: WebView) {
 
         val shell = createRootShell()
         val result = shell.newJob().add(finalCommand.toString()).to(ArrayList(), ArrayList()).exec()
-        if (!result.isSuccess) {
+        val stdout = result.out.joinToString(separator = "\n")
-            val jsCode =
+        val stderr = result.err.joinToString(separator = "\n")
-                "javascript: (function() { try { ${errorCallbackName}(${result.code}); } catch(e) { console.error(e); } })();"
-            webView.post {
-                webView.loadUrl(jsCode)
-            }
-        } else {
-            val stdout = result.out.joinToString(separator = "\n")
-            val stderr = result.err.joinToString(separator = "\n")
 
-            val jsCode =
+        val jsCode =
-                "javascript: (function() { try { ${successCallbackName}(${JSONObject.quote(stdout)}, ${
+            "javascript: (function() { try { ${callbackFunc}(${result.code}, ${
-                    JSONObject.quote(
+                JSONObject.quote(
-                        stderr
+                    stdout
-                    )
+                )
-                }); } catch(e) { console.error(e); } })();"
+            }, ${JSONObject.quote(stderr)}); } catch(e) { console.error(e); } })();"
-            webView.post {
+        webView.post {
-                webView.loadUrl(jsCode)
+            webView.loadUrl(jsCode)
-            }
         }
     }