New: Use job queue instead of while loop

Classes/Exception/FilePreviewException.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Unikka\FilePreviews\Exception;
+
+/*
+ * This file is part of the  Unikka.FilePreviews package.
+ *
+ * (c) Contributors to the package
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Neos\Flow\Exception as FlowException;
+
+/**
+ * A generic FilePreview Exception
+ */
+class FilePreviewException extends FlowException
+{
+}

Classes/Service/ThumbnailGenerator.php

@@ -20,13 +20,16 @@
 use Neos\Utility\Arrays;
 use Psr\Log\LoggerInterface;
 use Flowpack\JobQueue\Common\Annotations as Job;
+use Unikka\FilePreviews\Exception\FilePreviewException;
 
 /**
  * File Previews Client Service
  */
 class ThumbnailGenerator
 {
     const API_STATUS_PENDING = 'pending';
+    const API_STATUS_FAILURE = 'failure';
+    const API_STATUS_SUCCESS = 'success';
 
     /**
      * @var ResourceManager
@@ -86,28 +89,26 @@ public function submitThumbnailToFilePreviewApi($thumbnail)
      * @param Thumbnail $thumbnail
      * @return void
      * @throws Exception
+     * @throws FilePreviewException
+     * @throws \Neos\Flow\Persistence\Exception\IllegalObjectTypeException
      * @throws \Neos\Flow\ResourceManagement\Exception
      */
     public function fetchThumbnailFromFilePreviewApi($previewIdentifier, Thumbnail $thumbnail)
     {
-        $success = false;
-        $elapsedTime = 0;
-        $maximumWaitingTime = (integer)$this->settings['maximumWaitingTime'];
-        $retryInterval = (integer)$this->settings['retryInterval'];
-        while ($success === false) {
-            if ($elapsedTime >= $maximumWaitingTime) {
-                break;
-            }
-            $previewApiClient = $this->getApiClient();
-            $response = $previewApiClient->retrieve($previewIdentifier);
-
-            $success = $response->status === 'success';
-            sleep($retryInterval);
-            $elapsedTime = $elapsedTime + $retryInterval;
+        $previewApiClient = $this->getApiClient();
+        $response = $previewApiClient->retrieve($previewIdentifier);
+
+        if ($response->status === self::API_STATUS_FAILURE) {
+            $message = sprintf(
+                'FilePreview.io was unable to generate thumbnail for the given reason: %s (%s)',
+                $response->error->message,
+                $response->error->code
+            );
+            throw new FilePreviewException($message, 1594730717);
         }
 
-        if ($success === false || !isset($response->thumbnails[0])) {
-            throw new Exception('Unable to process the thumbnail is less than 20 seconds, sorry', 1447891433);
+        if ($response->status !== self::API_STATUS_SUCCESS || !isset($response->thumbnails[0])) {
+            throw new Exception('Unable to process the thumbnail', 1594729983);
         }
 
         $url = $response->thumbnails[0]->url;

Configuration/Settings.yaml

@@ -2,8 +2,6 @@ Unikka:
   FilePreviews:
     apiKey: 'sQjSRy8WGaWo6d5dCDcGQ8Su1OxFY3'
     apiSecret: 'f6VtvhwxhIX3HxBINlM9yxLQZ1rzHi'
-    maximumWaitingTime: 30
-    retryInterval: 15
     defaultOptions:
       format: 'jpg'
 
@@ -25,7 +23,7 @@ Flowpack:
           maximumNumberOfReleases: 3
           executeIsolated: true
           options:
-            defaultTimeout: 50
+            defaultTimeout: 30
           releaseOptions:
             priority: 512
-            delay: 120
+            delay: 15

README.md

@@ -19,8 +19,6 @@ Unikka:
   FilePreviews:
     apiKey: 'key'
     apiSecret: 'secret'
-    maximumWaitingTime: 30
-    retryInterval: 15
     defaultOptions:
       format: 'jpg'
 ```