godzil/crunchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a proper cookie store.

Browse Source
This commit is contained in:
Godzil 2018-08-01 00:46:14 +01:00
parent 02a9ed1eb8
commit a6b025bdbf
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/my_request.ts
View File

@ -3,16 +3,23 @@ import cheerio = require('cheerio');
import request = require('request');
import rp = require('request-promise');
import Promise = require('bluebird');
import path = require('path');
import fs = require('fs-extra');
import log = require('./log');
import { RequestPromise } from 'request-promise';
import { Response } from 'request';
// tslint:disable-next-line:no-var-requires
const cookieStore = require('tough-cookie-file-store');
// tslint:disable-next-line:no-var-requires
const cloudscraper = require('cloudscraper');
let isAuthenticated = false;
let isPremium = false;
let j: request.CookieJar;
const defaultHeaders: request.Headers =
{
'User-Agent': 'Mozilla/5.0 (Windows NT 6.2; WOW64; x64; rv:58.0) Gecko/20100101 Firefox/58.0',
@ -69,6 +76,7 @@ function login(sessionId: string, user: string, pass: string): Promise<any>
version: 'CR_API_VERSION',
},
json: true,
jar: j,
})
.then((response) =>
{
@ -78,12 +86,26 @@ function login(sessionId: string, user: string, pass: string): Promise<any>
}
// TODO: logout
function loadCookies(config: IConfig)
{
const cookiePath = path.join(config.output || process.cwd(), '.cookies.json');
if(!fs.existsSync(cookiePath))
{
fs.closeSync(fs.openSync(cookiePath, 'w'));
}
j = request.jar(new cookieStore(cookiePath));
}
/**
* Performs a GET request for the resource.
*/
export function get(config: IConfig, options: string|request.Options, done: (err: any, result?: string) => void)
{
if (j === undefined)
{
loadCookies(config);
}
authenticate(config, (err) =>
{
if (err)
@ -104,6 +126,11 @@ export function get(config: IConfig, options: string|request.Options, done: (err
*/
export function post(config: IConfig, options: request.Options, done: (err: Error, result?: string) => void)
{
if (j === undefined)
{
loadCookies(config);
}
authenticate(config, (err) =>
{
if (err)
@ -153,7 +180,7 @@ function authenticate(config: IConfig, done: (err: Error) => void)
const options =
{
headers: defaultHeaders,
jar: true,
jar: j,
url: 'http://www.crunchyroll.com/',
method: 'GET',
};
@ -212,13 +239,13 @@ function modify(options: string|request.Options, reqMethod: string): request.Opt
{
if (typeof options !== 'string')
{
options.jar = true;
options.jar = j;
options.headers = defaultHeaders;
options.method = reqMethod;
return options;
}
return {
jar: true,
jar: j,
headers: defaultHeaders,
url: options.toString(),
method: reqMethod