fix: Use a single Node entrypoint (#397)

* fix: Use a single Node entrypoint

* remove debug line

Author: arcoraven

package.json

@@ -9,18 +9,16 @@
   "scripts": {
     "docker": "docker compose --env-file ./.env up --remove-orphans",
     "docker:build": "docker compose build --no-cache",
-    "dev": "yarn dev:infra && yarn dev:db && (yarn dev:server & yarn dev:worker)",
+    "dev": "yarn dev:infra && yarn dev:db && yarn dev:run",
     "dev:infra": "docker compose -f ./docker-compose-infra.yml up -d",
     "dev:db": "yarn prisma:setup:dev",
-    "dev:server": "nodemon --watch 'src/server/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./src/server/index.ts' --files src/server/index.ts",
-    "dev:worker": "nodemon --watch 'src/worker/**/*.ts' --watch 'src/**/*.ts' --exec 'npx tsx ./src/worker/index.ts' --files src/worker/index.ts",
+    "dev:run": "nodemon --watch 'src/**/*.ts' --exec 'npx tsx ./src/index.ts' --files src/index.ts",
     "build": "yarn && rm -rf dist && tsc -p ./tsconfig.json --outDir dist",
     "generate:sdk": "npx tsx ./src/scripts/generate-sdk && cd ./sdk && yarn build",
     "prisma:setup:dev": "npx tsx ./src/scripts/setup-db.ts",
     "prisma:setup:prod": "npx tsx ./dist/scripts/setup-db.js",
-    "start": "yarn prisma:setup:prod && (yarn start:server & yarn start:worker)",
-    "start:server": "node --experimental-specifier-resolution=node ./dist/server/index.js",
-    "start:worker": "node --experimental-specifier-resolution=node ./dist/worker/index.js",
+    "start": "yarn prisma:setup:prod && yarn start:run",
+    "start:run": "node --experimental-specifier-resolution=node ./dist/index.js",
     "start:docker": "docker compose build && docker compose --env-file ./.env up --remove-orphans",
     "docker-build-run": "docker compose build --no-cache && docker compose --env-file ./.env up --remove-orphans",
     "copy-files": "copyfiles -u 2 ./src/prisma/* ./dist/prisma/ && copyfiles -u 3 ./src/prisma/migrations/**/*.sql ./dist/prisma/migrations/",

src/index.ts

@@ -0,0 +1,9 @@
+import { initServer } from "./server";
+import { initWorker } from "./worker";
+
+const main = async () => {
+  initServer();
+  initWorker();
+};
+
+main();

src/server/index.ts

@@ -28,7 +28,7 @@ interface HttpsObject {
   };
 }
 
-const main = async () => {
+export const initServer = async () => {
   // Reset any server state that is safe to reset.
   // This allows the server to start in a predictable state.
   await deleteAllWalletNonces({});
@@ -94,5 +94,3 @@ const main = async () => {
   await updateTxListener();
   await clearCacheCron("server");
 };
-
-main();

src/utils/cache/clearCache.ts

@@ -1,5 +1,4 @@
 import { env } from "../env";
-import { logger } from "../logger";
 import { configCache } from "./getConfig";
 import { sdkCache } from "./getSdk";
 import { walletsCache } from "./getWallet";
@@ -8,12 +7,6 @@ import { webhookCache } from "./getWebhook";
 export const clearCache = async (
   service: (typeof env)["LOG_SERVICES"][0],
 ): Promise<void> => {
-  logger({
-    level: "info",
-    service,
-    message: "Resetting Cache",
-  });
-
   // Reset config
   configCache.clear();
 

src/worker/index.ts

@@ -12,7 +12,7 @@ import {
   updatedWebhooksListener,
 } from "./listeners/webhookListener";
 
-const worker = async () => {
+export const initWorker = async () => {
   // Listen for queued transactions to process
   await queuedTxListener();
 
@@ -36,5 +36,3 @@ const worker = async () => {
   // Rest Cache Cron
   await clearCacheCron("worker");
 };
-
-worker();