feat : Add electron auto update function

electron-builder.json5

@@ -37,6 +37,6 @@
   publish:{
     provider: 'generic', 
     channel: 'latest',
-    url: 'https://github.com/RSS1101/electron-vite-react/releases/download/v9.9.9/',
+    url: 'https://github.com/electron-vite/electron-vite-react/releases/download/v0.9.9/',
   }
 }

electron/preload/update.ts

@@ -1,108 +1,90 @@
 import { autoUpdater } from "electron-updater"
 import { app, ipcMain } from "electron";
 export const update = (win: Electron.CrossProcessExports.BrowserWindow) => {
-  // 设置日志打印
 
-  // 是否自动下载更新，设置为 false 时将通过 API 触发更新下载
+  // When set to false, the update download will be triggered through the API
   autoUpdater.autoDownload = false;
 
   autoUpdater.disableWebInstaller = false
 
-  // 是否允许版本降级，也就是服务器版本低于本地版本时，依旧以服务器版本为主
   autoUpdater.allowDowngrade = false;
 
-  // 设置服务器版本最新版本查询接口配置
-  autoUpdater.setFeedURL({
-    provider: 'generic', 
-    channel: 'latest',
-    url: 'https://github.com/RSS1101/electron-vite-react/releases/download/v9.9.9/',
-  });
-
-  // 保存是否需要安装更新的版本状态，因为需要提供用户在下载完成更新之后立即更新和稍后更新的操作
+  // Save the version status of whether the update needs to be installed,
+  // Because the user needs to update immediately and later after the update is downloaded
   let NEED_INSTALL = false;
 
-  Object.defineProperty(app, 'isPackaged', {
-    get() {
-      return true;
-    }
-  });
-
-  // 调用 API 检查是否用更新
+  // Check whether update is used
   ipcMain.on('check-update',()=>{
     autoUpdater.checkForUpdatesAndNotify()
       .then((res) => {
         win.webContents.send('check-update-type',{ checkUpdate: true})
       }).catch(err => {
-        // 网络错误 network error
+        //  network error
         win.webContents.send('check-update-type', { checkUpdate: false})
       });
   })
 
-  // 检测开始
+  // start check
   autoUpdater.on('checking-for-update', function () {
     console.log('checking-for-update')
   })
-  // 更新可用
+  // update available
   autoUpdater.on('update-available', (arg) => {
     console.log('update-available')
     win.webContents.send('is-update-available', { isUpdate: true, oldVersion: app.getVersion(), newVersion: arg?.version })
   })
-  // 更新不可用
+  // update not available
   autoUpdater.on('update-not-available', (arg) => {
     console.log('update-not-available')
     win.webContents.send('is-update-available', { isUpdate: false, oldVersion: app.getVersion(), newVersion: arg?.version })
   })
-  // API 触发更新下载
+
   const startDownload = (callback: any, successCallback: any) => {
-    // 监听下载进度并推送到更新窗口
+    // Monitor the download progress and push it to the update window
     autoUpdater.on('download-progress', (data) => {
       console.log("progress", data)
       win.webContents.send('download-progress-data', data)
       callback && callback instanceof Function && callback(null, data);
     });
-    // 监听下载错误并推送到更新窗口
+    // Listen for download errors and push to the update window
     autoUpdater.on('error', (err) => {
-      console.log("error")
       callback && callback instanceof Function && callback(err);
     });
-    // 监听下载完成并推送到更新窗口
+    // Listen to the download completion and push it to the update window
     autoUpdater.on('update-downloaded', () => {
-      console.log("update-downloaded")
       NEED_INSTALL = true;
       successCallback && successCallback instanceof Function && successCallback();
     });
-    // 下载更新
+
     autoUpdater.downloadUpdate();
   };
 
-  // 监听应用层发送来的进程消息，开始下载更新
+  // Listen to the process message sent by the application layer and start downloading updates
   ipcMain.on('start-download', (event) => {
     console.log("start")
     startDownload(
       (err: any, progressInfo: { percent: any; }) => {
         if (err) {
-          //回推下载错误消息
-          console.log("update-error")
+          // callback download error message
           event.sender.send('update-error', { updateError:true});
         } else {
-          //回推下载进度消息
-          console.log("pdate-progress-percent")
+           // callback update progress message
           event.sender.send('update-progress', { progressInfo: progressInfo.percent });
         }
       },
       () => {
-        //回推下载完成消息
-        console.log("update-downed")
+        // callback update downed message
         event.sender.send('update-downed');
       }
     );
   });
 
+  // install now
   ipcMain.on('quit-and-install', () => {
     autoUpdater.quitAndInstall(false, true);
   })
 
-  // 用户点击稍后安装后程序退出时执行立即安装更新
+  // install later
   app.on('will-quit', () => {
     console.log("NEED_INSTALL=true")
     if (NEED_INSTALL) {

src/App.scss

@@ -32,10 +32,6 @@
 
 .card {
   padding: 2em;
-  button{
-    margin: 0 20px;
-    background-color: #646cffaa;
-  }
 }
 
 .read-the-docs {

src/App.tsx

@@ -1,75 +1,36 @@
-import nodeLogo from "./assets/node.svg"
-import { useEffect, useRef, useState } from 'react'
+import nodeLogo from './assets/node.svg'
+import { useState } from 'react'
 import './App.scss'
-import Update from "./pages/update"
-import { ipcRenderer } from "electron"
+import Update from '@/components/update'
 
 console.log('[App.tsx]', `Hello world from Electron ${process.versions.electron}!`)
 
-interface checkUpdateType {
-  checkUpdate: boolean
-}
 
 function App() {
   const [count, setCount] = useState(0)
-  const ref =useRef<any>(null)
-  const [checkBtnText, setCheckBtnText] = useState('check update')
-  const [checkLoading, setCheckLoading] = useState(false)
-  const [checkType, setCheckType] = useState(false)
-  const [openModalType, setopenModalType] = useState(false)
-  /**
-   * @description 检查是否有新的更新 Listen for new updates
-   */
-  const checkUpdate = () => {
-    setCheckLoading(true)
-    setCheckBtnText('checking Update ...')
-    ipcRenderer.send('check-update')
-  }
-  /**
-   * @description 获取到检查结果 Get the check results
-   */
-  ipcRenderer.on('check-update-type', (_event, ...args: checkUpdateType[]) => {
-    setCheckLoading(false)
-    setCheckBtnText('check update')
-    setCheckType(args[0].checkUpdate)
-    setopenModalType(true)
-  })
-  /**
-   * @description 在通信监听的过程中获取不到ref.
-   */
-  useEffect(()=>{
-    if (openModalType){
-    ref.current!.openModal()
-    setopenModalType(false)
-    }
-  }, [openModalType])
-
   return (
-    <div className="App">
+    <div className='App'>
       <div>
-        <a href="https://github.com/electron-vite/electron-vite-react" target="_blank">
-          <img src="./electron-vite.svg" className="logo" alt="Electron + Vite logo" />
+        <a href='https://github.com/electron-vite/electron-vite-react' target='_blank'>
+          <img src='./electron-vite.svg' className='logo' alt='Electron + Vite logo' />
         </a>
       </div>
       <h1>Electron + Vite + React</h1>
-      <div className="card">
+      <div className='card'>
         <button onClick={() => setCount((count) => count + 1)}>
           count is {count}
         </button>
-        <button disabled={checkLoading} onClick={checkUpdate}>
-          {checkBtnText}
-        </button>
         <p>
           Edit <code>src/App.tsx</code> and save to test HMR
         </p>
       </div>
-      <p className="read-the-docs">
+      <p className='read-the-docs'>
         Click on the Electron + Vite logo to learn more
       </p>
-      <div className="flex-center">
-        Place static files into the<code>/public</code> folder <img style={{ width: "5em" }} src={nodeLogo} alt="Node logo" />
+      <div className='flex-center'>
+        Place static files into the<code>/public</code> folder <img style={{ width: '5em' }} src={nodeLogo} alt='Node logo' />
       </div>
-      <Update ref={ref} checkType={checkType}/>
+      <Update />
     </div>
   )
 }

src/components/RsModal/type.d.ts

@@ -1,18 +0,0 @@
-import { ReactNode } from 'react';
-interface childrens {
-  titleText?: string;
-  isHeaderShow?: boolean;
-  isFooterShow?: boolean;
-  canCelText?: string;
-  submitText?: string;
-  onSubmit?: () => void;
-  onCanCel?: () => void;
-}
-export interface ModalChildType extends childrens {
-  body: ReactNode | null;
-}
-
-export interface ModalPropsType extends childrens {
-  isOpenModal: boolean;
-  children: ReactNode | null;
-}

src/components/RsProgress/index.tsx

@@ -1,22 +0,0 @@
-import { RsProgressType } from './type';
-import './index.scss';
-
-const RsProgress = (props: RsProgressType) => {
-
-  return (
-    <div className="rs-progress">
-      <div className="rs-progress-pr"  style={{ width: props.rateWidth ?? 250 }}>
-      <div
-        className="rs-progress-rate"
-        style={{
-          width: (props.percent ?? 0) * ((props.rateWidth ?? 250) / 100),
-          backgroundColor: props.rateColor ?? 'blue',
-        }}
-      />
-    </div>
-      <span className='rs-progress-num'>{props.percent > 100 ? 100 :(props.percent.toString().substring(0,2) ?? 0) }%</span>
-    </div>
-  );
-};
-
-export default RsProgress;

src/components/RsProgress/type.d.ts

@@ -1,5 +0,0 @@
-export interface RsProgressType {
-  rateColor?: string;
-  rateWidth?: number;
-  percent: number;
-}

src/components/update/Modal/index.scss

@@ -1,4 +1,4 @@
-.rs-modal-bg{
+.up-modal-bg{
   width: 100vw;
   height: 100vh;
   position: fixed;
@@ -7,30 +7,30 @@
   z-index: 9999;
   background: rgba(0, 0, 0, 0.3);
 }
-.rs-modal {
+.up-modal {
   position: absolute;
   top: 20vh;
   left: 30vw;
   z-index: 10000;
-  .rs-modal-panel {
+  .up-modal-panel {
     border: 1px solid #000000;
     border-radius: 5px;
-    .rs-modal-header {
+    .up-modal-header {
       $titleheight: 38px;
       width: 530px;
       height: $titleheight;
       line-height: $titleheight;
       background-color: rgb(99, 153, 255);
       display: flex;
-      .rs-modal-header-text {
+      .up-modal-header-text {
         text-align: center;
         width: 480px;
       }
     }
-    .rs-modal-body{
+    .up-modal-body{
       background-color: #ffffff;
     }
-    .rs-modal-footer {
+    .up-modal-footer {
       background-color: #ffffff;
       display: flex;
       justify-content: end;

src/components/update/Modal/index.tsx

@@ -4,12 +4,12 @@ import './index.scss';
 const ModalTemplate = (child: ModalChildType) => {
   return (
     <>
-      <div className="rs-modal-bg" onClick={child.onCanCel} />
-      <div className="rs-modal">
-        <div className="rs-modal-panel">
+      <div className="up-modal-bg" onClick={child.onCanCel} />
+      <div className="up-modal">
+        <div className="up-modal-panel">
           {child.isHeaderShow ? (
-            <div className="rs-modal-header">
-              <div className="rs-modal-header-text">{child.titleText}</div>
+            <div className="up-modal-header">
+              <div className="up-modal-header-text">{child.titleText}</div>
               <svg
                 onClick={child.onCanCel}
                 className="icon"
@@ -28,11 +28,11 @@ const ModalTemplate = (child: ModalChildType) => {
             </div>
           ) : null}
 
-          <div className="rs-modal-body">{child.body}</div>
+          <div className="up-modal-body">{child.body}</div>
           {child.isFooterShow ? (
-            <div className="rs-modal-footer">
-              <button onClick={child.onSubmit}>{child.submitText ?? '确认'}</button>
-              <button onClick={child.onCanCel}>{child.canCelText ?? '取消'}</button>
+            <div className="up-modal-footer">
+              {(child.isSubmitShow ?? true) ?<button onClick={child.onSubmit}>{child.submitText ?? '确认'}</button> : null}
+              {(child.isCanCelShow ?? true) ? <button onClick={child.onCanCel}>{child.canCelText ?? '取消'}</button> : null}
             </div>
           ) : null}
         </div> 
@@ -41,13 +41,15 @@ const ModalTemplate = (child: ModalChildType) => {
   );
 };
 
-const RsModal = (props: ModalPropsType) => {
+const Modal = (props: ModalPropsType) => {
   return  createPortal(
     props.isOpenModal?
       ModalTemplate({
         titleText: props.titleText,
         isHeaderShow: props.isHeaderShow ?? true,
         isFooterShow: props.isFooterShow ?? true,
+        isCanCelShow: props.isCanCelShow ?? true,
+        isSubmitShow: props.isSubmitShow ?? true,
         body: props.children,
         submitText: props.submitText,
         canCelText: props.canCelText,
@@ -57,4 +59,4 @@ const RsModal = (props: ModalPropsType) => {
       document.body,
     );
 };
-export default RsModal;
+export default Modal;

src/components/update/Modal/type.d.ts

@@ -0,0 +1,20 @@
+import { ReactNode } from 'react'
+interface childrens {
+  titleText?: string
+  isHeaderShow?: boolean
+  isFooterShow?: boolean
+  isCanCelShow?: boolean
+  isSubmitShow?: boolean
+  canCelText?: string
+  submitText?: string
+  onSubmit?: () => void
+  onCanCel?: () => void
+}
+export interface ModalChildType extends childrens {
+  body: ReactNode | null
+}
+
+export interface ModalPropsType extends childrens {
+  isOpenModal: boolean
+  children: ReactNode | null
+}

src/components/update/Progress/index.scss

@@ -1,16 +1,16 @@
-.rs-progress{
+.up-progress{
   display: flex;
   align-items: center;
-  .rs-progress-pr{
+  .up-progress-pr{
      border: 1px solid #000000;
      border-radius: 3px;
      height: 6px;
   }
-  .rs-progress-rate{
+  .up-progress-rate{
      height: 6px;
      border-radius: 3px;
   }
-  .rs-progress-num{
+  .up-progress-num{
     margin: 0 10px;
   }
 }

src/components/update/Progress/index.tsx

@@ -0,0 +1,22 @@
+import { RsProgressType } from './type'
+import './index.scss'
+
+const Progress = (props: RsProgressType) => {
+
+  return (
+    <div className="up-progress">
+      <div className="up-progress-pr"  style={{ width: props.rateWidth ?? 250 }}>
+      <div
+        className="up-progress-rate"
+        style={{
+          width: (props.percent ?? 0) * ((props.rateWidth ?? 250) / 100),
+          backgroundColor: props.rateColor ?? 'blue',
+        }}
+      />
+    </div>
+      <span className='up-progress-num'>{props.percent > 100 ? 100 :(props.percent.toString().substring(0,4) ?? 0) }%</span>
+    </div>
+  );
+};
+
+export default Progress;

src/components/update/Progress/type.d.ts

@@ -0,0 +1,5 @@
+export interface RsProgressType {
+  rateColor?: string
+  rateWidth?: number
+  percent: number
+}

src/components/update/index.scss

@@ -1,4 +1,4 @@
-.modal-body{
+.up-modal-body{
   display: flex;
   align-items: center;
   justify-content: center;

src/components/update/index.tsx

@@ -1,27 +1,18 @@
-import RsModal from "@/components/RsModal"
-import RsProgress from "@/components/RsProgress"
-import { ipcRenderer } from "electron"
-import { forwardRef, useEffect, useImperativeHandle, useState } from "react"
-import "./index.scss"
+import Modal from '@/components/update/Modal'
+import Progress from '@/components/update/Progress'
+import { ipcRenderer } from 'electron'
+import { useEffect, useState } from 'react'
+import './index.scss'
+import { checkUpdateType, isUpdateAvailable, ModalBtnText, VersionInfo } from './type'
 
-interface VersionInfo {
-  oldVersion: string,
-  newVersion: string
-}
-
-interface isUpdateAvailable extends VersionInfo {
-  isUpdate: boolean,
-
-}
-interface ModalBtnText {
-  canCelText: string,
-  submitText: string
-}
 
 let onModalSubmit = () => { }
 let onModalCanCel = () => { }
 
-const Update = forwardRef((props: { checkType: boolean }, ref) => {
+const Update = () => {
+  const [checkBtnText, setCheckBtnText] = useState('check update')
+  const [checkType, setCheckType] = useState(false)
+  const [checkLoading, setCheckLoading] = useState(false)
   const [isOpenModal, setIsOpenModal] = useState<boolean>(false)
   const [percentNum, setPercentNum] = useState<number>(0)
   const [isNeedUpdate, setIsNeedUpdate] = useState<boolean>(false)
@@ -35,23 +26,33 @@ const Update = forwardRef((props: { checkType: boolean }, ref) => {
     submitText: ''
   })
 
-  useImperativeHandle(ref, () => ({
-    openModal: () => setIsOpenModal(true)
-  }));
-
   useEffect(() => {
     onModalCanCel = () => setIsOpenModal(false)
   }, [])
 
-  /**
-  * @description 获取版本信息和是否需要更新 Get version information and whether to update
-  */
+  // Check for updates
+  const checkUpdate = () => {
+    setCheckLoading(true)
+    setCheckBtnText('checking Update ...')
+    ipcRenderer.send('check-update')
+  }
+
+  // Listen to get the check result
+  ipcRenderer.on('check-update-type', (_event, ...args: checkUpdateType[]) => {
+    setCheckLoading(false)
+    setCheckBtnText('check update')
+    setCheckType(args[0].checkUpdate)
+    setIsOpenModal(true)
+  })
+
+  // Get version information and whether to update
   ipcRenderer.on('is-update-available', (_event, ...args: isUpdateAvailable[]) => {
     setVersionInfo({
       oldVersion: args[0].oldVersion,
       newVersion: args[0].newVersion,
     })
     setIsNeedUpdate(args[0].isUpdate)
+    // Update required
     if (args[0].isUpdate) {
       setModalBtnText({
         canCelText: 'cancel',
@@ -61,21 +62,19 @@ const Update = forwardRef((props: { checkType: boolean }, ref) => {
       onModalCanCel = () => setIsOpenModal(false)
     }
   })
-  /**
-   * @description 如果更新失败了抛出更新失败信息 Throw the update failure message if the update fails
-   */
+
+  // Throw the update failure message when the update fails
   ipcRenderer.on('update-error', (_event, ...args: { updateError: boolean }[]) => {
     setUpdateError(args[0].updateError)
+    setCheckType(false)
   })
-  /**
-   * @description 监听更新进度 update progress 
-   */
+
+  // Get update progress 
   ipcRenderer.on('update-progress', (_event, ...args: { progressInfo: number }[]) => {
     setPercentNum(args[0].progressInfo)
   })
-  /**
-   * @description 监听是否更新完成 is update been completed
-   */
+
+  // is update been completed
   ipcRenderer.on('update-downed', (_event, ...args) => {
     setPercentNum(100)
     setModalBtnText({
@@ -90,34 +89,35 @@ const Update = forwardRef((props: { checkType: boolean }, ref) => {
   })
 
   return (
-    <>
-      <RsModal isOpenModal={isOpenModal} onCanCel={onModalCanCel} onSubmit={onModalSubmit}
+    <div>
+      <Modal isOpenModal={isOpenModal} onCanCel={onModalCanCel} onSubmit={onModalSubmit}
         canCelText={modalBtnText.canCelText} submitText={modalBtnText.submitText}
-        isFooterShow={props.checkType && isNeedUpdate}>
-        <div className="modal-body">
+        isFooterShow={checkType && isNeedUpdate}>
+        <div className='up-modal-body'>
           {updateError ?
-            <div className="update-error">Error downloading the latest version, please contact the developer</div> :
-            props.checkType ? (
+            <div className='update-error'>Error downloading the latest version, please contact the developer</div> :
+            checkType ? (
               isNeedUpdate ? (
                 <div>
                   <div>
                     <span> oldVersion : v.{versionInfo.oldVersion} </span>
                     <span> newVersion : v.{versionInfo.newVersion} </span>
                   </div>
-                  <div className="update-progress">
-                    <span className="progress-title"> update progress : </span>
-                    <RsProgress percent={percentNum} ></RsProgress>
+                  <div className='update-progress'>
+                    <span className='progress-title'> update progress : </span>
+                    <Progress percent={percentNum} ></Progress>
                   </div>
                 </div>)
                 : <span>This is last version : v.{versionInfo.oldVersion} !</span>
             ) : <span>Check update is Error,Please check your network!</span>
           }
-
         </div>
-      </RsModal>
-
-    </>
+      </Modal>
+      <button disabled={checkLoading} onClick={checkUpdate}>
+        {checkBtnText}
+      </button>
+    </div>
   )
-})
+}
 
 export default Update

src/components/update/type.d.ts

@@ -0,0 +1,18 @@
+
+export interface checkUpdateType {
+  checkUpdate: boolean
+}
+
+export interface VersionInfo {
+  oldVersion: string
+  newVersion: string
+}
+
+export interface isUpdateAvailable extends VersionInfo {
+  isUpdate: boolean
+
+}
+export interface ModalBtnText {
+  canCelText: string
+  submitText: string
+}