Compare commits
5 Commits
6730ac8ada
...
3845bf12c1
| Author | SHA1 | Date |
|---|---|---|
|
|
3845bf12c1 | |
|
|
f066040415 | |
|
|
8ad4765d5d | |
|
|
bf9bcd4f7e | |
|
|
a58ece7076 |
|
|
@ -26,9 +26,9 @@
|
|||
"illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"laravel/pint": "^1.14",
|
||||
"nunomaduro/collision": "^8.8",
|
||||
"larastan/larastan": "^3.0",
|
||||
"laravel/pint": "^1.29",
|
||||
"nunomaduro/collision": "^8.8",
|
||||
"orchestra/testbench": "^10.0.0||^9.0.0",
|
||||
"pestphp/pest": "^4.0",
|
||||
"pestphp/pest-plugin-arch": "^4.0",
|
||||
|
|
@ -55,7 +55,8 @@
|
|||
"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,
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"version": "1.2.2",
|
||||
"version": "1.2.3",
|
||||
"minimum-stability": "stable",
|
||||
"prefer-stable": true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
<?php
|
||||
|
||||
namespace Msr\LaravelBitunixApi\Contracts;
|
||||
|
||||
interface RateLimiterContract
|
||||
{
|
||||
public function throttle(
|
||||
string $bucket,
|
||||
string $identity,
|
||||
int $maxRequests,
|
||||
float $perSeconds
|
||||
): void;
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ 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;
|
||||
|
|
@ -19,19 +20,14 @@ use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
|
|||
use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract,
|
||||
FlashClosePositionRequestContract, FutureKLineRequestContract,
|
||||
GetPendingPositionsRequestContract, GetSingleAccountRequestContract,
|
||||
GetTradingPairsRequestContract, PlaceOrderRequestContract,
|
||||
PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract,
|
||||
GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract
|
||||
class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract, FlashClosePositionRequestContract, FutureKLineRequestContract, GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract, GetPendingPositionsRequestContract, GetSingleAccountRequestContract, GetTradingPairsRequestContract, PlaceOrderRequestContract, PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract
|
||||
{
|
||||
private Client $publicFutureClient;
|
||||
|
||||
public function __construct()
|
||||
public function __construct(protected RateLimiter $rateLimiter)
|
||||
{
|
||||
$this->publicFutureClient = new Client([
|
||||
'base_uri' => config('bitunix-api.future_base_uri') . '/api/v1/futures/market/',
|
||||
'base_uri' => config('bitunix-api.future_base_uri').'/api/v1/futures/market/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -41,7 +37,7 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
|||
$headers = Header::generateHeaders($queryParams, $bodyString);
|
||||
|
||||
return new Client([
|
||||
'base_uri' => config('bitunix-api.future_base_uri') . '/api/v1/futures/',
|
||||
'base_uri' => config('bitunix-api.future_base_uri').'/api/v1/futures/',
|
||||
'headers' => $headers,
|
||||
]);
|
||||
}
|
||||
|
|
@ -211,6 +207,13 @@ 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,
|
||||
|
|
@ -243,7 +246,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
|||
return $response;
|
||||
}
|
||||
|
||||
|
||||
public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
|
||||
{
|
||||
$queryParams = [];
|
||||
|
|
@ -273,6 +275,13 @@ 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,
|
||||
|
|
@ -393,10 +402,13 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
|||
$body['slStopType'] = $slStopType;
|
||||
}
|
||||
|
||||
$response = $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
|
||||
return $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
|
||||
'json' => $body,
|
||||
]);
|
||||
}
|
||||
|
||||
return $response;
|
||||
protected function resolveRateLimitIdentity(): string
|
||||
{
|
||||
return (string) config('bitunix-api.api_key');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
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;
|
||||
|
|
@ -15,6 +17,7 @@ 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;
|
||||
|
||||
|
|
@ -51,5 +54,11 @@ 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()
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,56 @@
|
|||
<?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)
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue