Done
This commit is contained in:
parent
f066040415
commit
3845bf12c1
|
|
@ -26,9 +26,9 @@
|
||||||
"illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
|
"illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"laravel/pint": "^1.14",
|
|
||||||
"nunomaduro/collision": "^8.8",
|
|
||||||
"larastan/larastan": "^3.0",
|
"larastan/larastan": "^3.0",
|
||||||
|
"laravel/pint": "^1.29",
|
||||||
|
"nunomaduro/collision": "^8.8",
|
||||||
"orchestra/testbench": "^10.0.0||^9.0.0",
|
"orchestra/testbench": "^10.0.0||^9.0.0",
|
||||||
"pestphp/pest": "^4.0",
|
"pestphp/pest": "^4.0",
|
||||||
"pestphp/pest-plugin-arch": "^4.0",
|
"pestphp/pest-plugin-arch": "^4.0",
|
||||||
|
|
@ -55,7 +55,8 @@
|
||||||
"analyse": "vendor/bin/phpstan analyse",
|
"analyse": "vendor/bin/phpstan analyse",
|
||||||
"test": "vendor/bin/pest",
|
"test": "vendor/bin/pest",
|
||||||
"test-coverage": "vendor/bin/pest --coverage",
|
"test-coverage": "vendor/bin/pest --coverage",
|
||||||
"format": "vendor/bin/pint"
|
"format": "vendor/bin/pint",
|
||||||
|
"pint": "vendor/bin/pint --ansi"
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
"sort-packages": true,
|
"sort-packages": true,
|
||||||
|
|
@ -74,7 +75,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"version": "1.2.2",
|
"version": "1.2.3",
|
||||||
"minimum-stability": "stable",
|
"minimum-stability": "stable",
|
||||||
"prefer-stable": true
|
"prefer-stable": true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ namespace Msr\LaravelBitunixApi;
|
||||||
|
|
||||||
use GuzzleHttp\Client;
|
use GuzzleHttp\Client;
|
||||||
use GuzzleHttp\Exception\GuzzleException;
|
use GuzzleHttp\Exception\GuzzleException;
|
||||||
|
use Msr\LaravelBitunixApi\Contracts\RateLimiterContract as RateLimiter;
|
||||||
use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
|
use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
|
||||||
use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
|
use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
|
||||||
use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
|
use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
|
||||||
|
|
@ -19,19 +20,14 @@ use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
|
||||||
use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
|
use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
|
||||||
use Psr\Http\Message\ResponseInterface;
|
use Psr\Http\Message\ResponseInterface;
|
||||||
|
|
||||||
class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract,
|
class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract, FlashClosePositionRequestContract, FutureKLineRequestContract, GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract, GetPendingPositionsRequestContract, GetSingleAccountRequestContract, GetTradingPairsRequestContract, PlaceOrderRequestContract, PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract
|
||||||
FlashClosePositionRequestContract, FutureKLineRequestContract,
|
|
||||||
GetPendingPositionsRequestContract, GetSingleAccountRequestContract,
|
|
||||||
GetTradingPairsRequestContract, PlaceOrderRequestContract,
|
|
||||||
PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract,
|
|
||||||
GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract
|
|
||||||
{
|
{
|
||||||
private Client $publicFutureClient;
|
private Client $publicFutureClient;
|
||||||
|
|
||||||
public function __construct()
|
public function __construct(protected RateLimiter $rateLimiter)
|
||||||
{
|
{
|
||||||
$this->publicFutureClient = new Client([
|
$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);
|
$headers = Header::generateHeaders($queryParams, $bodyString);
|
||||||
|
|
||||||
return new Client([
|
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,
|
'headers' => $headers,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
@ -211,6 +207,13 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
||||||
int $skip = 0,
|
int $skip = 0,
|
||||||
int $limit = 100
|
int $limit = 100
|
||||||
): ResponseInterface {
|
): ResponseInterface {
|
||||||
|
$this->rateLimiter->throttle(
|
||||||
|
'futures::get_history_trades',
|
||||||
|
$this->resolveRateLimitIdentity(),
|
||||||
|
maxRequests: 8,
|
||||||
|
perSeconds: 1
|
||||||
|
);
|
||||||
|
|
||||||
$queryParams = [
|
$queryParams = [
|
||||||
'skip' => $skip,
|
'skip' => $skip,
|
||||||
'limit' => $limit,
|
'limit' => $limit,
|
||||||
|
|
@ -243,7 +246,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
|
public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
|
||||||
{
|
{
|
||||||
$queryParams = [];
|
$queryParams = [];
|
||||||
|
|
@ -273,6 +275,13 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
|
||||||
int $skip = 0,
|
int $skip = 0,
|
||||||
int $limit = 100
|
int $limit = 100
|
||||||
): ResponseInterface {
|
): ResponseInterface {
|
||||||
|
$this->rateLimiter->throttle(
|
||||||
|
'futures::get_history_positions',
|
||||||
|
$this->resolveRateLimitIdentity(),
|
||||||
|
maxRequests: 8,
|
||||||
|
perSeconds: 1
|
||||||
|
);
|
||||||
|
|
||||||
$queryParams = [
|
$queryParams = [
|
||||||
'skip' => $skip,
|
'skip' => $skip,
|
||||||
'limit' => $limit,
|
'limit' => $limit,
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace Msr\LaravelBitunixApi;
|
namespace Msr\LaravelBitunixApi;
|
||||||
|
|
||||||
|
use Illuminate\Contracts\Cache\Factory as CacheFactory;
|
||||||
use Msr\LaravelBitunixApi\Commands\LaravelBitunixApiCommand;
|
use Msr\LaravelBitunixApi\Commands\LaravelBitunixApiCommand;
|
||||||
use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
|
use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
|
||||||
use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
|
use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
|
||||||
|
|
@ -19,7 +20,6 @@ use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
|
||||||
use Msr\LaravelBitunixApi\Support\CacheRateLimiter;
|
use Msr\LaravelBitunixApi\Support\CacheRateLimiter;
|
||||||
use Spatie\LaravelPackageTools\Package;
|
use Spatie\LaravelPackageTools\Package;
|
||||||
use Spatie\LaravelPackageTools\PackageServiceProvider;
|
use Spatie\LaravelPackageTools\PackageServiceProvider;
|
||||||
use Illuminate\Contracts\Cache\Factory as CacheFactory;
|
|
||||||
|
|
||||||
class LaravelBitunixApiServiceProvider extends PackageServiceProvider
|
class LaravelBitunixApiServiceProvider extends PackageServiceProvider
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,7 @@ class CacheRateLimiter implements RateLimiterContract
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
protected Repository $cache,
|
protected Repository $cache,
|
||||||
) {
|
) {}
|
||||||
}
|
|
||||||
|
|
||||||
public function throttle(
|
public function throttle(
|
||||||
string $bucket,
|
string $bucket,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue