bulltrackers-module 1.0.136 → 1.0.137

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

@@ -59,14 +59,30 @@ async function handleVerify(task, taskId, { db, logger, ...dependencies }, confi
         }
     }
 
+    // --- START FIX: MODIFIED FOR SHARDING ---
     if (Object.keys(usernameMap).length) {
-        const mapRef = db.collection(config.FIRESTORE_COLLECTION_USERNAME_MAP).doc('cid_map_shard_1');
-        batch.set(mapRef, usernameMap, { merge: true });
-        logger.log('INFO', `[VERIFY] Staging ${Object.keys(usernameMap).length} username updates.`);
+        // Group updates by shard
+        const shardedUpdates = {};
+        for (const cid in usernameMap) {
+            // Re-implement the sharding logic here
+            const shardId = `cid_map_shard_${Math.floor(parseInt(cid) / 10000) % 10}`;
+            if (!shardedUpdates[shardId]) {
+                shardedUpdates[shardId] = {};
+            }
+            shardedUpdates[shardId][cid] = usernameMap[cid];
+        }
+
+        // Write each shard to its own document
+        for (const shardId in shardedUpdates) {
+            const mapRef = db.collection(config.FIRESTORE_COLLECTION_USERNAME_MAP).doc(shardId);
+            batch.set(mapRef, shardedUpdates[shardId], { merge: true });
+        }
+        logger.log('INFO', `[VERIFY] Staging username updates across ${Object.keys(shardedUpdates).length} shards.`);
     }
+    // --- END FIX ---
 
     await batch.commit();
     if (validUserCount) logger.log('INFO', `[VERIFY] Verified and stored ${validUserCount} new ${userType} users.`);
 }
 
-module.exports = { handleVerify };
+module.exports = { handleVerify };

package/functions/task-engine/utils/firestore_batch_manager.js

@@ -31,6 +31,13 @@ class FirestoreBatchManager {
         logger.log('INFO', 'FirestoreBatchManager initialized.');
     }
 
+    // --- START FIX: ADDED SHARDING HELPER ---
+    _getUsernameShardId(cid) {
+        // Shard across 10 documents (supports ~200k users assuming 50 bytes/user)
+        return `cid_map_shard_${Math.floor(parseInt(cid) / 10000) % 10}`;
+    }
+    // --- END FIX ---
+
     _scheduleFlush() {
         if (!this.batchTimeout) this.batchTimeout = setTimeout(() => this.flushBatches(), this.config.TASK_ENGINE_FLUSH_INTERVAL_MS);
     }
@@ -40,6 +47,7 @@ class FirestoreBatchManager {
         this.usernameMap.clear();
         this.logger.log('INFO', '[BATCH] Refreshing username map from Firestore...');
         try {
+            // This correctly gets ALL documents (shards) in the collection
             const snapshot = await this.db.collection(this.usernameMapCollectionName).get();
             snapshot.forEach(doc => {
                 const data = doc.data();
@@ -54,14 +62,23 @@ class FirestoreBatchManager {
 
     getUsername(cid) { return this.usernameMap.get(String(cid)); }
 
+    // --- START FIX: MODIFIED FOR SHARDING ---
     addUsernameMapUpdate(cid, username) {
         if (!username) return;
         const cidStr = String(cid);
         this.usernameMap.set(cidStr, username);
-        this.usernameMapUpdates[cidStr] = { username };
-        this.logger.log('TRACE', `[BATCH] Queued username update for ${cidStr}.`);
+
+        // Organize updates by shard ID
+        const shardId = this._getUsernameShardId(cidStr);
+        if (!this.usernameMapUpdates[shardId]) {
+            this.usernameMapUpdates[shardId] = {};
+        }
+        this.usernameMapUpdates[shardId][cidStr] = { username };
+
+        this.logger.log('TRACE', `[BATCH] Queued username update for ${cidStr} in ${shardId}.`);
         this._scheduleFlush();
     }
+    // --- END FIX ---
 
     async addToTradingHistoryBatch(userId, blockId, date, historyData, userType) {
         const collection = userType === 'speculator' ? this.speculatorHistoryCollectionName : this.normalHistoryCollectionName;
@@ -151,12 +168,22 @@ class FirestoreBatchManager {
             delete this.speculatorTimestampFixBatch[docPath];
         }
 
-        if (Object.keys(this.usernameMapUpdates).length) {
-            firestoreBatch.set(this.db.collection(this.usernameMapCollectionName).doc('cid_map_shard_1'), this.usernameMapUpdates, { merge: true });
-            batchOps++;
-            this.logger.log('INFO', `[BATCH] Flushing ${Object.keys(this.usernameMapUpdates).length} username map updates.`);
-            this.usernameMapUpdates = {};
+        // --- START FIX: MODIFIED FOR SHARDING ---
+        // Loop over each shardId in the updates object
+        for (const shardId in this.usernameMapUpdates) {
+            const updates = this.usernameMapUpdates[shardId];
+            if (updates && Object.keys(updates).length > 0) {
+                firestoreBatch.set(
+                    this.db.collection(this.usernameMapCollectionName).doc(shardId),
+                    updates,
+                    { merge: true }
+                );
+                batchOps++;
+                this.logger.log('INFO', `[BATCH] Flushing ${Object.keys(updates).length} username updates to ${shardId}.`);
+            }
         }
+        this.usernameMapUpdates = {}; // Clear updates after staging them
+        // --- END FIX ---
 
         if (this.processedSpeculatorCids.size) {
             const cids = Array.from(this.processedSpeculatorCids);
@@ -180,4 +207,4 @@ class FirestoreBatchManager {
     }
 }
 
-module.exports = { FirestoreBatchManager };
+module.exports = { FirestoreBatchManager };

package/package.json

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