@electerm/electerm-react 1.100.46 → 1.100.50

package/client/common/file-drop-utils.js

@@ -0,0 +1,61 @@
+/**
+ * Common utilities for handling file drops
+ */
+
+import { getFolderFromFilePath } from '../components/sftp/file-read'
+import { typeMap } from './constants'
+
+/**
+ * Safely get file path from dropped file
+ * @param {File} file - File object from drop event
+ * @returns {string} - File path
+ */
+export const getFilePath = (file) => {
+  if (file.path) {
+    return file.path
+  }
+  // Try the official Electron 32+ method first if available
+  if (window.api && window.api.getPathForFile) {
+    return window.api.getPathForFile(file)
+  }
+  return file.name
+}
+
+/**
+ * Process dropped files and return file list
+ * @param {DataTransfer} dataTransfer - DataTransfer object from drop event
+ * @returns {Array} - Array of file objects
+ */
+export const getDropFileList = (dataTransfer) => {
+  const fromFile = dataTransfer.getData('fromFile')
+  if (fromFile) {
+    return [JSON.parse(fromFile)]
+  }
+
+  const { files } = dataTransfer
+  const res = []
+  for (let i = 0, len = files.length; i < len; i++) {
+    const item = files[i]
+    if (!item) {
+      continue
+    }
+
+    const filePath = getFilePath(item)
+    const isRemote = false
+    const fileObj = getFolderFromFilePath(filePath, isRemote)
+    res.push({
+      ...fileObj,
+      type: typeMap.local
+    })
+  }
+  return res
+}
+
+/**
+ * Check if filename contains unsafe characters
+ * @param {string} filename - Filename to check
+ * @returns {boolean} - True if unsafe
+ */
+export const isUnsafeFilename = (filename) => {
+  return /["'\n\r]/.test(filename)
+}

package/client/components/ai/ai-config.jsx

@@ -27,8 +27,8 @@ const defaultRoles = [
 ]
 
 const proxyOptions = [
-  { value: 'socks5://localhost:1080' },
-  { value: 'http://localhost:8080' },
+  { value: 'socks5://127.0.0.1:1080' },
+  { value: 'http://127.0.0.1:8080' },
   { value: 'https://proxy.example.com:3128' }
 ]
 
@@ -180,7 +180,7 @@ export default function AIConfigForm ({ initialValues, onSubmit, showAIConfig })
         <Form.Item
           label={e('proxy')}
           name='proxyAI'
-          tooltip='Proxy for AI API requests (e.g., socks5://localhost:1080)'
+          tooltip='Proxy for AI API requests (e.g., socks5://127.0.0.1:1080)'
         >
           <AutoComplete
             options={proxyOptions}

package/client/components/bookmark-form/proxy.jsx

@@ -25,7 +25,7 @@ export default function renderProxy (props) {
           value: d
         }
       }),
