bulltrackers-module 1.0.195 → 1.0.197

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,8 +3,8 @@
3
3
  * V4.1: Supports Smart Shard Lookup via Wrapper
4
4
  */
5
5
 
6
- const { DataExtractor, HistoryExtractor, MathPrimitives, Aggregators, Validators, SCHEMAS, SignalPrimitives, DistributionAnalytics, TimeSeries, priceExtractor } = require('../layers/math_primitives');
7
- const { loadDailyInsights, loadDailySocialPostInsights, getRelevantShardRefs, getPriceShardRefs } = require('../utils/data_loader');
6
+ const { DataExtractor, HistoryExtractor, MathPrimitives, Aggregators, Validators, SCHEMAS, SignalPrimitives, DistributionAnalytics, TimeSeries, priceExtractor } = require('../layers/math_primitives'); // TODO, SURELY THIS COULD BE DYNAMIC, DETECT WHAT IS EXPORTED?
7
+ const { loadDailyInsights, loadDailySocialPostInsights, getRelevantShardRefs, getPriceShardRefs } = require('../utils/data_loader'); // THE IDEA IS THAT WE CAN PRODUCE NEW COMPUTATIONS IN MATH PRIMITIVES, AND NOT NEED TO UPDATE ANY OTHER CODE FILE
8
8
 
