arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-01-17 05:22:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix API endpoint is now read from sessionInfo no longer 'winged'

Browse Source
This commit is contained in:
snobu
2020-03-30 10:16:46 +03:00
parent ee1d9b3cf1
commit 7cbd3c7472
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
destreamer.ts
View File

@@ -18,7 +18,6 @@ import axios from 'axios';
const ApiVersion = "1.3-private" const ApiVersion = "1.3-private"
const args: string[] = process.argv.slice(2); // TODO: Remove this const args: string[] = process.argv.slice(2); // TODO: Remove this
let isMsTenant: boolean = false;
const argv = yargs.options({ const argv = yargs.options({
videoUrls: { type: 'array', demandOption: true }, videoUrls: { type: 'array', demandOption: true },
@@ -109,13 +108,9 @@ async function rentVideoForLater(videoUrls: string[], username: string, outputDi
await page.click('input[type="submit"]'); await page.click('input[type="submit"]');
await browser.waitForTarget(target => target.url().includes('microsoftstream.com/'), { timeout: 90000 }); await browser.waitForTarget(target => target.url().includes('microsoftstream.com/'), { timeout: 90000 });
process.stdout.write('We are logged in. '); console.log('We are logged in.');
await sleep(1500); await sleep(1500);
if (videoUrls[0].includes('msit.microsoftstream.com')) {
isMsTenant = true;
}
for (let videoUrl of videoUrls) { for (let videoUrl of videoUrls) {
let videoID = videoUrl.split('/').pop() ?? (console.error("Couldn't split the videoID, wrong url"), process.exit(25)) let videoID = videoUrl.split('/').pop() ?? (console.error("Couldn't split the videoID, wrong url"), process.exit(25))
@@ -133,19 +128,26 @@ async function rentVideoForLater(videoUrls: string[], username: string, outputDi
console.log("Accessing API..."); console.log("Accessing API...");
let sessionInfo: any; let sessionInfo: any;
var accesToken = await page.evaluate( let session = await page.evaluate(
() => { () => {
return sessionInfo.AccessToken; return {
AccessToken: sessionInfo.AccessToken,
ApiGatewayUri: sessionInfo.ApiGatewayUri,
ApiGatewayVersion: sessionInfo.ApiGatewayVersion
}
} }
); );
console.log(`ApiGatewayUri: ${session.ApiGatewayUri}`);
console.log(`ApiGatewayVersion: ${session.ApiGatewayVersion}`);
console.log("Fetching title and HLS URL...") console.log("Fetching title and HLS URL...")
var [title, hlsUrl] = await getVideoInfo(videoID, accesToken) var [title, hlsUrl] = await getVideoInfo(videoID, session);
title = (sanitize(title) == "") ? `Video${videoUrls.indexOf(videoUrl)}` : sanitize(title) title = (sanitize(title) == "") ? `Video${videoUrls.indexOf(videoUrl)}` : sanitize(title)
term.blue("Video title is: ") term.blue("Video title is: ");
console.log(`${title} \n`) console.log(`${title} \n`);
console.log('Spawning youtube-dl with cookie and HLS URL...'); console.log('Spawning youtube-dl with cookie and HLS URL...');
@@ -191,27 +193,24 @@ async function exfiltrateCookie(page: puppeteer.Page) {
} }
async function getVideoInfo(videoID: string, accesToken: string) { async function getVideoInfo(videoID: string, session: any) {
let title: string; let title: string;
let hlsUrl: string; let hlsUrl: string;
let apiEndpoint = isMsTenant ?
'https://use2-2.api.microsoftstream.com' :
'https://api.microsoftstream.com';
let content = axios.get( let content = axios.get(
`${apiEndpoint}/api/videos/${videoID}` + `${session.ApiGatewayUri}videos/${videoID}` +
`?$expand=creator,tokens,status,liveEvent,extensions&api-version=${ApiVersion}`, `?$expand=creator,tokens,status,liveEvent,extensions&api-version=${session.ApiGatewayVersion}`,
{ {
headers: { headers: {
Authorization: `Bearer ${accesToken}` Authorization: `Bearer ${session.AccessToken}`
} }
}) })
.then(function (response) { .then(function (response) {
return response.data; return response.data;
}) })
.catch(function (error) { .catch(function (error) {
term.red("Error when calling Microsoft Stream API:") term.red('Error when calling Microsoft Stream API: ' +
`${error.response.status} ${error.response.reason}`);
console.error(error.response.status); console.error(error.response.status);
console.error(error.response.data); console.error(error.response.data);
console.error("Exiting..."); console.error("Exiting...");