-    placeholder: 'socks5://localhost:1080',
+    placeholder: 'socks5://127.0.0.1:1080',
     allowClear: true
   }
   return (

package/client/components/bookmark-form/render-ssh-tunnel.jsx

@@ -29,9 +29,9 @@ export default function renderSshTunnels (props) {
   const [initialValues] = useState({
     sshTunnel: 'forwardRemoteToLocal',
     sshTunnelLocalPort: 12200,
-    sshTunnelLocalHost: 'localhost',
+    sshTunnelLocalHost: '127.0.0.1',
     sshTunnelRemotePort: 12300,
-    sshTunnelRemoteHost: 'localhost'
+    sshTunnelRemoteHost: '127.0.0.1'
   })
   const [isDynamic, setter] = useState(formData.sshTunnel === 'dynamicForward')
   const [list, setList] = useState(formData.sshTunnels || [])
@@ -85,9 +85,9 @@ export default function renderSshTunnels (props) {
         // sshTunnel is forwardRemoteToLocal or forwardLocalToRemote or dynamicForward
         const {
           sshTunnel,
-          sshTunnelRemoteHost = 'localhost',
+          sshTunnelRemoteHost = '127.0.0.1',
           sshTunnelRemotePort = '',
-          sshTunnelLocalHost = 'localhost',
+          sshTunnelLocalHost = '127.0.0.1',
           sshTunnelLocalPort = '',
           name
         } = item

package/client/components/setting-panel/setting-common.jsx

@@ -434,7 +434,7 @@ export default class SettingCommon extends Component {
           />
         </div>
         {
-          this.renderText('proxy', 'socks5://localhost:1080')
+          this.renderText('proxy', 'socks5://127.0.0.1:1080')
         }
       </div>
     )

package/client/components/sftp/file-item.jsx

@@ -30,6 +30,7 @@ import findParent from '../../common/find-parent'
 import sorter from '../../common/index-sorter'
 import { getFolderFromFilePath, getLocalFileInfo } from './file-read'
 import { readClipboard, copy as copyToClipboard, hasFileInClipboardText } from '../../common/clipboard'
+import { getDropFileList } from '../../common/file-drop-utils'
 import fs from '../../common/fs'
 import time from '../../common/time'
 import { filesize } from 'filesize'
@@ -228,26 +229,7 @@ export default class FileSection extends React.Component {
   }
 
   getDropFileList = data => {
-    const fromFile = data.getData('fromFile')
-    if (fromFile) {
-      return [JSON.parse(fromFile)]
-    }
-    const { files } = data
-    const res = []
-    for (let i = 0, len = files.length; i < len; i++) {
-      const item = files[i]
-      if (!item) {
-        continue
-      }
-      // let file = item.getAsFile()
-      const isRemote = false
-      const fileObj = getFolderFromFilePath(item.path, isRemote)
-      res.push({
-        ...fileObj,
-        type: typeMap.local
-      })
-    }
-    return res
+    return getDropFileList(data)
   }
 
   onDrop = async e => {
@@ -261,6 +243,7 @@ export default class FileSection extends React.Component {
     if (!fromFiles) {
       return
     }
+
     while (!target.className.includes(fileItemCls)) {
       target = target.parentNode
     }

package/client/components/tabs/tab.jsx

@@ -350,10 +350,10 @@ class Tab extends Component {
     const list = sshTunnelResults.map(({ sshTunnel: obj, error }, i) => {
       const {
         sshTunnelLocalPort,
-        sshTunnelRemoteHost = 'localhost',
+        sshTunnelRemoteHost = '127.0.0.1',
         sshTunnelRemotePort,
         sshTunnel,
-        sshTunnelLocalHost = 'localhost',
+        sshTunnelLocalHost = '127.0.0.1',
         name
       } = obj
       let tunnel

package/client/components/terminal/terminal.jsx

@@ -47,6 +47,7 @@ import { createTerm, resizeTerm } from './terminal-apis.js'
 import { shortcutExtend, shortcutDescExtend } from '../shortcuts/shortcut-handler.js'
 import { KeywordHighlighterAddon } from './highlight-addon.js'
 import { getLocalFileInfo } from '../sftp/file-read.js'
+import { getFilePath, isUnsafeFilename } from '../../common/file-drop-utils.js'
 import { CommandTrackerAddon } from './command-tracker-addon.js'
 import AIIcon from '../icons/ai-icon.jsx'
 import { formatBytes } from '../../common/byte-format.js'
@@ -356,12 +357,8 @@ class Term extends Component {
     this.term.focus()
   }
 
-  isUnsafeFilename = (filename) => {
-    return /["'\n\r]/.test(filename)
-  }
-
   cd = (p) => {
-    if (this.isUnsafeFilename(p)) {
+    if (isUnsafeFilename(p)) {
       return message.error('File name contains unsafe characters')
     }
     this.runQuickCommand(`cd "${p}"`)
@@ -377,7 +374,7 @@ class Term extends Component {
       try {
         const fileData = JSON.parse(fromFile)
         const filePath = resolve(fileData.path, fileData.name)
-        if (this.isUnsafeFilename(filePath)) {
+        if (isUnsafeFilename(filePath)) {
           message.error(notSafeMsg)
           return
         }
@@ -392,13 +389,16 @@ class Term extends Component {
     const files = dt.files
     if (files && files.length) {
       const arr = Array.from(files)
+      const filePaths = arr.map(f => getFilePath(f))
+
       // Check each file path individually
-      const hasUnsafeFilename = arr.some(f => this.isUnsafeFilename(f.path))
+      const hasUnsafeFilename = filePaths.some(path => isUnsafeFilename(path))
       if (hasUnsafeFilename) {
         message.error(notSafeMsg)
         return
       }
-      const filesAll = arr.map(f => `"${f.path}"`).join(' ')
+
+      const filesAll = filePaths.map(path => `"${path}"`).join(' ')
       this.attachAddon._sendData(filesAll)
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.100.46",
+  "version": "1.100.50",
   "description": "react components src for electerm",
   "main": "./client/components/main/main.jsx",
   "license": "MIT",