🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Wip (#42)
Bill Yang2b5c67793354
diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsxindex 87a85da5c..824ac7b94 100644--- a/client/src/app/[site]/Header/Header.tsx+++ b/client/src/app/[site]/Header/Header.tsx@@ -13,7 +13,7 @@ export function Header() {const pathname = usePathname();const site = sites?.data?.find(- (site) => site.site_id === Number(pathname.split("/")[1])+ (site) => site.siteId === Number(pathname.split("/")[1]));// Check which tab is active based on the current pathdiff --git a/client/src/app/[site]/components/NoData.tsx b/client/src/app/[site]/components/NoData.tsxindex 902041bf5..d6a4ab34b 100644--- a/client/src/app/[site]/components/NoData.tsx+++ b/client/src/app/[site]/components/NoData.tsx@@ -27,7 +27,7 @@ export function NoData({</div><CodeSnippetlanguage="HTML"- code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteMetadata?.site_id}"\n defer\n/>`}+ code={`<script\n src="${BACKEND_URL}/script.js"\n site-id="${siteMetadata?.siteId}"\n defer\n/>`}/></div></CardContent>diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsxindex 9ce29c4e2..627161327 100644--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx@@ -41,7 +41,7 @@ export function SubHeader() {const pathname = usePathname();const site = sites?.data?.find(- (site) => site.site_id === Number(pathname.slice(1))+ (site) => site.siteId === Number(pathname.slice(1)));return (diff --git a/client/src/app/[site]/settings/DeleteSite.tsx b/client/src/app/[site]/settings/DeleteSite.tsxindex 51593df8f..309ca79b5 100644--- a/client/src/app/[site]/settings/DeleteSite.tsx+++ b/client/src/app/[site]/settings/DeleteSite.tsx@@ -25,7 +25,7 @@ export function DeleteSite({isOpen={isOpen}setIsOpen={setIsOpen}onConfirm={async () => {- await deleteSite(site.site_id);+ await deleteSite(site.siteId);refetch();router.push("/");}}diff --git a/client/src/app/[site]/settings/page.tsx b/client/src/app/[site]/settings/page.tsxindex 75401bbc7..9bb3964ef 100644--- a/client/src/app/[site]/settings/page.tsx+++ b/client/src/app/[site]/settings/page.tsx@@ -13,7 +13,7 @@ export default function SettingsPage() {const pathname = usePathname();const site = sites?.data?.find(- (site) => site.site_id === Number(pathname.split("/")[1])+ (site) => site.siteId === Number(pathname.split("/")[1]));return (diff --git a/client/src/app/page.tsx b/client/src/app/page.tsxindex 764258bb2..41e878d91 100644--- a/client/src/app/page.tsx+++ b/client/src/app/page.tsx@@ -15,7 +15,7 @@ export default function Home() {</div><div className="grid grid-cols-3 gap-4 mt-4">{sites?.data?.map((site) => (- <Link href={`/${site.site_id}`} key={site.site_id}>+ <Link href={`/${site.siteId}`} key={site.siteId}><div className="flex p-4 rounded-lg bg-neutral-900 text-lg font-semibold gap-2"><imgclassName="w-6 mr-1"diff --git a/client/src/hooks/api.ts b/client/src/hooks/api.tsindex 8a11a56f3..38081f1a3 100644--- a/client/src/hooks/api.ts+++ b/client/src/hooks/api.ts@@ -178,12 +178,12 @@ export function useGetOverview(periodTime?: PeriodTime) {}export type GetSitesResponse = {- site_id: number;- site_name: string;+ siteId: number;+ name: string;domain: string;- created_at: string;- updated_at: string;- created_by: string;+ createdAt: string;+ updatedAt: string;+ createdBy: string;}[];export function useGetSites() {diff --git a/client/src/hooks/hooks.ts b/client/src/hooks/hooks.tsindex 63c3e3873..c730af9bd 100644--- a/client/src/hooks/hooks.ts+++ b/client/src/hooks/hooks.ts@@ -3,7 +3,7 @@ import { useGetSites } from "./api";export function useGetSiteMetadata(siteId: string) {const { data, isLoading } = useGetSites();return {- siteMetadata: data?.data?.find((site) => site.site_id === Number(siteId)),+ siteMetadata: data?.data?.find((site) => site.siteId === Number(siteId)),isLoading,};}diff --git a/server/Dockerfile b/server/Dockerfileindex 5a37542ed..d899da4cc 100644--- a/server/Dockerfile+++ b/server/Dockerfile@@ -1,14 +1,46 @@# syntax=docker/dockerfile:1-FROM node:22-alpine+FROM node:20-alpine AS builderWORKDIR /app-COPY ["package.json", "package-lock.json*", "./"]--RUN npm install+# Install dependencies+COPY package*.json ./+RUN npm ci+# Copy source codeCOPY . .++# Build the applicationRUN npm run build-CMD [ "npm", "start" ]\ No newline at end of file+# Generate migrations (but don't run them)+RUN mkdir -p /app/drizzle+RUN npx drizzle-kit generate || echo "Skipping migration generation during build"++# Runtime image+FROM node:20-alpine++WORKDIR /app++# Install PostgreSQL client for migrations+RUN apk add --no-cache postgresql-client++# Copy built application and dependencies+COPY --from=builder /app/package*.json ./+COPY --from=builder /app/dist ./dist+COPY --from=builder /app/drizzle ./drizzle+COPY --from=builder /app/node_modules ./node_modules+COPY --from=builder /app/docker-entrypoint.sh /docker-entrypoint.sh+COPY --from=builder /app/drizzle.config.ts ./drizzle.config.ts+COPY --from=builder /app/public ./public++# Make the entrypoint executable+RUN chmod +x /docker-entrypoint.sh++# Expose the API port+EXPOSE 3001++# Use our custom entrypoint script+ENTRYPOINT ["/docker-entrypoint.sh"]+CMD ["node", "dist/index.js"]\ No newline at end of filediff --git a/server/better-auth_migrations/2025-02-11T06-34-22.095Z.sql b/server/better-auth_migrations/2025-02-11T06-34-22.095Z.sqldeleted file mode 100644index 0a0fadae3..000000000--- a/server/better-auth_migrations/2025-02-11T06-34-22.095Z.sql+++ /dev/null@@ -1,7 +0,0 @@-create table "user" ("id" text not null primary key, "name" text not null, "email" text not null unique, "emailVerified" boolean not null, "image" text, "createdAt" timestamp not null, "updatedAt" timestamp not null);--create table "session" ("id" text not null primary key, "expiresAt" timestamp not null, "token" text not null unique, "createdAt" timestamp not null, "updatedAt" timestamp not null, "ipAddress" text, "userAgent" text, "userId" text not null references "user" ("id"));--create table "account" ("id" text not null primary key, "accountId" text not null, "providerId" text not null, "userId" text not null references "user" ("id"), "accessToken" text, "refreshToken" text, "idToken" text, "accessTokenExpiresAt" timestamp, "refreshTokenExpiresAt" timestamp, "scope" text, "password" text, "createdAt" timestamp not null, "updatedAt" timestamp not null);--create table "verification" ("id" text not null primary key, "identifier" text not null, "value" text not null, "expiresAt" timestamp not null, "createdAt" timestamp, "updatedAt" timestamp)\ No newline at end of filediff --git a/server/docker-entrypoint.sh b/server/docker-entrypoint.shnew file mode 100644index 000000000..e3e34886e--- /dev/null+++ b/server/docker-entrypoint.sh@@ -0,0 +1,13 @@+#!/bin/sh+set -e++# Docker Compose already ensures services are ready using healthchecks+# and dependency conditions in the docker-compose.yml file++# Run migrations explicitly using the npm script+echo "Running database migrations...."+# npm run db:migrate++# Start the application+echo "Starting application..."+exec "$@"\ No newline at end of filediff --git a/server/drizzle.config.ts b/server/drizzle.config.tsnew file mode 100644index 000000000..bf2369a71--- /dev/null+++ b/server/drizzle.config.ts@@ -0,0 +1,18 @@+import "dotenv/config";+import { defineConfig } from "drizzle-kit";++export default defineConfig({+ schema: "./src/db/postgres/schema.ts",+ out: "./drizzle",+ dialect: "postgresql",+ dbCredentials: {+ host: "postgres",+ port: 5432,+ database: "analytics",+ user: "frog",+ password: "frog",+ ssl: false,+ },+ verbose: true,+ strict: true,+});diff --git a/server/drizzle/0000_gorgeous_shriek.sql b/server/drizzle/0000_gorgeous_shriek.sqlnew file mode 100644index 000000000..9c5f18155--- /dev/null+++ b/server/drizzle/0000_gorgeous_shriek.sql@@ -0,0 +1,109 @@+CREATE TABLE "account" (+ "id" text PRIMARY KEY NOT NULL,+ "accountId" text NOT NULL,+ "providerId" text NOT NULL,+ "userId" text NOT NULL,+ "accessToken" text,+ "refreshToken" text,+ "idToken" text,+ "accessTokenExpiresAt" timestamp,+ "refreshTokenExpiresAt" timestamp,+ "scope" text,+ "password" text,+ "createdAt" timestamp NOT NULL,+ "updatedAt" timestamp NOT NULL+);+--> statement-breakpoint+CREATE TABLE "active_sessions" (+ "session_id" text PRIMARY KEY NOT NULL,+ "site_id" integer,+ "user_id" text,+ "hostname" text,+ "start_time" timestamp DEFAULT now(),+ "last_activity" timestamp DEFAULT now(),+ "pageviews" integer DEFAULT 0,+ "entry_page" text,+ "exit_page" text,+ "device_type" text,+ "screen_width" integer,+ "screen_height" integer,+ "browser" text,+ "operating_system" text,+ "language" text,+ "referrer" text+);+--> statement-breakpoint+CREATE TABLE "member" (+ "id" text PRIMARY KEY NOT NULL,+ "organizationId" text NOT NULL,+ "userId" text NOT NULL,+ "role" text NOT NULL,+ "createdAt" timestamp NOT NULL+);+--> statement-breakpoint+CREATE TABLE "organization" (+ "id" text PRIMARY KEY NOT NULL,+ "name" text NOT NULL,+ "slug" text NOT NULL,+ "logo" text,+ "createdAt" timestamp NOT NULL,+ "metadata" text,+ CONSTRAINT "organization_slug_unique" UNIQUE("slug")+);+--> statement-breakpoint+CREATE TABLE "session" (+ "id" text PRIMARY KEY NOT NULL,+ "expiresAt" timestamp NOT NULL,+ "token" text NOT NULL,+ "createdAt" timestamp NOT NULL,+ "updatedAt" timestamp NOT NULL,+ "ipAddress" text,+ "userAgent" text,+ "userId" text NOT NULL,+ "impersonatedBy" text,+ "activeOrganizationId" text,+ CONSTRAINT "session_token_unique" UNIQUE("token")+);+--> statement-breakpoint+CREATE TABLE "sites" (+ "site_id" serial PRIMARY KEY NOT NULL,+ "name" text NOT NULL,+ "domain" text NOT NULL,+ "created_at" timestamp DEFAULT now(),+ "updated_at" timestamp DEFAULT now(),+ "created_by" text NOT NULL,+ CONSTRAINT "sites_domain_unique" UNIQUE("domain")+);+--> statement-breakpoint+CREATE TABLE "user" (+ "id" text PRIMARY KEY NOT NULL,+ "name" text NOT NULL,+ "username" text NOT NULL,+ "email" text NOT NULL,+ "emailVerified" boolean NOT NULL,+ "image" text,+ "createdAt" timestamp NOT NULL,+ "updatedAt" timestamp NOT NULL,+ "role" text DEFAULT 'user' NOT NULL,+ "displayUsername" text,+ "banned" boolean,+ "banReason" text,+ "banExpires" timestamp,+ CONSTRAINT "user_username_unique" UNIQUE("username"),+ CONSTRAINT "user_email_unique" UNIQUE("email")+);+--> statement-breakpoint+CREATE TABLE "verification" (+ "id" text PRIMARY KEY NOT NULL,+ "identifier" text NOT NULL,+ "value" text NOT NULL,+ "expiresAt" timestamp NOT NULL,+ "createdAt" timestamp,+ "updatedAt" timestamp+);+--> statement-breakpoint+ALTER TABLE "account" ADD CONSTRAINT "account_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint+ALTER TABLE "member" ADD CONSTRAINT "member_organizationId_organization_id_fk" FOREIGN KEY ("organizationId") REFERENCES "public"."organization"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint+ALTER TABLE "member" ADD CONSTRAINT "member_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint+ALTER TABLE "session" ADD CONSTRAINT "session_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint+ALTER TABLE "sites" ADD CONSTRAINT "sites_created_by_user_id_fk" FOREIGN KEY ("created_by") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;\ No newline at end of filediff --git a/server/drizzle/0001_sweet_retro_girl.sql b/server/drizzle/0001_sweet_retro_girl.sqlnew file mode 100644index 000000000..3c9dbcde0--- /dev/null+++ b/server/drizzle/0001_sweet_retro_girl.sql@@ -0,0 +1,12 @@+CREATE TABLE "reports" (+ "report_id" serial PRIMARY KEY NOT NULL,+ "site_id" integer,+ "user_id" text,+ "report_type" text,+ "data" jsonb,+ "created_at" timestamp DEFAULT now(),+ "updated_at" timestamp DEFAULT now()+);+--> statement-breakpoint+ALTER TABLE "reports" ADD CONSTRAINT "reports_site_id_sites_site_id_fk" FOREIGN KEY ("site_id") REFERENCES "public"."sites"("site_id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint+ALTER TABLE "reports" ADD CONSTRAINT "reports_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;\ No newline at end of filediff --git a/server/drizzle/meta/0000_snapshot.json b/server/drizzle/meta/0000_snapshot.jsonnew file mode 100644index 000000000..045a6c061--- /dev/null+++ b/server/drizzle/meta/0000_snapshot.json@@ -0,0 +1,687 @@+{+ "id": "a1455965-aa57-4090-83fa-c3863fbdca3d",+ "prevId": "00000000-0000-0000-0000-000000000000",+ "version": "7",+ "dialect": "postgresql",+ "tables": {+ "public.account": {+ "name": "account",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "accountId": {+ "name": "accountId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "providerId": {+ "name": "providerId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "accessToken": {+ "name": "accessToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "refreshToken": {+ "name": "refreshToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "idToken": {+ "name": "idToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "accessTokenExpiresAt": {+ "name": "accessTokenExpiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "refreshTokenExpiresAt": {+ "name": "refreshTokenExpiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "scope": {+ "name": "scope",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "password": {+ "name": "password",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "account_userId_user_id_fk": {+ "name": "account_userId_user_id_fk",+ "tableFrom": "account",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.active_sessions": {+ "name": "active_sessions",+ "schema": "",+ "columns": {+ "session_id": {+ "name": "session_id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "site_id": {+ "name": "site_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "hostname": {+ "name": "hostname",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "start_time": {+ "name": "start_time",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "last_activity": {+ "name": "last_activity",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "pageviews": {+ "name": "pageviews",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "default": 0+ },+ "entry_page": {+ "name": "entry_page",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "exit_page": {+ "name": "exit_page",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "device_type": {+ "name": "device_type",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "screen_width": {+ "name": "screen_width",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "screen_height": {+ "name": "screen_height",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "browser": {+ "name": "browser",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "operating_system": {+ "name": "operating_system",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "language": {+ "name": "language",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "referrer": {+ "name": "referrer",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.member": {+ "name": "member",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "organizationId": {+ "name": "organizationId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "role": {+ "name": "role",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "member_organizationId_organization_id_fk": {+ "name": "member_organizationId_organization_id_fk",+ "tableFrom": "member",+ "tableTo": "organization",+ "columnsFrom": [+ "organizationId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ },+ "member_userId_user_id_fk": {+ "name": "member_userId_user_id_fk",+ "tableFrom": "member",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.organization": {+ "name": "organization",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "slug": {+ "name": "slug",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "logo": {+ "name": "logo",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "metadata": {+ "name": "metadata",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "organization_slug_unique": {+ "name": "organization_slug_unique",+ "nullsNotDistinct": false,+ "columns": [+ "slug"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.session": {+ "name": "session",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "expiresAt": {+ "name": "expiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "token": {+ "name": "token",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "ipAddress": {+ "name": "ipAddress",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "userAgent": {+ "name": "userAgent",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "impersonatedBy": {+ "name": "impersonatedBy",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "activeOrganizationId": {+ "name": "activeOrganizationId",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "session_userId_user_id_fk": {+ "name": "session_userId_user_id_fk",+ "tableFrom": "session",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "session_token_unique": {+ "name": "session_token_unique",+ "nullsNotDistinct": false,+ "columns": [+ "token"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.sites": {+ "name": "sites",+ "schema": "",+ "columns": {+ "site_id": {+ "name": "site_id",+ "type": "serial",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "domain": {+ "name": "domain",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "created_at": {+ "name": "created_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "created_by": {+ "name": "created_by",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "sites_created_by_user_id_fk": {+ "name": "sites_created_by_user_id_fk",+ "tableFrom": "sites",+ "tableTo": "user",+ "columnsFrom": [+ "created_by"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "sites_domain_unique": {+ "name": "sites_domain_unique",+ "nullsNotDistinct": false,+ "columns": [+ "domain"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.user": {+ "name": "user",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "username": {+ "name": "username",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "email": {+ "name": "email",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "emailVerified": {+ "name": "emailVerified",+ "type": "boolean",+ "primaryKey": false,+ "notNull": true+ },+ "image": {+ "name": "image",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "role": {+ "name": "role",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "default": "'user'"+ },+ "displayUsername": {+ "name": "displayUsername",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "banned": {+ "name": "banned",+ "type": "boolean",+ "primaryKey": false,+ "notNull": false+ },+ "banReason": {+ "name": "banReason",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "banExpires": {+ "name": "banExpires",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "user_username_unique": {+ "name": "user_username_unique",+ "nullsNotDistinct": false,+ "columns": [+ "username"+ ]+ },+ "user_email_unique": {+ "name": "user_email_unique",+ "nullsNotDistinct": false,+ "columns": [+ "email"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.verification": {+ "name": "verification",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "identifier": {+ "name": "identifier",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "value": {+ "name": "value",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "expiresAt": {+ "name": "expiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ }+ },+ "enums": {},+ "schemas": {},+ "sequences": {},+ "roles": {},+ "policies": {},+ "views": {},+ "_meta": {+ "columns": {},+ "schemas": {},+ "tables": {}+ }+}\ No newline at end of filediff --git a/server/drizzle/meta/0001_snapshot.json b/server/drizzle/meta/0001_snapshot.jsonnew file mode 100644index 000000000..ce9ed83a7--- /dev/null+++ b/server/drizzle/meta/0001_snapshot.json@@ -0,0 +1,771 @@+{+ "id": "b13c246a-71be-4b88-9672-eb0943b3fe19",+ "prevId": "a1455965-aa57-4090-83fa-c3863fbdca3d",+ "version": "7",+ "dialect": "postgresql",+ "tables": {+ "public.account": {+ "name": "account",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "accountId": {+ "name": "accountId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "providerId": {+ "name": "providerId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "accessToken": {+ "name": "accessToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "refreshToken": {+ "name": "refreshToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "idToken": {+ "name": "idToken",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "accessTokenExpiresAt": {+ "name": "accessTokenExpiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "refreshTokenExpiresAt": {+ "name": "refreshTokenExpiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "scope": {+ "name": "scope",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "password": {+ "name": "password",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "account_userId_user_id_fk": {+ "name": "account_userId_user_id_fk",+ "tableFrom": "account",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.active_sessions": {+ "name": "active_sessions",+ "schema": "",+ "columns": {+ "session_id": {+ "name": "session_id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "site_id": {+ "name": "site_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "hostname": {+ "name": "hostname",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "start_time": {+ "name": "start_time",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "last_activity": {+ "name": "last_activity",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "pageviews": {+ "name": "pageviews",+ "type": "integer",+ "primaryKey": false,+ "notNull": false,+ "default": 0+ },+ "entry_page": {+ "name": "entry_page",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "exit_page": {+ "name": "exit_page",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "device_type": {+ "name": "device_type",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "screen_width": {+ "name": "screen_width",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "screen_height": {+ "name": "screen_height",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "browser": {+ "name": "browser",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "operating_system": {+ "name": "operating_system",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "language": {+ "name": "language",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "referrer": {+ "name": "referrer",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.member": {+ "name": "member",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "organizationId": {+ "name": "organizationId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "role": {+ "name": "role",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "member_organizationId_organization_id_fk": {+ "name": "member_organizationId_organization_id_fk",+ "tableFrom": "member",+ "tableTo": "organization",+ "columnsFrom": [+ "organizationId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ },+ "member_userId_user_id_fk": {+ "name": "member_userId_user_id_fk",+ "tableFrom": "member",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.organization": {+ "name": "organization",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "slug": {+ "name": "slug",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "logo": {+ "name": "logo",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "metadata": {+ "name": "metadata",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "organization_slug_unique": {+ "name": "organization_slug_unique",+ "nullsNotDistinct": false,+ "columns": [+ "slug"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.reports": {+ "name": "reports",+ "schema": "",+ "columns": {+ "report_id": {+ "name": "report_id",+ "type": "serial",+ "primaryKey": true,+ "notNull": true+ },+ "site_id": {+ "name": "site_id",+ "type": "integer",+ "primaryKey": false,+ "notNull": false+ },+ "user_id": {+ "name": "user_id",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "report_type": {+ "name": "report_type",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "data": {+ "name": "data",+ "type": "jsonb",+ "primaryKey": false,+ "notNull": false+ },+ "created_at": {+ "name": "created_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ }+ },+ "indexes": {},+ "foreignKeys": {+ "reports_site_id_sites_site_id_fk": {+ "name": "reports_site_id_sites_site_id_fk",+ "tableFrom": "reports",+ "tableTo": "sites",+ "columnsFrom": [+ "site_id"+ ],+ "columnsTo": [+ "site_id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ },+ "reports_user_id_user_id_fk": {+ "name": "reports_user_id_user_id_fk",+ "tableFrom": "reports",+ "tableTo": "user",+ "columnsFrom": [+ "user_id"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.session": {+ "name": "session",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "expiresAt": {+ "name": "expiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "token": {+ "name": "token",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "ipAddress": {+ "name": "ipAddress",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "userAgent": {+ "name": "userAgent",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "userId": {+ "name": "userId",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "impersonatedBy": {+ "name": "impersonatedBy",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "activeOrganizationId": {+ "name": "activeOrganizationId",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {+ "session_userId_user_id_fk": {+ "name": "session_userId_user_id_fk",+ "tableFrom": "session",+ "tableTo": "user",+ "columnsFrom": [+ "userId"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "session_token_unique": {+ "name": "session_token_unique",+ "nullsNotDistinct": false,+ "columns": [+ "token"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.sites": {+ "name": "sites",+ "schema": "",+ "columns": {+ "site_id": {+ "name": "site_id",+ "type": "serial",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "domain": {+ "name": "domain",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "created_at": {+ "name": "created_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "updated_at": {+ "name": "updated_at",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false,+ "default": "now()"+ },+ "created_by": {+ "name": "created_by",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ }+ },+ "indexes": {},+ "foreignKeys": {+ "sites_created_by_user_id_fk": {+ "name": "sites_created_by_user_id_fk",+ "tableFrom": "sites",+ "tableTo": "user",+ "columnsFrom": [+ "created_by"+ ],+ "columnsTo": [+ "id"+ ],+ "onDelete": "no action",+ "onUpdate": "no action"+ }+ },+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "sites_domain_unique": {+ "name": "sites_domain_unique",+ "nullsNotDistinct": false,+ "columns": [+ "domain"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.user": {+ "name": "user",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "name": {+ "name": "name",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "username": {+ "name": "username",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "email": {+ "name": "email",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "emailVerified": {+ "name": "emailVerified",+ "type": "boolean",+ "primaryKey": false,+ "notNull": true+ },+ "image": {+ "name": "image",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "role": {+ "name": "role",+ "type": "text",+ "primaryKey": false,+ "notNull": true,+ "default": "'user'"+ },+ "displayUsername": {+ "name": "displayUsername",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "banned": {+ "name": "banned",+ "type": "boolean",+ "primaryKey": false,+ "notNull": false+ },+ "banReason": {+ "name": "banReason",+ "type": "text",+ "primaryKey": false,+ "notNull": false+ },+ "banExpires": {+ "name": "banExpires",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {+ "user_username_unique": {+ "name": "user_username_unique",+ "nullsNotDistinct": false,+ "columns": [+ "username"+ ]+ },+ "user_email_unique": {+ "name": "user_email_unique",+ "nullsNotDistinct": false,+ "columns": [+ "email"+ ]+ }+ },+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ },+ "public.verification": {+ "name": "verification",+ "schema": "",+ "columns": {+ "id": {+ "name": "id",+ "type": "text",+ "primaryKey": true,+ "notNull": true+ },+ "identifier": {+ "name": "identifier",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "value": {+ "name": "value",+ "type": "text",+ "primaryKey": false,+ "notNull": true+ },+ "expiresAt": {+ "name": "expiresAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": true+ },+ "createdAt": {+ "name": "createdAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ },+ "updatedAt": {+ "name": "updatedAt",+ "type": "timestamp",+ "primaryKey": false,+ "notNull": false+ }+ },+ "indexes": {},+ "foreignKeys": {},+ "compositePrimaryKeys": {},+ "uniqueConstraints": {},+ "policies": {},+ "checkConstraints": {},+ "isRLSEnabled": false+ }+ },+ "enums": {},+ "schemas": {},+ "sequences": {},+ "roles": {},+ "policies": {},+ "views": {},+ "_meta": {+ "columns": {},+ "schemas": {},+ "tables": {}+ }+}\ No newline at end of filediff --git a/server/drizzle/meta/_journal.json b/server/drizzle/meta/_journal.jsonnew file mode 100644index 000000000..30131e573--- /dev/null+++ b/server/drizzle/meta/_journal.json@@ -0,0 +1,20 @@+{+ "version": "7",+ "dialect": "postgresql",+ "entries": [+ {+ "idx": 0,+ "version": "7",+ "when": 1741156226094,+ "tag": "0000_gorgeous_shriek",+ "breakpoints": true+ },+ {+ "idx": 1,+ "version": "7",+ "when": 1741197517430,+ "tag": "0001_sweet_retro_girl",+ "breakpoints": true+ }+ ]+}\ No newline at end of filediff --git a/server/package-lock.json b/server/package-lock.jsonindex d8b2a1cef..efbd2c096 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -14,11 +14,13 @@"@fastify/static": "^8.0.4","better-auth": "^1.2.2","dotenv": "^16.4.7",+ "drizzle-kit": "^0.30.5",+ "drizzle-orm": "^0.40.0","fastify": "^5.1.0","fastify-better-auth": "^1.0.1","luxon": "^3.5.0","node-cron": "^3.0.3",- "pg": "^8.13.1",+ "pg": "^8.13.3","postgres": "^3.4.5","ua-parser-js": "^2.0.0","undici": "^7.3.0"@@ -29,6 +31,7 @@"@types/node-cron": "^3.0.11","@types/pg": "^8.11.11","ts-node-dev": "^2.0.0",+ "tsx": "^4.19.3","typescript": "^5.7.3"}},@@ -73,6 +76,774 @@"node": ">=12"}},+ "node_modules/@drizzle-team/brocli": {+ "version": "0.10.2",+ "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz",+ "integrity": "sha512-z33Il7l5dKjUgGULTqBsQBQwckHh5AbIuxhdsIxDDiZAzBOrZO6q9ogcWC65kU382AfynTfgNumVcNIjuIua6w=="+ },+ "node_modules/@esbuild-kit/core-utils": {+ "version": "3.3.2",+ "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz",+ "integrity": "sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==",+ "deprecated": "Merged into tsx: https://tsx.is",+ "dependencies": {+ "esbuild": "~0.18.20",+ "source-map-support": "^0.5.21"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",+ "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",+ "cpu": [+ "arm"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-arm64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",+ "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/android-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",+ "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-arm64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",+ "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/darwin-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",+ "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-arm64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",+ "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/freebsd-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",+ "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",+ "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",+ "cpu": [+ "arm"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-arm64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",+ "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ia32": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",+ "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",+ "cpu": [+ "ia32"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-loong64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",+ "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",+ "cpu": [+ "loong64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-mips64el": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",+ "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",+ "cpu": [+ "mips64el"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-ppc64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",+ "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",+ "cpu": [+ "ppc64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-riscv64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",+ "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",+ "cpu": [+ "riscv64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-s390x": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",+ "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",+ "cpu": [+ "s390x"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/linux-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",+ "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/netbsd-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",+ "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/openbsd-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",+ "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/sunos-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",+ "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "sunos"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-arm64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",+ "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-ia32": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",+ "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",+ "cpu": [+ "ia32"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/@esbuild/win32-x64": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",+ "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild-kit/core-utils/node_modules/esbuild": {+ "version": "0.18.20",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",+ "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",+ "hasInstallScript": true,+ "bin": {+ "esbuild": "bin/esbuild"+ },+ "engines": {+ "node": ">=12"+ },+ "optionalDependencies": {+ "@esbuild/android-arm": "0.18.20",+ "@esbuild/android-arm64": "0.18.20",+ "@esbuild/android-x64": "0.18.20",+ "@esbuild/darwin-arm64": "0.18.20",+ "@esbuild/darwin-x64": "0.18.20",+ "@esbuild/freebsd-arm64": "0.18.20",+ "@esbuild/freebsd-x64": "0.18.20",+ "@esbuild/linux-arm": "0.18.20",+ "@esbuild/linux-arm64": "0.18.20",+ "@esbuild/linux-ia32": "0.18.20",+ "@esbuild/linux-loong64": "0.18.20",+ "@esbuild/linux-mips64el": "0.18.20",+ "@esbuild/linux-ppc64": "0.18.20",+ "@esbuild/linux-riscv64": "0.18.20",+ "@esbuild/linux-s390x": "0.18.20",+ "@esbuild/linux-x64": "0.18.20",+ "@esbuild/netbsd-x64": "0.18.20",+ "@esbuild/openbsd-x64": "0.18.20",+ "@esbuild/sunos-x64": "0.18.20",+ "@esbuild/win32-arm64": "0.18.20",+ "@esbuild/win32-ia32": "0.18.20",+ "@esbuild/win32-x64": "0.18.20"+ }+ },+ "node_modules/@esbuild-kit/esm-loader": {+ "version": "2.6.5",+ "resolved": "https://registry.npmjs.org/@esbuild-kit/esm-loader/-/esm-loader-2.6.5.tgz",+ "integrity": "sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==",+ "deprecated": "Merged into tsx: https://tsx.is",+ "dependencies": {+ "@esbuild-kit/core-utils": "^3.3.2",+ "get-tsconfig": "^4.7.0"+ }+ },+ "node_modules/@esbuild/aix-ppc64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",+ "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",+ "cpu": [+ "ppc64"+ ],+ "optional": true,+ "os": [+ "aix"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/android-arm": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",+ "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",+ "cpu": [+ "arm"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/android-arm64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",+ "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/android-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",+ "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/darwin-arm64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",+ "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/darwin-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",+ "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/freebsd-arm64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",+ "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/freebsd-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",+ "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-arm": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",+ "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",+ "cpu": [+ "arm"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-arm64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",+ "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-ia32": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",+ "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",+ "cpu": [+ "ia32"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-loong64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",+ "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",+ "cpu": [+ "loong64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-mips64el": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",+ "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",+ "cpu": [+ "mips64el"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-ppc64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",+ "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",+ "cpu": [+ "ppc64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-riscv64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",+ "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",+ "cpu": [+ "riscv64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-s390x": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",+ "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",+ "cpu": [+ "s390x"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/linux-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",+ "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/netbsd-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",+ "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/@esbuild/netbsd-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",+ "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/openbsd-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",+ "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/@esbuild/openbsd-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",+ "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/sunos-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",+ "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "sunos"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/win32-arm64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",+ "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",+ "cpu": [+ "arm64"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/win32-ia32": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",+ "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",+ "cpu": [+ "ia32"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/@esbuild/win32-x64": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",+ "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",+ "cpu": [+ "x64"+ ],+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },"node_modules/@fastify/accept-negotiator": {"version": "2.0.1","resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-2.0.1.tgz",@@ -366,6 +1137,11 @@"tslib": "^2.8.1"}},+ "node_modules/@petamoriken/float16": {+ "version": "3.9.1",+ "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.9.1.tgz",+ "integrity": "sha512-j+ejhYwY6PeB+v1kn7lZFACUIG97u90WxMuGosILFsl9d4Ovi0sjk0GlPfoEcx+FzvXZDAfioD+NGnnPamXgMA=="+ },"node_modules/@simplewebauthn/browser": {"version": "13.1.0","resolved": "https://registry.npmjs.org/@simplewebauthn/browser/-/browser-13.1.0.tgz",@@ -422,7 +1198,7 @@"version": "20.10.0","resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.0.tgz","integrity": "sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==",- "dev": true,+ "devOptional": true,"dependencies": {"undici-types": "~5.26.4"}@@ -437,7 +1213,7 @@"version": "8.11.11","resolved": "https://registry.npmjs.org/@types/pg/-/pg-8.11.11.tgz","integrity": "sha512-kGT1qKM8wJQ5qlawUrEkXgvMSXoV213KfMGXcwfDwUIfUHXqXYXOfS1nE1LINRJVVVx5wCm70XnFlMHaIcQAfw==",- "dev": true,+ "devOptional": true,"dependencies": {"@types/node": "*","pg-protocol": "*",@@ -448,7 +1224,7 @@"version": "4.0.2","resolved": "https://registry.npmjs.org/pg-types/-/pg-types-4.0.2.tgz","integrity": "sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==",- "dev": true,+ "devOptional": true,"dependencies": {"pg-int8": "1.0.1","pg-numeric": "1.0.2",@@ -466,7 +1242,7 @@"version": "3.0.2","resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-3.0.2.tgz","integrity": "sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==",- "dev": true,+ "devOptional": true,"engines": {"node": ">=12"}@@ -475,7 +1251,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-3.0.0.tgz","integrity": "sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==",- "dev": true,+ "devOptional": true,"dependencies": {"obuf": "~1.1.2"},@@ -487,7 +1263,7 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-2.1.0.tgz","integrity": "sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==",- "dev": true,+ "devOptional": true,"engines": {"node": ">=12"}@@ -496,7 +1272,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-3.0.0.tgz","integrity": "sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==",- "dev": true,+ "devOptional": true,"engines": {"node": ">=12"}@@ -768,8 +1544,7 @@"node_modules/buffer-from": {"version": "1.1.2","resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",- "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",- "dev": true+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="},"node_modules/chokidar": {"version": "3.6.0",@@ -868,6 +1643,22 @@"node": "*"}},+ "node_modules/debug": {+ "version": "4.4.0",+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",+ "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",+ "dependencies": {+ "ms": "^2.1.3"+ },+ "engines": {+ "node": ">=6.0"+ },+ "peerDependenciesMeta": {+ "supports-color": {+ "optional": true+ }+ }+ },"node_modules/defu": {"version": "6.1.4","resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",@@ -928,6 +1719,141 @@"url": "https://dotenvx.com"}},+ "node_modules/drizzle-kit": {+ "version": "0.30.5",+ "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.30.5.tgz",+ "integrity": "sha512-l6dMSE100u7sDaTbLczibrQZjA35jLsHNqIV+jmhNVO3O8jzM6kywMOmV9uOz9ZVSCMPQhAZEFjL/qDPVrqpUA==",+ "dependencies": {+ "@drizzle-team/brocli": "^0.10.2",+ "@esbuild-kit/esm-loader": "^2.5.5",+ "esbuild": "^0.19.7",+ "esbuild-register": "^3.5.0",+ "gel": "^2.0.0"+ },+ "bin": {+ "drizzle-kit": "bin.cjs"+ }+ },+ "node_modules/drizzle-orm": {+ "version": "0.40.0",+ "resolved": "https://registry.npmjs.org/drizzle-orm/-/drizzle-orm-0.40.0.tgz",+ "integrity": "sha512-7ptk/HQiMSrEZHnAsSlBESXWj52VwgMmyTEfoNmpNN2ZXpcz13LwHfXTIghsAEud7Z5UJhDOp8U07ujcqme7wg==",+ "peerDependencies": {+ "@aws-sdk/client-rds-data": ">=3",+ "@cloudflare/workers-types": ">=4",+ "@electric-sql/pglite": ">=0.2.0",+ "@libsql/client": ">=0.10.0",+ "@libsql/client-wasm": ">=0.10.0",+ "@neondatabase/serverless": ">=0.10.0",+ "@op-engineering/op-sqlite": ">=2",+ "@opentelemetry/api": "^1.4.1",+ "@planetscale/database": ">=1",+ "@prisma/client": "*",+ "@tidbcloud/serverless": "*",+ "@types/better-sqlite3": "*",+ "@types/pg": "*",+ "@types/sql.js": "*",+ "@vercel/postgres": ">=0.8.0",+ "@xata.io/client": "*",+ "better-sqlite3": ">=7",+ "bun-types": "*",+ "expo-sqlite": ">=14.0.0",+ "gel": ">=2",+ "knex": "*",+ "kysely": "*",+ "mysql2": ">=2",+ "pg": ">=8",+ "postgres": ">=3",+ "sql.js": ">=1",+ "sqlite3": ">=5"+ },+ "peerDependenciesMeta": {+ "@aws-sdk/client-rds-data": {+ "optional": true+ },+ "@cloudflare/workers-types": {+ "optional": true+ },+ "@electric-sql/pglite": {+ "optional": true+ },+ "@libsql/client": {+ "optional": true+ },+ "@libsql/client-wasm": {+ "optional": true+ },+ "@neondatabase/serverless": {+ "optional": true+ },+ "@op-engineering/op-sqlite": {+ "optional": true+ },+ "@opentelemetry/api": {+ "optional": true+ },+ "@planetscale/database": {+ "optional": true+ },+ "@prisma/client": {+ "optional": true+ },+ "@tidbcloud/serverless": {+ "optional": true+ },+ "@types/better-sqlite3": {+ "optional": true+ },+ "@types/pg": {+ "optional": true+ },+ "@types/sql.js": {+ "optional": true+ },+ "@vercel/postgres": {+ "optional": true+ },+ "@xata.io/client": {+ "optional": true+ },+ "better-sqlite3": {+ "optional": true+ },+ "bun-types": {+ "optional": true+ },+ "expo-sqlite": {+ "optional": true+ },+ "gel": {+ "optional": true+ },+ "knex": {+ "optional": true+ },+ "kysely": {+ "optional": true+ },+ "mysql2": {+ "optional": true+ },+ "pg": {+ "optional": true+ },+ "postgres": {+ "optional": true+ },+ "prisma": {+ "optional": true+ },+ "sql.js": {+ "optional": true+ },+ "sqlite3": {+ "optional": true+ }+ }+ },"node_modules/dynamic-dedupe": {"version": "0.3.0","resolved": "https://registry.npmjs.org/dynamic-dedupe/-/dynamic-dedupe-0.3.0.tgz",@@ -955,6 +1881,65 @@"once": "^1.4.0"}},+ "node_modules/env-paths": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz",+ "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==",+ "engines": {+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/esbuild": {+ "version": "0.19.12",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",+ "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",+ "hasInstallScript": true,+ "bin": {+ "esbuild": "bin/esbuild"+ },+ "engines": {+ "node": ">=12"+ },+ "optionalDependencies": {+ "@esbuild/aix-ppc64": "0.19.12",+ "@esbuild/android-arm": "0.19.12",+ "@esbuild/android-arm64": "0.19.12",+ "@esbuild/android-x64": "0.19.12",+ "@esbuild/darwin-arm64": "0.19.12",+ "@esbuild/darwin-x64": "0.19.12",+ "@esbuild/freebsd-arm64": "0.19.12",+ "@esbuild/freebsd-x64": "0.19.12",+ "@esbuild/linux-arm": "0.19.12",+ "@esbuild/linux-arm64": "0.19.12",+ "@esbuild/linux-ia32": "0.19.12",+ "@esbuild/linux-loong64": "0.19.12",+ "@esbuild/linux-mips64el": "0.19.12",+ "@esbuild/linux-ppc64": "0.19.12",+ "@esbuild/linux-riscv64": "0.19.12",+ "@esbuild/linux-s390x": "0.19.12",+ "@esbuild/linux-x64": "0.19.12",+ "@esbuild/netbsd-x64": "0.19.12",+ "@esbuild/openbsd-x64": "0.19.12",+ "@esbuild/sunos-x64": "0.19.12",+ "@esbuild/win32-arm64": "0.19.12",+ "@esbuild/win32-ia32": "0.19.12",+ "@esbuild/win32-x64": "0.19.12"+ }+ },+ "node_modules/esbuild-register": {+ "version": "3.6.0",+ "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.6.0.tgz",+ "integrity": "sha512-H2/S7Pm8a9CL1uhp9OvjwrBh5Pvx0H8qVOxNu8Wed9Y7qv56MPtq+GGM8RJpq6glYJn9Wspr8uw7l55uyinNeg==",+ "dependencies": {+ "debug": "^4.3.4"+ },+ "peerDependencies": {+ "esbuild": ">=0.12 <1"+ }+ },"node_modules/escape-html": {"version": "1.0.3","resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",@@ -1176,7 +2161,59 @@"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==","dev": true,"funding": {- "url": "https://github.com/sponsors/ljharb"+ "url": "https://github.com/sponsors/ljharb"+ }+ },+ "node_modules/gel": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/gel/-/gel-2.0.0.tgz",+ "integrity": "sha512-Oq3Fjay71s00xzDc0BF/mpcLmnA+uRqMEJK8p5K4PaZjUEsxaeo+kR9OHBVAf289/qPd+0OcLOLUN0UhqiUCog==",+ "dependencies": {+ "@petamoriken/float16": "^3.8.7",+ "debug": "^4.3.4",+ "env-paths": "^3.0.0",+ "semver": "^7.6.2",+ "shell-quote": "^1.8.1",+ "which": "^4.0.0"+ },+ "bin": {+ "gel": "dist/cli.mjs"+ },+ "engines": {+ "node": ">= 18.0.0"+ }+ },+ "node_modules/gel/node_modules/isexe": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",+ "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",+ "engines": {+ "node": ">=16"+ }+ },+ "node_modules/gel/node_modules/which": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",+ "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",+ "dependencies": {+ "isexe": "^3.1.1"+ },+ "bin": {+ "node-which": "bin/which.js"+ },+ "engines": {+ "node": "^16.13.0 || >=18.0.0"+ }+ },+ "node_modules/get-tsconfig": {+ "version": "4.10.0",+ "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",+ "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",+ "dependencies": {+ "resolve-pkg-maps": "^1.0.0"+ },+ "funding": {+ "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"}},"node_modules/glob": {@@ -1541,6 +2578,11 @@"obliterator": "^2.0.1"}},+ "node_modules/ms": {+ "version": "2.1.3",+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="+ },"node_modules/nanostores": {"version": "0.11.3","resolved": "https://registry.npmjs.org/nanostores/-/nanostores-0.11.3.tgz",@@ -1584,7 +2626,7 @@"version": "1.1.2","resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz","integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",- "dev": true+ "devOptional": true},"node_modules/on-exit-leak-free": {"version": "2.1.2",@@ -1646,13 +2688,13 @@}},"node_modules/pg": {- "version": "8.13.1",- "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.1.tgz",- "integrity": "sha512-OUir1A0rPNZlX//c7ksiu7crsGZTKSOXJPgtNiHGIlC9H0lO+NC6ZDYksSgBYY/thSWhnSRBv8w1lieNNGATNQ==",+ "version": "8.13.3",+ "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.3.tgz",+ "integrity": "sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==","dependencies": {"pg-connection-string": "^2.7.0",- "pg-pool": "^3.7.0",- "pg-protocol": "^1.7.0",+ "pg-pool": "^3.7.1",+ "pg-protocol": "^1.7.1","pg-types": "^2.1.0","pgpass": "1.x"},@@ -1694,23 +2736,23 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/pg-numeric/-/pg-numeric-1.0.2.tgz","integrity": "sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==",- "dev": true,+ "devOptional": true,"engines": {"node": ">=4"}},"node_modules/pg-pool": {- "version": "3.7.0",- "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.7.0.tgz",- "integrity": "sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==",+ "version": "3.7.1",+ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.7.1.tgz",+ "integrity": "sha512-xIOsFoh7Vdhojas6q3596mXFsR8nwBQBXX5JiV7p9buEVAGqYL4yFzclON5P9vFrpu1u7Zwl2oriyDa89n0wbw==","peerDependencies": {"pg": ">=8.0"}},"node_modules/pg-protocol": {- "version": "1.7.0",- "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.7.0.tgz",- "integrity": "sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ=="+ "version": "1.7.1",+ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.7.1.tgz",+ "integrity": "sha512-gjTHWGYWsEgy9MsY0Gp6ZJxV24IjDqdpTW7Eh0x+WfJLFsm/TJx1MzL6T0D88mBvkpxotCQ6TwW6N+Kko7lhgQ=="},"node_modules/pg-types": {"version": "2.2.0",@@ -1872,7 +2914,7 @@"version": "1.1.4","resolved": "https://registry.npmjs.org/postgres-range/-/postgres-range-1.1.4.tgz","integrity": "sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==",- "dev": true+ "devOptional": true},"node_modules/process": {"version": "0.11.10",@@ -1990,6 +3032,14 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/resolve-pkg-maps": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",+ "funding": {+ "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"+ }+ },"node_modules/ret": {"version": "0.5.0","resolved": "https://registry.npmjs.org/ret/-/ret-0.5.0.tgz",@@ -2173,6 +3223,17 @@"node": ">=8"}},+ "node_modules/shell-quote": {+ "version": "1.8.2",+ "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",+ "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/signal-exit": {"version": "4.1.0","resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",@@ -2196,7 +3257,6 @@"version": "0.6.1","resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz","integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",- "dev": true,"engines": {"node": ">=0.10.0"}@@ -2205,7 +3265,6 @@"version": "0.5.21","resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz","integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",- "dev": true,"dependencies": {"buffer-from": "^1.0.0","source-map": "^0.6.0"@@ -2492,11 +3551,438 @@"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz","integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="},+ "node_modules/tsx": {+ "version": "4.19.3",+ "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.3.tgz",+ "integrity": "sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==",+ "dev": true,+ "dependencies": {+ "esbuild": "~0.25.0",+ "get-tsconfig": "^4.7.5"+ },+ "bin": {+ "tsx": "dist/cli.mjs"+ },+ "engines": {+ "node": ">=18.0.0"+ },+ "optionalDependencies": {+ "fsevents": "~2.3.3"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/aix-ppc64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",+ "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",+ "cpu": [+ "ppc64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "aix"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-arm": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",+ "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",+ "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/android-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",+ "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/darwin-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",+ "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/darwin-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",+ "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/freebsd-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",+ "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/freebsd-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",+ "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-arm": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",+ "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",+ "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-ia32": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",+ "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-loong64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",+ "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",+ "cpu": [+ "loong64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-mips64el": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",+ "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",+ "cpu": [+ "mips64el"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-ppc64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",+ "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",+ "cpu": [+ "ppc64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-riscv64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",+ "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",+ "cpu": [+ "riscv64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-s390x": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",+ "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",+ "cpu": [+ "s390x"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/linux-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",+ "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/netbsd-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",+ "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/openbsd-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",+ "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/sunos-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",+ "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "sunos"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-arm64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",+ "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-ia32": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",+ "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/@esbuild/win32-x64": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",+ "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/tsx/node_modules/esbuild": {+ "version": "0.25.0",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",+ "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",+ "dev": true,+ "hasInstallScript": true,+ "bin": {+ "esbuild": "bin/esbuild"+ },+ "engines": {+ "node": ">=18"+ },+ "optionalDependencies": {+ "@esbuild/aix-ppc64": "0.25.0",+ "@esbuild/android-arm": "0.25.0",+ "@esbuild/android-arm64": "0.25.0",+ "@esbuild/android-x64": "0.25.0",+ "@esbuild/darwin-arm64": "0.25.0",+ "@esbuild/darwin-x64": "0.25.0",+ "@esbuild/freebsd-arm64": "0.25.0",+ "@esbuild/freebsd-x64": "0.25.0",+ "@esbuild/linux-arm": "0.25.0",+ "@esbuild/linux-arm64": "0.25.0",+ "@esbuild/linux-ia32": "0.25.0",+ "@esbuild/linux-loong64": "0.25.0",+ "@esbuild/linux-mips64el": "0.25.0",+ "@esbuild/linux-ppc64": "0.25.0",+ "@esbuild/linux-riscv64": "0.25.0",+ "@esbuild/linux-s390x": "0.25.0",+ "@esbuild/linux-x64": "0.25.0",+ "@esbuild/netbsd-arm64": "0.25.0",+ "@esbuild/netbsd-x64": "0.25.0",+ "@esbuild/openbsd-arm64": "0.25.0",+ "@esbuild/openbsd-x64": "0.25.0",+ "@esbuild/sunos-x64": "0.25.0",+ "@esbuild/win32-arm64": "0.25.0",+ "@esbuild/win32-ia32": "0.25.0",+ "@esbuild/win32-x64": "0.25.0"+ }+ },"node_modules/typescript": {"version": "5.7.3","resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz","integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",- "dev": true,+ "devOptional": true,"bin": {"tsc": "bin/tsc","tsserver": "bin/tsserver"@@ -2571,7 +4057,7 @@"version": "5.26.5","resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz","integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",- "dev": true+ "devOptional": true},"node_modules/uuid": {"version": "8.3.2",diff --git a/server/package.json b/server/package.jsonindex e52db4342..a78392d0b 100644--- a/server/package.json+++ b/server/package.json@@ -7,7 +7,12 @@"scripts": {"dev": "tsc && node dist/index.js","build": "tsc",- "start": "node dist/index.js"+ "start": "node dist/index.js",+ "db:generate": "drizzle-kit generate --config=drizzle.config.ts",+ "db:migrate": "drizzle-kit migrate --config=drizzle.config.ts",+ "db:push": "drizzle-kit push --config=drizzle.config.ts",+ "db:drop": "drizzle-kit drop --config=drizzle.config.ts",+ "db:check": "drizzle-kit check --config=drizzle.config.ts"},"dependencies": {"@clickhouse/client": "^1.10.1",@@ -16,21 +21,24 @@"@fastify/static": "^8.0.4","better-auth": "^1.2.2","dotenv": "^16.4.7",+ "drizzle-orm": "^0.40.0","fastify": "^5.1.0","fastify-better-auth": "^1.0.1","luxon": "^3.5.0","node-cron": "^3.0.3",- "pg": "^8.13.1",+ "pg": "^8.13.3","postgres": "^3.4.5","ua-parser-js": "^2.0.0","undici": "^7.3.0"},"devDependencies": {- "@types/pg": "^8.11.11","@types/luxon": "^3.4.2","@types/node": "^20.10.0","@types/node-cron": "^3.0.11",+ "@types/pg": "^8.11.11",+ "drizzle-kit": "^0.30.5","ts-node-dev": "^2.0.0",+ "tsx": "^4.19.3","typescript": "^5.7.3"}}diff --git a/server/src/api/getLiveUsercount.ts b/server/src/api/getLiveUsercount.tsindex d071b6fb6..6810d33f2 100644--- a/server/src/api/getLiveUsercount.ts+++ b/server/src/api/getLiveUsercount.ts@@ -1,12 +1,16 @@import { FastifyReply, FastifyRequest } from "fastify";-import { sql } from "../db/postgres/postgres.js";+import { db } from "../db/postgres/postgres.js";+import { activeSessions } from "../db/postgres/schema.js";+import { eq, count } from "drizzle-orm";export const getLiveUsercount = async ({ params: { site } }: FastifyRequest<{ Params: { site: string } }>,res: FastifyReply) => {- const result =- await sql`SELECT COUNT(*) FROM active_sessions WHERE site_id = ${site}`;+ const result = await db+ .select({ count: count() })+ .from(activeSessions)+ .where(eq(activeSessions.siteId, Number(site)));return res.send({ count: result[0].count });};diff --git a/server/src/api/sites/addSite.ts b/server/src/api/sites/addSite.tsindex 1cfdb7a66..b43d7c022 100644--- a/server/src/api/sites/addSite.ts+++ b/server/src/api/sites/addSite.ts@@ -1,10 +1,9 @@-import { FastifyReply } from "fastify";--import { FastifyRequest } from "fastify";-import { auth } from "../../lib/auth.js";import { fromNodeHeaders } from "better-auth/node";-import { sql } from "../../db/postgres/postgres.js";+import { FastifyReply, FastifyRequest } from "fastify";+import { db } from "../../db/postgres/postgres.js";+import { sites } from "../../db/postgres/schema.js";import { loadAllowedDomains } from "../../lib/allowedDomains.js";+import { auth } from "../../lib/auth.js";export async function addSite(request: FastifyRequest<{ Body: { domain: string; name: string } }>,@@ -29,8 +28,14 @@ export async function addSite(if (!session?.user.id) {return reply.status(500).send({ error: "Could not find user id" });}+try {- await sql`INSERT INTO sites (domain, name, created_by) VALUES (${domain}, ${name}, ${session?.user.id})`;+ await db.insert(sites).values({+ domain,+ name,+ createdBy: session.user.id,+ });+await loadAllowedDomains();return reply.status(200).send();} catch (err) {diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.tsindex 799a25406..303c5bf09 100644--- a/server/src/api/sites/deleteSite.ts+++ b/server/src/api/sites/deleteSite.ts@@ -1,9 +1,8 @@-import { FastifyReply } from "fastify";--import { FastifyRequest } from "fastify";-import { sql } from "../../db/postgres/postgres.js";+import { eq } from "drizzle-orm";+import { FastifyReply, FastifyRequest } from "fastify";+import { db } from "../../db/postgres/postgres.js";+import { sites } from "../../db/postgres/schema.js";import { loadAllowedDomains } from "../../lib/allowedDomains.js";-import clickhouse from "../../db/clickhouse/clickhouse.js";export async function deleteSite(request: FastifyRequest<{ Params: { id: string } }>,@@ -11,7 +10,7 @@ export async function deleteSite() {const { id } = request.params;- await sql`DELETE FROM sites WHERE site_id = ${id}`;+ await db.delete(sites).where(eq(sites.siteId, Number(id)));// await clickhouse.query({// query: `DELETE FROM pageviews WHERE site_id = ${id}`,// });diff --git a/server/src/api/sites/getSites.ts b/server/src/api/sites/getSites.tsindex 3f264bc49..7366ac334 100644--- a/server/src/api/sites/getSites.ts+++ b/server/src/api/sites/getSites.ts@@ -1,12 +1,12 @@import { FastifyReply } from "fastify";-import { FastifyRequest } from "fastify";-import { sql } from "../../db/postgres/postgres.js";+import { db } from "../../db/postgres/postgres.js";+import { sites } from "../../db/postgres/schema.js";export async function getSites(_: FastifyRequest, reply: FastifyReply) {try {- const sites = await sql`SELECT * FROM sites`;- return reply.status(200).send({ data: sites });+ const sitesData = await db.select().from(sites);+ return reply.status(200).send({ data: sitesData });} catch (err) {return reply.status(500).send({ error: String(err) });}diff --git a/server/src/db/postgres/migrate.ts b/server/src/db/postgres/migrate.tsnew file mode 100644index 000000000..e1e4aec7a--- /dev/null+++ b/server/src/db/postgres/migrate.ts@@ -0,0 +1,89 @@+import { drizzle } from "drizzle-orm/postgres-js";+import { migrate } from "drizzle-orm/postgres-js/migrator";+import postgres from "postgres";+import dotenv from "dotenv";+import * as schema from "./schema.js";++dotenv.config();++/**+ * Run database migrations+ * @param migrationsPath Path to migrations folder+ * @returns Promise that resolves when migrations are complete+ */+export async function runMigrations(migrationsPath: string = "./drizzle") {+ console.log("Running database migrations...");++ const migrationClient = postgres({+ host: process.env.POSTGRES_HOST || "postgres",+ port: parseInt(process.env.POSTGRES_PORT || "5432", 10),+ database: process.env.POSTGRES_DB,+ username: process.env.POSTGRES_USER,+ password: process.env.POSTGRES_PASSWORD,+ max: 1,+ onnotice: () => {}, // Silence notices+ });++ const db = drizzle(migrationClient, { schema });++ try {+ // Create drizzle schema if it doesn't exist+ await migrationClient`CREATE SCHEMA IF NOT EXISTS drizzle;`;++ // Create migration table if it doesn't exist+ await migrationClient`+ CREATE TABLE IF NOT EXISTS drizzle."__drizzle_migrations" (+ id SERIAL PRIMARY KEY,+ hash text NOT NULL,+ created_at timestamp with time zone DEFAULT now()+ );+ `;++ // Always run migrations, Drizzle will skip already applied ones+ console.log(+ "Running all migrations - Drizzle will skip already applied ones"+ );++ // This will run migrations on the database, skipping the ones already applied+ try {+ await migrate(db, { migrationsFolder: migrationsPath });+ console.log("Migrations completed!");+ return true; // Return success+ } catch (err: any) {+ // If error contains relation already exists, tables likely exist but not in drizzle metadata+ if (err.message && err.message.includes("already exists")) {+ console.log(+ "Some tables already exist but not tracked by drizzle. This is expected for existing databases."+ );+ console.log(+ "You can safely ignore these errors if your database is already set up."+ );+ return true; // Consider this a success case+ } else {+ // Other errors should be reported+ throw err;+ }+ }+ } catch (e) {+ console.error("Migration failed!");+ console.error(e);+ return false; // Return failure+ } finally {+ // Don't forget to close the connection+ await migrationClient.end();+ }+}++// Only run migrations directly if this module is executed directly+if (import.meta.url === `file://${process.argv[1]}`) {+ runMigrations()+ .then((success) => {+ if (!success) {+ process.exit(1);+ }+ })+ .catch((err) => {+ console.error("Unhandled error in migrations:", err);+ process.exit(1);+ });+}diff --git a/server/src/db/postgres/postgres.ts b/server/src/db/postgres/postgres.tsindex 0b1b20e7c..9a29dafe8 100644--- a/server/src/db/postgres/postgres.ts+++ b/server/src/db/postgres/postgres.ts@@ -1,10 +1,13 @@import dotenv from "dotenv";+import { drizzle } from "drizzle-orm/postgres-js";import postgres from "postgres";import { auth } from "../../lib/auth.js";+import * as schema from "./schema.js";dotenv.config();-export const sql = postgres({+// Create postgres connection+const client = postgres({host: process.env.POSTGRES_HOST || "postgres",port: parseInt(process.env.POSTGRES_PORT || "5432", 10),database: process.env.POSTGRES_DB,@@ -13,115 +16,41 @@ export const sql = postgres({onnotice: () => {},});-export async function initializePostgres() {- try {- // Phase 1: Create tables with no dependencies- await sql`- CREATE TABLE IF NOT EXISTS "user" (- "id" text not null primary key,- "name" text not null,- "username" text not null unique,- "email" text not null unique,- "emailVerified" boolean not null,- "image" text,- "createdAt" timestamp not null,- "updatedAt" timestamp not null,- "role" text not null default 'user'- );- `;-- await sql`- CREATE TABLE IF NOT EXISTS "verification" (- "id" text not null primary key,- "identifier" text not null,- "value" text not null,- "expiresAt" timestamp not null,- "createdAt" timestamp,- "updatedAt" timestamp- );- `;+// Create drizzle ORM instance+export const db = drizzle(client, { schema });- await sql`- CREATE TABLE IF NOT EXISTS active_sessions (- session_id TEXT PRIMARY KEY,- site_id INT,- user_id TEXT,- hostname TEXT,- start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,- last_activity TIMESTAMP DEFAULT CURRENT_TIMESTAMP,- pageviews INT DEFAULT 0,- entry_page TEXT,- exit_page TEXT,- device_type TEXT,- screen_width INT,- screen_height INT,- browser TEXT,- operating_system TEXT,- language TEXT,- referrer TEXT- );- `;+// For compatibility with raw SQL if needed+export const sql = client;- await sql`- CREATE TABLE IF NOT EXISTS sites (- site_id SERIAL PRIMARY KEY,- name TEXT NOT NULL,- domain TEXT NOT NULL UNIQUE,- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,- updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,- created_by TEXT NOT NULL REFERENCES "user" ("id")- );- `;-- await sql`- CREATE TABLE IF NOT EXISTS "session" (- "id" text not null primary key,- "expiresAt" timestamp not null,- "token" text not null unique,- "createdAt" timestamp not null,- "updatedAt" timestamp not null,- "ipAddress" text,- "userAgent" text,- "userId" text not null references "user" ("id")- );- `;+export async function initializePostgres() {+ try {+ console.log("Initializing PostgreSQL database...");- await sql`- CREATE TABLE IF NOT EXISTS "account" (- "id" text not null primary key,- "accountId" text not null,- "providerId" text not null,- "userId" text not null references "user" ("id"),- "accessToken" text,- "refreshToken" text,- "idToken" text,- "accessTokenExpiresAt" timestamp,- "refreshTokenExpiresAt" timestamp,- "scope" text,- "password" text,- "createdAt" timestamp not null,- "updatedAt" timestamp not null- );- `;+ // Assume migrations have been run manually with 'npm run db:migrate'+ // No automatic migrations during application startup+ // Check if admin user exists, if not create oneconst [{ count }]: { count: number }[] =- await sql`SELECT count(*) FROM "user" WHERE username = 'admin'`;+ await client`SELECT count(*) FROM "user" WHERE username = 'admin'`;if (Number(count) === 0) {+ // Create admin user+ console.log("Creating admin user");await auth!.api.signUpEmail({body: {- email: "[email protected]",+ email: "[email protected]",username: "admin",- name: "admin",password: "admin123",+ name: "Admin User",},});}- await sql`UPDATE "user" SET "role" = 'admin' WHERE username = 'admin'`;+ await client`UPDATE "user" SET "role" = 'admin' WHERE username = 'admin'`;- console.log("Tables created successfully.");- } catch (err) {- console.error("Error creating tables:", err);+ console.log("PostgreSQL initialization completed successfully.");+ } catch (error) {+ console.error("Error initializing PostgreSQL:", error);+ throw error;}}diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsnew file mode 100644index 000000000..b611da3b5--- /dev/null+++ b/server/src/db/postgres/schema.ts@@ -0,0 +1,155 @@+import {+ pgTable,+ text,+ timestamp,+ integer,+ boolean,+ primaryKey,+ foreignKey,+ serial,+ unique,+ jsonb,+} from "drizzle-orm/pg-core";++// User table+export const users = pgTable("user", {+ id: text("id").primaryKey().notNull(),+ name: text("name").notNull(),+ username: text("username").notNull().unique(),+ email: text("email").notNull().unique(),+ emailVerified: boolean("emailVerified").notNull(),+ image: text("image"),+ createdAt: timestamp("createdAt").notNull(),+ updatedAt: timestamp("updatedAt").notNull(),+ role: text("role").notNull().default("user"),+ displayUsername: text("displayUsername"),+ banned: boolean("banned"),+ banReason: text("banReason"),+ banExpires: timestamp("banExpires"),+});++// Verification table+export const verification = pgTable("verification", {+ id: text("id").primaryKey().notNull(),+ identifier: text("identifier").notNull(),+ value: text("value").notNull(),+ expiresAt: timestamp("expiresAt").notNull(),+ createdAt: timestamp("createdAt"),+ updatedAt: timestamp("updatedAt"),+});++// Sites table+export const sites = pgTable("sites", {+ siteId: serial("site_id").primaryKey().notNull(),+ name: text("name").notNull(),+ domain: text("domain").notNull().unique(),+ createdAt: timestamp("created_at").defaultNow(),+ updatedAt: timestamp("updated_at").defaultNow(),+ createdBy: text("created_by")+ .notNull()+ .references(() => users.id),+});++// Active sessions table+export const activeSessions = pgTable("active_sessions", {+ sessionId: text("session_id").primaryKey().notNull(),+ siteId: integer("site_id"),+ userId: text("user_id"),+ hostname: text("hostname"),+ startTime: timestamp("start_time").defaultNow(),+ lastActivity: timestamp("last_activity").defaultNow(),+ pageviews: integer("pageviews").default(0),+ entryPage: text("entry_page"),+ exitPage: text("exit_page"),+ deviceType: text("device_type"),+ screenWidth: integer("screen_width"),+ screenHeight: integer("screen_height"),+ browser: text("browser"),+ operatingSystem: text("operating_system"),+ language: text("language"),+ referrer: text("referrer"),+});++export const reports = pgTable("reports", {+ reportId: serial("report_id").primaryKey().notNull(),+ siteId: integer("site_id").references(() => sites.siteId),+ userId: text("user_id").references(() => users.id),+ reportType: text("report_type"),+ data: jsonb("data"),+ createdAt: timestamp("created_at").defaultNow(),+ updatedAt: timestamp("updated_at").defaultNow(),+});++// Account table+export const account = pgTable("account", {+ id: text("id").primaryKey().notNull(),+ accountId: text("accountId").notNull(),+ providerId: text("providerId").notNull(),+ userId: text("userId")+ .notNull()+ .references(() => users.id),+ accessToken: text("accessToken"),+ refreshToken: text("refreshToken"),+ idToken: text("idToken"),+ accessTokenExpiresAt: timestamp("accessTokenExpiresAt"),+ refreshTokenExpiresAt: timestamp("refreshTokenExpiresAt"),+ scope: text("scope"),+ password: text("password"),+ createdAt: timestamp("createdAt").notNull(),+ updatedAt: timestamp("updatedAt").notNull(),+});++// Organization table+export const organization = pgTable("organization", {+ id: text("id").primaryKey().notNull(),+ name: text("name").notNull(),+ slug: text("slug").notNull().unique(),+ logo: text("logo"),+ createdAt: timestamp("createdAt").notNull(),+ metadata: text("metadata"),+});++// Member table+export const member = pgTable("member", {+ id: text("id").primaryKey().notNull(),+ organizationId: text("organizationId")+ .notNull()+ .references(() => organization.id),+ userId: text("userId")+ .notNull()+ .references(() => users.id),+ role: text("role").notNull(),+ createdAt: timestamp("createdAt").notNull(),+});++// Invitation table+export const invitation = pgTable("invitation", {+ id: text("id").primaryKey().notNull(),+ email: text("email").notNull(),+ inviterId: text("inviterId")+ .notNull()+ .references(() => users.id),+ organizationId: text("organizationId")+ .notNull()+ .references(() => organization.id),+ role: text("role").notNull(),+ status: text("status").notNull(),+ expiresAt: timestamp("expiresAt").notNull(),+ createdAt: timestamp("createdAt").notNull(),+});++// Session table+export const session = pgTable("session", {+ id: text("id").primaryKey().notNull(),+ expiresAt: timestamp("expiresAt").notNull(),+ token: text("token").notNull().unique(),+ createdAt: timestamp("createdAt").notNull(),+ updatedAt: timestamp("updatedAt").notNull(),+ ipAddress: text("ipAddress"),+ userAgent: text("userAgent"),+ userId: text("userId")+ .notNull()+ .references(() => users.id),+ impersonatedBy: text("impersonatedBy"),+ activeOrganizationId: text("activeOrganizationId"),+});diff --git a/server/src/lib/allowedDomains.ts b/server/src/lib/allowedDomains.tsindex 209037df0..75e2178cf 100644--- a/server/src/lib/allowedDomains.ts+++ b/server/src/lib/allowedDomains.ts@@ -1,4 +1,5 @@-import { sql } from "../db/postgres/postgres.js";+import { db, sql } from "../db/postgres/postgres.js";+import { sites } from "../db/postgres/schema.js";import { initAuth } from "./auth.js";import dotenv from "dotenv";@@ -20,7 +21,9 @@ export const loadAllowedDomains = async () => {// Only query the sites table if it existslet domains: { domain: string }[] = [];if (tableExists[0].exists) {- domains = await sql`SELECT domain FROM sites`;+ // Use Drizzle to get domains+ const sitesData = await db.select({ domain: sites.domain }).from(sites);+ domains = sitesData;}allowList = [diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.tsindex 3d9b2f786..253c2900a 100644--- a/server/src/lib/auth.ts+++ b/server/src/lib/auth.ts@@ -2,6 +2,9 @@ import { betterAuth } from "better-auth";import { username, admin, organization } from "better-auth/plugins";import dotenv from "dotenv";import pg from "pg";+import { drizzleAdapter } from "better-auth/adapters/drizzle";+import { db } from "../db/postgres/postgres.js";+import * as schema from "../db/postgres/schema.js";dotenv.config();@@ -33,16 +36,26 @@ export let auth: AuthType | null = betterAuth({},});-export const initAuth = (allowList: string[]) => {+export function initAuth(allowedOrigins: string[]) {auth = betterAuth({basePath: "/auth",- database: new pg.Pool({- host: process.env.POSTGRES_HOST || "postgres",- port: parseInt(process.env.POSTGRES_PORT || "5432", 10),- database: process.env.POSTGRES_DB,- user: process.env.POSTGRES_USER,- password: process.env.POSTGRES_PASSWORD,+ database: drizzleAdapter(db, {+ provider: "pg",+ schema: {+ // Map our schema tables to what better-auth expects+ user: schema.users,+ account: schema.account,+ session: schema.session,+ verification: schema.verification,+ organization: schema.organization,+ member: schema.member,+ },}),+ experimental: {+ sessionCookie: {+ domains: allowedOrigins,+ },+ },emailAndPassword: {enabled: true,},@@ -50,7 +63,7 @@ export const initAuth = (allowList: string[]) => {enabled: true,},plugins: [username(), admin(), organization()],- trustedOrigins: allowList,+ trustedOrigins: allowedOrigins,advanced: {useSecureCookies: process.env.NODE_ENV === "production", // don't mark Secure in devdefaultCookieAttributes: {@@ -59,4 +72,4 @@ export const initAuth = (allowList: string[]) => {},},});-};+}diff --git a/server/src/tracker/trackPageView.ts b/server/src/tracker/trackPageView.tsindex b2ff8c509..b744ab3c6 100644--- a/server/src/tracker/trackPageView.ts+++ b/server/src/tracker/trackPageView.ts@@ -2,8 +2,10 @@ import { FastifyReply, FastifyRequest } from "fastify";import { TrackingPayload } from "../types.js";import { getUserId, getDeviceType, getIpAddress } from "../utils.js";import crypto from "crypto";-import { sql } from "../db/postgres/postgres.js";+import { db, sql } from "../db/postgres/postgres.js";+import { activeSessions } from "../db/postgres/schema.js";import UAParser, { UAParser as userAgentParser } from "ua-parser-js";+import { eq } from "drizzle-orm";import { Pageview } from "../db/clickhouse/types.js";import { pageviewQueue } from "./pageviewQueue.js";@@ -17,8 +19,31 @@ type TotalPayload = TrackingPayload & {ipAddress: string;};-const getExistingSession = async (userId: string): Promise<Pageview | null> => {- const [existingSession] = await sql<Pageview[]>`+// Extended type for database active sessions+type ActiveSession = {+ session_id: string;+ site_id: number | null;+ user_id: string;+ pageviews: number;+ hostname: string | null;+ start_time: Date | null;+ last_activity: Date | null;+ entry_page: string | null;+ exit_page: string | null;+ device_type: string | null;+ screen_width: number | null;+ screen_height: number | null;+ browser: string | null;+ operating_system: string | null;+ language: string | null;+ referrer: string | null;+};++const getExistingSession = async (+ userId: string+): Promise<ActiveSession | null> => {+ // We need to use the raw SQL query here since we're selecting into a specific type+ const [existingSession] = await sql<ActiveSession[]>`SELECT * FROM active_sessions WHERE user_id = ${userId}`;return existingSession;@@ -26,41 +51,47 @@ const getExistingSession = async (userId: string): Promise<Pageview | null> => {const updateSession = async (pageview: TotalPayload,- existingSession: Pageview | null+ existingSession: ActiveSession | null) => {if (existingSession) {- await sql`- UPDATE active_sessions SET last_activity = ${pageview.timestamp}, pageviews = pageviews + 1 WHERE user_id = ${pageview.userId}- `;+ // Update session with Drizzle+ await db+ .update(activeSessions)+ .set({+ lastActivity: new Date(pageview.timestamp),+ pageviews: (existingSession.pageviews || 0) + 1,+ })+ .where(eq(activeSessions.userId, pageview.userId));return;}- const inserts = {- site_id: pageview.site_id || 0,- session_id: pageview.sessionId,- user_id: pageview.userId,- hostname: pageview.hostname || "",- start_time: pageview.timestamp || "",- last_activity: pageview.timestamp || "",+ // Insert new session with Drizzle+ const insertData = {+ sessionId: pageview.sessionId,+ siteId:+ typeof pageview.site_id === "string"+ ? parseInt(pageview.site_id, 10)+ : pageview.site_id,+ userId: pageview.userId,+ hostname: pageview.hostname || null,+ startTime: new Date(pageview.timestamp || Date.now()),+ lastActivity: new Date(pageview.timestamp || Date.now()),pageviews: 1,- entry_page: pageview.pathname || "",- // exit_page: pageview.pathname,- device_type: getDeviceType(+ entryPage: pageview.pathname || null,+ deviceType: getDeviceType(pageview.screenWidth,pageview.screenHeight,pageview.ua),- screen_width: pageview.screenWidth || 0,- screen_height: pageview.screenHeight || 0,- browser: pageview.ua.browser.name || "",- operating_system: pageview.ua.os.name || "",- language: pageview.language || "",- referrer: pageview.referrer || "",+ screenWidth: pageview.screenWidth || null,+ screenHeight: pageview.screenHeight || null,+ browser: pageview.ua.browser.name || null,+ operatingSystem: pageview.ua.os.name || null,+ language: pageview.language || null,+ referrer: pageview.referrer || null,};- await sql`- INSERT INTO active_sessions ${sql(inserts)}- `;+ await db.insert(activeSessions).values(insertData);};export async function trackPageView(