Upgraded Porter to dev-v7.

Provider · Nov 5, 2022 · 9cc607e · 9cc607e
1 parent 52d9892
commit 9cc607e
Show file tree

Hide file tree

Showing 35 changed files with 181 additions and 288 deletions.
diff --git a/composer.json b/composer.json
@@ -12,11 +12,11 @@
   "require": {
     "php": "^8.1",
     "ext-json": "*",
-    "connectors/http": "^5",
+    "connectors/http": "dev-master as 6",
     "eloquent/enumeration": "^5|^6",
     "phpseclib/phpseclib": "^2",
     "psr/log": "^1",
-    "scriptfusion/porter": "^6",
+    "scriptfusion/porter": "dev-master as 7",
     "symfony/css-selector": "^5.3",
     "symfony/dom-crawler": "^5.4",
     "xpaw/steamid": "^2.0"

diff --git a/src/Collection/AsyncGameReviewsRecords.php b/src/Collection/AsyncGameReviewsRecords.php
@@ -4,12 +4,12 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Collection;
 
 use Amp\Future;
-use ScriptFUSION\Porter\Collection\AsyncProviderRecords;
-use ScriptFUSION\Porter\Provider\Resource\AsyncResource;
+use ScriptFUSION\Porter\Collection\ProviderRecords;
+use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 
-class AsyncGameReviewsRecords extends AsyncProviderRecords
+class AsyncGameReviewsRecords extends ProviderRecords
 {
-    public function __construct(\Iterator $records, private readonly Future $totalReviews, AsyncResource $resource)
+    public function __construct(\Iterator $records, private readonly Future $totalReviews, ProviderResource $resource)
     {
         parent::__construct($records, $resource);
     }

diff --git a/src/Collection/AsyncLoginRecord.php b/src/Collection/AsyncLoginRecord.php
@@ -4,16 +4,16 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Collection;
 
 use Amp\Future;
-use ScriptFUSION\Porter\Collection\AsyncProviderRecords;
-use ScriptFUSION\Porter\Provider\Resource\AsyncResource;
+use ScriptFUSION\Porter\Collection\ProviderRecords;
+use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Provider\Steam\Cookie\SecureLoginCookie;
 
-class AsyncLoginRecord extends AsyncProviderRecords
+class AsyncLoginRecord extends ProviderRecords
 {
     public function __construct(
         \Iterator $records,
         private readonly Future $secureLoginCookie,
-        AsyncResource $resource
+        ProviderResource $resource
     ) {
         parent::__construct($records, $resource);
     }

diff --git a/src/Collection/AsyncSteamStoreSessionRecord.php b/src/Collection/AsyncSteamStoreSessionRecord.php
@@ -4,13 +4,13 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Collection;
 
 use Amp\Future;
-use ScriptFUSION\Porter\Collection\AsyncProviderRecords;
-use ScriptFUSION\Porter\Provider\Resource\AsyncResource;
+use ScriptFUSION\Porter\Collection\ProviderRecords;
+use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Provider\Steam\Cookie\StoreSessionCookie;
 
-class AsyncSteamStoreSessionRecord extends AsyncProviderRecords
+class AsyncSteamStoreSessionRecord extends ProviderRecords
 {
-    public function __construct(\Iterator $records, private readonly Future $sessionCookie, AsyncResource $resource)
+    public function __construct(\Iterator $records, private readonly Future $sessionCookie, ProviderResource $resource)
     {
         parent::__construct($records, $resource);
     }

diff --git a/src/Resource/CreateSteamStoreSession.php b/src/Resource/CreateSteamStoreSession.php
@@ -8,19 +8,19 @@
 use ScriptFUSION\Porter\Connector\ImportConnector;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpConnector;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
-use ScriptFUSION\Porter\Provider\Resource\AsyncResource;
+use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Provider\Steam\Collection\AsyncSteamStoreSessionRecord;
 use ScriptFUSION\Porter\Provider\Steam\Cookie\StoreSessionCookie;
 use ScriptFUSION\Porter\Provider\Steam\SteamProvider;
 
-final class CreateSteamStoreSession implements AsyncResource
+final class CreateSteamStoreSession implements ProviderResource
 {
     public function getProviderClassName(): string
     {
         return SteamProvider::class;
     }
 
-    public function fetchAsync(ImportConnector $connector): \Iterator
+    public function fetch(ImportConnector $connector): \Iterator
     {
         $sessionCookie = new DeferredFuture();
 
@@ -32,7 +32,7 @@ public function fetchAsync(ImportConnector $connector): \Iterator
                         throw new \InvalidArgumentException('Unexpected connector type.');
                     }
 
-                    $connector->fetchAsync(new AsyncHttpDataSource(SteamProvider::buildStoreApiUrl('/')));
+                    $connector->fetch(new AsyncHttpDataSource(SteamProvider::buildStoreApiUrl('/')));
                 } catch (\Throwable $throwable) {
                     $sessionCookie->error($throwable);
 

diff --git a/src/Resource/Curator/CuratorList/DeleteCuratorList.php b/src/Resource/Curator/CuratorList/DeleteCuratorList.php
@@ -4,7 +4,7 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorList;
 
 use Amp\Http\Client\Body\FormBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Resource\SingleRecordResource;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
@@ -22,7 +22,7 @@ public function __construct(CuratorSession $session, int $curatorId, string $lis
         $this->listId = $listId;
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         $body = new FormBody;
         $body->addFields([

diff --git a/src/Resource/Curator/CuratorList/DeleteCuratorListApp.php b/src/Resource/Curator/CuratorList/DeleteCuratorListApp.php
@@ -4,7 +4,7 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorList;
 
 use Amp\Http\Client\Body\FormBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Resource\SingleRecordResource;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
@@ -13,19 +13,16 @@
 
 final class DeleteCuratorListApp extends CuratorResource implements SingleRecordResource
 {
-    private $listId;
-
-    private $appId;
-
-    public function __construct(CuratorSession $session, int $curatorId, string $listId, int $appId)
-    {
+    public function __construct(
+        CuratorSession $session,
+        int $curatorId,
+        private readonly string $listId,
+        private readonly int $appId,
+    ) {
         parent::__construct($session, $curatorId);
-
-        $this->listId = $listId;
-        $this->appId = $appId;
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         $body = new FormBody;
         $body->addFields([
@@ -35,7 +32,7 @@ protected function getSource(): AsyncDataSource
         ]);
 
         return (new AsyncHttpDataSource(
-            SteamProvider::buildStoreApiUrl("/curator/{$this->curatorId}/admin/ajaxremovefromlist/")
+            SteamProvider::buildStoreApiUrl("/curator/$this->curatorId/admin/ajaxremovefromlist/")
         ))
             ->setMethod('POST')
             ->setBody($body)

diff --git a/src/Resource/Curator/CuratorList/GetCuratorLists.php b/src/Resource/Curator/CuratorList/GetCuratorLists.php
@@ -3,15 +3,15 @@
 
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorList;
 
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Net\Http\HttpResponse;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
 use ScriptFUSION\Porter\Provider\Steam\SteamProvider;
 
 final class GetCuratorLists extends CuratorResource
 {
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         return new AsyncHttpDataSource(
             SteamProvider::buildStoreApiUrl("/curator/$this->curatorId/ajaxgetlists/?all=1")

diff --git a/src/Resource/Curator/CuratorList/PatchCuratorListAppOrder.php b/src/Resource/Curator/CuratorList/PatchCuratorListAppOrder.php
@@ -4,7 +4,7 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorList;
 
 use Amp\Http\Client\Body\FormBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Resource\SingleRecordResource;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
@@ -13,19 +13,16 @@
 
 final class PatchCuratorListAppOrder extends CuratorResource implements SingleRecordResource
 {
-    private $listId;
-
-    private $appIds;
-
-    public function __construct(CuratorSession $session, int $curatorId, string $listId, array $appIds)
-    {
+    public function __construct(
+        CuratorSession $session,
+        int $curatorId,
+        private readonly string $listId,
+        private readonly array $appIds,
+    ) {
         parent::__construct($session, $curatorId);
-
-        $this->listId = $listId;
-        $this->appIds = $appIds;
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         $body = new FormBody;
         $body->addFields([

diff --git a/src/Resource/Curator/CuratorList/PutCuratorList.php b/src/Resource/Curator/CuratorList/PutCuratorList.php
@@ -5,7 +5,7 @@
 
 use Amp\Http\Client\Body\FormBody;
 use Amp\Http\Client\RequestBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Resource\SingleRecordResource;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
@@ -26,7 +26,7 @@ public function __construct(CuratorSession $session, int $curatorId, CuratorList
         $this->list = $list;
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         return (new AsyncHttpDataSource(
             SteamProvider::buildStoreApiUrl("/curator/$this->curatorId/admin/ajaxeditlist/")

diff --git a/src/Resource/Curator/CuratorList/PutCuratorListApp.php b/src/Resource/Curator/CuratorList/PutCuratorListApp.php
@@ -4,7 +4,7 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorList;
 
 use Amp\Http\Client\Body\FormBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Resource\SingleRecordResource;
 use ScriptFUSION\Porter\Provider\Steam\Resource\Curator\CuratorResource;
@@ -25,7 +25,7 @@ public function __construct(CuratorSession $session, int $curatorId, string $lis
         $this->appId = $appId;
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         $body = new FormBody;
         $body->addFields([

diff --git a/src/Resource/Curator/CuratorResource.php b/src/Resource/Curator/CuratorResource.php
@@ -4,14 +4,14 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator;
 
 use Amp\Http\Client\Cookie\CookieJar;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Connector\ImportConnector;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpConnector;
 use ScriptFUSION\Porter\Net\Http\HttpResponse;
-use ScriptFUSION\Porter\Provider\Resource\AsyncResource;
+use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Provider\Steam\SteamProvider;
 
-abstract class CuratorResource implements AsyncResource
+abstract class CuratorResource implements ProviderResource
 {
     public function __construct(protected CuratorSession $session, protected int $curatorId)
     {
@@ -22,9 +22,9 @@ public function getProviderClassName(): string
         return SteamProvider::class;
     }
 
-    abstract protected function getSource(): AsyncDataSource;
+    abstract protected function getSource(): DataSource;
 
-    public function fetchAsync(ImportConnector $connector): \Iterator
+    public function fetch(ImportConnector $connector): \Iterator
     {
         $baseConnector = $connector->findBaseConnector();
         if (!$baseConnector instanceof AsyncHttpConnector) {
@@ -33,7 +33,7 @@ public function fetchAsync(ImportConnector $connector): \Iterator
 
         $this->applySessionCookies($baseConnector->getCookieJar());
 
-        $response = $connector->fetchAsync($this->getSource());
+        $response = $connector->fetch($this->getSource());
 
         yield from $this->emitResponses($response);
     }

diff --git a/src/Resource/Curator/CuratorSession.php b/src/Resource/Curator/CuratorSession.php
@@ -11,7 +11,8 @@
 use ScriptFUSION\Porter\Provider\Steam\Cookie\StoreSessionCookie;
 use ScriptFUSION\Porter\Provider\Steam\Resource\CreateSteamStoreSession;
 use ScriptFUSION\Porter\Provider\Steam\Resource\SteamLogin;
-use ScriptFUSION\Porter\Specification\AsyncImportSpecification;
+use ScriptFUSION\Porter\Specification\AsyncImport;
+use ScriptFUSION\Porter\Import\Import;
 
 final class CuratorSession
 {
@@ -28,9 +29,7 @@ public function __construct(SecureLoginCookie $secureLoginCookie, StoreSessionCo
     public static function create(Porter $porter, string $username, string $password): self
     {
         /** @var AsyncLoginRecord $steamLogin */
-        $steamLogin = $porter->importAsync(new AsyncImportSpecification(
-            new SteamLogin($username, $password)
-        ))->findFirstCollection();
+        $steamLogin = $porter->import(new Import(new SteamLogin($username, $password)))->findFirstCollection();
 
         $secureLoginCookie = $steamLogin->getSecureLoginCookie()->await();
 
@@ -44,9 +43,7 @@ public static function create(Porter $porter, string $username, string $password
     public static function createFromCookie(SecureLoginCookie $secureLoginCookie, Porter $porter): self
     {
         /** @var AsyncSteamStoreSessionRecord $storeSession */
-        $storeSession = $porter->importAsync(new AsyncImportSpecification(
-            new CreateSteamStoreSession
-        ))->findFirstCollection();
+        $storeSession = $porter->import(new Import(new CreateSteamStoreSession))->findFirstCollection();
 
         $storeSessionCookie = $storeSession->getSessionCookie()->await();
 

diff --git a/src/Resource/Curator/DeleteCuratorReviews.php b/src/Resource/Curator/DeleteCuratorReviews.php
@@ -4,27 +4,23 @@
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator;
 
 use Amp\Http\Client\Body\FormBody;
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Provider\Steam\SteamProvider;
 
 final class DeleteCuratorReviews extends CuratorResource
 {
-    private $appIds;
-
-    public function __construct(CuratorSession $session, int $curatorId, array $appIds)
+    public function __construct(CuratorSession $session, int $curatorId, private readonly array $appIds)
     {
         parent::__construct($session, $curatorId);
-
-        $this->appIds = $appIds;
     }
 
     protected function getUrl(): string
     {
         return SteamProvider::buildStoreApiUrl("/curator/$this->curatorId/admin/ajaxupdatemultiplecurations/");
     }
 
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         $body = new FormBody;
 

diff --git a/src/Resource/Curator/GetCuratorReviews.php b/src/Resource/Curator/GetCuratorReviews.php
@@ -3,14 +3,14 @@
 
 namespace ScriptFUSION\Porter\Provider\Steam\Resource\Curator;
 
-use ScriptFUSION\Porter\Connector\AsyncDataSource;
+use ScriptFUSION\Porter\Connector\DataSource;
 use ScriptFUSION\Porter\Net\Http\AsyncHttpDataSource;
 use ScriptFUSION\Porter\Net\Http\HttpResponse;
 use ScriptFUSION\Porter\Provider\Steam\SteamProvider;
 
 final class GetCuratorReviews extends CuratorResource
 {
-    protected function getSource(): AsyncDataSource
+    protected function getSource(): DataSource
     {
         return new AsyncHttpDataSource(SteamProvider::buildStoreApiUrl(
             "/curator/$this->curatorId/admin/ajaxgetrecommendations/?count=0x7FFFFFFF"