Merge pull request #38 from zeroshine/fixChromeBreak

fix chrome api break change
zeroshine · Mar 5, 2019 · 8f48e10 · 8f48e10
2 parents 361f191 + ca1dfde
commit 8f48e10
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 91 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "comicsscroller",
-  "version": "4.0.27",
+  "version": "4.0.28",
   "private": true,
   "scripts": {
     "clean": "shx rm -rf ./ComicsScroller",

diff --git a/src/extensions/manifest.json b/src/extensions/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Comics Scroller",
-  "version": "4.0.27",
+  "version": "4.0.28",
   "manifest_version": 2,
   "description": "一個支援動漫屋、無限動漫、sfacg，給你更好的漫畫閱讀體驗的 chrome extension ",
   "icons": {

diff --git a/src/js/background.js b/src/js/background.js
@@ -62,19 +62,19 @@ chrome.browserAction.setBadgeBackgroundColor({ color: '#F00' });
 chrome.webRequest.onBeforeSendHeaders.addListener(
   dm5RefererHandler,
   { urls: ['http://www.dm5.com/m*/chapterfun*', 'http://*.cdndm5.com/*'] },
-  ['requestHeaders', 'blocking'],
+  ['requestHeaders', 'blocking', 'extraHeaders'],
 );
 
 chrome.webRequest.onBeforeSendHeaders.addListener(
   dm5CookieHandler,
   { urls: ['http://www.dm5.com/m*/'] },
-  ['requestHeaders', 'blocking'],
+  ['requestHeaders', 'blocking', 'extraHeaders'],
 );
 
 chrome.webRequest.onBeforeSendHeaders.addListener(
   sfRefererHandler,
   { urls: ['http://*.sfacg.com/*'] },
-  ['requestHeaders', 'blocking'],
+  ['requestHeaders', 'blocking', 'extraHeaders'],
 );
 
 chrome.notifications.onClicked.addListener(id => {

diff --git a/src/js/container/App/reducers/dm5Epic.js b/src/js/container/App/reducers/dm5Epic.js
@@ -39,7 +39,7 @@ function fetchImgs$(chapter) {
     responseType: 'document',
   }).mergeMap(function fetchImgPageHandler({ response }) {
     const node = response.querySelector('div.title > span:nth-child(2) > a');
-    const script = response.querySelector('head > script:nth-child(17)')
+    const script = response.querySelector('head')
       .textContent;
     const DM5_IMAGE_COUNT = /DM5_IMAGE_COUNT=(\d+);/.exec(script)[1];
     const DM5_CID = /DM5_CID=(\d+);/.exec(script)[1];
@@ -139,6 +139,7 @@ export function fetchChapterPage$(url) {
 }
 
 export function fetchImgListEpic(action$, store) {
+  console.log('fetchImgs$')
   return action$.ofType(FETCH_IMG_LIST).mergeMap(action => {
     const { chapterList } = store.getState().comics;
     return fetchImgs$(chapterList[action.index]).mergeMap(({ imgList }) => {
@@ -169,88 +170,79 @@ export function fetchChapterEpic(action$, store) {
         Observable.of(updateRenderIndex(0, 6)),
         Observable.of(fetchImgSrc(0, 6)),
         Observable.of(startScroll()),
-        fetchChapterPage$(`${baseURL}/${comicsID}`).mergeMap(
+        fetchChapterPage$(`${baseURL}/${comicsID}/`).mergeMap(
           ({ title, coverURL, chapterList, chapters }) => {
             const chapterIndex = findIndex(
               chapterList,
               item => item === chapter,
             );
-            return Observable.bindCallback(chrome.storage.local.get)().mergeMap(
-              item => {
-                const newItem = {
-                  ...item,
-                  update: filter(
-                    item.update,
-                    updateItem =>
-                      updateItem.site !== 'dm5' ||
-                      updateItem.chapterID !== chapter,
+            console.log(chapterIndex)
+            chrome.storage.local.get(null, item => {
+              const newItem = {
+                ...item,
+                update: filter(
+                  item.update,
+                  updateItem =>
+                    updateItem.site !== 'dm5' ||
+                    updateItem.chapterID !== chapter,
+                ),
+                history: [
+                  {
+                    site: 'dm5',
+                    comicsID,
+                  },
+                  ...filter(
+                    item.history,
+                    historyItem =>
+                      historyItem.site !== 'dm5' ||
+                      historyItem.comicsID !== comicsID,
                   ),
-                  history: [
-                    {
-                      site: 'dm5',
-                      comicsID,
-                    },
-                    ...filter(
-                      item.history,
-                      historyItem =>
-                        historyItem.site !== 'dm5' ||
-                        historyItem.comicsID !== comicsID,
-                    ),
-                  ],
-                  dm5: {
-                    ...item.dm5,
-                    [comicsID]: {
-                      title,
-                      chapters,
-                      chapterList,
-                      coverURL,
-                      chapterURL: `${baseURL}/${comicsID}`,
-                      lastReaded: chapter,
-                      readedChapters: {
-                        ...(item.dm5[comicsID]
-                          ? item.dm5[comicsID].readedChapters
-                          : {}),
-                        [chapter]: chapter,
-                      },
+                ],
+                dm5: {
+                  ...item.dm5,
+                  [comicsID]: {
+                    title,
+                    chapters,
+                    chapterList,
+                    coverURL,
+                    chapterURL: `${baseURL}/${comicsID}`,
+                    lastReaded: chapter,
+                    readedChapters: {
+                      ...(item.dm5[comicsID]
+                        ? item.dm5[comicsID].readedChapters
+                        : {}),
+                      [chapter]: chapter,
                     },
                   },
-                };
-                const subscribe = some(
-                  item.subscribe,
-                  citem => citem.site === 'dm5' && citem.comicsID === comicsID,
-                );
-                return Observable.merge(
-                  Observable.of(updateSubscribe(subscribe)),
-                  Observable.bindCallback(chrome.storage.local.set)(
-                    newItem,
-                  ).mergeMap(() => {
-                    chrome.browserAction.setBadgeText({
-                      text: `${
-                        newItem.update.length === 0 ? '' : newItem.update.length
-                      }`,
-                    });
-                    const result$ = [
-                      updateTitle(title),
-                      updateReadedChapters(
-                        newItem.dm5[comicsID].readedChapters,
-                      ),
-                      updateChapters(chapters),
-                      updateChapterList(chapterList),
-                      updateChapterNowIndex(chapterIndex),
-                    ];
-                    if (chapterIndex > 0) {
-                      result$.push(
-                        fetchImgList(chapterIndex - 1),
-                        updateChapterLatestIndex(chapterIndex - 1),
-                      );
-                    } else {
-                      result$.push(updateChapterLatestIndex(chapterIndex - 1));
-                    }
-                    return result$;
-                  }),
-                );
-              },
-            );
+                },
+              };
+              const subscribe = some(
+                item.subscribe,
+                citem => citem.site === 'dm5' && citem.comicsID === comicsID,
+              );
+              store.dispatch(updateSubscribe(subscribe))
+              chrome.storage.local.set(newItem, () => {
+                chrome.browserAction.setBadgeText({
+                  text: `${
+                    newItem.update.length === 0 ? '' : newItem.update.length
+                    }`,
+                });
+                store.dispatch(updateTitle(title));
+                store.dispatch(updateReadedChapters(
+                  newItem.dm5[comicsID].readedChapters,
+                ));
+                store.dispatch(updateChapters(chapters));
+                store.dispatch(updateChapterList(chapterList));
+                store.dispatch(updateChapterNowIndex(chapterIndex));
+                if (chapterIndex > 0) {
+                  store.dispatch(fetchImgList(chapterIndex - 1));
+                  store.dispatch(updateChapterLatestIndex(chapterIndex - 1));
+                } else {
+                  store.dispatch(updateChapterLatestIndex(chapterIndex - 1));
+                }
+              })
+            })
+            return []
           },
         ),
       );
@@ -263,8 +255,8 @@ export function fetchChapter(chapter) {
 }
 
 export function updateReadedEpic(action$, store) {
-  return action$.ofType(UPDATE_READED).mergeMap(action =>
-    Observable.bindCallback(chrome.storage.local.get)().mergeMap(item => {
+  return action$.ofType(UPDATE_READED).mergeMap(action => {
+    chrome.storage.local.get(null, item => {
       const { comicsID, chapterList } = store.getState().comics;
       const chapterID = chapterList[action.index];
       const newItem = {
@@ -285,19 +277,16 @@ export function updateReadedEpic(action$, store) {
           },
         },
       };
-      return Observable.bindCallback(chrome.storage.local.set)(
-        newItem,
-      ).mergeMap(() => {
+      chrome.storage.local.set(newItem, () => {
         chrome.browserAction.setBadgeText({
           text: `${newItem.update.length === 0 ? '' : newItem.update.length}`,
         });
-        return [
-          updateReadedChapters(newItem.dm5[comicsID].readedChapters),
-          updateChapterNowIndex(action.index),
-        ];
+        store.dispatch(updateReadedChapters(newItem.dm5[comicsID].readedChapters))
+        store.dispatch(updateChapterNowIndex(action.index))
       });
-    }),
-  );
+    })
+    return []
+  });
 }
 
 export function updateReaded(index) {