coomer-downloader 3.1.0 → 3.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coomer-downloader",
-  "version": "3.1.0",
+  "version": "3.3.2",
   "author": "smartacephal",
   "license": "MIT",
   "description": "Downloads images/videos from Coomer/Kemono, Bunkr, GoFile, Reddit-NSFW user posts",
@@ -22,10 +22,11 @@
     "type": "git",
     "url": "git+https://github.com/smartacephale/coomer-downloader.git"
   },
-  "main": "./src/index.ts",
+  "main": "./src/index.tsx",
   "type": "module",
   "scripts": {
     "start": "tsx ./src/index.ts",
+    "start-watch": "tsx watch ./src/index.ts",
     "build": "node build.js",
     "start-build": "npm run build && node ./dist/index.js"
   },
@@ -38,18 +39,25 @@
   },
   "dependencies": {
     "cheerio": "1.1.0",
-    "cli-progress": "^3.12.0",
+    "cli-spinners": "^3.3.0",
     "http-cookie-agent": "^6.0.0",
+    "ink": "^6.5.1",
+    "ink-picture": "^1.3.3",
+    "react": "^19.2.0",
     "rxjs": "^7.8.2",
     "tough-cookie": "5.1.2",
     "undici": "^6.22.0",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "zustand": "^5.0.8"
   },
   "devDependencies": {
-    "@types/cli-progress": "^3.11.6",
     "@types/node": "^24.10.0",
+    "@types/react": "^19.2.6",
     "@types/yargs": "^17.0.34",
     "esbuild": "^0.27.0",
+    "eslint-config-xo-react": "^0.27.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "tsx": "^4.20.6"
   }
 }

package/src/api/bunkr.ts

@@ -1,7 +1,6 @@
 import * as cheerio from 'cheerio';
 import { fetch } from 'undici';
-import type { ApiResult, MediaType } from '../types/index.js';
-import { testMediaType } from '../utils/index.js';
+import { CoomerFile, CoomerFileList } from '../services/file';
 
 type EncData = { url: string; timestamp: number };
 
@@ -23,46 +22,46 @@ function decryptEncryptedUrl(encryptionData: EncData) {
     .join('');
 }
 
