Updated Usage Report + MinedTxListener (#416)

* added check for root url on usage tracker. updated minedTxListener

* updated implementation to skip usage reporting for some URLS

* updates

* updates

* updates

* updated sharedSchema

Author: farhanW3

src/utils/usage.ts

@@ -54,6 +54,14 @@ interface UsageEventSchema extends Omit<UsageEvent, "action"> {
   action: UsageEventTxActionEnum;
 }
 
+const URLS_LIST_TO_NOT_REPORT_USAGE = new Set([
+  "/",
+  "/favicon.ico",
+  "/",
+  "/system/health",
+  "/json",
+]);
+
 const createHeaderForRequest = (input: CreateHeaderForRequestParams) => {
   return {
     "Content-Type": "application/json",
@@ -71,6 +79,10 @@ export const withServerUsageReporting = (server: FastifyInstance) => {
         return;
       }
 
+      if (URLS_LIST_TO_NOT_REPORT_USAGE.has(reply.request.routerPath)) {
+        return;
+      }
+
       const derivedClientId = deriveClientId(env.THIRDWEB_API_SECRET_KEY);
       const headers = createHeaderForRequest({
         clientId: derivedClientId,
@@ -84,10 +96,6 @@ export const withServerUsageReporting = (server: FastifyInstance) => {
         ? await getChainIdFromChain(requestParams.chain)
         : "";
 
-      if (reply.request.routerPath === "" || !reply.request.routerPath) {
-        return;
-      }
-
       const requestBody: UsageEventSchema = {
         source: "engine",
         action: UsageEventTxActionEnum.APIRequest,

src/worker/listeners/minedTxListener.ts

@@ -1,9 +1,11 @@
 import cron from "node-cron";
 import { getConfig } from "../../utils/cache/getConfig";
+import { logger } from "../../utils/logger";
 import { updateMinedTx } from "../tasks/updateMinedTx";
 import { updateMinedUserOps } from "../tasks/updateMinedUserOps";
 
 let task: cron.ScheduledTask;
+let minedTxStarted = false;
 export const minedTxListener = async () => {
   const config = await getConfig();
 
@@ -16,7 +18,17 @@ export const minedTxListener = async () => {
   }
 
   task = cron.schedule(config.minedTxListenerCronSchedule, async () => {
-    await updateMinedTx();
-    await updateMinedUserOps();
+    if (!minedTxStarted) {
+      minedTxStarted = true;
+      await updateMinedTx();
+      await updateMinedUserOps();
+      minedTxStarted = false;
+    } else {
+      logger({
+        service: "worker",
+        level: "warn",
+        message: "Mined tx listener already running, skipping",
+      });
+    }
   });
 };