🐛 向主控同步文件时不带token

Author: Mxmilu666

inc/cluster.php

@@ -116,7 +116,7 @@ class download {
     private $maxConcurrent;
     private $semaphore;
 
-    public function __construct($filesList, $maxConcurrent = 1) {
+    public function __construct($filesList = [], $maxConcurrent = 1) {
         $this->filesList = $filesList;
         $this->maxConcurrent = $maxConcurrent;
         $this->semaphore = new Swoole\Coroutine\Channel($maxConcurrent);
@@ -239,6 +239,34 @@ public function downloadFiles() {
         $bar->display();
         $bar->end();
     }
+
+    private function downloadnopoen($hash) {
+        global $DOWNLOAD_DIR;
+        global $tokendata;
+        $filePath = $DOWNLOAD_DIR . '/' . substr($hash, 0, 2) . '/';
+        if (!file_exists($filePath)) {
+            mkdir($filePath, 0777, true);
+        }
+        $filepath = "/openbmclapi/download/{$hash}?noopen=1"
+        $client = new Swoole\Coroutine\Http\Client('openbmclapi.bangbang93.com', 443, true);
+        $client->set([
+            'timeout' => -1
+        ]);
+        $client->setHeaders([
+            'Host' => 'openbmclapi.bangbang93.com',
+            'User-Agent' => USERAGENT,
+            'Accept' => '*/*',
+            'Authorization' => "Bearer {$tokendata['token']}"
+        ]);
+        $downloader = $client->download($filepath,$DOWNLOAD_DIR.'/'.substr($hash, 0, 2).'/'.$hash);
+        if (!$downloader) {
+            mlog("Error download to the main control:{$client->errMsg}",2);
+            return false;
+        } 
+        else($client->statusCode == "200"){
+            return true;
+        }
+    }
 }
 
 class FilesCheck {

inc/server.php

@@ -46,14 +46,8 @@ public function startserver() {
                 $filepath = $this->dir.'/'.substr($downloadhash, 0, 2).'/'.$downloadhash;
                 if ($this->check_sign($downloadhash, $this->secret, $allurl['s'], $allurl['e'])){
                     if (!file_exists($filepath)) {
-                        $Missfile[] = new BMCLAPIFile(
-                            '/openbmclapi/download/'.$downloadhash,
-                            $downloadhash,
-                            $downloadhash,
-                            $downloadhash
-                        );
-                        $download = new download($Missfile);
-                        $download->downloadFiles();
+                        $download = new download();
+                        $download->downloadnopoen($downloadhash);
                     }
                     if(isset($request->header['range'])){
                         preg_match('/bytes=(\d+)-(\d+)?/', $request->header['range'], $matches);
@@ -72,6 +66,7 @@ public function startserver() {
                         }
                         $code = 206;
                         $response->header('Content-Type', 'application/octet-stream');
+                        $response->header('Content-Type', 'application/octet-stream');
                         $response->sendfile($filepath,$start_byte,$length);
                     }
                     else{
@@ -83,6 +78,7 @@ public function startserver() {
                         }
                         $code = 200;
                         $response->header('Content-Type', 'application/octet-stream');
+                        $response->header('Content-Type', 'application/octet-stream');
                         $response->sendfile($filepath);
                     }
                 }

inc/socketio.php

@@ -172,9 +172,12 @@ public function IsTime($inputString) {
     }
 
     public function disable() {
-        $this->ack("disable");
-        Coroutine::sleep(2);
+        global $enable;
+        if ($enable;){
+            $this->ack("disable");
+            Coroutine::sleep(2);
+        }
         mlog("[socket.io]Close Connection");
-        $client->close();
+        $this->$client->close();
     }
 }