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

Add https request error handling

Browse Source
This commit is contained in:
cjh980402 2021-09-13 14:13:36 +09:00
parent 342c977606
commit b29a9121f2
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
play-dl/YouTube/stream.ts
View File

@ -1,13 +1,12 @@
import { video_info } from "." import { video_info } from "."
import { LiveStreaming, Stream } from "./classes/LiveStream" import { LiveStreaming, Stream } from "./classes/LiveStream"
import { request } from "./utils/request"
export enum StreamType{ export enum StreamType{
Arbitrary = 'arbitrary', Arbitrary = 'arbitrary',
Raw = 'raw', Raw = 'raw',
OggOpus = 'ogg/opus', OggOpus = 'ogg/opus',
WebmOpus = 'webm/opus', WebmOpus = 'webm/opus',
Opus = 'opus', Opus = 'opus',
} }
interface InfoData{ interface InfoData{

42
play-dl/YouTube/utils/request.ts
View File

@ -10,17 +10,18 @@ interface RequestOpts extends RequestOptions{
async function https_getter(req_url : string, options : RequestOpts = {}): Promise<IncomingMessage>{ async function https_getter(req_url : string, options : RequestOpts = {}): Promise<IncomingMessage>{
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let s = new URL(req_url) let s = new URL(req_url)
if(!options.method) options.method = "GET" options.method ??= "GET"
let req_options : RequestOptions = { let req_options : RequestOptions = {
host : s.hostname, host : s.hostname,
path : s.pathname + s.search, path : s.pathname + s.search,
headers : (options.headers) ? options.headers : {}, headers : options.headers ?? {},
method : options.method method : options.method
} }
let req = https.request(req_options, (response) => { let req = https.request(req_options, (response) => {
resolve(response) resolve(response)
}) })
req.on('error', reject)
if(options.method === "POST") req.write(options.body) if(options.method === "POST") req.write(options.body)
req.end() req.end()
}) })
@ -28,27 +29,36 @@ async function https_getter(req_url : string, options : RequestOpts = {}): Promi
export async function request(url : string, options? : RequestOpts): Promise<string>{ export async function request(url : string, options? : RequestOpts): Promise<string>{
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let data = '' try{
let res = await https_getter(url, options) let data = ''
if(Number(res.statusCode) >= 300 && Number(res.statusCode) < 400){ let res = await https_getter(url, options)
res = await https_getter(res.headers.location as string , options) if(Number(res.statusCode) >= 300 && Number(res.statusCode) < 400){
res = await https_getter(res.headers.location as string , options)
}
else if(Number(res.statusCode) > 400){
reject(`Got ${res.statusCode} from the request`)
}
res.setEncoding('utf-8')
res.on('data', (c) => data+=c)
res.on('end', () => resolve(data))
} }
else if(Number(res.statusCode) > 400){ catch(err) {
reject(`Got ${res.statusCode} from the request`) reject(err)
} }
res.setEncoding('utf-8')
res.on('data', (c) => data+=c)
res.on('end', () => resolve(data))
}) })
} }
export async function request_stream(url : string, options? : RequestOpts): Promise<IncomingMessage>{ export async function request_stream(url : string, options? : RequestOpts): Promise<IncomingMessage>{
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let data = '' try{
let res = await https_getter(url, options) let res = await https_getter(url, options)
if(Number(res.statusCode) >= 300 && Number(res.statusCode) < 400){ if(Number(res.statusCode) >= 300 && Number(res.statusCode) < 400){
res = await https_getter(res.headers.location as string, options) res = await https_getter(res.headers.location as string, options)
}
resolve(res)
}
catch(err){
reject(err)
} }
resolve(res)
}) })
} }