Histmy/play-dl-fix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SetToken function added

Browse Source
This commit is contained in:
killer069 2021-10-12 13:56:33 +05:30
parent 80d6ecba96
commit 229bbc7a11
5 changed files with 160 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
play-dl/SoundCloud/index.ts
View File

@ -151,3 +151,7 @@ function parseHlsFormats(data: SoundCloudTrackFormat[]) {
});
return result;
}
export function setSoundCloudToken(options : SoundDataOptions){
soundData = options
}

25
play-dl/Spotify/index.ts
View File

@ -5,6 +5,7 @@ import fs from 'fs';
let spotifyData: SpotifyDataOptions;
if (fs.existsSync('.data/spotify.data')) {
spotifyData = JSON.parse(fs.readFileSync('.data/spotify.data').toString());
spotifyData.file = true
}
/**
* Spotify Data options that are stored in spotify.data file.
@ -12,7 +13,7 @@ if (fs.existsSync('.data/spotify.data')) {
export interface SpotifyDataOptions {
client_id: string;
client_secret: string;
redirect_url: string;
redirect_url?: string;
authorization_code?: string;
access_token?: string;
refresh_token?: string;
@ -20,6 +21,7 @@ export interface SpotifyDataOptions {
expires_in?: number;
expiry?: number;
market?: string;
file? : boolean
}
const pattern = /^((https:)?\/\/)?open.spotify.com\/(track|album|playlist)\//;
@ -89,14 +91,14 @@ export function sp_validate(url: string): 'track' | 'playlist' | 'album' | 'sear
* @param data Sportify Data options to validate
* @returns boolean.
*/
export async function SpotifyAuthorize(data: SpotifyDataOptions): Promise<boolean> {
export async function SpotifyAuthorize(data: SpotifyDataOptions, file : boolean): Promise<boolean> {
const response = await request(`https://accounts.spotify.com/api/token`, {
headers: {
'Authorization': `Basic ${Buffer.from(`${data.client_id}:${data.client_secret}`).toString('base64')}`,
'Content-Type': 'application/x-www-form-urlencoded'
},
body: `grant_type=authorization_code&code=${data.authorization_code}&redirect_uri=${encodeURI(
data.redirect_url
data.redirect_url as string
)}`,
method: 'POST'
}).catch((err: Error) => {
@ -115,7 +117,14 @@ export async function SpotifyAuthorize(data: SpotifyDataOptions): Promise<boolea
token_type: resp_json.token_type,
market: data.market
};
fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4));
if(file) fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4));
else {
console.log(`Client ID : ${spotifyData.client_id}`)
console.log(`Client Secret : ${spotifyData.client_secret}`)
console.log(`Refresh Token : ${spotifyData.refresh_token}`)
console.log(`Market : ${spotifyData.market}`)
console.log(`\nPaste above info in setToken function.`)
}
return true;
}
/**
@ -198,6 +207,12 @@ export async function refreshToken(): Promise<boolean> {
spotifyData.expires_in = Number(resp_json.expires_in);
spotifyData.expiry = Date.now() + (resp_json.expires_in - 1) * 1000;
spotifyData.token_type = resp_json.token_type;
fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4));
if(spotifyData.file) fs.writeFileSync('.data/spotify.data', JSON.stringify(spotifyData, undefined, 4));
return true;
}
export function setSpotifyToken(options: SpotifyDataOptions) {
spotifyData = options
spotifyData.file = false
refreshToken()
}

18
play-dl/YouTube/utils/cookie.ts
View File

@ -3,10 +3,12 @@ import fs from 'fs';
let youtubeData: youtubeDataOptions;
if (fs.existsSync('.data/youtube.data')) {
youtubeData = JSON.parse(fs.readFileSync('.data/youtube.data').toString());
youtubeData.file = true
}
interface youtubeDataOptions {
cookie?: Object;
file? : boolean;
}
export function getCookies(): undefined | string {
@ -27,5 +29,19 @@ export function setCookie(key: string, value: string): boolean {
}
export function uploadCookie() {
if (youtubeData) fs.writeFileSync('.data/youtube.data', JSON.stringify(youtubeData, undefined, 4));
if (youtubeData.cookie && youtubeData.file) fs.writeFileSync('.data/youtube.data', JSON.stringify(youtubeData, undefined, 4));
}
export function setCookieToken(options : { cookie : string }){
let cook = options.cookie
let cookie: Object = {};
cook.split(';').forEach((x) => {
const arr = x.split('=');
if (arr.length <= 1) return;
const key = arr.shift()?.trim() as string;
const value = arr.join('=').trim();
Object.assign(cookie, { [key]: value });
});
youtubeData = { cookie }
youtubeData.file = false
}

23
play-dl/index.ts
View File

@ -1,6 +1,7 @@
export { playlist_info, video_basic_info, video_info, yt_validate, extractID, YouTube, YouTubeStream } from './YouTube';
export { spotify, sp_validate, refreshToken, is_expired, Spotify } from './Spotify';
export { soundcloud, so_validate, SoundCloud, SoundCloudStream } from './SoundCloud';
export { setToken } from './token'
enum AudioPlayerStatus {
Idle = 'idle',
@ -114,6 +115,15 @@ export function authorization(): void {
input: process.stdin,
output: process.stdout
});
ask.question('Do you want to save data in a file ? (Yes / No): ', (msg) => {
let file : boolean;
if(msg.toLowerCase() === 'yes') file = true
else if(msg.toLowerCase() === 'no') file = false
else {
console.log("That option doesn't exist. Try again...");
ask.close();
return;
}
ask.question('Choose your service - sc (for SoundCloud) / sp (for Spotify) / yo (for YouTube): ', (msg) => {
if (msg.toLowerCase().startsWith('sp')) {
let client_id: string, client_secret: string, redirect_url: string, market: string;
@ -151,7 +161,7 @@ export function authorization(): void {
authorization_code: url.split('code=')[1],
market
};
const check = await SpotifyAuthorize(spotifyData);
const check = await SpotifyAuthorize(spotifyData, file);
if (check === false) throw new Error('Failed to get access token.');
ask.close();
});
@ -160,6 +170,11 @@ export function authorization(): void {
});
});
} else if (msg.toLowerCase().startsWith('sc')) {
if(!file){
console.log("You already had a client ID, just paste that in setToken function.");
ask.close();
return;
}
ask.question('Client ID : ', async (id) => {
let client_id = id;
if (!client_id) {
@ -176,6 +191,11 @@ export function authorization(): void {
ask.close();
});
} else if (msg.toLowerCase().startsWith('yo')) {
if(!file){
console.log("You already had cookie, just paste that in setToken function.");
ask.close();
return;
}
ask.question('Cookies : ', (cook: string) => {
if (!cook || cook.length === 0) {
console.log("You didn't provide a cookie. Try again...");
@ -200,6 +220,7 @@ export function authorization(): void {
ask.close();
}
});
})
}
export function attachListeners(player: EventEmitter, resource: YouTubeStream | SoundCloudStream) {

24
play-dl/token.ts Normal file
View File

@ -0,0 +1,24 @@
import { setSoundCloudToken } from "./SoundCloud";
import { setSpotifyToken } from "./Spotify";
import { setCookieToken } from "./YouTube/utils/cookie";
interface tokenOptions {
spotify? : {
client_id : string
client_secret : string;
refresh_token : string
market : string
}
soundcloud? : {
client_id : string
}
youtube? : {
cookie : string
}
}
export function setToken(options : tokenOptions){
if(options.spotify) setSpotifyToken(options.spotify)
if(options.soundcloud) setSoundCloudToken(options.soundcloud)
if(options.youtube) setCookieToken(options.youtube)
}