README.md

@@ -10,7 +10,6 @@ $ npx https://git.fogtype.com/nebel/gadl/archive/main.tar.gz --help
 ## Supported Sites
 
 - DMM ブックス (漫画)
-- FANZA 同人
 - Google Play ブックス (漫画)
 
 ## License

browser.ts

@@ -3,78 +3,11 @@ import { chromium, devices } from "playwright";
 import type { Database } from "./database";
 import type { TPlatform } from "./platform";
 
-export type ImageFile = {
-  url: string;
-  blocks?: Array<Record<string, number>>;
-  width?: number;
-  height?: number;
-};
-
-async function drawImage(imageFile: ImageFile): Promise<string> {
-  const canvas = Object.assign(document.createElement("canvas"), {
-    width: imageFile.width,
-    height: imageFile.height,
-  });
-
-  const image = (await new Promise((resolve) => {
-    Object.assign(new Image(), {
-      crossOrigin: "use-credentials",
-      src: imageFile.url,
-      onload() {
-        resolve(this);
-      },
-    });
-  })) as HTMLImageElement;
-
-  const ctx = canvas.getContext("2d")!;
-
-  for (const q of imageFile.blocks!) {
-    ctx.drawImage(
-      image,
-      q.destX,
-      q.destY,
-      q.width,
-      q.height,
-      q.srcX,
-      q.srcY,
-      q.width,
-      q.height,
-    );
-  }
-
-  const dataUrl = canvas.toDataURL();
-  return dataUrl;
-}
-
-async function fetchImage(imageFile: ImageFile): Promise<string> {
-  const res = await fetch(imageFile.url);
-  const blob = await res.blob();
-  const dataUrl: string = await new Promise((resolve, reject) => {
-    const fileReader = Object.assign(new FileReader(), {
-      onload(): void {
-        resolve(this.result);
-      },
-      onerror(e: ErrorEvent): void {
-        const error = new Error(`${e.type}: ${e.message}`);
-        reject(error);
-      },
-    });
-
-    fileReader.readAsDataURL(blob);
-  });
-
-  return dataUrl;
-}
-
 export type Browser = {
   loadBrowserContext(platform: TPlatform): Promise<Playwright.BrowserContext>;
   saveBrowserContext(platform: TPlatform, ctx: BrowserContext): Promise<void>;
-  newContext(): Promise<Playwright.BrowserContext>;
+  newContext: () => Promise<Playwright.BrowserContext>;
-  close(): Promise<void>;
+  close: () => Promise<void>;
-  drawImage(
-    pageOrFrame: Playwright.Page | Playwright.Frame,
-    imageFile: ImageFile,
-  ): Promise<string>;
 };
 
 export type BrowserContext = Playwright.BrowserContext;
@@ -105,7 +38,6 @@ export async function createBrowser({
       const ctx = await browser.newContext({ storageState, userAgent });
       return ctx;
     },
-
     async saveBrowserContext(
       platform: TPlatform,
       ctx: BrowserContext,
@@ -117,29 +49,7 @@ export async function createBrowser({
         platform,
       );
     },
-
     newContext: () => browser.newContext(),
     close: () => browser.close(),
-
-    async drawImage(
-      pageOrFrame: Playwright.Page | Playwright.Frame,
-      imageFile: ImageFile,
-    ): Promise<string> {
-      if (Array.isArray(imageFile.blocks) && imageFile.blocks.length > 0) {
-        return await pageOrFrame.evaluate(drawImage, imageFile);
-      }
-
-      if (imageFile.url.startsWith("blob:")) {
-        return await pageOrFrame.evaluate(fetchImage, imageFile);
-      }
-
-      const page = "page" in pageOrFrame ? pageOrFrame.page() : pageOrFrame;
-      const res = await page.context().request.get(imageFile.url);
-      const buffer = await res.body();
-      const type = res.headers()["content-type"];
-      const base64 = buffer.toString("base64");
-
-      return `data:${type};base64,${base64}`;
-    },
   };
 }

