Fix: Worker Error Reporting (#480)

* throwing Error for Worker onError hook to log right message * more errors --------- Co-authored-by: Phillip Ho <[email protected]>
thirdweb-dev · Apr 6, 2024 · c16b97b · c16b97b
1 parent b90de6b
commit c16b97b
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 23 deletions.
diff --git a/src/server/routes/chain/get.ts b/src/server/routes/chain/get.ts
@@ -77,12 +77,11 @@ export async function getChainData(fastify: FastifyInstance) {
       }
 
       if (!chainData) {
-        const error = createCustomError(
+        throw createCustomError(
           "Chain not found",
           StatusCodes.NOT_FOUND,
           "ChainNotFound",
         );
-        throw error;
       }
 
       const minimizeChainData = minimizeChain(chainData);

diff --git a/src/server/routes/contract/subscriptions/getContractIndexedBlockRange.ts b/src/server/routes/contract/subscriptions/getContractIndexedBlockRange.ts
@@ -59,12 +59,11 @@ export async function getContractIndexedBlockRange(fastify: FastifyInstance) {
       });
 
       if (!result.fromBlock || !result.toBlock) {
-        const error = createCustomError(
+        throw createCustomError(
           `No logs found for chainId: ${chainId}, contractAddress: ${standardizedContractAddress}`,
           StatusCodes.NOT_FOUND,
           "LOG_NOT_FOUND",
         );
-        throw error;
       }
 
       reply.status(StatusCodes.OK).send({

diff --git a/src/server/routes/transaction/blockchain/getUserOpReceipt.ts b/src/server/routes/transaction/blockchain/getUserOpReceipt.ts
@@ -101,7 +101,9 @@ export async function getUserOpReceipt(fastify: FastifyInstance) {
           }),
         });
         if (!resp.ok) {
-          throw `Unexpected status ${resp.status} - ${await resp.text()}`;
+          throw new Error(
+            `Unexpected status ${resp.status} - ${await resp.text()}`,
+          );
         }
 
         const json = await resp.json();

diff --git a/src/server/routes/transaction/getAll.ts b/src/server/routes/transaction/getAll.ts
@@ -115,19 +115,17 @@ export async function getAllTx(fastify: FastifyInstance) {
       const { page, limit } = request.query;
 
       if (isNaN(parseInt(page, 10))) {
-        const customError = createCustomError(
+        throw createCustomError(
           "Page must be a number",
           StatusCodes.BAD_REQUEST,
           "BAD_REQUEST",
         );
-        throw customError;
       } else if (isNaN(parseInt(limit, 10))) {
-        const customError = createCustomError(
+        throw createCustomError(
           "Limit must be a number",
           StatusCodes.BAD_REQUEST,
           "BAD_REQUEST",
         );
-        throw customError;
       }
 
       const { transactions, totalCount } = await getAllTxs({

diff --git a/src/server/routes/transaction/getAllDeployedContracts.ts b/src/server/routes/transaction/getAllDeployedContracts.ts
@@ -94,19 +94,17 @@ export async function getAllDeployedContracts(fastify: FastifyInstance) {
       const { page, limit } = request.query;
 
       if (isNaN(parseInt(page, 10))) {
-        const customError = createCustomError(
+        throw createCustomError(
           "Page must be a number",
           StatusCodes.BAD_REQUEST,
           "BAD_REQUEST",
         );
-        throw customError;
       } else if (isNaN(parseInt(limit, 10))) {
-        const customError = createCustomError(
+        throw createCustomError(
           "Limit must be a number",
           StatusCodes.BAD_REQUEST,
           "BAD_REQUEST",
         );
-        throw customError;
       }
       const { transactions, totalCount } = await getAllTxs({
         page: parseInt(page, 10),

diff --git a/src/server/routes/transaction/status.ts b/src/server/routes/transaction/status.ts
@@ -82,12 +82,11 @@ export async function checkTxStatus(fastify: FastifyInstance) {
       const returnData = await getTxById({ queueId });
 
       if (!returnData) {
-        const error = createCustomError(
+        throw createCustomError(
           `Transaction not found with queueId ${queueId}`,
           StatusCodes.NOT_FOUND,
           "TX_NOT_FOUND",
         );
-        throw error;
       }
 
       reply.status(StatusCodes.OK).send({

diff --git a/src/server/routes/transaction/syncRetry.ts b/src/server/routes/transaction/syncRetry.ts
@@ -125,7 +125,7 @@ export async function syncRetryTransaction(fastify: FastifyInstance) {
       try {
         txResponse = await signer.sendTransaction(txRequest);
         if (!txResponse) {
-          throw "Missing transaction response.";
+          throw new Error("Missing transaction response.");
         }
       } catch (e) {
         const errorMessage = await parseTxError(tx, e);

diff --git a/src/server/utils/simulateTx.ts b/src/server/utils/simulateTx.ts
@@ -36,7 +36,7 @@ export const simulateRaw = async (tx: InputTransaction) => {
       from: tx.fromAddress,
     });
   } catch (e: any) {
-    throw e?.message || e.toString();
+    throw new Error(e?.message || e.toString());
   }
 };
 

diff --git a/src/worker/queues/workers.ts b/src/worker/queues/workers.ts
@@ -6,23 +6,25 @@ export const logWorkerEvents = (worker: Worker) => {
   worker.on("active", (job: Job) => {
     logger({
       level: "debug",
-      message: `Processing job ${job.id}`,
+      message: `[${worker.name}] Processing: ${job.id}`,
       service: "worker",
     });
   });
   worker.on("completed", (job: Job) => {
     logger({
       level: "debug",
-      message: `[${worker.name}] Job ${job.id} has completed!`,
+      message: `[${worker.name}] Completed: ${job.id}`,
       service: "worker",
     });
   });
   worker.on("failed", (job: Job | undefined, err: Error) => {
     logger({
       level: "error",
-      message: `[${worker.name}]  Job ${job?.id ?? "?"} has failed with ${
-        err.message
-      } ${env.NODE_ENV === "development" ? err.stack : ""}`,
+      message: `[${worker.name}] Failed: ${
+        job?.id ?? "<no job ID>"
+      } with error: ${err.message} ${
+        env.NODE_ENV === "development" ? err.stack : ""
+      }`,
       service: "worker",
     });
   });

diff --git a/src/worker/tasks/webhookWorker.ts b/src/worker/tasks/webhookWorker.ts
@@ -20,7 +20,9 @@ const handleWebhook: Processor<any, void, string> = async (
   }
 
   if (resp && !resp.ok) {
-    throw `Received status ${resp.status} from webhook ${webhook.url}.`;
+    throw new Error(
+      `Received status ${resp.status} from webhook ${webhook.url}.`,
+    );
   }
 };