chore: update ssh lib to 3.1.2 from 3.0.6

- updated ssh library
- few bug fixes
- removed deprecated apis
- experimental logging of native logs in js logger

Author: bajrangCoder

.gitignore

@@ -11,3 +11,4 @@
 .DS_Store
 pnpm-lock.yaml
 .zed
+.idea

src/plugins/sftp/plugin.xml

@@ -25,5 +25,5 @@
     </platform>
 
     <framework src="commons-io:commons-io:2.11.0" />
-    <framework src="com.sshtools:maverick-synergy-client:3.0.6" />
+    <framework src="com.sshtools:maverick-synergy-client:3.1.2" />
 </plugin>

src/plugins/sftp/src/com/foxdebug/sftp/Sftp.java

@@ -6,9 +6,10 @@
 import android.net.Uri;
 import android.util.Log;
 import androidx.documentfile.provider.DocumentFile;
-import com.sshtools.client.PublicKeyAuthenticator;
 import com.sshtools.client.SshClient;
+import com.sshtools.client.SshClient.SshClientBuilder;
 import com.sshtools.client.sftp.SftpClient;
+import com.sshtools.client.sftp.SftpClient.SftpClientBuilder;
 import com.sshtools.client.sftp.SftpFile;
 import com.sshtools.client.sftp.TransferCancelledException;
 import com.sshtools.common.permissions.PermissionDeniedException;
@@ -51,6 +52,7 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
     super.initialize(cordova, webView);
     context = cordova.getContext();
     activity = cordova.getActivity();
