@electerm/electerm-react 3.0.18 → 3.1.16

package/client/store/sync.js

@@ -67,6 +67,13 @@ export default (Store) => {
         }
       ).join('####')
     }
+    if (type === syncTypes.webdav) {
+      // WebDAV token format: serverUrl####username####password
+      const serverUrl = get(window.store.config, 'syncSetting.webdavServerUrl')
+      const username = get(window.store.config, 'syncSetting.webdavUsername')
+      const password = get(window.store.config, 'syncSetting.webdavPassword')
+      return [serverUrl, username, password].join('####')
+    }
     return get(window.store.config, 'syncSetting.' + type + 'AccessToken')
   }
 
@@ -158,7 +165,13 @@ export default (Store) => {
     const types = Object.keys(syncTypes)
     for (const type of types) {
       const gistId = store.getSyncGistId(type)
-      if (gistId) {
+      // For WebDAV, check if server URL is configured
+      if (type === syncTypes.webdav) {
+        const serverUrl = get(window.store.config, 'syncSetting.webdavServerUrl')
+        if (serverUrl) {
+          await store.uploadSetting(type)
+        }
+      } else if (gistId) {
         await store.uploadSetting(type)
       }
     }
@@ -183,6 +196,24 @@ export default (Store) => {
     const { store } = window
     const token = store.getSyncToken(type)
     const gistId = store.getSyncGistId(type)
+
+    // Handle WebDAV preview differently
+    if (type === syncTypes.webdav) {
+      const gist = await fetchData(
+        type,
+        'download',
+        [],
+        token,
+        store.getSyncProxy(type)
+      )
+      if (gist && gist.files) {
+        const statusContent = get(gist, 'files["electerm-status.json"].content')
+        const status = statusContent ? parseJsonSafe(statusContent) : undefined
+        store.syncServerStatus[type] = status
+      }
+      return
+    }
+
     const gist = await fetchData(
       type,
       'getOne',
@@ -201,7 +232,7 @@ export default (Store) => {
     //   await store.createGist(type)
     //   gistId = store.getSyncGistId(type)
     // }
-    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud) {
+    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud && type !== syncTypes.webdav) {
       return
     }
     const pass = store.getSyncPassword(type)
@@ -244,6 +275,31 @@ export default (Store) => {
       electermVersion: packVer,
       deviceName: window.pre.osInfo().find(r => r.k === 'hostname')?.v || 'unknown'
     }
+
+    // Handle WebDAV upload differently
+    if (type === syncTypes.webdav) {
+      const uploadData = {}
+      for (const [key, value] of Object.entries(objs)) {
+        uploadData[key] = value.content
+      }
+      uploadData['electerm-status.json'] = JSON.stringify(status)
+
+      const res = await fetchData(
+        type,
+        'upload',
+        [uploadData],
+        token,
+        store.getSyncProxy(type)
+      )
+      if (res && !res.error) {
+        store.updateSyncSetting({
+          [type + 'LastSyncTime']: now
+        })
+        store.syncServerStatus[type] = status
+      }
+      return
+    }
+
     const gistData = {
       description: 'sync electerm data',
       files: {
@@ -285,10 +341,80 @@ export default (Store) => {
     //   await store.createGist(type)
     //   gistId = store.getSyncGistId(type)
     // }
-    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud) {
+    if (!gistId && type !== syncTypes.custom && type !== syncTypes.cloud && type !== syncTypes.webdav) {
       return
     }
     const pass = store.getSyncPassword(type)
+
+    // Handle WebDAV download differently
+    if (type === syncTypes.webdav) {
+      const gist = await fetchData(
+        type,
+        'download',
+        [],
+        token,
+        store.getSyncProxy(type)
+      )
+      if (gist && gist.files) {
+        const statusContent = get(gist, 'files["electerm-status.json"].content')
+        const status = statusContent ? parseJsonSafe(statusContent) : undefined
+        store.syncServerStatus[type] = status
+
+        const { names, syncConfig } = store.getDataSyncNames()
+        for (const n of names) {
+          let str = get(gist, `files["${n}.json"].content`)
+          if (!str) {
+            if (n === settingMap.bookmarks) {
+              throw new Error(('Seems you have a empty WebDAV folder, you can try upload first'))
+            } else {
+              continue
+            }
+          }
+          if (!isJSON(str)) {
+            str = await window.pre.runGlobalAsync('decryptAsync', str, pass)
+          }
+          let arr = JSON.parse(str)
+          if (n === settingMap.terminalThemes) {
+            arr = store.fixThemes(arr)
+          } else if (n === settingMap.bookmarks) {
+            arr = fixBookmarks(arr)
+          }
+          let strOrder = get(gist, `files["${n}.order.json"].content`)
+          if (isJSON(strOrder)) {
+            strOrder = JSON.parse(strOrder)
+            arr.sort((a, b) => {
+              const ai = strOrder.findIndex(r => r === a.id)
+              const bi = strOrder.findIndex(r => r === b.id)
+              return ai - bi
+            })
+          }
+          store.setItems(n, arr)
+        }
+        if (syncConfig) {
+          const userConfig = parseJsonSafe(
+            get(gist, 'files["userConfig.json"].content')
+          )
+          if (userConfig) {
+            store.setConfig(userConfig)
+          }
+          if (userConfig && userConfig.theme) {
+            store.setTheme(userConfig.theme)
+          }
+        }
+
+        const up = {
+          [type + 'LastSyncTime']: Date.now()
+        }
+        if (pass) {
+          up[type + 'SyncPassword'] = pass
+        }
+        store.updateSyncSetting(up)
+      }
+      store.isSyncingSetting = false
+      store.isSyncDownload = false
+      return
+    }
+
     const gist = await fetchData(
       type,
       'getOne',

package/client/store/transfer-list.js

@@ -24,10 +24,11 @@ export default Store => {
     // console.log('addTransferList', JSON.stringify(items, null, 2))
     const { fileTransfers } = window.store
     const transferBatch = uid()
-    fileTransfers.push(...items.map(t => {
+    const nextItems = items.map(t => {
       t.transferBatch = transferBatch
       return t
-    }))
+    })
+    fileTransfers.push(...nextItems)
   }
 
   Store.prototype.pauseAll = function () {

package/client/store/watch.js

@@ -11,9 +11,7 @@ import {
   expandedKeysLsKey,
   resolutionsLsKey,
   localAddrBookmarkLsKey,
-  syncServerDataKey,
-  aiChatHistoryKey,
-  cmdHistoryKey
+  syncServerDataKey
 } from '../common/constants'
 import * as ls from '../common/safe-local-storage'
 import { debounce, isEmpty } from 'lodash-es'
@@ -134,28 +132,6 @@ export default store => {
     return store.syncServerStatus
   }).start()
 
-  autoRun(() => {
-    ls.safeSetItemJSON('history', store.history)
-    return store.history
-  }).start()
-
-  autoRun(() => {
-    ls.safeSetItemJSON(aiChatHistoryKey, store.aiChatHistory)
-    return store.aiChatHistory
-  }).start()
-
-  autoRun(() => {
-    const history = store.terminalCommandHistory
-    // Save in new format: array of {cmd, count, lastUseTime}
-    const data = Array.from(history.entries()).map(([cmd, info]) => ({
-      cmd,
-      count: info.count,
-      lastUseTime: info.lastUseTime
-    }))
-    ls.safeSetItemJSON(cmdHistoryKey, data)
-    return store.terminalCommandHistory
-  }).start()
-
   autoRun(() => {
     store.updateBatchInputSelectedTabIds()
     const tabs = store.getTabs()

package/package.json

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