diff --git a/apps/web/app/api/registry/entries/route.ts b/apps/web/app/api/registry/entries/route.ts index 40ac75076b..23ed8a2803 100644 --- a/apps/web/app/api/registry/entries/route.ts +++ b/apps/web/app/api/registry/entries/route.ts @@ -1,5 +1,5 @@ import { NextRequest, NextResponse } from 'next/server'; -import { getVercelDb } from 'apps/web/src/utils/datastores/rds'; +import { getDb } from 'apps/web/src/utils/datastores/rds'; import { getKv } from 'apps/web/src/utils/datastores/kv'; import { logger } from 'apps/web/src/utils/logger'; import { withTimeout } from 'apps/web/app/api/decorators'; @@ -18,7 +18,7 @@ async function handler(req: NextRequest) { // Base query for filtering by category if provided try { - const db = getVercelDb(); + const db = getDb(); let baseQuery = db.selectFrom('content'); if (category) { diff --git a/apps/web/app/api/registry/featured/route.ts b/apps/web/app/api/registry/featured/route.ts index 9311722e92..ec152fac17 100644 --- a/apps/web/app/api/registry/featured/route.ts +++ b/apps/web/app/api/registry/featured/route.ts @@ -1,5 +1,5 @@ import { NextResponse } from 'next/server'; -import { getVercelDb } from 'apps/web/src/utils/datastores/rds'; +import { getDb } from 'apps/web/src/utils/datastores/rds'; import { getKv } from 'apps/web/src/utils/datastores/kv'; import { logger } from 'apps/web/src/utils/logger'; import { withTimeout } from 'apps/web/app/api/decorators'; @@ -8,7 +8,7 @@ const PAGE_KEY = 'api.ocs_registry.featured'; async function handler() { try { - const db = getVercelDb(); + const db = getDb(); const content = await db .selectFrom('content') .where('is_featured', '=', true) diff --git a/apps/web/package.json b/apps/web/package.json index 91fefce1f0..ee55b5363c 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -42,7 +42,6 @@ "@types/three": "0.153.0", "@vercel/blob": "^0.23.4", "@vercel/og": "^0.6.2", - "@vercel/postgres-kysely": "^0.8.0", "base-ui": "0.1.1", "classnames": "^2.5.1", "cloudinary": "^2.5.1", diff --git a/apps/web/src/utils/datastores/rds/index.ts b/apps/web/src/utils/datastores/rds/index.ts index 02a0eb3591..ff3e34cfdb 100644 --- a/apps/web/src/utils/datastores/rds/index.ts +++ b/apps/web/src/utils/datastores/rds/index.ts @@ -1,4 +1,3 @@ -import { createKysely } from '@vercel/postgres-kysely'; import { Kysely, PostgresDialect } from 'kysely'; import { Pool } from 'pg'; import { isDevelopment } from 'apps/web/src/constants'; @@ -30,19 +29,6 @@ function createDefaultRDSManager() { } } -function createVercelRDSManager() { - try { - return createKysely(); - } catch (error) { - if (isDevelopment) { - console.error('Failed to connect to Vercel RDS', error); - } else { - logger.error('Failed to connect to Vercel Postgres', error); - } - throw new Error(`Failed to connect to Vercel Postgres: ${error}`); - } -} - let db: Kysely | undefined = undefined; export function getDb() { if (!db) { @@ -50,11 +36,3 @@ export function getDb() { } return db; } - -let vercelDb: Kysely | undefined = undefined; -export function getVercelDb() { - if (!vercelDb) { - vercelDb = createVercelRDSManager(); - } - return vercelDb; -} diff --git a/apps/web/src/utils/proofs/discount_code_storage.ts b/apps/web/src/utils/proofs/discount_code_storage.ts index 77214a5379..cad7c26b5c 100644 --- a/apps/web/src/utils/proofs/discount_code_storage.ts +++ b/apps/web/src/utils/proofs/discount_code_storage.ts @@ -1,9 +1,9 @@ -import { getVercelDb } from 'apps/web/src/utils/datastores/rds'; +import { getDb } from 'apps/web/src/utils/datastores/rds'; const publicTableName = 'public.basenames_discount_codes'; export async function getDiscountCode(code: string) { - const db = getVercelDb(); + const db = getDb(); let query = db.selectFrom(publicTableName).where('code', 'ilike', code); return query.selectAll().limit(1).execute(); } @@ -12,7 +12,7 @@ export async function incrementDiscountCodeUsage(code: string) { const tableName = publicTableName; // Perform the update and return the updated row in a single query - const db = getVercelDb(); + const db = getDb(); const result = await db .updateTable(tableName) .set((eb) => ({ diff --git a/apps/web/src/utils/proofs/proofs_storage.ts b/apps/web/src/utils/proofs/proofs_storage.ts index b6ce2d94d2..869e715845 100644 --- a/apps/web/src/utils/proofs/proofs_storage.ts +++ b/apps/web/src/utils/proofs/proofs_storage.ts @@ -1,4 +1,4 @@ -import { getVercelDb } from 'apps/web/src/utils/datastores/rds'; +import { getDb } from 'apps/web/src/utils/datastores/rds'; import { Address } from 'viem'; export enum ProofTableNamespace { @@ -15,7 +15,7 @@ export async function getProofsByNamespaceAndAddress( namespace: ProofTableNamespace, caseInsensitive = true, // set false for big data sets ) { - const db = getVercelDb(); + const db = getDb(); let query = db.selectFrom(proofTableName).where('namespace', '=', namespace.valueOf()); /** diff --git a/yarn.lock b/yarn.lock index 4259aa24f1..6aaea389ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -164,7 +164,6 @@ __metadata: "@typescript-eslint/utils": ^7.8.0 "@vercel/blob": ^0.23.4 "@vercel/og": ^0.6.2 - "@vercel/postgres-kysely": ^0.8.0 autoprefixer: ^10.4.13 base-ui: 0.1.1 classnames: ^2.5.1 @@ -5159,15 +5158,6 @@ __metadata: languageName: node linkType: hard -"@neondatabase/serverless@npm:0.7.2": - version: 0.7.2 - resolution: "@neondatabase/serverless@npm:0.7.2" - dependencies: - "@types/pg": 8.6.6 - checksum: bfcd7e209aae0c0b05cbf40c5cbc105d9cf43a4f65171cee5f2a170132d015a547c5a8ee2b4cd6e963670ebe77eab5fd0db62d1636e816129fa343b1bd8ec141 - languageName: node - linkType: hard - "@next/bundle-analyzer@npm:^15.1.6": version: 15.1.7 resolution: "@next/bundle-analyzer@npm:15.1.7" @@ -8432,17 +8422,6 @@ __metadata: languageName: node linkType: hard -"@types/pg@npm:8.6.6": - version: 8.6.6 - resolution: "@types/pg@npm:8.6.6" - dependencies: - "@types/node": "*" - pg-protocol: "*" - pg-types: ^2.2.0 - checksum: ac145553a8ad2f357feacad1bceaf5d6ce904eb9d66233b84c469a2b4fa3738d4ebdf29b7ea45387be2d07f915fd873a229f90a2f766d7c377afa7c41fbcf8d1 - languageName: node - linkType: hard - "@types/pg@npm:^8.11.6": version: 8.11.11 resolution: "@types/pg@npm:8.11.11" @@ -9157,29 +9136,6 @@ __metadata: languageName: node linkType: hard -"@vercel/postgres-kysely@npm:^0.8.0": - version: 0.8.0 - resolution: "@vercel/postgres-kysely@npm:0.8.0" - dependencies: - "@vercel/postgres": 0.8.0 - peerDependencies: - kysely: ^0.24.2 || ^0.25.0 || ^0.26.0 || ^0.27.0 - checksum: 3e4cb9fa2e4752c7693aefb6f15b946658d68ab38c0dcb9ae74e49f5dad22bf5a6510c4df9d78e3916115d9f1250817f5ed3361615796ec56d5181347a57abe8 - languageName: node - linkType: hard - -"@vercel/postgres@npm:0.8.0": - version: 0.8.0 - resolution: "@vercel/postgres@npm:0.8.0" - dependencies: - "@neondatabase/serverless": 0.7.2 - bufferutil: 4.0.8 - utf-8-validate: 6.0.3 - ws: 8.14.2 - checksum: c6e2683bec4df7abd0f9dfc525a62d8eab38bdc64928616b21c507445ca5574bff133ff868e7b20fe653fbca1b55341c3ab7dce6255cc05013eaa60414debd71 - languageName: node - linkType: hard - "@vercel/static-config@npm:3.0.0": version: 3.0.0 resolution: "@vercel/static-config@npm:3.0.0" @@ -10651,16 +10607,6 @@ __metadata: languageName: node linkType: hard -"bufferutil@npm:4.0.8": - version: 4.0.8 - resolution: "bufferutil@npm:4.0.8" - dependencies: - node-gyp: latest - node-gyp-build: ^4.3.0 - checksum: 7e9a46f1867dca72fda350966eb468eca77f4d623407b0650913fadf73d5750d883147d6e5e21c56f9d3b0bdc35d5474e80a600b9f31ec781315b4d2469ef087 - languageName: node - linkType: hard - "bufferutil@npm:^4.0.8": version: 4.0.9 resolution: "bufferutil@npm:4.0.9" @@ -20288,7 +20234,7 @@ __metadata: languageName: node linkType: hard -"pg-types@npm:^2.1.0, pg-types@npm:^2.2.0": +"pg-types@npm:^2.1.0": version: 2.2.0 resolution: "pg-types@npm:2.2.0" dependencies: @@ -24804,16 +24750,6 @@ __metadata: languageName: node linkType: hard -"utf-8-validate@npm:6.0.3": - version: 6.0.3 - resolution: "utf-8-validate@npm:6.0.3" - dependencies: - node-gyp: latest - node-gyp-build: ^4.3.0 - checksum: 5e21383c81ff7469c1912119ca69d07202d944c73ddd8a54b84dddcc546b939054e5101c78c294e494d206fe93bd43428adc635a0660816b3ec9c8ec89286ac4 - languageName: node - linkType: hard - "utf-8-validate@npm:^5.0.2": version: 5.0.10 resolution: "utf-8-validate@npm:5.0.10" @@ -25575,21 +25511,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:8.14.2": - version: 8.14.2 - resolution: "ws@npm:8.14.2" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b - languageName: node - linkType: hard - "ws@npm:8.17.1, ws@npm:~8.17.1": version: 8.17.1 resolution: "ws@npm:8.17.1"