@tradejs/infra 1.0.8 → 1.0.9

package/dist/{chunk-DSTV67R5.mjs → chunk-MLVWC2I2.mjs}

@@ -122,6 +122,31 @@ var parseJsonOrDeleteKey = async (redis, key, raw, fallback) => {
     return fallback;
   }
 };
+var parseHashMap = (value) => {
+  if (!value) {
+    return {};
+  }
+  if (Array.isArray(value)) {
+    const result = {};
+    for (let index = 0; index < value.length; index += 2) {
+      const field = value[index];
+      const fieldValue = value[index + 1];
+      if (field == null || fieldValue == null) {
+        continue;
+      }
+      result[String(field)] = toResultString(fieldValue) ?? "";
+    }
+    return result;
+  }
+  if (typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(
+        ([field, fieldValue]) => [field, toResultString(fieldValue) ?? ""]
+      )
+    );
+  }
+  return {};
+};
 var getKeys = async (prefix) => {
   if (redisUnavailable) return [];
   const redis = await getReadyRedis();
@@ -258,6 +283,96 @@ var setData = async (key, data, options = {}) => {
     }
   }
 };
+var setHashJsonField = async (key, field, data, options = {}) => {
+  if (redisUnavailable) return;
+  const { expire } = { ...DEFAULT_OPTIONS, ...options };
+  const redis = await getReadyRedis();
+  if (!redis) return;
+  try {
+    await redis.call("HSET", key, field, toJson(data));
+    if (expire) {
+      await redis.expire(key, expire);
+    }
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return;
+    }
+    logger.log("error", "failed HSET %s[%s]: %s", key, field, String(e));
+  }
+};
+var getHashJsonValues = async (key) => {
+  if (redisUnavailable) return [];
+  const redis = await getReadyRedis();
+  if (!redis) return [];
+  try {
+    const raw = await redis.call("HGETALL", key);
+    const values = Object.values(parseHashMap(raw));
+    const parsed = [];
+    for (const value of values) {
+      if (!value) {
+        continue;
+      }
+      try {
+        parsed.push(JSON.parse(value));
+      } catch (e) {
+        logger.log(
+          "error",
+          "failed JSON.parse(HGETALL %s value): %s",
+          key,
+          String(e)
+        );
+      }
+    }
+    return parsed;
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return [];
+    }
+    logger.log("error", "failed HGETALL %s: %s", key, String(e));
+    return [];
+  }
+};
+var incrHashFields = async (key, increments, options = {}) => {
+  if (redisUnavailable) return;
+  const { expire } = { ...DEFAULT_OPTIONS, ...options };
+  const redis = await getReadyRedis();
+  if (!redis) return;
+  try {
+    for (const [field, increment] of Object.entries(increments)) {
+      if (!Number.isFinite(increment) || increment === 0) {
+        continue;
+      }
+      await redis.call("HINCRBY", key, field, Math.trunc(increment));
+    }
+    if (expire) {
+      await redis.expire(key, expire);
+    }
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return;
+    }
+    logger.log("error", "failed HINCRBY %s: %s", key, String(e));
+  }
+};
+var getHashData = async (key) => {
+  if (redisUnavailable) return {};
+  const redis = await getReadyRedis();
+  if (!redis) return {};
+  try {
+    const raw = await redis.call("HGETALL", key);
+    return parseHashMap(raw);
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return {};
+    }
+    logger.log("error", "failed HGETALL %s: %s", key, String(e));
+    return {};
+  }
+};
 var createScreenshotSessionToken = async (userName) => {
   const token = randomBytes(24).toString("hex");
   await setData(
@@ -311,8 +426,14 @@ var redisKeys = {
   storeSignal: (symbol, signalId) => `store:signals:${symbol}:${signalId}`,
   runtimeSignals: (userName) => `users:${userName}:runtime:signals:`,
   runtimeSignal: (userName, signalId) => `users:${userName}:runtime:signals:${signalId}`,
+  runtimeSignalBuckets: (userName) => `users:${userName}:runtime:signals:days:`,
+  runtimeSignalBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signals:days:${dayKey}:${strategyName}`,
   runtimeSignalEvaluations: (userName) => `users:${userName}:runtime:signal-evaluations:`,
   runtimeSignalEvaluation: (userName, evaluationId) => `users:${userName}:runtime:signal-evaluations:${evaluationId}`,
+  runtimeSignalEvaluationBuckets: (userName) => `users:${userName}:runtime:signal-evaluations:days:`,
+  runtimeSignalEvaluationBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluations:days:${dayKey}:${strategyName}`,
+  runtimeSignalEvaluationStatsBuckets: (userName) => `users:${userName}:runtime:signal-evaluation-stats:days:`,
+  runtimeSignalEvaluationStatsBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluation-stats:days:${dayKey}:${strategyName}`,
   runtimeTrades: (userName) => `users:${userName}:runtime:trade-records:`,
   runtimeTrade: (userName, orderId) => `users:${userName}:runtime:trade-records:${orderId}`,
   runtimeActiveTrades: (userName) => `users:${userName}:runtime:active-trades:`,
@@ -339,6 +460,10 @@ export {
   RedisWriteBlockedError,
   delKeyWithOptions,
   setData,
+  setHashJsonField,
+  getHashJsonValues,
+  incrHashFields,
+  getHashData,
   createScreenshotSessionToken,
   consumeScreenshotSessionToken,
   redisKeys

package/dist/redis.d.mts

@@ -17,6 +17,10 @@ declare class RedisWriteBlockedError extends Error {
 }
 declare const delKeyWithOptions: (key: string, options?: DelKeyOptions) => Promise<boolean>;
 declare const setData: <T>(key: string, data: T, options?: Options) => Promise<void>;
+declare const setHashJsonField: <T>(key: string, field: string, data: T, options?: Options) => Promise<void>;
+declare const getHashJsonValues: <T>(key: string) => Promise<T[]>;
+declare const incrHashFields: (key: string, increments: Record<string, number>, options?: Options) => Promise<void>;
+declare const getHashData: (key: string) => Promise<Record<string, string>>;
 declare const createScreenshotSessionToken: (userName: string) => Promise<string | null>;
 declare const consumeScreenshotSessionToken: (token: string) => Promise<string | null>;
 declare const redisKeys: {
@@ -42,8 +46,14 @@ declare const redisKeys: {
     storeSignal: (symbol: string, signalId: string) => string;
     runtimeSignals: (userName: string) => string;
     runtimeSignal: (userName: string, signalId: string) => string;
+    runtimeSignalBuckets: (userName: string) => string;
+    runtimeSignalBucket: (userName: string, dayKey: string, strategyName: string) => string;
     runtimeSignalEvaluations: (userName: string) => string;
     runtimeSignalEvaluation: (userName: string, evaluationId: string) => string;
+    runtimeSignalEvaluationBuckets: (userName: string) => string;
+    runtimeSignalEvaluationBucket: (userName: string, dayKey: string, strategyName: string) => string;
+    runtimeSignalEvaluationStatsBuckets: (userName: string) => string;
+    runtimeSignalEvaluationStatsBucket: (userName: string, dayKey: string, strategyName: string) => string;
     runtimeTrades: (userName: string) => string;
     runtimeTrade: (userName: string, orderId: string) => string;
     runtimeActiveTrades: (userName: string) => string;
@@ -63,4 +73,4 @@ declare const redisKeys: {
     mlResult: (strategyName: string, signalId: string) => string;
 };
 
-export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };
+export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getHashData, getHashJsonValues, getKeys, incrHashFields, redisKeys, setData, setHashJsonField };

package/dist/redis.d.ts

@@ -17,6 +17,10 @@ declare class RedisWriteBlockedError extends Error {
 }
 declare const delKeyWithOptions: (key: string, options?: DelKeyOptions) => Promise<boolean>;
 declare const setData: <T>(key: string, data: T, options?: Options) => Promise<void>;
+declare const setHashJsonField: <T>(key: string, field: string, data: T, options?: Options) => Promise<void>;
+declare const getHashJsonValues: <T>(key: string) => Promise<T[]>;
+declare const incrHashFields: (key: string, increments: Record<string, number>, options?: Options) => Promise<void>;
+declare const getHashData: (key: string) => Promise<Record<string, string>>;
 declare const createScreenshotSessionToken: (userName: string) => Promise<string | null>;
 declare const consumeScreenshotSessionToken: (token: string) => Promise<string | null>;
 declare const redisKeys: {
@@ -42,8 +46,14 @@ declare const redisKeys: {
     storeSignal: (symbol: string, signalId: string) => string;
     runtimeSignals: (userName: string) => string;
     runtimeSignal: (userName: string, signalId: string) => string;
+    runtimeSignalBuckets: (userName: string) => string;
+    runtimeSignalBucket: (userName: string, dayKey: string, strategyName: string) => string;
     runtimeSignalEvaluations: (userName: string) => string;
     runtimeSignalEvaluation: (userName: string, evaluationId: string) => string;
+    runtimeSignalEvaluationBuckets: (userName: string) => string;
+    runtimeSignalEvaluationBucket: (userName: string, dayKey: string, strategyName: string) => string;
+    runtimeSignalEvaluationStatsBuckets: (userName: string) => string;
+    runtimeSignalEvaluationStatsBucket: (userName: string, dayKey: string, strategyName: string) => string;
     runtimeTrades: (userName: string) => string;
     runtimeTrade: (userName: string, orderId: string) => string;
     runtimeActiveTrades: (userName: string) => string;
@@ -63,4 +73,4 @@ declare const redisKeys: {
     mlResult: (strategyName: string, signalId: string) => string;
 };
 
-export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getKeys, redisKeys, setData };
+export { RedisWriteBlockedError, consumeScreenshotSessionToken, createScreenshotSessionToken, delKey, delKeyWithOptions, getData, getHashData, getHashJsonValues, getKeys, incrHashFields, redisKeys, setData, setHashJsonField };

package/dist/redis.js

@@ -36,9 +36,13 @@ __export(redis_exports, {
   delKey: () => delKey,
   delKeyWithOptions: () => delKeyWithOptions,
   getData: () => getData,
+  getHashData: () => getHashData,
+  getHashJsonValues: () => getHashJsonValues,
   getKeys: () => getKeys,
+  incrHashFields: () => incrHashFields,
   redisKeys: () => redisKeys,
-  setData: () => setData
+  setData: () => setData,
+  setHashJsonField: () => setHashJsonField
 });
 module.exports = __toCommonJS(redis_exports);
 var import_crypto = require("crypto");
@@ -164,6 +168,31 @@ var parseJsonOrDeleteKey = async (redis, key, raw, fallback) => {
     return fallback;
   }
 };
+var parseHashMap = (value) => {
+  if (!value) {
+    return {};
+  }
+  if (Array.isArray(value)) {
+    const result = {};
+    for (let index = 0; index < value.length; index += 2) {
+      const field = value[index];
+      const fieldValue = value[index + 1];
+      if (field == null || fieldValue == null) {
+        continue;
+      }
+      result[String(field)] = toResultString(fieldValue) ?? "";
+    }
+    return result;
+  }
+  if (typeof value === "object") {
+    return Object.fromEntries(
+      Object.entries(value).map(
+        ([field, fieldValue]) => [field, toResultString(fieldValue) ?? ""]
+      )
+    );
+  }
+  return {};
+};
 var getKeys = async (prefix) => {
   if (redisUnavailable) return [];
   const redis = await getReadyRedis();
@@ -300,6 +329,96 @@ var setData = async (key, data, options = {}) => {
     }
   }
 };
+var setHashJsonField = async (key, field, data, options = {}) => {
+  if (redisUnavailable) return;
+  const { expire } = { ...DEFAULT_OPTIONS, ...options };
+  const redis = await getReadyRedis();
+  if (!redis) return;
+  try {
+    await redis.call("HSET", key, field, toJson(data));
+    if (expire) {
+      await redis.expire(key, expire);
+    }
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return;
+    }
+    logger.log("error", "failed HSET %s[%s]: %s", key, field, String(e));
+  }
+};
+var getHashJsonValues = async (key) => {
+  if (redisUnavailable) return [];
+  const redis = await getReadyRedis();
+  if (!redis) return [];
+  try {
+    const raw = await redis.call("HGETALL", key);
+    const values = Object.values(parseHashMap(raw));
+    const parsed = [];
+    for (const value of values) {
+      if (!value) {
+        continue;
+      }
+      try {
+        parsed.push(JSON.parse(value));
+      } catch (e) {
+        logger.log(
+          "error",
+          "failed JSON.parse(HGETALL %s value): %s",
+          key,
+          String(e)
+        );
+      }
+    }
+    return parsed;
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return [];
+    }
+    logger.log("error", "failed HGETALL %s: %s", key, String(e));
+    return [];
+  }
+};
+var incrHashFields = async (key, increments, options = {}) => {
+  if (redisUnavailable) return;
+  const { expire } = { ...DEFAULT_OPTIONS, ...options };
+  const redis = await getReadyRedis();
+  if (!redis) return;
+  try {
+    for (const [field, increment] of Object.entries(increments)) {
+      if (!Number.isFinite(increment) || increment === 0) {
+        continue;
+      }
+      await redis.call("HINCRBY", key, field, Math.trunc(increment));
+    }
+    if (expire) {
+      await redis.expire(key, expire);
+    }
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return;
+    }
+    logger.log("error", "failed HINCRBY %s: %s", key, String(e));
+  }
+};
+var getHashData = async (key) => {
+  if (redisUnavailable) return {};
+  const redis = await getReadyRedis();
+  if (!redis) return {};
+  try {
+    const raw = await redis.call("HGETALL", key);
+    return parseHashMap(raw);
+  } catch (e) {
+    if (e instanceof Error && isRedisConnectivityError(e)) {
+      markRedisUnavailable(e);
+      return {};
+    }
+    logger.log("error", "failed HGETALL %s: %s", key, String(e));
+    return {};
+  }
+};
 var createScreenshotSessionToken = async (userName) => {
   const token = (0, import_crypto.randomBytes)(24).toString("hex");
   await setData(
@@ -353,8 +472,14 @@ var redisKeys = {
   storeSignal: (symbol, signalId) => `store:signals:${symbol}:${signalId}`,
   runtimeSignals: (userName) => `users:${userName}:runtime:signals:`,
   runtimeSignal: (userName, signalId) => `users:${userName}:runtime:signals:${signalId}`,
+  runtimeSignalBuckets: (userName) => `users:${userName}:runtime:signals:days:`,
+  runtimeSignalBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signals:days:${dayKey}:${strategyName}`,
   runtimeSignalEvaluations: (userName) => `users:${userName}:runtime:signal-evaluations:`,
   runtimeSignalEvaluation: (userName, evaluationId) => `users:${userName}:runtime:signal-evaluations:${evaluationId}`,
+  runtimeSignalEvaluationBuckets: (userName) => `users:${userName}:runtime:signal-evaluations:days:`,
+  runtimeSignalEvaluationBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluations:days:${dayKey}:${strategyName}`,
+  runtimeSignalEvaluationStatsBuckets: (userName) => `users:${userName}:runtime:signal-evaluation-stats:days:`,
+  runtimeSignalEvaluationStatsBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluation-stats:days:${dayKey}:${strategyName}`,
   runtimeTrades: (userName) => `users:${userName}:runtime:trade-records:`,
   runtimeTrade: (userName, orderId) => `users:${userName}:runtime:trade-records:${orderId}`,
   runtimeActiveTrades: (userName) => `users:${userName}:runtime:active-trades:`,
@@ -381,7 +506,11 @@ var redisKeys = {
   delKey,
   delKeyWithOptions,
   getData,
+  getHashData,
+  getHashJsonValues,
   getKeys,
+  incrHashFields,
   redisKeys,
-  setData
+  setData,
+  setHashJsonField
 });

package/dist/redis.mjs

@@ -5,10 +5,14 @@ import {
   delKey,
   delKeyWithOptions,
   getData,
+  getHashData,
+  getHashJsonValues,
   getKeys,
+  incrHashFields,
   redisKeys,
-  setData
-} from "./chunk-DSTV67R5.mjs";
+  setData,
+  setHashJsonField
+} from "./chunk-MLVWC2I2.mjs";
 export {
   RedisWriteBlockedError,
   consumeScreenshotSessionToken,
@@ -16,7 +20,11 @@ export {
   delKey,
   delKeyWithOptions,
   getData,
+  getHashData,
+  getHashJsonValues,
   getKeys,
+  incrHashFields,
   redisKeys,
-  setData
+  setData,
+  setHashJsonField
 };

package/dist/userSettings.js

@@ -558,8 +558,14 @@ var redisKeys = {
   storeSignal: (symbol, signalId) => `store:signals:${symbol}:${signalId}`,
   runtimeSignals: (userName) => `users:${userName}:runtime:signals:`,
   runtimeSignal: (userName, signalId) => `users:${userName}:runtime:signals:${signalId}`,
+  runtimeSignalBuckets: (userName) => `users:${userName}:runtime:signals:days:`,
+  runtimeSignalBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signals:days:${dayKey}:${strategyName}`,
   runtimeSignalEvaluations: (userName) => `users:${userName}:runtime:signal-evaluations:`,
   runtimeSignalEvaluation: (userName, evaluationId) => `users:${userName}:runtime:signal-evaluations:${evaluationId}`,
+  runtimeSignalEvaluationBuckets: (userName) => `users:${userName}:runtime:signal-evaluations:days:`,
+  runtimeSignalEvaluationBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluations:days:${dayKey}:${strategyName}`,
+  runtimeSignalEvaluationStatsBuckets: (userName) => `users:${userName}:runtime:signal-evaluation-stats:days:`,
+  runtimeSignalEvaluationStatsBucket: (userName, dayKey, strategyName) => `users:${userName}:runtime:signal-evaluation-stats:days:${dayKey}:${strategyName}`,
   runtimeTrades: (userName) => `users:${userName}:runtime:trade-records:`,
   runtimeTrade: (userName, orderId) => `users:${userName}:runtime:trade-records:${orderId}`,
   runtimeActiveTrades: (userName) => `users:${userName}:runtime:active-trades:`,

package/dist/userSettings.mjs

@@ -2,7 +2,7 @@ import {
   getData,
   redisKeys,
   setData
-} from "./chunk-DSTV67R5.mjs";
+} from "./chunk-MLVWC2I2.mjs";
 import {
   DEFAULT_AI_RESPONSE_LANGUAGE,
   normalizeAiResponseLanguage

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tradejs/infra",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Server-only infrastructure adapters for the TradeJS open-source framework: Redis, Timescale, ML, logging, and IO.",
   "keywords": [
     "tradejs",
@@ -83,7 +83,7 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.10.7",
     "@grpc/proto-loader": "^0.8.0",
-    "@tradejs/types": "^1.0.8",
+    "@tradejs/types": "^1.0.9",
     "chalk": "4.1.2",
     "ioredis": "5.8.0",
     "pg": "8.16.3",