diff --git a/.gitignore b/.gitignore index fed780d..7ced88b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ node_modules .env.* !.env.example /test.js -/tmp \ No newline at end of file +/tmp +/run.js \ No newline at end of file diff --git a/package.json b/package.json index 1689048..525df0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lucida", - "version": "1.2.1", + "version": "1.2.2", "description": "A modular downloader tool", "main": "build/index.js", "type": "module", diff --git a/run.js b/run.js deleted file mode 100644 index e460a60..0000000 --- a/run.js +++ /dev/null @@ -1,11 +0,0 @@ -import Lucida from './build/index.js'; -import Soundcloud from './build/streamers/soundcloud/main.js' - -const lucida = new Lucida({ - modules: { - soundcloud: new Soundcloud({"oauthToken": "2-294707-1346470389-4thCm1p3QnA05"}) - }, - logins: {} -}); - -console.log(await lucida.search("ram ranch")) \ No newline at end of file diff --git a/src/streamers/soundcloud/constants.ts b/src/streamers/soundcloud/constants.ts index a2b7588..3392121 100644 --- a/src/streamers/soundcloud/constants.ts +++ b/src/streamers/soundcloud/constants.ts @@ -12,4 +12,4 @@ export const DEFAULT_HEADERS = { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.132 Safari/537.36' } -export const SC_VERSION = '1686222762' +export const SC_VERSION = '1712837702' diff --git a/src/streamers/soundcloud/main.ts b/src/streamers/soundcloud/main.ts index 94cdfb0..0b3a965 100644 --- a/src/streamers/soundcloud/main.ts +++ b/src/streamers/soundcloud/main.ts @@ -38,16 +38,21 @@ export default class Soundcloud implements Streamer { hostnames = ['soundcloud.com', 'm.soundcloud.com', 'www.soundcloud.com'] oauthToken?: string constructor(options: SoundcloudOptions) { - this.oauthToken = options.oauthToken + this.oauthToken = options?.oauthToken } async search(query: string, limit = 20): Promise { const client = await this.#getClient() - + console.log(this.#formatURL( + `https://api-v2.soundcloud.com/search?q=${encodeURIComponent( + query + )}&offset=0&linked_partitioning=1&app_locale=en&limit=${limit}`, + client + ), headers(this.oauthToken)) const response = await fetch( this.#formatURL( `https://api-v2.soundcloud.com/search?q=${encodeURIComponent( query - )}&app_locale=en&limit=${limit}`, + )}&offset=0&linked_partitioning=1&app_locale=en&limit=${limit}`, client ), { method: 'get', headers: headers(this.oauthToken) } @@ -57,7 +62,8 @@ export default class Soundcloud implements Streamer { try { throw new Error(JSON.parse(errMsg)) } catch (error) { - throw new Error(errMsg); + if (errMsg) throw new Error(errMsg) + else throw new Error('Soundcloud request failed.') } }