Code sync

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electerm-web",
-  "version": "2.39.104",
+  "version": "2.39.109",
   "description": "Running electerm in as web app",
   "main": "src/app/app.js",
   "type": "module",
@@ -47,7 +47,7 @@
   "preferGlobal": true,
   "devDependencies": {
     "@ant-design/icons": "5.2.6",
-    "@electerm/electerm-react": "^1.39.103",
+    "@electerm/electerm-react": "^1.39.109",
     "@electerm/electerm-resource": "1.3.7",
     "@electerm/strip-ansi": "^1.0.0",
     "@novnc/novnc": "^1.4.0",

src/app/server/session-sftp.js

@@ -54,7 +54,26 @@ class SftpBase extends TerminalBase {
    * @return {Promise}
    */
   getHomeDir () {
-    return this.runCmd('eval echo "~$different_user"')
+    // return this.runCmd('eval echo "~$different_user"')
+    // ext_home_dir
+    return this.getSftpHomeDir()
+      .catch(err => {
+        console.error('get home dir error', err)
+        return this.realpath('')
+      })
+  }
+
+  getSftpHomeDir () {
+    // return this.runCmd('eval echo "~$different_user"')
+    // ext_home_dir
+    return new Promise((resolve, reject) => {
+      this.sftp.ext_home_dir('', (err, path) => {
+        if (err) {
+          return reject(err)
+        }
+        resolve(path)
+      })
+    })
   }
 
   /**
@@ -66,19 +85,23 @@ class SftpBase extends TerminalBase {
    * @return {Promise}
    */
   rmdir (remotePath) {
-    return this.removeDirectoryRecursively(remotePath)
-    // if (this.enableSsh) {
-    //   return new Promise((resolve, reject) => {
-    //     const { client } = this
-    //     const cmd = `rm -rf "${remotePath}"`
-    //     client.exec(cmd, this.getExecOpts(), err => {
-    //       if (err) reject(err)
-    //       else resolve(1)
-    //     })
-    //   })
-    // } else {
-    //   return this.removeDirectoryRecursively(remotePath)
-    // }
+    return this.rmrf(remotePath)
+      .then(r => r)
+      .catch(err => {
+        console.error('rm -rf dir error', err)
+        return this.removeDirectoryRecursively(remotePath)
+      })
+  }
+
+  rmrf (remotePath) {
+    return new Promise((resolve, reject) => {
+      const { client } = this
+      const cmd = `rm -rf "${remotePath}"`
+      client.exec(cmd, this.getExecOpts(), err => {
+        if (err) reject(err)
+        else resolve(1)
+      })
+    })
   }
 
   async removeDirectoryRecursively (remotePath) {

src/app/server/ssh2-alg.js

@@ -71,5 +71,10 @@ export default {
     'hmac-sha2-256-etm@openssh.com',
     'hmac-sha2-512-etm@openssh.com',
     'hmac-sha1-etm@openssh.com'
+  ],
+  compress: [
+    'zlib@openssh.com',
+    'zlib',
+    'none'
   ]
 }