moltox
/
laravel-bitunix-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Compare commits

base: moltox:main
Branches Tags
moltox:main
moltox:1.2.3
moltox:1.2.2
moltox:1.2.1
moltox:1.2.0
moltox:dependabot/github_actions/dependabot/fetch-metadata-3.0.0
moltox:dependabot/github_actions/ramsey/composer-install-4
moltox:dependabot/github_actions/actions/checkout-6
moltox:dev
moltox:1.2.3
moltox:1.2.2
moltox:1.2.0
moltox:1.1.0
moltox:1.0.0
..
compare: moltox:1.2.2
Branches Tags
moltox:1.2.3
moltox:main
moltox:1.2.2
moltox:1.2.1
moltox:1.2.0
moltox:dependabot/github_actions/dependabot/fetch-metadata-3.0.0
moltox:dependabot/github_actions/ramsey/composer-install-4
moltox:dependabot/github_actions/actions/checkout-6
moltox:dev
moltox:1.2.3
moltox:1.2.2
moltox:1.2.0
moltox:1.1.0
moltox:1.0.0

No commits in common. "main" and "1.2.2" have entirely different histories.
main ... 1.2.2

7 changed files with 10 additions and 227 deletions
Show Stats Expand all files Collapse all files

9
composer.json
View File

@ -26,9 +26,9 @@
"illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
},
"require-dev": {
"larastan/larastan": "^3.0",
"laravel/pint": "^1.29",
"laravel/pint": "^1.14",
"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",
"pint": "vendor/bin/pint --ansi"
"format": "vendor/bin/pint"
},
"config": {
"sort-packages": true,
@ -75,7 +74,7 @@
}
}
},
"version": "1.2.3",
"version": "1.2.2",
"minimum-stability": "stable",
"prefer-stable": true
}

13
src/Contracts/RateLimiterContract.php
View File

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

112
src/LaravelBitunixApi.php
View File

@ -3,14 +3,10 @@
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;
use Msr\LaravelBitunixApi\Requests\FutureKLineRequestContract;
use Msr\LaravelBitunixApi\Requests\GetHistoryPositionsRequestContract;
use Msr\LaravelBitunixApi\Requests\GetHistoryTradesRequestContract;
use Msr\LaravelBitunixApi\Requests\GetPendingPositionsRequestContract;
use Msr\LaravelBitunixApi\Requests\GetSingleAccountRequestContract;
use Msr\LaravelBitunixApi\Requests\GetTradingPairsRequestContract;
@ -20,11 +16,11 @@ 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
{
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/',
@ -42,14 +38,8 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
]);
}
public function getFutureKline(
string $symbol,
string $interval,
int $limit = 100,
?int $startTime = null,
?int $endTime = null,
string $type = 'LAST_PRICE'
): ResponseInterface {
public function getFutureKline(string $symbol, string $interval, int $limit = 100, ?int $startTime = null, ?int $endTime = null, string $type = 'LAST_PRICE'): ResponseInterface
{
$response = $this->publicFutureClient->get('kline', [
'query' => [
'symbol' => $symbol,
@ -198,54 +188,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
return $response;
}
public function getHistoryTrades(
?string $symbol = null,
?string $orderId = null,
?string $positionId = null,
?int $startTime = null,
?int $endTime = null,
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,
];
if ($symbol !== null) {
$queryParams['symbol'] = $symbol;
}
if ($orderId !== null) {
$queryParams['orderId'] = $orderId;
}
if ($positionId !== null) {
$queryParams['positionId'] = $positionId;
}
if ($startTime !== null) {
$queryParams['startTime'] = $startTime;
}
if ($endTime !== null) {
$queryParams['endTime'] = $endTime;
}
$response = $this->getPrivateFutureClient($queryParams, [])->get('trade/get_history_trades', [
'query' => $queryParams,
]);
return $response;
}
public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
{
$queryParams = [];
@ -265,45 +207,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
return $response;
}
/**
* @throws GuzzleException
*/
public function getHistoryPositions(
?string $symbol = null,
?int $startTime = null,
?int $endTime = null,
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,
];
if ($symbol !== null) {
$queryParams['symbol'] = $symbol;
}
if ($startTime !== null) {
$queryParams['startTime'] = $startTime;
}
if ($endTime !== null) {
$queryParams['endTime'] = $endTime;
}
return $this->getPrivateFutureClient($queryParams, [])->get('position/get_history_positions', [
'query' => $queryParams,
]);
}
public function getSingleAccount(string $marginCoin): ResponseInterface
{
$queryParams = [
@ -402,13 +305,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 (string) config('bitunix-api.api_key');
return $response;
}
}

13
src/LaravelBitunixApiServiceProvider.php
View File

@ -2,22 +2,17 @@
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;
use Msr\LaravelBitunixApi\Requests\FutureKLineRequestContract;
use Msr\LaravelBitunixApi\Requests\GetHistoryPositionsRequestContract;
use Msr\LaravelBitunixApi\Requests\GetHistoryTradesRequestContract;
use Msr\LaravelBitunixApi\Requests\GetPendingPositionsRequestContract;
use Msr\LaravelBitunixApi\Requests\GetSingleAccountRequestContract;
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;
@ -52,13 +47,5 @@ class LaravelBitunixApiServiceProvider extends PackageServiceProvider
$this->app->bind(PlaceTpSlOrderRequestContract::class, LaravelBitunixApi::class);
$this->app->bind(PlacePositionTpSlOrderRequestContract::class, LaravelBitunixApi::class);
$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()
);
});
}
}

16
src/Requests/GetHistoryPositionsRequestContract.php
View File

@ -1,16 +0,0 @@
<?php
namespace Msr\LaravelBitunixApi\Requests;
use Psr\Http\Message\ResponseInterface;
interface GetHistoryPositionsRequestContract
{
public function getHistoryPositions(
?string $symbol = null,
?int $startTime = null,
?int $endTime = null,
int $skip = 0,
int $limit = 100
): ResponseInterface;
}

18
src/Requests/GetHistoryTradesRequestContract.php
View File

@ -1,18 +0,0 @@
<?php
namespace Msr\LaravelBitunixApi\Requests;
use Psr\Http\Message\ResponseInterface;
interface GetHistoryTradesRequestContract
{
public function getHistoryTrades(
?string $symbol = null,
?string $orderId = null,
?string $positionId = null,
?int $startTime = null,
?int $endTime = null,
int $skip = 0,
int $limit = 100
): ResponseInterface;
}

56
src/Support/CacheRateLimiter.php
View File

@ -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)
);
}
}