Merge pull request #1001 from phaizullin/5.x

Fix resumable upload error "There was a problem uploading your video"

Author: yguedidi

CHANGELOG.md

@@ -10,6 +10,7 @@ Version 5 of the Facebook PHP SDK is a complete refactor of version 4. It comes
   - Add `joined` to list of fields to be cast to `\DateTime` (#950)
   - Add `GraphPage::getFanCount()` to get the number of people who like the page (#815)
   - Fixed HTTP/2 support (#1079)
+  - Fixed resumable upload error (#1001)
 - 5.6.3 (2018-07-01)
   - Add fix for countable error in PHP 7.2 (originally #969 by @andreybolonin)
 - 5.6.2 (2018-02-15)

src/Facebook/Exceptions/FacebookResponseException.php

@@ -90,11 +90,20 @@ public static function create(FacebookResponse $response)
                 // Video upload resumable error
                 case 1363030:
                 case 1363019:
-                case 1363037:
                 case 1363033:
                 case 1363021:
                 case 1363041:
                     return new static($response, new FacebookResumableUploadException($message, $code));
+                case 1363037:
+                    $previousException = new FacebookResumableUploadException($message, $code);
+
+                    $startOffset = isset($data['error']['error_data']['start_offset']) ? (int) $data['error']['error_data']['start_offset'] : null;
+                    $previousException->setStartOffset($startOffset);
+
+                    $endOffset = isset($data['error']['error_data']['end_offset']) ? (int) $data['error']['error_data']['end_offset'] : null;
+                    $previousException->setEndOffset($endOffset);
+
+                    return new static($response, $previousException);
             }
         }
 

src/Facebook/Exceptions/FacebookResumableUploadException.php

@@ -30,4 +30,39 @@
  */
 class FacebookResumableUploadException extends FacebookSDKException
 {
+    protected $startOffset;
+
+    protected $endOffset;
+
+    /**
+     * @return int|null
+     */
+    public function getStartOffset()
+    {
+        return $this->startOffset;
+    }
+
+    /**
+     * @param int|null $startOffset
+     */
+    public function setStartOffset($startOffset)
+    {
+        $this->startOffset = $startOffset;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getEndOffset()
+    {
+        return $this->endOffset;
+    }
+
+    /**
+     * @param int|null $endOffset
+     */
+    public function setEndOffset($endOffset)
+    {
+        $this->endOffset = $endOffset;
+    }
 }

src/Facebook/FileUpload/FacebookResumableUploader.php

@@ -121,6 +121,16 @@ public function transfer($endpoint, FacebookTransferChunk $chunk, $allowToThrow
                 throw $e;
             }
 
+            if (null !== $preException->getStartOffset() && null !== $preException->getEndOffset()) {
+                return new FacebookTransferChunk(
+                    $chunk->getFile(),
+                    $chunk->getUploadSessionId(),
+                    $chunk->getVideoId(),
+                    $preException->getStartOffset(),
+                    $preException->getEndOffset()
+                );
+            }
+
             // Return the same chunk entity so it can be retried.
             return $chunk;
         }

src/Facebook/FileUpload/FacebookTransferChunk.php

@@ -121,6 +121,14 @@ public function getStartOffset()
         return $this->startOffset;
     }
 
+    /**
+     * @return int
+     */
+    public function getEndOffset()
+    {
+        return $this->endOffset;
+    }
+
     /**
      * Get uploaded video Id
      *

tests/FileUpload/FacebookResumableUploaderTest.php

@@ -98,4 +98,15 @@ public function testFailedResumableTransferWillNotThrowAndReturnSameChunk()
         $newChunk = $uploader->transfer('/me/videos', $chunk);
         $this->assertSame($newChunk, $chunk);
     }
+
+    public function testFailedResumableTransferWillNotThrowAndReturnNewChunk()
+    {
+        $this->graphApi->failOnTransferAndUploadNewChunk();
+        $uploader = new FacebookResumableUploader($this->fbApp, $this->client, 'access_token', 'v2.4');
+
+        $chunk = new FacebookTransferChunk($this->file, '1', '2', '3', '4');
+        $newChunk = $uploader->transfer('/me/videos', $chunk);
+        $this->assertEquals(40, $newChunk->getStartOffset());
+        $this->assertEquals(50, $newChunk->getEndOffset());
+    }
 }

tests/Fixtures/FakeGraphApiForResumableUpload.php

@@ -42,6 +42,11 @@ public function failOnTransfer()
         $this->respondWith = 'FAIL_ON_TRANSFER';
     }
 
+    public function failOnTransferAndUploadNewChunk()
+    {
+        $this->respondWith = 'FAIL_ON_TRANSFER_AND_UPLOAD_NEW_CHUNK';
+    }
+
     public function send($url, $method, $body, array $headers, $timeOut)
     {
         // Could be start, transfer or finish
@@ -81,6 +86,15 @@ private function respondTransfer()
             );
         }
 
+        if ($this->respondWith == 'FAIL_ON_TRANSFER_AND_UPLOAD_NEW_CHUNK') {
+            return new GraphRawResponse(
+                "HTTP/1.1 500 OK\r\nFoo: Bar",
+                '{"error":{"message":"There was a problem uploading your video. Please try uploading it again.",' .
+                '"type":"OAuthException","code":6001,"error_subcode":1363037,' .
+                '"error_data":{"start_offset":40,"end_offset":50}}}'
+            );
+        }
+
         switch ($this->transferCount) {
             case 0:
                 $data = ['start_offset' => 20, 'end_offset' => 40];