electerm 3.3.1 → 3.3.3

package/npm/electerm

@@ -18,56 +18,37 @@ const os = require('os')
 const plat = os.platform()
 const packageRoot = path.resolve(__dirname, '..')
 
-/**
- * Get the path to the installed electerm binary
- */
 function getElectermExePath () {
-  // macOS: prefer the installed app in /Applications
   if (plat === 'darwin') {
     const appBinary = '/Applications/electerm.app/Contents/MacOS/electerm'
     if (fs.existsSync(appBinary)) {
       return appBinary
     }
-    // Fallback: extracted folder
     return path.join(packageRoot, 'electerm', 'electerm')
   }
 
-  // Windows
   if (plat === 'win32') {
     return path.join(packageRoot, 'electerm', 'electerm.exe')
   }
 
-  // Linux
   return path.join(packageRoot, 'electerm', 'electerm')
 }
 
-/**
- * Check if the electerm binary exists
- */
-function isElectermInstalled () {
-  return fs.existsSync(getElectermExePath())
-}
-
-/**
- * Launch the installed electerm binary
- */
 function launchElecterm () {
   const exePath = getElectermExePath()
 
   if (!fs.existsSync(exePath)) {
-    console.error('Error: electerm binary not found at:', exePath)
+    console.error('electerm binary not found at:', exePath)
     console.error('')
-    console.error('The binary may not have been installed. Try running:')
+    console.error('The binary may not have been installed properly.')
+    console.error('Try running manually:')
     console.error('  node', path.join(packageRoot, 'npm', 'install.js'))
     process.exit(1)
   }
 
-  // Spawn the binary, passing through all args
   const child = spawn(exePath, process.argv.slice(2), {
     stdio: 'inherit',
-    // On macOS/Linux, detach so the app survives if the terminal closes
     detached: plat !== 'win32',
-    // On Windows, don't create a console window for the spawn
     windowsHide: false
   })
 
@@ -85,16 +66,8 @@ function launchElecterm () {
   })
 }
 
-// ---------------------------------------------------------------------------
-// Main
-// ---------------------------------------------------------------------------
-
-if (!isElectermInstalled()) {
-  console.error('electerm binary not found. It should have been installed during npm install.')
-  console.error('')
-  console.error('Try running manually:')
-  console.error('  node', path.join(packageRoot, 'npm', 'install.js'))
-  process.exit(1)
+if (require.main === module) {
+  launchElecterm()
 }
 
-launchElecterm()
+module.exports = { launchElecterm }

package/npm/install.js

@@ -191,6 +191,15 @@ async function runLinux (folderName, filePattern) {
   console.log(`  Installing to: ${extractDir}`)
   mv(join(tmpDir, extractedFolder), extractDir)
 
+  // Fix chrome-sandbox permissions on Linux (Electron requires specific permissions)
+  if (plat === 'linux') {
+    const chromeSandboxPath = join(extractDir, 'chrome-sandbox')
+    if (fs.existsSync(chromeSandboxPath)) {
+      console.log('  Fixing chrome-sandbox permissions...')
+      fs.chmodSync(chromeSandboxPath, 0o4755)
+    }
+  }
+
   // Clean up temp files
   rm('-rf', tmpDir)
 
@@ -207,6 +216,7 @@ async function runWin (archName) {
   const target = join(packageRoot, `electerm-${ver}-win-${archName}`)
 
   rm('-rf', [target, extractDir])
+  fs.mkdirSync(extractDir, { recursive: true })
 
   const pattern = new RegExp(`electerm-\\d+\\.\\d+\\.\\d+-win-${archName}\\.tar\\.gz$`)
   console.log('  Fetching release info...')
@@ -215,7 +225,8 @@ async function runWin (archName) {
     throw new Error(`No release found for Windows ${archName}`)
   }
 
-  // Extract to temp, then move
+  // 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')
   rm('-rf', tmpDir)
   fs.mkdirSync(tmpDir, { recursive: true })
@@ -225,19 +236,16 @@ async function runWin (archName) {
 
   const { filepath } = await download(releaseInfo.browser_download_url, tmpDir, { extract: false, displayName: releaseInfo.name })
 
-  await extractTarGz(filepath, tmpDir)
+  console.log(`  Installing to: ${extractDir}`)
+  await extractTarGz(filepath, extractDir, 1)
 
-  const entries = fs.readdirSync(tmpDir)
-  const extractedFolder = entries.find(e => fs.statSync(join(tmpDir, e)).isDirectory())
+  rm('-rf', tmpDir)
 
-  if (!extractedFolder) {
-    throw new Error('No folder found in extracted archive')
+  const exePath = getElectermExePath()
+  if (!fs.existsSync(exePath)) {
+    throw new Error(`electerm.exe not found at ${exePath} after extraction. Archive may have an unexpected structure.`)
   }
 
-  console.log(`  Installing to: ${extractDir}`)
-  mv(join(tmpDir, extractedFolder), extractDir)
-  rm('-rf', tmpDir)
-
   showFinalMessage()
 }
 
@@ -251,6 +259,7 @@ async function runWin7 () {
   const target = join(packageRoot, `electerm-${ver}-win7`)
 
   rm('-rf', [target, extractDir])
+  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))
@@ -258,7 +267,6 @@ async function runWin7 () {
     throw new Error('No release found for Windows 7')
   }
 
-  // Extract to temp, then move
   const tmpDir = join(packageRoot, '.electerm-tmp')
   rm('-rf', tmpDir)
   fs.mkdirSync(tmpDir, { recursive: true })
@@ -268,19 +276,16 @@ async function runWin7 () {
 
   const { filepath } = await download(releaseInfo.browser_download_url, tmpDir, { extract: false, displayName: releaseInfo.name })
 
-  await extractTarGz(filepath, tmpDir)
+  console.log(`  Installing to: ${extractDir}`)
+  await extractTarGz(filepath, extractDir, 1)
 
-  const entries = fs.readdirSync(tmpDir)
-  const extractedFolder = entries.find(e => fs.statSync(join(tmpDir, e)).isDirectory())
+  rm('-rf', tmpDir)
 
-  if (!extractedFolder) {
-    throw new Error('No folder found in extracted archive')
+  const exePath = getElectermExePath()
+  if (!fs.existsSync(exePath)) {
+    throw new Error(`electerm.exe not found at ${exePath} after extraction. Archive may have an unexpected structure.`)
   }
 
-  console.log(`  Installing to: ${extractDir}`)
-  mv(join(tmpDir, extractedFolder), extractDir)
-  rm('-rf', tmpDir)
-
   showFinalMessage()
 }
 

package/package.json

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