StreamDriver ready

Author: brcontainer

.gitignore

@@ -46,3 +46,4 @@ Temporary Items
 .phpintel/
 .idea/
 .vscode/
+cache/*

src/Drivers/StreamDriver.php

@@ -78,41 +78,42 @@ public function exec($url, &$httpStatus, &$contentType, &$errorCode, &$errorMess
             $this->context = stream_context_create($options);
         }
 
-        $handle = fopen($url, 'r', false, $this->context);
+        $handle = fopen($url, 'rb', false, $this->context);
 
         if ($handle) {
             $temp = $this->proxy->getTemporary();
             $timeout = $this->timeout;
             $timedOut = false;
             $start = microtime(true);
 
-            $first = true;
-            $body = false;
+            $meta_data = stream_get_meta_data($handle);
 
-            while (feof($handle) === false) {
-                if ($timeout < (microtime(true) - $start)) {
-                    $timedOut = true;
-                    $errorCode = 0;
-                    $errorMessage = 'Connection timed out';
-                    break;
+            foreach ($meta_data['wrapper_data'] as $index => $header) {
+                if ($index === 0) {
+                    if (preg_match('#HTTP/\d+\.\d+\s+(\d+)#', $header, $match)) {
+                        $httpStatus = (int) $match;
+                    } else {
+                        $httpStatus = 0;
+                        $errorCode = 0;
+                        $errorMessage = 'Invalid response';
+                        break;
+                    }
+                } elseif (stripos($header, 'content-type:') === 0) {
+                    $contentType = substr($header, 13);
                 }
+            }
 
-                $content = fgets($handle, 4096);
-
-                if ($first) {
-                    $first = false;
-
-                    if (preg_match('#^HTTP/1\.\d\s+(\d{3})\s+#', $content, $match)) {
-                        $httpStatus = $match[1];
-                    } else {
+            if ($httpStatus !== 0) {
+                while (feof($handle) === false) {
+                    if ($timeout < (microtime(true) - $start)) {
+                        $timedOut = true;
+                        $errorCode = 0;
+                        $errorMessage = 'Connection timed out';
                         break;
                     }
-                } elseif ($body) {
+
+                    $content = fgets($handle, 4096);
                     fwrite($temp, $content);
-                } elseif (trim($content) === '') {
-                    $body = true;
-                } elseif (stripos($content, 'content-type:') === 0) {
-                    $contentType = trim($content);
                 }
             }
 

src/Proxy.php

@@ -250,8 +250,12 @@ public function response()
 
         $this->httpCache();
 
-        while(feof($this->temporary) === false) {
-            echo fgets($this->temporary, 4096);
+        $handle = $this->temporary;
+
+        rewind($handle);
+
+        while (feof($handle) === false) {
+            echo fgets($handle, 4096);
         }
     }
 
@@ -287,6 +291,8 @@ public function jsonp($callback, $public = false)
 
             $handle = $this->temporary;
 
+            rewind($handle);
+
             while (feof($handle) === false) {
                 $raw = fread($handle, 8151);
                 echo base64_encode($raw);