-async function getFileData(url: string, name: string) {
+async function getFileData(url: string, name: string): Promise<CoomerFile> {
   const slug = url.split('/').pop() as string;
   const encryptionData = await getEncryptionData(slug);
   const src = decryptEncryptedUrl(encryptionData);
-  return { name, url: src };
+  return CoomerFile.from({ name, url: src });
 }
 
-async function getGalleryFiles(url: string, mediaType: MediaType) {
-  const data = [];
+async function getGalleryFiles(url: string): Promise<CoomerFileList> {
+  const filelist = new CoomerFileList();
   const page = await fetch(url).then((r) => r.text());
   const $ = cheerio.load(page);
-  const title = $('title').text();
+  const dirName = $('title').text();
+  filelist.dirName = `${dirName.split('|')[0].trim()}-bunkr`;
   const url_ = new URL(url);
 
   if (url_.pathname.startsWith('/f/')) {
     const fileName = $('h1').text();
     const singleFile = await getFileData(url, fileName);
-    data.push(singleFile);
-    return { title, files: data.filter((f) => testMediaType(f.name, mediaType)) };
+    filelist.files.push(singleFile);
+    return filelist;
   }
 
   const fileNames = Array.from($('div[title]').map((_, e) => $(e).attr('title')));
 
-  const files = Array.from($('a').map((_, e) => $(e).attr('href')))
+  const data = Array.from($('a').map((_, e) => $(e).attr('href')))
     .filter((a) => /\/f\/\w+/.test(a))
     .map((a, i) => ({
       url: `${url_.origin}${a}`,
       name: fileNames[i] || (url.split('/').pop() as string),
     }));
 
-  for (const { name, url } of files) {
+  for (const { name, url } of data) {
     const res = await getFileData(url, name);
-    data.push(res);
+    filelist.files.push(res);
   }
 
-  return { title, files: data.filter((f) => testMediaType(f.name, mediaType)) };
+  return filelist;
 }
 
-export async function getBunkrData(url: string, mediaType: MediaType): Promise<ApiResult> {
-  const { files, title } = await getGalleryFiles(url, mediaType);
-  const dirName = `${title.split('|')[0].trim()}-bunkr`;
-  return { dirName, files };
+export async function getBunkrData(url: string): Promise<CoomerFileList> {
+  const filelist = await getGalleryFiles(url);
+  return filelist;
 }

package/src/api/coomer-api.ts

@@ -1,15 +1,16 @@
-import type { ApiResult, File, MediaType } from '../types/index.js';
-import { fetchWithGlobalHeader, isImage, setGlobalHeaders, testMediaType } from '../utils/index.js';
-
-type CoomerUser = { domain: string; service: string; id: string; name?: string };
-type CoomerUserApi = { name: string };
-type CoomerFile = { path: string; name: string };
-type CoomerPost = {
+import { CoomerFile, CoomerFileList } from '../services/file';
+import { isImage } from '../utils/filters';
+import { fetchWithGlobalHeader, setGlobalHeaders } from '../utils/requests';
+
+type CoomerAPIUser = { domain: string; service: string; id: string; name?: string };
+type CoomerAPIUserData = { name: string };
+type CoomerAPIFile = { path: string; name: string };
+type CoomerAPIPost = {
   title: string;
   content: string;
   published: string;
-  attachments: CoomerFile[];
-  file: CoomerFile;
+  attachments: CoomerAPIFile[];
+  file: CoomerAPIFile;
 };
 
 const SERVERS = ['n1', 'n2', 'n3', 'n4'];
@@ -27,19 +28,19 @@ export function tryFixCoomerUrl(url: string, attempts: number) {
   return url;
 }
 
-async function getUserProfileAPI(user: CoomerUser): Promise<CoomerUserApi> {
+async function getUserProfileData(user: CoomerAPIUser): Promise<CoomerAPIUserData> {
   const url = `${user.domain}/api/v1/${user.service}/user/${user.id}/profile`;
   const result = await fetchWithGlobalHeader(url).then((r) => r.json());
-  return result as CoomerUserApi;
+  return result as CoomerAPIUserData;
 }
 
-async function getUserPostsAPI(user: CoomerUser, offset: number): Promise<CoomerPost[]> {
+async function getUserPostsAPI(user: CoomerAPIUser, offset: number): Promise<CoomerAPIPost[]> {
   const url = `${user.domain}/api/v1/${user.service}/user/${user.id}/posts?o=${offset}`;
   const posts = await fetchWithGlobalHeader(url).then((r) => r.json());
-  return posts as CoomerPost[];
+  return posts as CoomerAPIPost[];
 }
 
-export async function getUserFiles(user: CoomerUser, mediaType: MediaType): Promise<File[]> {
+export async function getUserFiles(user: CoomerAPIUser): Promise<CoomerFileList> {
   const userPosts = [];
 
   const offset = 50;
@@ -49,7 +50,7 @@ export async function getUserFiles(user: CoomerUser, mediaType: MediaType): Prom
     if (posts.length < 50) break;
   }
 
-  const files: File[] = [];
+  const filelist = new CoomerFileList();
 
   for (const p of userPosts) {
     const title = p.title.match(/\w+/g)?.join(' ') || '';
@@ -59,35 +60,34 @@ export async function getUserFiles(user: CoomerUser, mediaType: MediaType): Prom
 
     const postFiles = [...p.attachments, p.file]
       .filter((f) => f.path)
-      .filter((f) => testMediaType(f.name, mediaType))
       .map((f, i) => {
         const ext = f.name.split('.').pop();
         const name = `${datentitle} ${i + 1}.${ext}`;
         const url = `${user.domain}/${f.path}`;
-        return { name, url, content };
+        return CoomerFile.from({ name, url, content });
       });
 
-    files.push(...postFiles);
+    filelist.files.push(...postFiles);
   }
 
-  return files;
+  return filelist;
 }
 
-async function parseUser(url: string): Promise<CoomerUser> {
+async function parseUser(url: string): Promise<CoomerAPIUser> {
   const [_, domain, service, id] = url.match(
     /(https:\/\/\w+\.\w+)\/(\w+)\/user\/([\w|.|-]+)/,
   ) as RegExpMatchArray;
   if (!domain || !service || !id) console.error('Invalid URL', url);
 
-  const { name } = await getUserProfileAPI({ domain, service, id });
+  const { name } = await getUserProfileData({ domain, service, id });
 
   return { domain, service, id, name };
 }
 
-export async function getCoomerData(url: string, mediaType: MediaType): Promise<ApiResult> {
+export async function getCoomerData(url: string): Promise<CoomerFileList> {
   setGlobalHeaders({ accept: 'text/css' });
   const user = await parseUser(url);
-  const dirName = `${user.name}-${user.service}`;
-  const files = await getUserFiles(user, mediaType);
-  return { dirName, files };
+  const filelist = await getUserFiles(user);
+  filelist.dirName = `${user.name}-${user.service}`;
+  return filelist;
 }

package/src/api/gofile.ts

@@ -1,6 +1,6 @@
 import { fetch } from 'undici';
-import type { ApiResult, File, MediaType } from '../types/index.js';
-import { setGlobalHeaders, testMediaType } from '../utils/index.js';
+import { CoomerFile, CoomerFileList } from '../services/file';
+import { setGlobalHeaders } from '../utils/requests';
 
 type GoFileAPIToken = { status: string; data: { token: string } };
 type GoFileAPIFilelist = { data: { children: { link: string; name: string }[] } };
@@ -26,7 +26,11 @@ async function getWebsiteToken() {
   throw new Error('cannot get wt');
 }
 
-async function getFolderFiles(id: string, token: string, websiteToken: string): Promise<File[]> {
+async function getFolderFiles(
+  id: string,
+  token: string,
+  websiteToken: string,
+): Promise<CoomerFileList> {
   const url = `https://api.gofile.io/contents/${id}?wt=${websiteToken}&cache=true}`;
   const response = await fetch(url, {
     headers: {
@@ -39,26 +43,26 @@ async function getFolderFiles(id: string, token: string, websiteToken: string):
   }
 
   const data = (await response.json()) as GoFileAPIFilelist;
-  const files = Object.values(data.data.children).map((f) => ({
-    url: f.link,
-    name: f.name,
-  }));
+  const files = Object.values(data.data.children).map((f) =>
+    CoomerFile.from({
+      url: f.link,
+      name: f.name,
+    }),
+  );
 
-  return files;
+  return new CoomerFileList(files);
 }
 
-export async function getGofileData(url: string, mediaType: MediaType): Promise<ApiResult> {
+export async function getGofileData(url: string): Promise<CoomerFileList> {
   const id = url.match(/gofile.io\/d\/(\w+)/)?.[1] as string;
-  const dirName = `gofile-${id}`;
 
   const token = await getToken();
   const websiteToken = await getWebsiteToken();
 
-  const files = (await getFolderFiles(id, token, websiteToken)).filter((f) =>
-    testMediaType(f.name, mediaType),
-  );
+  const filelist = await getFolderFiles(id, token, websiteToken);
+  filelist.dirName = `gofile-${id}`;
 
   setGlobalHeaders({ Cookie: `accountToken=${token}` });
 
-  return { dirName, files };
+  return filelist;
 }

package/src/api/index.ts

@@ -1,28 +1,32 @@
-import type { ApiResult, MediaType } from '../types';
+import type { CoomerFileList } from '../services/file';
 import { getBunkrData } from './bunkr';
 import { getCoomerData } from './coomer-api';
 import { getGofileData } from './gofile';
 import { getRedditData } from './nsfw.xxx';
 import { getPlainFileData } from './plain-curl';
 
-export async function apiHandler(
-  url: string,
-  mediaType: MediaType,
-): Promise<ApiResult | undefined> {
-  if (/^u\/\w+$/.test(url.trim())) {
-    return getRedditData(url, mediaType);
+export async function apiHandler(url_: string): Promise<CoomerFileList> {
+  const url = new URL(url_);
+
+  if (/^u\/\w+$/.test(url.origin)) {
+    return getRedditData(url.href);
   }
-  if (/coomer|kemono/.test(url)) {
-    return getCoomerData(url, mediaType);
+
+  if (/coomer|kemono/.test(url.origin)) {
+    return getCoomerData(url.href);
   }
-  if (/bunkr/.test(url)) {
-    return getBunkrData(url, mediaType);
+
+  if (/bunkr/.test(url.origin)) {
+    return getBunkrData(url.href);
   }
-  if (/gofile\.io/.test(url)) {
-    return getGofileData(url, mediaType);
+
+  if (/gofile\.io/.test(url.origin)) {
+    return getGofileData(url.href);
   }
-  if (/\.\w+/.test(url.split('/').pop() as string)) {
-    return getPlainFileData(url);
+
+  if (/\.\w+/.test(url.pathname)) {
+    return getPlainFileData(url.href);
   }
-  console.error('Wrong URL.');
+
+  throw Error('Invalid URL');
 }

package/src/api/nsfw.xxx.ts

@@ -1,7 +1,6 @@
 import * as cheerio from 'cheerio';
 import { fetch } from 'undici';
-import type { ApiResult, File, MediaType } from '../types/index.js';
-import { testMediaType } from '../utils/index.js';
+import { CoomerFile, CoomerFileList } from '../services/file';
 
 async function getUserPage(user: string, offset: number) {
   const url = `https://nsfw.xxx/page/${offset}?nsfw[]=0&types[]=image&types[]=video&types[]=gallery&slider=1&jsload=1&user=${user}&_=${Date.now()}`;
@@ -26,9 +25,9 @@ async function getUserPosts(user: string): Promise<string[]> {
   return posts;
 }
 
-async function getPostsData(posts: string[], mediaType: MediaType): Promise<File[]> {
+async function getPostsData(posts: string[]): Promise<CoomerFileList> {
   console.log('Fetching posts data...');
-  const data = [];
+  const filelist = new CoomerFileList();
   for (const post of posts) {
     const page = await fetch(post).then((r) => r.text());
     const $ = cheerio.load(page);
@@ -46,16 +45,16 @@ async function getPostsData(posts: string[], mediaType: MediaType): Promise<File
     const ext = src.split('.').pop();
     const name = `${slug}-${date}.${ext}`;
 
-    data.push({ name, url: src });
+    filelist.files.push(CoomerFile.from({ name, url: src }));
   }
 
-  return data.filter((f) => testMediaType(f.name, mediaType));
+  return filelist;
 }
 
-export async function getRedditData(url: string, mediaType: MediaType): Promise<ApiResult> {
+export async function getRedditData(url: string): Promise<CoomerFileList> {
   const user = url.match(/u\/(\w+)/)?.[1] as string;
   const posts = await getUserPosts(user);
-  const files = await getPostsData(posts, mediaType);
-  const dirName = `${user}-reddit`;
-  return { dirName, files };
+  const filelist = await getPostsData(posts);
+  filelist.dirName = `${user}-reddit`;
+  return filelist;
 }

package/src/api/plain-curl.ts

@@ -1,13 +1,9 @@
-import type { ApiResult } from '../types';
+import { CoomerFile, CoomerFileList } from '../services/file';
 
-export async function getPlainFileData(url: string): Promise<ApiResult> {
-  return {
-    dirName: '',
-    files: [
-      {
-        name: url.split('/').pop() as string,
-        url,
-      },
-    ],
-  };
+export async function getPlainFileData(url: string): Promise<CoomerFileList> {
+  const name = url.split('/').pop() as string;
+  const file = CoomerFile.from({ name, url });
+  const filelist = new CoomerFileList([file]);
+  filelist.dirName = '';
+  return filelist;
 }

package/src/{args-handler.ts → cli/args-handler.ts}

@@ -1,16 +1,13 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-export type ArgumentHandlerResult = {
-  [x: string]: unknown;
+type ArgumentHandlerResult = {
   url: string;
   dir: string;
   media: string;
   include: string;
   exclude: string;
   skip: number;
-  _: (string | number)[];
-  $0: string;
 };
 
 export function argumentHander(): ArgumentHandlerResult {

package/src/cli/ui/app.tsx

@@ -0,0 +1,40 @@
+import { Box } from 'ink';
+import React from 'react';
+import { CoomerFileList } from '../../services/file';
+import { FileBox, FileListStateBox, KeyboardControlsInfo, Loading, TitleBar } from './components';
+import { useDownloaderHook } from './hooks/downloader';
+import { useInputHook } from './hooks/input';
+import { useInkStore } from './store';
+
+export function App() {
+  useInputHook();
+  useDownloaderHook();
+
+  const downloader = useInkStore((state) => state.downloader);
+  const filelist = downloader?.filelist;
+  const isFilelist = filelist instanceof CoomerFileList;
+
+  return (
+    <Box borderStyle="single" flexDirection="column" borderColor="blue" width={80}>
+      <TitleBar />
+      {!isFilelist ? (
+        <Loading />
+      ) : (
+        <>
+          <Box>
+            <Box>
+              <FileListStateBox filelist={filelist} />
+            </Box>
+            <Box flexBasis={29}>
+              <KeyboardControlsInfo />
+            </Box>
+          </Box>
+
+          {filelist.getActiveFiles().map((file) => {
+            return <FileBox file={file} key={file.name} />;
+          })}
+        </>
+      )}
+    </Box>
+  );
+}

package/src/cli/ui/components/file.tsx

@@ -0,0 +1,44 @@
+import { Box, Spacer, Text } from 'ink';
+import React from 'react';
+import type { CoomerFile } from '../../../services/file';
+import { b2mb } from '../../../utils/strings';
+import { Preview } from './preview';
+import { Spinner } from './spinner';
+
+interface FileBoxProps {
+  file: CoomerFile;
+}
+
+export function FileBox({ file }: FileBoxProps) {
+  const percentage = Number((file.downloaded / (file.size as number)) * 100).toFixed(2);
+  return (
+    <>
+      <Box
+        borderStyle="single"
+        borderColor="magentaBright"
+        borderDimColor
+        paddingX={1}
+        flexDirection="column"
+      >
+        <Box>
+          <Text color="blue" dimColor wrap="truncate-middle">
+            {file.name}
+          </Text>
+        </Box>
+        <Box flexDirection="row-reverse">
+          <Text color="cyan" dimColor>
+            {b2mb(file.downloaded)}/{file.size ? b2mb(file.size) : '∞'} MB
+          </Text>
+          <Text color="redBright" dimColor>
+            {file.size ? `  ${percentage}% ` : ''}
+          </Text>
+          <Spacer />
+          <Text color={'green'} dimColor>
+            <Spinner></Spinner>
+          </Text>
+        </Box>
+      </Box>
+      <Preview file={file} />
+    </>
+  );
+}

package/src/cli/ui/components/filelist.tsx

@@ -0,0 +1,52 @@
+import { Box, Text } from 'ink';
+import React from 'react';
+import type { CoomerFileList } from '../../../services/file';
+
+interface FileListStateBoxProps {
+  filelist: CoomerFileList;
+}
+
+export function FileListStateBox({ filelist }: FileListStateBoxProps) {
+  return (
+    <Box
+      paddingX={1}
+      flexDirection="column"
+      borderStyle={'single'}
+      borderColor={'magenta'}
+      borderDimColor
+    >
+      <Box>
+        <Box marginRight={1}>
+          <Text color="cyanBright" dimColor>
+            Found:
+          </Text>
+        </Box>
+        <Text color="blue" dimColor wrap="wrap">
+          {filelist.files.length}
+        </Text>
+      </Box>
+      <Box>
+        <Box marginRight={1}>
+          <Text color="cyanBright" dimColor>
+            Downloaded:
+          </Text>
+        </Box>
+        <Text color="blue" dimColor wrap="wrap">
+          {filelist.getDownloaded().length}
+        </Text>
+      </Box>
+      <Box>
+        <Box width={9}>
+          <Text color="cyanBright" dimColor>
+            Folder:
+          </Text>
+        </Box>
+        <Box flexGrow={1}>
+          <Text color="blue" dimColor wrap="truncate-middle">
+            {filelist.dirPath}
+          </Text>
+        </Box>
+      </Box>
+    </Box>
+  );
+}

package/src/cli/ui/components/index.ts

@@ -0,0 +1,6 @@
+export { FileBox } from './file';
+export { FileListStateBox } from './filelist';
+export { KeyboardControlsInfo } from './keyboardinfo';
+export { Loading } from './loading';
+export { Spinner } from './spinner';
+export { TitleBar } from './titlebar';

package/src/cli/ui/components/keyboardinfo.tsx

@@ -0,0 +1,41 @@
+import { Box, Text } from 'ink';
+import React from 'react';
+
+const info = {
+  's ': 'skip current file',
+  p: 'on/off image preview',
+};
+
+export function KeyboardControlsInfo() {
+  const infoRender = Object.entries(info).map(([key, value]) => {
+    return (
+      <Box key={key}>
+        <Box marginRight={2}>
+          <Text color={'red'} dimColor bold>
+            {key}
+          </Text>
+        </Box>
+        <Text dimColor bold={false}>
+          {value}
+        </Text>
+      </Box>
+    );
+  });
+
+  return (
+    <Box
+      flexDirection="column"
+      paddingX={1}
+      borderStyle={'single'}
+      borderColor={'gray'}
+      borderDimColor
+    >
+      <Box>
+        <Text color={'red'} dimColor bold>
+          Keyboard controls:
+        </Text>
+      </Box>
+      {infoRender}
+    </Box>
+  );
+}

package/src/cli/ui/components/loading.tsx

@@ -0,0 +1,20 @@
+import { Box, Text } from 'ink';
+import React from 'react';
+import { Spinner } from './spinner';
+
+export function Loading() {
+  return (
+    <Box paddingX={1} borderDimColor flexDirection="column">
+      <Box alignSelf="center">
+        <Text dimColor color={'redBright'}>
+          Fetching Data
+        </Text>
+      </Box>
+      <Box alignSelf="center">
+        <Text color={'blueBright'} dimColor>
+          <Spinner type="grenade"></Spinner>
+        </Text>
+      </Box>
+    </Box>
+  );
+}

package/src/cli/ui/components/preview.tsx

@@ -0,0 +1,32 @@
+import { Box } from 'ink';
+import Image, { TerminalInfoProvider } from 'ink-picture';
+import React from 'react';
+import type { CoomerFile } from '../../../services/file';
+import { isImage } from '../../../utils/filters';
+import { useInkStore } from '../store';
+
+interface PreviewProps {
+  file: CoomerFile;
+}
+
+export function Preview({ file }: PreviewProps) {
+  const previewEnabled = useInkStore((state) => state.preview);
+  const bigEnough = file.downloaded > 50 * 1024;
+  const shouldShow = previewEnabled && bigEnough && isImage(file.filepath as string);
+  const imgInfo = `
+    can't read partial images yet...
+    actual size: ${file.size}}
+    downloaded: ${file.downloaded}}
+  `;
+  return (
+    shouldShow && (
+      <Box paddingX={1}>
+        <TerminalInfoProvider>
+          <Box width={30} height={15}>
+            <Image src={file.filepath as string} alt={imgInfo} />
+          </Box>
+        </TerminalInfoProvider>
+      </Box>
+    )
+  );
+}