Add laravel vapor support

composer.json

@@ -31,6 +31,9 @@
         "phpunit/phpunit": "~9",
         "friendsofphp/php-cs-fixer": "^3.2"
     },
+    "suggest": {
+        "laravel/vapor-core": "Allows SQS disk based storage while using Laravel Vapor."
+    },
     "autoload": {
         "psr-4": {
             "SimpleSoftwareIO\\SqsDisk\\": "src"

src/SqsDiskBaseJob.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace SimpleSoftwareIO\SqsDisk;
+
+use Aws\Sqs\SqsClient;
+use Illuminate\Support\Arr;
+use Illuminate\Container\Container;
+
+trait SqsDiskBaseJob
+{
+    use ResolvesPointers;
+
+    /**
+     * The Amazon SQS client instance.
+     *
+     * @var \Aws\Sqs\SqsClient
+     */
+    protected $sqs;
+
+    /**
+     * The Amazon SQS job instance.
+     *
+     * @var array
+     */
+    protected $job;
+
+    /**
+     * Holds the raw body to prevent fetching the file from
+     * the disk multiple times.
+     *
+     * @var string
+     */
+    protected $cachedRawBody;
+
+    /**
+     * The disk options for the job.
+     *
+     * @var array
+     */
+    protected $diskOptions;
+
+    /**
+     * Create a new job instance.
+     *
+     * @param  \Illuminate\Container\Container  $container
+     * @param  \Aws\Sqs\SqsClient  $sqs
+     * @param  array  $job
+     * @param  string  $connectionName
+     * @param  string  $queue
+     *
+     * @return void
+     */
+    public function __construct(Container $container, SqsClient $sqs, array $job, $connectionName, $queue, array $diskOptions)
+    {
+        $this->sqs = $sqs;
+        $this->job = $job;
+        $this->queue = $queue;
+        $this->container = $container;
+        $this->connectionName = $connectionName;
+        $this->diskOptions = $diskOptions;
+    }
+
+    /**
+     * Delete the job from the queue.
+     *
+     * @return void
+     */
+    public function delete()
+    {
+        parent::delete();
+
+        if (Arr::get($this->diskOptions, 'cleanup') && $pointer = $this->resolvePointer()) {
+            $this->resolveDisk()->delete($pointer);
+        }
+    }
+
+    /**
+     * Get the raw body string for the job.
+     *
+     * @return string
+     */
+    public function getRawBody()
+    {
+        if ($this->cachedRawBody) {
+            return $this->cachedRawBody;
+        }
+
+        if ($pointer = $this->resolvePointer()) {
+            return $this->cachedRawBody = $this->resolveDisk()->get($pointer);
+        }
+
+        return parent::getRawBody();
+    }
+}

src/SqsDiskJob.php

@@ -2,95 +2,10 @@
 
 namespace SimpleSoftwareIO\SqsDisk;
 
-use Aws\Sqs\SqsClient;
-use Illuminate\Support\Arr;
 use Illuminate\Queue\Jobs\SqsJob;
-use Illuminate\Container\Container;
 use Illuminate\Contracts\Queue\Job as JobContract;
 
 class SqsDiskJob extends SqsJob implements JobContract
 {
-    use ResolvesPointers;
-
-    /**
-     * The Amazon SQS client instance.
-     *
-     * @var \Aws\Sqs\SqsClient
-     */
-    protected $sqs;
-
-    /**
-     * The Amazon SQS job instance.
-     *
-     * @var array
-     */
-    protected $job;
-
-    /**
-     * Holds the raw body to prevent fetching the file from
-     * the disk multiple times.
-     *
-     * @var string
-     */
-    protected $cachedRawBody;
-
-    /**
-     * The disk options for the job.
-     *
-     * @var array
-     */
-    protected $diskOptions;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param  \Illuminate\Container\Container  $container
-     * @param  \Aws\Sqs\SqsClient  $sqs
-     * @param  array  $job
-     * @param  string  $connectionName
-     * @param  string  $queue
-     *
-     * @return void
-     */
-    public function __construct(Container $container, SqsClient $sqs, array $job, $connectionName, $queue, array $diskOptions)
-    {
-        $this->sqs = $sqs;
-        $this->job = $job;
-        $this->queue = $queue;
-        $this->container = $container;
-        $this->connectionName = $connectionName;
-        $this->diskOptions = $diskOptions;
-    }
-
-    /**
-     * Delete the job from the queue.
-     *
-     * @return void
-     */
-    public function delete()
-    {
-        parent::delete();
-
-        if (Arr::get($this->diskOptions, 'cleanup') && $pointer = $this->resolvePointer()) {
-            $this->resolveDisk()->delete($pointer);
-        }
-    }
-
-    /**
-     * Get the raw body string for the job.
-     *
-     * @return string
-     */
-    public function getRawBody()
-    {
-        if ($this->cachedRawBody) {
-            return $this->cachedRawBody;
-        }
-
-        if ($pointer = $this->resolvePointer()) {
-            return $this->cachedRawBody = $this->resolveDisk()->get($pointer);
-        }
-
-        return parent::getRawBody();
-    }
+    use SqsDiskBaseJob;
 }

src/SqsDiskServiceProvider.php

@@ -13,5 +13,7 @@ public function boot()
     {
         $manager = $this->app->make('queue');
         $manager->addConnector('sqs-disk', fn () => new SqsDiskConnector());
+
+        $this->app->extend('command.vapor.work', fn () => new VaporWorkCommand($this->app['queue.vaporWorker']));
     }
 }

src/VaporSqsDiskJob.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace SimpleSoftwareIO\SqsDisk;
+
+use Laravel\Vapor\Queue\VaporJob;
+use Illuminate\Contracts\Queue\Job as JobContract;
+
+class VaporSqsDiskJob extends VaporJob implements JobContract
+{
+    use SqsDiskBaseJob;
+}

src/VaporWorkCommand.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace SimpleSoftwareIO\SqsDisk;
+
+use Laravel\Vapor\Console\Commands\VaporWorkCommand as LaravelVaporWorkCommand;
+
+class VaporWorkCommand extends LaravelVaporWorkCommand
+{
+    /**
+     * Marshal the job with the given message ID.
+     *
+     * @param  array  $message
+     *
+     * @return \Laravel\Vapor\Queue\VaporJob
+     */
+    protected function marshalJob(array $message)
+    {
+        $normalizedMessage = $this->normalizeMessage($message);
+
+        $queue = $this->worker->getManager()->connection('sqs');
+
+        return new SqsDiskJob(
+            $this->laravel,
+            $queue->getSqs(),
+            $normalizedMessage,
+            'sqs',
+            $this->queueUrl($message),
+            config('queue.connections.sqs.disk_options')
+        );
+    }
+}