Skip to content

pass yt-dlp http_headers through to actual fetches #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexanderadam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pass yt-dlp http_headers through to actual fetches #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions plugin/M4a.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,26 @@ use constant PARSING => 2;
use constant DATA => 3;

{
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url));
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url http_headers));
__PACKAGE__->mk_accessor('rw', qw(_mp4a _context));
}

sub new {
my ($class, $url) = @_;
my ($class, $url, $headers) = @_;
my $self = $class->SUPER::new;

# _context is to be flushed/initialized each time the getAudio is restarted
# but _mp4a is to be used for the duration of the objects, i.e. when seeking
# but _mp4a is to be used for the duration of the objects, i.e. when seeking
$self->init_accessor(
format => 'aac',
url => $url,
http_headers => $headers || {},
_context => {},
_mp4a => {},
);
);

return bless $self, $class;
}
}

sub flush {
$_[0]->_context( { } );
Expand All @@ -87,13 +88,15 @@ sub getStartOffset {

my $http = Slim::Networking::Async::HTTP->new;
my $args = { startTime => $startTime };


my %hdrs = %{ $self->http_headers || {} };

$http->send_request( {
request => HTTP::Request->new( GET => $url ),
request => HTTP::Request->new( GET => $url, [ %hdrs ] ),

onStream => sub {
my ($http, $dataref) = @_;

if (my $atom = parseAtoms('sidx', $dataref, $args)) {
my $offset = $args->{offset} || 0;
$startTime -= $atom->{time};
Expand Down Expand Up @@ -128,12 +131,14 @@ sub initialize {
my ($self, $cb, $ecb, $url) = @_;
my $http = Slim::Networking::Async::HTTP->new;
my $args = {};

# we might have received an initialize url
$url ||= $self->url;


my %hdrs = %{ $self->http_headers || {} };

$http->send_request( {
request => HTTP::Request->new( GET => $url ),
request => HTTP::Request->new( GET => $url, [ %hdrs ] ),
onStream => sub {
my ($http, $dataref) = @_;

Expand Down
23 changes: 13 additions & 10 deletions plugin/MPEGTS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,23 @@ use constant TABLE_SYNTAX_OFS => TABLE_OFS + 3;
use constant TABLE_DATA_OFS => TABLE_SYNTAX_OFS + 5;

{
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url));
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url http_headers));
__PACKAGE__->mk_accessor('rw', qw( _context));
}

sub new {
my ($class, $url) = @_;
my ($class, $url, $headers) = @_;
my $self = $class->SUPER::new;

# _context is to be flushed/initialized each time the getAudio is restarted
$self->init_accessor(
$self->init_accessor(
url => $url,
http_headers => $headers || {},
_context => {},
);
);

return bless $self, $class;
}
}

sub flush {
$_[0]->_context( { } );
Expand All @@ -69,9 +70,11 @@ sub getStartOffset {

sub initialize {
my ($self, $cb, $ecb, $fragment) = @_;


my %hdrs = %{ $self->http_headers || {} };

# let's get a bit of 1st fragment to get AAC params
Slim::Networking::SimpleAsyncHTTP->new (
Slim::Networking::SimpleAsyncHTTP->new (
sub {
my $outBuf ='';

Expand Down Expand Up @@ -120,7 +123,7 @@ sub initialize {
$ecb->();
},

)->get( $fragment, Range => 'bytes=0-128000' );
)->get( $fragment, %hdrs, Range => 'bytes=0-128000' );
}

sub getAudio {
Expand Down
24 changes: 14 additions & 10 deletions plugin/ProtocolHandler.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,11 @@ sub sysread_URL {
# we only use one session in that mode
my $session = $v->{sessions}->[0] ||= Slim::Networking::Async::HTTP->new;

my $request = HTTP::Request->new( GET => $url,
[ 'Connection', 'keep-alive',
'Range', "bytes=$v->{offset}-" . ($v->{offset} + DATA_CHUNK - 1),
]
);
my %hdrs = %{ $config->{headers} || {} };
$hdrs{Connection} = 'keep-alive';
$hdrs{Range} = "bytes=$v->{offset}-" . ($v->{offset} + DATA_CHUNK - 1);

my $request = HTTP::Request->new( GET => $url, [ %hdrs ] );

$request->protocol( 'HTTP/1.1' );

Expand Down Expand Up @@ -539,8 +539,12 @@ AUDIO:
sub sendRequest {
my ($self, $url, $level, $onBody, $onError) = @_;
my $v = ${*$self}{vars};

my $request = HTTP::Request->new( GET => $url, [ 'Connection', 'keep-alive' ] );
my $config = ${*$self}{config};

my %hdrs = %{ ($config && $config->{headers}) || {} };
$hdrs{Connection} = 'keep-alive';

my $request = HTTP::Request->new( GET => $url, [ %hdrs ] );
# my $request = HTTP::Request->new( GET => $url );
$request->protocol( 'HTTP/1.1' );

Expand Down Expand Up @@ -758,8 +762,8 @@ sub _getNextTrack {
# What type of stream do we have?
if (!$track->{manifest_url}) {
my $handler = $config->{'format'} =~ /aac/ ?
Plugins::YouTube::M4a->new($track->{url}) :
Plugins::YouTube::WebM->new($track->{url});
Plugins::YouTube::M4a->new($track->{url}, $track->{http_headers}) :
Plugins::YouTube::WebM->new($track->{url}, $track->{http_headers});

$config->{'handler'} = $handler;
$config->{'sysread'} = \&sysread_URL;
Expand Down Expand Up @@ -816,7 +820,7 @@ sub _getNextTrack {
# stash that into pluginData to retrieve it later
$song->pluginData(stash => $mpeg);

my $handler = Plugins::YouTube::MPEGTS->new( $track->{url} );
my $handler = Plugins::YouTube::MPEGTS->new( $track->{url}, $track->{http_headers} );

$config->{source} = 'hls-mpeg';
$config->{handler} = $handler;
Expand Down
36 changes: 21 additions & 15 deletions plugin/WebM.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,25 @@ use constant ID_CUE_CLUSTER_POS => "\xF1";
my $log = logger('plugin.youtube');

{
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url));
__PACKAGE__->mk_accessor('rw', qw(bitrate samplerate channels format url http_headers));
__PACKAGE__->mk_accessor('rw', qw(_webm _context));
}

sub new {
my ($class, $url) = @_;
my ($class, $url, $headers) = @_;
my $self = $class->SUPER::new;

# _context is to be flushed/initialized each time the getAudio is restarted
# but _webm is to be used for the duration of the objects, i.e. when seeking
# but _webm is to be used for the duration of the objects, i.e. when seeking
$self->init_accessor(
url => $url,
http_headers => $headers || {},
_context => {},
_webm => {},
);
);

return bless $self, $class;
}
}

sub flush {
$_[0]->_context( { } );
Expand Down Expand Up @@ -655,12 +656,15 @@ sub getStartOffset {
'need' => EBML_NEED,
};

my %hdrs = %{ $self->http_headers || {} };
$hdrs{Range} = "bytes=$webm->{offset}->{cues}-";

$http->send_request( {
request => HTTP::Request->new( GET => $url, [ 'Range' => "bytes=$webm->{offset}->{cues}-" ] ),
onStream => sub {
request => HTTP::Request->new( GET => $url, [ %hdrs ] ),
onStream => sub {
my ($http, $dataref) = @_;
$var->{'inBuf'} .= $$dataref;

$var->{'inBuf'} .= $$dataref;
my $res = getCues($var);

if ( $res eq WEBM_MORE ) {
Expand Down Expand Up @@ -693,12 +697,14 @@ sub initialize {
};

my $http = Slim::Networking::Async::HTTP->new;


my %hdrs = %{ $self->http_headers || {} };

$http->send_request( {
request => HTTP::Request->new( GET => $self->url ),
onStream => sub {
request => HTTP::Request->new( GET => $self->url, [ %hdrs ] ),
onStream => sub {
my ($http, $dataref) = @_;

$var->{'inBuf'} .= $$dataref;
my $res = $self->getHeaders($var);

Expand Down