Merge branch '1.5.5-dev'

gegehprast · Dec 31, 2019 · 5d18a7f · 5d18a7f
2 parents 4f0142b + b331e00
commit 5d18a7f
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "shallty",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Shallty adalah aplikasi untuk meng-crawl situs fastsub/fanshare Indonesia. Tujuan utamanya adalah untuk melewati berbagai halaman redirect dan mengambil tautan unduh aslinya. Saat ini Shallty telah mendukung crawling untuk Meownime, Samehadaku, Neonime, dan Oploverz. https://shallty.kyuun.id",
   "main": "index.js",
   "scripts": {

diff --git a/services/Browser.js b/services/Browser.js
@@ -19,9 +19,27 @@ class Browser {
         return [this.browser, this.browser2]
     }
 
+    /**
+     * Create new disabled asset page.
+     */
+    async newOptimizedPage() {
+        const page = await this.browser.newPage()
+        await page.setRequestInterception(true)
+
+        page.on('request', (req) => {
+            if (req.resourceType() == 'stylesheet' || req.resourceType() == 'font' || req.resourceType() == 'image') {
+                req.abort()
+            } else {
+                req.continue()
+            }
+        })
+
+        return page
+    }
+
     /**
      * Create new page with different browser context
-     * to support multiple sessions
+     * to support multiple sessions.
      * https://github.com/GoogleChrome/puppeteer/issues/85
      */
     async newPageWithNewContext() {
@@ -33,7 +51,7 @@ class Browser {
     }
 
     /**
-     * Close a page, use this function to close a page that has context
+     * Close a page, use this function to close a page that has context.
      * 
      * @param {Object} page Puppeteer page
      */

diff --git a/services/Kiryuu.js b/services/Kiryuu.js
@@ -12,7 +12,7 @@ class Kiryuu {
      *
      */
     async getMangaList() {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(kiryuu_url + '/manga/?list', {
@@ -49,7 +49,7 @@ class Kiryuu {
      * @param {String} link Manga page url.
      */
     async getMangaInfo(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         let cover = null
 
         try {
@@ -142,7 +142,7 @@ class Kiryuu {
                 message: 'Browser not ready.'
             }
 
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(kiryuu_url + link)
@@ -188,7 +188,7 @@ class Kiryuu {
                 message: 'Browser not ready.'
             }
 
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(kiryuu_url + link)
@@ -238,7 +238,7 @@ class Kiryuu {
      *
      */
     async getNewReleases() {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(kiryuu_url, {

diff --git a/services/Kusonime.js b/services/Kusonime.js
@@ -11,7 +11,7 @@ class Kusonime {
      * Parse and get anime list. Currently support only up to page 2.
      */
     async animeList() {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             let animeList = []
@@ -44,7 +44,7 @@ class Kusonime {
      * @param {Number} homePage Home page.
      */
     async homePage(homePage = 1) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         const posts = []
 
         try {
@@ -155,7 +155,7 @@ class Kusonime {
      * @param {String} link Episode page url.
      */
     async getDownloadLinks(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -227,7 +227,7 @@ class Kusonime {
     }
 
     async parseSemawur(link) {
-        const page = await this.browser.newPageWithNewContext()
+        const page = await this.newOptimizedPageWithNewContext()
 
         try {
             await page.goto(link, {

diff --git a/services/Meownime.js b/services/Meownime.js
@@ -12,7 +12,7 @@ class Meownime {
      * @param link anime page.
      */
     async getEpisodes(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         const episodes = new Map
 
         try {
@@ -75,7 +75,7 @@ class Meownime {
      * @param link davinsurance page.
      */
     async davinsurance(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -113,7 +113,7 @@ class Meownime {
      * @param link meowbox page.
      */
     async meowbox(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -185,7 +185,7 @@ class Meownime {
      */
     async meowdrive(link) {
         let finalUrl
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -226,7 +226,7 @@ class Meownime {
      */
     async checkOnGoingPage() {
         const anime = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(meownime_url + '/tag/ongoing/', {
@@ -265,7 +265,7 @@ class Meownime {
      */
     async onGoingAnime(link) {
         const episodes = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -332,7 +332,7 @@ class Meownime {
      * @param link anime page.
      */
     async getMovieEpisodes(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         const episodes = []
 
         try {

diff --git a/services/Moenime.js b/services/Moenime.js
@@ -13,7 +13,7 @@ class Moenime {
      * @param {String} show Show type, could be: movie, ongoing or, all.
      */
     async animeList(show = 'all') {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(moenime_url + '/daftar-anime-baru/', {
@@ -165,7 +165,7 @@ class Moenime {
      * @param {String} link Anime page url.
      */
     async episodes(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             let episodes = {}
@@ -285,7 +285,7 @@ class Moenime {
      *
      */
     async newReleases() {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             const anime = []
@@ -319,7 +319,7 @@ class Moenime {
     }
 
     async teknoku(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)

diff --git a/services/Neonime.js b/services/Neonime.js
@@ -25,7 +25,7 @@ class Neonime {
      */
     async checkOnGoingPage() {
         const anime = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(neonime_url + '/episode/', {
@@ -66,7 +66,7 @@ class Neonime {
      * Parse and get anime list.
      */
     async animeList() {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(neonime_url + '/list-anime/', {
@@ -97,7 +97,7 @@ class Neonime {
      */
     async tvShow(link) {
         const episodes = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -136,7 +136,7 @@ class Neonime {
      */
     async getEpisodes(link) {
         const episodes = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -180,7 +180,7 @@ class Neonime {
     async getBatchEpisodes(link) {
         const episodes = []
         let info1 = false
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -261,7 +261,7 @@ class Neonime {
             }
         }
 
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(link, {

diff --git a/services/Oploverz.js b/services/Oploverz.js
@@ -12,7 +12,7 @@ class Oploverz {
      */
     async checkOnGoingPage() {
         const anime = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.setUserAgent('Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.83 Safari/537.1')
@@ -58,7 +58,7 @@ class Oploverz {
      */
     async series(link) {
         const episodes = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -100,7 +100,7 @@ class Oploverz {
      * @param link episode page.
      */
     async getDownloadLinks(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         const downloadLinks = []
 
         try {
@@ -149,7 +149,7 @@ class Oploverz {
     }
 
     async hexa(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         try {
             link = decodeURIComponent(link)
 

diff --git a/services/Samehadaku.js b/services/Samehadaku.js
@@ -44,7 +44,7 @@ class Samehadaku {
         let totalPage
         const pageLimit = 3
         const episodes = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -107,7 +107,7 @@ class Samehadaku {
      */
     async checkOnGoingPage() {
         const anime = []
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             await page.goto(samehadaku_url, {
@@ -154,7 +154,7 @@ class Samehadaku {
      * @param link episode page.
      */
     async getDownloadLinks(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
         const downloadLinks = []
 
         try {
@@ -186,7 +186,7 @@ class Samehadaku {
                 await Util.asyncForEach(list, async item => {
                     const strong = await item.$('strong')
                     if (strong && strong != null) {
-                        const quality = this.browser.getPlainProperty(strong, 'innerText')
+                        const quality = await this.browser.getPlainProperty(strong, 'innerText')
                         const anchors = await item.$$('a')
                         await Util.asyncForEach(anchors, async anchor => {
                             const host = await this.browser.getPlainProperty(anchor, 'innerText')
@@ -230,7 +230,7 @@ class Samehadaku {
      */
     async tetew(link, skip = false) {
         let final
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -298,7 +298,7 @@ class Samehadaku {
      * @param link njiir url.
      */
     async njiir(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             let downloadLink, anchor
@@ -328,7 +328,7 @@ class Samehadaku {
     }
 
     async eueSiherp(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -373,7 +373,7 @@ class Samehadaku {
 
     //anjay.info
     async anjay(link) {
-        const page = await this.browser.browser.newPage()
+        const page = await this.browser.newOptimizedPage()
 
         try {
             link = decodeURIComponent(link)
@@ -385,7 +385,7 @@ class Samehadaku {
                 timeout: 30000
             })
 
-            await Util.sleep(10000)
+            await Util.sleep(13000)
             await page.waitForSelector('div.to > a')
             await page.click('div.to > a')
             await page.waitForSelector('#showlink')