delete connectdb

Author: catdevnull

sitio/src/lib/data-processing/days.ts

@@ -1,4 +1,3 @@
-import type { connectDb } from "$lib/db/connectDb";
 import type { Dayjs } from "dayjs";
 import {
   likedTweets,
@@ -16,6 +15,7 @@ import {
 } from "./screenTime";
 import { formatDuration } from "date-fns";
 import { es } from "date-fns/locale/es";
+import { type db as dbGlobal } from "@/db";
 
 export function makeMapOfDays<T>(
   days: Array<Date>,
@@ -42,7 +42,7 @@ export function makeMapOfDays<T>(
 }
 
 export async function getDataForTimePeriod(
-  db: Awaited<ReturnType<typeof connectDb>>,
+  db: typeof dbGlobal,
   start: Dayjs,
   end: Dayjs,
 ): Promise<[Array<MiniLikedTweet>, Array<MiniRetweet>]> {
@@ -76,7 +76,7 @@ export async function getDataForTimePeriod(
 }
 
 export async function getStatsForDaysInTimePeriod(
-  db: Awaited<ReturnType<typeof connectDb>>,
+  db: typeof dbGlobal,
   start: Dayjs,
   end: Dayjs,
 ) {

sitio/src/lib/db/connectDb.ts

@@ -1,7 +1,14 @@
+import * as schema from "../../schema";
 import { env } from "$env/dynamic/private";
-import { connectDb } from "./connectDb.js";
+import postgres from "postgres";
+import { drizzle } from "drizzle-orm/postgres-js";
 
 const path = env.DATABASE_URL ?? "postgresql://localhost:5432/milei";
-export const db = connectDb({
-  url: path,
+
+const client = postgres(path, {
+  max: 1,
+  idle_timeout: 20,
+  connect_timeout: 10,
 });
+
+export const db = drizzle(client, { schema: schema });

sitio/src/lib/db/index.ts

@@ -2,15 +2,13 @@ import { parsearLinkDeTwitter } from "$lib/consts";
 import { readFile } from "node:fs/promises";
 import { promisify } from "node:util";
 import { brotliDecompress } from "node:zlib";
-import { connectDb } from "./connectDb";
 import * as schema from "../../schema";
 import { toDate } from "date-fns-tz";
+import type { db } from ".";
 
 const brotliDecompressP = promisify(brotliDecompress);
 
-export async function seedHistoricLikes(
-  db: Awaited<ReturnType<typeof connectDb>>,
-) {
+export async function seedHistoricLikes(db: typeof db) {
   console.time("seedHistoricLikes");
   const compressed = await readFile("src/lib/db/historicLikes/likes.tsv.br");
   const dataset = await brotliDecompressP(compressed);