electerm 3.3.2 → 3.3.5

package/README.md

@@ -90,9 +90,6 @@ Check [https://electerm-repos.html5beta.com/deb](https://electerm-repos.html5bet
 ```bash
 npm i -g electerm
 
-# After installation, it will immediately open for windows and linux,
-# For macOS, it will open the drag to install panel
-
 ```
 
 ## Upgrade

package/npm/electerm

@@ -34,6 +34,21 @@ function getElectermExePath () {
   return path.join(packageRoot, 'electerm', 'electerm')
 }
 
+function isSandboxReady () {
+  // chrome-sandbox must be owned by root (uid 0) and have setuid bit set (mode 4755)
+  // This requires root during install, which npm global install does not provide.
+  try {
+    const sandboxPath = path.join(packageRoot, 'electerm', 'chrome-sandbox')
+    if (!fs.existsSync(sandboxPath)) return false
+    const stat = fs.statSync(sandboxPath)
+    const hasSetuid = (stat.mode & 0o4000) !== 0
+    const ownedByRoot = stat.uid === 0
+    return hasSetuid && ownedByRoot
+  } catch (e) {
+    return false
+  }
+}
+
 function launchElecterm () {
   const exePath = getElectermExePath()
 
@@ -46,7 +61,12 @@ function launchElecterm () {
     process.exit(1)
   }
 
-  const child = spawn(exePath, process.argv.slice(2), {
+  const extraArgs = []
+  if (plat === 'linux' && !isSandboxReady()) {
+    extraArgs.push('--no-sandbox')
+  }
+
+  const child = spawn(exePath, [...extraArgs, ...process.argv.slice(2)], {
     stdio: 'inherit',
     detached: plat !== 'win32',
     windowsHide: false

package/npm/install.js

@@ -192,11 +192,15 @@ async function runLinux (folderName, filePattern) {
   mv(join(tmpDir, extractedFolder), extractDir)
 
   // Fix chrome-sandbox permissions on Linux (Electron requires specific permissions)
+  // Note: setting the setuid bit requires root ownership, which npm install cannot provide.
+  // The launcher handles this by passing --no-sandbox when the sandbox is not root-owned.
   if (plat === 'linux') {
     const chromeSandboxPath = join(extractDir, 'chrome-sandbox')
     if (fs.existsSync(chromeSandboxPath)) {
-      console.log('  Fixing chrome-sandbox permissions...')
-      fs.chmodSync(chromeSandboxPath, 0o4755)
+      console.log('  Note: To enable the Electron sandbox, run:')
+      console.log(`    sudo chown root:root "${chromeSandboxPath}"`)
+      console.log(`    sudo chmod 4755 "${chromeSandboxPath}"`)
+      console.log('  Otherwise, electerm will launch with --no-sandbox automatically.')
     }
   }
 
@@ -207,23 +211,16 @@ async function runLinux (folderName, filePattern) {
 }
 
 async function runWin (archName) {
-  console.log('  [DEBUG] runWin started')
-  console.log(`  [DEBUG] packageRoot: ${packageRoot}`)
-  console.log(`  [DEBUG] extractDir: ${extractDir}`)
-
   const rawVer = await getVer()
   const ver = sanitizeVersion(rawVer)
 
-  console.log(`  [DEBUG] Raw version from server: ${rawVer}`)
-  console.log(`  Sanitized version: ${ver}`)
+  console.log(`  Version: ${ver}`)
   console.log(`  Target: win-${archName}`)
 
   const target = join(packageRoot, `electerm-${ver}-win-${archName}`)
-  console.log(`  [DEBUG] Target folder: ${target}`)
 
-  console.log('  Cleaning old installations...')
   rm('-rf', [target, extractDir])
-  console.log('  [DEBUG] Old installations cleaned')
+  fs.mkdirSync(extractDir, { recursive: true })
 
   const pattern = new RegExp(`electerm-\\d+\\.\\d+\\.\\d+-win-${archName}\\.tar\\.gz$`)
   console.log('  Fetching release info...')
@@ -231,70 +228,24 @@ async function runWin (archName) {
   if (!releaseInfo) {
     throw new Error(`No release found for Windows ${archName}`)
   }
-  console.log(`  [DEBUG] Release info found: ${JSON.stringify(releaseInfo, null, 2)}`)
 
+  // Download to a temp file, then extract directly to extractDir with strip:1
+  // (avoids a rename which can fail on Windows when AV has file locks)
   const tmpDir = join(packageRoot, '.electerm-tmp')
-  console.log(`  [DEBUG] Creating temp directory: ${tmpDir}`)
   rm('-rf', tmpDir)
   fs.mkdirSync(tmpDir, { recursive: true })
 
   const proxyUrl = applyProxy(releaseInfo.browser_download_url)
-  console.log(`  [DEBUG] Proxy URL: ${proxyUrl}`)
-  console.log(`  [DEBUG] Download URL: ${releaseInfo.browser_download_url}`)
+  console.log(`  URL: ${proxyUrl}`)
 
-  console.log('  Downloading...')
   const { filepath } = await download(releaseInfo.browser_download_url, tmpDir, { extract: false, displayName: releaseInfo.name })
-  console.log(`  [DEBUG] Downloaded to: ${filepath}`)
-  console.log(`  [DEBUG] File exists: ${fs.existsSync(filepath)}`)
-  console.log(`  [DEBUG] File size: ${fs.statSync(filepath).size}`)
-
-  console.log('  Extracting...')
-  await extractTarGz(filepath, tmpDir)
-  console.log('  [DEBUG] Extraction complete')
-
-  console.log('  [DEBUG] Listing temp directory contents:')
-  const entries = fs.readdirSync(tmpDir)
-  entries.forEach(e => {
-    const fullPath = join(tmpDir, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
-
-  const extractedFolder = entries.find(e => fs.statSync(join(tmpDir, e)).isDirectory())
-
-  if (!extractedFolder) {
-    console.error('  [DEBUG] No directory found in extracted archive')
-    console.error('  [DEBUG] All entries:', entries)
-    throw new Error('No folder found in extracted archive')
-  }
-
-  console.log(`  [DEBUG] Extracted folder: ${extractedFolder}`)
-  console.log('  [DEBUG] Contents of extracted folder:')
-  const extractedContents = fs.readdirSync(join(tmpDir, extractedFolder))
-  extractedContents.forEach(e => {
-    const fullPath = join(tmpDir, extractedFolder, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
 
   console.log(`  Installing to: ${extractDir}`)
-  fs.renameSync(join(tmpDir, extractedFolder), extractDir)
-  console.log('  [DEBUG] Renamed folder to extractDir')
-
-  console.log('  [DEBUG] Verifying extractDir contents:')
-  const installContents = fs.readdirSync(extractDir)
-  installContents.forEach(e => {
-    const fullPath = join(extractDir, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
+  await extractTarGz(filepath, extractDir, 1)
 
   rm('-rf', tmpDir)
-  console.log('  [DEBUG] Temp directory cleaned')
 
   const exePath = getElectermExePath()
-  console.log(`  [DEBUG] Expected exe path: ${exePath}`)
-  console.log(`  [DEBUG] Exe exists: ${fs.existsSync(exePath)}`)
   if (!fs.existsSync(exePath)) {
     throw new Error(`electerm.exe not found at ${exePath} after extraction. Archive may have an unexpected structure.`)
   }
@@ -303,93 +254,38 @@ async function runWin (archName) {
 }
 
 async function runWin7 () {
-  console.log('  [DEBUG] runWin7 started')
-  console.log(`  [DEBUG] packageRoot: ${packageRoot}`)
-  console.log(`  [DEBUG] extractDir: ${extractDir}`)
-
   const rawVer = await getVer()
   const ver = sanitizeVersion(rawVer)
 
-  console.log(`  [DEBUG] Raw version from server: ${rawVer}`)
-  console.log(`  Sanitized version: ${ver}`)
+  console.log(`  Version: ${ver}`)
   console.log('  Target: win7')
 
   const target = join(packageRoot, `electerm-${ver}-win7`)
-  console.log(`  [DEBUG] Target folder: ${target}`)
 
-  console.log('  Cleaning old installations...')
   rm('-rf', [target, extractDir])
-  console.log('  [DEBUG] Old installations cleaned')
+  fs.mkdirSync(extractDir, { recursive: true })
 
   console.log('  Fetching release info...')
   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')
   }
-  console.log(`  [DEBUG] Release info found: ${JSON.stringify(releaseInfo, null, 2)}`)
 
   const tmpDir = join(packageRoot, '.electerm-tmp')
-  console.log(`  [DEBUG] Creating temp directory: ${tmpDir}`)
   rm('-rf', tmpDir)
   fs.mkdirSync(tmpDir, { recursive: true })
 
   const proxyUrl = applyProxy(releaseInfo.browser_download_url)
-  console.log(`  [DEBUG] Proxy URL: ${proxyUrl}`)
-  console.log(`  [DEBUG] Download URL: ${releaseInfo.browser_download_url}`)
+  console.log(`  URL: ${proxyUrl}`)
 
-  console.log('  Downloading...')
   const { filepath } = await download(releaseInfo.browser_download_url, tmpDir, { extract: false, displayName: releaseInfo.name })
-  console.log(`  [DEBUG] Downloaded to: ${filepath}`)
-  console.log(`  [DEBUG] File exists: ${fs.existsSync(filepath)}`)
-  console.log(`  [DEBUG] File size: ${fs.statSync(filepath).size}`)
-
-  console.log('  Extracting...')
-  await extractTarGz(filepath, tmpDir)
-  console.log('  [DEBUG] Extraction complete')
-
-  console.log('  [DEBUG] Listing temp directory contents:')
-  const entries = fs.readdirSync(tmpDir)
-  entries.forEach(e => {
-    const fullPath = join(tmpDir, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
-
-  const extractedFolder = entries.find(e => fs.statSync(join(tmpDir, e)).isDirectory())
-
-  if (!extractedFolder) {
-    console.error('  [DEBUG] No directory found in extracted archive')
-    console.error('  [DEBUG] All entries:', entries)
-    throw new Error('No folder found in extracted archive')
-  }
-
-  console.log(`  [DEBUG] Extracted folder: ${extractedFolder}`)
-  console.log('  [DEBUG] Contents of extracted folder:')
-  const extractedContents = fs.readdirSync(join(tmpDir, extractedFolder))
-  extractedContents.forEach(e => {
-    const fullPath = join(tmpDir, extractedFolder, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
 
   console.log(`  Installing to: ${extractDir}`)
-  fs.renameSync(join(tmpDir, extractedFolder), extractDir)
-  console.log('  [DEBUG] Renamed folder to extractDir')
-
-  console.log('  [DEBUG] Verifying extractDir contents:')
-  const installContents = fs.readdirSync(extractDir)
-  installContents.forEach(e => {
-    const fullPath = join(extractDir, e)
-    const stat = fs.statSync(fullPath)
-    console.log(`    [DEBUG] ${e} - ${stat.isDirectory() ? 'DIR' : 'FILE'} (${stat.size} bytes)`)
-  })
+  await extractTarGz(filepath, extractDir, 1)
 
   rm('-rf', tmpDir)
-  console.log('  [DEBUG] Temp directory cleaned')
 
   const exePath = getElectermExePath()
-  console.log(`  [DEBUG] Expected exe path: ${exePath}`)
-  console.log(`  [DEBUG] Exe exists: ${fs.existsSync(exePath)}`)
   if (!fs.existsSync(exePath)) {
     throw new Error(`electerm.exe not found at ${exePath} after extraction. Archive may have an unexpected structure.`)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electerm",
-  "version": "3.3.2",
+  "version": "3.3.5",
   "description": "Terminal/ssh/telnet/serialport/sftp client(linux, mac, win)",
   "main": "app.js",
   "bin": "npm/electerm",