Don't output user country on token refresh

Also should prevent from some excess API calls
This commit is contained in:
AnimeDL 2023-07-10 16:04:41 -07:00
parent 2dc6b3968c
commit 2149df6fe5
2 changed files with 16 additions and 6 deletions

View file

@ -14,6 +14,7 @@ export type CrunchyDownloadOptions = {
partsize: number,
callbackMaker?: (data: DownloadInfo) => HLSCallback,
timeout: number,
waittime: number,
fsRetryTime: number,
dlsubs: string[],
skipsubs: boolean,

View file

@ -238,7 +238,7 @@ export default class Crunchy implements ServiceClass {
yamlCfg.saveCRToken(this.token);
}
public async getProfile() : Promise<boolean> {
public async getProfile(silent = false) : Promise<boolean> {
if(!this.token.access_token){
console.error('No access token!');
return false;
@ -255,7 +255,9 @@ export default class Crunchy implements ServiceClass {
return false;
}
const profile = JSON.parse(profileReq.res.body);
console.info('USER: %s (%s)', profile.username, profile.email);
if (!silent) {
console.info('USER: %s (%s)', profile.username, profile.email);
}
return true;
}
@ -297,19 +299,26 @@ export default class Crunchy implements ServiceClass {
yamlCfg.saveCRToken(this.token);
}
if(this.token.refresh_token) {
if (!silent)
await this.getProfile();
await this.getProfile(silent);
} else {
console.info('USER: Anonymous');
}
await this.getCMStoken();
await this.getCMStoken(ifNeeded);
}
public async getCMStoken(){
public async getCMStoken(ifNeeded = false) {
if(!this.token.access_token){
console.error('No access token!');
return;
}
if (ifNeeded && this.cmsToken.cms) {
if (!(Date.now() >= new Date(this.cmsToken.cms.expires).getTime())) {
return;
} else {
}
}
const cmsTokenReqOpts = {
headers: {
Authorization: `Bearer ${this.token.access_token}`,