feat: mobi;

Author: rodzyk

package-lock.json

@@ -29,6 +29,7 @@
     "jszip": "^3.10.1",
     "ngx-highlightjs": "^12.0.0",
     "pdfjs-dist": "^4.6.82",
+    "readiverse": "^0.1.0",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.10"

package.json

@@ -3,27 +3,27 @@ import { inject, Injectable } from '@angular/core';
 import { map, Observable } from 'rxjs';
 import { CompositionEpisode } from '../../@common-read';
 import { environment } from '../../../../environments/environment';
-import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class BlankaryService {
   http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getComposition(id: string): Observable<CompositionEpisode> {
-    return this.http.get<any>(environment.blankaryoHost + id)
+    return this.http.get<any>(this.proxy.proxyUrl(environment.blankaryoHost + id))
       .pipe(map((data) => { return this.map(data) }))
   }
 
   map(data: any): CompositionEpisode {
-    
     const mappedResponse = {
       title: data.title,
 
       images: JSON.parse(data.images).map((img: string) => {
         return {
-          src: environment.proxy + Base64.toBase64(`https://blankary.com/image/${img}`)
+          src: this.proxy.proxyUrl(`https://blankary.com/image/${img}`)
         };
       })
 

src/app/@site-modules/blankary/data-access/blankary.service.ts

@@ -3,16 +3,17 @@ import { inject, Injectable } from '@angular/core';
 import { Observable, map } from 'rxjs';
 import { environment } from '../../../../environments/environment';
 import { CompositionEpisode } from '../../@common-read';
-import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ComickService {
   http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getComposition(id: string): Observable<CompositionEpisode> {
-    // environment.proxy + Base64.toBase64
+    // this.proxy.proxyUrl()
     return this.http.get<any>((environment.comickHost + id))
       .pipe(map((data) => { return this.map(data) }))
   }
@@ -31,7 +32,7 @@ export class ComickService {
       })).filter((i: any) => i.src)
         // .map((img: any) => {
         //   return {
-        //     src: environment.proxy + Base64.toBase64(`${img.src}`)
+        //     src:  this.proxy.proxyUrl(`${img.src}`)
         //   }
         // })
 

src/app/@site-modules/comick/data-access/comick.service.ts

@@ -1,8 +1,9 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { environment } from '../../../../environments/environment';
 import { Observable, catchError, map, throwError } from 'rxjs';
 import { CompositionEpisode, CompositionImage } from '../../@common-read';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 interface MdChapterImages {
   hash: string;
@@ -62,15 +63,15 @@ interface MdMangaResp {
   providedIn: 'root'
 })
 export class MangadexService {
-
-  constructor(private http: HttpClient) { }
+  http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getChapterImages(id: string): Observable<CompositionImage[]> {
-    return this.http.get<MdChapterImagesResp>(environment.mangadexHost + id)
+    return this.http.get<MdChapterImagesResp>(this.proxy.proxyUrl(environment.mangadexHost + id))
       .pipe(
         map((data: MdChapterImagesResp) => data.chapter.dataSaver.map((item: string) => {
           return {
-            src: `${environment.proxy}${data.baseUrl}/data-saver/${data.chapter.hash}/${item}`
+            src: this.proxy.proxyUrl(`${data.baseUrl}/data-saver/${data.chapter.hash}/${item}`)
             // src: `${data.baseUrl}/data/${data.chapter.hash}/${item}`
           }
         })
@@ -80,7 +81,7 @@ export class MangadexService {
   }
 
   getChapter(id: string): Observable<CompositionEpisode> {
-    return this.http.get<MdChapterResp>(environment.mangadexChapter + id)
+    return this.http.get<MdChapterResp>(this.proxy.proxyUrl(environment.mangadexChapter + id))
       .pipe(
         map((data: MdChapterResp) => {
           return {
@@ -98,7 +99,7 @@ export class MangadexService {
 
 
   getManga(id: string): Observable<{ nsfw: boolean }> {
-    return this.http.get<MdMangaResp>(environment.mangadexManga + id).pipe(this.nsfwMap())
+    return this.http.get<MdMangaResp>(this.proxy.proxyUrl(environment.mangadexManga + id)).pipe(this.nsfwMap())
   }
 
   nsfwMap() {

src/app/@site-modules/mangadex/data-access/mangadex.service.ts

@@ -3,16 +3,17 @@ import { inject, Injectable } from '@angular/core';
 import { Observable, map } from 'rxjs';
 import { environment } from '../../../../environments/environment';
 import { CompositionEpisode } from '../../@common-read';
-import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class NhentaiService {
   http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getComposition(id: string): Observable<CompositionEpisode> {
-    return this.http.get<any>(environment.proxy + Base64.toBase64(environment.nhentaiHost + id))
+    return this.http.get<any>(this.proxy.proxyUrl(environment.nhentaiHost + id))
       .pipe(map((data) => { return this.map(data) }))
   }
 
@@ -31,7 +32,7 @@ export class NhentaiService {
         };
       })).filter((i: any) => i.src)
         .map((img: any) => {
-          return { src: environment.proxy + Base64.toBase64(`${img.src}`) }
+          return { src: this.proxy.proxyUrl(`${img.src}`) }
         })
 
     };

src/app/@site-modules/nhentai/data-access/nhentai.service.ts

@@ -3,16 +3,17 @@ import { inject, Injectable } from '@angular/core';
 import { Observable, map } from 'rxjs';
 import { environment } from '../../../../environments/environment';
 import { CompositionEpisode, CompositionPublisher } from '../../@common-read';
-import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class PixivService {
   http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getComposition(id: string): Observable<CompositionEpisode> {
-    return this.http.get<any>(environment.proxy + Base64.toBase64(environment.pixivHost + id))
+    return this.http.get<any>(this.proxy.proxyUrl(environment.pixivHost + id))
       .pipe(map((data) => { return this.map(data.body) }))
   }
 
@@ -25,7 +26,7 @@ export class PixivService {
         id: data.author_details.user_id as string,
         site: `https://pixiv.net/en/users/` + data.author_details.user_id as string,
         name: data.author_details.user_name as string,
-        avatar: environment.proxy + Base64.toBase64(data.author_details.profile_img.main) + '&ref=https://www.pixiv.net' as string,
+        avatar: this.proxy.proxyUrl(data.author_details.profile_img.main) + '&ref=https://www.pixiv.net' as string,
         description: '',
         links: []
       } as unknown as CompositionPublisher,
@@ -46,7 +47,7 @@ export class PixivService {
 
         .filter((i: any) => i.src).map((img: any) => {
           return {
-            src: environment.proxy + Base64.toBase64(img.src) + '&ref=https://www.pixiv.net',
+            src: this.proxy.proxyUrl(img.src) + '&ref=https://www.pixiv.net',
             width: img.width,
             height: img.height
           }

src/app/@site-modules/pixiv/data-access/pixiv.service.ts

@@ -1,14 +1,16 @@
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Observable, map } from 'rxjs';
 import { environment } from '../../../../environments/environment';
 import { CompositionEpisode } from '../../@common-read';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 import { Base64 } from '../../../shared/utils';
 
 @Injectable({
   providedIn: 'root'
 })
 export class RedditService {
+  proxy: ProxyService = inject(ProxyService)
 
   constructor(private http: HttpClient) { }
 
@@ -32,7 +34,7 @@ export class RedditService {
         const ext = (media_metadata[i.media_id]?.m).replace('image/', '');
         const imgSrc = `https://i.redd.it/${i.media_id}.${ext ?? 'jpg'}`
         return {
-          src: environment.proxy + Base64.toBase64(imgSrc),
+          src: this.proxy.proxyUrl(imgSrc),
           height: (media_metadata[i.media_id]?.s).y,
           width: (media_metadata[i.media_id]?.s).x,
         }

src/app/@site-modules/reddit/data-access/reddit.service.ts

@@ -1,14 +1,15 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Observable, map } from 'rxjs';
 import { CompositionEpisode } from '../../@common-read';
 import { environment } from '../../../../environments/environment';
-import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class TelegraphService {
+  proxy: ProxyService = inject(ProxyService)
 
   constructor(private http: HttpClient) { }
 
@@ -27,7 +28,7 @@ export class TelegraphService {
           src: item.children.find((child: any) => child.tag === "img")?.attrs.src
         };
       })).filter((i: any) => i.src).map((img: any)=> {return {src: 
-        environment.proxy + Base64.toBase64('https://telegra.ph'+ img.src)
+        this.proxy.proxyUrl('https://telegra.ph'+ img.src)
       }})
     };
 

src/app/@site-modules/telegraph/data-access/telegraph.service.ts

@@ -2,17 +2,19 @@ import { inject, Injectable } from '@angular/core';
 import { environment } from '../../../../environments/environment';
 import { HttpClient } from '@angular/common/http';
 import { Observable, map } from 'rxjs';
-import { CompositionEpisode, CompositionPublisher } from '../../@common-read';
+import { CompositionEpisode } from '../../@common-read';
 import { Base64 } from '../../../shared/utils';
+import { ProxyService } from '../../../shared/data-access/proxy.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class YandereService {
   http: HttpClient = inject(HttpClient)
+  proxy: ProxyService = inject(ProxyService)
 
   getComposition(id: string): Observable<CompositionEpisode> {
-    return this.http.get<any>(environment.yanderePoolsHost + id)
+    return this.http.get<any>(this.proxy.proxyUrl(environment.yanderePoolsHost + id))
       .pipe(map((data) => { return this.map(data) }))
   }
 
@@ -29,7 +31,7 @@ export class YandereService {
       })).filter((i: any) => i.src)
         .map((img: any) => {
           return {
-            src: environment.proxy + Base64.toBase64(img.src),
+            src: this.proxy.proxyUrl(img.src),
             width: img.width,
             height: img.height
           }