refactor: Simplify folder organization in the repo (#796)

* Revert "Revert "refactor: clearer folder organization (#792)" (#795)"

This reverts commit 8f668fe.

* copy scripts folder

* move scripts back

* fix import

Author: arcoraven

.vscode/settings.json

@@ -1,8 +1,9 @@
 import "./polyfill";
+import "./tracer";
+
 import { initServer } from "./server";
-import { env } from "./utils/env";
-import { logger } from "./utils/logger";
-import "./utils/tracer";
+import { env } from "./shared/utils/env";
+import { logger } from "./shared/utils/logger";
 import { initWorker } from "./worker";
 import { CancelRecycledNoncesQueue } from "./worker/queues/cancelRecycledNoncesQueue";
 import { MineTransactionQueue } from "./worker/queues/mineTransactionQueue";

src/index.ts

@@ -1,4 +1,4 @@
-import * as crypto from "crypto";
+import * as crypto from "node:crypto";
 
 if (typeof globalThis.crypto === "undefined") {
   (globalThis as any).crypto = crypto;

src/polyfill.ts

@@ -1,6 +1,10 @@
-import { logger } from "../utils/logger";
-import { acquireLock, releaseLock, waitForLock } from "../utils/redis/lock";
-import { redis } from "../utils/redis/redis";
+import { logger } from "../shared/utils/logger";
+import {
+  acquireLock,
+  releaseLock,
+  waitForLock,
+} from "../shared/utils/redis/lock";
+import { redis } from "../shared/utils/redis/redis";
 
 const MIGRATION_LOCK_TTL_SECONDS = 60;
 

src/scripts/apply-migrations.ts

@@ -1,5 +1,5 @@
-import { execSync } from "child_process";
-import { prisma } from "../db/client";
+import { execSync } from "node:child_process";
+import { prisma } from "../shared/db/client";
 
 const main = async () => {
   const [{ exists: hasWalletsTable }]: [{ exists: boolean }] =
@@ -14,8 +14,8 @@ const main = async () => {
 
   const schema =
     process.env.NODE_ENV === "production"
-      ? `./dist/prisma/schema.prisma`
-      : `./src/prisma/schema.prisma`;
+      ? "./dist/prisma/schema.prisma"
+      : "./src/prisma/schema.prisma";
 
   if (hasWalletsTable) {
     execSync(`yarn prisma migrate reset --force --schema ${schema}`, {

src/scripts/setup-db.ts

@@ -3,11 +3,11 @@ import fastify, { type FastifyInstance } from "fastify";
 import * as fs from "node:fs";
 import path from "node:path";
 import { URL } from "node:url";
-import { clearCacheCron } from "../utils/cron/clearCacheCron";
-import { env } from "../utils/env";
-import { logger } from "../utils/logger";
-import { metricsServer } from "../utils/prometheus";
-import { withServerUsageReporting } from "../utils/usage";
+import { clearCacheCron } from "../shared/utils/cron/clearCacheCron";
+import { env } from "../shared/utils/env";
+import { logger } from "../shared/utils/logger";
+import { metricsServer } from "../shared/utils/prometheus";
+import { withServerUsageReporting } from "../shared/utils/usage";
 import { updateTxListener } from "./listeners/updateTxListener";
 import { withAdminRoutes } from "./middleware/adminRoutes";
 import { withAuth } from "./middleware/auth";

src/server/index.ts

@@ -1,6 +1,6 @@
-import { knex } from "../../db/client";
-import { TransactionDB } from "../../db/transactions/db";
-import { logger } from "../../utils/logger";
+import { knex } from "../../shared/db/client";
+import { TransactionDB } from "../../shared/db/transactions/db";
+import { logger } from "../../shared/utils/logger";
 import { toTransactionSchema } from "../schemas/transaction";
 import { subscriptionsData } from "../schemas/websocket";
 import {

src/server/listeners/updateTxListener.ts

@@ -5,7 +5,7 @@ import type { Queue } from "bullmq";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { timingSafeEqual } from "node:crypto";
-import { env } from "../../utils/env";
+import { env } from "../../shared/utils/env";
 import { CancelRecycledNoncesQueue } from "../../worker/queues/cancelRecycledNoncesQueue";
 import { MineTransactionQueue } from "../../worker/queues/mineTransactionQueue";
 import { NonceHealthCheckQueue } from "../../worker/queues/nonceHealthCheckQueue";

src/server/middleware/adminRoutes.ts

@@ -5,25 +5,25 @@ import {
   type ThirdwebAuthUser,
 } from "@thirdweb-dev/auth/fastify";
 import { AsyncWallet } from "@thirdweb-dev/wallets/evm/wallets/async";
-import { createHash } from "crypto";
+import { createHash } from "node:crypto";
 import type { FastifyInstance } from "fastify";
 import type { FastifyRequest } from "fastify/types/request";
 import jsonwebtoken, { type JwtPayload } from "jsonwebtoken";
 import { validate as uuidValidate } from "uuid";
-import { getPermissions } from "../../db/permissions/getPermissions";
-import { createToken } from "../../db/tokens/createToken";
-import { revokeToken } from "../../db/tokens/revokeToken";
-import { WebhooksEventTypes } from "../../schema/webhooks";
-import { THIRDWEB_DASHBOARD_ISSUER, handleSiwe } from "../../utils/auth";
-import { getAccessToken } from "../../utils/cache/accessToken";
-import { getAuthWallet } from "../../utils/cache/authWallet";
-import { getConfig } from "../../utils/cache/getConfig";
-import { getWebhooksByEventType } from "../../utils/cache/getWebhook";
-import { getKeypair } from "../../utils/cache/keypair";
-import { env } from "../../utils/env";
-import { logger } from "../../utils/logger";
-import { sendWebhookRequest } from "../../utils/webhook";
-import { Permission } from "../schemas/auth";
+import { getPermissions } from "../../shared/db/permissions/getPermissions";
+import { createToken } from "../../shared/db/tokens/createToken";
+import { revokeToken } from "../../shared/db/tokens/revokeToken";
+import { WebhooksEventTypes } from "../../shared/schemas/webhooks";
+import { THIRDWEB_DASHBOARD_ISSUER, handleSiwe } from "../../shared/utils/auth";
+import { getAccessToken } from "../../shared/utils/cache/accessToken";
+import { getAuthWallet } from "../../shared/utils/cache/authWallet";
+import { getConfig } from "../../shared/utils/cache/getConfig";
+import { getWebhooksByEventType } from "../../shared/utils/cache/getWebhook";
+import { getKeypair } from "../../shared/utils/cache/keypair";
+import { env } from "../../shared/utils/env";
+import { logger } from "../../shared/utils/logger";
+import { sendWebhookRequest } from "../../shared/utils/webhook";
+import { Permission } from "../../shared/schemas/auth";
 import { ADMIN_QUEUES_BASEPATH } from "./adminRoutes";
 import { OPENAPI_ROUTES } from "./openApi";
 

src/server/middleware/auth.ts

@@ -1,5 +1,5 @@
 import type { FastifyInstance } from "fastify";
-import { getConfig } from "../../utils/cache/getConfig";
+import { getConfig } from "../../shared/utils/cache/getConfig";
 import { ADMIN_QUEUES_BASEPATH } from "./adminRoutes";
 
 const STANDARD_METHODS = "GET,POST,DELETE,PUT,PATCH,HEAD,PUT,PATCH,POST,DELETE";