修复下载照片时，超时导致下载卡死的问题

Signed-off-by: 芷炫 <lvshuncai@gmail.com>

src/js/common.js

@@ -390,12 +390,10 @@ API.Utils = {
             }
             // 允许跨域
             request.withCredentials = true;
-            request.onload = function (xhr) {
-                resolve(request);
-            }
-            request.onerror = function (xhr) {
-                reject(xhr);
-            }
+            request.onload = (xhr) => resolve(request);
+            request.onerror = (xhr) => reject(xhr);
+            request.ontimeout = (xhr) => reject(xhr);
+            request.onabort = (xhr) => reject(xhr);
             request.send();
         });
     },

src/js/content-script.js

@@ -1714,16 +1714,20 @@ API.Boards.contentToFile = function () {
  * @param {function} nextFunc
  */
 API.Photos.fetchOneList = async function (albumItem, page, nextList) {
-    let imgData = await API.Photos.getImages(albumItem.id, page);
-    // 去掉函数，保留json
-    imgData = imgData.replace(/^shine0_Callback\(/, "");
-    imgData = imgData.replace(/\);$/, "");
-    imgData = JSON.parse(imgData);
-    let photoList = imgData.data.photoList || [];
-    QZone.Photos.Data = QZone.Photos.Data.concat(photoList);
-    let albumnIdList = QZone.Photos.Images.get(albumItem.id) || [];
-    QZone.Photos.Images.set(albumItem.id, albumnIdList.concat(photoList));
-    nextList(albumItem, page, nextList);
+    await API.Photos.getImages(albumItem.id, page).then((imgData) => {
+        // 去掉函数，保留json
+        imgData = imgData.replace(/^shine0_Callback\(/, "");
+        imgData = imgData.replace(/\);$/, "");
+        imgData = JSON.parse(imgData);
+        let photoList = imgData.data.photoList || [];
+        QZone.Photos.Data = QZone.Photos.Data.concat(photoList);
+        let albumnIdList = QZone.Photos.Images.get(albumItem.id) || [];
+        QZone.Photos.Images.set(albumItem.id, albumnIdList.concat(photoList));
+        nextList(albumItem, page, nextList);
+    }).catch(() => {
+        console.error('获取照片异常，当前页：' + page, albumItem);
+        nextList(albumItem, page, nextList);
+    });
 };
 
 

src/manifest.json

@@ -3,7 +3,7 @@
     "name": "QQ空间导出助手",
     "short_name": "QQ空间备份",
     "description": "QQ空间导出助手，用于备份QQ空间的说说、日志、私密日记、相册、视频、留言板、QQ好友为文件，供永久保存",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "icons": {
         "128": "img/icon-128.png"
     },