@go-mailer/jarvis 10.9.2 → 10.9.4

package/lib/throttlers/wallet/index.js

@@ -1,126 +1,159 @@
-const fs = require('fs')
-const path = require('path')
-
-const WalletThrottler = async ({ redisClient = null, RMQBroker, wallet_charge_queue, wallet_refund_queue }) => {
+const fs = require("fs");
+const path = require("path");
+
+const WalletThrottler = async ({
+  redisClient = null,
+  RMQBroker,
+  wallet_charge_queue,
+  wallet_refund_queue,
+}) => {
   if (!redisClient) {
-    throw new Error('Redis client is required for WalletThrottler')
+    throw new Error("Redis client is required for WalletThrottler");
   }
 
-  const lua_script = fs.readFileSync(path.join(__dirname, 'throttler.lua'), 'utf-8')
-  const deduct_sha = await redisClient.scriptLoad(lua_script)
-
-  const deductCredits = async ({ tenant_id, message_type = 'transactional', wallet_type, amount, min_allowed = 0 }) => {
-    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`
-    const usage_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}:usage`
-
-    let result
+  const lua_script = fs.readFileSync(
+    path.join(__dirname, "throttler.lua"),
+    "utf-8",
+  );
+  const deduct_sha = await redisClient.scriptLoad(lua_script);
+
+  const deductCredits = async ({
+    tenant_id,
+    resource_id,
+    resource_type,
+    wallet_type,
+    amount,
+    min_allowed = 0,
+  }) => {
+    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`;
+    const usage_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}:${resource_type}:${resource_id}:usage`;
+
+    let result;
     try {
       result = await redisClient.evalSha(deduct_sha, {
         keys: [balance_key, usage_key],
-        arguments: [amount.toString(), min_allowed.toString(), message_type]
-      })
+        arguments: [amount.toString(), min_allowed.toString()],
+      });
     } catch (err) {
       result = await redisClient.eval(lua_script, {
         keys: [balance_key, usage_key],
-        arguments: [amount.toString(), min_allowed.toString(), message_type]
-      })
+        arguments: [amount.toString(), min_allowed.toString()],
+      });
     }
 
-    const [success, status, newBalance] = result
+    const [success, status, newBalance] = result;
     if (success === 1) {
-      return { success: true, newBalance: parseInt(newBalance, 10) }
+      return { success: true, newBalance: parseInt(newBalance, 10) };
     }
 
-    if (status === 'no_balance') {
-      return { success: false, reason: 'no_wallet' }
+    if (status === "no_balance") {
+      return { success: false, reason: "no_wallet" };
     }
 
-    return { success: false, reason: 'insufficient', currentBalance: parseInt(newBalance, 10) }
-  }
+    return {
+      success: false,
+      reason: "insufficient",
+      currentBalance: parseInt(newBalance, 10),
+    };
+  };
 
   const deductUsedCreditsFromDB = async () => {
     if (!RMQBroker) {
-      throw new Error('RMQBroker is required for WalletThrottler')
+      throw new Error("RMQBroker is required for WalletThrottler");
     }
 
     if (!wallet_charge_queue) {
-      throw new Error('wallet_charge_queue is required for WalletThrottler')
+      throw new Error("wallet_charge_queue is required for WalletThrottler");
     }
 
-    const used_keys = await redisClient.keys('wallet:tenant:*:wallet:*:usage')
+    const used_keys = await redisClient.keys(
+      "wallet:tenant:*:wallet:*:*:*:usage",
+    );
     for (const usage_key of used_keys) {
-      const usage = await redisClient.get(usage_key)
-      const [, , tenant_id, , wallet_type] = usage_key.split(':')
-      if (usage && parseInt(usage, 10) === 0) continue
+      const usage = await redisClient.get(usage_key);
+      const [, , tenant_id, , wallet_type, resource_type, resource_id] =
+        usage_key.split(":");
+      if (usage && parseInt(usage, 10) === 0) continue;
 
-      await redisClient.multi().set(usage_key, 0).exec()
+      await redisClient.multi().set(usage_key, 0).exec();
       RMQBroker.publish(
         wallet_charge_queue,
-        JSON.stringify({ tenant_id, resource_id: 0, resource_type: wallet_type, wallet_type, cost: parseInt(usage, 10), timestamp: Date.now() })
-      )
-
-      console.log(`Synced ${usage} used credits for ${tenant_id}`)
+        JSON.stringify({
+          tenant_id,
+          resource_id,
+          resource_type,
+          wallet_type,
+          cost: parseInt(usage, 10),
+          timestamp: Date.now(),
+        }),
+      );
+
+      console.log(`Synced ${usage} used credits for ${tenant_id}`);
     }
