PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 04:58:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Initial Alexa integration

Browse source
This commit is contained in:
Adam Lavin 2016-09-30 22:21:17 +01:00
parent d0a6022ed8
commit 14211f4ea4
4 changed files with 223 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
app/Http/Controllers/Api/Web/AlexaController.php
View file

@ -2,31 +2,71 @@
namespace Poniverse\Ponyfm\Http\Controllers\Api\Web;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Session\Store;
use Poniverse\Ponyfm\Http\Controllers\Controller;
use Poniverse\Ponyfm\Models\AlexaSession;
use Poniverse\Ponyfm\Models\Track;
use Psr\Log\LoggerInterface;
class AlexaController extends Controller
{
/**
* @var AlexaSession
*/
protected $session;
public function handle(Request $request, LoggerInterface $logger)
{
$type = $request->json('request.type');
$intent = $request->json('request.intent.name');
$sessId = $request->json('session.user.userId', $request->json('context.System.user.userId'));
if ($sessId) {
$this->session = AlexaSession::find($sessId);
if (!$this->session) {
$this->session = new AlexaSession();
$this->session->id = $sessId;
}
}
$logger->debug('Incoming Alexa Request', [
'type' => $type,
'intent' => $intent
]);
$logger->debug('Incoming Alexa Full Request', $request->json()->all());
$logger->debug('Incoming Alexa Full Request', [
'json' => json_encode($request->json()->all(), JSON_PRETTY_PRINT)
]);
/** @var JsonResponse $response */
$response = $this->handleType($request);
if ($response instanceof JsonResponse) {
$logger->debug('Alexa Response', ['json' => $response->getContent()]);
}
if ($this->session) {
$this->session->save();
}
return $response;
}
public function handleType(Request $request)
{
$type = $request->json('request.type');
switch ($type) {
case 'LaunchRequest':
return $this->launch();
case 'PlayAudio';
return $this->play();
// case 'AudioPlayer.PlaybackNearlyFinished':
// return $this->queueNextTrack();
case 'AudioPlayer.PlaybackNearlyFinished':
return $this->queueNextTrack();
case 'IntentRequest':
return $this->handleIntent($request);
default:
@ -41,8 +81,13 @@ class AlexaController extends Controller
switch ($intent) {
case 'AMAZON.PauseIntent':
return $this->stop();
case 'PlayAudio':
case 'AMAZON.ResumeIntent':
return $this->play();
case 'AMAZON.NextIntent':
return $this->queueNextTrack(true);
case 'AMAZON.PreviousIntent':
return $this->previousTrack();
case 'Author':
return $this->author();
default:
@ -101,6 +146,11 @@ class AlexaController extends Controller
public function play()
{
$track = array_first(Track::popular(1));
$this->session->put('current_position', 1);
$this->session->put('track_id', $track['id']);
return [
'version' => '1.0',
'sessionAttributes' => (object)[],
@ -111,8 +161,8 @@ class AlexaController extends Controller
'playBehavior' => 'REPLACE_ALL',
'audioItem' => [
'stream' => [
'url' => 'https://pony.fm/t13840/stream.mp3',
'token' => 't13840',
'url' => $track['streams']['mp3'],
'token' => '1',
'offsetInMilliseconds' => 0,
],
],
@ -123,8 +173,68 @@ class AlexaController extends Controller
];
}
public function queueNextTrack()
public function queueNextTrack($replace = false)
{
$trackId = $this->session->get('track_id');
$position = $this->session->get('current_position', 1);
$trackHistory = $this->session->get('track_history', []);
$playlist = $this->session->get('playlist', []);
$playlistNum = $this->session->get('playlist-num', 1);
if (count($playlist) === 0) {
$playlist = Track::popular(30);
$this->session->put('playlist', $playlist);
}
if ($position === 30) {
$playlist = Track::popular(30, false, $playlistNum * 30);
$position = 1;
$playlistNum++;
}
if (count($playlist) === 0) {
return [
'version' => '1.0',
'sessionAttributes' => (object)[],
'response' => [
"outputSpeech" => [
"type" => "SSML",
"ssml" => "
<speak>
You've reached the end of the popular tracks today. To start from the beginning say 'Alexa, ask pony fm to play'
</speak>
"],
'directives' => [
[
'type' => 'AudioPlayer.Stop'
],
],
'shouldEndSession' => true,
],
];
}
$track = $playlist[$position-1];
$trackHistory[] = $trackId;
$this->session->put('current_position', $position + 1);
$this->session->put('track_id', $track['id']);
$this->session->put('track_history', $trackHistory);
$this->session->put('playlist-num', $playlistNum);
$stream = [
'url' => $track['streams']['mp3'],
'token' => $track['id'],
'offsetInMilliseconds' => 0,
];
if (!$replace) {
$stream['expectedPreviousToken'] = $trackId;
}
return [
'version' => '1.0',
'sessionAttributes' => (object)[],
@ -132,15 +242,48 @@ class AlexaController extends Controller
'directives' => [
[
'type' => 'AudioPlayer.Play',
'playBehavior' => 'ENQUEUE',
'playBehavior' => $replace ? 'REPLACE_ALL' : 'ENQUEUE',
'audioItem' => [
'stream' => [
'url' => 'https://pony.fm/t13840/stream.mp3',
'token' => 't13840',
'expectedPreviousToken' => 'fma',
'offsetInMilliseconds' => 0,
'stream' => $stream,
],
],
]
],
];
}
public function previousTrack()
{
$trackId = $this->session->get('track_id');
$position = $this->session->get('current_position', 1);
$trackHistory = $this->session->get('track_history', []);
$playlist = $this->session->get('playlist', []);
$track = $playlist[$position-2];
$trackHistory[] = $trackId;
$this->session->put('current_position', $position - 1);
$this->session->put('track_id', $track['id']);
$this->session->put('track_history', $trackHistory);
$stream = [
'url' => $track['streams']['mp3'],
'token' => $track['id'],
'offsetInMilliseconds' => 0,
];
return [
'version' => '1.0',
'sessionAttributes' => (object)[],
'response' => [
'directives' => [
[
'type' => 'AudioPlayer.Play',
'playBehavior' => 'REPLACE_ALL',
'audioItem' => [
'stream' => $stream,
],
],
]
],

30
app/Models/AlexaSession.php Normal file
View file

@ -0,0 +1,30 @@
<?php
namespace Poniverse\Ponyfm\Models;
use Illuminate\Database\Eloquent\Model;
class AlexaSession extends Model
{
public $incrementing = false;
protected $table = 'alexa_session';
protected $casts = [
'payload' => 'array'
];
public function put($key, $value)
{
$payload = $this->payload;
$payload[$key] = $value;
$this->payload = $payload;
}
public function get($key, $default = null)
{
return $this->payload[$key] ?? $default;
}
}

7
app/Models/Track.php
View file

@ -287,12 +287,12 @@ class Track extends Model implements Searchable, Commentable, Favouritable
* @param integer $count
* @return array
*/
public static function popular($count, $allowExplicit = false)
public static function popular($count, $allowExplicit = false, $skip = 0)
{
$trackIds = Cache::remember(
'popular_tracks'.$count.'-'.($allowExplicit ? 'explicit' : 'safe'),
5,
function () use ($allowExplicit, $count) {
function () use ($allowExplicit, $count, $skip) {
$query = static
::published()
->listed()
@ -308,6 +308,7 @@ class Track extends Model implements Searchable, Commentable, Favouritable
)
->groupBy(['id', 'track_id'])
->orderBy('plays', 'desc')
->skip($skip)
->take($count);
if (!$allowExplicit) {
@ -455,7 +456,7 @@ class Track extends Model implements Searchable, Commentable, Favouritable
'original' => $track->getCoverUrl(Image::ORIGINAL)
],
'streams' => [
'mp3' => $track->getStreamUrl('MP3'),
'mp3' => str_replace('http://adamlav.in', 'https://pony.fm', str_replace('http://ponyfm-dev.poni','https://pony.fm', $track->getStreamUrl('MP3'))),
'aac' => (!Config::get('app.debug') || is_file($track->getFileFor('AAC'))) ? $track->getStreamUrl('AAC') : null,
'ogg' => (Config::get('app.debug') || is_file($track->getFileFor('OGG Vorbis'))) ? $track->getStreamUrl('OGG Vorbis') : null
],

33
database/migrations/2016_09_30_202330_create_alexa_session.php Normal file
View file

@ -0,0 +1,33 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateAlexaSession extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('alexa_session', function(Blueprint $table)
{
$table->string('id')->unique();
$table->text('payload');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('alexa_session');
}
}