chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Add async activitypub delivery with timeout and concurrency settings

This commit is contained in:
Daniel Supernault 2019-03-07 22:38:07 -07:00
parent bcabf0c76c
commit fadfd8349b
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/Jobs/StatusPipeline/StatusActivityPubDeliver.php
View File

@ -13,6 +13,10 @@ use League\Fractal;
use League\Fractal\Serializer\ArraySerializer;
use App\Transformer\ActivityPub\Verb\CreateNote;
use App\Util\ActivityPub\Helpers;
use GuzzleHttp\Pool;
use GuzzleHttp\Client;
use GuzzleHttp\Promise;
use App\Util\ActivityPub\HttpSignature;
class StatusActivityPubDeliver implements ShouldQueue
{
@ -51,16 +55,45 @@ class StatusActivityPubDeliver implements ShouldQueue
}
$audience = $status->profile->getAudienceInbox();
if(empty($audience)) {
// Return on profiles with no remote followers
return;
}
$profile = $status->profile;
Cache::forget('status:transformer:media:attachments:'.$status->id);
$fractal = new Fractal\Manager();
$fractal->setSerializer(new ArraySerializer());
$resource = new Fractal\Resource\Item($status, new CreateNote());
$activity = $fractal->createData($resource)->toArray();
foreach($audience as $url) {
Helpers::sendSignedObject($profile, $url, $activity);
}
$payload = json_encode($activity);
$client = new Client([
'timeout' => config('pixelfed.ap_delivery_timeout')
]);
$requests = function() use ($client, $activity, $profile) {
foreach($audience as $url) {
$headers = HttpSignature::sign($profile, $url, $activity);
yield function() use ($client, $url, $activity) {
return $client->requestAsync('POST', $url, $headers, $activity);
};
}
};
$pool = new Pool($client, $requests, [
'concurrency' => config('pixelfed.ap_delivery_concurrency'),
'fulfilled' => function ($response, $index) {
},
'rejected' => function ($reason, $index) {
}
]);
$promise = $pool->promise();
$promise->wait();
}
}

2
config/pixelfed.php
View File

@ -262,4 +262,6 @@ return [
'enforce_account_limit' => env('LIMIT_ACCOUNT_SIZE', true),
'ap_inbox' => env('ACTIVITYPUB_INBOX', false),
'ap_shared' => env('ACTIVITYPUB_SHAREDINBOX', false),
'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0),
'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10)
];