@tradejs/cli 2.0.6 → 2.0.7

package/dist/scripts/signalsSummary.js

@@ -205,6 +205,18 @@ var consumeClosedPnlMatch = (buckets, trade) => {
   const [row] = rows.splice(matchIndex, 1);
   return row ?? null;
 };
+var isRuntimeTradeInConnectorScope = (trade, connector) => {
+  if (trade.deploymentId && trade.deploymentId !== connector.deploymentId) {
+    return false;
+  }
+  if (trade.accountId && trade.accountId !== connector.accountId) {
+    return false;
+  }
+  if (trade.universe && connector.universe && trade.universe !== connector.universe) {
+    return false;
+  }
+  return true;
+};
 var syncRuntimeTrades = async ({
   userName,
   connector,
@@ -228,16 +240,23 @@ var syncRuntimeTrades = async ({
   const openPositionsBySymbol = new Map(
     openPositions.map((position) => [position.symbol, position])
   );
-  const activeOrderIdBySymbol = /* @__PURE__ */ new Map();
-  const symbols = [...new Set(trades.map((trade) => trade.symbol))];
+  const activeOrderIdByKey = /* @__PURE__ */ new Map();
+  const activeTradeKeys = [
+    ...new Set(
+      trades.filter((trade) => isRuntimeTradeInConnectorScope(trade, connector)).map(
+        (trade) => import_redis2.redisKeys.runtimeActiveTrade(
+          userName,
+          trade.symbol,
+          trade.deploymentId ?? trade.accountId
+        )
+      )
+    )
+  ];
   await Promise.all(
-    symbols.map(async (symbol) => {
-      const activeRef = await (0, import_redis2.getData)(
-        import_redis2.redisKeys.runtimeActiveTrade(userName, symbol),
-        null
-      );
-      activeOrderIdBySymbol.set(
-        symbol,
+    activeTradeKeys.map(async (key) => {
+      const activeRef = await (0, import_redis2.getData)(key, null);
+      activeOrderIdByKey.set(
+        key,
         typeof activeRef?.orderId === "string" ? activeRef.orderId : null
       );
     })
@@ -256,12 +275,21 @@ var syncRuntimeTrades = async ({
   }
   const syncedTrades = [];
   for (const trade of trades) {
+    if (!isRuntimeTradeInConnectorScope(trade, connector)) {
+      syncedTrades.push(trade);
+      continue;
+    }
     if (trade.status !== "active" && !isRuntimeTradeSyncFallbackClose(trade)) {
       syncedTrades.push(trade);
       continue;
     }
+    const activeTradeKey = import_redis2.redisKeys.runtimeActiveTrade(
+      userName,
+      trade.symbol,
+      trade.deploymentId ?? trade.accountId
+    );
     const openPosition = openPositionsBySymbol.get(trade.symbol);
-    const activeOrderId = activeOrderIdBySymbol.get(trade.symbol);
+    const activeOrderId = activeOrderIdByKey.get(activeTradeKey);
     const isCurrentActiveTrade = activeOrderId === trade.orderId;
     if (trade.status === "active" && !openPositionsReliable) {
       syncedTrades.push({
@@ -300,6 +328,7 @@ var syncRuntimeTrades = async ({
     }
     const matchedClosedPnl = consumeClosedPnlMatch(closedPnlBuckets, trade);
     if (!matchedClosedPnl) {
+      syncedTrades.push(trade);
       continue;
     }
     const nextTrade = {
@@ -332,7 +361,7 @@ var syncRuntimeTrades = async ({
         nextTrade,
         { expire: import_constants.TTL_1M }
       ),
-      ...isCurrentActiveTrade ? [(0, import_redis2.delKey)(import_redis2.redisKeys.runtimeActiveTrade(userName, trade.symbol))] : []
+      ...isCurrentActiveTrade ? [(0, import_redis2.delKey)(activeTradeKey)] : []
     ]);
     syncedTrades.push(nextTrade);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/cli",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Official CLI for the TradeJS TypeScript framework: infra setup, backtests, signals, bots, and ML workflows.",
   "keywords": [
     "tradejs",
@@ -29,14 +29,14 @@
     "tradejs": "dist/cli.js"
   },
   "dependencies": {
-    "@tradejs/base": "^2.0.6",
-    "@tradejs/connectors": "^2.0.6",
-    "@tradejs/core": "^2.0.6",
-    "@tradejs/indicators": "^2.0.6",
-    "@tradejs/infra": "^2.0.6",
-    "@tradejs/node": "^2.0.6",
-    "@tradejs/strategies": "^2.0.6",
-    "@tradejs/types": "^2.0.6",
+    "@tradejs/base": "^2.0.7",
+    "@tradejs/connectors": "^2.0.7",
+    "@tradejs/core": "^2.0.7",
+    "@tradejs/indicators": "^2.0.7",
+    "@tradejs/infra": "^2.0.7",
+    "@tradejs/node": "^2.0.7",
+    "@tradejs/strategies": "^2.0.7",
+    "@tradejs/types": "^2.0.7",
     "args": "^5.0.3",
     "bcryptjs": "^2.4.3",
     "chalk": "4.1.2",
@@ -70,6 +70,7 @@
     "ai-pocket-search": "yarn run run:dist ai-pocket-search",
     "ai-train": "yarn run run:dist ai-train",
     "backtest": "yarn run run:dist backtest",
+    "breadth:universes:update": "yarn run run:dist binance:breadth-universes:update",
     "bot": "yarn run run:dist bot",
     "candles:migrate-provider": "yarn run run:dist candles:migrate-provider",
     "signals": "yarn run run:dist signals",