Merge branch 'develop'

Author: leoding86

package.json

@@ -54,14 +54,14 @@
     "json-loader": "^0.5.7",
     "mini-css-extract-plugin": "^0.10.0",
     "node-notifier": "8.0.1",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "portfinder": "^1.0.28",
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
     "postcss-url": "^7.2.1",
     "rollup": "^1.32.1",
     "rollup-plugin-commonjs": "^9.3.4",
+    "sass": "^1.49.7",
     "sass-loader": "^10.0.1",
     "semver": "^5.7.1",
     "shelljs": "^0.7.6",
@@ -81,7 +81,6 @@
   },
   "browserslist": [
     "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
+    "last 2 versions"
   ]
 }

src/background/main.js

@@ -76,6 +76,8 @@ Main.prototype = {
     ];
 
     browser.webRequest.onBeforeSendHeaders.addListener(details => {
+      let requestHeadersNeedOverride = [];
+
       if (details.type === 'xmlhttprequest') {
         let hasOriginHeader = false;
         let hasReferer = false;
@@ -87,7 +89,10 @@ Main.prototype = {
             hasReferer = true;
 
             if (details.url.indexOf('i.pximg.net') > -1 && !savePattern.test(header.value)) {
-              details.requestHeaders[i].value = 'https://www.pixiv.net/';
+              requestHeadersNeedOverride.push({
+                name: 'referer',
+                value: 'https://www.pixiv.net/'
+              });
             }
           } else if (headerName === 'origin') {
             hasOriginHeader = true;
@@ -96,39 +101,39 @@ Main.prototype = {
 
         if (details.url.indexOf('api.fanbox.cc') > -1) {
           if (!hasOriginHeader) {
-            details.requestHeaders.push({
+            requestHeadersNeedOverride.push({
               name: 'Origin',
               value: details.initiator ? details.initiator : 'https://www.fanbox.cc'
             });
           }
         }
 
         if (!hasReferer) {
-          details.requestHeaders.push({
+          requestHeadersNeedOverride.push({
             name: 'referer',
             value: 'https://www.pixiv.net/'
           });
         }
 
+        if (requestHeadersNeedOverride.length > 0) {
+          this.overrideHttpHeaders(details.requestHeaders, requestHeadersNeedOverride);
+        }
+
         return { requestHeaders: details.requestHeaders }
       }
     }, {
       urls: filter
     }, opt_onBeforeSendHeaders_extraInfoSpec);
 
     browser.webRequest.onHeadersReceived.addListener(details => {
-      let accessControlAllowOrigin = '*';
+      let accessControlAllowOrigin = '*',
+          responseHeadersNeedOverride = [];
 
       if (details.type === 'xmlhttprequest') {
-        details.responseHeaders.forEach((header, i) => {
-          if (header.name.toLowerCase() === 'access-control-allow-origin') {
-            details.responseHeaders.splice(i, 1);
-          }
-        });
-
         if (details.frameId === 0 && /^https:\/\/[^.]+\.fanbox\.cc/.test(details.initiator)) {
           accessControlAllowOrigin = details.initiator;
-          details.responseHeaders.push({
+
+          responseHeadersNeedOverride.push({
             name: 'Access-Control-Allow-Credentials',
             value: 'true'
           });
@@ -140,28 +145,30 @@ Main.prototype = {
         if (this.items.ugoiraConvertTool === 'ffmpeg' &&
           /^https:\/\/(www\.)?pixiv\.net\/([a-z\d\-_]*\/)?artworks/i.test(details.url)
         ) {
-          details.responseHeaders.push({
+          responseHeadersNeedOverride.push({
             name: 'Cross-Origin-Embedder-Policy',
             value: 'require-corp'
           });
 
-          details.responseHeaders.push({
+          responseHeadersNeedOverride.push({
             name: 'Cross-Origin-Opener-Policy',
             value: 'same-origin'
           });
         }
       }
 
-      details.responseHeaders.push({
+      responseHeadersNeedOverride.push({
         name: 'Cross-Origin-Resource-Policy',
         value: 'cross-origin'
       });
 
-      details.responseHeaders.push({
+      responseHeadersNeedOverride.push({
         name: 'Access-Control-Allow-Origin',
         value: accessControlAllowOrigin
       });
 
+      this.overrideHttpHeaders(details.responseHeaders, responseHeadersNeedOverride);
+
       return { responseHeaders: details.responseHeaders };
     }, {
       urls: filter
@@ -216,6 +223,32 @@ Main.prototype = {
     });
   },
 
+  /**
+   *
+   * @param {{name: string, value: string}[]} headers
+   * @param {{name: string, value: string}[]} headersNeedOverride
+   * @returns {void}
+   */
+   overrideHttpHeaders(headers, headersNeedOverride) {
+    let headerNames = headersNeedOverride.map(header => header.name);
+
+    /**
+     * Let's keep thing simple, delete headers which are need to be
+     * override first, then set new headers to the  headers.
+     */
+    for (let i = 0; headers[i];) {
+      if (headerNames.indexOf(headers[i].name.toLowerCase()) >= 0) {
+        headers.splice(i, 1);
+      } else {
+        i++;
+      }
+    }
+
+    /**
+     */
+    headersNeedOverride.forEach(header => headers.push(header));
+  },
+
   /**
    * Update action icon
    */

src/config/default.js

@@ -207,4 +207,10 @@ export default Object.assign({}, {
      * @since 5.3.0
      */
     multipleDownloadsGapTime: 150,
+
+    /**
+     * @since 5.5.0
+     */
+    downloadPanelPosition: 'center',
+    downloadPanelStyle: 1,
   });

src/content_scripts/NovelAdapter.js

@@ -55,6 +55,13 @@ class NovelAdapter {
       month: dateFormatter.getMonth(),
       day: dateFormatter.getDay()
     }
+
+    // series data
+    if (context.seriesNavData) {
+      this.novelContext.seriesId = context.seriesNavData.seriesId;
+      this.novelContext.seriesTitle = context.seriesNavData.title;
+      this.novelContext.seriesOrder = context.seriesNavData.order;
+    }
   }
 
   makeTool() {