@electerm/electerm-react 3.15.39 → 3.15.42

package/client/common/choose-save-folder.js

@@ -2,7 +2,7 @@ const {
   openDialog
 } = window.api
 
-export async function chooseSaveDirectory () {
+export async function chooseSaveDirectory (opts) {
   const savePaths = await openDialog({
     title: 'Choose a folder to save file(s)',
     message: 'Choose a folder to save file(s)',
@@ -13,7 +13,8 @@ export async function chooseSaveDirectory () {
       'noResolveAliases',
       'treatPackageAsDirectory',
       'dontAddToRecent'
-    ]
+    ],
+    ...opts
   })
   if (!savePaths || !savePaths.length) {
     return undefined

package/client/common/download.jsx

@@ -6,23 +6,11 @@ import ShowItem from '../components/common/show-item'
 import { chooseSaveDirectory } from './choose-save-folder'
 import { DownloadOutlined } from '@ant-design/icons'
 
-// function downloadForBrowser (filename, text) {
-//   const blob = new Blob([text], { type: 'text/plain;charset=utf-8' })
-//   const url = URL.createObjectURL(blob)
-//   const a = document.createElement('a')
-//   a.href = url
-//   a.download = filename
-//   document.body.appendChild(a)
-//   a.click()
-//   document.body.removeChild(a)
-//   URL.revokeObjectURL(url)
-// }
-
 export default async function download (filename, text) {
-  // if (window.et.isWebApp) {
-  //   return downloadForBrowser(filename, text)
-  // }
-  const savePath = await chooseSaveDirectory()
+  const opts = window.et.isWebApp
+    ? { filename, content: text }
+    : undefined
+  const savePath = await chooseSaveDirectory(opts)
   if (!savePath) {
     return
   }

package/client/components/bookmark-form/common/ssh-auth-selector.jsx

@@ -26,8 +26,9 @@ export default function renderAuth (props) {
     profileFilter = (d) => d
   } = props
   const commonBeforeUpload = (fieldName) => async (file) => {
-    const filePath = file.filePath
-    const content = await window.fs.readFile(filePath)
+    const content = file.fileContent !== undefined
+      ? file.fileContent
+      : await window.fs.readFile(file.filePath)
     form.setFieldsValue({
       [fieldName]: content
     })

package/client/components/common/upload.jsx

@@ -8,6 +8,7 @@ import { getLocalFileInfo } from '../sftp/file-read'
 
 /**
  * Open a single file select dialog
+ * Supports browser upload in web app mode
  * @returns {Promise<Object|null>} - File object with path info or null if cancelled
  */
 const openFileSelect = async () => {
@@ -23,7 +24,14 @@ const openFileSelect = async () => {
     message: 'Choose a file',
     properties
   }).catch(() => false)
-  if (!files || !files.length) {
+  if (!files) {
+    return null
+  }
+  // Browser upload returns { fileContent, fileName }
+  if (files.fileContent !== undefined) {
+    return files
+  }
+  if (!files.length) {
     return null
   }
   const filePath = files[0]

package/client/components/quick-commands/quick-command-transport-mod.jsx

@@ -7,8 +7,9 @@ export default class QmTransport extends BookmarkTransport {
   name = 'quickCommands'
   beforeUpload = async (file) => {
     const { store } = this.props
-    const filePath = file.filePath
-    const txt = await window.fs.readFile(filePath)
+    const txt = file.fileContent !== undefined
+      ? file.fileContent
+      : await window.fs.readFile(file.filePath)
     try {
       const arr = JSON.parse(txt)
       const state = store[this.name]

package/client/components/rdp/file-transfer.js

@@ -233,7 +233,8 @@ export class FileTransferManager {
       const savePath = await window.api.openDialog({
         title: `Save ${fileInfo.name}`,
         message: `Choose where to save ${fileInfo.name}`,
-        properties: ['openDirectory', 'createDirectory']
+        properties: ['openDirectory', 'createDirectory'],
+        noBrowserTransfer: true
       }).catch((err) => {
         this.log(`Save dialog error: ${err.message}`, 'error')
         return false

package/client/components/rdp/rdp-session.jsx

@@ -562,7 +562,8 @@ export default class RdpSession extends PureComponent {
     const files = await window.api.openDialog({
       title: 'Choose files to upload to remote desktop',
       message: 'Choose files to upload',
-      properties
+      properties,
+      noBrowserTransfer: true
     }).catch((err) => {
       this.log(`File dialog error: ${err.message}`, 'error')
       return false

package/client/components/setting-panel/keywords-transport.jsx

@@ -6,8 +6,9 @@ export default class KeywordsTransport extends BookmarkTransport {
   name = 'keywords-highlight'
   beforeUpload = async (file) => {
     const { store } = this.props
-    const filePath = file.filePath
-    const txt = await window.fs.readFile(filePath)
+    const txt = file.fileContent !== undefined
+      ? file.fileContent
+      : await window.fs.readFile(file.filePath)
     try {
       store.setConfig({
         keywords: JSON.parse(txt)

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

@@ -264,6 +264,9 @@ export default class SettingTerminal extends Component {
     const after = (
       <Upload
         beforeUpload={(file) => {
+          if (file.fileContent !== undefined) {
+            return
+          }
           const filePath = file.filePath
           this.onChangeValue(filePath, name)
         }}

package/client/components/setting-panel/terminal-bg-config.jsx

@@ -32,6 +32,9 @@ export default function TerminalBackgroundConfig ({
   const after = (
     <Upload
       beforeUpload={(file) => {
+        if (file.fileContent !== undefined) {
+          return
+        }
         const filePath = file.filePath
         onChangeValue(filePath, name)
       }}

package/client/components/sftp/address-bar.jsx

@@ -89,6 +89,7 @@ function renderAddonAfter (isLoadingRemote, onGoto, GoIcon, type, handleUploadFr
           ? (
             <PlusOutlined
               className='mg1r'
+              title={e('uploadFromBrowser')}
               onClick={(e) => {
                 e.stopPropagation()
                 handleUploadFromBrowser()

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

@@ -871,11 +871,9 @@ export default class FileSection extends React.Component {
     const { path, name, isDirectory } = this.state.file
     const p = resolve(path, name)
     const url = '/api/download?path=' + encodeURIComponent(p)
-    const res = await window.fetch(url, {
-      headers: {
-        token: window.store?.config.tokenElecterm
-      }
-    })
+    const res = await window.api.fetch(url)
+      .catch(window.store.onError)
+    if (!res) return
     const blob = await res.blob()
     const a = document.createElement('a')
     a.href = URL.createObjectURL(blob)
@@ -1068,7 +1066,7 @@ export default class FileSection extends React.Component {
       res.push({
         func: 'downloadFromBrowser',
         icon: 'DownloadOutlined',
-        text: 'Download from browser'
+        text: e('downloadFromBrowser')
       })
     }
     if (showEdit) {

package/client/components/sftp/sftp-entry.jsx

@@ -983,13 +983,10 @@ export default class Sftp extends Component {
         const formData = new FormData()
         formData.append('file', file)
         formData.append('path', localPath)
-        await window.fetch('/api/upload', {
+        await window.api.fetch('/api/upload', {
           method: 'POST',
-          body: formData,
-          headers: {
-            token: window.store?.config.tokenElecterm
-          }
-        })
+          body: formData
+        }).catch(handleErr)
       }
       this.localList()
     }

package/client/components/terminal/transfer-client-base.js

@@ -203,11 +203,11 @@ export class TransferClientBase {
         'treatPackageAsDirectory',
         'dontAddToRecent'
       ]
-
       files = await window.api.openDialog({
         title,
         message,
-        properties
+        properties,
+        noBrowserTransfer: true
       }).catch(() => false)
     }
 
@@ -253,7 +253,8 @@ export class TransferClientBase {
         'noResolveAliases',
         'treatPackageAsDirectory',
         'dontAddToRecent'
-      ]
+      ],
+      noBrowserTransfer: true
     }).catch(() => false)
 
     if (!savePaths || !savePaths.length) {

package/client/components/theme/theme-form.jsx

@@ -154,8 +154,9 @@ export default function ThemeForm (props) {
   }
 
   async function beforeUpload (file) {
-    const filePath = file.filePath
-    const txt = await window.fs.readFile(filePath)
+    const txt = file.fileContent !== undefined
+      ? file.fileContent
+      : await window.fs.readFile(file.filePath)
     const { name, themeConfig, uiThemeConfig } = convertTheme(txt)
     const tt = convertThemeToText({
       themeConfig, uiThemeConfig

package/client/components/tree-list/bookmark-upload.js

@@ -25,8 +25,9 @@ export const bookmarkUpload = action(async (file) => {
   const { store } = window
   const { bookmarks, bookmarkGroups } = store
 
-  const filePath = file.filePath
-  const txt = await window.fs.readFile(filePath)
+  const txt = file.fileContent !== undefined
+    ? file.fileContent
+    : await window.fs.readFile(file.filePath)
 
   const content = JSON.parse(txt)
   let bookmarkGroups1 = []

package/client/store/sync.js

@@ -565,9 +565,9 @@ export default (Store) => {
   }
 
   Store.prototype.importAll = async function (file) {
-    const filePath = file.filePath
-    const txt = await window.fs
-      .readFile(filePath)
+    const txt = file.fileContent !== undefined
+      ? file.fileContent
+      : await window.fs.readFile(file.filePath)
     const { store } = window
     const objs = JSON.parse(txt)
     const { names } = store.getDataSyncNames(true)

package/package.json

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