* Finish backend app update check.

MrMYHuang · Feb 9, 2021 · e1c80d6 · e1c80d6
1 parent 7ce1375
commit e1c80d6
Show file tree

Hide file tree

Showing 16 changed files with 316 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -247,6 +247,11 @@ https://github.com/MrMYHuang/cbetar2/releases/latest
 11. 合成語音選項在Android Chrome無效。( https://stackoverflow.com/a/61366224/631869 )
 
 ## <a id='history'>版本歷史</a>
+* 2021.02.09:
+  * PWA 4.23.0:
+    * [新增] 支援檢查後端app下載進度顯示。
+  * Backend 13.0.0:
+    * [新增] 支援檢查後端app更新、下載。
 * PWA 4.22.0:
   * [新增] 經文頁開啟CBETA Online經文功能。
 * PWA 4.21.5:

diff --git a/electronBuilderConfigs/IsDeb.txt b/electronBuilderConfigs/IsDeb.txt
diff --git a/electronBuilderConfigs/IsMac.txt b/electronBuilderConfigs/IsMac.txt
diff --git a/electronBuilderConfigs/IsRpm.txt b/electronBuilderConfigs/IsRpm.txt
diff --git a/electronBuilderConfigs/IsWin.txt b/electronBuilderConfigs/IsWin.txt
diff --git a/electronBuilderConfigs/deb.json b/electronBuilderConfigs/deb.json
@@ -5,6 +5,13 @@
     "buildElectron/**/*",
     "package.json"
   ],
+  "extraFiles": [
+    {
+      "from": "electronBuilderConfigs",
+      "to": ".",
+      "filter": ["IsDeb.txt"]
+    }
+  ],
   "extraResources": [
     "buildElectron/*.xsl"
   ],

diff --git a/electronBuilderConfigs/mac.json b/electronBuilderConfigs/mac.json
@@ -6,6 +6,11 @@
     "package.json"
   ],
   "extraResources": [
+    {
+      "from": "electronBuilderConfigs",
+      "to": ".",
+      "filter": ["IsMac.txt"]
+    },
     "buildElectron/*.xsl"
   ],
   "asarUnpack": [

diff --git a/electronBuilderConfigs/rpm.json b/electronBuilderConfigs/rpm.json
@@ -5,6 +5,13 @@
     "buildElectron/**/*",
     "package.json"
   ],
+  "extraFiles": [
+    {
+      "from": "electronBuilderConfigs",
+      "to": ".",
+      "filter": ["IsRpm.txt"]
+    }
+  ],
   "extraResources": [
     "buildElectron/*.xsl"
   ],

diff --git a/electronBuilderConfigs/snap.json b/electronBuilderConfigs/snap.json
@@ -6,7 +6,11 @@
     "package.json"
   ],
   "extraFiles": [
-    "electronBuilderConfigs/IsSnap.txt",
+    {
+      "from": "electronBuilderConfigs",
+      "to": ".",
+      "filter": ["IsSnap.txt"]
+    }
   ],
   "extraResources": [
     "buildElectron/*.xsl"

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "cbetar2",
   "productName": "電子佛典",
-  "pwaVersion": "4.22.0",
-  "version": "12.0.1",
+  "pwaVersion": "4.23.0",
+  "version": "13.0.0",
   "license": "MIT",
   "keywords": [
     "CBETA",
@@ -49,8 +49,12 @@
     "extends": "react-app"
   },
   "dependencies": {
+    "@types/semver": "^7.3.4",
+    "axios": "^0.21.1",
     "electron-window-state": "^5.0.3",
-    "libxslt-myh": "^0.9.7"
+    "libxslt-myh": "^0.9.7",
+    "node-downloader-helper": "^1.0.17",
+    "semver": "^7.3.4"
   },
   "devDependencies": {
     "@ionic/react": "^5.5.3",
@@ -68,7 +72,6 @@
     "@types/react-router": "^5.1.8",
     "@types/react-router-dom": "^5.1.6",
     "@types/uuid": "^8.3.0",
-    "axios": "^0.21.1",
     "customize-cra": "^1.0.0",
     "electron": "^11.2.1",
     "electron-builder": "^22.9.1",

diff --git a/src/App.tsx b/src/App.tsx
@@ -47,6 +47,7 @@ import DictionaryPage from './pages/DictionaryPage';
 import FullTextSearchPage from './pages/FullTextSearchPage';
 import ShareTextModal from './components/ShareTextModal';
 import WordDictionaryPage from './pages/WordDictionaryPage';
+import DownloadModal from './components/DownloadModal';
 
 const electronBackendApi: any = (window as any).electronBackendApi;
 
@@ -97,6 +98,7 @@ interface State {
   toastMessage: string;
   showUpdateAlert: boolean;
   showRestoreAppSettingsToast: boolean;
+  downloadModal: any;
 }
 
 class _App extends React.Component<PageProps> {
@@ -135,6 +137,12 @@ class _AppOrig extends React.Component<AppOrigProps, State> {
             val: data.isOn,
           });
           break;
+        case 'DownloadingBackend':
+          this.setState({ downloadModal: { show: true, progress: data.progress / 100 } });
+          break;
+        case 'DownloadingBackendDone':
+          this.setState({ downloadModal: { show: false, progress: this.state.downloadModal.progress } });
+          break;
       }
     });
     electronBackendApi?.send("toMain", { event: 'ready' });
@@ -183,6 +191,7 @@ class _AppOrig extends React.Component<AppOrigProps, State> {
       showRestoreAppSettingsToast: (queryParams.settings != null && this.originalAppSettingsStr != null) || false,
       showToast: false,
       toastMessage: '',
+      downloadModal: { progress: 0, show: false }
     };
 
     serviceWorkCallbacks.onUpdate = (registration: ServiceWorkerRegistration) => {
@@ -385,6 +394,14 @@ class _AppOrig extends React.Component<AppOrigProps, State> {
           }}
         />
 
+        <DownloadModal
+          {...{
+            progress: this.state.downloadModal.progress,
+            showModal: this.state.downloadModal.show,
+            ...this.props
+          }}
+        />
+
         <IonToast
           cssClass='uiFont'
           isOpen={this.state.showRestoreAppSettingsToast}