bulltrackers-module 1.0.721 → 1.0.723

package/index.js

@@ -51,8 +51,6 @@ const computationUtils                                    = require('./functions
 const { createApiV2App } = require('./functions/api-v2/index');
 
 // Maintenance & Data Acquisition
-const { runCleanup }                                      = require('./functions/speculator-cleanup-orchestrator/helpers/cleanup_helpers');
-const { handleInvalidSpeculator }                         = require('./functions/invalid-speculator-handler/helpers/handler_helpers');
 const { fetchAndStoreInsights }                           = require('./functions/fetch-insights/helpers/handler_helpers');
 const { fetchAndStorePrices }                             = require('./functions/etoro-price-fetcher/helpers/handler_helpers');
 const { runSocialOrchestrator }                           = require('./functions/social-orchestrator/helpers/orchestrator_helpers');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.721",
+  "version": "1.0.723",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [
@@ -11,8 +11,6 @@
     "functions/computation-system/",
     "functions/api-v2/",
     "functions/dispatcher/",
-    "functions/invalid-speculator-handler/",
-    "functions/speculator-cleanup-orchestrator/",
     "functions/fetch-insights/",
     "functions/etoro-price-fetcher/",
     "functions/appscript-api/",
@@ -56,7 +54,8 @@
     "sharedsetup": "latest",
     "zod": "^4.3.5",
     "@google-cloud/storage": "^7.18.0",
-    "@google-cloud/bigquery": "^7.3.0"
+    "@google-cloud/bigquery": "^7.3.0",
+    "@google-cloud/tasks": "^5.0.0"
   },
   "devDependencies": {
     "bulltracker-deployer": "file:../bulltracker-deployer"

package/functions/invalid-speculator-handler/helpers/handler_helpers.js

@@ -1,38 +0,0 @@
-/**
- * @fileoverview Main pipe: pipe.maintenance.handleInvalidSpeculator
- * REFACTORED: Now stateless and receives dependencies.
- */
-const { FieldValue } = require('@google-cloud/firestore');
-
-/**
- * Main pipe: pipe.maintenance.handleInvalidSpeculator
- * @param {object} message The Pub/Sub message.
- * @param {object} context The message context.
- * @param {object} config The configuration object.
- * @param {object} dependencies - Contains db, logger.
- */
-exports.handleInvalidSpeculator = async (message, context, config, dependencies) => {
-    const { db, logger } = dependencies;
-    try {
-        const { invalidCids } = JSON.parse(Buffer.from(message.data, 'base64').toString());
-        if (!invalidCids || invalidCids.length === 0) { logger.log('WARN', 'Received message with no invalid CIDs. Nothing to do.'); return; }
-        const collectionRef = db.collection(config.invalidSpeculatorsCollectionName); 
-        const maxPerDoc = config.maxInvalidUsersPerDoc;
-        const querySnapshot = await collectionRef .where('userCount', '<', maxPerDoc) .limit(10) .get();
-        let targetDocRef;
-        if (!querySnapshot.empty) { const randomIndex = Math.floor(Math.random() * querySnapshot.docs.length); targetDocRef = querySnapshot.docs[randomIndex].ref;
-        } else { targetDocRef = collectionRef.doc(); }
-        await db.runTransaction(async (transaction) => { const doc = await transaction.get(targetDocRef);
-            const updates = {};
-            let newUsersCount = 0;
-            if (!doc.exists) { updates.userCount = 0; }
-            for (const cid of invalidCids) {
-                const fieldPath = `users.${cid}`;
-                if (!doc.exists || !doc.data().users || !doc.data().users[cid]) {updates[fieldPath] = true; newUsersCount++; } }
-            if (newUsersCount > 0) { updates.userCount = FieldValue.increment(newUsersCount); transaction.set(targetDocRef, updates, { merge: true }); } });
-        logger.log('SUCCESS', `Successfully stored ${invalidCids.length} invalid speculator IDs in document ${targetDocRef.id}.`);
-    } catch (error) {
-        logger.log('ERROR', 'FATAL Error in Invalid Speculator Handler', { errorMessage: error.message, errorStack: error.stack });
-        throw error;
-    }
-};

package/functions/speculator-cleanup-orchestrator/helpers/cleanup_helpers.js

@@ -1,101 +0,0 @@
-/**
- * @fileoverview Main pipe: pipe.maintenance.runSpeculatorCleanup
- * REFACTORED: Now stateless and receives dependencies.
- */
-
-const { FieldValue } = require('@google-cloud/firestore');
-
-/**
- * Main pipe: pipe.maintenance.runSpeculatorCleanup
- * Orchestrates the cleanup process.
- * @param {object} config - Configuration object.
- * @param {object} dependencies - Contains db, logger.
- */
-exports.runCleanup = async (config, dependencies) => {
-    const { logger } = dependencies;
-    logger.log('INFO', '[CleanupHelpers] Running cleanup orchestrator...');
-    try { const { batch: batchAfterPending, count: pendingRemoved } = await cleanupPendingSpeculators(config, dependencies);
-        const { batch: finalBatch, count: staleRemoved } = await cleanupStaleSpeculators(config, dependencies, batchAfterPending);
-        if (pendingRemoved > 0 || staleRemoved > 0) { await finalBatch.commit(); logger.log('SUCCESS', `[CleanupHelpers] Cleanup commit successful. Removed ${pendingRemoved} pending, ${staleRemoved} stale speculators.`); return { pendingRemoved, staleRemoved };
-        } else { logger.log('SUCCESS', '[CleanupHelpers] No stale users found in pending or blocks.'); return { pendingRemoved: 0, staleRemoved: 0 }; }
-    } catch (error) { logger.log('ERROR', '[CleanupHelpers] FATAL error during cleanup orchestration', { errorMessage: error.message, errorStack: error.stack }); throw error; }
-};
-
-/**
- * Internal sub-pipe for cleaning pending speculators.
- */
-async function cleanupPendingSpeculators(config, dependencies) {
-    const { db, logger } = dependencies;
-    logger.log('INFO', '[CleanupHelpers] Starting pending speculator cleanup...');
-    
-    const batch = db.batch(); 
-    let stalePendingUsersRemoved = 0;
-    const pendingCollectionRef = db.collection(config.pendingSpeculatorsCollectionName);
-    const staleThreshold = new Date();
-    staleThreshold.setHours(staleThreshold.getHours() - config.pendingGracePeriodHours);
-
-    try {
-        const pendingSnapshot = await pendingCollectionRef.get();
-        if (pendingSnapshot.empty) { logger.log('INFO', '[CleanupHelpers] Pending speculators collection is empty.'); return { batch, count: 0 }; }
-
-        for (const doc of pendingSnapshot.docs) {
-            const pendingData = doc.data().users || {};
-            const updates = {};
-            let updatesInDoc = 0;
-
-            for (const userId in pendingData) {
-                const timestamp = pendingData[userId]?.toDate ? pendingData[userId].toDate() : null;
-                if (timestamp && timestamp < staleThreshold) { updates[`users.${userId}`] = FieldValue.delete(); stalePendingUsersRemoved++; updatesInDoc++; } }
-
-            if (updatesInDoc > 0) { logger.log('TRACE', `[CleanupHelpers] Marking ${updatesInDoc} users for removal from pending doc ${doc.id}`); batch.update(doc.ref, updates); } }
-        logger.log('INFO', `[CleanupHelpers] Marked ${stalePendingUsersRemoved} total stale pending users for removal.`);
-    } catch (error) { logger.log('ERROR', '[CleanupHelpers] Error cleaning pending speculators', { errorMessage: error.message }); throw error; }
-    return { batch, count: stalePendingUsersRemoved };
-}
-
-/**
- * Internal sub-pipe for cleaning stale speculators.
- */
-async function cleanupStaleSpeculators(config, dependencies, batch) {
-    const { db, logger } = dependencies;
-    logger.log('INFO', '[CleanupHelpers] Starting stale speculator cleanup from blocks...');
-    let totalUsersRemoved = 0;
-    const blocksCollectionRef = db.collection(config.speculatorBlocksCollectionName); 
-    const gracePeriodDate = new Date();
-    gracePeriodDate.setDate(gracePeriodDate.getDate() - config.activityGracePeriodDays);
-    const blockCountsUpdate = {}; 
-
-    try {
-        const blocksSnapshot = await blocksCollectionRef.get();
-        if (blocksSnapshot.empty) { logger.log('INFO', '[CleanupHelpers] Speculator blocks collection is empty.'); return { batch, count: 0 }; }
-
-        for (const doc of blocksSnapshot.docs) {
-            const blockId = doc.id;
-            const blockData = doc.data();
-            const users = blockData.users || {};
-            let usersRemovedFromBlock = 0;
-            const updates = {}; 
-
-            for (const userKey in users) { 
-                const userId = userKey.split('.')[1];
-                if (!userId) continue; 
-
-                const userData = users[userKey];
-                const lastHeldTimestamp = userData.lastHeldSpeculatorAsset?.toDate ? userData.lastHeldSpeculatorAsset.toDate() : null;
-
-                if (lastHeldTimestamp && lastHeldTimestamp < gracePeriodDate) { updates[userKey] = FieldValue.delete(); usersRemovedFromBlock++;
-
-                    if (userData.instruments && Array.isArray(userData.instruments)) {
-                        userData.instruments.forEach(instrumentId => { const instrumentBlockKey = `${instrumentId}_${blockId}`; if (!blockCountsUpdate[instrumentBlockKey]) { blockCountsUpdate[instrumentBlockKey] = 0; } blockCountsUpdate[instrumentBlockKey]--; }); } } }
-            if (usersRemovedFromBlock > 0) { logger.log('TRACE', `[CleanupHelpers] Marking ${usersRemovedFromBlock} users for removal from block ${blockId}.`); batch.update(doc.ref, updates); totalUsersRemoved += usersRemovedFromBlock; } }
-
-        if (totalUsersRemoved > 0 && Object.keys(blockCountsUpdate).length > 0) {
-            const countsRef = db.doc(config.speculatorBlockCountsDocPath);
-            const finalCountUpdates = {};
-            for (const key in blockCountsUpdate) { finalCountUpdates[`counts.${key}`] = FieldValue.increment(blockCountsUpdate[key]); }
-             logger.log('TRACE', '[CleanupHelpers] Staging block count decrements.', { updates: finalCountUpdates });
-            batch.set(countsRef, finalCountUpdates, { merge: true }); }
-        logger.log('INFO', `[CleanupHelpers] Marked ${totalUsersRemoved} total stale speculators for removal from blocks.`);
-    } catch (error) { logger.log('ERROR', '[CleanupHelpers] Error cleaning stale speculators', { errorMessage: error.message }); throw error; }
-    return { batch, count: totalUsersRemoved };
-}