@tradejs/cli 2.0.18 → 2.0.19

package/dist/lib/runtimeDebugEvidence.js

@@ -34,17 +34,7 @@ var import_redis3 = require("@tradejs/infra/redis");
 // src/lib/runtimeRedis.ts
 var import_redis = require("@tradejs/infra/redis");
 var import_time = require("@tradejs/core/time");
-var RESERVED_STRATEGY_NAMES = /* @__PURE__ */ new Set(["charts"]);
-var RESERVED_CONFIG_IDS = /* @__PURE__ */ new Set(["results"]);
-var resolveStrategyConfigIdentityByKey = (userName, key) => {
-  const parts = key.split(":");
-  if (parts.length !== 5) return null;
-  const [users, keyUserName, strategiesKey, strategyName, configId] = parts;
-  if (users !== "users" || keyUserName !== userName || strategiesKey !== "strategies" || !strategyName || !configId || RESERVED_STRATEGY_NAMES.has(strategyName) || RESERVED_CONFIG_IDS.has(configId) || !/^[a-zA-Z0-9_-]+$/.test(configId)) {
-    return null;
-  }
-  return { strategyName, configId };
-};
+var import_runtimeStrategyConfigs = require("@tradejs/infra/runtimeStrategyConfigs");
 var isRuntimeTradeRecord = (value) => {
   if (!value || typeof value !== "object") {
     return false;
@@ -52,42 +42,6 @@ var isRuntimeTradeRecord = (value) => {
   const record = value;
   return typeof record.orderId === "string" && typeof record.strategy === "string" && typeof record.symbol === "string" && typeof record.entryTimestamp === "number" && typeof record.entryPrice === "number" && typeof record.qty === "number" && (record.direction === "LONG" || record.direction === "SHORT");
 };
-var resolveStrategyNameByConfigKey = (userName, key) => {
-  return resolveStrategyConfigIdentityByKey(userName, key)?.strategyName ?? null;
-};
-var getRuntimeStrategyConfigKeys = async (userName) => {
-  const keys = await (0, import_redis.getKeys)(`${import_redis.redisKeys.strategies(userName)}:`);
-  return keys.filter((key) => resolveStrategyConfigIdentityByKey(userName, key)).sort((left, right) => left.localeCompare(right));
-};
-var loadRuntimeStrategyConfigs = async (userName, {
-  onInvalidConfig
-} = {}) => {
-  const configKeys = await getRuntimeStrategyConfigKeys(userName);
-  const strategyConfigs = await Promise.all(
-    configKeys.map(async (key) => {
-      const strategyName = resolveStrategyNameByConfigKey(userName, key);
-      const identity = resolveStrategyConfigIdentityByKey(userName, key);
-      if (!strategyName || !identity) {
-        return null;
-      }
-      const strategyConfig = await (0, import_redis.getData)(
-        key,
-        null
-      );
-      if (!strategyConfig || typeof strategyConfig !== "object" || Array.isArray(strategyConfig)) {
-        onInvalidConfig?.(key);
-        return null;
-      }
-      return {
-        key,
-        strategyName,
-        configId: identity.configId,
-        strategyConfig
-      };
-    })
-  );
-  return strategyConfigs.filter(Boolean);
-};
 var loadRuntimeTrades = async (userName, {
   startTime,
   endTime
@@ -356,7 +310,7 @@ var collectRuntimeDebugEvidence = async ({
     loadRuntimeSignals(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluations(userName, { startTime, endTime }),
     loadRuntimeSignalEvaluationStatsBuckets(userName),
-    loadRuntimeStrategyConfigs(userName)
+    (0, import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs)(userName)
   ]);
   const tradesByOrderId = new Map(
     entryTrades.map((trade) => [trade.orderId, trade])

package/dist/lib/runtimeRedis.js

@@ -20,32 +20,22 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/lib/runtimeRedis.ts
 var runtimeRedis_exports = {};
 __export(runtimeRedis_exports, {
-  getRuntimeStrategyConfigKeys: () => getRuntimeStrategyConfigKeys,
+  getRuntimeStrategyConfigKeys: () => import_runtimeStrategyConfigs.getRuntimeStrategyConfigKeys,
   isRuntimeStrategyEnabled: () => isRuntimeStrategyEnabled,
   isRuntimeTradeRecord: () => isRuntimeTradeRecord,
   loadRuntimeActiveTradeOrderIds: () => loadRuntimeActiveTradeOrderIds,
   loadRuntimeClosedTrades: () => loadRuntimeClosedTrades,
-  loadRuntimeStrategyConfigs: () => loadRuntimeStrategyConfigs,
-  loadRuntimeStrategyNames: () => loadRuntimeStrategyNames,
+  loadRuntimeStrategyConfigs: () => import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs,
+  loadRuntimeStrategyNames: () => import_runtimeStrategyConfigs.loadRuntimeStrategyNames,
   loadRuntimeTrades: () => loadRuntimeTrades,
   loadStrategyResultSymbols: () => loadStrategyResultSymbols,
-  resolveStrategyConfigIdentityByKey: () => resolveStrategyConfigIdentityByKey,
-  resolveStrategyNameByConfigKey: () => resolveStrategyNameByConfigKey
+  resolveStrategyConfigIdentityByKey: () => import_runtimeStrategyConfigs.resolveStrategyConfigIdentityByKey,
+  resolveStrategyNameByConfigKey: () => import_runtimeStrategyConfigs.resolveStrategyNameByConfigKey
 });
 module.exports = __toCommonJS(runtimeRedis_exports);
 var import_redis = require("@tradejs/infra/redis");
 var import_time = require("@tradejs/core/time");
-var RESERVED_STRATEGY_NAMES = /* @__PURE__ */ new Set(["charts"]);
-var RESERVED_CONFIG_IDS = /* @__PURE__ */ new Set(["results"]);
-var resolveStrategyConfigIdentityByKey = (userName, key) => {
-  const parts = key.split(":");
-  if (parts.length !== 5) return null;
-  const [users, keyUserName, strategiesKey, strategyName, configId] = parts;
-  if (users !== "users" || keyUserName !== userName || strategiesKey !== "strategies" || !strategyName || !configId || RESERVED_STRATEGY_NAMES.has(strategyName) || RESERVED_CONFIG_IDS.has(configId) || !/^[a-zA-Z0-9_-]+$/.test(configId)) {
-    return null;
-  }
-  return { strategyName, configId };
-};
+var import_runtimeStrategyConfigs = require("@tradejs/infra/runtimeStrategyConfigs");
 var isRuntimeStrategyEnabled = (strategyConfig) => {
   const enabled = strategyConfig.ENABLE;
   return enabled !== false;
@@ -57,47 +47,6 @@ var isRuntimeTradeRecord = (value) => {
   const record = value;
   return typeof record.orderId === "string" && typeof record.strategy === "string" && typeof record.symbol === "string" && typeof record.entryTimestamp === "number" && typeof record.entryPrice === "number" && typeof record.qty === "number" && (record.direction === "LONG" || record.direction === "SHORT");
 };
-var resolveStrategyNameByConfigKey = (userName, key) => {
-  return resolveStrategyConfigIdentityByKey(userName, key)?.strategyName ?? null;
-};
-var getRuntimeStrategyConfigKeys = async (userName) => {
-  const keys = await (0, import_redis.getKeys)(`${import_redis.redisKeys.strategies(userName)}:`);
-  return keys.filter((key) => resolveStrategyConfigIdentityByKey(userName, key)).sort((left, right) => left.localeCompare(right));
-};
-var loadRuntimeStrategyNames = async (userName) => [
-  ...new Set(
-    (await getRuntimeStrategyConfigKeys(userName)).map((key) => resolveStrategyNameByConfigKey(userName, key)).filter((value) => Boolean(value))
-  )
-].sort((left, right) => left.localeCompare(right));
-var loadRuntimeStrategyConfigs = async (userName, {
-  onInvalidConfig
-} = {}) => {
-  const configKeys = await getRuntimeStrategyConfigKeys(userName);
-  const strategyConfigs = await Promise.all(
-    configKeys.map(async (key) => {
-      const strategyName = resolveStrategyNameByConfigKey(userName, key);
-      const identity = resolveStrategyConfigIdentityByKey(userName, key);
-      if (!strategyName || !identity) {
-        return null;
-      }
-      const strategyConfig = await (0, import_redis.getData)(
-        key,
-        null
-      );
-      if (!strategyConfig || typeof strategyConfig !== "object" || Array.isArray(strategyConfig)) {
-        onInvalidConfig?.(key);
-        return null;
-      }
-      return {
-        key,
-        strategyName,
-        configId: identity.configId,
-        strategyConfig
-      };
-    })
-  );
-  return strategyConfigs.filter(Boolean);
-};
 var loadRuntimeTrades = async (userName, {
   startTime,
   endTime

package/dist/lib/runtimeStrategyBacktest.js

@@ -40,57 +40,11 @@ var import_chalk = __toESM(require("chalk"));
 // src/lib/runtimeRedis.ts
 var import_redis = require("@tradejs/infra/redis");
 var import_time = require("@tradejs/core/time");
-var RESERVED_STRATEGY_NAMES = /* @__PURE__ */ new Set(["charts"]);
-var RESERVED_CONFIG_IDS = /* @__PURE__ */ new Set(["results"]);
-var resolveStrategyConfigIdentityByKey = (userName, key) => {
-  const parts = key.split(":");
-  if (parts.length !== 5) return null;
-  const [users, keyUserName, strategiesKey, strategyName, configId] = parts;
-  if (users !== "users" || keyUserName !== userName || strategiesKey !== "strategies" || !strategyName || !configId || RESERVED_STRATEGY_NAMES.has(strategyName) || RESERVED_CONFIG_IDS.has(configId) || !/^[a-zA-Z0-9_-]+$/.test(configId)) {
-    return null;
-  }
-  return { strategyName, configId };
-};
+var import_runtimeStrategyConfigs = require("@tradejs/infra/runtimeStrategyConfigs");
 var isRuntimeStrategyEnabled = (strategyConfig) => {
   const enabled = strategyConfig.ENABLE;
   return enabled !== false;
 };
-var resolveStrategyNameByConfigKey = (userName, key) => {
-  return resolveStrategyConfigIdentityByKey(userName, key)?.strategyName ?? null;
-};
-var getRuntimeStrategyConfigKeys = async (userName) => {
-  const keys = await (0, import_redis.getKeys)(`${import_redis.redisKeys.strategies(userName)}:`);
-  return keys.filter((key) => resolveStrategyConfigIdentityByKey(userName, key)).sort((left, right) => left.localeCompare(right));
-};
-var loadRuntimeStrategyConfigs = async (userName, {
-  onInvalidConfig
-} = {}) => {
-  const configKeys = await getRuntimeStrategyConfigKeys(userName);
-  const strategyConfigs = await Promise.all(
-    configKeys.map(async (key) => {
-      const strategyName = resolveStrategyNameByConfigKey(userName, key);
-      const identity = resolveStrategyConfigIdentityByKey(userName, key);
-      if (!strategyName || !identity) {
-        return null;
-      }
-      const strategyConfig = await (0, import_redis.getData)(
-        key,
-        null
-      );
-      if (!strategyConfig || typeof strategyConfig !== "object" || Array.isArray(strategyConfig)) {
-        onInvalidConfig?.(key);
-        return null;
-      }
-      return {
-        key,
-        strategyName,
-        configId: identity.configId,
-        strategyConfig
-      };
-    })
-  );
-  return strategyConfigs.filter(Boolean);
-};
 
 // src/lib/runtimeStrategyBacktest.ts
 var BACKTEST_CLI_RUNTIME_CONFIG_KEYS = /* @__PURE__ */ new Set([
@@ -105,7 +59,7 @@ var toStrategyConfigGrid = (strategyConfig) => Object.fromEntries(
   Object.entries(strategyConfig).filter(([key]) => !BACKTEST_CLI_RUNTIME_CONFIG_KEYS.has(key)).map(([key, value]) => [key, [value]])
 );
 var loadRuntimeStrategyBacktestConfigs = async (userName) => {
-  const configs = await loadRuntimeStrategyConfigs(userName, {
+  const configs = await (0, import_runtimeStrategyConfigs.loadRuntimeStrategyConfigs)(userName, {
     onInvalidConfig: (key) => {
       console.log(import_chalk.default.yellow(`Skip invalid runtime strategy config: ${key}`));
     }