composer.json

@@ -26,9 +26,9 @@
         "illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
     },
     "require-dev": {
-        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.14",
-        "laravel/pint": "^1.29",
         "nunomaduro/collision": "^8.8",
+        "larastan/larastan": "^3.0",
         "orchestra/testbench": "^10.0.0||^9.0.0",
         "pestphp/pest": "^4.0",
         "pestphp/pest-plugin-arch": "^4.0",
@@ -55,8 +55,7 @@
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",
         "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/pint",
+        "format": "vendor/bin/pint"
-        "pint": "vendor/bin/pint --ansi"
     },
     "config": {
         "sort-packages": true,
@@ -75,7 +74,7 @@
             }
         }
     },
-    "version": "1.2.3",
+    "version": "1.2.2",
     "minimum-stability": "stable",
     "prefer-stable": true
 }

src/Contracts/RateLimiterContract.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Contracts;
-
-interface RateLimiterContract
-{
-    public function throttle(
-        string $bucket,
-        string $identity,
-        int $maxRequests,
-        float $perSeconds
-    ): void;
-}

src/LaravelBitunixApi.php

@@ -4,7 +4,6 @@ namespace Msr\LaravelBitunixApi;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
-use Msr\LaravelBitunixApi\Contracts\RateLimiterContract as RateLimiter;
 use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
 use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
 use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
@@ -20,11 +19,16 @@ use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
 use Psr\Http\Message\ResponseInterface;
 
-class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract, FlashClosePositionRequestContract, FutureKLineRequestContract, GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract, GetPendingPositionsRequestContract, GetSingleAccountRequestContract, GetTradingPairsRequestContract, PlaceOrderRequestContract, PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract
+class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract,
+                                   FlashClosePositionRequestContract, FutureKLineRequestContract,
+                                   GetPendingPositionsRequestContract, GetSingleAccountRequestContract,
+                                   GetTradingPairsRequestContract, PlaceOrderRequestContract,
+                                   PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract,
+                                   GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract
 {
     private Client $publicFutureClient;
 
-    public function __construct(protected RateLimiter $rateLimiter)
+    public function __construct()
     {
         $this->publicFutureClient = new Client([
             'base_uri' => config('bitunix-api.future_base_uri') . '/api/v1/futures/market/',
@@ -207,13 +211,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         int $skip = 0,
         int $limit = 100
     ): ResponseInterface {
-        $this->rateLimiter->throttle(
-            'futures::get_history_trades',
-            $this->resolveRateLimitIdentity(),
-            maxRequests: 8,
-            perSeconds: 1
-        );
-
         $queryParams = [
             'skip' => $skip,
             'limit' => $limit,
@@ -246,6 +243,7 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         return $response;
     }
 
+
     public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
     {
         $queryParams = [];
@@ -275,13 +273,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         int $skip = 0,
         int $limit = 100
     ): ResponseInterface {
-        $this->rateLimiter->throttle(
-            'futures::get_history_positions',
-            $this->resolveRateLimitIdentity(),
-            maxRequests: 8,
-            perSeconds: 1
-        );
-
         $queryParams = [
             'skip' => $skip,
             'limit' => $limit,
@@ -402,13 +393,10 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
             $body['slStopType'] = $slStopType;
         }
 
-        return $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
+        $response = $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
             'json' => $body,
         ]);
-    }
 
-    protected function resolveRateLimitIdentity(): string
+        return $response;
-    {
-        return (string) config('bitunix-api.api_key');
     }
 }

src/LaravelBitunixApiServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace Msr\LaravelBitunixApi;
 
-use Illuminate\Contracts\Cache\Factory as CacheFactory;
 use Msr\LaravelBitunixApi\Commands\LaravelBitunixApiCommand;
-use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
 use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
 use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
 use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
@@ -17,7 +15,6 @@ use Msr\LaravelBitunixApi\Requests\GetTradingPairsRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlaceOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
-use Msr\LaravelBitunixApi\Support\CacheRateLimiter;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -54,11 +51,5 @@ class LaravelBitunixApiServiceProvider extends PackageServiceProvider
         $this->app->bind(GetTradingPairsRequestContract::class, LaravelBitunixApi::class);
         $this->app->bind(GetHistoryTradesRequestContract::class, LaravelBitunixApi::class);
         $this->app->bind(GetHistoryPositionsRequestContract::class, LaravelBitunixApi::class);
-
-        $this->app->bind(RateLimiterContract::class, function ($app) {
-            return new CacheRateLimiter(
-                $app->make(CacheFactory::class)->store()
-            );
-        });
     }
 }

src/Support/CacheRateLimiter.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Support;
-
-use Illuminate\Contracts\Cache\Repository;
-use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
-
-class CacheRateLimiter implements RateLimiterContract
-{
-    public function __construct(
-        protected Repository $cache,
-    ) {}
-
-    public function throttle(
-        string $bucket,
-        string $identity,
-        int $maxRequests,
-        float $perSeconds
-    ): void {
-        if ($maxRequests <= 0 || $perSeconds <= 0) {
-            return;
-        }
-
-        $cacheKey = $this->makeCacheKey($bucket, $identity);
-        $minIntervalMicroseconds = (int) (($perSeconds / $maxRequests) * 1_000_000);
-
-        $lastRequestAt = $this->cache->get($cacheKey);
-
-        if (is_numeric($lastRequestAt)) {
-            $elapsedMicroseconds = (int) ((microtime(true) - (float) $lastRequestAt) * 1_000_000);
-
-            if ($elapsedMicroseconds < $minIntervalMicroseconds) {
-                $sleepMicroseconds = $minIntervalMicroseconds - $elapsedMicroseconds;
-
-                if ($sleepMicroseconds > 0) {
-                    usleep($sleepMicroseconds);
-                }
-            }
-        }
-
-        $this->cache->put(
-            $cacheKey,
-            microtime(true),
-            now()->addSeconds((int) max(1, ceil($perSeconds * 2)))
-        );
-    }
-
-    protected function makeCacheKey(string $bucket, string $identity): string
-    {
-        return sprintf(
-            'laravel_bitunix_api:rate_limit:%s:%s',
-            $bucket,
-            sha1($identity)
-        );
-    }
-}