Improve async logic

Author: vekien

Diff for: cli

@@ -11,6 +11,10 @@ require __DIR__ . '/vendor/autoload.php';
 
 $api = new \Lodestone\Api();
 
+$start = microtime(true);
 print_r([
-    'results' => $api->character()->classjobs('7322082')
+    'results' => $api->character()->get('7322082')
 ]);
+$finish = microtime(true);
+
+echo "duration = ". ($finish - $start) ."ms";

Diff for: cli_async

@@ -7,6 +7,8 @@
  */
 
 // composer auto loader
+use Lodestone\Http\AsyncHandler;
+
 require __DIR__ . '/vendor/autoload.php';
 
 $api = new \Lodestone\Api();
@@ -16,30 +18,14 @@ $start = microtime(true);
 // use async mode
 $api->config()->useAsync();
 
-$responses = [];
-foreach(range(0,5) as $i) {
-    echo "Loop: {$i} \n";
-    // perform multiple requests
-    $api->character()->get(730968);
-    $api->character()->get(15609878);
-    $api->character()->get(2269193);
-    $api->character()->get(720399);
-    $api->character()->get(14673089);
-    $api->character()->get(24328626);
-    $api->character()->get(24778921);
-    $api->character()->get(6649088);
-    $api->character()->get(1567731);
-    $api->character()->get(11887821);
-
-    // settle responses (they will trigger in the order you added them)
-    $responses = array_merge($responses, $api->http()->settle());
-    sleep(1);
-}
-
-$duration = microtime(true) - $start;
-
-print_r([
-    count($responses),
-    "Duration = {$duration}"
-]);
+$api->requestId('profile')->character()->get(730968);
+$api->requestId('classjobs')->character()->classjobs(730968);
+$api->requestId('minions')->character()->minions(730968);
+$api->requestId('minions')->character()->mounts(730968);
+
+$responses = $api->http()->settle();
+
+
+
+print_r($responses);
 

Diff for: src/Lodestone/Api.php

@@ -2,6 +2,7 @@
 
 namespace Lodestone;
 
+use Lodestone\Http\AsyncHandler;
 use Lodestone\Http\Http;
 use Lodestone\Http\RequestConfig;
 use Lodestone\Api\{
@@ -31,6 +32,12 @@ private function getApiNamespace($namespace)
 
         return $class;
     }
+    
+    public function requestId(string $name)
+    {
+        AsyncHandler::setRequestId($name);
+        return $this;
+    }
 
     /**
      * Access the Lodestone API Configuration

Diff for: src/Lodestone/Http/AsyncHandler.php

@@ -39,4 +39,9 @@ public static function reset(): void
         self::$responses = [];
         self::$requestId = null;
     }
+    
+    public static function setRequestId(string $name)
+    {
+        self::$requestId = $name;
+    }
 }

Diff for: src/Lodestone/Parser/ParseCharacterClassJobs.php

@@ -101,7 +101,11 @@ public function handle(string $html)
         //
         $elemental       = new ClassJobEureka('Elemental Level');
         $node            = $this->dom->find('.character__job__list')[$elementalIndex];
-        [$current, $max] = explode('/', $node->find('.character__job__exp')->text());
+        
+        $currentmax      = explode('/', $node->find('.character__job__exp')->text());
+        $current         = $currentmax[0] ?? null;
+        $max             = $currentmax[1] ?? null;
+        
         $current         = filter_var(trim(str_ireplace('-', null, $current)) ?: 0, FILTER_SANITIZE_NUMBER_INT);
         $max             = filter_var(trim(str_ireplace('-', null, $max)) ?: 0, FILTER_SANITIZE_NUMBER_INT);