@tradejs/node 3.1.27 → 3.1.28-beta.251

package/dist/runtimeDashboard.mjs

@@ -1,16 +1,16 @@
 import {
   listRuntimeDeployments,
   loadResolvedRuntimeStrategies
-} from "./chunk-NQO2MFP6.mjs";
+} from "./chunk-K2YQ3MQC.mjs";
 import {
   buildExchangeFallbackRuntimeTrades,
   takeClosedPnlMatch
-} from "./chunk-FB5NUEOQ.mjs";
+} from "./chunk-OFVUEYUR.mjs";
 import {
   getConnectorCreatorByProvider
 } from "./chunk-QVKUROR2.mjs";
-import "./chunk-XHNJ757K.mjs";
-import "./chunk-IKRSNRP6.mjs";
+import "./chunk-VQSGH7YA.mjs";
+import "./chunk-UITD6LG6.mjs";
 import "./chunk-LZDXRXIU.mjs";
 import "./chunk-Y6FXYEAI.mjs";
 
@@ -249,6 +249,32 @@ var MIN_HOURS = 6;
 var MAX_HOURS = 24 * 90;
 var BYBIT_MAX_TIME_RANGE_MS = 7 * 24 * 60 * 60 * 1e3 - 1e3;
 var EXCHANGE_REQUEST_TIMEOUT_MS = 15e3;