library.ts

@@ -20,14 +20,7 @@ export function createLibrary(db: Database) {
         const platform = site(readerUrlOrBook);
 
         await db.run(
-          `\
+          `insert into books(platform_id, reader_url) values((select id from platforms where name = ?), ?)`,
-insert into books(
-  platform_id,
-  reader_url)
-values((select id from platforms where name = ?), ?)
-on conflict(reader_url)
-  do nothing
-`,
           platform,
           readerUrlOrBook,
         );
@@ -55,11 +48,10 @@ on conflict(reader_url)
     async delete(id: number) {
       await db.run(`delete from books where id = ?`, id);
     },
-    async get(readerUrlOrBookId: string | number): Promise<Book | undefined> {
+    async get(id: number): Promise<Book | undefined> {
       const row = await db.get(
-        `select books.id, platforms.name as platform, books.reader_url as readerUrl, books.title, books.authors from books left join platforms on books.platform_id = platforms.id where books.reader_url = ? or books.id = ?`,
+        `select books.id, platforms.name as platform, books.reader_url as readerUrl, books.title, books.authors from books left join platforms on books.platform_id = platforms.id where books.id = ?`,
-        readerUrlOrBookId,
+        id,
-        Number(readerUrlOrBookId),
       );
 
       const book: Book | undefined = row && {
@@ -95,17 +87,9 @@ on conflict(reader_url)
         throw new Error(`Not found: ${path}`);
       }
 
-      if (!book.title) {
+      const title = `${book.authors
-        book.title = String(book.id);
+        .slice(0, opts.outAuthorsLimit)
-      }
+        .join("、")}「${book.title}」`.replace(/[/]/g, "%2F");
-
-      if (book.authors.length > 0) {
-        book.title = `「${book.title}」`;
-      }
-
-      const title = `${book.authors.slice(0, opts.outAuthorsLimit).join("、")}${
-        book.title
-      }`.replace(/[/]/g, "%2F");
 
       const out = createWriteStream(`${opts.outDir}/${title}.cbz`);
 

main.ts

@@ -128,7 +128,7 @@ const options = {
           await library.add(args.values.download!);
         }
 
-        const book = await library.get(args.values.download!);
+        const book = await library.get(Number(args.values.download!));
 
         if (!book) {
           process.exit(1);

migrations/3_add_fanza_doujin.sql

@@ -1,2 +0,0 @@
-insert into platforms(name) values
-  ('fanza-doujin');

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fogtype/gadl",
-  "version": "1.1.0",
+  "version": "1.0.0",
   "license": "AGPL-3.0",
   "type": "module",
   "bin": "bin/run.js",

platform.ts

@@ -4,20 +4,20 @@ import type { Book } from "./library";
 import type { Browser } from "./browser";
 import type { Database } from "./database";
 import { DmmBooks } from "./platforms/dmm-books";
-import { FanzaDoujin } from "./platforms/fanza-doujin";
 import { GooglePlayBooks } from "./platforms/google-play-books";
 
 const platforms = {
   "dmm-books": DmmBooks,
-  "fanza-doujin": FanzaDoujin,
   "google-play-books": GooglePlayBooks,
 };
 
 export type TPlatform = keyof typeof platforms;
 
 export function site(url: string): TPlatform {
-  for (const [platform, { siteUrl }] of Object.entries(platforms)) {
+  const { origin } = new URL(url);
-    if (siteUrl(new URL(url))) return platform as TPlatform;
+
+  for (const [platform, { site }] of Object.entries(platforms)) {
+    if (site.includes(origin)) return platform as TPlatform;
   }
 
   throw new Error(`Unsupported URL: ${url}`);
@@ -29,11 +29,7 @@ export function createPlatform(opts: {
   browser: Browser;
 }) {
   if (!(opts.platform in platforms)) {
-    throw new Error(
+    throw new Error(`Available platform: ${Object.keys(platforms).join(", ")}`);
-      `The value must be a platform type: ${[...Object.keys(platforms)].join(
-        ", ",
-      )}.`,
-    );
   }
 
   const platform = platforms[opts.platform](opts.browser);

platforms/dmm-books.ts

@@ -1,9 +1,16 @@
 import type { Book } from "../library";
-import type { Browser, BrowserContext, ImageFile } from "../browser";
+import type { Browser, BrowserContext } from "../browser";
+
+type ImageFile = {
+  url: string;
+  blocks: Array<Record<string, number>>;
+  width: number;
+  height: number;
+};
 
 var NFBR: any;
 
-export async function getImageFiles(): Promise<Array<ImageFile>> {
+async function getImageFiles(): Promise<Array<ImageFile>> {
   const params = new URLSearchParams(location.search);
   const model = new NFBR.a6G.Model({
     settings: new NFBR.Settings("NFBR.SettingData"),
@@ -72,6 +79,42 @@ export async function getImageFiles(): Promise<Array<ImageFile>> {
   return imageFiles;
 }
 
+async function drawImage(imageFile: ImageFile) {
+  const canvas = Object.assign(document.createElement("canvas"), {
+    width: imageFile.width,
+    height: imageFile.height,
+  });
+
+  const image = (await new Promise((resolve) => {
+    Object.assign(new Image(), {
+      crossOrigin: "use-credentials",
+      src: imageFile.url,
+      onload() {
+        resolve(this);
+      },
+    });
+  })) as HTMLImageElement;
+
+  const ctx = canvas.getContext("2d")!;
+
+  for (const q of imageFile.blocks) {
+    ctx.drawImage(
+      image,
+      q.destX,
+      q.destY,
+      q.width,
+      q.height,
+      q.srcX,
+      q.srcY,
+      q.width,
+      q.height,
+    );
+  }
+
+  const dataUrl = canvas.toDataURL();
+  return dataUrl;
+}
+
 export function DmmBooks(browser: Browser) {
   async function* getSeriesBooks(
     ctx: BrowserContext,
@@ -203,7 +246,7 @@ export function DmmBooks(browser: Browser) {
       const imageFiles = await page.evaluate(getImageFiles);
 
       return imageFiles.map((imageFile) => async () => {
-        const dataUrl = await browser.drawImage(page, imageFile);
+        const dataUrl = await page.evaluate(drawImage, imageFile);
 
         process.stderr.write(".");
 
@@ -213,5 +256,4 @@ export function DmmBooks(browser: Browser) {
   };
 }
 
-DmmBooks.siteUrl = (url: URL) =>
+DmmBooks.site = ["https://book.dmm.com", "https://book.dmm.co.jp"];
-  ["https://book.dmm.com", "https://book.dmm.co.jp"].includes(url.origin);

platforms/fanza-doujin.ts

@@ -1,97 +0,0 @@
-import type { Book } from "../library";
-import type { Browser, BrowserContext, ImageFile } from "../browser";
-import { getImageFiles } from "./dmm-books";
-
-export function FanzaDoujin(browser: Browser) {
-  async function* getAllBooks(ctx: BrowserContext): AsyncGenerator<Book> {
-    const endpoint =
-      "https://www.dmm.co.jp/dc/doujin/api/mylibraries/?limit=20";
-    const pager = {
-      page: 1,
-      perPage: 20,
-      totalCount: Infinity,
-    };
-
-    while (pager.page * pager.perPage <= pager.totalCount) {
-      const res = await ctx.request.get(`${endpoint}&page=${pager.page}`);
-
-      if (!res.ok()) {
-        throw new Error(`${res.status()} ${res.statusText()}`);
-      }
-
-      const body: {
-        data: {
-          items: Record<
-            string,
-            Array<{
-              productId: string;
-              title: string;
-              makerName: string;
-            }>
-          >;
-          total: number;
-        };
-      } = await res.json();
-
-      for (const item of Object.values(body.data.items).flat()) {
-        yield {
-          id: NaN,
-          platform: "fanza-doujin",
-          readerUrl: `https://www.dmm.co.jp/dc/-/mylibrary/detail/=/product_id=${item.productId}/`,
-          title: item.title || "",
-          authors: [item.makerName],
-        };
-
-        process.stderr.write(".");
-      }
-
-      pager.page += 1;
-      pager.totalCount = body.data.total;
-    }
-  }
-
-  return {
-    async login() {
-      const ctx = await browser.newContext();
-      const page = await ctx.newPage();
-      await page.goto("https://accounts.dmm.co.jp/service/login/password");
-      await page.waitForURL("https://www.dmm.co.jp/top/", { timeout: 0 });
-      await browser.saveBrowserContext("fanza-doujin", ctx);
-    },
-
-    async *pull(): AsyncGenerator<Book> {
-      const ctx = await browser.loadBrowserContext("fanza-doujin");
-
-      yield* getAllBooks(ctx);
-
-      process.stderr.write(`\n`);
-    },
-
-    async getFiles(book: Book): Promise<Array<() => Promise<string>>> {
-      const ctx = await browser.loadBrowserContext("fanza-doujin");
-      const page = await ctx.newPage();
-
-      await page.goto(book.readerUrl);
-      await page.waitForSelector(`li[class^="fileTreeItem"]`);
-      await page.click(`li[class^="fileTreeItem"]>a`);
-      await page.waitForURL((url) =>
-        url.href.startsWith("https://www.dmm.co.jp/dc/-/viewer/=/product_id="),
-      );
-
-      const imageFiles: Array<ImageFile> = await page.evaluate(getImageFiles);
-
-      return imageFiles.map((imageFile) => async () => {
-        const dataUrl = await browser.drawImage(page, imageFile);
-
-        process.stderr.write(".");
-
-        return dataUrl;
-      });
-    },
-  };
-}
-
-FanzaDoujin.siteUrl = (url: URL) =>
-  url.href.startsWith(
-    "https://www.dmm.co.jp/dc/-/mylibrary/detail/=/product_id=",
-  );

platforms/google-play-books.ts

@@ -1,5 +1,9 @@
 import type { Book } from "../library";
-import type { Browser, ImageFile } from "../browser";
+import type { Browser } from "../browser";
+
+type ImageFile = {
+  url: string;
+};
 
 async function getImageFiles(): Promise<Array<ImageFile>> {
   const pages: NodeListOf<HTMLElement> = await new Promise(async function (
@@ -37,6 +41,26 @@ async function getImageFiles(): Promise<Array<ImageFile>> {
   return [...images].map((image) => ({ url: image.href.baseVal }));
 }
 
+async function fetchImage(imageFile: ImageFile): Promise<string> {
+  const res = await fetch(imageFile.url);
+  const blob = await res.blob();
+  const dataUrl: string = await new Promise((resolve, reject) => {
+    const fileReader = Object.assign(new FileReader(), {
+      onload(): void {
+        resolve(this.result);
+      },
+      onerror(e: ErrorEvent): void {
+        const error = new Error(`${e.type}: ${e.message}`);
+        reject(error);
+      },
+    });
+
+    fileReader.readAsDataURL(blob);
+  });
+
+  return dataUrl;
+}
+
 export function GooglePlayBooks(browser: Browser) {
   return {
     async login() {
@@ -126,7 +150,7 @@ export function GooglePlayBooks(browser: Browser) {
         for (const imageFile of imageFiles) {
           if (fileMap.has(imageFile.url)) continue;
 
-          const dataUrl = await browser.drawImage(frame, imageFile);
+          const dataUrl = await frame.evaluate(fetchImage, imageFile);
 
           process.stderr.write(".");
 
@@ -139,5 +163,4 @@ export function GooglePlayBooks(browser: Browser) {
   };
 }
 
-GooglePlayBooks.siteUrl = (url: URL) =>
+GooglePlayBooks.site = ["https://play.google.com"];
-  url.origin === "https://play.google.com";