README.md

@@ -10,7 +10,7 @@ $ npx https://git.fogtype.com/nebel/gadl/archive/main.tar.gz --help
 
 - Google Play ブックス (漫画)
 - DMM ブックス (漫画)
-- DLsite 同人/がるまに/成年コミック
+- DLsite 同人
 - FANZA 同人
 
 ## License

browser.ts

@@ -1,10 +1,8 @@
-import type * as Playwright from "playwright";
+import * as Playwright from "playwright";
 import { chromium, devices } from "playwright";
 import type { Database } from "./database";
 import type { TPlatform } from "./platform";
 
-export type PageOrFrame = Playwright.Page | Playwright.Frame;
-
 export type ImageFile = {
   url: string;
   blocks?: Array<Record<string, number>>;
@@ -12,16 +10,6 @@ export type ImageFile = {
   height?: number;
 };
 
-export type Browser = {
-  loadBrowserContext(platform: TPlatform): Promise<Playwright.BrowserContext>;
-  saveBrowserContext(platform: TPlatform, ctx: BrowserContext): Promise<void>;
-  newContext(): Promise<Playwright.BrowserContext>;
-  close(): Promise<void>;
-  drawImage(pageOrFrame: PageOrFrame, imageFile: ImageFile): Promise<Blob>;
-};
-
-export type BrowserContext = Playwright.BrowserContext;
-
 async function drawImage(imageFile: ImageFile): Promise<string> {
   const canvas = Object.assign(document.createElement("canvas"), {
     width: imageFile.width,
@@ -83,12 +71,25 @@ async function dataUrlToBlob(dataUrl: string): Promise<Blob> {
   return await res.blob();
 }
 
+export type Browser = {
+  loadBrowserContext(platform: TPlatform): Promise<Playwright.BrowserContext>;
+  saveBrowserContext(platform: TPlatform, ctx: BrowserContext): Promise<void>;
+  newContext(): Promise<Playwright.BrowserContext>;
+  close(): Promise<void>;
+  drawImage(
+    pageOrFrame: Playwright.Page | Playwright.Frame,
+    imageFile: ImageFile,
+  ): Promise<Blob>;
+};
+
+export type BrowserContext = Playwright.BrowserContext;
+
 export async function createBrowser({
   db,
-  headless,
+  headless = true,
 }: {
   db: Database;
-  headless: boolean;
+  headless?: boolean;
 }): Promise<Browser> {
   const { userAgent } = devices["Desktop Chrome"];
   const browser = await chromium.launch({
@@ -126,7 +127,7 @@ export async function createBrowser({
     close: () => browser.close(),
 
     async drawImage(
-      pageOrFrame: PageOrFrame,
+      pageOrFrame: Playwright.Page | Playwright.Frame,
       imageFile: ImageFile,
     ): Promise<Blob> {
       if (Array.isArray(imageFile.blocks) && imageFile.blocks.length > 0) {

main.ts

@@ -4,9 +4,9 @@ import path from "node:path";
 import util from "node:util";
 import { createBrowser } from "./browser";
 import { createDatabase } from "./database";
-import { createLibrary, type Book } from "./library";
+import { type Book, createLibrary } from "./library";
+import { type TPlatform, createPlatform, platforms } from "./platform";
 import * as pkg from "./package.json";
-import { createPlatform, platforms, type TPlatform } from "./platform";
 
 const options = {
   db: {
@@ -30,10 +30,6 @@ const options = {
       return `<output_authors_limit> (default: ${this.default})`;
     },
   },
-  "no-headless": {
-    type: "boolean",
-    default: false,
-  },
   login: {
     type: "string",
     toString() {
@@ -57,9 +53,8 @@ const options = {
       return [...Object.keys(platforms)].join("|");
     },
     async run() {
-      const db = await createDatabase(args.values.db!),
+      const db = await createDatabase(args.values.db!);
-        headless = !args.values["no-headless"];
+      const browser = await createBrowser({ db });
-      const browser = await createBrowser({ db, headless });
       const platform = createPlatform({
         platform: args.values.logout as TPlatform,
         db,
@@ -133,10 +128,9 @@ const options = {
       return [...Object.keys(platforms)].join("|");
     },
     async run() {
-      const db = await createDatabase(args.values.db!),
+      const db = await createDatabase(args.values.db!);
-        library = createLibrary(db),
+      const library = createLibrary(db);
-        headless = !args.values["no-headless"];
+      const browser = await createBrowser({ db });
-      const browser = await createBrowser({ db, headless });
       const platform = createPlatform({
         platform: args.values.pull as TPlatform,
         db,
@@ -156,9 +150,8 @@ const options = {
       return `all|<reader_url_or_id>`;
     },
     async run() {
-      const db = await createDatabase(args.values.db!),
+      const db = await createDatabase(args.values.db!);
-        library = createLibrary(db),
+      const library = createLibrary(db);
-        headless = !args.values["no-headless"];
       const books: Array<Book> = [];
 
       if (args.values.download === "all") {
@@ -178,7 +171,7 @@ const options = {
       }
 
       for (const book of books) {
-        const browser = await createBrowser({ db, headless });
+        const browser = await createBrowser({ db });
         const platform = createPlatform({
           platform: book.platform,
           db,

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@fogtype/gadl",
-  "version": "1.6.0",
+  "version": "1.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@fogtype/gadl",
-      "version": "1.6.0",
+      "version": "1.5.0",
       "license": "AGPL-3.0",
       "dependencies": {
         "fflate": "^0.8.1",

package.json

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

platforms/dlsite-maniax.ts

@@ -1,41 +1,5 @@
-import type {
-  Browser,
-  BrowserContext,
-  ImageFile,
-  PageOrFrame,
-} from "../browser";
 import type { Book } from "../library";
-
+import type { Browser, BrowserContext, ImageFile } from "../browser";
-// リーダーのページ要素
-const workTreeItemsSelector = `[class^=_worktree_] li[class^=_item_]`;
-
-function Reader(page: PageOrFrame, readerUrl: string) {
-  const workId = /^https:[/][/]play[.]dlsite[.]com[/]#[/]work[/]([^/]+)/.exec(
-    readerUrl,
-  )?.[1];
-
-  if (!workId) {
-    throw new Error(`workId is not included: ${readerUrl}`);
-  }
-
-  return {
-    async load() {
-      await page.goto(readerUrl);
-    },
-    async downloadUrl(): Promise<null | string> {
-      const isBook = workId.startsWith("B");
-
-      if (isBook) {
-        // PDFファイルでないことを確認
-        const items = await page.waitForSelector(workTreeItemsSelector);
-        const text = await items.textContent();
-        if (!text?.match(/PDFファイル/u)) return null;
-      }
-
-      return `https://www.dlsite.com/home/download/=/product_id/${workId}.html`;
-    },
-  };
-}
 
 export function DlsiteManiax(browser: Browser) {
   async function* getAllBooks(ctx: BrowserContext): AsyncGenerator<Book> {
@@ -73,7 +37,6 @@ export function DlsiteManiax(browser: Browser) {
               ja_JP: string;
             };
           };
-          author_name: string | null;
         }>;
       } = await res.json();
 
@@ -83,7 +46,7 @@ export function DlsiteManiax(browser: Browser) {
           platform: "dlsite-maniax",
           readerUrl: `https://play.dlsite.com/#/work/${work.workno}`,
           title: work.name.ja_JP || "",
-          authors: [work.author_name || work.maker.name.ja_JP || ""],
+          authors: [work.maker.name.ja_JP || ""],
         };
 
         process.stderr.write(".");
@@ -106,13 +69,20 @@ export function DlsiteManiax(browser: Browser) {
     async getFiles(book: Book): Promise<Array<() => Promise<Blob>>> {
       const ctx = await browser.loadBrowserContext("dlsite-maniax");
       const page = await ctx.newPage();
-      const reader = Reader(page, book.readerUrl);
 
-      await reader.load();
+      await page.goto(book.readerUrl);
-      const downloadUrl = await reader.downloadUrl();
 
-      if (downloadUrl) {
+      const [, workId] =
-        const imageFile: ImageFile = { url: downloadUrl };
+        /^https:[/][/]play[.]dlsite[.]com[/]#[/]work[/]([^/]+)/.exec(
+          book.readerUrl,
+        ) ?? [];
+
+      if (!workId) {
+        throw new Error(`workId is not included: ${book.readerUrl}`);
+      }
+
+      const url = `https://www.dlsite.com/home/download/=/product_id/${workId}.html`;
+      const imageFile = { url };
 
       return [
         async () => {
@@ -123,44 +93,6 @@ export function DlsiteManiax(browser: Browser) {
           return blob;
         },
       ];
-      }
-
-      // ページ数 … 画面に表示されている要素を辿る
-      await page.waitForSelector(workTreeItemsSelector);
-      const workTreeItems = await page.locator(workTreeItemsSelector).count();
-      await page.click(workTreeItemsSelector);
-
-      // 見開き表示の無効化 … 初回: 右下見開きボタンをクリックして無効化
-      const spreadButton = page.getByRole("button", { name: "見開き" });
-      await spreadButton.click();
-      await Promise.all([
-        spreadButton.waitFor({ state: "detached" }),
-        page.mouse.click(0, 720 / 2),
-      ]);
-      await page.keyboard.press("ArrowRight");
-
-      // ページ数だけ画面送りを繰り返し行い、canvasをそのままキャプチャしていく
-      const files: Array<() => Promise<Blob>> = [];
-      while (files.length < workTreeItems) {
-        await page.waitForTimeout(1000);
-        const n = Math.min(2, Math.max(0, workTreeItems - 1 - files.length));
-        const canvas = page.locator("canvas").nth(n);
-        await canvas.waitFor({ state: "visible" });
-        const [width, height] = await Promise.all(
-          ["width", "height"].map((d) => canvas.getAttribute(d).then(Number)),
-        );
-        await page.setViewportSize({ width, height });
-        await page.waitForTimeout(500);
-        const buff = await canvas.screenshot();
-        files.push(async () => new Blob([buff], { type: "image/png" }));
-
-        process.stderr.write(".");
-
-        await page.keyboard.press("ArrowLeft");
-      }
-
-      // TODO: $ gadl --download=1498 # pdf のとき
-      return files;
     },
     loginEndpoints: ["https://www.dlsite.com/home/login"],
     loginSuccessUrl: (url: URL) => url.origin === "https://www.dlsite.com",