bulltrackers-module 1.0.148 → 1.0.150

package/functions/generic-api/index.js

@@ -3,6 +3,8 @@
  * Exports the 'createApiApp' main pipe function.
  * REFACTORED: /manifest endpoint now reads static schemas from Firestore.
  * REFACTORED: /manifest/generate endpoint now reads static schema from class.
+ *
+ * --- MODIFIED: Added in-memory cache wrapper for the main API handler ---
  */
 
 const express = require('express');
@@ -16,6 +18,72 @@ const {
     getDynamicSchema      // <-- This helper's behavior has changed
 } = require('./helpers/api_helpers.js');
 
+/**
+ * --- NEW: In-Memory Cache Handler ---
+ * A wrapper function that adds a time-to-live (TTL) in-memory cache
+ * to any Express request handler.
+ * @param {function} handler - The original (req, res) handler to wrap.
+ * @param {object} dependencies - { logger }
+ * @returns {function} The new (req, res) handler with caching logic.
+ */
+const createCacheHandler = (handler, { logger }) => {
+    // 1. Define the cache *outside* the handler so it persists
+    const CACHE = {};
+    const CACHE_TTL_MS = 10 * 60 * 1000; // 10 minute cache
+
+    // 2. Return the new handler
+    return async (req, res) => {
+        const cacheKey = req.url; // Use the full URL (e.g., "/?computation=foo") as the key
+        const now = Date.now();
+
+        // 3. --- Cache HIT ---
+        if (CACHE[cacheKey] && (now - CACHE[cacheKey].timestamp) < CACHE_TTL_MS) {
+            logger.log('INFO', `[API] Cache HIT for ${cacheKey}`);
+            // Send cached status and data
+            return res.status(CACHE[cacheKey].status).send(CACHE[cacheKey].data);
+        }
+
+        // 4. --- Cache MISS ---
+        logger.log('INFO', `[API] Cache MISS for ${cacheKey}`);
+
+        // We need to capture the response from the original handler.
+        // To do this, we "monkey-patch" res.send and res.status.
+        const originalSend = res.send;
+        const originalStatus = res.status;
+
+        let capturedData = null;
+        let capturedStatus = 200; // Default
+
+        // Create a new status function
+        res.status = (statusCode) => {
+            capturedStatus = statusCode;
+            // Call the original status function
+            return originalStatus.call(res, statusCode);
+        };
+
+        // Create a new send function
+        res.send = (data) => {
+            capturedData = data;
+            // Call the original send function
+            return originalSend.call(res, data);
+        };
+
+        // 5. Call the original handler (which will now use our patched functions)
+        await handler(req, res);
+
+        // 6. If the response was successful, cache it
+        if (capturedStatus === 200 && capturedData) {
+            logger.log('INFO', `[API] Caching new entry for ${cacheKey}`);
+            CACHE[cacheKey] = {
+                data: capturedData,
+                status: capturedStatus,
+                timestamp: now
+            };
+        }
+    };
+};
+
+
 /**
  * Main pipe: pipe.api.createApiApp
  * Creates and configures the Express app for the Generic API.
@@ -36,7 +104,10 @@ function createApiApp(config, dependencies, unifiedCalculations) {
     app.use(express.json());
 
     // --- Main API Endpoint ---
-    app.get('/', createApiHandler(config, dependencies, calcMap));
+    // MODIFIED: We now wrap the original handler with the cache handler.
+    const originalApiHandler = createApiHandler(config, dependencies, calcMap);
+    const cachedApiHandler = createCacheHandler(originalApiHandler, dependencies);
+    app.get('/', cachedApiHandler); // <-- Use the new caching handler
 
     // --- Health Check Endpoint ---
     app.get('/health', (req, res) => {
@@ -168,7 +239,7 @@ function createApiApp(config, dependencies, unifiedCalculations) {
             const schemaDoc = await db.collection(schemaCollection).doc(computationName).get();
             
             if (!schemaDoc.exists) {
-                return res.status(404).send({
+                return res.status(4404).send({
                     status: 'error',
                     message: `Schema not found for computation: ${computationName}`,
                     hint: 'Try running the computation system or use POST /manifest/generate/:computationName'

package/functions/task-engine/helpers/update_helpers.js

@@ -56,15 +56,18 @@ async function handleUpdate(task, taskId, { logger, headerManager, proxyManager,
     
     let wasHistorySuccess = false, isPrivate = false;
     
+    // --- FIX: 'fetchHistory' MUST be declared here, outside the 'try' block ---
+    let fetchHistory = false;
+    
     try {
         // Fetch history ONCE per user
         const promisesToRun = [];
-        let fetchHistory = false;
+        // --- 'fetchHistory' is no longer declared here ---
         
         if (!historyFetchedForUser.has(userId)) {
             historyHeader = await headerManager.selectHeader();
             if (historyHeader) {
-                fetchHistory = true;
+                fetchHistory = true; // This now sets the outer variable
                 historyFetchedForUser.add(userId);
                 const historyUrl = `${config.ETORO_API_USERSTATS_URL}${username}/trades/oneYearAgo?CopyAsAsset=true`;
                 promisesToRun.push(proxyManager.fetch(historyUrl, { headers: historyHeader.header }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.148",
+  "version": "1.0.150",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [