ponder 0.11.21 → 0.11.22

package/src/build/index.ts

@@ -15,8 +15,6 @@ import type {
   Schema,
   SchemaBuild,
 } from "@/internal/types.js";
-import { createPool } from "@/utils/pg.js";
-import { createPglite } from "@/utils/pglite.js";
 import { getNextAvailablePort } from "@/utils/port.js";
 import type { Result } from "@/utils/result.js";
 import { serialize } from "@/utils/serialize.js";
@@ -60,7 +58,7 @@ export type Build = {
     database: Database;
   }) => Promise<ApiResult>;
   namespaceCompile: () => Result<NamespaceBuild>;
-  preCompile: (params: { config: Config }) => Promise<Result<PreBuild>>;
+  preCompile: (params: { config: Config }) => Result<PreBuild>;
   compileSchema: (params: { schema: Schema }) => Result<SchemaBuild>;
   compileIndexing: (params: {
     configResult: Extract<ConfigResult, { status: "success" }>["result"];
@@ -357,7 +355,7 @@ export const createBuild = async ({
         result: { schema, viewsSchema },
       } as const;
     },
-    async preCompile({ config }): Promise<Result<PreBuild>> {
+    preCompile({ config }): Result<PreBuild> {
       const preBuild = safeBuildPre({
         config,
         options: common.options,
@@ -372,55 +370,6 @@ export const createBuild = async ({
         return preBuild;
       }
 
-      // diagnostic query
-      const dialect = preBuild.databaseConfig.kind;
-      if (dialect === "pglite") {
-        const driver = createPglite(preBuild.databaseConfig.options);
-        try {
-          await driver.query("SELECT version()");
-        } catch (e) {
-          const error = new BuildError(
-            `Failed to connect to PGlite database. Please check your database connection settings.\n\n${(e as any).message}`,
-          );
-          error.stack = undefined;
-          common.logger.error({
-            service: "build",
-            msg: "Failed build",
-            error,
-          });
-          return { status: "error", error };
-        } finally {
-          await driver.close();
-        }
-      } else if (dialect === "postgres") {
-        const pool = createPool(
-          {
-            ...preBuild.databaseConfig.poolConfig,
-            application_name: "test",
-            max: 1,
-            statement_timeout: 10_000,
-          },
-          common.logger,
-        );
-
-        try {
-          await pool.query("SELECT version()");
-        } catch (e) {
-          const error = new BuildError(
-            `Failed to connect to database. Please check your database connection settings.\n\n${(e as any).message}`,
-          );
-          error.stack = undefined;
-          common.logger.error({
-            service: "build",
-            msg: "Failed build",
-            error,
-          });
-          return { status: "error", error };
-        } finally {
-          await pool.end();
-        }
-      }
-
       for (const log of preBuild.logs) {
         common.logger[log.level]({ service: "build", msg: log.msg });
       }

package/src/build/plugin.ts

@@ -37,7 +37,7 @@ for (let i = 0; i < globalThis.PONDER_INDEXING_BUILD.chains.length; i++) {
   })
 }
 
-export const db = globalThis.PONDER_DATABASE.readonlyQB();
+export const db = globalThis.PONDER_DATABASE.qb.drizzleReadonly;
 export { publicClients };
 `;
 

package/src/client/index.ts

@@ -2,7 +2,7 @@ import type { Schema, Status } from "@/internal/types.js";
 import type { ReadonlyDrizzle } from "@/types/db.js";
 import { decodeCheckpoint } from "@/utils/checkpoint.js";
 import { promiseWithResolvers } from "@/utils/promiseWithResolvers.js";
-import { type QueryWithTypings, sql } from "drizzle-orm";
+import type { QueryWithTypings } from "drizzle-orm";
 import type { PgSession } from "drizzle-orm/pg-core";
 import { createMiddleware } from "hono/factory";
 import { streamSSE } from "hono/streaming";
@@ -39,7 +39,7 @@ export const client = ({
 
   const channel = `${globalThis.PONDER_NAMESPACE_BUILD.schema}_status_channel`;
 
-  if (driver.dialect === "pglite") {
+  if ("instance" in driver) {
     driver.instance.query(`LISTEN "${channel}"`).then(() => {
       driver.instance.onNotification(async () => {
         statusResolver.resolve();
@@ -47,7 +47,7 @@ export const client = ({
       });
     });
   } else {
-    const pool = driver.admin;
+    const pool = driver.internal;
 
     const connectAndListen = async () => {
       driver.listen = await pool.connect();
@@ -88,7 +88,7 @@ export const client = ({
           return c.text((error as Error).message, 500);
         }
       } else {
-        const client = await driver.admin.connect();
+        const client = await driver.internal.connect();
 
         try {
           await validateQuery(query.sql);
@@ -123,27 +123,16 @@ export const client = ({
     }
 
     if (c.req.path === "/sql/status") {
-      // Note: This is done to avoid non-browser compatible dependencies
-
-      const checkpoints = (await globalThis.PONDER_DATABASE.readonlyQB()
-        .execute(
-          sql`SELECT chain_name, chain_id, latest_checkpoint, safe_checkpoint from _ponder_checkpoint`,
-        )
-        .then((res) => res.rows)) as {
-        chain_name: string;
-        chain_id: number;
-        latest_checkpoint: string;
-        safe_checkpoint: string;
-      }[];
+      const checkpoints = await globalThis.PONDER_DATABASE.getCheckpoints();
 
       const status: Status = {};
-      for (const { chain_name, chain_id, latest_checkpoint } of checkpoints) {
-        status[chain_name] = {
-          id: chain_id,
+      for (const { chainName, chainId, latestCheckpoint } of checkpoints) {
+        status[chainName] = {
+          id: chainId,
           block: {
-            number: Number(decodeCheckpoint(latest_checkpoint).blockNumber),
+            number: Number(decodeCheckpoint(latestCheckpoint).blockNumber),
             timestamp: Number(
-              decodeCheckpoint(latest_checkpoint).blockTimestamp,
+              decodeCheckpoint(latestCheckpoint).blockTimestamp,
             ),
           },
         };