From 6b368a7c02e5c53447872a030617d46038e10b5d Mon Sep 17 00:00:00 2001 From: Philippe G Date: Sun, 4 Apr 2021 15:52:47 -0700 Subject: [PATCH] 0.310 (download cache + battery) --- plugin/SqueezeESP32.zip | Bin 13548 -> 14648 bytes plugin/SqueezeESP32/FirmwareHelper.pm | 237 ++++++++++++++++++++++++++ plugin/SqueezeESP32/Player.pm | 5 + plugin/SqueezeESP32/Plugin.pm | 147 +--------------- plugin/SqueezeESP32/install.xml | 2 +- plugin/repo.xml | 4 +- 6 files changed, 248 insertions(+), 147 deletions(-) create mode 100644 plugin/SqueezeESP32/FirmwareHelper.pm diff --git a/plugin/SqueezeESP32.zip b/plugin/SqueezeESP32.zip index f9bb8cf0d894b7dea5be104c23a807ce806479fe..9180a8fad19304bc02d40563d0475dc18665a570 100644 GIT binary patch delta 7307 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 diff --git a/plugin/SqueezeESP32/FirmwareHelper.pm b/plugin/SqueezeESP32/FirmwareHelper.pm new file mode 100644 index 00000000..3f0c192e --- /dev/null +++ b/plugin/SqueezeESP32/FirmwareHelper.pm @@ -0,0 +1,237 @@ +package Plugins::SqueezeESP32::FirmwareHelper; + +use strict; + +use File::Basename qw(basename); +use File::Spec::Functions qw(catfile); +use JSON::XS::VersionOneAndTwo; + +use Slim::Utils::Log; +use Slim::Utils::Prefs; + +use constant FIRMWARE_POLL_INTERVAL => 3600 * (5 + rand()); +use constant GITHUB_RELEASES_URI => "https://api.github.com/repos/sle118/squeezelite-esp32/releases"; +use constant GITHUB_ASSET_URI => GITHUB_RELEASES_URI . "/assets/"; +use constant GITHUB_DOWNLOAD_URI => "https://github.com/sle118/squeezelite-esp32/releases/download/"; +my $FW_DOWNLOAD_ID_REGEX = qr|plugins/SqueezeESP32/firmware/(-?\d+)|; +my $FW_DOWNLOAD_REGEX = qr|plugins/SqueezeESP32/firmware/([-a-z0-9-/.]+\.bin)$|i; +my $FW_FILENAME_REGEX = qr/^squeezelite-esp32-.*\.bin(\.tmp)?$/; +my $FW_TAG_REGEX = qr/\/(ESP32-A1S|SqueezeAmp|I2S-4MFlash)\.(16|32)\.(\d+)\.(.*)\//; + +my $prefs = preferences('plugin.squeezeesp32'); +my $log = logger('plugin.squeezeesp32'); + +sub init { + Slim::Web::Pages->addRawFunction($FW_DOWNLOAD_ID_REGEX, \&handleFirmwareDownload); + Slim::Web::Pages->addRawFunction($FW_DOWNLOAD_REGEX, \&handleFirmwareDownloadDirect); + + # start checking for firmware updates + Slim::Utils::Timers::setTimer(undef, Time::HiRes::time() + 30 + rand(30), \&prefetchFirmware); +} + +sub prefetchFirmware { + Slim::Utils::Timers::killTimers(undef, \&prefetchFirmware); + my $releaseInfo = $prefs->get('lastReleaseTagUsed'); + + Slim::Networking::SimpleAsyncHTTP->new( + sub { + my $http = shift; + my $content = eval { from_json( $http->content ) }; + + if (!$content || !ref $content) { + $@ && $log->error("Failed to parse response: $@"); + } + + my $regex = $releaseInfo->{model} . '\.' . $releaseInfo->{res} . '\.\d+\.' . $releaseInfo->{branch}; + my $url; + foreach (@$content) { + if ($_->{tag_name} =~ /$regex/ && $_->{assets} && ref $_->{assets}) { + ($url) = grep /\.bin$/, map { + $_->{browser_download_url} + } @{$_->{assets}}; + + last if $url; + } + } + + downloadFirmwareFile(sub { + main::INFOLOG && $log->is_info && $log->info("Pre-cached firmware file: " . $_[0]); + }, sub { + my ($http, $error, $url, $code) = @_; + $error ||= ($http && $http->error) || 'unknown error'; + $url ||= ($http && $http->url) || 'no URL'; + + $log->error(sprintf("Failed to get firmware image from Github: %s (%s)", $error || $http->error, $url)); + }, $url) if $url && $url =~ /^https?/; + + }, + sub { + my ($http, $error) = @_; + $log->error("Failed to get releases from Github: $error"); + }, + { + timeout => 10, + cache => 1, + expires => 3600 + } + )->get(GITHUB_RELEASES_URI) if $releaseInfo; + + Slim::Utils::Timers::setTimer(undef, Time::HiRes::time() + FIRMWARE_POLL_INTERVAL, \&prefetchFirmware); +} + +sub handleFirmwareDownload { + my ($httpClient, $response) = @_; + + my $request = $response->request; + + my $_errorDownloading = sub { + _errorDownloading($httpClient, $response, @_); + }; + + my $id; + if (!defined $request || !(($id) = $request->uri =~ $FW_DOWNLOAD_ID_REGEX)) { + return $_errorDownloading->(undef, 'Invalid request', $request->uri, 400); + } + + # this is the magic number used on the client to figure out whether the plugin does support download proxying + if ($id == -99) { + $response->code(204); + $response->header('Access-Control-Allow-Origin' => '*'); + + $httpClient->send_response($response); + return Slim::Web::HTTP::closeHTTPSocket($httpClient); + } + + Slim::Networking::SimpleAsyncHTTP->new( + sub { + my $http = shift; + my $content = eval { from_json( $http->content ) }; + + if (!$content || !ref $content) { + $@ && $log->error("Failed to parse response: $@"); + return $_errorDownloading->($http); + } + elsif (!$content->{browser_download_url} || !$content->{name}) { + return $_errorDownloading->($http, 'No download URL found'); + } + + downloadFirmwareFile(sub { + my $firmwareFile = shift; + $response->code(200); + Slim::Web::HTTP::sendStreamingFile($httpClient, $response, 'application/octet-stream', $firmwareFile, undef, 1); + }, $_errorDownloading, $content->{browser_download_url}, $content->{name}); + }, + $_errorDownloading, + { + timeout => 10, + cache => 1, + expires => 86400 + } + )->get(GITHUB_ASSET_URI . $id); + + return; +} + +sub handleFirmwareDownloadDirect { + my ($httpClient, $response) = @_; + + my $request = $response->request; + + my $_errorDownloading = sub { + _errorDownloading($httpClient, $response, @_); + }; + + my $path; + if (!defined $request || !(($path) = $request->uri =~ $FW_DOWNLOAD_REGEX)) { + return $_errorDownloading->(undef, 'Invalid request', $request->uri, 400); + } + + main::INFOLOG && $log->is_info && $log->info("Requesting firmware from: $path"); + + downloadFirmwareFile(sub { + my $firmwareFile = shift; + $response->code(200); + Slim::Web::HTTP::sendStreamingFile($httpClient, $response, 'application/octet-stream', $firmwareFile, undef, 1); + }, $_errorDownloading, GITHUB_DOWNLOAD_URI . $path); +} + +sub downloadFirmwareFile { + my ($cb, $ecb, $url, $name) = @_; + + # keep track of the last firmware we requested, to prefetch it in the future + _getFirmwareTag($url); + + $name ||= basename($url); + + if ($name !~ $FW_FILENAME_REGEX) { + return $ecb->(undef, 'Unexpected firmware image name: ' . $name, $url, 400); + } + + my $updatesDir = Slim::Utils::OSDetect::dirsFor('updates'); + my $firmwareFile = catfile($updatesDir, $name); + Slim::Utils::Misc::deleteFiles($updatesDir, $FW_FILENAME_REGEX, $firmwareFile); + + if (-f $firmwareFile) { + main::INFOLOG && $log->is_info && $log->info("Found cached firmware file"); + return $cb->($firmwareFile); + } + + Slim::Networking::SimpleAsyncHTTP->new( + sub { + my $http = shift; + + if ($http->code != 200 || !-e "$firmwareFile.tmp") { + return $ecb->($http, $http->mess); + } + + rename "$firmwareFile.tmp", $firmwareFile or return $ecb->($http, "Unable to rename temporary $firmwareFile file" ); + + return $cb->($firmwareFile); + }, + $ecb, + { + saveAs => "$firmwareFile.tmp", + } + )->get($url); + + return; +} + +sub _getFirmwareTag { + my ($url) = @_; + + if (my ($model, $resolution, $version, $branch) = $url =~ $FW_TAG_REGEX) { + my $releaseInfo = { + model => $model, + res => $resolution, + version => $version, + branch => $branch + }; + + $prefs->set('lastReleaseTagUsed', $releaseInfo); + + return $releaseInfo; + } +} + +sub _errorDownloading { + my ($httpClient, $response, $http, $error, $url, $code) = @_; + + $error ||= ($http && $http->error) || 'unknown error'; + $url ||= ($http && $http->url) || 'no URL'; + $code ||= ($http && $http->code) || 500; + + $log->error(sprintf("Failed to get data from Github: %s (%s)", $error || $http->error, $url)); + + $response->headers->remove_content_headers; + $response->code($code); + $response->content_type('text/plain'); + $response->header('Connection' => 'close'); + $response->content(''); + + $httpClient->send_response($response); + Slim::Web::HTTP::closeHTTPSocket($httpClient); +}; + + +1; \ No newline at end of file diff --git a/plugin/SqueezeESP32/Player.pm b/plugin/SqueezeESP32/Player.pm index 158d1395..d82b3b5c 100644 --- a/plugin/SqueezeESP32/Player.pm +++ b/plugin/SqueezeESP32/Player.pm @@ -343,4 +343,9 @@ sub lineInOutStatus { } } +sub voltage { + my $voltage = Slim::Networking::Slimproto::voltage(shift) || return 0; + return sprintf("%.2f", ($voltage >> 4) / 128); +} + 1; diff --git a/plugin/SqueezeESP32/Plugin.pm b/plugin/SqueezeESP32/Plugin.pm index 9ba733a6..6614c179 100644 --- a/plugin/SqueezeESP32/Plugin.pm +++ b/plugin/SqueezeESP32/Plugin.pm @@ -3,14 +3,13 @@ package Plugins::SqueezeESP32::Plugin; use strict; use base qw(Slim::Plugin::Base); -use File::Basename qw(basename); -use File::Spec::Functions qw(catfile); -use JSON::XS::VersionOneAndTwo; use Slim::Utils::Prefs; use Slim::Utils::Log; use Slim::Web::ImageProxy; +use Plugins::SqueezeESP32::FirmwareHelper; + my $prefs = preferences('plugin.squeezeesp32'); my $log = Slim::Utils::Log->addLogCategory({ @@ -19,12 +18,6 @@ my $log = Slim::Utils::Log->addLogCategory({ 'description' => 'PLUGIN_SQUEEZEESP32', }); -use constant GITHUB_ASSET_URI => "https://api.github.com/repos/sle118/squeezelite-esp32/releases/assets/"; -use constant GITHUB_DOWNLOAD_URI => "https://github.com/sle118/squeezelite-esp32/releases/download/"; -my $FW_DOWNLOAD_ID_REGEX = qr|plugins/SqueezeESP32/firmware/(-?\d+)|; -my $FW_DOWNLOAD_REGEX = qr|plugins/SqueezeESP32/firmware/([-a-z0-9-/.]+\.bin)$|i; -my $FW_FILENAME_REGEX = qr/^squeezelite-esp32-.*\.bin(\.tmp)?$/; - # migrate 'eq' pref, as that's a reserved word and could cause problems in the future $prefs->migrateClient(1, sub { my ($cprefs, $client) = @_; @@ -68,8 +61,7 @@ sub initPlugin { Slim::Control::Request::subscribe( sub { onNotification(@_) }, [ ['playlist'], ['open', 'newsong'] ]); Slim::Control::Request::subscribe( \&onStopClear, [ ['playlist'], ['stop', 'clear'] ]); - Slim::Web::Pages->addRawFunction($FW_DOWNLOAD_ID_REGEX, \&handleFirmwareDownload); - Slim::Web::Pages->addRawFunction($FW_DOWNLOAD_REGEX, \&handleFirmwareDownloadDirect); + Plugins::SqueezeESP32::FirmwareHelper->init(); } sub onStopClear { @@ -111,137 +103,4 @@ sub setEQ { $client->send_equalizer(\@eqParams); } -sub handleFirmwareDownload { - my ($httpClient, $response) = @_; - - my $request = $response->request; - - my $_errorDownloading = sub { - _errorDownloading($httpClient, $response, @_); - }; - - my $id; - if (!defined $request || !(($id) = $request->uri =~ $FW_DOWNLOAD_ID_REGEX)) { - return $_errorDownloading->(undef, 'Invalid request', $request->uri, 400); - } - - # this is the magic number used on the client to figure out whether the plugin does support download proxying - if ($id == -99) { - $response->code(204); - $response->header('Access-Control-Allow-Origin' => '*'); - - $httpClient->send_response($response); - return Slim::Web::HTTP::closeHTTPSocket($httpClient); - } - - Slim::Networking::SimpleAsyncHTTP->new( - sub { - my $http = shift; - my $content = eval { from_json( $http->content ) }; - - if (!$content || !ref $content) { - $@ && $log->error("Failed to parse response: $@"); - return $_errorDownloading->($http); - } - elsif (!$content->{browser_download_url} || !$content->{name}) { - return $_errorDownloading->($http, 'No download URL found'); - } - - downloadAndStreamFirmware($httpClient, $response, $content->{browser_download_url}, $content->{name}); - }, - $_errorDownloading, - { - timeout => 10, - cache => 1, - expires => 86400 - } - )->get(GITHUB_ASSET_URI . $id); - - return; -} - -sub handleFirmwareDownloadDirect { - my ($httpClient, $response) = @_; - - my $request = $response->request; - - my $_errorDownloading = sub { - _errorDownloading($httpClient, $response, @_); - }; - - my $path; - if (!defined $request || !(($path) = $request->uri =~ $FW_DOWNLOAD_REGEX)) { - return $_errorDownloading->(undef, 'Invalid request', $request->uri, 400); - } - - main::INFOLOG && $log->is_info && $log->info("Requesting firmware from: $path"); - - downloadAndStreamFirmware($httpClient, $response, GITHUB_DOWNLOAD_URI . $path); -} - -sub downloadAndStreamFirmware { - my ($httpClient, $response, $url, $name) = @_; - - my $_errorDownloading = sub { - _errorDownloading($httpClient, $response, @_); - }; - - $name ||= basename($url); - - if ($name !~ $FW_FILENAME_REGEX) { - return $_errorDownloading->(undef, 'Unexpected firmware image name: ' . $name, $url, 400); - } - - my $updatesDir = Slim::Utils::OSDetect::dirsFor('updates'); - my $firmwareFile = catfile($updatesDir, $name); - Slim::Utils::Misc::deleteFiles($updatesDir, $FW_FILENAME_REGEX, $firmwareFile); - - if (-f $firmwareFile) { - main::INFOLOG && $log->is_info && $log->info("Found cached firmware version"); - $response->code(200); - return Slim::Web::HTTP::sendStreamingFile($httpClient, $response, 'application/octet-stream', $firmwareFile, undef, 1); - } - - Slim::Networking::SimpleAsyncHTTP->new( - sub { - my $http = shift; - - if ($http->code != 200 || !-e "$firmwareFile.tmp") { - return $_errorDownloading->($http, $http->mess); - } - - rename "$firmwareFile.tmp", $firmwareFile or return $_errorDownloading->($http, "Unable to rename temporary $firmwareFile file" ); - - $response->code(200); - Slim::Web::HTTP::sendStreamingFile($httpClient, $response, 'application/octet-stream', $firmwareFile, undef, 1); - }, - $_errorDownloading, - { - saveAs => "$firmwareFile.tmp", - } - )->get($url); - - return; -} - -sub _errorDownloading { - my ($httpClient, $response, $http, $error, $url, $code) = @_; - - $error ||= ($http && $http->error) || 'unknown error'; - $url ||= ($http && $http->url) || 'no URL'; - $code ||= ($http && $http->code) || 500; - - $log->error(sprintf("Failed to get data from Github: %s (%s)", $error || $http->error, $url)); - - $response->headers->remove_content_headers; - $response->code($code); - $response->content_type('text/plain'); - $response->header('Connection' => 'close'); - $response->content(''); - - $httpClient->send_response($response); - Slim::Web::HTTP::closeHTTPSocket($httpClient); -}; - - 1; diff --git a/plugin/SqueezeESP32/install.xml b/plugin/SqueezeESP32/install.xml index 56551748..44753dce 100644 --- a/plugin/SqueezeESP32/install.xml +++ b/plugin/SqueezeESP32/install.xml @@ -10,6 +10,6 @@ PLUGIN_SQUEEZEESP32 PLUGIN_SQUEEZEESP32_DESC Plugins::SqueezeESP32::Plugin - 0.300 + 0.310 Philippe diff --git a/plugin/repo.xml b/plugin/repo.xml index 3a473e19..4e6770bd 100644 --- a/plugin/repo.xml +++ b/plugin/repo.xml @@ -1,10 +1,10 @@ - + https://github.com/sle118/squeezelite-esp32 Philippe - 0763bf75e2c8e7d535d50959916053d865ce2c4d + 39e70a87ce903cc8651e6b3bb2dc86609a8d0541 philippe_44@outlook.com SqueezeESP32 additional player id (100) http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip