Skip to content

Commit

Permalink
Code sync
Browse files Browse the repository at this point in the history
  • Loading branch information
zxdong262 committed Dec 27, 2024
1 parent cf0dfd7 commit a68bfa8
Show file tree
Hide file tree
Showing 6 changed files with 253 additions and 246 deletions.
76 changes: 38 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electerm-web",
"version": "2.51.3",
"version": "2.51.8",
"description": "Running electerm in as web app",
"main": "src/app/app.js",
"type": "module",
Expand Down Expand Up @@ -47,7 +47,7 @@
"preferGlobal": true,
"devDependencies": {
"@ant-design/icons": "5.5.1",
"@electerm/electerm-react": "^1.51.3",
"@electerm/electerm-react": "^1.51.8",
"@electerm/electerm-resource": "1.3.7",
"@electerm/strip-ansi": "^1.0.0",
"@novnc/novnc": "^1.4.0",
Expand Down Expand Up @@ -92,6 +92,7 @@
"@electerm/electerm-locales": "2.0.11",
"@electerm/electerm-themes": "^1.0.1",
"@electerm/rdpjs": "^1.0.0",
"@electerm/ssh2": "1.16.0",
"@yetzt/nedb": "1.8.0",
"axios": "^1.7.7",
"dayjs": "^1.11.13",
Expand Down Expand Up @@ -123,7 +124,6 @@
"socks-proxy-agent": "8.0.1",
"socksv5": "^0.0.6",
"ssh-config": "5.0.1",
"ssh2": "1.16.0",
"strip-ansi": "^7.1.0",
"stylus": "0.64.0",
"tar": "^7.4.3"
Expand Down
30 changes: 13 additions & 17 deletions src/app/server/session-sftp.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,21 @@ class SftpBase extends TerminalBase {
getHomeDir () {
// 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('')
})
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)
})
})
}
// 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)
// })
// })
// }

/**
* rmdir
Expand Down
2 changes: 1 addition & 1 deletion src/app/server/session-ssh.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* terminal/sftp/serial class
*/
import { Client } from 'ssh2'
import { Client } from '@electerm/ssh2'
import proxySock from './socks.js'
import _ from 'lodash'
import uid from '../common/uid.js'
Expand Down
Loading

0 comments on commit a68bfa8

Please sign in to comment.