Add DLsite metadata download support

Author: daydreamer-json

build-rel.bat

@@ -1,7 +1,7 @@
 @echo off&cd /d %~dp0
 
 set "ISCC_PATH=C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
-set VERSION_NUM=1.2.0
+set VERSION_NUM=1.2.1
 
 mkdir build\asmr-dl-ng
 xcopy bin build\asmr-dl-ng\bin /E /I /Q

package.json

@@ -1,6 +1,6 @@
 {
   "name": "asmr-dl-ng",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "ASMR Direct Downloader (New Generation)",
   "author": "daydreamer-json <[email protected]> (https://github.com/daydreamer-json)",
   "license": "AGPL-3.0-or-later",

setup/main.iss

@@ -1,5 +1,5 @@
 #define MyAppName "asmr-dl-ng"
-#define MyAppVersion "1.2.0"
+#define MyAppVersion "1.2.1"
 #define MyAppPublisher "daydreamer-json"
 #define MyAppURL "https://github.com/daydreamer-json/asmr-dl-ng"
 #define MyAppExeName "asmr-dl-ng.exe"

src/cmds/info.ts

@@ -46,6 +46,9 @@ async function mainCmdHandler() {
   const workApiRsp = await downloadUtils.downloadMeta(argvUtils.getArgv()['id']);
 
   console.log(termPrettyUtils.printWorkInfo(workApiRsp));
+
+  // console.log(YAML.stringify(workApiRsp.infoOrig));
+  // await fs.promises.writeFile('R:/dlsite_api_meta.yaml', YAML.stringify(workApiRsp.infoOrig), 'utf-8');
 }
 
 export default mainCmdHandler;

src/utils/api.ts

@@ -20,6 +20,22 @@ export default {
   setBaseUri: (server: TypesApi.ServerName) => {
     BASE_URI = `https://${appConfig.network.asmrApi.baseDomain[server]}/${appConfig.network.asmrApi.apiPath}`;
   },
+  apiDlsite: {
+    work: {
+      info: async (source_id: string): Promise<any> => {
+        const rsp = await ky
+          .get(atob('aHR0cHM6Ly93d3cuZGxzaXRlLmNvbQ==') + '/maniax/product/info/ajax', {
+            ...defaultKySettings,
+            searchParams: {
+              product_id: source_id,
+              cdn_cache_min: 1,
+            },
+          })
+          .json();
+        return (rsp as any)[source_id] ?? rsp;
+      },
+    },
+  },
   api: {
     health: async (): Promise<{ available: boolean; message: string }> => {
       const rsp = await ky.get(`${BASE_URI}/health`, defaultKySettings).text();

src/utils/configEmbed.ts

@@ -2,5 +2,5 @@ import semver from 'semver';
 
 export default {
   APPLICATION_NAME: 'asmr-dl-ng',
-  VERSION_NUMBER: semver.valid('1.2.0'),
+  VERSION_NUMBER: semver.valid('1.2.1'),
 };

src/utils/download.ts

@@ -29,7 +29,7 @@ import termPrettyUtils from './termPretty.js';
 
 async function downloadMeta(workId: number) {
   const spinner = !argvUtils.getArgv()['no-show-progress']
-    ? ora({ text: 'Downloading work metadata ...', color: 'cyan', spinner: 'dotsCircle' }).start()
+    ? ora({ text: 'Downloading metadata from DB ...', color: 'cyan', spinner: 'dotsCircle' }).start()
     : undefined;
   const workApiRsp: {
     info: TypesApiEndpoint.RspWorkInfoSanitized;
@@ -65,26 +65,56 @@ async function downloadMeta(workId: number) {
       }
     }
   })();
+  spinner ? (spinner.text = 'Downloading metadata from DLsite server ...') : undefined;
+  const workOriginApiRsp = await (async () => {
+    try {
+      return await apiUtils.apiDlsite.work.info(workApiRsp.info.source_id);
+    } catch (error) {
+      spinner?.stop();
+      if (error instanceof HTTPError) {
+        if (error.response.status === 404) {
+          logger.error(`Work not found. Please check the ID and try again. ID: ${workId}`);
+          await exitUtils.exit(1, null, false);
+        } else if (error.response.status === 525) {
+          logger.error(`Failed to download metadata: 525 Cloudflare SSL handshake failed`);
+          await exitUtils.exit(1, null, false);
+        }
+        logger.error(`Failed to download metadata: ${error.response.status} ${error.response.statusText}`);
+        await exitUtils.exit(1, null, false);
+        throw error;
+      } else if (error instanceof Error) {
+        logger.error(`Failed to download metadata: ${error.message}`);
+        await exitUtils.exit(1, null, false);
+        throw error;
+      } else {
+        throw new Error('An unknown error occurred while downloading metadata');
+      }
+    }
+  })();
   const coverImgBuffer: Record<'main' | 'thumb' | 'icon', ArrayBuffer | null> = {
     main: null,
     thumb: null,
     icon: null,
   };
+  spinner ? (spinner.text = 'Downloading cover image ...') : undefined;
   for (const coverImgType of ['main', 'thumb', 'icon'] as const) {
     try {
       coverImgBuffer[coverImgType] = await apiUtils.api.media.coverImage(workId, coverImgType);
     } catch (error) {
       if (error instanceof HTTPError) {
         if (error.response.status !== 404) {
+          spinner?.stop();
           logger.error(`Failed to download metadata: ${error.response.status} ${error.response.statusText}`);
           await exitUtils.exit(1, null, false);
           throw error;
         }
       } else if (error instanceof Error) {
+        spinner?.stop();
         logger.error(`Failed to download metadata: ${error.message}`);
         await exitUtils.exit(1, null, false);
         throw error;
       } else {
+        spinner?.stop();
         throw new Error('An unknown error occurred while downloading metadata');
       }
     }
@@ -93,7 +123,9 @@ async function downloadMeta(workId: number) {
   spinner?.stop();
   logger.info('Work metadata downloaded');
   return {
-    ...workApiRsp,
+    info: workApiRsp.info,
+    infoOrig: JSON.stringify(workOriginApiRsp) === '[]' ? null : workOriginApiRsp,
+    fileEntry: workApiRsp.fileEntry,
     coverImgBuffer,
   };
 }
@@ -156,6 +188,7 @@ async function filterFileEntry(fileEntries: TypesApiFiles.FilesystemEntryTransfo
 async function downloadWork(
   workApiRsp: {
     info: TypesApiEndpoint.RspWorkInfoSanitized;
+    infoOrig: any;
     fileEntry: {
       raw: TypesApiFiles.FilesystemEntry[];
       transformed: TypesApiFiles.FilesystemEntryTransformed[];
@@ -403,6 +436,7 @@ async function downloadWork(
         path.join(tempOutputDirPath, 'meta.yaml'),
         YAML.stringify({
           info: workApiRsp.info,
+          infoOrig: workApiRsp.infoOrig,
           coverImage: Object.fromEntries(Object.entries(workApiRsp.coverImgBuffer).map((e) => [e[0], e[1] !== null])),
           fileEntry: (() => {
             return workApiRsp.fileEntry.transformed

src/utils/downloadPost.ts

@@ -184,6 +184,7 @@ async function calculateHashes(
 async function deobfuscateFilename(
   workApiRsp: {
     info: TypesApiEndpoint.RspWorkInfoSanitized;
+    infoOrig: any;
     fileEntry: {
       raw: TypesApiFiles.FilesystemEntry[];
       transformed: TypesApiFiles.FilesystemEntryTransformed[];
@@ -205,7 +206,10 @@ async function deobfuscateFilename(
       (() => {
         const replaceArray: [RegExp, string][] = [
           [/<WORK_ID>/g, workApiRsp.info.source_id],
-          [/<WORK_TITLE>/g, stringUtils.sanitizeFilename(workApiRsp.info.title)],
+          [
+            /<WORK_TITLE>/g,
+            stringUtils.sanitizeFilename(workApiRsp.infoOrig ? workApiRsp.infoOrig.work_name : workApiRsp.info.title),
+          ],
           [/<CIRCLE_ID>/g, workApiRsp.info.circle.source_id],
           [/<CIRCLE_NAME>/g, stringUtils.sanitizeFilename(workApiRsp.info.circle.name)],
           [/<VA_NAME>/g, workApiRsp.info.vas.map((e) => stringUtils.sanitizeFilename(e.name)).join(',')],

src/utils/termPretty.ts

@@ -148,6 +148,7 @@ function wordWrapperSimple(strArray: string[], width: number): string[] {
 
 function printWorkInfo(workApiRsp: {
   info: TypesApiEndpoint.RspWorkInfoSanitized;
+  infoOrig: any;
   fileEntry: {
     raw: TypesApiFiles.FilesystemEntry[];
     transformed: TypesApiFiles.FilesystemEntryTransformed[];
@@ -169,7 +170,13 @@ function printWorkInfo(workApiRsp: {
   table.push(
     ...[
       ['ID', workApiRsp.info.source_id],
-      ['Title', wordWrapper(workApiRsp.info.title, availableMaxTextWidth).join('\n')],
+      [
+        'Title',
+        wordWrapper(
+          workApiRsp.infoOrig ? workApiRsp.infoOrig.work_name : workApiRsp.info.title,
+          availableMaxTextWidth,
+        ).join('\n'),
+      ],
       // ['Circle ID', workApiRsp.info.circle.source_id],
       ['Circle Name', wordWrapper(workApiRsp.info.circle.name, availableMaxTextWidth).join('\n')],
       [