9
9
  class DataLoader {
10
10
  constructor(config, dependencies) {
@@ -64,7 +64,7 @@ class DataLoader {
64
64
  }
65
65
  }
66
66
 
67
- class ContextBuilder {
67
+ class ContextBuilder { //TODO, THE MATH EXTRACT HERE COULD SURELY BE DYNAMIC LISTED, JUST TAKE WHAT IS EXPORTED?
68
68
  static buildPerUserContext(options) {
69
69
  const { todayPortfolio, yesterdayPortfolio, todayHistory, yesterdayHistory, userId, userType, dateStr, metadata, mappings, insights, socialData, computedDependencies, previousComputedDependencies, config, deps } = options;
70
70
  return {
@@ -80,7 +80,7 @@ class ContextBuilder {
80
80
  };
81
81
  }
82
82
 
83
- static buildMetaContext(options) {
83
+ static buildMetaContext(options) { //TODO, THE MATH EXTRACT HERE COULD SURELY BE DYNAMIC LISTED, JUST TAKE WHAT IS EXPORTED?
84
84
  const { dateStr, metadata, mappings, insights, socialData, prices, computedDependencies, previousComputedDependencies, config, deps } = options;
85
85
  return {
86
86
  date: { today: dateStr },
@@ -13,7 +13,7 @@ const {
13
13
  runStandardComputationPass,
14
14
  runMetaComputationPass,
15
15
  checkRootDependencies,
16
- runBatchPriceComputation // NEW IMPORT
16
+ runBatchPriceComputation
17
17
  } = require('./orchestration_helpers.js');
18
18
 
19
19
  const { getExpectedDateStrings, normalizeName } = require('../utils/utils.js');
@@ -31,10 +31,10 @@ async function runComputationPass(config, dependencies, computationManifest) {
31
31
  // Hardcoded earliest dates
32
32
  const earliestDates = {
33
33
  portfolio: new Date('2025-09-25T00:00:00Z'),
34
- history: new Date('2025-11-05T00:00:00Z'),
35
- social: new Date('2025-10-30T00:00:00Z'),
36
- insights: new Date('2025-08-26T00:00:00Z'),
37
- price: new Date('2025-08-01T00:00:00Z')
34
+ history: new Date('2025-11-05T00:00:00Z'),
35
+ social: new Date('2025-10-30T00:00:00Z'),
36
+ insights: new Date('2025-08-26T00:00:00Z'),
37
+ price: new Date('2025-08-01T00:00:00Z') // This is slightly arbitrary, the true earliest date is 1 year ago, but there is no need to backfill that far so we just set it to be slightly earlier than the 2nd earliest computation.
38
38
  };
39
39
  earliestDates.absoluteEarliest = Object.values(earliestDates).reduce((a,b) => a < b ? a : b);
40
40
 
@@ -169,12 +169,12 @@ async function runComputationPass(config, dependencies, computationManifest) {
169
169
  const prevDateStr = prevDate.toISOString().slice(0, 10);
170
170
  const previousResults = await fetchExistingResults(prevDateStr, calcsRunning, computationManifest, config, dependencies, true);
171
171
 
172
- // Changed skipstatus write to false to ensure updates are recorded
172
+ // Changed skipstatus write to false to ensure updates are recorded, allowing for proper tracking and avoiding re-computation in future passes. NOTE : Writing true here introduces significant bugs and should be avoided.
173
173
  if (finalStandardToRun.length) {
174
174
  const updates = await runStandardComputationPass(dateToProcess, finalStandardToRun, `Pass ${passToRun} (Std)`, config, dependencies, rootData, existingResults, previousResults, false);
175
175
  Object.assign(dateUpdates, updates);
176
176
  }
177
- if (finalMetaToRun.length) {
177
+ if (finalMetaToRun.length) { // Again, writing true here introduces significant bugs and should be avoided.
178
178
  const updates = await runMetaComputationPass(dateToProcess, finalMetaToRun, `Pass ${passToRun} (Meta)`, config, dependencies, existingResults, previousResults, rootData, false);
179
179
  Object.assign(dateUpdates, updates);
180
180
  }
@@ -13,7 +13,8 @@ const {
13
13
  getHistoryPartRefs, streamPortfolioData, streamHistoryData,
14
14
  getRelevantShardRefs, loadDataByRefs
15
15
  } = require('../utils/data_loader');
16
- const pLimit = require('p-limit'); // Ensure p-limit is required
16
+
17
+ const pLimit = require('p-limit'); // TODO, THIS OUGHT TO BE INJECTED.
17
18
 
18
19
  /**
19
20
  * Groups calculations from a manifest by their 'pass' property.
@@ -25,7 +26,7 @@ function groupByPass(manifest) { return manifest.reduce((acc, calc) => { (acc[ca
25
26
  * Scans a result set for suspicious patterns (e.g., a field is NULL for 100% of tickers).
26
27
  * Logs warnings but DOES NOT block the commit.
27
28
  */
28
- function validateResultPatterns(logger, calcName, results, category) {
29
+ function validateResultPatterns(logger, calcName, results, category) { // TODO, THIS COULD BE MUCH MORE SOPHISTICATED, WE WILL NEVER FORCE FAIL A COMPUTATION REGARDLESS, BUT IT COULD BE A GREAT WARNING SYSTEM, USE GLOUD LOG SINKS TO DETECT PROBLEMS BASED ON THESE LOGS
29
30
  // 1. Skip Speculators (Too sparse, nulls are expected)
30
31
  if (category === 'speculator' || category === 'speculators') return;
31
32
 
@@ -90,16 +91,16 @@ function checkRootDependencies(calcManifest, rootDataStatus) {
90
91
  async function checkRootDataAvailability(dateStr, config, dependencies, earliestDates) {
91
92
  const { logger } = dependencies;
92
93
  const dateToProcess = new Date(dateStr + 'T00:00:00Z');
93
- let portfolioRefs = [], historyRefs = [];
94
- let hasPortfolio = false, hasInsights = false, hasSocial = false, hasHistory = false, hasPrices = false;
95
- let insightsData = null, socialData = null;
94
+ let portfolioRefs = [], historyRefs = [];
95
+ let hasPortfolio = false, hasInsights = false, hasSocial = false, hasHistory = false, hasPrices = false;
96
+ let insightsData = null, socialData = null;
96
97
 
97
98
  try {
98
99
  const tasks = [];
99
100
  if (dateToProcess >= earliestDates.portfolio) tasks.push(getPortfolioPartRefs(config, dependencies, dateStr).then(r => { portfolioRefs = r; hasPortfolio = !!r.length; }));
100
- if (dateToProcess >= earliestDates.insights) tasks.push(loadDailyInsights(config, dependencies, dateStr).then(r => { insightsData = r; hasInsights = !!r; }));
101
- if (dateToProcess >= earliestDates.social) tasks.push(loadDailySocialPostInsights(config, dependencies, dateStr).then(r => { socialData = r; hasSocial = !!r; }));
102
- if (dateToProcess >= earliestDates.history) tasks.push(getHistoryPartRefs(config, dependencies, dateStr).then(r => { historyRefs = r; hasHistory = !!r.length; }));
101
+ if (dateToProcess >= earliestDates.insights) tasks.push(loadDailyInsights(config, dependencies, dateStr).then(r => { insightsData = r; hasInsights = !!r; }));
102
+ if (dateToProcess >= earliestDates.social) tasks.push(loadDailySocialPostInsights(config, dependencies, dateStr).then(r => { socialData = r; hasSocial = !!r; }));
103
+ if (dateToProcess >= earliestDates.history) tasks.push(getHistoryPartRefs(config, dependencies, dateStr).then(r => { historyRefs = r; hasHistory = !!r.length; }));
103
104
 
104
105
  if (dateToProcess >= earliestDates.price) {
105
106
  tasks.push(checkPriceDataAvailability(config, dependencies).then(r => { hasPrices = r; }));
@@ -732,7 +732,13 @@ class DistributionAnalytics {
732
732
  }
733
733
 
734
734
 
735
- // This block is dynamically generated. Do not edit manually.
735
+ // TODO, THIS EXPORT CAN SURELY BE DYNAMICALLY PRODUCED? TAKE WHATEVER CLASSES ARE DEFINED? THE IDEA IS THAT WE CAN SIMPLY PRODUCE NEW CLASSES AND NOT NEED TO MAKE ANY FURTHER CHANGES SO :
736
+ // 1. DYNAMICALLY FINDS THE CLASS, EXPORTS HERE
737
+ // 2. DYNAMICALLY IMPORTS INTO COMPUTATION CONTROLLER
738
+ // 3. DYNAMICALLY POPULATES THE MATH VALUE OF THE COMPUTATION CONTROLLER FOR STANDARD AND META COMPUTATION CONTEXTBUILDERS
739
+ // 4. GO AHEAD AND WRITE YOUR COMPUTATION FILES USING THE NEW MATH PRIMITIVES DEFINED AS NEEDED.
740
+ // THIS THEN MEANS THE MATH PRIMTIVIES CAN BE UPDATED EASILY WITHOUT FURTHER CHANGES TO OTHER SYSTEMS AND AVOID COMPLICATED DEBUGGING OR FORGETFUL INTEGRATIONS.
741
+
736
742
  module.exports = {
737
743
  Aggregators,
738
744
  DataExtractor,
@@ -177,7 +177,7 @@ async function getPriceShardRefs(config, deps) {
177
177
  async function ensurePriceShardIndex(config, deps) {
178
178
  const { db, logger } = deps;
179
179
  const metadataCol = config.metadataCollection || 'system_metadata';
180
- const indexDocRef = db.collection(metadataCol).doc('price_shard_index');
180
+ const indexDocRef = db.collection(metadataCol).doc('price_shard_index'); // TODO. TEST THIS SHARD INDEX SYSTEM, CURRENTLY UNUSED IN COMPUTATIONS BUT IS EXTREMELY EFFICIENT AND GREAT FOR COST REDUCTION
181
181
 
182
182
  // 1. Try to fetch existing index
183
183
  const snap = await indexDocRef.get();
@@ -6,6 +6,7 @@
6
6
  /**
7
7
  * Batch store schemas for multiple computations.
8
8
  * This function now expects a fully-formed schema, not sample output.
9
+ * It strictly stamps a 'lastUpdated' field to support stale-schema filtering in the API.
9
10
  *
10
11
  * @param {object} dependencies - Contains db, logger
11
12
  * @param {object} config - Configuration object
@@ -13,16 +14,49 @@
13
14
  */
14
15
  async function batchStoreSchemas(dependencies, config, schemas) {
15
16
  const { db, logger } = dependencies;
16
- if (config.captureSchemas === false) { logger.log('INFO', '[SchemaCapture] Schema capture is disabled. Skipping.'); return; }
17
+
18
+ if (config.captureSchemas === false) {
19
+ logger.log('INFO', '[SchemaCapture] Schema capture is disabled. Skipping.');
20
+ return;
21
+ }
22
+
17
23
  const batch = db.batch();
18
24
  const schemaCollection = config.schemaCollection || 'computation_schemas';
25
+ let validCount = 0;
26
+
19
27
  for (const item of schemas) {
20
- try { if (!item.schema) { logger.log('WARN', `[SchemaCapture] No schema provided for ${item.name}. Skipping.`); continue; }
21
- const docRef = db.collection(schemaCollection).doc(item.name);
22
- batch.set(docRef, { computationName: item.name, category: item.category, schema: item.schema, metadata: item.metadata || {}, lastUpdated: new Date() }, { merge: true });
23
- } catch (error) { logger.log('WARN', `[SchemaCapture] Failed to add schema to batch for ${item.name}`, { errorMessage: error.message }); } }
24
- try { await batch.commit(); logger.log('INFO', `[SchemaCapture] Batch stored ${schemas.length} computation schemas`);
25
- } catch (error) { logger.log('ERROR', '[SchemaCapture] Failed to commit schema batch', { errorMessage: error.message }); }
28
+ try {
29
+ if (!item.schema) {
30
+ logger.log('WARN', `[SchemaCapture] No schema provided for ${item.name}. Skipping.`);
31
+ continue;
32
+ }
33
+
34
+ const docRef = db.collection(schemaCollection).doc(item.name);
35
+
36
+ // Critical: Always overwrite 'lastUpdated' to now
37
+ batch.set(docRef, {
38
+ computationName: item.name,
39
+ category: item.category,
40
+ schema: item.schema,
41
+ metadata: item.metadata || {},
42
+ lastUpdated: new Date()
43
+ }, { merge: true });
44
+
45
+ validCount++;
46
+
47
+ } catch (error) {
48
+ logger.log('WARN', `[SchemaCapture] Failed to add schema to batch for ${item.name}`, { errorMessage: error.message });
49
+ }
50
+ }
51
+
52
+ if (validCount > 0) {
53
+ try {
54
+ await batch.commit();
55
+ logger.log('INFO', `[SchemaCapture] Batch stored ${validCount} computation schemas`);
56
+ } catch (error) {
57
+ logger.log('ERROR', '[SchemaCapture] Failed to commit schema batch', { errorMessage: error.message });
58
+ }
59
+ }
26
60
  }
27
61
 
28
62
  module.exports = {
@@ -83,7 +83,7 @@ async function getEarliestDataDates(config, deps) {
83
83
  speculatorHistoryDate,
84
84
  insightsDate,
85
85
  socialDate,
86
- priceDate // NEW
86
+ priceDate
87
87
  ] = await Promise.all([
88
88
  getFirstDateFromCollection(config, deps, config.normalUserPortfolioCollection),
89
89
  getFirstDateFromCollection(config, deps, config.speculatorPortfolioCollection),
@@ -91,7 +91,7 @@ async function getEarliestDataDates(config, deps) {
91
91
  getFirstDateFromCollection(config, deps, config.speculatorHistoryCollection),
92
92
  getFirstDateFromSimpleCollection(config, deps, config.insightsCollectionName),
93
93
  getFirstDateFromSimpleCollection(config, deps, config.socialInsightsCollectionName),
94
- getFirstDateFromPriceCollection(config, deps) // NEW
94
+ getFirstDateFromPriceCollection(config, deps) //TODO, Why no config.pricecollectionname here, looks ugly.
95
95
  ]);
96
96
 
97
97
  const getMinDate = (...dates) => {
@@ -101,35 +101,35 @@ async function getEarliestDataDates(config, deps) {
101
101
  };
102
102
 
103
103
  const earliestPortfolioDate = getMinDate(investorDate, speculatorDate);
104
- const earliestHistoryDate = getMinDate(investorHistoryDate, speculatorHistoryDate);
105
- const earliestInsightsDate = getMinDate(insightsDate);
106
- const earliestSocialDate = getMinDate(socialDate);
107
- const earliestPriceDate = getMinDate(priceDate); // NEW
108
- const absoluteEarliest = getMinDate(
104
+ const earliestHistoryDate = getMinDate(investorHistoryDate, speculatorHistoryDate);
105
+ const earliestInsightsDate = getMinDate(insightsDate);
106
+ const earliestSocialDate = getMinDate(socialDate);
107
+ const earliestPriceDate = getMinDate(priceDate);
108
+ const absoluteEarliest = getMinDate(
109
109
  earliestPortfolioDate,
110
110
  earliestHistoryDate,
111
111
  earliestInsightsDate,
112
112
  earliestSocialDate,
113
- earliestPriceDate // NEW
113
+ earliestPriceDate
114
114
  );
115
115
 
116
116
  const fallbackDate = new Date(config.earliestComputationDate + 'T00:00:00Z' || '2023-01-01T00:00:00Z');
117
117
 
118
118
  const result = {
119
- portfolio: earliestPortfolioDate || new Date('2999-12-31'),
120
- history: earliestHistoryDate || new Date('2999-12-31'),
121
- insights: earliestInsightsDate || new Date('2999-12-31'),
122
- social: earliestSocialDate || new Date('2999-12-31'),
123
- price: earliestPriceDate || new Date('2999-12-31'), // NEW
124
- absoluteEarliest: absoluteEarliest || fallbackDate
119
+ portfolio: earliestPortfolioDate || new Date('2999-12-31T00:00:00Z'),
120
+ history: earliestHistoryDate || new Date('2999-12-31T00:00:00Z'),
121
+ insights: earliestInsightsDate || new Date('2999-12-31T00:00:00Z'),
122
+ social: earliestSocialDate || new Date('2999-12-31T00:00:00Z'),
123
+ price: earliestPriceDate || new Date('2999-12-31T00:00:00Z'),
124
+ absoluteEarliest: absoluteEarliest || fallbackDate
125
125
  };
126
126
 
127
127
  logger.log('INFO', 'Earliest data availability map built:', {
128
- portfolio: result.portfolio.toISOString().slice(0, 10),
129
- history: result.history.toISOString().slice(0, 10),
130
- insights: result.insights.toISOString().slice(0, 10),
131
- social: result.social.toISOString().slice(0, 10),
132
- price: result.price.toISOString().slice(0, 10), // NEW
128
+ portfolio: result.portfolio.toISOString().slice(0, 10),
129
+ history: result.history.toISOString().slice(0, 10),
130
+ insights: result.insights.toISOString().slice(0, 10),
131
+ social: result.social.toISOString().slice(0, 10),
132
+ price: result.price.toISOString().slice(0, 10),
133
133
  absoluteEarliest: result.absoluteEarliest.toISOString().slice(0, 10)
134
134
  });
135
135
 
@@ -143,7 +143,7 @@ async function getEarliestDataDates(config, deps) {
143
143
  async function getFirstDateFromPriceCollection(config, deps) {
144
144
  const { db, logger, calculationUtils } = deps;
145
145
  const { withRetry } = calculationUtils;
146
- const collection = config.priceCollection || 'asset_prices';
146
+ const collection = config.priceCollection || 'asset_prices'; // TODO This hardcode is right, but we should really be passing the config directly as other data sources do.
147
147
 
148
148
  try {
149
149
  logger.log('TRACE', `[getFirstDateFromPriceCollection] Querying ${collection}...`);
@@ -185,7 +185,7 @@ async function getFirstDateFromPriceCollection(config, deps) {
185
185
  });
186
186
 
187
187
  if (earliestDate) {
188
- logger.log('TRACE', `[getFirstDateFromPriceCollection] Earliest price date: ${earliestDate.toISOString().slice(0, 10)}`);
188
+ logger.log('TRACE', `[getFirstDateFromPriceCollection] Earliest price date: ${earliestDate.toISOString().slice(0, 10)}`); // TODO, WTF IS THIS TS ERROR. Property 'toISOString' does not exist on type 'never'.ts(2339)
189
189
  }
190
190
 
191
191
  return earliestDate;
@@ -2,7 +2,7 @@
2
2
  * @fileoverview API sub-pipes.
3
3
  * REFACTORED: Now stateless and receive dependencies.
4
4
  * NEW: getDynamicSchema now reads static schema.
5
- * NEW: createManifestHandler added to serve all schemas.
5
+ * NEW: createManifestHandler filters out STALE schemas (>7 days old).
6
6
  */
7
7
 
8
8
  const { FieldPath } = require('@google-cloud/firestore');
@@ -15,13 +15,18 @@ const validateRequest = (query, config) => {
15
15
  if (!query.computations) return "Missing 'computations' parameter.";
16
16
  if (!query.startDate || !/^\d{4}-\d{2}-\d{2}$/.test(query.startDate)) return "Missing or invalid 'startDate'.";
17
17
  if (!query.endDate || !/^\d{4}-\d{2}-\d{2}$/.test(query.endDate)) return "Missing or invalid 'endDate'.";
18
+
18
19
  const start = new Date(query.startDate);
19
20
  const end = new Date(query.endDate);
21
+
20
22
  if (end < start) return "'endDate' must be after 'startDate'.";
23
+
21
24
  const maxDateRange = config.maxDateRange || 100;
22
25
  const diffTime = Math.abs(end - start);
23
26
  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)) + 1;
27
+
24
28
  if (diffDays > maxDateRange) return `Date range cannot exceed ${maxDateRange} days.`;
29
+
25
30
  return null;
26
31
  };
27
32
 
@@ -34,8 +39,19 @@ const validateRequest = (query, config) => {
34
39
  const buildCalculationMap = (unifiedCalculations) => {
35
40
  const calcMap = {};
36
41
  for (const category in unifiedCalculations) {
37
- for (const subKey in unifiedCalculations[category]) { const item = unifiedCalculations[category][subKey]; if (subKey === 'historical' && typeof item === 'object') { for (const calcName in item) { calcMap[calcName] = { category: category, class: item[calcName] }; } }
38
- else if (typeof item === 'function') { const calcName = subKey; calcMap[calcName] = { category: category, class: item }; }}} return calcMap;
42
+ for (const subKey in unifiedCalculations[category]) {
43
+ const item = unifiedCalculations[category][subKey];
44
+ if (subKey === 'historical' && typeof item === 'object') {
45
+ for (const calcName in item) {
46
+ calcMap[calcName] = { category: category, class: item[calcName] };
47
+ }
48
+ } else if (typeof item === 'function') {
49
+ const calcName = subKey;
50
+ calcMap[calcName] = { category: category, class: item };
51
+ }
52
+ }
53
+ }
54
+ return calcMap;
39
55
  };
40
56
 
41
57
  /**
@@ -45,7 +61,10 @@ const getDateStringsInRange = (startDate, endDate) => {
45
61
  const dates = [];
46
62
  const current = new Date(startDate + 'T00:00:00Z');
47
63
  const end = new Date(endDate + 'T00:00:00Z');
48
- while (current <= end) { dates.push(current.toISOString().slice(0, 10)); current.setUTCDate(current.getUTCDate() + 1); }
64
+ while (current <= end) {
65
+ dates.push(current.toISOString().slice(0, 10));
66
+ current.setUTCDate(current.getUTCDate() + 1);
67
+ }
49
68
  return dates;
50
69
  };
51
70
 
@@ -58,19 +77,42 @@ const fetchUnifiedData = async (config, dependencies, calcKeys, dateStrings, cal
58
77
  const insightsCollection = config.unifiedInsightsCollection || 'unified_insights';
59
78
  const resultsSub = config.resultsSubcollection || 'results';
60
79
  const compsSub = config.computationsSubcollection || 'computations';
80
+
61
81
  try {
62
82
  for (const date of dateStrings) {
63
83
  response[date] = {};
64
84
  const docRefs = [];
65
85
  const keyPaths = [];
86
+
66
87
  for (const key of calcKeys) {
67
88
  const pathInfo = calcMap[key];
68
- if (pathInfo) { const docRef = db.collection(insightsCollection).doc(date) .collection(resultsSub).doc(pathInfo.category) .collection(compsSub).doc(key); docRefs.push(docRef); keyPaths.push(key);
69
- } else { logger.log('WARN', `[${date}] No path info found for computation key: ${key}`); } }
89
+ if (pathInfo) {
90
+ const docRef = db.collection(insightsCollection).doc(date)
91
+ .collection(resultsSub).doc(pathInfo.category)
92
+ .collection(compsSub).doc(key);
93
+ docRefs.push(docRef);
94
+ keyPaths.push(key);
95
+ } else {
96
+ logger.log('WARN', `[${date}] No path info found for computation key: ${key}`);
97
+ }
98
+ }
99
+
70
100
  if (docRefs.length === 0) continue;
101
+
71
102
  const snapshots = await db.getAll(...docRefs);
72
- snapshots.forEach((doc, i) => { const key = keyPaths[i]; if (doc.exists) { response[date][key] = doc.data(); } else { response[date][key] = null; } }); }
73
- } catch (error) { logger.log('ERROR', 'API: Error fetching data from Firestore.', { errorMessage: error.message }); throw new Error('Failed to retrieve computation data.'); }
103
+ snapshots.forEach((doc, i) => {
104
+ const key = keyPaths[i];
105
+ if (doc.exists) {
106
+ response[date][key] = doc.data();
107
+ } else {
108
+ response[date][key] = null;
109
+ }
110
+ });
111
+ }
112
+ } catch (error) {
113
+ logger.log('ERROR', 'API: Error fetching data from Firestore.', { errorMessage: error.message });
114
+ throw new Error('Failed to retrieve computation data.');
115
+ }
74
116
  return response;
75
117
  };
76
118
 
@@ -79,14 +121,30 @@ const fetchUnifiedData = async (config, dependencies, calcKeys, dateStrings, cal
79
121
  */
80
122
  const createApiHandler = (config, dependencies, calcMap) => {
81
123
  const { logger } = dependencies;
82
- return async (req, res) => { const validationError = validateRequest(req.query, config);
83
- if (validationError) { logger.log('WARN', 'API Bad Request', { error: validationError, query: req.query }); return res.status(400).send({ status: 'error', message: validationError }); }
124
+ return async (req, res) => {
125
+ const validationError = validateRequest(req.query, config);
126
+ if (validationError) {
127
+ logger.log('WARN', 'API Bad Request', { error: validationError, query: req.query });
128
+ return res.status(400).send({ status: 'error', message: validationError });
129
+ }
84
130
  try {
85
131
  const computationKeys = req.query.computations.split(',');
86
132
  const dateStrings = getDateStringsInRange(req.query.startDate, req.query.endDate);
87
133
  const data = await fetchUnifiedData(config, dependencies, computationKeys, dateStrings, calcMap);
88
- res.status(200).send({ status: 'success', metadata: { computations: computationKeys, startDate: req.query.startDate, endDate: req.query.endDate, }, data, });
89
- } catch (error) { logger.log('ERROR', 'API processing failed.', { errorMessage: error.message, stack: error.stack }); res.status(500).send({ status: 'error', message: 'An internal error occurred.' }); } };
134
+ res.status(200).send({
135
+ status: 'success',
136
+ metadata: {
137
+ computations: computationKeys,
138
+ startDate: req.query.startDate,
139
+ endDate: req.query.endDate,
140
+ },
141
+ data,
142
+ });
143
+ } catch (error) {
144
+ logger.log('ERROR', 'API processing failed.', { errorMessage: error.message, stack: error.stack });
145
+ res.status(500).send({ status: 'error', message: 'An internal error occurred.' });
146
+ }
147
+ };
90
148
  };
91
149
 
92
150
  /**
@@ -99,21 +157,29 @@ function createStructureSnippet(data, maxKeys = 20) {
99
157
  if (typeof data === 'boolean') return true;
100
158
  return data;
101
159
  }
102
- if (Array.isArray(data)) { if (data.length === 0) return "<empty array>"; return [ createStructureSnippet(data[0], maxKeys) ]; }
160
+ if (Array.isArray(data)) {
161
+ if (data.length === 0) return "<empty array>";
162
+ return [ createStructureSnippet(data[0], maxKeys) ];
163
+ }
103
164
  const newObj = {};
104
- const keys = Object.keys(data)
165
+ const keys = Object.keys(data);
166
+
105
167
  if (keys.length > 0 && keys.every(k => k.match(/^[A-Z.]+$/) || k.includes('_') || k.match(/^[0-9]+$/))) {
106
168
  const exampleKey = keys[0];
107
169
  newObj[exampleKey] = createStructureSnippet(data[exampleKey], maxKeys);
108
170
  newObj["... (more items)"] = "...";
109
171
  return newObj;
110
172
  }
173
+
111
174
  if (keys.length > maxKeys) {
112
175
  const firstKey = keys[0] || "example_key";
113
176
  newObj[firstKey] = createStructureSnippet(data[firstKey], maxKeys);
114
177
  newObj[`... (${keys.length - 1} more keys)`] = "<object>";
115
178
  } else {
116
- for (const key of keys) { newObj[key] = createStructureSnippet(data[key], maxKeys); } }
179
+ for (const key of keys) {
180
+ newObj[key] = createStructureSnippet(data[key], maxKeys);
181
+ }
182
+ }
117
183
  return newObj;
118
184
  }
119
185
 
@@ -130,11 +196,16 @@ async function getComputationStructure(computationName, calcMap, config, depende
130
196
  const resultsSub = config.resultsSubcollection || 'results';
131
197
  const compsSub = config.computationsSubcollection || 'computations';
132
198
  const computationQueryPath = `${category}.${computationName}`;
133
- const dateQuery = db.collection(insightsCollection) .where(computationQueryPath, '==', true) .orderBy(FieldPath.documentId(), 'desc') .limit(1);
199
+ const dateQuery = db.collection(insightsCollection)
200
+ .where(computationQueryPath, '==', true)
201
+ .orderBy(FieldPath.documentId(), 'desc')
202
+ .limit(1);
134
203
  const dateSnapshot = await dateQuery.get();
135
204
  if (dateSnapshot.empty) { return { status: 'error', computation: computationName, message: `No computed data found. (Query path: ${computationQueryPath})` }; }
136
205
  const latestStoredDate = dateSnapshot.docs[0].id;
137
- const docRef = db.collection(insightsCollection).doc(latestStoredDate) .collection(resultsSub).doc(category) .collection(compsSub).doc(computationName);
206
+ const docRef = db.collection(insightsCollection).doc(latestStoredDate)
207
+ .collection(resultsSub).doc(category)
208
+ .collection(compsSub).doc(computationName);
138
209
  const doc = await docRef.get();
139
210
  if (!doc.exists) { return { status: 'error', computation: computationName, message: `Summary flag was present for ${latestStoredDate} but doc is missing.` }; }
140
211
  const fullData = doc.data();
@@ -152,30 +223,104 @@ async function getComputationStructure(computationName, calcMap, config, depende
152
223
  */
153
224
  async function getDynamicSchema(CalcClass, calcName) {
154
225
  if (CalcClass && typeof CalcClass.getSchema === 'function') {
155
- try { return CalcClass.getSchema();
156
- } catch (e) { console.error(`Error running static getSchema() for ${calcName}: ${e.message}`); return { "ERROR": `Failed to get static schema: ${e.message}` };}
157
- } else { return { "ERROR": `Computation '${calcName}' does not have a static getSchema() method defined.` }; }
226
+ try {
227
+ return CalcClass.getSchema();
228
+ } catch (e) {
229
+ console.error(`Error running static getSchema() for ${calcName}: ${e.message}`);
230
+ return { "ERROR": `Failed to get static schema: ${e.message}` };
231
+ }
232
+ } else {
233
+ return { "ERROR": `Computation '${calcName}' does not have a static getSchema() method defined.` };
234
+ }
158
235
  }
159
236
 
160
237
 
161
238
  /**
162
- * --- NEW: MANIFEST API HANDLER ---
239
+ * --- NEW: MANIFEST API HANDLER (With Filtering) ---
163
240
  */
164
241
  const createManifestHandler = (config, dependencies, calcMap) => {
165
242
  const { db, logger } = dependencies;
166
243
  const schemaCollection = config.schemaCollection || 'computation_schemas';
244
+
167
245
  return async (req, res) => {
168
246
  try {
169
247
  logger.log('INFO', '[API /manifest] Fetching all computation schemas...');
170
248
  const snapshot = await db.collection(schemaCollection).get();
171
- if (snapshot.empty) { logger.log('WARN', '[API /manifest] No schemas found in collection.'); return res.status(404).send({ status: 'error', message: 'No computation schemas have been generated yet.' }); }
249
+
250
+ if (snapshot.empty) {
251
+ logger.log('WARN', '[API /manifest] No schemas found in collection.');
252
+ return res.status(404).send({ status: 'error', message: 'No computation schemas have been generated yet.' });
253
+ }
254
+
255
+ // --- FILTERING LOGIC ---
172
256
  const manifest = {};
173
- snapshot.forEach(doc => { const data = doc.data(); manifest[doc.id] = { category: data.category, structure: data.schema, metadata: data.metadata, lastUpdated: data.lastUpdated }; });
174
- res.status(200).send({ status: 'success', summary: { source: 'firestore_computation_schemas', totalComputations: snapshot.size, schemasAvailable: snapshot.size, schemasFailed: 0, lastUpdated: Math.max(...Object.values(manifest).map(m => m.lastUpdated ? m.lastUpdated.toMillis() : 0 )) }, manifest: manifest });
257
+ const now = Date.now();
258
+ const MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000; // 7 days
259
+
260
+ let activeCount = 0;
261
+ let staleCount = 0;
262
+
263
+ snapshot.forEach(doc => {
264
+ const data = doc.data();
265
+
266
+ // Safe Timestamp conversion
267
+ let lastUpdatedMs = 0;
268
+ if (data.lastUpdated && typeof data.lastUpdated.toMillis === 'function') {
269
+ lastUpdatedMs = data.lastUpdated.toMillis();
270
+ } else if (data.lastUpdated instanceof Date) {
271
+ lastUpdatedMs = data.lastUpdated.getTime();
272
+ } else {
273
+ // Fallback for very old records without a timestamp
274
+ lastUpdatedMs = 0;
275
+ }
276
+
277
+ // Exclude stale records
278
+ if ((now - lastUpdatedMs) < MAX_AGE_MS) {
279
+ manifest[doc.id] = {
280
+ category: data.category,
281
+ structure: data.schema,
282
+ metadata: data.metadata,
283
+ lastUpdated: data.lastUpdated
284
+ };
285
+ activeCount++;
286
+ } else {
287
+ staleCount++;
288
+ }
289
+ });
290
+
291
+ // Log filtering results
292
+ if (staleCount > 0) {
293
+ logger.log('INFO', `[API /manifest] Filtered out ${staleCount} stale schemas (older than 7 days). Returning ${activeCount} active.`);
294
+ }
295
+
296
+ res.status(200).send({
297
+ status: 'success',
298
+ summary: {
299
+ source: 'firestore_computation_schemas',
300
+ totalComputations: snapshot.size,
301
+ schemasAvailable: activeCount,
302
+ schemasFiltered: staleCount,
303
+ lastUpdated: Math.max(...Object.values(manifest).map(m =>
304
+ (m.lastUpdated && m.lastUpdated.toMillis) ? m.lastUpdated.toMillis() : 0
305
+ ), 0)
306
+ },
307
+ manifest: manifest
308
+ });
309
+
175
310
  } catch (error) {
176
311
  logger.log('ERROR', 'API /manifest handler failed.', { errorMessage: error.message, stack: error.stack });
177
- res.status(500).send({ status: 'error', message: 'An internal error occurred.' }); } };
312
+ res.status(500).send({ status: 'error', message: 'An internal error occurred.' });
313
+ }
314
+ };
178
315
  };
179
316
 
180
317
 
181
- module.exports = { validateRequest, buildCalculationMap, fetchUnifiedData, createApiHandler, getComputationStructure, getDynamicSchema, createManifestHandler };
318
+ module.exports = {
319
+ validateRequest,
320
+ buildCalculationMap,
321
+ fetchUnifiedData,
322
+ createApiHandler,
323
+ getComputationStructure,
324
+ getDynamicSchema,
325
+ createManifestHandler
326
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "bulltrackers-module",
3
- "version": "1.0.195",
3
+ "version": "1.0.197",
4
4
  "description": "Helper Functions for Bulltrackers.",
5
5
  "main": "index.js",
6
6
  "files": [