Merge pull request #51 from lecepin/fix-update-rule

feat: Rule update & Electron update
lecepin · Sep 4, 2023 · 17e0ffd · 17e0ffd
2 parents a31c15a + 14a8ef5
commit 17e0ffd
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/electron/ipc.js b/electron/ipc.js
@@ -20,9 +20,16 @@ export default function initIPC() {
     return startServer({
       interceptCallback: phase => async (req, res) => {
         if (phase === 'response' && res?._data?.headers?.['content-type'] == 'video/mp4') {
+          const fixUrl = {}
+          if(req.fullUrl().includes("video.qq.com")){
+            fixUrl.fixUrl = req.fullUrl().replace(/\/20302\//g, '/20304/');
+            fixUrl.hdUrl = fixUrl.fixUrl.replace(/(\?|&)(?!(encfilekey=|token=))[^&]+/g, '');
+          }
+
           win?.webContents?.send?.('VIDEO_CAPTURE', {
             url: req.fullUrl(),
             size: res?._data?.headers?.['content-length'] ?? 0,
+            ...fixUrl
           });
         }
       },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wechat-video-downloader",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "./build-electron/index.js",
   "homepage": "./",
@@ -34,7 +34,7 @@
     "concurrently": "^7.1.0",
     "cross-env": "^7.0.3",
     "customize-cra": "^1.0.0",
-    "electron": "^18.2.3",
+    "electron": "^26.1.0",
     "electron-builder": "^23.0.3",
     "electron-icon-builder": "^2.0.1",
     "husky": "^8.0.1",

diff --git a/src/App.jsx b/src/App.jsx
@@ -60,8 +60,8 @@ function App() {
                 title: '操作',
                 dataIndex: 'action',
                 key: 'action',
-                width: '200px',
-                render: (_, { url, fullFileName }) => (
+                width: '210px',
+                render: (_, { url, hdUrl, fixUrl, fullFileName,  }) => (
                   <div>
                     {fullFileName ? (
                       <Button
@@ -80,18 +80,18 @@ function App() {
                         icon={<DownloadOutlined />}
                         type="primary"
                         onClick={() => {
-                          send({ type: 'e_下载', url });
+                          send({ type: 'e_下载', url: (hdUrl || url) });
                         }}
                         size="small"
                       >
-                        下载
+                        {hdUrl ? "高清" : ""}下载
                       </Button>
                     )}
                     &nbsp; &nbsp;
                     <Button
                       icon={<PlaySquareOutlined />}
                       onClick={() => {
-                        send({ type: 'e_预览', url });
+                        send({ type: 'e_预览', url: (fixUrl || url) });
                       }}
                       size="small"
                     >

diff --git a/src/fsm.js b/src/fsm.js
@@ -161,8 +161,8 @@ export default createMachine(
           .finally(() => send('e_重新检测'));
       },
       invoke_启动服务: (context, event) => send => {
-        const fnDealVideoCapture = (eName, { url, size }) => {
-          send({ type: 'e_视频捕获', url, size });
+        const fnDealVideoCapture = (eName, { url, size, ...other }) => {
+          send({ type: 'e_视频捕获', url, size, ...other });
         };
 
         ipcRenderer
@@ -217,8 +217,8 @@ export default createMachine(
         },
     },
     actions: {
-      action_视频捕获: actions.assign(({ captureList }, { size, url }) => {
-        captureList.push({ size, url, prettySize: prettyBytes(+size) });
+      action_视频捕获: actions.assign(({ captureList }, { size, url, ...other }) => {
+        captureList.push({ size, url, prettySize: prettyBytes(+size), ...other });
 
         return {
           captureList: uniqBy(captureList, 'url'),
@@ -247,7 +247,7 @@ export default createMachine(
       action_下载完成: actions.assign(({ captureList }, { fullFileName, currentUrl }) => {
         return {
           captureList: captureList.map(item => {
-            if (item.url === currentUrl) {
+            if ((item.hdUrl || item.url) === currentUrl) {
               item.fullFileName = fullFileName;
             }
             return item;