feat: global-types

src/controllers/feed.ts

@@ -1,9 +1,13 @@
 import { User, Feeder } from '../iwara';
 import { response } from '../utils';
-import { FeedRequest } from '../types';
 
-export async function feed({ username, format }: FeedRequest) {
-  const user = await User.from(username);
+type Request = {
+  username: string;
+  format?: 'atom' | 'rss' | 'json';
+};
+
+export async function feed({ username, format }: Request) {
+  const user = await User.find(username);
   const feeder = await Feeder.create(user);
 
   if (format === undefined || response[format] === undefined) {

src/global-types.d.ts

@@ -0,0 +1,32 @@
+declare namespace API {
+  type Profile = {
+    [key: string]: unknown;
+    user: User;
+  };
+
+  type User = {
+    [key: string]: unknown;
+    id: string;
+    name: string;
+    username: string;
+  };
+
+  type Search = {
+    [key: string]: unknown;
+    count: number;
+    results: Video[];
+  };
+
+  type Video = {
+    [key: string]: unknown;
+    id: string;
+    title: string;
+    thumbnail: number;
+    file: {
+      [key: string]: unknown;
+      id: string;
+    };
+    user: User;
+    createdAt: string;
+  };
+}

src/iwara/feeder.ts

@@ -1,9 +1,7 @@
 import { Feed } from 'feed';
 import { User } from './user';
-import { IFeeder, IFeederFactory, IwaraVideo } from '../types';
 
-// Todo: 解藕類型
-export class Feeder implements IFeeder {
+export class Feeder {
   feed: Feed;
 
   constructor(user: User) {
@@ -16,19 +14,19 @@ export class Feeder implements IFeeder {
     });
   }
 
-  static async create(this: IFeederFactory ,user: User): Promise<Feeder> {
+  static async create(user: User): Promise<Feeder> {
     const feeder = new this(user);
-    await feeder.import(await user.video());
+    feeder.import(await user.video());
     return feeder;
   }
 
-  async import(videos: IwaraVideo[]): Promise<void> {
-    for (const video of videos) {
+  import(list: API.Video[]): void {
+    for (const video of list) {
       this.add(video);
     }
   }
 
-  add(video: IwaraVideo): void {
+  add(video: API.Video): void {
     let src = `https://fakeimg.pl/440x230/282828/eae0d0/?retina=1&text=Not+Found`;
     if (!!video.file) {
       let thumb = String(video.thumbnail.toString()).padStart(2, '0');

src/iwara/user.ts

@@ -1,33 +1,32 @@
 import { get } from '../utils';
-import { IwaraUser, IwaraProfile, IwaraVideoSearch, IwaraVideo, IUser, IUserFactory } from '../types';
 
-export class User implements IUser {
+export class User {
   id: string;
   name: string;
   username: string;
 
-  constructor({ id, name, username }: IwaraUser) {
+  constructor({ id, name, username }: API.User) {
     this.id = id;
     this.name = name;
     this.username = username;
   }
 
-  static async from(this: IUserFactory, username: string): Promise<User> {
+  static async find(username: string): Promise<User> {
     try {
-      const { user }: IwaraProfile = await get(`https://api.iwara.tv/profile/${username}`);
+      const { user }: API.Profile = await get(`https://api.iwara.tv/profile/${username}`);
       return new this(user);
     } catch (error) {
       throw new Error(`User not found: ${username}`);
     }
   }
 
-  async video(): Promise<IwaraVideo[]> {
-    let data: IwaraVideo[] = [];
+  async video(): Promise<API.Video[]> {
+    let data: API.Video[] = [];
     let qty: number = 0;
     let page: number = 0;
 
     do {
-      const search: IwaraVideoSearch = await get(`https://api.iwara.tv/videos`, {
+      const search: API.Search = await get(`https://api.iwara.tv/videos`, {
         user: this.id,
         page: page++,
         sort: 'date',