@electerm/electerm-react 1.34.30 → 1.34.36

package/client/common/build-proxy.js

@@ -0,0 +1,18 @@
+export const buildProxyString = function (obj) {
+  if (!obj.proxyIp) {
+    return ''
+  }
+
+  const proxyTypeMapping = {
+    5: 'socks5',
+    4: 'socks4',
+    0: 'http',
+    1: 'https'
+  }
+
+  const proxyType = proxyTypeMapping[obj.proxyType] || ''
+  const hasCredentials = obj.proxyUsername && obj.proxyPassword
+  const credentials = hasCredentials ? `${obj.proxyUsername}:${obj.proxyPassword}@` : ''
+
+  return `${proxyType}://${credentials}${obj.proxyIp}${obj.proxyPort ? `:${obj.proxyPort}` : ''}`
+}

package/client/common/build-run-scripts.js

@@ -0,0 +1,6 @@
+export const buildRunScripts = function (inst) {
+  return [{
+    delay: inst.loginScriptDelay || 0,
+    script: inst.loginScript
+  }]
+}

package/client/common/build-ssh-tunnel.js

@@ -0,0 +1,7 @@
+export const buildSshTunnels = function (inst) {
+  return [{
+    sshTunnel: inst.sshTunnel,
+    sshTunnelRemotePort: inst.sshTunnelRemotePort,
+    sshTunnelLocalPort: inst.sshTunnelLocalPort
+  }]
+}

package/client/common/constants.js

@@ -5,7 +5,7 @@ import { getUiThemeConfig } from './ui-theme'
 import logoPath1Ref from '@electerm/electerm-resource/res/imgs/electerm-round-128x128.png'
 import logoPath2Ref from '@electerm/electerm-resource/res/imgs/electerm.png'
 import logoPath3Ref from '@electerm/electerm-resource/res/imgs/electerm-watermark.png'
