@electerm/electerm-react 3.15.76 → 3.15.86

package/client/components/main/error-wrapper.jsx

@@ -121,6 +121,7 @@ export default class ErrorBoundary extends React.PureComponent {
           <img
             src='https://electerm.org/electerm-wechat-group-qr.jpg'
             className='mwm-100'
+            width={200}
           />
         </div>
       </>
@@ -133,7 +134,7 @@ export default class ErrorBoundary extends React.PureComponent {
       return (
         <div className='pd3 error-wrapper'>
           <div className='pd2y'>
-            <img src={logoPath1} className='iblock mwm-100' />
+            <img src={logoPath1} className='iblock mwm-100' width={100} />
           </div>
           <h1>
             <FrownOutlined className='mg1r iblock' />

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

@@ -104,13 +104,20 @@ export const getFolderFromFilePath = (filePath, isRemote) => {
   }
 }
 
+function toMs (ms, date) {
+  const n = Number(ms)
+  if (Number.isFinite(n)) return n
+  const d = Number(date)
+  return Number.isFinite(d) ? d : 0
+}
+
 export const getLocalFileInfo = async (filePath) => {
   const statr = await window.fs.statAsync(filePath)
   const stat = await window.fs.lstatAsync(filePath)
   return {
     size: stat.size,
-    accessTime: stat.atime || stat.atimeMs,
-    modifyTime: stat.mtime || stat.mtimeMs,
+    accessTime: toMs(stat.atimeMs, stat.atime),
+    modifyTime: toMs(stat.mtimeMs, stat.mtime),
     mode: stat.mode,
     owner: stat.uid,
     group: stat.gid,

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

@@ -222,7 +222,7 @@ export default class Sftp extends Component {
       let aValue = a[sortProp]
       let bValue = b[sortProp]
 
-      if (typeof aValue === 'string') {
+      if (typeof aValue === 'string' && typeof bValue === 'string') {
         aValue = aValue.toLowerCase()
         bValue = bValue.toLowerCase()
         return isDesc

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

@@ -24,7 +24,7 @@ import './vnc.styl'
 async function loadVncModule () {
   if (window.novnc) return
   console.debug('[VNC-CLIENT] Loading noVNC module...')
-  const mod = await import('@novnc/novnc/core/rfb')
+  const mod = await import('@novnc/novnc')
   window.novnc = {
     RFB: mod.default
   }

package/client/store/watch.js

@@ -31,6 +31,11 @@ export default store => {
         old,
         n
       )
+      // Update snapshot immediately before async DB writes to prevent
+      // race conditions: a second autoRun firing before the first
+      // completes would see stale oldState and re-insert the same items,
+      // causing NeDB unique constraint errors.
+      refsStatic.add('oldState-' + name, deepCopy(n) || [])
       await Promise.all([
         ...removed.map(item => remove(name, item.id)),
         ...updated.map(item => update(item.id, item, name, false)),
@@ -41,7 +46,6 @@ export default store => {
         `${name}:order`,
         newOrder
       )
-      refsStatic.add('oldState-' + name, deepCopy(n) || [])
       if (name === 'bookmarks') {
         store.bookmarksMap = new Map(
           n.map(d => [d.id, d])

package/package.json

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