From e42d40881e0faafbc8cccb2dbd7331f88f5d4ece Mon Sep 17 00:00:00 2001
From: TobyG74 <tobisaputra11@gmail.com>
Date: Sat, 11 Nov 2023 16:03:58 +0700
Subject: [PATCH] fix: downloader types

---
 src/types/stalker.ts | 26 +++++++++++++-------------
 src/utils/switch.ts  | 28 +++++++++++++++++++---------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/types/stalker.ts b/src/types/stalker.ts
index 526695a..778b846 100644
--- a/src/types/stalker.ts
+++ b/src/types/stalker.ts
@@ -4,7 +4,7 @@ export interface StalkResult {
   result?: {
     users: Users
     stats: Stats
-    posts: Posts[]
+    // posts: Posts[]
   }
 }
 
@@ -30,20 +30,20 @@ export interface Stats {
   videoCount: number
   likeCount: number
   friendCount: number
-  postCount: number
+  // postCount: number
 }
 
-export interface Posts {
-  id: string
-  desc: string
-  createTime: number
-  author: string
-  locationCreated: string
-  hashtags: string[]
-  statistics: Statistics
-  video: Video
-  music: Music
-}
+// export interface Posts {
+//   id: string
+//   desc: string
+//   createTime: number
+//   author: string
+//   locationCreated: string
+//   hashtags: string[]
+//   statistics: Statistics
+//   video: Video
+//   music: Music
+// }
 
 export interface Statistics {
   likeCount: number
diff --git a/src/utils/switch.ts b/src/utils/switch.ts
index 6951407..53abc1a 100644
--- a/src/utils/switch.ts
+++ b/src/utils/switch.ts
@@ -1,24 +1,34 @@
-import { MusicalDownResponse } from "../types/musicaldown"
-import { SSSTikResponse } from "../types/ssstik"
-import { TiktokAPIResponse } from "../types/tiktokApi"
 import { MusicalDown } from "./downloader_musicaldown"
 import { SSSTik } from "./downloader_ssstik"
 import { TiktokAPI } from "./downloader_tiktokApi"
 
-export const TiktokDL = (url: string, options: { version: "v1" | "v2" | "v3" }) =>
-  new Promise<TiktokAPIResponse | SSSTikResponse | MusicalDownResponse>(async (resolve, reject) => {
+/** Types */
+import { MusicalDownResponse } from "../types/musicaldown"
+import { SSSTikResponse } from "../types/ssstik"
+import { TiktokAPIResponse } from "../types/tiktokApi"
+
+export const TiktokDL = (url: string, options: { version: "v1" | "v2" | "v3" }): Promise<TiktokAPIResponse | SSSTikResponse | MusicalDownResponse> =>
+  new Promise(async (resolve, reject) => {
     switch (options.version) {
       case "v1": {
-        await TiktokAPI(url).then(resolve).catch(reject)
+        const response: TiktokAPIResponse = await TiktokAPI(url)
+        resolve(response)
+        break
       }
       case "v2": {
-        await SSSTik(url).then(resolve).catch(reject)
+        const response: SSSTikResponse = await SSSTik(url)
+        resolve(response)
+        break
       }
       case "v3": {
-        await MusicalDown(url).then(resolve).catch(reject)
+        const response: MusicalDownResponse = await MusicalDown(url)
+        resolve(response)
+        break
       }
       default: {
-        await TiktokAPI(url).then(resolve).catch(reject)
+        const response: TiktokAPIResponse = await TiktokAPI(url)
+        resolve(response)
+        break
       }
     }
   })