@electerm/electerm-react 3.15.38 → 3.15.39

package/client/components/batch-op/batch-op-editor.jsx

@@ -14,7 +14,6 @@ import BatchOpLogs from './batch-op-logs'
 import message from '../common/message'
 import { refsStatic } from '../common/ref'
 import generate from '../../common/uid'
-import fs from '../../common/fs'
 import { safeGetItem, safeSetItem } from '../../common/safe-local-storage'
 
 const batchOpEditorKey = 'batch-op-editor-content'
@@ -134,14 +133,14 @@ export default function BatchOpEditor ({ widget }) {
   const handleEditWithSystemEditor = useCallback(async () => {
     const id = generate()
     const tempPath = window.pre.resolve(window.pre.tempDir, `electerm-batch-op-${id}.json`)
-    await fs.writeFile(tempPath, value)
+    await window.fs.writeFile(tempPath, value)
     window.pre.runGlobalAsync('watchFile', tempPath)
-    fs.openFile(tempPath).catch(window.store.onError)
+    window.fs.openFile(tempPath).catch(window.store.onError)
     window.pre.showItemInFolder(tempPath)
     const onFileChange = (e, text) => {
       setValue(text)
       window.pre.ipcOffEvent('file-change', onFileChange)
-      fs.unlink(tempPath).catch(console.log)
+      window.fs.unlink(tempPath).catch(console.log)
     }
     window.pre.ipcOnEvent('file-change', onFileChange)
   }, [value])
@@ -149,13 +148,13 @@ export default function BatchOpEditor ({ widget }) {
   const handleEditWithCustom = useCallback(async (editorCommand) => {
     const id = generate()
     const tempPath = window.pre.resolve(window.pre.tempDir, `electerm-batch-op-${id}.json`)
-    await fs.writeFile(tempPath, value)
+    await window.fs.writeFile(tempPath, value)
     window.pre.runGlobalAsync('watchFile', tempPath)
     await window.pre.runGlobalAsync('openFileWithEditor', tempPath, editorCommand)
     const onFileChange = (e, text) => {
       setValue(text)
       window.pre.ipcOffEvent('file-change', onFileChange)
-      fs.unlink(tempPath).catch(console.log)
+      window.fs.unlink(tempPath).catch(console.log)
     }
     window.pre.ipcOnEvent('file-change', onFileChange)
   }, [value])

package/client/components/bg/css-overwrite.jsx

@@ -2,7 +2,6 @@
 * btns
 */
 import { useEffect, useRef } from 'react'
-import fs from '../../common/fs'
 import { noTerminalBgValue, textTerminalBgValue } from '../../common/constants'
 import { generateMosaicBackground } from './shapes'
 
@@ -24,7 +23,7 @@ function createBackgroundStyle (imagePath) {
   } else if (textTerminalBgValue === imagePath) {
     st = 'text'
   } else if (imagePath && !isWebImg) {
-    return fs.readFileAsBase64(imagePath)
+    return window.fs.readFileAsBase64(imagePath)
       .then(content => {
         if (content) {
           return `url(data:image;base64,${content})`

package/client/components/file-transfer/remote2remote-handler.jsx

@@ -2,7 +2,6 @@ import { autoRun } from 'manate'
 import copy from 'json-deep-copy'
 import uid from '../../common/uid'
 import resolve from '../../common/resolve'
-import fs from '../../common/fs'
 import { typeMap } from '../../common/constants'
 import { getFolderFromFilePath, getLocalFileInfo } from '../sftp/file-read'
 
@@ -154,7 +153,7 @@ export default class Remote2RemoteHandler {
     if (!this.tempPath) {
       return
     }
-    await fs.rmrf(this.tempPath).catch(() => {})
+    await window.fs.rmrf(this.tempPath).catch(() => {})
   }
 
   finish = async (error) => {

package/client/components/file-transfer/transfer.jsx

@@ -3,7 +3,6 @@ import copy from 'json-deep-copy'
 import { isFunction } from 'lodash-es'
 import generate from '../../common/uid'
 import { typeMap, transferTypeMap, fileOperationsMap, fileActions } from '../../common/constants'
-import fs from '../../common/fs'
 import format, { computeLeftTime, computePassedTime } from './transfer-speed-format'
 import {
   getLocalFileInfo,
@@ -257,7 +256,7 @@ export default class TransportAction extends Component {
       })
     }
     if (typeFrom === typeMap.local) {
-      return fs[operation](fromPath, finalToPath)
+      return window.fs[operation](fromPath, finalToPath)
         .then(this.onEnd)
         .catch(e => {
           this.onEnd()
@@ -436,7 +435,7 @@ export default class TransportAction extends Component {
     let isFromRemote
     if (typeFrom === typeMap.local) {
       isFromRemote = false
-      p = await fs.zipFolder(fromPath)
+      p = await window.fs.zipFolder(fromPath)
     } else {
       isFromRemote = true
       const terminalId = refs.get('sftp-' + this.tabId)?.terminalId
@@ -484,22 +483,22 @@ export default class TransportAction extends Component {
       }
     } else {
       if (newName) {
-        await fs.mkdir(path)
+        await window.fs.mkdir(path)
       }
-      await fs.unzipFile(toPath, path)
+      await window.fs.unzipFile(toPath, path)
       if (newName) {
         const mvFrom = resolve(path, name)
         const mvTo = resolve(targetPath, newName)
-        await fs.mv(mvFrom, mvTo)
+        await window.fs.mv(mvFrom, mvTo)
       }
     }
     await rmCmd(terminalId, !isToRemote ? fromPath : toPath)
-    await fs.rmrf(!isToRemote ? toPath : fromPath)
+    await window.fs.rmrf(!isToRemote ? toPath : fromPath)
     if (newName) {
       if (isToRemote) {
         await rmCmd(terminalId, path)
       } else {
-        await fs.rmrf(path)
+        await window.fs.rmrf(path)
       }
     }
     this.onEnd()
@@ -821,7 +820,7 @@ export default class TransportAction extends Component {
       tabId
     } = transfer
     if (typeTo === typeMap.local) {
-      return fs.mkdir(toPath)
+      return window.fs.mkdir(toPath)
         .then(() => true)
         .catch(() => false)
     }

package/client/components/main/main.jsx

@@ -40,6 +40,7 @@ import { pick } from 'lodash-es'
 import deepCopy from 'json-deep-copy'
 import './wrapper.styl'
 import TerminalInfo from '../terminal-info/terminal-info-entry'
+import '../../common/fs.js'
 import './term-fullscreen.styl'
 
 export default auto(function Index (props) {

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

@@ -3,7 +3,6 @@
  * Handles file upload/download between local and remote desktop via IronRDP CLIPRDR channel
  */
 
-import fs from '../../common/fs'
 import { getLocalFileInfo } from '../sftp/file-read'
 import { osResolve } from '../../common/resolve'
 import { filesize } from 'filesize'
@@ -115,7 +114,7 @@ export class FileTransferManager {
           const length = request.size
 
           const fd = await new Promise((resolve, reject) => {
-            fs.open(file.filePath, O_RDONLY, (err, fd) => {
+            window.fs.open(file.filePath, O_RDONLY, (err, fd) => {
               if (err) reject(err)
               else resolve(fd)
             })
@@ -123,14 +122,14 @@ export class FileTransferManager {
 
           const buffer = new Uint8Array(length)
           const { bytesRead, buffer: readBuffer } = await new Promise((resolve, reject) => {
-            fs.read(fd, buffer, 0, length, start, (err, bytesRead, buffer) => {
+            window.fs.read(fd, buffer, 0, length, start, (err, bytesRead, buffer) => {
               if (err) reject(err)
               else resolve({ bytesRead, buffer })
             })
           })
 
           await new Promise((resolve, reject) => {
-            fs.close(fd, (err) => {
+            window.fs.close(fd, (err) => {
               if (err) reject(err)
               else resolve()
             })
@@ -248,7 +247,7 @@ export class FileTransferManager {
       const fullPath = osResolve(savePath[0], fileInfo.name)
 
       const fd = await new Promise((resolve, reject) => {
-        fs.open(fullPath, O_WRONLY | O_CREAT | O_TRUNC, (err, fd) => {
+        window.fs.open(fullPath, O_WRONLY | O_CREAT | O_TRUNC, (err, fd) => {
           if (err) reject(err)
           else resolve(fd)
         })
@@ -259,14 +258,14 @@ export class FileTransferManager {
       const data = new Uint8Array(arrayBuffer)
 
       await new Promise((resolve, reject) => {
-        fs.write(fd, data, (err) => {
+        window.fs.write(fd, data, (err) => {
           if (err) reject(err)
           else resolve()
         })
       })
 
       await new Promise((resolve, reject) => {
-        fs.close(fd, (err) => {
+        window.fs.close(fd, (err) => {
           if (err) reject(err)
           else resolve()
         })

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

@@ -31,7 +31,6 @@ import Link from '../common/external-link'
 import FontSelect from '../common/font-select'
 import HelpIcon from '../common/help-icon'
 import KeywordsTransport from './keywords-transport'
-import fs from '../../common/fs'
 import uid from '../../common/uid'
 import createDefaultSessionLogPath from '../../common/default-log-path'
 import TerminalBackgroundConfig from './terminal-bg-config'
@@ -136,14 +135,14 @@ export default class SettingTerminal extends Component {
 
   testFolderPathCanSaveLog = async (path) => {
     try {
-      const st = await fs.statCustom(path)
+      const st = await window.fs.statCustom(path)
       if (!st.isD) {
         message.error('invalid log folder')
         return false
       }
       const testFile = osResolve(path, uid + '.test.log')
-      await fs.touch(testFile)
-      await fs.unlink(testFile)
+      await window.fs.touch(testFile)
+      await window.fs.unlink(testFile)
       return true
     } catch (err) {
       message.error('invalid log folder')

package/client/components/sftp/file-info-modal.jsx

@@ -11,7 +11,6 @@ import { update } from 'lodash-es'
 import { mode2permission, permission2mode } from '../../common/mode2permission'
 import renderPermission from './permission-render'
 import FileIcon from './file-icon'
-import fs from '../../common/fs'
 import { filesize } from 'filesize'
 import { runCmd } from '../terminal/terminal-apis'
 import {
@@ -166,7 +165,7 @@ export default class FileMode extends React.PureComponent {
       ? `Get-ChildItem -Recurse '${folder}' | Measure-Object -Property Length -Sum`
       : `du -sh '${folder}'`
     const func = isWin ? 'runWinCmd' : 'run'
-    const res = await fs[func](cmd).catch(window.store.onError)
+    const res = await window.fs[func](cmd).catch(window.store.onError)
     return this.getSize(res)
   }
 

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

@@ -31,7 +31,6 @@ 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'
 import { createTransferProps } from './transfer-common'
@@ -391,8 +390,8 @@ export default class FileSection extends React.Component {
     const { localPath } = this.props
     const p = resolve(localPath, nameTemp)
     const func = isDirectory
-      ? fs.mkdir
-      : fs.touch
+      ? window.fs.mkdir
+      : window.fs.touch
     const res = await func(p)
       .then(() => true)
       .catch(window.store.onError)
@@ -496,7 +495,7 @@ export default class FileSection extends React.Component {
     this.clearRef()
     const { permission, type, path, name } = file
     const func = type === typeMap.local
-      ? fs.chmod
+      ? window.fs.chmod
       : this.props.sftp.chmod
     const p = resolve(path, name)
     await func(p, permission).catch(window.store.onError)
@@ -546,7 +545,7 @@ export default class FileSection extends React.Component {
     const { localPath } = this.props
     const p1 = resolve(localPath, oldname)
     const p2 = resolve(localPath, newname)
-    await fs.rename(p1, p2).catch(window.store.onError)
+    await window.fs.rename(p1, p2).catch(window.store.onError)
     this.props.localList()
   }
 
@@ -593,7 +592,7 @@ export default class FileSection extends React.Component {
 
   openFile = file => {
     const filePath = resolve(file.path, file.name)
-    fs.openFile(filePath)
+    window.fs.openFile(filePath)
       .catch(window.store.onError)
   }
 
@@ -602,7 +601,7 @@ export default class FileSection extends React.Component {
     if (this.watchingFile) {
       window.pre.ipcOffEvent('file-change', this.onFileChange)
       window.pre.runGlobalAsync('unwatchFile', this.watchingFile)
-      fs.unlink(this.watchingFile).catch(console.log)
+      window.fs.unlink(this.watchingFile).catch(console.log)
       delete this.watchingFile
     }
   }
@@ -621,7 +620,7 @@ export default class FileSection extends React.Component {
       tempPath = window.pre.resolve(
         window.pre.tempDir, `electerm-temp-${id}-${name}`
       )
-      await fs.writeFile(tempPath, text)
+      await window.fs.writeFile(tempPath, text)
     }
     this.watchingFile = tempPath
     this.watchFile(tempPath)
@@ -641,7 +640,7 @@ export default class FileSection extends React.Component {
       tempPath = window.pre.resolve(
         window.pre.tempDir, `electerm-temp-${id}-${name}`
       )
-      await fs.writeFile(tempPath, text)
+      await window.fs.writeFile(tempPath, text)
     }
     this.watchingFile = tempPath
     window.pre.runGlobalAsync('watchFile', tempPath)
@@ -658,7 +657,7 @@ export default class FileSection extends React.Component {
 
   watchFile = async (tempPath) => {
     window.pre.runGlobalAsync('watchFile', tempPath)
-    fs.openFile(tempPath)
+    window.fs.openFile(tempPath)
       .catch(window.store.onError)
     window.pre.showItemInFolder(tempPath)
     window.pre.ipcOnEvent('file-change', this.onFileChange)
@@ -688,7 +687,7 @@ export default class FileSection extends React.Component {
     // const sftp = sftpFunc()
     const text = typeMap.remote === type
       ? await this.props.sftp.readFile(path)
-      : await fs.readFile(path)
+      : await window.fs.readFile(path)
     return text
   }
 
@@ -699,7 +698,7 @@ export default class FileSection extends React.Component {
         text,
         mode
       ).catch(window.store.onError)
-      : await fs.writeFile(
+      : await window.fs.writeFile(
         path,
         text,
         mode

package/client/components/sftp/file-read.js

@@ -3,7 +3,6 @@
  */
 
 import generate from '../../common/uid'
-import fs from '../../common/fs'
 import { isWin } from '../../common/constants'
 
 export const getFileExt = fileName => {
@@ -106,8 +105,8 @@ export const getFolderFromFilePath = (filePath, isRemote) => {
 }
 
 export const getLocalFileInfo = async (filePath) => {
-  const statr = await fs.statAsync(filePath)
-  const stat = await fs.lstatAsync(filePath)
+  const statr = await window.fs.statAsync(filePath)
+  const stat = await window.fs.lstatAsync(filePath)
   return {
     size: stat.size,
     accessTime: stat.atime || stat.atimeMs,

package/client/components/sftp/owner-list.js

@@ -9,7 +9,6 @@
  * for windows list groups: do not know yet
  */
 
-import fs from '../../common/fs'
 import { runCmd } from '../terminal/terminal-apis'
 import { isWin, isMac } from '../../common/constants'
 
@@ -49,7 +48,7 @@ export async function localListUsers () {
   if (isWin) {
     return {}
   } else if (isMac) {
-    const g = await fs.run('dscl . -list /Users UniqueID')
+    const g = await window.fs.run('dscl . -list /Users UniqueID')
       .catch(console.error)
     return g
       ? g.split('\n')
@@ -65,7 +64,7 @@ export async function localListUsers () {
         }, {})
       : {}
   } else {
-    const g = await fs.run(linuxListUser).catch(console.error)
+    const g = await window.fs.run(linuxListUser).catch(console.error)
     return g
       ? parseNames(g)
       : {}
@@ -76,7 +75,7 @@ export async function localListGroups () {
   if (isWin) {
     return {}
   } else if (isMac) {
-    const g = await fs.run('dscl . list /Groups PrimaryGroupID')
+    const g = await window.fs.run('dscl . list /Groups PrimaryGroupID')
       .catch(console.error)
     return g
       ? g.split('\n')
@@ -89,7 +88,7 @@ export async function localListGroups () {
         }, {})
       : {}
   } else {
-    const g = await fs.run(linuxListGroup).catch(console.error)
+    const g = await window.fs.run(linuxListGroup).catch(console.error)
     return g
       ? parseNames(g)
       : {}

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

@@ -25,7 +25,6 @@ import {
 } from '../../common/constants'
 import { hasFileInClipboardText } from '../../common/clipboard'
 import Client from '../../common/sftp'
-import fs from '../../common/fs'
 import ListTable from './list-table-ui'
 import deepCopy from 'json-deep-copy'
 import isValidPath from '../../common/is-valid-path'
@@ -410,8 +409,8 @@ export default class Sftp extends Component {
   localDel = async (file) => {
     const { name, isDirectory, path } = file
     const func = !isDirectory
-      ? fs.unlink
-      : fs.rmrf
+      ? window.fs.unlink
+      : window.fs.rmrf
     const p = resolve(path, name)
     await func(p).catch(window.store.onError)
   }
@@ -878,7 +877,7 @@ export default class Sftp extends Component {
   }
 
   localList = async (returnList = false, localPathReal, oldPath) => {
-    if (!fs) return
+    if (!window.fs) return
     if (!returnList) {
       this.setState({
         localLoading: true
@@ -892,7 +891,7 @@ export default class Sftp extends Component {
       const localPath = noPathInit ||
         this.getCwdLocal() ||
         this.getLocalHome()
-      const locals = await fs.readdirAsync(localPath)
+      const locals = await window.fs.readdirAsync(localPath)
       const local = []
       for (const name of locals) {
         const p = resolve(localPath, name)

package/client/store/load-data.js

@@ -5,7 +5,6 @@
 import { dbNames, getData, fetchInitData } from '../common/db'
 import parseInt10 from '../common/parse-int10'
 import { infoTabs, statusMap, defaultEnvLang } from '../common/constants'
-import fs from '../common/fs'
 import generate from '../common/id-with-stamp'
 import { refsStatic } from '../components/common/ref'
 import defaultSettings from '../common/default-setting'
@@ -107,7 +106,7 @@ export async function addTabFromCommandLine (store, opts) {
   }
   Object.assign(conf, update)
   if (options.privateKeyPath) {
-    conf.privateKey = await fs.readFile(options.privateKeyPath)
+    conf.privateKey = await window.fs.readFile(options.privateKeyPath)
   }
   console.debug('command line opts', conf)
   if (

package/package.json

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