@lifi/perps-sdk 1.5.3 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/services/resolveSubscribeQuote.d.ts.map +1 -1
- package/dist/cjs/services/resolveSubscribeQuote.js +33 -19
- package/dist/cjs/services/resolveSubscribeQuote.js.map +1 -1
- package/dist/cjs/transport/fetchWithRetry.d.ts +1 -0
- package/dist/cjs/transport/fetchWithRetry.d.ts.map +1 -1
- package/dist/cjs/transport/fetchWithRetry.js +8 -1
- package/dist/cjs/transport/fetchWithRetry.js.map +1 -1
- package/dist/cjs/transport/request.d.ts.map +1 -1
- package/dist/cjs/transport/request.js +3 -0
- package/dist/cjs/transport/request.js.map +1 -1
- package/dist/cjs/utils/sleep.d.ts +1 -1
- package/dist/cjs/utils/sleep.d.ts.map +1 -1
- package/dist/cjs/utils/sleep.js +16 -1
- package/dist/cjs/utils/sleep.js.map +1 -1
- package/dist/cjs/version.d.ts +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/services/resolveSubscribeQuote.d.ts +9 -8
- package/dist/esm/services/resolveSubscribeQuote.d.ts.map +1 -1
- package/dist/esm/services/resolveSubscribeQuote.js +44 -27
- package/dist/esm/services/resolveSubscribeQuote.js.map +1 -1
- package/dist/esm/transport/fetchWithRetry.d.ts +11 -1
- package/dist/esm/transport/fetchWithRetry.d.ts.map +1 -1
- package/dist/esm/transport/fetchWithRetry.js +17 -2
- package/dist/esm/transport/fetchWithRetry.js.map +1 -1
- package/dist/esm/transport/request.d.ts.map +1 -1
- package/dist/esm/transport/request.js +4 -1
- package/dist/esm/transport/request.js.map +1 -1
- package/dist/esm/utils/sleep.d.ts +3 -2
- package/dist/esm/utils/sleep.d.ts.map +1 -1
- package/dist/esm/utils/sleep.js +18 -2
- package/dist/esm/utils/sleep.js.map +1 -1
- package/dist/esm/version.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/services/resolveSubscribeQuote.d.ts +9 -8
- package/dist/types/services/resolveSubscribeQuote.d.ts.map +1 -1
- package/dist/types/transport/fetchWithRetry.d.ts +11 -1
- package/dist/types/transport/fetchWithRetry.d.ts.map +1 -1
- package/dist/types/transport/request.d.ts.map +1 -1
- package/dist/types/utils/sleep.d.ts +3 -2
- package/dist/types/utils/sleep.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/services/resolveSubscribeQuote.ts +56 -28
- package/src/transport/fetchWithRetry.ts +18 -2
- package/src/transport/request.ts +5 -1
- package/src/utils/sleep.ts +19 -3
- package/src/version.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAGR,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAUvD,eAAO,MAAM,iBAAiB,MAAM,CAAA;AAqBpC,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EACjC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,IAAI,CAAC,CAuFrB"}
|
|
@@ -7,7 +7,7 @@ const resolveQuote_js_1 = require("./resolveQuote.js");
|
|
|
7
7
|
exports.QUOTE_THROTTLE_MS = 100;
|
|
8
8
|
async function resolveSubscribeQuote(client, provider, ws, params, feeTier, onQuote) {
|
|
9
9
|
const market = await (0, resolveQuote_js_1.resolveQuoteMarket)(client, provider, params);
|
|
10
|
-
|
|
10
|
+
let latestContext = await (0, resolveQuote_js_1.resolveQuotePrice)(client, provider, market.id);
|
|
11
11
|
let latestBook;
|
|
12
12
|
let lastEmitAt = Number.NEGATIVE_INFINITY;
|
|
13
13
|
let trailing;
|
|
@@ -23,32 +23,45 @@ async function resolveSubscribeQuote(client, provider, ws, params, feeTier, onQu
|
|
|
23
23
|
side: params.side,
|
|
24
24
|
sizeUsd: params.size,
|
|
25
25
|
market,
|
|
26
|
-
price,
|
|
26
|
+
price: latestContext,
|
|
27
27
|
bids: latestBook.bids,
|
|
28
28
|
asks: latestBook.asks,
|
|
29
29
|
feeTier,
|
|
30
30
|
timestamp: Date.now(),
|
|
31
31
|
}));
|
|
32
32
|
};
|
|
33
|
-
const
|
|
34
|
-
if (event.channel !== '
|
|
33
|
+
const unsubscribeContext = await ws.subscribe({ channel: 'marketContext', dex: provider, marketId: market.id }, (event) => {
|
|
34
|
+
if (event.channel !== 'marketContext') {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
if (trailing !== undefined) {
|
|
39
|
-
return;
|
|
40
|
-
}
|
|
41
|
-
const wait = exports.QUOTE_THROTTLE_MS - (Date.now() - lastEmitAt);
|
|
42
|
-
if (wait <= 0) {
|
|
43
|
-
emit();
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
trailing = setTimeout(() => {
|
|
47
|
-
trailing = undefined;
|
|
48
|
-
emit();
|
|
49
|
-
}, wait);
|
|
50
|
-
}
|
|
37
|
+
latestContext = event.data;
|
|
51
38
|
});
|
|
39
|
+
let unsubscribeBook;
|
|
40
|
+
try {
|
|
41
|
+
unsubscribeBook = await ws.subscribe({ channel: 'orderbook', dex: provider, marketId: market.id }, (event) => {
|
|
42
|
+
if (event.channel !== 'orderbook') {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
latestBook = event.data;
|
|
46
|
+
if (trailing !== undefined) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
const wait = exports.QUOTE_THROTTLE_MS - (Date.now() - lastEmitAt);
|
|
50
|
+
if (wait <= 0) {
|
|
51
|
+
emit();
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
trailing = setTimeout(() => {
|
|
55
|
+
trailing = undefined;
|
|
56
|
+
emit();
|
|
57
|
+
}, wait);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
unsubscribeContext();
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
52
65
|
let released = false;
|
|
53
66
|
return () => {
|
|
54
67
|
if (released) {
|
|
@@ -59,7 +72,8 @@ async function resolveSubscribeQuote(client, provider, ws, params, feeTier, onQu
|
|
|
59
72
|
clearTimeout(trailing);
|
|
60
73
|
trailing = undefined;
|
|
61
74
|
}
|
|
62
|
-
|
|
75
|
+
unsubscribeContext();
|
|
76
|
+
unsubscribeBook();
|
|
63
77
|
};
|
|
64
78
|
}
|
|
65
79
|
//# sourceMappingURL=resolveSubscribeQuote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSubscribeQuote.js","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"resolveSubscribeQuote.js","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,6 @@ export interface FetchWithRetryOptions {
|
|
|
4
4
|
fetchImpl?: typeof fetch;
|
|
5
5
|
signal?: AbortSignal;
|
|
6
6
|
}
|
|
7
|
+
export declare function isAbortError(error: unknown): boolean;
|
|
7
8
|
export declare function fetchWithRetry(input: RequestInfo | URL, init: RequestInit | undefined, options: FetchWithRetryOptions): Promise<Response>;
|
|
8
9
|
//# sourceMappingURL=fetchWithRetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAOhF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;
|
|
1
|
+
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAOhF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AASD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpD;AAaD,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CA4DnB"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isAbortError = isAbortError;
|
|
3
4
|
exports.fetchWithRetry = fetchWithRetry;
|
|
4
5
|
const sleep_js_1 = require("../utils/sleep.js");
|
|
6
|
+
function isAbortError(error) {
|
|
7
|
+
return error instanceof Error && error.name === 'AbortError';
|
|
8
|
+
}
|
|
5
9
|
async function fetchWithRetry(input, init, options) {
|
|
6
10
|
const { policy, fetchImpl = fetch, signal } = options;
|
|
7
11
|
const mergedInit = signal ? { ...init, signal } : (init ?? {});
|
|
@@ -16,6 +20,9 @@ async function fetchWithRetry(input, init, options) {
|
|
|
16
20
|
response = await fetchImpl(input, mergedInit);
|
|
17
21
|
}
|
|
18
22
|
catch (error) {
|
|
23
|
+
if (isAbortError(error)) {
|
|
24
|
+
throw error;
|
|
25
|
+
}
|
|
19
26
|
networkError = error;
|
|
20
27
|
}
|
|
21
28
|
if (response?.ok) {
|
|
@@ -48,7 +55,7 @@ async function fetchWithRetry(input, init, options) {
|
|
|
48
55
|
}
|
|
49
56
|
const delayMs = computeDelay(policy, attempt, response);
|
|
50
57
|
if (delayMs > 0) {
|
|
51
|
-
await (0, sleep_js_1.sleep)(delayMs);
|
|
58
|
+
await (0, sleep_js_1.sleep)(delayMs, signal);
|
|
52
59
|
}
|
|
53
60
|
attempt++;
|
|
54
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithRetry.js","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"fetchWithRetry.js","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAOzB,MAAM,WAAW,cAAe,SAAQ,WAAW;IAEjD,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAQD,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAOzB,MAAM,WAAW,cAAe,SAAQ,WAAW;IAEjD,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAQD,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,CAuEZ;AAOD,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAC5D,MAAM,CAWR"}
|
|
@@ -59,6 +59,9 @@ async function request(config, url, options = {}, sdkOptions) {
|
|
|
59
59
|
if (error instanceof PerpsError_js_1.PerpsError) {
|
|
60
60
|
throw error;
|
|
61
61
|
}
|
|
62
|
+
if ((0, fetchWithRetry_js_1.isAbortError)(error)) {
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
62
65
|
throw new PerpsError_js_1.PerpsError(perps_types_1.PerpsErrorCode.ServerError, error instanceof Error ? error.message : 'Request failed');
|
|
63
66
|
}
|
|
64
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":";;AA6BA,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const sleep: (ms: number) => Promise<void>;
|
|
1
|
+
export declare const sleep: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
2
2
|
//# sourceMappingURL=sleep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgBjE,CAAA"}
|
package/dist/cjs/utils/sleep.js
CHANGED
|
@@ -1,6 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sleep = void 0;
|
|
4
|
-
const sleep = (ms) => new Promise((resolve) =>
|
|
4
|
+
const sleep = (ms, signal) => new Promise((resolve, reject) => {
|
|
5
|
+
if (signal?.aborted) {
|
|
6
|
+
reject(signal.reason ?? new DOMException('Aborted', 'AbortError'));
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
|
+
let timer;
|
|
10
|
+
const onAbort = () => {
|
|
11
|
+
clearTimeout(timer);
|
|
12
|
+
reject(signal?.reason ?? new DOMException('Aborted', 'AbortError'));
|
|
13
|
+
};
|
|
14
|
+
timer = setTimeout(() => {
|
|
15
|
+
signal?.removeEventListener('abort', onAbort);
|
|
16
|
+
resolve();
|
|
17
|
+
}, ms);
|
|
18
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
19
|
+
});
|
|
5
20
|
exports.sleep = sleep;
|
|
6
21
|
//# sourceMappingURL=sleep.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":";;;AAMO,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,MAAoB,EAAiB,EAAE,CACvE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAA;QAClE,OAAM;IACR,CAAC;IACD,IAAI,KAAoC,CAAA;IACxC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAA;IACrE,CAAC,CAAA;IACD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QACtB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC7C,OAAO,EAAE,CAAA;IACX,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAC,CAAA;AAhBS,QAAA,KAAK,SAgBd"}
|
package/dist/cjs/version.d.ts
CHANGED
package/dist/cjs/version.js
CHANGED
|
@@ -12,17 +12,18 @@ export declare const QUOTE_THROTTLE_MS = 100;
|
|
|
12
12
|
/**
|
|
13
13
|
* Shared provider-side `subscribeQuote` implementation: resolve
|
|
14
14
|
* `params.symbol` to a market on `provider` (via {@link resolveQuoteMarket}),
|
|
15
|
-
* subscribe to that market's orderbook
|
|
16
|
-
* update rebuild the {@link Quote}
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
15
|
+
* subscribe to that market's orderbook and marketContext channels on `ws`,
|
|
16
|
+
* and on each book update rebuild the {@link Quote} against the latest
|
|
17
|
+
* {@link MarketContext} with the provider's public base `feeTier` — the same
|
|
18
|
+
* transform the one-shot `resolveQuote` applies to a REST snapshot. Emissions
|
|
19
|
+
* are throttled to {@link QUOTE_THROTTLE_MS}: the first book update emits
|
|
20
|
+
* immediately, then at most one (trailing, latest-book) emission per
|
|
20
21
|
* interval. Both venue WS plugins delegate here; each only supplies its own
|
|
21
22
|
* base tier.
|
|
22
23
|
*
|
|
23
|
-
* The returned unsubscribe is idempotent — it releases
|
|
24
|
-
*
|
|
25
|
-
*
|
|
24
|
+
* The returned unsubscribe is idempotent — it releases both underlying
|
|
25
|
+
* listeners once and cancels any pending trailing emission, so the wire
|
|
26
|
+
* subscriptions' ref counts cannot be double-decremented.
|
|
26
27
|
*
|
|
27
28
|
* @throws {PerpsError} `MarketNotFound` when no market matches symbol+type.
|
|
28
29
|
* @internal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAGR,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,MAAM,CAAA;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EACjC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,IAAI,CAAC,CAuFrB"}
|
|
@@ -11,24 +11,27 @@ export const QUOTE_THROTTLE_MS = 100;
|
|
|
11
11
|
/**
|
|
12
12
|
* Shared provider-side `subscribeQuote` implementation: resolve
|
|
13
13
|
* `params.symbol` to a market on `provider` (via {@link resolveQuoteMarket}),
|
|
14
|
-
* subscribe to that market's orderbook
|
|
15
|
-
* update rebuild the {@link Quote}
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
14
|
+
* subscribe to that market's orderbook and marketContext channels on `ws`,
|
|
15
|
+
* and on each book update rebuild the {@link Quote} against the latest
|
|
16
|
+
* {@link MarketContext} with the provider's public base `feeTier` — the same
|
|
17
|
+
* transform the one-shot `resolveQuote` applies to a REST snapshot. Emissions
|
|
18
|
+
* are throttled to {@link QUOTE_THROTTLE_MS}: the first book update emits
|
|
19
|
+
* immediately, then at most one (trailing, latest-book) emission per
|
|
19
20
|
* interval. Both venue WS plugins delegate here; each only supplies its own
|
|
20
21
|
* base tier.
|
|
21
22
|
*
|
|
22
|
-
* The returned unsubscribe is idempotent — it releases
|
|
23
|
-
*
|
|
24
|
-
*
|
|
23
|
+
* The returned unsubscribe is idempotent — it releases both underlying
|
|
24
|
+
* listeners once and cancels any pending trailing emission, so the wire
|
|
25
|
+
* subscriptions' ref counts cannot be double-decremented.
|
|
25
26
|
*
|
|
26
27
|
* @throws {PerpsError} `MarketNotFound` when no market matches symbol+type.
|
|
27
28
|
* @internal
|
|
28
29
|
*/
|
|
29
30
|
export async function resolveSubscribeQuote(client, provider, ws, params, feeTier, onQuote) {
|
|
30
31
|
const market = await resolveQuoteMarket(client, provider, params);
|
|
31
|
-
|
|
32
|
+
// REST snapshot seeds the context; the marketContext subscription below
|
|
33
|
+
// keeps it live so streamed impact/funding track the moving market.
|
|
34
|
+
let latestContext = await resolveQuotePrice(client, provider, market.id);
|
|
32
35
|
let latestBook;
|
|
33
36
|
let lastEmitAt = Number.NEGATIVE_INFINITY;
|
|
34
37
|
let trailing;
|
|
@@ -44,32 +47,45 @@ export async function resolveSubscribeQuote(client, provider, ws, params, feeTie
|
|
|
44
47
|
side: params.side,
|
|
45
48
|
sizeUsd: params.size,
|
|
46
49
|
market,
|
|
47
|
-
price,
|
|
50
|
+
price: latestContext,
|
|
48
51
|
bids: latestBook.bids,
|
|
49
52
|
asks: latestBook.asks,
|
|
50
53
|
feeTier,
|
|
51
54
|
timestamp: Date.now(),
|
|
52
55
|
}));
|
|
53
56
|
};
|
|
54
|
-
const
|
|
55
|
-
if (event.channel !== '
|
|
57
|
+
const unsubscribeContext = await ws.subscribe({ channel: 'marketContext', dex: provider, marketId: market.id }, (event) => {
|
|
58
|
+
if (event.channel !== 'marketContext') {
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
58
|
-
|
|
59
|
-
if (trailing !== undefined) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
const wait = QUOTE_THROTTLE_MS - (Date.now() - lastEmitAt);
|
|
63
|
-
if (wait <= 0) {
|
|
64
|
-
emit();
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
trailing = setTimeout(() => {
|
|
68
|
-
trailing = undefined;
|
|
69
|
-
emit();
|
|
70
|
-
}, wait);
|
|
71
|
-
}
|
|
61
|
+
latestContext = event.data;
|
|
72
62
|
});
|
|
63
|
+
let unsubscribeBook;
|
|
64
|
+
try {
|
|
65
|
+
unsubscribeBook = await ws.subscribe({ channel: 'orderbook', dex: provider, marketId: market.id }, (event) => {
|
|
66
|
+
if (event.channel !== 'orderbook') {
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
latestBook = event.data;
|
|
70
|
+
if (trailing !== undefined) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const wait = QUOTE_THROTTLE_MS - (Date.now() - lastEmitAt);
|
|
74
|
+
if (wait <= 0) {
|
|
75
|
+
emit();
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
trailing = setTimeout(() => {
|
|
79
|
+
trailing = undefined;
|
|
80
|
+
emit();
|
|
81
|
+
}, wait);
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
unsubscribeContext();
|
|
87
|
+
throw error;
|
|
88
|
+
}
|
|
73
89
|
let released = false;
|
|
74
90
|
return () => {
|
|
75
91
|
if (released) {
|
|
@@ -80,7 +96,8 @@ export async function resolveSubscribeQuote(client, provider, ws, params, feeTie
|
|
|
80
96
|
clearTimeout(trailing);
|
|
81
97
|
trailing = undefined;
|
|
82
98
|
}
|
|
83
|
-
|
|
99
|
+
unsubscribeContext();
|
|
100
|
+
unsubscribeBook();
|
|
84
101
|
};
|
|
85
102
|
}
|
|
86
103
|
//# sourceMappingURL=resolveSubscribeQuote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSubscribeQuote.js","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolveSubscribeQuote.js","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,22 @@ export interface FetchWithRetryOptions {
|
|
|
9
9
|
fetchImpl?: typeof fetch;
|
|
10
10
|
signal?: AbortSignal;
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* True when `error` is an `AbortSignal` cancellation (the native `fetch` abort
|
|
14
|
+
* rejection) rather than a genuine network failure. An abort is a deliberate
|
|
15
|
+
* caller action, so it is rethrown untouched instead of being retried.
|
|
16
|
+
*
|
|
17
|
+
* @internal
|
|
18
|
+
*/
|
|
19
|
+
export declare function isAbortError(error: unknown): boolean;
|
|
12
20
|
/**
|
|
13
21
|
* Wrap `fetch` with policy-driven retry. Honors `Retry-After` (when present
|
|
14
22
|
* and `respectRetryAfter` is true), otherwise falls back to exponential
|
|
15
23
|
* backoff with full jitter, capped by `maxDelayMs`. Network errors (thrown
|
|
16
24
|
* `fetch` rejections) are treated as `retry-network` — same retry budget as
|
|
17
|
-
* 5xx.
|
|
25
|
+
* 5xx. Aborts (a pre-aborted signal, a mid-flight abort rejection, or a signal
|
|
26
|
+
* that fires during a between-retries backoff) reject with the abort reason
|
|
27
|
+
* without any further attempt.
|
|
18
28
|
*
|
|
19
29
|
* @public
|
|
20
30
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAEhF;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED
|
|
1
|
+
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAEhF;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CA4DnB"}
|
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
import { sleep } from '../utils/sleep.js';
|
|
2
|
+
/**
|
|
3
|
+
* True when `error` is an `AbortSignal` cancellation (the native `fetch` abort
|
|
4
|
+
* rejection) rather than a genuine network failure. An abort is a deliberate
|
|
5
|
+
* caller action, so it is rethrown untouched instead of being retried.
|
|
6
|
+
*
|
|
7
|
+
* @internal
|
|
8
|
+
*/
|
|
9
|
+
export function isAbortError(error) {
|
|
10
|
+
return error instanceof Error && error.name === 'AbortError';
|
|
11
|
+
}
|
|
2
12
|
/**
|
|
3
13
|
* Wrap `fetch` with policy-driven retry. Honors `Retry-After` (when present
|
|
4
14
|
* and `respectRetryAfter` is true), otherwise falls back to exponential
|
|
5
15
|
* backoff with full jitter, capped by `maxDelayMs`. Network errors (thrown
|
|
6
16
|
* `fetch` rejections) are treated as `retry-network` — same retry budget as
|
|
7
|
-
* 5xx.
|
|
17
|
+
* 5xx. Aborts (a pre-aborted signal, a mid-flight abort rejection, or a signal
|
|
18
|
+
* that fires during a between-retries backoff) reject with the abort reason
|
|
19
|
+
* without any further attempt.
|
|
8
20
|
*
|
|
9
21
|
* @public
|
|
10
22
|
*/
|
|
@@ -22,6 +34,9 @@ export async function fetchWithRetry(input, init, options) {
|
|
|
22
34
|
response = await fetchImpl(input, mergedInit);
|
|
23
35
|
}
|
|
24
36
|
catch (error) {
|
|
37
|
+
if (isAbortError(error)) {
|
|
38
|
+
throw error;
|
|
39
|
+
}
|
|
25
40
|
networkError = error;
|
|
26
41
|
}
|
|
27
42
|
if (response?.ok) {
|
|
@@ -54,7 +69,7 @@ export async function fetchWithRetry(input, init, options) {
|
|
|
54
69
|
}
|
|
55
70
|
const delayMs = computeDelay(policy, attempt, response);
|
|
56
71
|
if (delayMs > 0) {
|
|
57
|
-
await sleep(delayMs);
|
|
72
|
+
await sleep(delayMs, signal);
|
|
58
73
|
}
|
|
59
74
|
attempt++;
|
|
60
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithRetry.js","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAczC
|
|
1
|
+
{"version":3,"file":"fetchWithRetry.js","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAEzB;;;;GAIG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,+EAA+E;IAC/E,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAEzB;;;;GAIG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,+EAA+E;IAC/E,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,CAuEZ;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAC5D,MAAM,CAWR"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { PerpsErrorCode } from '@lifi/perps-types';
|
|
2
2
|
import { PerpsError } from '../errors/PerpsError.js';
|
|
3
3
|
import { version } from '../version.js';
|
|
4
|
-
import { fetchWithRetry } from './fetchWithRetry.js';
|
|
4
|
+
import { fetchWithRetry, isAbortError } from './fetchWithRetry.js';
|
|
5
5
|
import { LIFI_REQUEST_KEY, LIFI_RETRY_DEFAULTS, resolveRetryPolicy, } from './retryPolicy.js';
|
|
6
6
|
/**
|
|
7
7
|
* Internal HTTP helper: applies SDK headers, retry policy, and the request
|
|
@@ -61,6 +61,9 @@ export async function request(config, url, options = {}, sdkOptions) {
|
|
|
61
61
|
if (error instanceof PerpsError) {
|
|
62
62
|
throw error;
|
|
63
63
|
}
|
|
64
|
+
if (isAbortError(error)) {
|
|
65
|
+
throw error;
|
|
66
|
+
}
|
|
64
67
|
throw new PerpsError(PerpsErrorCode.ServerError, error instanceof Error ? error.message : 'Request failed');
|
|
65
68
|
}
|
|
66
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Resolve after `ms` milliseconds
|
|
2
|
+
* Resolve after `ms` milliseconds, or reject with the signal's abort reason if
|
|
3
|
+
* `signal` aborts first. Without a `signal` it always resolves.
|
|
3
4
|
*
|
|
4
5
|
* @internal
|
|
5
6
|
*/
|
|
6
|
-
export declare const sleep: (ms: number) => Promise<void>;
|
|
7
|
+
export declare const sleep: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
7
8
|
//# sourceMappingURL=sleep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgBjE,CAAA"}
|
package/dist/esm/utils/sleep.js
CHANGED
|
@@ -1,7 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Resolve after `ms` milliseconds
|
|
2
|
+
* Resolve after `ms` milliseconds, or reject with the signal's abort reason if
|
|
3
|
+
* `signal` aborts first. Without a `signal` it always resolves.
|
|
3
4
|
*
|
|
4
5
|
* @internal
|
|
5
6
|
*/
|
|
6
|
-
export const sleep = (ms) => new Promise((resolve) =>
|
|
7
|
+
export const sleep = (ms, signal) => new Promise((resolve, reject) => {
|
|
8
|
+
if (signal?.aborted) {
|
|
9
|
+
reject(signal.reason ?? new DOMException('Aborted', 'AbortError'));
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
let timer;
|
|
13
|
+
const onAbort = () => {
|
|
14
|
+
clearTimeout(timer);
|
|
15
|
+
reject(signal?.reason ?? new DOMException('Aborted', 'AbortError'));
|
|
16
|
+
};
|
|
17
|
+
timer = setTimeout(() => {
|
|
18
|
+
signal?.removeEventListener('abort', onAbort);
|
|
19
|
+
resolve();
|
|
20
|
+
}, ms);
|
|
21
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
22
|
+
});
|
|
7
23
|
//# sourceMappingURL=sleep.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,MAAoB,EAAiB,EAAE,CACvE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAA;QAClE,OAAM;IACR,CAAC;IACD,IAAI,KAAoC,CAAA;IACxC,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,YAAY,CAAC,KAAK,CAAC,CAAA;QACnB,MAAM,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAA;IACrE,CAAC,CAAA;IACD,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QACtB,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC7C,OAAO,EAAE,CAAA;IACX,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;AAC5D,CAAC,CAAC,CAAA"}
|
package/dist/esm/version.d.ts
CHANGED
package/dist/esm/version.js
CHANGED
|
@@ -12,17 +12,18 @@ export declare const QUOTE_THROTTLE_MS = 100;
|
|
|
12
12
|
/**
|
|
13
13
|
* Shared provider-side `subscribeQuote` implementation: resolve
|
|
14
14
|
* `params.symbol` to a market on `provider` (via {@link resolveQuoteMarket}),
|
|
15
|
-
* subscribe to that market's orderbook
|
|
16
|
-
* update rebuild the {@link Quote}
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
15
|
+
* subscribe to that market's orderbook and marketContext channels on `ws`,
|
|
16
|
+
* and on each book update rebuild the {@link Quote} against the latest
|
|
17
|
+
* {@link MarketContext} with the provider's public base `feeTier` — the same
|
|
18
|
+
* transform the one-shot `resolveQuote` applies to a REST snapshot. Emissions
|
|
19
|
+
* are throttled to {@link QUOTE_THROTTLE_MS}: the first book update emits
|
|
20
|
+
* immediately, then at most one (trailing, latest-book) emission per
|
|
20
21
|
* interval. Both venue WS plugins delegate here; each only supplies its own
|
|
21
22
|
* base tier.
|
|
22
23
|
*
|
|
23
|
-
* The returned unsubscribe is idempotent — it releases
|
|
24
|
-
*
|
|
25
|
-
*
|
|
24
|
+
* The returned unsubscribe is idempotent — it releases both underlying
|
|
25
|
+
* listeners once and cancels any pending trailing emission, so the wire
|
|
26
|
+
* subscriptions' ref counts cannot be double-decremented.
|
|
26
27
|
*
|
|
27
28
|
* @throws {PerpsError} `MarketNotFound` when no market matches symbol+type.
|
|
28
29
|
* @internal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"resolveSubscribeQuote.d.ts","sourceRoot":"","sources":["../../../src/services/resolveSubscribeQuote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EAGR,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,aAAa,EACd,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAGvD;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,MAAM,CAAA;AAEpC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,EACjC,MAAM,EAAE,sBAAsB,EAC9B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,IAAI,CAAC,CAuFrB"}
|
|
@@ -9,12 +9,22 @@ export interface FetchWithRetryOptions {
|
|
|
9
9
|
fetchImpl?: typeof fetch;
|
|
10
10
|
signal?: AbortSignal;
|
|
11
11
|
}
|
|
12
|
+
/**
|
|
13
|
+
* True when `error` is an `AbortSignal` cancellation (the native `fetch` abort
|
|
14
|
+
* rejection) rather than a genuine network failure. An abort is a deliberate
|
|
15
|
+
* caller action, so it is rethrown untouched instead of being retried.
|
|
16
|
+
*
|
|
17
|
+
* @internal
|
|
18
|
+
*/
|
|
19
|
+
export declare function isAbortError(error: unknown): boolean;
|
|
12
20
|
/**
|
|
13
21
|
* Wrap `fetch` with policy-driven retry. Honors `Retry-After` (when present
|
|
14
22
|
* and `respectRetryAfter` is true), otherwise falls back to exponential
|
|
15
23
|
* backoff with full jitter, capped by `maxDelayMs`. Network errors (thrown
|
|
16
24
|
* `fetch` rejections) are treated as `retry-network` — same retry budget as
|
|
17
|
-
* 5xx.
|
|
25
|
+
* 5xx. Aborts (a pre-aborted signal, a mid-flight abort rejection, or a signal
|
|
26
|
+
* that fires during a between-retries backoff) reject with the abort reason
|
|
27
|
+
* without any further attempt.
|
|
18
28
|
*
|
|
19
29
|
* @public
|
|
20
30
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAEhF;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED
|
|
1
|
+
{"version":3,"file":"fetchWithRetry.d.ts","sourceRoot":"","sources":["../../../src/transport/fetchWithRetry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAuB,MAAM,kBAAkB,CAAA;AAEhF;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,mBAAmB,CAAA;IAC3B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACxB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,QAAQ,CAAC,CA4DnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAEzB;;;;GAIG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,+EAA+E;IAC/E,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/transport/request.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,EAGL,KAAK,WAAW,EAEjB,MAAM,kBAAkB,CAAA;AAEzB;;;;GAIG;AACH,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,+EAA+E;IAC/E,KAAK,CAAC,EAAE,WAAW,GAAG,KAAK,CAAA;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,MAAM,EAAE,eAAe,EACvB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,cAAmB,EAC5B,UAAU,CAAC,EAAE,iBAAiB,GAC7B,OAAO,CAAC,CAAC,CAAC,CAuEZ;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,GAC5D,MAAM,CAWR"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Resolve after `ms` milliseconds
|
|
2
|
+
* Resolve after `ms` milliseconds, or reject with the signal's abort reason if
|
|
3
|
+
* `signal` aborts first. Without a `signal` it always resolves.
|
|
3
4
|
*
|
|
4
5
|
* @internal
|
|
5
6
|
*/
|
|
6
|
-
export declare const sleep: (ms: number) => Promise<void>;
|
|
7
|
+
export declare const sleep: (ms: number, signal?: AbortSignal) => Promise<void>;
|
|
7
8
|
//# sourceMappingURL=sleep.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"sleep.d.ts","sourceRoot":"","sources":["../../../src/utils/sleep.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,KAAK,GAAI,IAAI,MAAM,EAAE,SAAS,WAAW,KAAG,OAAO,CAAC,IAAI,CAgBjE,CAAA"}
|
package/dist/types/version.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type {
|
|
2
|
+
FeeTier,
|
|
3
|
+
MarketContext,
|
|
4
|
+
OrderbookResponse,
|
|
5
|
+
} from '@lifi/perps-types'
|
|
2
6
|
import type {
|
|
3
7
|
PerpsSDKClient,
|
|
4
8
|
ProviderGetQuoteParams,
|
|
@@ -20,17 +24,18 @@ export const QUOTE_THROTTLE_MS = 100
|
|
|
20
24
|
/**
|
|
21
25
|
* Shared provider-side `subscribeQuote` implementation: resolve
|
|
22
26
|
* `params.symbol` to a market on `provider` (via {@link resolveQuoteMarket}),
|
|
23
|
-
* subscribe to that market's orderbook
|
|
24
|
-
* update rebuild the {@link Quote}
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
27
|
+
* subscribe to that market's orderbook and marketContext channels on `ws`,
|
|
28
|
+
* and on each book update rebuild the {@link Quote} against the latest
|
|
29
|
+
* {@link MarketContext} with the provider's public base `feeTier` — the same
|
|
30
|
+
* transform the one-shot `resolveQuote` applies to a REST snapshot. Emissions
|
|
31
|
+
* are throttled to {@link QUOTE_THROTTLE_MS}: the first book update emits
|
|
32
|
+
* immediately, then at most one (trailing, latest-book) emission per
|
|
28
33
|
* interval. Both venue WS plugins delegate here; each only supplies its own
|
|
29
34
|
* base tier.
|
|
30
35
|
*
|
|
31
|
-
* The returned unsubscribe is idempotent — it releases
|
|
32
|
-
*
|
|
33
|
-
*
|
|
36
|
+
* The returned unsubscribe is idempotent — it releases both underlying
|
|
37
|
+
* listeners once and cancels any pending trailing emission, so the wire
|
|
38
|
+
* subscriptions' ref counts cannot be double-decremented.
|
|
34
39
|
*
|
|
35
40
|
* @throws {PerpsError} `MarketNotFound` when no market matches symbol+type.
|
|
36
41
|
* @internal
|
|
@@ -44,7 +49,13 @@ export async function resolveSubscribeQuote(
|
|
|
44
49
|
onQuote: QuoteListener
|
|
45
50
|
): Promise<() => void> {
|
|
46
51
|
const market = await resolveQuoteMarket(client, provider, params)
|
|
47
|
-
|
|
52
|
+
// REST snapshot seeds the context; the marketContext subscription below
|
|
53
|
+
// keeps it live so streamed impact/funding track the moving market.
|
|
54
|
+
let latestContext: MarketContext = await resolveQuotePrice(
|
|
55
|
+
client,
|
|
56
|
+
provider,
|
|
57
|
+
market.id
|
|
58
|
+
)
|
|
48
59
|
|
|
49
60
|
let latestBook: OrderbookResponse | undefined
|
|
50
61
|
let lastEmitAt = Number.NEGATIVE_INFINITY
|
|
@@ -63,7 +74,7 @@ export async function resolveSubscribeQuote(
|
|
|
63
74
|
side: params.side,
|
|
64
75
|
sizeUsd: params.size,
|
|
65
76
|
market,
|
|
66
|
-
price,
|
|
77
|
+
price: latestContext,
|
|
67
78
|
bids: latestBook.bids,
|
|
68
79
|
asks: latestBook.asks,
|
|
69
80
|
feeTier,
|
|
@@ -72,28 +83,44 @@ export async function resolveSubscribeQuote(
|
|
|
72
83
|
)
|
|
73
84
|
}
|
|
74
85
|
|
|
75
|
-
const
|
|
76
|
-
{ channel: '
|
|
86
|
+
const unsubscribeContext = await ws.subscribe(
|
|
87
|
+
{ channel: 'marketContext', dex: provider, marketId: market.id },
|
|
77
88
|
(event) => {
|
|
78
|
-
if (event.channel !== '
|
|
79
|
-
return
|
|
80
|
-
}
|
|
81
|
-
latestBook = event.data
|
|
82
|
-
if (trailing !== undefined) {
|
|
89
|
+
if (event.channel !== 'marketContext') {
|
|
83
90
|
return
|
|
84
91
|
}
|
|
85
|
-
|
|
86
|
-
if (wait <= 0) {
|
|
87
|
-
emit()
|
|
88
|
-
} else {
|
|
89
|
-
trailing = setTimeout(() => {
|
|
90
|
-
trailing = undefined
|
|
91
|
-
emit()
|
|
92
|
-
}, wait)
|
|
93
|
-
}
|
|
92
|
+
latestContext = event.data
|
|
94
93
|
}
|
|
95
94
|
)
|
|
96
95
|
|
|
96
|
+
let unsubscribeBook: () => void
|
|
97
|
+
try {
|
|
98
|
+
unsubscribeBook = await ws.subscribe(
|
|
99
|
+
{ channel: 'orderbook', dex: provider, marketId: market.id },
|
|
100
|
+
(event) => {
|
|
101
|
+
if (event.channel !== 'orderbook') {
|
|
102
|
+
return
|
|
103
|
+
}
|
|
104
|
+
latestBook = event.data
|
|
105
|
+
if (trailing !== undefined) {
|
|
106
|
+
return
|
|
107
|
+
}
|
|
108
|
+
const wait = QUOTE_THROTTLE_MS - (Date.now() - lastEmitAt)
|
|
109
|
+
if (wait <= 0) {
|
|
110
|
+
emit()
|
|
111
|
+
} else {
|
|
112
|
+
trailing = setTimeout(() => {
|
|
113
|
+
trailing = undefined
|
|
114
|
+
emit()
|
|
115
|
+
}, wait)
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
)
|
|
119
|
+
} catch (error) {
|
|
120
|
+
unsubscribeContext()
|
|
121
|
+
throw error
|
|
122
|
+
}
|
|
123
|
+
|
|
97
124
|
let released = false
|
|
98
125
|
return () => {
|
|
99
126
|
if (released) {
|
|
@@ -104,6 +131,7 @@ export async function resolveSubscribeQuote(
|
|
|
104
131
|
clearTimeout(trailing)
|
|
105
132
|
trailing = undefined
|
|
106
133
|
}
|
|
107
|
-
|
|
134
|
+
unsubscribeContext()
|
|
135
|
+
unsubscribeBook()
|
|
108
136
|
}
|
|
109
137
|
}
|
|
@@ -12,12 +12,25 @@ export interface FetchWithRetryOptions {
|
|
|
12
12
|
signal?: AbortSignal
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* True when `error` is an `AbortSignal` cancellation (the native `fetch` abort
|
|
17
|
+
* rejection) rather than a genuine network failure. An abort is a deliberate
|
|
18
|
+
* caller action, so it is rethrown untouched instead of being retried.
|
|
19
|
+
*
|
|
20
|
+
* @internal
|
|
21
|
+
*/
|
|
22
|
+
export function isAbortError(error: unknown): boolean {
|
|
23
|
+
return error instanceof Error && error.name === 'AbortError'
|
|
24
|
+
}
|
|
25
|
+
|
|
15
26
|
/**
|
|
16
27
|
* Wrap `fetch` with policy-driven retry. Honors `Retry-After` (when present
|
|
17
28
|
* and `respectRetryAfter` is true), otherwise falls back to exponential
|
|
18
29
|
* backoff with full jitter, capped by `maxDelayMs`. Network errors (thrown
|
|
19
30
|
* `fetch` rejections) are treated as `retry-network` — same retry budget as
|
|
20
|
-
* 5xx.
|
|
31
|
+
* 5xx. Aborts (a pre-aborted signal, a mid-flight abort rejection, or a signal
|
|
32
|
+
* that fires during a between-retries backoff) reject with the abort reason
|
|
33
|
+
* without any further attempt.
|
|
21
34
|
*
|
|
22
35
|
* @public
|
|
23
36
|
*/
|
|
@@ -40,6 +53,9 @@ export async function fetchWithRetry(
|
|
|
40
53
|
try {
|
|
41
54
|
response = await fetchImpl(input, mergedInit)
|
|
42
55
|
} catch (error) {
|
|
56
|
+
if (isAbortError(error)) {
|
|
57
|
+
throw error
|
|
58
|
+
}
|
|
43
59
|
networkError = error
|
|
44
60
|
}
|
|
45
61
|
|
|
@@ -78,7 +94,7 @@ export async function fetchWithRetry(
|
|
|
78
94
|
|
|
79
95
|
const delayMs = computeDelay(policy, attempt, response)
|
|
80
96
|
if (delayMs > 0) {
|
|
81
|
-
await sleep(delayMs)
|
|
97
|
+
await sleep(delayMs, signal)
|
|
82
98
|
}
|
|
83
99
|
attempt++
|
|
84
100
|
}
|
package/src/transport/request.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { PerpsErrorCode } from '@lifi/perps-types'
|
|
|
3
3
|
import { PerpsError } from '../errors/PerpsError.js'
|
|
4
4
|
import type { PerpsBaseConfig, SDKRequestOptions } from '../types/config.js'
|
|
5
5
|
import { version } from '../version.js'
|
|
6
|
-
import { fetchWithRetry } from './fetchWithRetry.js'
|
|
6
|
+
import { fetchWithRetry, isAbortError } from './fetchWithRetry.js'
|
|
7
7
|
import {
|
|
8
8
|
LIFI_REQUEST_KEY,
|
|
9
9
|
LIFI_RETRY_DEFAULTS,
|
|
@@ -94,6 +94,10 @@ export async function request<T>(
|
|
|
94
94
|
throw error
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
+
if (isAbortError(error)) {
|
|
98
|
+
throw error
|
|
99
|
+
}
|
|
100
|
+
|
|
97
101
|
throw new PerpsError(
|
|
98
102
|
PerpsErrorCode.ServerError,
|
|
99
103
|
error instanceof Error ? error.message : 'Request failed'
|
package/src/utils/sleep.ts
CHANGED
|
@@ -1,7 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Resolve after `ms` milliseconds
|
|
2
|
+
* Resolve after `ms` milliseconds, or reject with the signal's abort reason if
|
|
3
|
+
* `signal` aborts first. Without a `signal` it always resolves.
|
|
3
4
|
*
|
|
4
5
|
* @internal
|
|
5
6
|
*/
|
|
6
|
-
export const sleep = (ms: number): Promise<void> =>
|
|
7
|
-
new Promise((resolve) =>
|
|
7
|
+
export const sleep = (ms: number, signal?: AbortSignal): Promise<void> =>
|
|
8
|
+
new Promise((resolve, reject) => {
|
|
9
|
+
if (signal?.aborted) {
|
|
10
|
+
reject(signal.reason ?? new DOMException('Aborted', 'AbortError'))
|
|
11
|
+
return
|
|
12
|
+
}
|
|
13
|
+
let timer: ReturnType<typeof setTimeout>
|
|
14
|
+
const onAbort = () => {
|
|
15
|
+
clearTimeout(timer)
|
|
16
|
+
reject(signal?.reason ?? new DOMException('Aborted', 'AbortError'))
|
|
17
|
+
}
|
|
18
|
+
timer = setTimeout(() => {
|
|
19
|
+
signal?.removeEventListener('abort', onAbort)
|
|
20
|
+
resolve()
|
|
21
|
+
}, ms)
|
|
22
|
+
signal?.addEventListener('abort', onAbort, { once: true })
|
|
23
|
+
})
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/perps-sdk'
|
|
2
|
-
export const version = '1.5.
|
|
2
|
+
export const version = '1.5.5'
|