(feat) Add support for uploads via form data

This makes it possible to upload the local file directly, without the need for the file to be public.
DeuxHuitHuit · Oct 16, 2023 · a2ee9b2 · a2ee9b2
1 parent 7d055b0
commit a2ee9b2
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 7 deletions.
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -88,6 +88,7 @@ public function autoUpload(\craft\events\ModelEvent $event)
             'elementId' => $asset->id,
             'videoUrl' => $asset->getUrl(),
             'videoName' => $asset->filename,
+            'videoPath' => $asset->getFs()->rootPath,
         ]);
         \Craft::$app->getQueue()->push($uploadJob);
     }

diff --git a/src/client/CloudflareVideoStreamClient.php b/src/client/CloudflareVideoStreamClient.php
@@ -2,6 +2,7 @@
 
 namespace deuxhuithuit\cfstream\client;
 
+use Exception;
 use GuzzleHttp;
 
 class CloudflareVideoStreamClient
@@ -12,15 +13,15 @@ class CloudflareVideoStreamClient
     public function __construct(\deuxhuithuit\cfstream\models\Settings $config)
     {
         if (!$config->getApiToken()) {
-            throw new \Error('No API token found');
+            throw new Exception('No API token found');
         }
         if (!$config->getAccountId()) {
-            throw new \Error('No account ID found');
+            throw new Exception('No account ID found');
         }
         $this->config = $config;
     }
 
-    public function uploadVideo(string $videoUrl, string $videoName)
+    public function uploadVideoByUrl(string $videoUrl, string $videoName)
     {
         $client = new GuzzleHttp\Client();
         $accountId = $this->config->getAccountId();
@@ -46,6 +47,38 @@ public function uploadVideo(string $videoUrl, string $videoName)
         return $data['result'];
     }
 
+    public function uploadVideoByPath(string $videoPath, string $videoFilename)
+    {
+        $client = new GuzzleHttp\Client();
+        $accountId = $this->config->getAccountId();
+        $apiToken = $this->config->getApiToken();
+        $url = $this->baseUrl . $accountId . '/stream';
+        $uploadRes = $client->request('POST', $url, [
+            'headers' => [
+                'Authorization' => 'Bearer ' . $apiToken,
+            ],
+            'multipart' => [
+                [
+                    'name'     => 'file',
+                    'contents' => fopen($videoPath . '/' . $videoFilename, 'r'),
+                    'filename' => $videoFilename,
+                ]
+            ],
+            'http_errors' => false,
+        ]);
+
+        if ($uploadRes->getStatusCode() !== 200) {
+            return [
+                'error' => 'Error uploading video',
+                'message' => $uploadRes->getBody(),
+            ];
+        }
+
+        $data = json_decode($uploadRes->getBody(), true);
+
+        return $data['result'];
+    }
+
     public function getVideo(string $videoUid)
     {
         $client = new GuzzleHttp\Client();

diff --git a/src/controllers/ReuploadController.php b/src/controllers/ReuploadController.php
@@ -43,6 +43,7 @@ public function actionReupload(): int
                             'elementId' => $asset->id,
                             'videoUrl' => $asset->getUrl(),
                             'videoName' => $asset->title ?? $asset->filename,
+                            'videoPath' => $asset->getFs()->rootPath,
                         ]);
                         \Craft::$app->getQueue()->push($uploadJob);
                         ++$uploadCount;

diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -46,6 +46,7 @@ public function actionUpload()
             'elementId' => $elementId,
             'videoUrl' => $videoUrl,
             'videoName' => $videoName,
+            'videoPath' => $asset->getFs()->rootPath,
         ]);
         \Craft::$app->getQueue()->push($uploadJob);
         $element->setFieldValue($fieldHandle, ['readyToStream' => false]);

diff --git a/src/jobs/DeleteVideoJob.php b/src/jobs/DeleteVideoJob.php
@@ -12,6 +12,11 @@ class DeleteVideoJob extends BaseJob
     public $elementId;
     public $videoUid;
 