-import dbDefaults from '../../app/upgrade/db-defaults'
+import dbDefaults from './db-defaults'
 import { get as _get } from 'lodash-es'
 export const packInfo = typeof window.et.packInfo === 'undefined' ? window.pre.packInfo : window.et.packInfo
 const buildConst = (props) => {
@@ -306,3 +306,24 @@ export const modals = {
   setting: 1,
   batchOps: 2
 }
+export const instSftpKeys = [
+  'connect',
+  'list',
+  'download',
+  'upload',
+  'mkdir',
+  'getHomeDir',
+  'rmdir',
+  'stat',
+  'lstat',
+  'chmod',
+  'rename',
+  'rm',
+  'touch',
+  'readlink',
+  'realpath',
+  'mv',
+  'cp',
+  'readFile',
+  'writeFile'
+]

package/client/common/db-defaults.js

@@ -0,0 +1,123 @@
+/**
+ * database default should init
+ */
+
+function parsor (themeTxt) {
+  return themeTxt.split('\n').reduce((prev, line) => {
+    let [key = '', value = ''] = line.split('=')
+    key = key.trim()
+    value = value.trim()
+    if (!key || !value) {
+      return prev
+    }
+    prev[key] = value
+    return prev
+  }, {})
+}
+
+const defaultTheme = parsor(`
+  main = #141314
+  main-dark = #000
+  main-light = #2E3338
+  text = #ddd
+  text-light = #fff
+  text-dark = #888
+  text-disabled = #777
+  primary = #08c
+  info = #FFD166
+  success = #06D6A0
+  error = #EF476F
+  warn = #E55934
+`)
+const defaultThemeLight = parsor(`
+  main=#ededed
+  main-dark=#cccccc
+  main-light=#fefefe
+  text=#555
+  text-light=#777
+  text-dark=#444
+  text-disabled=#888
+  primary=#08c
+  info=#FFD166
+  success=#06D6A0
+  error=#EF476F
+  warn=#E55934
+`)
+const defaultThemeLightTerminal = parsor(`
+foreground=#333333
+background=#ededed
+cursor=#b5bd68
+cursorAccent=#1d1f21
+selectionBackground=rgba(0, 0, 0, 0.3)
+black=#575757
+red=#FF2C6D
+green=#19f9d8
+yellow=#FFB86C
+blue=#45A9F9
+magenta=#FF75B5
+cyan=#B084EB
+white=#CDCDCD
+brightBlack=#757575
+brightRed=#FF2C6D
+brightGreen=#19f9d8
+brightYellow=#FFCC95
+brightBlue=#6FC1FF
+brightMagenta=#FF9AC1
+brightCyan=#BCAAFE
+brightWhite=#E6E6E6
+`)
+
+const defaultThemeTerminal = {
+  foreground: '#bbbbbb',
+  background: '#141314',
+  cursor: '#b5bd68',
+  cursorAccent: '#1d1f21',
+  selectionBackground: 'rgba(255, 255, 255, 0.3)',
+  black: '#575757',
+  red: '#FF2C6D',
+  green: '#19f9d8',
+  yellow: '#FFB86C',
+  blue: '#45A9F9',
+  magenta: '#FF75B5',
+  cyan: '#B084EB',
+  white: '#CDCDCD',
+  brightBlack: '#757575',
+  brightRed: '#FF2C6D',
+  brightGreen: '#19f9d8',
+  brightYellow: '#FFCC95',
+  brightBlue: '#6FC1FF',
+  brightMagenta: '#FF9AC1',
+  brightCyan: '#BCAAFE',
+  brightWhite: '#E6E6E6'
+}
+
+export default [
+  {
+    db: 'terminalThemes',
+    data: [
+      {
+        _id: 'default',
+        name: 'default',
+        themeConfig: defaultThemeTerminal,
+        uiThemeConfig: defaultTheme
+      },
+      {
+        _id: 'defaultLight',
+        name: 'default light',
+        themeConfig: defaultThemeLightTerminal,
+        uiThemeConfig: defaultThemeLight
+      }
+    ]
+  },
+  {
+    db: 'bookmarkGroups',
+    data: [
+      {
+        _id: 'default',
+        title: 'default',
+        bookmarkIds: [],
+        bookmarkGroupIds: []
+      }
+    ]
+  }
+]

package/client/common/db-fix.js

@@ -1,7 +1,7 @@
 // make old data imported compatible
-import { buildProxyString } from '../../app/lib/build-proxy.js'
-import { buildSshTunnels } from '../../app/common/build-ssh-tunnel.js'
-import { buildRunScripts } from '../../app/common/build-run-scripts.js'
+import { buildProxyString } from './build-proxy.js'
+import { buildSshTunnels } from './build-ssh-tunnel.js'
+import { buildRunScripts } from './build-run-scripts.js'
 
 export function fixBookmarks (arr) {
   return arr.map(bookmark => {

package/client/common/default-setting.js

@@ -0,0 +1,41 @@
+/**
+ * default setting
+ */
+
+export default {
+  hotkey: 'Control+2',
+  sshReadyTimeout: 50000,
+  scrollback: 3000,
+  onStartSessions: [],
+  fontSize: 16,
+  fontFamily: 'mono, courier-new, courier, monospace',
+  execWindows: 'System32/WindowsPowerShell/v1.0/powershell.exe',
+  execMac: 'zsh',
+  execLinux: 'bash',
+  execWindowsArgs: [],
+  execMacArgs: [],
+  execLinuxArgs: [],
+  enableGlobalProxy: false,
+  disableSshHistory: false,
+  disableTransferHistory: false,
+  terminalBackgroundImagePath: '',
+  terminalBackgroundFilterOpacity: 1,
+  terminalBackgroundFilterBlur: 0,
+  terminalBackgroundFilterBrightness: 1,
+  terminalBackgroundFilterGrayscale: 0,
+  terminalBackgroundFilterContrast: 1,
+  rendererType: 'canvas',
+  terminalType: 'xterm-256color',
+  keepaliveCountMax: 10,
+  saveTerminalLogToFile: false,
+  checkUpdateOnStart: true,
+  cursorBlink: false,
+  cursorStyle: 'block',
+  useSystemTitleBar: false,
+  opacity: 1,
+  defaultEditor: '',
+  confirmBeforeExit: false,
+  initDefaultTabOnStart: true,
+  screenReaderMode: false,
+  autoRefreshWhenSwitchToSftp: false
+}

package/client/common/pass-enc.js

@@ -1,4 +1,20 @@
-import { enc, dec } from '../../app/common/pass-enc'
+const enc = (str) => {
+  if (typeof str !== 'string') {
+    return str
+  }
+  return str.split('').map((s, i) => {
+    return String.fromCharCode((s.charCodeAt(0) + i + 1) % 65536)
+  }).join('')
+}
+
+const dec = (str) => {
+  if (typeof str !== 'string') {
+    return str
+  }
+  return str.split('').map((s, i) => {
+    return String.fromCharCode((s.charCodeAt(0) - i - 1 + 65536) % 65536)
+  }).join('')
+}
 
 /**
  * enc password

package/client/common/sftp.js

@@ -4,9 +4,8 @@
 
 import generate from './uid'
 import Transfer from './transfer'
-import { transferTypeMap } from './constants'
+import { transferTypeMap, instSftpKeys as keys } from './constants'
 import initWs from './ws'
-import { instSftpKeys as keys } from '../../app/common/constants'
 
 const transferKeys = Object.keys(transferTypeMap)
 

package/client/common/version-compare.js

@@ -0,0 +1,25 @@
+/**
+ * version compare
+ * @param {string} a
+ * @param {string} b
+ * @return {number}
+ */
+// compare version '1.0.0' '12.0.3'
+// return 1 when a > b
+// return -1 when a < b
+// return 0 when a === b
+export default function (a, b) {
+  const ar = a.split('.').map(n => Number(n.replace('v', '')))
+  const br = b.split('.').map(n => Number(n.replace('v', '')))
+  let res = 0
+  for (let i = 0, len = br.length; i < len; i++) {
+    if (br[i] < ar[i]) {
+      res = 1
+      break
+    } else if (br[i] > ar[i]) {
+      res = -1
+      break
+    }
+  }
+  return res
+}

package/client/components/bookmark-form/serial-form-ui.jsx

@@ -25,7 +25,7 @@ import {
   newBookmarkIdPrefix
 } from '../../common/constants'
 import formatBookmarkGroups from './bookmark-group-tree-format'
-import defaultSettings from '../../../app/common/default-setting'
+import defaultSettings from '../../common/default-setting'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
 import useSubmit from './use-submit'
 import useUI from './use-ui'

package/client/components/bookmark-form/telnet-form-ui.jsx

@@ -14,7 +14,7 @@ import {
 } from '../../common/constants'
 import { formItemLayout } from '../../common/form-layout'
 import findBookmarkGroupId from '../../common/find-bookmark-group-id'
-import defaultSettings from '../../../app/common/default-setting'
+import defaultSettings from '../../common/default-setting'
 import useSubmit from './use-submit'
 import useUI from './use-ui'
 import useQm from './use-quick-commands'

package/client/components/bookmark-form/use-ui.jsx

@@ -13,7 +13,7 @@ import {
   Form
 } from 'antd'
 import { formItemLayout } from '../../common/form-layout'
-import defaultSettings from '../../../app/common/default-setting'
+import defaultSettings from '../../common/default-setting'
 import mapper from '../../common/auto-complete-data-mapper'
 import { defaultEnvLang } from '../../common/constants'
 

package/client/components/main/upgrade.jsx

@@ -3,7 +3,7 @@ import { CloseOutlined, MinusSquareOutlined, UpCircleOutlined } from '@ant-desig
 import { Button } from 'antd'
 import { getLatestReleaseInfo, getLatestReleaseVersion } from '../../common/update-check'
 import upgrade from '../../common/upgrade'
-import compare from '../../../app/common/version-compare'
+import compare from '../../common/version-compare'
 import Link from '../common/external-link'
 import {
   isMac,

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

@@ -1,6 +1,6 @@
 import BookmarkTransport from '../setting-panel/bookmark-transport'
 import download from '../../common/download'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import copy from 'json-deep-copy'
 
 export default class QmTransport extends BookmarkTransport {

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

@@ -10,7 +10,7 @@ import {
 } from '@ant-design/icons'
 import { Upload, Button } from 'antd'
 import download from '../../common/download'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import copy from 'json-deep-copy'
 import { find, uniq, isEqual } from 'lodash-es'
 import { fixBookmarks } from '../../common/db-fix'

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

@@ -22,7 +22,7 @@ import {
   proxyHelpLink,
   isWin
 } from '../../common/constants'
-import defaultSettings from '../../../app/common/default-setting'
+import defaultSettings from '../../common/default-setting'
 import ShowItem from '../common/show-item'
 import { osResolve } from '../../common/resolve'
 import Link from '../common/external-link'

package/client/components/sftp/confirm-modal.jsx

@@ -6,7 +6,7 @@
 import { Modal, Button } from 'antd'
 import { isString } from 'lodash-es'
 import AnimateText from '../common/animate-text'
-import formatTime from '../../../app/common/time'
+import formatTime from '../../common/time'
 import { FolderOutlined, FileOutlined } from '@ant-design/icons'
 import {
   fileActions

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

@@ -31,7 +31,7 @@ import sorter from '../../common/index-sorter'
 import { getFolderFromFilePath } from './file-read'
 import { readClipboard, copy as copyToClipboard, hasFileInClipboardText } from '../../common/clipboard'
 import fs from '../../common/fs'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import { filesize } from 'filesize'
 import { createTransferProps } from './transfer-common'
 import generate from '../../common/uid'

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

@@ -5,7 +5,7 @@
 import React from 'react'
 import { Modal, Button } from 'antd'
 import resolve from '../../common/resolve'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import { findIndex, update } from 'lodash-es'
 import { mode2permission, permission2mode } from '../../common/mode2permission'
 import { commonActions } from '../../common/constants'

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

@@ -14,7 +14,7 @@ import {
 } from '../../common/constants'
 import resolve from '../../common/resolve'
 import { mode2permission } from '../../common/mode2permission'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import renderPermission from './permission-render'
 import FileIcon from './file-icon'
 import fs from '../../common/fs'

package/client/components/sidebar/transfer-history-modal.jsx

@@ -5,7 +5,7 @@
 import { Component } from '../common/react-subx'
 import { CloseOutlined } from '@ant-design/icons'
 import { Table } from 'antd'
-import time from '../../../app/common/time'
+import time from '../../common/time'
 import Tag from '../sftp/transfer-tag'
 import './transfer-history.styl'
 import { get as _get } from 'lodash-es'

package/client/components/terminal-info/base.jsx

@@ -2,7 +2,6 @@
  * show base terminal info, id sessionID
  */
 
-// import { createLogFileName } from '../../../app/common/create-session-log-file-path'
 import { osResolve } from '../../common/resolve'
 import ShowItem from '../common/show-item'
 

package/client/entry/index.jsx

@@ -1,6 +1,6 @@
 import { render } from 'react-dom'
-import '../../../node_modules/antd/dist/reset.css'
-import '../../../node_modules/xterm/css/xterm.css'
+import 'antd/dist/reset.css'
+import 'xterm/css/xterm.css'
 import '../common/trzsz'
 import Main from '../components/main'
 import { notification } from 'antd'

package/client/store/load-data.js

@@ -8,7 +8,7 @@ import parseInt10 from '../common/parse-int10'
 import { infoTabs, statusMap, defaultEnvLang } from '../common/constants'
 import fs from '../common/fs'
 import generate from '../common/uid'
-import defaultSettings from '../../app/common/default-setting'
+import defaultSettings from '../common/default-setting'
 import encodes from '../components/bookmark-form/encodes'
 import runIdle from '../common/run-idle'
 import { initWsCommon } from '../common/fetch-from-server'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electerm/electerm-react",
-  "version": "1.34.30",
+  "version": "1.34.36",
   "description": "react components src for electerm",
   "main": "app.js",
   "bin": "npm/electerm",