+ Support for retries

src/Sqs/Connector.php

@@ -54,17 +54,12 @@ private function modifyPayload($payload, $class)
     {
         if (! is_array($payload)) $payload = json_decode($payload, true);
 
-        if(!array_key_exists('job', $payload) || !array_key_exists('data', $payload)){
+        $body = [
+          'job' => $class . '@handle',
+          'data' => json_decode($payload['Body'])
+        ];
 
-          $body = [
-              'job' => $class . '@handle',
-              'data' => json_decode($payload['Body']),
-              'was_plain' => true
-          ];
-
-          $payload['Body'] = json_encode($body);
-
-        }
+        $payload['Body'] = json_encode($body);
 
         return $payload;
     }

src/Sqs/Queue.php

@@ -45,21 +45,21 @@ private function getClass($queue = null)
             ? Config::get('sqs-plain.handlers')[$queue]
             : Config::get('sqs-plain.default-handler');
     }
-    
+
     /**
-     * Push a raw payload onto the queue.
-     *
-     * @param  string  $payload
-     * @param  string  $queue
-     * @param  array   $options
-     * @return mixed
+     * @param string $payload
+     * @param null $queue
+     * @param array $options
+     * @return mixed|null
      */
     public function pushRaw($payload, $queue = null, array $options = [])
     {
         $payload = json_decode($payload, true);
 
-        $response = $this->sqs->sendMessage(['QueueUrl' => $this->getQueue($queue), 'MessageBody' => array_key_exists('was_plain', $payload) ? json_encode($payload['data']) : json_encode($payload)]);
+        if (isset($payload['data']) && isset($payload['job'])) {
+            $payload = $payload['data'];
+        }
 
-        return $response->get('MessageId');
+        return parent::pushRaw(json_encode($payload), $queue, $options);
     }
 }