Skip to content
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

fix an issue where trying to upload large transcoded videos to the cloud would fail #68

Merged
merged 8 commits into from
Jul 26, 2024
Merged

fix an issue where trying to upload large transcoded videos to the cloud would fail #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
888c3d7
fix an issue where trying to upload large transcoded videos to the cl…
mszulik Jul 25, 2024
49999dd
remove obsolete CloudStorage helper
mszulik Jul 25, 2024
05789e2
fix an issue where files were falsely deleted
mszulik Jul 25, 2024
78e9454
create a pr image when labeling with pullpreview
mszulik Jul 25, 2024
9f39f0b
add some debug logging
mszulik Jul 25, 2024
e1db7d9
make logs more specific
mszulik Jul 25, 2024
1a8bb40
add more logs
mszulik Jul 25, 2024
91f9a6e
Update app/Jobs/TranscodeVideo.php
gael-connan-cybex Jul 25, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Docker Image CI
on:
release:
types: [ published ]
pull_request:
types: [ labeled, synchronize, closed ]

jobs:
build-push-docker-image:
Expand Down
11 changes: 0 additions & 11 deletions .phpstorm.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -394,7 +393,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -612,7 +610,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -830,7 +827,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -1048,7 +1044,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -1266,7 +1261,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -1484,7 +1478,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -1702,7 +1695,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -1920,7 +1912,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -2138,7 +2129,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down Expand Up @@ -2356,7 +2346,6 @@
'cache.psr6' => \Symfony\Component\Cache\Adapter\Psr16Adapter::class,
'cache.store' => \Illuminate\Cache\Repository::class,
'cdn' => \App\Helpers\CloudFrontHelper::class,
'cloud.storage' => \App\Helpers\PhpFfmpegVideoStreaming\S3Helper::class,
'command.ide-helper.eloquent' => \Barryvdh\LaravelIdeHelper\Console\EloquentCommand::class,
'command.ide-helper.generate' => \Barryvdh\LaravelIdeHelper\Console\GeneratorCommand::class,
'command.ide-helper.meta' => \Barryvdh\LaravelIdeHelper\Console\MetaCommand::class,
Expand Down
99 changes: 65 additions & 34 deletions _ide_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/**
* A helper file for Laravel, to provide autocomplete information to your IDE
* Generated for Laravel 11.5.0.
* Generated for Laravel 11.7.0.
*
* This file should not be included in your code, only analyzed by your IDE!
*
Expand Down Expand Up @@ -18036,34 +18036,6 @@
/**
*
*
*/ class CloudStorageFacade {
/**
* Returns the configuration for opening data from the cloud storage.
*
* @param string $key
* @return array
* @static
*/ public static function getOpenConfiguration($key)
{
/** @var \App\Helpers\PhpFfmpegVideoStreaming\S3Helper $instance */
return $instance->getOpenConfiguration($key);
}
/**
* Returns the configuration for saving data to the cloud storage.
*
* @param string $destinationPath
* @param string $fileName
* @return array
* @static
*/ public static function getSaveConfiguration($destinationPath, $fileName)
{
/** @var \App\Helpers\PhpFfmpegVideoStreaming\S3Helper $instance */
return $instance->getSaveConfiguration($destinationPath, $fileName);
}
}
/**
*
*
*/ class TranscodeFacade {
/**
* Returns the class which handles the actual transcoding.
Expand Down Expand Up @@ -18853,10 +18825,10 @@
*
*
* @static
*/ public static function registerErrorHandler()
*/ public static function registerErrorHandler($errorLevels = null)
{
/** @var \Spatie\FlareClient\Flare $instance */
return $instance->registerErrorHandler();
return $instance->registerErrorHandler($errorLevels);
}
/**
*
Expand Down Expand Up @@ -18924,10 +18896,19 @@
*
*
* @static
*/ public static function report($throwable, $callback = null, $report = null)
*/ public static function report($throwable, $callback = null, $report = null, $handled = null)
{
/** @var \Spatie\FlareClient\Flare $instance */
return $instance->report($throwable, $callback, $report, $handled);
}
/**
*
*
* @static
*/ public static function reportHandled($throwable)
{
/** @var \Spatie\FlareClient\Flare $instance */
return $instance->report($throwable, $callback, $report);
return $instance->reportHandled($throwable);
}
/**
*
Expand Down Expand Up @@ -21581,6 +21562,57 @@ class Eloquent extends \Illuminate\Database\Eloquent\Model {
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereJsonDoesntContain($column, $value);
}
/**
* Add a "where JSON overlaps" clause to the query.
*
* @param string $column
* @param mixed $value
* @param string $boolean
* @param bool $not
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function whereJsonOverlaps($column, $value, $boolean = 'and', $not = false)
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->whereJsonOverlaps($column, $value, $boolean, $not);
}
/**
* Add an "or where JSON overlaps" clause to the query.
*
* @param string $column
* @param mixed $value
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function orWhereJsonOverlaps($column, $value)
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereJsonOverlaps($column, $value);
}
/**
* Add a "where JSON not overlap" clause to the query.
*
* @param string $column
* @param mixed $value
* @param string $boolean
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function whereJsonDoesntOverlap($column, $value, $boolean = 'and')
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->whereJsonDoesntOverlap($column, $value, $boolean);
}
/**
* Add an "or where JSON not overlap" clause to the query.
*
* @param string $column
* @param mixed $value
* @return \Illuminate\Database\Query\Builder
* @static
*/ public static function orWhereJsonDoesntOverlap($column, $value)
{
/** @var \Illuminate\Database\Query\Builder $instance */
return $instance->orWhereJsonDoesntOverlap($column, $value);
}
/**
* Add a clause that determines if a JSON path exists to the query.
Expand Down Expand Up @@ -22717,7 +22749,6 @@ class Validator extends \Illuminate\Support\Facades\Validator {}
class View extends \Illuminate\Support\Facades\View {}
class Vite extends \Illuminate\Support\Facades\Vite {}
class CdnHelper extends \App\Facades\CdnHelperFacade {}
class CloudStorage extends \App\Facades\CloudStorageFacade {}
class InterventionImage extends \Intervention\Image\Facades\Image {}
class Transcode extends \App\Facades\TranscodeFacade {}
class Transform extends \App\Facades\TransformFacade {}
Expand Down
2 changes: 2 additions & 0 deletions app/Classes/MediaHandler/VideoHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ class VideoHandler implements MediaHandlerInterface
*/
public function handleSavedFile(string $basePath, UploadSlot $uploadSlot, Version $version): ResponseState
{
\Log::info(sprintf('Dispatching transcoding job for media %s and version %s.', $version->Media->identifier, $version->getKey()));
$success = Transcode::createJob($version, $uploadSlot);
\Log::info(sprintf('Transcoding job dispatched with result %s for media %s and version %s.', $success, $version->Media->identifier, $version->getKey()));

return $success ? ResponseState::VIDEO_UPLOAD_SUCCESSFUL : ResponseState::TRANSCODING_JOB_DISPATCH_FAILED;
}
Expand Down
1 change: 1 addition & 0 deletions app/Classes/Transcode.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public function callback(ResponseState $responseState, string $uploadToken, Medi

$signedNotification = SodiumHelper::sign(json_encode($notification));

\Log::info(sprintf('Sending signed notification with state %s to client package for media %s and version %s, message: %s.', $responseState->getState()->value, $media->identifier, Version::whereNumber($versionNumber)->first()?->getKey(), $responseState->getMessage()));
Http::post($media->User->api_url, ['signed_notification' => $signedNotification]);
}
}
18 changes: 0 additions & 18 deletions app/Facades/CloudStorageFacade.php
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions app/Helpers/PhpFfmpegVideoStreaming/S3Helper.php
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions app/Http/Controllers/V1/UploadSlotController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ protected function saveFile(UploadedFile $uploadedFile, UploadSlot $uploadSlot,
$version->update(['filename' => $version->createOriginalFileName($uploadedFile->getClientOriginalName())]);

if (MediaStorage::ORIGINALS->getDisk()->putFileAs($basePath, $uploadedFile, $version->filename)) {
\Log::info(sprintf('File for media %s and version %s saved successfully.', $media->identifier, $version->number));
$responseState = $type->handler()->handleSavedFile($basePath, $uploadSlot, $version);
} else {
\Log::error(sprintf('Could not write file for media %s and version %s.', $media->identifier, $version->number));
$responseState = ResponseState::WRITE_FAILED;
}

Expand Down
25 changes: 0 additions & 25 deletions app/Interfaces/CloudStorageInterface.php
View file
Open in desktop

This file was deleted.

Loading