arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-02-04 06:08:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix login for private tenants, improved refresh reliability (#181)

Browse Source
This commit is contained in:
lukaarma
2020-07-19 09:50:23 +02:00
committed by GitHub
parent 0be6ad8b60
commit 78e5818cc3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/destreamer.ts
View File

@@ -44,7 +44,6 @@ async function init(): Promise<void> {
async function DoInteractiveLogin(url: string, username?: string): Promise<Session> {
const videoId: string = url.split('/').pop() ?? process.exit(ERROR_CODE.INVALID_VIDEO_GUID);
logger.info('Launching headless Chrome to perform the OpenID Connect dance...');
@@ -81,7 +80,7 @@ async function DoInteractiveLogin(url: string, username?: string): Promise<Sessi
remember the credentials or it could still prompt the user for a password */
}
await browser.waitForTarget((target: puppeteer.Target) => target.url().includes(videoId), { timeout: 150000 });
await browser.waitForTarget((target: puppeteer.Target) => target.url().includes('microsoftstream.com'), { timeout: 150000 });
logger.info('We are logged in.');
let session: Session | null = null;
@@ -142,16 +141,16 @@ async function downloadVideo(videoGUIDs: Array<string>, outputDirectories: Array
return;
}
for (const video of videos) {
for (const [index, video] of videos.entries()) {
if (argv.skip && fs.existsSync(video.outPath)) {
logger.info(`File already exists, skipping: ${video.outPath} \n`);
continue;
}
if (argv.keepLoginCookies) {
if (argv.keepLoginCookies && index !== 0) {
logger.info('Trying to refresh token...');
session = await refreshSession();
session = await refreshSession('https://web.microsoftstream.com/video/' + videoGUIDs[index]);
}
const pbar: cliProgress.SingleBar = new cliProgress.SingleBar({