-  }
+  };
 
   const loadCache = async ({ tenant_id, wallet_type, balance }) => {
-    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`
-    const usage_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}:usage`
+    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`;
 
     // Load balance from DB if missing
-    const redis_balance = await redisClient.get(balance_key)
+    const redis_balance = await redisClient.get(balance_key);
     if (redis_balance === null) {
-      await redisClient.set(balance_key, balance)
+      await redisClient.set(balance_key, balance);
     }
-
-    // Check & sync any dangling used immediately
-    const used = parseInt((await redisClient.get(usage_key)) || '0', 10)
-    if (used > 0) {
-      RMQBroker.publish(
-        wallet_charge_queue,
-        JSON.stringify({ tenant_id, resource_id: 0, resource_type: wallet_type, wallet_type, cost: used, timestamp: Date.now() })
-      )
-
-      await redisClient.set(usage_key, 0) // reset after sync
-      await redisClient.decrBy(balance_key, used) // update Redis balance too
-      console.log(`Synced dangling used ${used} for ${tenant_id} on startup`)
-    }
-  }
-
-  const refundCredits = async ({ tenant_id, wallet_type, amount, resource_id }) => {
-    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`
-    const usage_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}:usage`
+  };
+
+  const refundCredits = async ({
+    tenant_id,
+    wallet_type,
+    amount,
+    resource_id,
+    resource_type,
+    syncWithDb = true,
+  }) => {
+    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`;
+    const usage_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}:${resource_type}:${resource_id}:usage`;
 
     // Atomic refund in Redis
     await redisClient
       .multi()
       .incrBy(balance_key, amount)
       .decrBy(usage_key, amount) // reduce tracked usage
-      .exec()
+      .exec();
 
     // Async DB refund
-    RMQBroker.publish(
-      wallet_refund_queue,
-      JSON.stringify({
-        tenant_id,
-        amount: 0,
-        units: amount,
-        resource_id,
-        type: wallet_type
-      })
-    )
-    console.log(`Refunded ${amount} credits for tenant ${tenant_id} on wallet ${wallet_type}`)
-  }
+    if (syncWithDb) {
+      RMQBroker.publish(
+        wallet_refund_queue,
+        JSON.stringify({
+          tenant_id,
+          amount: 0,
+          units: amount,
+          resource_id,
+          resource_type,
+          type: wallet_type,
+        }),
+      );
+    }
+    console.log(
+      `Refunded ${amount} credits for tenant ${tenant_id} on wallet ${wallet_type}`,
+    );
+  };
 
   const topUpCredits = async ({ tenant_id, wallet_type, amount = 0 }) => {
-    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`
+    const balance_key = `wallet:tenant:${tenant_id}:wallet:${wallet_type}`;
 
     // Increment Redis (instant across all instances)
-    await redisClient.incrBy(balance_key, amount)
-    console.log(`Top-up ${amount} for ${tenant_id} on wallet ${wallet_type}`)
-  }
-
-  return { deductCredits, deductUsedCreditsFromDB, loadCache, refundCredits, topUpCredits }
-}
-
-module.exports = { WalletThrottler }
+    await redisClient.incrBy(balance_key, amount);
+    console.log(`Top-up ${amount} for ${tenant_id} on wallet ${wallet_type}`);
+  };
+
+  return {
+    deductCredits,
+    deductUsedCreditsFromDB,
+    loadCache,
+    refundCredits,
+    topUpCredits,
+  };
+};
+
+module.exports = { WalletThrottler };

package/lib/throttlers/wallet/throttler.lua

@@ -8,7 +8,6 @@ local balanceKey = KEYS[1]
 local usedKey    = KEYS[2]
 local amount     = tonumber(ARGV[1])
 local minAllowed = tonumber(ARGV[2]) or 0
-local msgType = ARGV[3]
 
 local balance = redis.call('GET', balanceKey)
 if not balance then
@@ -25,8 +24,6 @@ end
 redis.call('SET', balanceKey, balance - amount)
 
 -- Track usage
-if msgType ~= "campaign" then
-  redis.call('INCRBY', usedKey, amount)
-end
+redis.call('INCRBY', usedKey, amount)
 
 return {1, "success", balance - amount}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-mailer/jarvis",
-  "version": "10.9.2",
+  "version": "10.9.4",
   "main": "index.js",
   "repository": "git@github.com:go-mailer-ltd/jarvis-node.git",
   "author": "Nathan Oguntuberu <nateoguns.work@gmail.com>",