+    public function getTtr()
+    {
+        return 30; // 30 seconds
+    }
+
     public function execute($queue): void
     {
         $this->setProgress($queue, 0, 'Validating job data');

diff --git a/src/jobs/PollVideoJob.php b/src/jobs/PollVideoJob.php
@@ -14,6 +14,16 @@ class PollVideoJob extends BaseJob
     public $lastResult;
     public $attempts = 0;
 
+    private function delay()
+    {
+        return $this->attempts * 2;
+    }
+
+    public function getTtr()
+    {
+        return 10 + $this->delay();
+    }
+
     public function execute($queue): void
     {
         $this->setProgress($queue, 0, 'Validating job data');
@@ -80,7 +90,7 @@ public function execute($queue): void
             $this->setProgress($queue, 0, 'Delayed retry');
             // Retry the job after x * 2 seconds
             $this->lastResult = $result;
-            $queue->delay($this->attempts * 2)->push($this);
+            $queue->delay($this->delay())->push($this);
         }
     }
 

diff --git a/src/jobs/UploadVideoJob.php b/src/jobs/UploadVideoJob.php
@@ -5,6 +5,7 @@
 use craft\queue\BaseJob;
 use deuxhuithuit\cfstream\client\CloudflareVideoStreamClient;
 use deuxhuithuit\cfstream\fields\CloudflareVideoStreamField;
+use deuxhuithuit\cfstream\models\Settings;
 
 // TODO: Make cancellable, to cancel the upload if the asset is deleted
 class UploadVideoJob extends BaseJob implements \yii\queue\RetryableJobInterface
@@ -13,6 +14,7 @@ class UploadVideoJob extends BaseJob implements \yii\queue\RetryableJobInterface
     public $elementId;
     public $videoUrl;
     public $videoName;
+    public $videoPath;
 
     public function getTtr()
     {
@@ -55,8 +57,15 @@ public function execute($queue): void
 
         $this->setProgress($queue, 0.2, 'Uploading video to Cloudflare Stream');
 
-        $client = new CloudflareVideoStreamClient(\deuxhuithuit\cfstream\Plugin::getInstance()->getSettings());
-        $result = $client->uploadVideo($this->videoUrl, $this->videoName);
+        /** @var Settings */
+        $settings = \deuxhuithuit\cfstream\Plugin::getInstance()->getSettings();
+        $client = new CloudflareVideoStreamClient($settings);
+        $result = null;
+        if ($settings->isUsingFormUpload()) {
+            $result = $client->uploadVideoByPath($this->videoPath, basename($this->videoUrl));
+        } else {
+            $result = $client->uploadVideoByUrl($this->videoUrl, $this->videoName);
+        }
 
         $this->setProgress($queue, 0.3, 'Uploading request returned');
 

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -9,17 +9,21 @@ class Settings extends Model
 {
     public $accountId = '';
     public $apiToken = '';
-
     /**
      * @var bool
      */
     public $autoUpload = false;
+    /**
+     * @var bool
+     */
+    public $useFormUpload = false;
 
     public function defineRules(): array
     {
         return [
             [['accountId', 'apiToken'], 'required'],
             ['autoUpload', 'boolean'],
+            ['useFormUpload', 'boolean']
         ];
     }
 
@@ -37,4 +41,9 @@ public function isAutoUpload(): bool
     {
         return $this->autoUpload == 1 || $this->autoUpload == true;
     }
+
+    public function isUsingFormUpload(): bool
+    {
+        return $this->useFormUpload == 1 || $this->useFormUpload == true;
+    }
 }
diff --git a/src/templates/settings.twig b/src/templates/settings.twig
@@ -24,3 +24,11 @@
   name: 'autoUpload',
   on: settings.autoUpload,
 }) }}
+
+<br/>
+
+{{ forms.lightswitch({
+  label: 'Upload videos to Cloudflare Stream usign form data instead of via the asset`s url'|t('cloudflare-stream'),
+  name: 'useFormUpload',
+  on: settings.useFormUpload,
+}) }}