+var groupRuntimeTradesByIdentity = (trades, identities) => {
+  const grouped = /* @__PURE__ */ new Map();
+  for (const trade of trades) {
+    const matches = [...identities.entries()].filter(([, identity]) => {
+      if (trade.strategy !== identity.strategyName || String(trade.interval) !== String(identity.interval)) {
+        return false;
+      }
+      if (trade.deploymentId && trade.deploymentId !== identity.deploymentId) {
+        return false;
+      }
+      if (trade.accountId && trade.accountId !== identity.accountId) {
+        return false;
+      }
+      if (trade.universe && trade.universe !== identity.universe) {
+        return false;
+      }
+      return true;
+    });
+    if (matches.length !== 1) continue;
+    const [runtimeKey] = matches[0];
+    const bucket = grouped.get(runtimeKey) ?? [];
+    bucket.push(trade);
+    grouped.set(runtimeKey, bucket);
+  }
+  return grouped;
+};
 var coerceHours = (value) => {
   const parsed = Number(value ?? Number.NaN);
   if (!Number.isFinite(parsed)) {
@@ -579,6 +605,7 @@ var loadRuntimeDashboard = async ({
   const syncedTrades = [...unsyncedTrades, ...syncedConnectorTrades];
   const fallbackTrades = [];
   for (const {
+    connector,
     strategyNames,
     entryRows,
     closedPnlRows,
@@ -591,7 +618,12 @@ var loadRuntimeDashboard = async ({
         openPositions: openPositionsSnapshot.positions,
         strategyNames,
         existingTrades: [...syncedTrades, ...fallbackTrades],
-        endTime
+        endTime,
+        scope: {
+          accountId: connector.accountId,
+          deploymentId: connector.deploymentId,
+          universe: connector.universe
+        }
       })
     );
   }
@@ -634,6 +666,9 @@ var loadRuntimeDashboard = async ({
       });
       identityByKey.set(runtimeKey, {
         strategyName: resolvedStrategy.strategyName,
+        strategyModule: resolvedStrategy.strategyModule,
+        strategyPackage: resolvedStrategy.strategyPackage,
+        strategyPackageVersion: resolvedStrategy.strategyPackageVersion,
         configId: strategyConfigId,
         strategyRevision: resolvedStrategy.strategyRevision,
         controlState: resolvedStrategy.controlState,
@@ -642,6 +677,8 @@ var loadRuntimeDashboard = async ({
         accountId: deployment.accountId,
         accountLabel: accountsById.get(deployment.accountId)?.label,
         deploymentId: deployment.id,
+        deploymentLabel: deployment.label,
+        ...resolvedStrategy.generation ? { generation: resolvedStrategy.generation } : {},
         policyProfileId: strategyPolicyProfileId,
         enabled: resolvedStrategy.controlState !== "entries_paused",
         config: resolvedStrategy.strategyConfig,
@@ -650,12 +687,16 @@ var loadRuntimeDashboard = async ({
       });
     }
   }
+  const tradesByRuntimeKey = groupRuntimeTradesByIdentity(
+    allTrades,
+    identityByKey
+  );
   const strategies = await Promise.all(
     [...identityByKey.entries()].map(async ([runtimeKey, identity]) => {
       const { strategyName } = identity;
-      const strategyTrades = allTrades.filter(
-        (trade) => trade.strategy === strategyName && String(trade.interval) === String(identity.interval)
-      ).sort((left, right) => right.entryTimestamp - left.entryTimestamp);
+      const strategyTrades = (tradesByRuntimeKey.get(runtimeKey) ?? []).sort(
+        (left, right) => right.entryTimestamp - left.entryTimestamp
+      );
       const orders = strategyTrades.sort((left, right) => {
         const leftDate = left.exitTimestamp ?? left.entryTimestamp;
         const rightDate = right.exitTimestamp ?? right.entryTimestamp;
@@ -670,14 +711,19 @@ var loadRuntimeDashboard = async ({
       return {
         runtimeKey,
         strategyName,
+        strategyModule: identity.strategyModule,
+        strategyPackage: identity.strategyPackage,
+        strategyPackageVersion: identity.strategyPackageVersion,
         configId: identity.configId,
         strategyRevision: identity.strategyRevision,
+        ...identity.generation ? { generation: identity.generation } : {},
         controlState: identity.controlState,
         interval: identity.interval,
         universe: identity.universe,
         accountId: identity.accountId,
         accountLabel: identity.accountLabel,
         deploymentId: identity.deploymentId,
+        deploymentLabel: identity.deploymentLabel,
         ...identity.selection ? { selection: identity.selection } : {},
         policyProfileId: identity.policyProfileId,
         connected: identity.connected,

package/dist/runtimeStrategies.d.mts

@@ -8,6 +8,7 @@ interface RuntimePackageManifest {
 }
 interface ResolvedRuntimeStrategy {
     strategyName: string;
+    strategyModule: string;
     strategyRevision: string;
     deploymentCompositionId: string;
     generation?: string;
@@ -27,6 +28,7 @@ interface ResolvedRuntimeStrategy {
 }
 interface ResolvedStrategyComposition {
     strategyName: string;
+    strategyModule: string;
     strategyRevision: string;
     generation?: string;
     enabled: boolean;
@@ -93,9 +95,10 @@ declare const loadResolvedRuntimeStrategies: ({ userName, projectRoot, deploymen
     accountId?: string;
     interval?: Interval;
 }) => Promise<ResolvedRuntimeStrategy[]>;
-declare const getRuntimeStrategyPackageMetadata: ({ strategyName, projectRoot, }: {
+declare const getRuntimeStrategyPackageMetadata: ({ strategyName, projectRoot, strategyModule, }: {
     strategyName: string;
     projectRoot: string;
+    strategyModule?: string;
 }) => Promise<{
     strategyPackage: string;
     strategyPackageVersion: string;

package/dist/runtimeStrategies.d.ts

@@ -8,6 +8,7 @@ interface RuntimePackageManifest {
 }
 interface ResolvedRuntimeStrategy {
     strategyName: string;
+    strategyModule: string;
     strategyRevision: string;
     deploymentCompositionId: string;
     generation?: string;
@@ -27,6 +28,7 @@ interface ResolvedRuntimeStrategy {
 }
 interface ResolvedStrategyComposition {
     strategyName: string;
+    strategyModule: string;
     strategyRevision: string;
     generation?: string;
     enabled: boolean;
@@ -93,9 +95,10 @@ declare const loadResolvedRuntimeStrategies: ({ userName, projectRoot, deploymen
     accountId?: string;
     interval?: Interval;
 }) => Promise<ResolvedRuntimeStrategy[]>;
-declare const getRuntimeStrategyPackageMetadata: ({ strategyName, projectRoot, }: {
+declare const getRuntimeStrategyPackageMetadata: ({ strategyName, projectRoot, strategyModule, }: {
     strategyName: string;
     projectRoot: string;
+    strategyModule?: string;
 }) => Promise<{
     strategyPackage: string;
     strategyPackageVersion: string;