+    System.setProperty("maverick.log.nothread", "true");
   }
 
   public boolean execute(
@@ -91,10 +93,18 @@ public void run() {
               int port = args.optInt(1);
               String username = args.optString(2);
               String password = args.optString(3);
-              ssh = new SshClient(host, port, username, password.toCharArray());
+              ssh = SshClientBuilder.create()
+                .withHostname(host)
+                .withPort(port)
+                .withUsername(username)
+                .withPassword(password)
+                .build();
+
               if (ssh.isConnected()) {
                 connectionID = username + "@" + host;
-                sftp = new SftpClient(ssh);
+
+                sftp = SftpClientBuilder.create().withClient(ssh).build();
+
                 try {
                   sftp.getSubsystemChannel().setCharsetEncoding("UTF-8");
                 } catch (UnsupportedEncodingException | SshException e) {
@@ -139,22 +149,18 @@ public void run() {
               Uri uri = file.getUri();
               ContentResolver contentResolver = context.getContentResolver();
               InputStream in = contentResolver.openInputStream(uri);
-              SshKeyPair pair = SshKeyUtils.getPrivateKey(in, passphrase);
-
-              try {
-                pair = SshKeyUtils.makeRSAWithSHA256Signature(pair);
-                pair = SshKeyUtils.makeRSAWithSHA512Signature(pair);
-              } catch (Exception e) {
-                // ignore
-              }
-
-              ssh = new SshClient(host, port, username);
 
-              ssh.authenticate(new PublicKeyAuthenticator(pair), 30000);
+              ssh = SshClientBuilder.create()
+                .withHostname(host)
+                .withPort(port)
+                .withUsername(username)
+                .withIdentities(SshKeyUtils.getPrivateKey(in, passphrase))
+                .build();
 
               if (ssh.isConnected()) {
                 connectionID = username + "@" + host;
-                sftp = new SftpClient(ssh);
+                sftp = SftpClientBuilder.create().withClient(ssh).build();
+
                 try {
                   sftp.getSubsystemChannel().setCharsetEncoding("UTF-8");
                 } catch (UnsupportedEncodingException | SshException e) {
@@ -190,7 +196,6 @@ public void run() {
             try {
               String command = args.optString(0);
               if (ssh != null) {
-                callback.success("hiiii");
                 JSONObject res = new JSONObject();
                 StringBuffer buffer = new StringBuffer();
                 int code = ssh.executeCommandWithResult(command, buffer);
@@ -331,21 +336,23 @@ public void run() {
                   if (filename.equals(".") || filename.equals("..")) {
                     continue;
                   }
-                  SftpFileAttributes fileAttributes = file.getAttributes();
+                  SftpFileAttributes fileAttributes = file.attributes();
                   JSONObject fileInfo = new JSONObject();
                   fileInfo.put("name", filename);
                   fileInfo.put("exists", true);
-                  fileInfo.put("canRead", file.canRead());
-                  fileInfo.put("canWrite", file.canWrite());
 
                   if (fileAttributes != null) {
-                    String permissions = fileAttributes.getPermissionsString();
+                    String permissions = fileAttributes.toPermissionsString();
+                    boolean canRead = permissions.charAt(1) == 'r';
+                    boolean canWrite = permissions.charAt(2) == 'w';
+                    fileInfo.put("canRead", canRead);
+                    fileInfo.put("canWrite", canWrite);
                     fileInfo.put("permissions", permissions);
-                    fileInfo.put("length", fileAttributes.getSize());
+                    fileInfo.put("length", fileAttributes.size());
                     fileInfo.put("url", file.getAbsolutePath());
                     fileInfo.put(
                       "lastModified",
-                      fileAttributes.getModifiedDateTime()
+                      fileAttributes.lastModifiedTime()
                     );
 
                     if (permissions.charAt(0) == 'l') {
@@ -405,7 +412,7 @@ public void run() {
                 try {
                   SftpFileAttributes fileAttributes = sftp.stat(uri.getPath());
                   if (fileAttributes != null) {
-                    String permissions = fileAttributes.getPermissionsString();
+                    String permissions = fileAttributes.toPermissionsString();
                     boolean canRead = permissions.charAt(1) == 'r';
                     boolean canWrite = permissions.charAt(2) == 'w';
 
@@ -415,14 +422,14 @@ public void run() {
                     fileStat.put("isLink", fileAttributes.isLink());
                     fileStat.put("isDirectory", fileAttributes.isDirectory());
                     fileStat.put("isFile", fileAttributes.isFile());
-                    fileStat.put("length", fileAttributes.getSize());
+                    fileStat.put("length", fileAttributes.size());
                     fileStat.put(
                       "permissions",
-                      fileAttributes.getPermissionsString()
+                      fileAttributes.toPermissionsString()
                     );
                     fileStat.put(
                       "lastModified",
-                      fileAttributes.getModifiedDateTime()
+                      fileAttributes.lastModifiedTime()
                     );
                     String[] pathSegments = uri.getPath().split("/");
                     String filename = pathSegments[pathSegments.length - 1];

src/plugins/system/android/com/foxdebug/system/System.java

@@ -31,6 +31,8 @@
 import androidx.core.graphics.drawable.IconCompat;
 import com.foxdebug.system.Ui.Theme;
 import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
@@ -65,6 +67,31 @@ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
     this.context = cordova.getContext();
     this.activity = cordova.getActivity();
     this.webView = webView;
+
+    // Set up global exception handler
+    Thread.setDefaultUncaughtExceptionHandler(
+      new Thread.UncaughtExceptionHandler() {
+        @Override
+        public void uncaughtException(Thread thread, Throwable ex) {
+          StringWriter sw = new StringWriter();
+          PrintWriter pw = new PrintWriter(sw);
+          ex.printStackTrace(pw);
+          String stackTrace = sw.toString();
+
+          String errorMsg = String.format(
+            "Uncaught Exception: %s\nStack trace: %s",
+            ex.getMessage(),
+            stackTrace
+          );
+
+          sendLogToJavaScript("error", errorMsg);
+
+          // rethrow to the default handler
+          Thread.getDefaultUncaughtExceptionHandler()
+            .uncaughtException(thread, ex);
+        }
+      }
+    );
   }
 
   public boolean execute(
@@ -210,6 +237,21 @@ public void run() {
     return true;
   }
 
+  private void sendLogToJavaScript(String level, String message) {
+    final String js =
+      "window.log('" + level + "', " + JSONObject.quote(message) + ");";
+    cordova
+      .getActivity()
+      .runOnUiThread(
+        new Runnable() {
+          @Override
+          public void run() {
+            webView.loadUrl("javascript:" + js);
+          }
+        }
+      );
+  }
+
   private void getConfiguration(CallbackContext callback) {
     try {
       JSONObject result = new JSONObject();