mzoe/ritmex-bot
1
0
Fork 0
mirror of https://github.com/discountry/ritmex-bot.git synced 2026-09-09 08:18:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance toAccountSnapshot function with improved market ID and symbol matching logic, and add corresponding unit tests

Browse Source
This commit is contained in:
discountry
2025-11-08 17:14:01 +08:00
parent 274e2f3d75
commit e94cf1bda2
2 changed files with 92 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/exchanges/lighter/mappers.ts
+36 -9
View File
@@ -144,16 +144,23 @@ export function toAccountSnapshot(
assets: AsterAccountAsset[] = [],
options?: { marketSymbol?: string | null; marketId?: number | null }
): AsterAccountSnapshot {
const targetSymbol = options?.marketSymbol?.toUpperCase();
const targetMarketId = options?.marketId;
const targetSymbol = options?.marketSymbol ?? null;
const targetMarketId =
options?.marketId != null && Number.isFinite(Number(options.marketId))
? Number(options.marketId)
: null;
const filteredPositions = positions.filter((position) => {
const marketMatches =
targetMarketId == null ||
(Number.isFinite(Number(position.market_id)) && Number(position.market_id) === Number(targetMarketId));
const symbolMatches =
!targetSymbol ||
(typeof position.symbol === "string" && position.symbol.toUpperCase() === targetSymbol);
return marketMatches && symbolMatches;
if (targetMarketId != null) {
const positionMarketId = Number(position.market_id);
if (Number.isFinite(positionMarketId)) {
return positionMarketId === targetMarketId;
}
return targetSymbol ? symbolsMatch(position.symbol, targetSymbol) : false;
}
if (targetSymbol) {
return symbolsMatch(position.symbol, targetSymbol);
}
return true;
});
const transformedPositions = filteredPositions.map((position) => lighterPositionToAster(symbol, position));
const aggregateUnrealized = transformedPositions.reduce((acc, pos) => acc + Number(pos.unrealizedProfit ?? 0), 0);
@@ -201,3 +208,23 @@ function lighterPositionToAster(symbol: string, position: LighterPosition): Aste
markPrice: undefined,
};
}
function symbolsMatch(source: string | null | undefined, target: string | null | undefined): boolean {
if (!source || !target) return false;
const sourceForms = normalizeSymbolForms(source);
const targetForms = normalizeSymbolForms(target);
if (!sourceForms.length || !targetForms.length) return false;
return sourceForms.some((value) => targetForms.includes(value));
}
function normalizeSymbolForms(value: string): string[] {
const upper = value.toUpperCase();
const sanitized = upper.replace(/[^A-Z0-9]/g, "");
const parts = upper.split(/[-:/]/).filter(Boolean);
const base = parts.length ? parts[0] : "";
const forms = new Set<string>();
if (upper) forms.add(upper);
if (sanitized) forms.add(sanitized);
if (base) forms.add(base);
return Array.from(forms);
}