electerm 2.3.126 → 2.3.166

package/README.md

@@ -133,12 +133,13 @@ wechat donate
 ## Dev
 
 ```bash
-# tested in ubuntu20.04+/mac os 10.13+ only
-# needs nodejs/npm, suggest using fnm to install nodejs/npm
+# May only works in Linux
+# needs nodejs/npm, suggest using nvm to install nodejs/npm
 # with nodejs 22.x
 
 git clone git@github.com:electerm/electerm.git
 cd electerm
+npm config set legacy-peer-deps true
 npm i
 
 # start vite dev server, requires port 5570
@@ -168,7 +169,7 @@ npm run test
 ## Test build
 
 ```bash
-# Tested only in ubuntu 16.04 x64+
+# May only works in Linux
 # Install yarn first(to do yarn autoclean)
 # See https://yarnpkg.com/en/docs/install
 
@@ -184,9 +185,9 @@ npm run pb
 ./node_modules/.bin/electron-builder --linux --arm64
 ```
 
-## Video guides
+## Video guide
 
-- [bilibili](https://space.bilibili.com/14001525/channel/series?sid=5461229&spm_id_from=333.788.0.0)
+- [https://electerm.html5beta.com/videos](https://electerm.html5beta.com/videos)
 
 ## Change log
 

package/npm/install.js

@@ -8,12 +8,7 @@ const { exec, rm, mv } = require('shelljs')
 const rp = require('phin').promisified
 const download = require('download')
 const plat = os.platform()
-const isWin = plat === 'win32'
-const isMac = plat === 'darwin'
-const isLinux = plat === 'linux'
 const arch = os.arch()
-const isArm = arch === 'arm'
-const isArm64 = arch === 'arm64'
 const { homepage } = require('../package.json')
 const releaseInfoUrl = `${homepage}/data/electerm-github-release.json?_=${+new Date()}`
 const versionUrl = `${homepage}/version.html?_=${+new Date()}`
@@ -47,49 +42,234 @@ function getReleaseInfo (filter) {
     })
 }
 
-async function runLinux (name, nameWithExt) {
+function showFinalMessage () {
+  console.log('\n========================================')
+  console.log('electerm installation complete!')
+  console.log('========================================')
+  console.log('\nFor more information, documentation, and updates, please visit:')
+  console.log('\x1b[36m%s\x1b[0m', 'https://electerm.html5beta.com')
+  console.log('\nThank you for using electerm!')
+  console.log('========================================\n')
+}
+
+// Check if running on Windows 7 or earlier
+function isWindows7OrEarlier (platform, release) {
+  if (platform !== 'win32') return false
+  // Windows 7 is NT 6.1, Windows 8 is NT 6.2, Windows 10 is NT 10.0
+  const [major, minor] = release.split('.').map(Number)
+  return major < 10 && (major < 6 || (major === 6 && minor <= 1))
+}
+
+// Check if running on macOS 10.x (older than Big Sur 11.0)
+function isMacOS10 (platform, release) {
+  if (platform !== 'darwin') return false
+  // Darwin kernel version: macOS 11 (Big Sur) = Darwin 20.x, macOS 10.15 = Darwin 19.x
+  const majorVersion = parseInt(release.split('.')[0], 10)
+  return majorVersion < 20
+}
+
+// Check if running on Linux with old glibc (< 2.34)
+function isLinuxLegacy (platform, glibcVersion) {
+  if (platform !== 'linux') return false
+  if (typeof glibcVersion === 'number') {
+    return glibcVersion < 2.34
+  }
+  try {
+    const result = exec('ldd --version 2>&1 | head -n1', { silent: true })
+    if (result.code !== 0) return false
+    const output = result.stdout || ''
+    // Extract version number like "ldd (GNU libc) 2.31" or "ldd (Ubuntu GLIBC 2.35-0ubuntu3) 2.35"
+    const match = output.match(/(\d+\.\d+)\s*$/)
+    if (match) {
+      const version = parseFloat(match[1])
+      return version < 2.34
+    }
+    return false
+  } catch (e) {
+    return false
+  }
+}
+
+// Get the file pattern for download based on platform/arch/legacy status
+function getDownloadPattern (platform, architecture, options = {}) {
+  const { win7, mac10, linuxLegacy } = options
+
+  if (platform === 'win32') {
+    if (win7) {
+      return { pattern: /electerm-\d+\.\d+\.\d+-win7\.tar\.gz$/, type: 'win7' }
+    } else if (architecture === 'arm64') {
+      return { pattern: /electerm-\d+\.\d+\.\d+-win-arm64\.tar\.gz$/, type: 'win-arm64' }
+    } else {
+      return { pattern: /electerm-\d+\.\d+\.\d+-win-x64\.tar\.gz$/, type: 'win-x64' }
+    }
+  } else if (platform === 'darwin') {
+    if (mac10) {
+      return { pattern: /mac10-x64\.dmg$/, type: 'mac10-x64' }
+    } else if (architecture === 'arm64') {
+      return { pattern: /mac-arm64\.dmg$/, type: 'mac-arm64' }
+    } else {
+      return { pattern: /mac-x64\.dmg$/, type: 'mac-x64' }
+    }
+  } else if (platform === 'linux') {
+    const suffix = linuxLegacy ? '-legacy' : ''
+    if (architecture === 'arm64') {
+      return { pattern: new RegExp(`linux-arm64${suffix}\\.tar\\.gz$`), type: `linux-arm64${suffix}` }
+    } else if (architecture === 'arm') {
+      return { pattern: new RegExp(`linux-armv7l${suffix}\\.tar\\.gz$`), type: `linux-armv7l${suffix}` }
+    } else {
+      return { pattern: new RegExp(`linux-x64${suffix}\\.tar\\.gz$`), type: `linux-x64${suffix}` }
+    }
+  }
+  return { pattern: null, type: 'unsupported' }
+}
+
+async function runLinux (folderName, filePattern) {
   const ver = await getVer()
-  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-${name}`)
+  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-${folderName}`)
   const targetNew = resolve(__dirname, '../electerm')
   exec(`rm -rf ${target} ${targetNew}`)
-  const releaseInfo = await getReleaseInfo(r => r.name.includes(nameWithExt))
+  const releaseInfo = await getReleaseInfo(r => r.name.includes(filePattern))
+  if (!releaseInfo) {
+    throw new Error(`No release found for pattern: ${filePattern}`)
+  }
   await down(releaseInfo.browser_download_url)
-  // await down('http://192.168.0.67:7500/electerm-0.16.1.tar.gz')
   exec(`mv ${target} ${targetNew}`)
+  showFinalMessage()
   exec('electerm')
 }
 
-async function runMac () {
-  const releaseInfo = await getReleaseInfo(r => /mac-x64\.dmg$/.test(r.name))
+async function runMac (archName) {
+  const pattern = new RegExp(`mac-${archName}\\.dmg$`)
+  const releaseInfo = await getReleaseInfo(r => pattern.test(r.name))
+  if (!releaseInfo) {
+    throw new Error(`No release found for Mac ${archName}`)
+  }
   await down(releaseInfo.browser_download_url, false)
-  // await down('http://192.168.0.67:7500/electerm-0.16.1-mac.dmg', false)
   const target = resolve(__dirname, '../', releaseInfo.name)
+  showFinalMessage()
   exec(`open ${target}`)
 }
 
-async function runWin () {
+// macOS 10.x specific version
+async function runMac10 () {
+  const releaseInfo = await getReleaseInfo(r => /mac10-x64\.dmg$/.test(r.name))
+  if (!releaseInfo) {
+    throw new Error('No release found for macOS 10.x')
+  }
+  await down(releaseInfo.browser_download_url, false)
+  const target = resolve(__dirname, '../', releaseInfo.name)
+  showFinalMessage()
+  exec(`open ${target}`)
+}
+
+async function runWin (archName) {
   const ver = await getVer()
-  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-win-x64`)
+  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-win-${archName}`)
   const targetNew = resolve(__dirname, '../electerm')
   rm('-rf', [
     target,
     targetNew
   ])
-  const releaseInfo = await getReleaseInfo(r => /electerm-\d+\.\d+\.\d+-win-x64\.tar\.gz/.test(r.name))
+  const pattern = new RegExp(`electerm-\\d+\\.\\d+\\.\\d+-win-${archName}\\.tar\\.gz$`)
+  const releaseInfo = await getReleaseInfo(r => pattern.test(r.name))
+  if (!releaseInfo) {
+    throw new Error(`No release found for Windows ${archName}`)
+  }
   await down(releaseInfo.browser_download_url)
-  // await down('http://192.168.0.67:7500/electerm-0.16.1-win.tar.gz')
   await mv(target, targetNew)
+  showFinalMessage()
   require('child_process').execFile(`${targetNew}\\electerm.exe`)
 }
 
-if (isWin) {
-  runWin()
-} else if (isMac) {
-  runMac()
-} else if (isLinux && isArm) {
-  runLinux('linux-armv7l', 'linux-armv7l.tar.gz')
-} else if (isLinux && isArm64) {
-  runLinux('linux-arm64', 'linux-arm64.tar.gz')
-} else {
-  throw new Error(`platform: ${plat}, arch: ${arch} not supported`)
+// Windows 7 specific version
+async function runWin7 () {
+  const ver = await getVer()
+  const target = resolve(__dirname, `../electerm-${ver.replace('v', '')}-win7`)
+  const targetNew = resolve(__dirname, '../electerm')
+  rm('-rf', [
+    target,
+    targetNew
+  ])
+  const releaseInfo = await getReleaseInfo(r => /electerm-\d+\.\d+\.\d+-win7\.tar\.gz$/.test(r.name))
+  if (!releaseInfo) {
+    throw new Error('No release found for Windows 7')
+  }
+  await down(releaseInfo.browser_download_url)
+  await mv(target, targetNew)
+  showFinalMessage()
+  require('child_process').execFile(`${targetNew}\\electerm.exe`)
+}
+
+async function main () {
+  console.log(`Detected platform: ${plat}, architecture: ${arch}`)
+
+  // Check for legacy systems
+  const win7 = isWindows7OrEarlier(plat, os.release())
+  const mac10 = isMacOS10(plat, os.release())
+  const linuxLegacy = isLinuxLegacy(plat)
+
+  if (win7) console.log('Detected: Windows 7 or earlier')
+  if (mac10) console.log('Detected: macOS 10.x')
+  if (linuxLegacy) console.log('Detected: Linux with glibc < 2.34 (legacy)')
+
+  console.log('Fetching release information...\n')
+
+  try {
+    if (plat === 'win32') {
+      // Windows: x64, arm64, win7
+      if (win7) {
+        await runWin7()
+      } else if (arch === 'arm64') {
+        await runWin('arm64')
+      } else {
+        // Default to x64 for all other Windows architectures
+        await runWin('x64')
+      }
+    } else if (plat === 'darwin') {
+      // macOS: x64, arm64, mac10
+      if (mac10) {
+        await runMac10()
+      } else if (arch === 'arm64') {
+        await runMac('arm64')
+      } else {
+        // Default to x64 for Intel Macs
+        await runMac('x64')
+      }
+    } else if (plat === 'linux') {
+      // Linux: x64, arm64, armv7l (with legacy variants)
+      const suffix = linuxLegacy ? '-legacy' : ''
+      if (arch === 'arm64') {
+        await runLinux(`linux-arm64${suffix}`, `linux-arm64${suffix}.tar.gz`)
+      } else if (arch === 'arm') {
+        await runLinux(`linux-armv7l${suffix}`, `linux-armv7l${suffix}.tar.gz`)
+      } else {
+        // Default to x64 for all other Linux architectures
+        await runLinux(`linux-x64${suffix}`, `linux-x64${suffix}.tar.gz`)
+      }
+    } else {
+      throw new Error(`Platform "${plat}" is not supported.`)
+    }
+  } catch (err) {
+    console.error('\n========================================')
+    console.error('Installation failed!')
+    console.error('========================================')
+    console.error(`Error: ${err.message}`)
+    console.error(`\nPlatform: ${plat}, Architecture: ${arch}`)
+    console.error('\nPlease visit https://electerm.html5beta.com for manual download options.')
+    console.error('========================================\n')
+    process.exit(1)
+  }
+}
+
+// Export functions for testing
+module.exports = {
+  isWindows7OrEarlier,
+  isMacOS10,
+  isLinuxLegacy,
+  getDownloadPattern
+}
+
+// Run main only if this file is executed directly
+if (require.main === module) {
+  main()
 }

package/package.json

@@ -1,39 +1,14 @@
 {
   "name": "electerm",
-  "version": "2.3.126",
+  "version": "2.3.166",
   "description": "Terminal/ssh/telnet/serialport/sftp client(linux, mac, win)",
   "main": "app.js",
   "bin": "npm/electerm",
   "scripts": {
-    "app": "node build/bin/app",
-    "build": "npm run vite-build",
-    "start": "node build/bin/start.js",
-    "icon": "node build/bin/icon",
-    "clean": "node build/bin/clean",
-    "compile": "node build/bin/build",
-    "vite-build": "node build/bin/vite-build.js",
-    "prepublishOnly": "node build/bin/prepublish",
-    "postpublish": "node build/bin/postpublish",
-    "prepare-file": "node build/bin/prepare",
-    "pb": "node build/bin/prepare-electron-build.js",
-    "prepare-test": "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npm i -E playwright@1.28.1 --no-save && npm i -E @playwright/test@1.28.1 --no-save",
-    "postinstall": "node build/bin/post-install",
-    "lint": "./node_modules/.bin/standard --verbose",
-    "fix": "./node_modules/.bin/standard --fix",
-    "test": "npm run test1 && npm run test2",
-    "test1": "./node_modules/.bin/playwright test test/e2e/00*.js --workers=1",
-    "test2": "./node_modules/.bin/playwright test test/e2e/01*.js --workers=1",
-    "b": "npm run clean && npm run compile && npm run prepare-file",
-    "r": "./build/bin/release",
-    "w": "./build/bin/web-release",
-    "t": "./node_modules/.bin/electron work/app/app.js",
-    "lock": "npm i --package-lock-only"
+    "postinstall": "node npm/install.js",
+    "postpublish": "node bin/postpublish.js"
   },
   "license": "MIT",
-  "langugeRepo": "https://github.com/electerm/electerm-locales",
-  "privacyNoticeLink": "https://github.com/electerm/electerm/wiki/privacy-notice",
-  "knownIssuesLink": "https://github.com/electerm/electerm/wiki/Know-issues",
-  "sponsorLink": "https://electerm.html5beta.com/sponsor-electerm.html",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/electerm/electerm.git"
@@ -47,112 +22,18 @@
     "url": "https://github.com/electerm/electerm/issues"
   },
   "homepage": "https://electerm.html5beta.com",
-  "releases": "https://github.com/electerm/electerm/releases",
   "engines": {
     "node": ">=16.0.0"
   },
   "preferGlobal": true,
-  "devDependencies": {
-    "@ant-design/icons": "5.6.1",
-    "@electerm/electerm-resource": "1.3.7",
-    "@electron/rebuild": "4.0.1",
-    "@fontsource/maple-mono": "^5.2.5",
-    "@novnc/novnc": "1.4.0",
-    "@types/node": "22.9.3",
-    "@vitejs/plugin-react": "4.3.4",
-    "@xterm/addon-attach": "0.11.0",
-    "@xterm/addon-canvas": "0.7.0",
-    "@xterm/addon-fit": "0.10.0",
-    "@xterm/addon-ligatures": "0.9.0",
-    "@xterm/addon-search": "0.15.0",
-    "@xterm/addon-unicode11": "0.8.0",
-    "@xterm/addon-web-links": "0.11.0",
-    "@xterm/addon-webgl": "0.18.0",
-    "@xterm/xterm": "5.5.0",
-    "antd": "5.27.1",
-    "classnames": "2.5.1",
-    "cross-env": "7.0.3",
-    "dotenv": "16.4.5",
-    "electerm-icons": "1.0.1",
-    "electron": "38.2.2",
-    "electron-builder": "26.0.20",
-    "filesize": "10.1.6",
-    "filesize-parser": "1.5.1",
-    "firacode": "^6.2.0",
-    "ftp-srv": "^4.6.3",
-    "glob": "^11.0.0",
-    "lodash-es": "^4.17.21",
-    "manate": "2.0.0",
-    "morgan": "1.10.1",
-    "pug": "3.0.3",
-    "react": "18.3.1",
-    "react-colorful": "^5.6.1",
-    "react-delta-hooks": "1.1.5",
-    "react-dom": "18.3.1",
-    "react-markdown": "9.0.1",
-    "replace-in-file": "6.3.5",
-    "shelljs": "0.8.5",
-    "standard": "^17.1.0",
-    "stylus": "^0.64.0",
-    "trzsz": "^1.1.3",
-    "vite": "6.3.6",
-    "vite-plugin-commonjs": "0.10.4",
-    "zmodem-ts": "1.0.4"
-  },
   "dependencies": {
-    "@electerm/electerm-locales": "2.1.53",
-    "@electerm/electerm-themes": "^1.0.1",
-    "@electerm/nedb": "1.8.0",
-    "@electerm/rdpjs": "^1.0.0",
-    "@electerm/ssh2": "1.16.2",
-    "@electerm/strip-ansi": "1.0.0",
-    "axios": "1.12.2",
-    "basic-ftp": "^5.0.5",
-    "commander": "12.1.0",
-    "diffie-hellman": "^5.0.3",
-    "electerm-sync": "1.2.1",
-    "electron-log": "4.3.5",
-    "express": "4.21.2",
-    "express-ws": "5.0.2",
-    "fast-deep-equal": "3.1.3",
-    "find-free-port": "2.0.0",
-    "font-list": "1.5.1",
-    "gist-wrapper": "0.4.1",
-    "gitee-client": "0.2.0",
-    "https-proxy-agent": "7.0.1",
-    "json-deep-copy": "1.3.1",
-    "jsonwebtoken": "^9.0.1",
-    "nanoid": "3.3.8",
-    "node-bash": "5.0.1",
-    "node-pty": "1.1.0-beta34",
-    "os-locale-s": "1.0.8",
-    "serialport": "13.0.0",
-    "socks": "2.7.1",
-    "socks-proxy-agent": "8.0.1",
-    "socksv5-electron": "^0.0.6",
-    "ssh-config": "5.0.1",
-    "tar": "7.4.3"
+    "shelljs": "*",
+    "phin": "*",
+    "download": "*"
   },
   "files": [
     "npm",
     "README.md",
     "LICENSE"
-  ],
-  "standard": {
-    "sourceType": "module",
-    "ignore": [
-      "/app/assets/",
-      "src/client/entry/rle.js"
-    ],
-    "globals": [
-      "log",
-      "MouseEvent",
-      "WebSocket",
-      "FileReader",
-      "CustomEvent",
-      "onmessage",
-      "requestAnimationFrame",
-      "self"
-    ]
-  }
-}
+  ]
+}