@ponder/client 0.9.0-next.9 → 0.9.1

package/dist/index.d.ts

@@ -1,8 +1,11 @@
 import { SQLWrapper, QueryWithTypings } from 'drizzle-orm';
-export { and, asc, avg, avgDistinct, between, count, countDistinct, desc, eq, exists, gt, gte, inArray, isNotNull, isNull, like, lt, lte, max, min, ne, not, notBetween, notExists, notIlike, notInArray, or, relations, sql, sum, sumDistinct } from 'drizzle-orm';
+export { and, asc, avg, avgDistinct, between, count, countDistinct, desc, eq, exists, gt, gte, ilike, inArray, isNotNull, isNull, like, lt, lte, max, min, ne, not, notBetween, notExists, notIlike, notInArray, notLike, or, relations, sql, sum, sumDistinct } from 'drizzle-orm';
 import { PgRemoteDatabase } from 'drizzle-orm/pg-proxy';
 export { alias, except, exceptAll, intersect, intersectAll, union, unionAll } from 'drizzle-orm/pg-core';
 
+type Schema = {
+    [name: string]: unknown;
+};
 type Prettify<T> = {
     [K in keyof T]: T[K];
 } & {};
@@ -19,14 +22,34 @@ type ClientDb<schema extends Schema = Schema> = Prettify<Omit<PgRemoteDatabase<s
 type Client<schema extends Schema = Schema> = {
     /** Query the database. */
     db: ClientDb<schema>;
-    /** Subscribe to live updates. */
+    /**
+     * Subscribe to live updates.
+     *
+     * @param queryFn - The query to subscribe to.
+     * @param onData - The callback to call with each new query result
+     * @param onError - The callback to call when an error occurs.
+     *
+     * @example
+     * ```ts
+     * import { createClient } from "@ponder/client";
+     * import * as schema from "../ponder.schema";
+     *
+     * const client = createClient("https://.../sql", { schema });
+     *
+     * client.live(
+     *   (db) => db.select().from(schema.account),
+     *   (result) => console.log(result),
+     *   (error) => console.error(error),
+     * );
+     * ```
+     */
     live: <result>(queryFn: (db: ClientDb<schema>) => Promise<result>, onData: (result: result) => void, onError?: (error: Error) => void) => {
         unsubscribe: () => void;
     };
     /** Get the status of all chains. */
     getStatus: () => Promise<Status>;
 };
-declare const compileQuery: (query: SQLWrapper | string) => QueryWithTypings;
+declare const compileQuery: (query: SQLWrapper) => QueryWithTypings;
 /**
  * Create a client for querying Ponder apps.
  *
@@ -38,19 +61,11 @@ declare const compileQuery: (query: SQLWrapper | string) => QueryWithTypings;
  * import { createClient } from "@ponder/client";
  * import * as schema from "../ponder.schema";
  *
- * const client = createClient("https://...", { schema });
+ * const client = createClient("https://.../sql", { schema });
  * ```
  */
 declare const createClient: <schema extends Schema>(baseUrl: string, { schema }: {
     schema: schema;
 }) => Client<schema>;
 
-type Schema = {
-    [name: string]: unknown;
-};
-declare const Schema: unique symbol;
-declare const setDatabaseSchema: <T extends {
-    [name: string]: unknown;
-}>(schema: T, schemaName: string) => T;
-
-export { type Client, type Status, compileQuery, createClient, setDatabaseSchema };
+export { type Client, type Status, compileQuery, createClient };

package/dist/index.js

@@ -1,12 +1,9 @@
 // src/index.ts
-import {
-  Table,
-  is,
-  sql
-} from "drizzle-orm";
 import { drizzle } from "drizzle-orm/pg-proxy";
+import { EventSource } from "eventsource";
+import superjson from "superjson";
 import {
-  sql as sql2,
+  sql,
   eq,
   gt,
   gte,
@@ -22,6 +19,8 @@ import {
   between,
   notBetween,
   like,
+  notLike,
+  ilike,
   notIlike,
   not,
   asc,
@@ -47,23 +46,11 @@ import {
   except,
   exceptAll
 } from "drizzle-orm/pg-core";
-var getEventSource = async () => {
-  let SSE;
-  if (typeof window === "undefined") {
-    const undici = await import(
-      /* webpackIgnore: true */
-      "undici"
-    );
-    SSE = undici.EventSource;
-  } else {
-    SSE = EventSource;
-  }
-  return SSE;
-};
 var getUrl = (baseUrl, method, query) => {
-  const url = new URL(`${baseUrl}/client/${method}`);
+  const url = new URL(baseUrl);
+  url.pathname = `${url.pathname}/${method}`;
   if (query) {
-    url.searchParams.set("sql", JSON.stringify(query));
+    url.searchParams.set("sql", superjson.stringify(query));
   }
   return url;
 };
@@ -72,16 +59,15 @@ var noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {
 });
 var dialect = noopDatabase.dialect;
 var compileQuery = (query) => {
-  const sequel = typeof query === "string" ? sql.raw(query) : query.getSQL();
-  return dialect.sqlToQuery(sequel);
+  return dialect.sqlToQuery(query.getSQL());
 };
 var createClient = (baseUrl, { schema }) => {
   let sse;
   let liveCount = 0;
   const client = {
     db: drizzle(
-      async (sql3, params, _, typings) => {
-        const builtQuery = { sql: sql3, params, typings };
+      async (sql2, params, _, typings) => {
+        const builtQuery = { sql: sql2, params, typings };
         const response = await fetch(getUrl(baseUrl, "db", builtQuery), {
           method: "POST"
         });
@@ -99,34 +85,27 @@ var createClient = (baseUrl, { schema }) => {
       { schema, casing: "snake_case" }
     ),
     live: (queryFn, onData, onError) => {
-      const addEventListeners = () => {
-        sse.addEventListener("message", (event) => {
-          const data = JSON.parse(event.data);
-          if (data.status === "error") {
-            const error = new Error(data.error);
-            error.stack = void 0;
-            onError?.(error);
-          } else {
-            queryFn(client.db).then(onData).catch(onError);
-          }
-        });
-        sse.addEventListener("error", () => {
-          onError?.(new Error("server disconnected"));
-        });
-      };
-      liveCount++;
       if (sse === void 0) {
-        getEventSource().then((SSE) => {
-          sse = new SSE(getUrl(baseUrl, "live"));
-          addEventListeners();
-        });
-      } else {
-        addEventListeners();
+        sse = new EventSource(getUrl(baseUrl, "live"));
       }
+      const onDataListener = (_event) => {
+        queryFn(client.db).then(onData).catch(onError);
+      };
+      const onErrorListener = (_event) => {
+        onError?.(new Error("server disconnected"));
+      };
+      sse?.addEventListener("message", onDataListener);
+      sse?.addEventListener("error", onErrorListener);
+      liveCount = liveCount + 1;
       return {
         unsubscribe: () => {
-          if (--liveCount === 0)
+          sse?.removeEventListener("message", onDataListener);
+          sse?.removeEventListener("error", onErrorListener);
+          liveCount = liveCount - 1;
+          if (liveCount === 0) {
             sse?.close();
+            sse = void 0;
+          }
         }
       };
     },
@@ -139,15 +118,6 @@ var createClient = (baseUrl, { schema }) => {
   };
   return client;
 };
-var Schema = Symbol.for("drizzle:Schema");
-var setDatabaseSchema = (schema, schemaName) => {
-  for (const table of Object.values(schema)) {
-    if (is(table, Table)) {
-      table[Schema] = schemaName;
-    }
-  }
-  return schema;
-};
 export {
   alias,
   and,
@@ -166,6 +136,7 @@ export {
   exists,
   gt,
   gte,
+  ilike,
   inArray,
   intersect,
   intersectAll,
@@ -182,10 +153,10 @@ export {
   notExists,
   notIlike,
   notInArray,
+  notLike,
   or,
   relations,
-  setDatabaseSchema,
-  sql2 as sql,
+  sql,
   sum,
   sumDistinct,
   union,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import {\n  type QueryWithTypings,\n  type SQLWrapper,\n  Table,\n  is,\n  sql,\n} from \"drizzle-orm\";\nimport type { PgDialect } from \"drizzle-orm/pg-core\";\nimport { type PgRemoteDatabase, drizzle } from \"drizzle-orm/pg-proxy\";\n\nconst getEventSource = async () => {\n  let SSE: typeof EventSource;\n  if (typeof window === \"undefined\") {\n    const undici = await import(/* webpackIgnore: true */ \"undici\");\n    // @ts-ignore\n    SSE = undici.EventSource;\n  } else {\n    SSE = EventSource;\n  }\n\n  return SSE;\n};\n\ntype Schema = { [name: string]: unknown };\n\ntype Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type Status = {\n  [network: string]: {\n    block: { number: number; timestamp: number } | null;\n    ready: boolean;\n  };\n};\n\ntype ClientDb<schema extends Schema = Schema> = Prettify<\n  Omit<\n    PgRemoteDatabase<schema>,\n    | \"insert\"\n    | \"update\"\n    | \"delete\"\n    | \"transaction\"\n    | \"refreshMaterializedView\"\n    | \"_\"\n  >\n>;\n\nexport type Client<schema extends Schema = Schema> = {\n  /** Query the database. */\n  db: ClientDb<schema>;\n  /** Subscribe to live updates. */\n  live: <result>(\n    queryFn: (db: ClientDb<schema>) => Promise<result>,\n    onData: (result: result) => void,\n    onError?: (error: Error) => void,\n  ) => {\n    unsubscribe: () => void;\n  };\n  /** Get the status of all chains. */\n  getStatus: () => Promise<Status>;\n};\n\nconst getUrl = (\n  baseUrl: string,\n  method: \"live\" | \"db\" | \"status\",\n  query?: QueryWithTypings,\n) => {\n  const url = new URL(`${baseUrl}/client/${method}`);\n  if (query) {\n    url.searchParams.set(\"sql\", JSON.stringify(query));\n  }\n  return url;\n};\n\nconst noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n  casing: \"snake_case\",\n});\n\n// @ts-ignore\nconst dialect: PgDialect = noopDatabase.dialect;\n\nexport const compileQuery = (query: SQLWrapper | string) => {\n  const sequel = typeof query === \"string\" ? sql.raw(query) : query.getSQL();\n  return dialect.sqlToQuery(sequel);\n};\n\n/**\n * Create a client for querying Ponder apps.\n *\n * @param baseUrl - The URL of the Ponder app.\n * @param schema - The schema of the Ponder app.\n *\n * @example\n * ```ts\n * import { createClient } from \"@ponder/client\";\n * import * as schema from \"../ponder.schema\";\n *\n * const client = createClient(\"https://...\", { schema });\n * ```\n */\nexport const createClient = <schema extends Schema>(\n  baseUrl: string,\n  { schema }: { schema: schema },\n): Client<schema> => {\n  let sse: EventSource | undefined;\n  let liveCount = 0;\n\n  const client: Client<schema> = {\n    db: drizzle(\n      async (sql, params, _, typings) => {\n        const builtQuery = { sql, params, typings };\n        const response = await fetch(getUrl(baseUrl, \"db\", builtQuery), {\n          method: \"POST\",\n        });\n\n        if (response.ok === false) {\n          const error = new Error(await response.text());\n          error.stack = undefined;\n          throw error;\n        }\n\n        const result = await response.json();\n\n        return {\n          ...result,\n          rows: result.rows.map((row: object) => Object.values(row)),\n        };\n      },\n      { schema, casing: \"snake_case\" },\n    ),\n    live: (queryFn, onData, onError) => {\n      // https://github.com/drizzle-team/drizzle-orm/blob/04c91434c7ac10aeb2923efd1d19a7ebf10ea9d4/drizzle-orm/src/pg-core/db.ts#L602-L621\n\n      const addEventListeners = () => {\n        sse!.addEventListener(\"message\", (event) => {\n          const data = JSON.parse(event.data) as\n            | { status: \"success\"; result: unknown }\n            | { status: \"error\"; error: string };\n\n          if (data.status === \"error\") {\n            const error = new Error(data.error);\n            error.stack = undefined;\n            onError?.(error);\n          } else {\n            queryFn(client.db).then(onData).catch(onError);\n          }\n        });\n\n        sse!.addEventListener(\"error\", () => {\n          onError?.(new Error(\"server disconnected\"));\n        });\n      };\n\n      liveCount++;\n      if (sse === undefined) {\n        getEventSource().then((SSE) => {\n          sse = new SSE(getUrl(baseUrl, \"live\"));\n          addEventListeners();\n        });\n      } else {\n        addEventListeners();\n      }\n\n      return {\n        unsubscribe: () => {\n          if (--liveCount === 0) sse?.close();\n        },\n      };\n    },\n    getStatus: async () => {\n      const response = await fetch(getUrl(baseUrl, \"status\"), {\n        method: \"POST\",\n      });\n\n      return response.json();\n    },\n  };\n\n  return client;\n};\n\nexport {\n  sql,\n  eq,\n  gt,\n  gte,\n  lt,\n  lte,\n  ne,\n  isNull,\n  isNotNull,\n  inArray,\n  notInArray,\n  exists,\n  notExists,\n  between,\n  notBetween,\n  like,\n  notIlike,\n  not,\n  asc,\n  desc,\n  and,\n  or,\n  count,\n  countDistinct,\n  avg,\n  avgDistinct,\n  sum,\n  sumDistinct,\n  max,\n  min,\n  relations,\n} from \"drizzle-orm\";\n\nexport {\n  alias,\n  union,\n  unionAll,\n  intersect,\n  intersectAll,\n  except,\n  exceptAll,\n} from \"drizzle-orm/pg-core\";\n\nconst Schema = Symbol.for(\"drizzle:Schema\");\n\nexport const setDatabaseSchema = <T extends { [name: string]: unknown }>(\n  schema: T,\n  schemaName: string,\n): T => {\n  for (const table of Object.values(schema)) {\n    if (is(table, Table)) {\n      // @ts-ignore\n      table[Schema] = schemaName;\n    }\n  }\n  return schema;\n};\n"],"mappings":"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","names":["sql"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import type { QueryWithTypings, SQLWrapper } from \"drizzle-orm\";\nimport type { PgDialect } from \"drizzle-orm/pg-core\";\nimport { type PgRemoteDatabase, drizzle } from \"drizzle-orm/pg-proxy\";\nimport { EventSource } from \"eventsource\";\nimport superjson from \"superjson\";\n\ntype Schema = { [name: string]: unknown };\n\ntype Prettify<T> = {\n  [K in keyof T]: T[K];\n} & {};\n\nexport type Status = {\n  [network: string]: {\n    block: { number: number; timestamp: number } | null;\n    ready: boolean;\n  };\n};\n\ntype ClientDb<schema extends Schema = Schema> = Prettify<\n  Omit<\n    PgRemoteDatabase<schema>,\n    | \"insert\"\n    | \"update\"\n    | \"delete\"\n    | \"transaction\"\n    | \"refreshMaterializedView\"\n    | \"_\"\n  >\n>;\n\nexport type Client<schema extends Schema = Schema> = {\n  /** Query the database. */\n  db: ClientDb<schema>;\n  /**\n   * Subscribe to live updates.\n   *\n   * @param queryFn - The query to subscribe to.\n   * @param onData - The callback to call with each new query result\n   * @param onError - The callback to call when an error occurs.\n   *\n   * @example\n   * ```ts\n   * import { createClient } from \"@ponder/client\";\n   * import * as schema from \"../ponder.schema\";\n   *\n   * const client = createClient(\"https://.../sql\", { schema });\n   *\n   * client.live(\n   *   (db) => db.select().from(schema.account),\n   *   (result) => console.log(result),\n   *   (error) => console.error(error),\n   * );\n   * ```\n   */\n  live: <result>(\n    queryFn: (db: ClientDb<schema>) => Promise<result>,\n    onData: (result: result) => void,\n    onError?: (error: Error) => void,\n  ) => {\n    unsubscribe: () => void;\n  };\n  /** Get the status of all chains. */\n  getStatus: () => Promise<Status>;\n};\n\nconst getUrl = (\n  baseUrl: string,\n  method: \"live\" | \"db\" | \"status\",\n  query?: QueryWithTypings,\n) => {\n  const url = new URL(baseUrl);\n  url.pathname = `${url.pathname}/${method}`;\n  if (query) {\n    url.searchParams.set(\"sql\", superjson.stringify(query));\n  }\n  return url;\n};\n\nconst noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {\n  casing: \"snake_case\",\n});\n\n// @ts-ignore\nconst dialect: PgDialect = noopDatabase.dialect;\n\nexport const compileQuery = (query: SQLWrapper) => {\n  return dialect.sqlToQuery(query.getSQL());\n};\n\n/**\n * Create a client for querying Ponder apps.\n *\n * @param baseUrl - The URL of the Ponder app.\n * @param schema - The schema of the Ponder app.\n *\n * @example\n * ```ts\n * import { createClient } from \"@ponder/client\";\n * import * as schema from \"../ponder.schema\";\n *\n * const client = createClient(\"https://.../sql\", { schema });\n * ```\n */\nexport const createClient = <schema extends Schema>(\n  baseUrl: string,\n  { schema }: { schema: schema },\n): Client<schema> => {\n  let sse: EventSource | undefined;\n  let liveCount = 0;\n\n  const client: Client<schema> = {\n    db: drizzle(\n      async (sql, params, _, typings) => {\n        const builtQuery = { sql, params, typings };\n        const response = await fetch(getUrl(baseUrl, \"db\", builtQuery), {\n          method: \"POST\",\n        });\n\n        if (response.ok === false) {\n          const error = new Error(await response.text());\n          error.stack = undefined;\n          throw error;\n        }\n\n        const result = await response.json();\n\n        return {\n          ...result,\n          rows: result.rows.map((row: object) => Object.values(row)),\n        };\n      },\n      { schema, casing: \"snake_case\" },\n    ),\n    live: (queryFn, onData, onError) => {\n      if (sse === undefined) {\n        sse = new EventSource(getUrl(baseUrl, \"live\"));\n      }\n\n      const onDataListener = (_event: MessageEvent) => {\n        queryFn(client.db).then(onData).catch(onError);\n      };\n\n      const onErrorListener = (_event: MessageEvent) => {\n        onError?.(new Error(\"server disconnected\"));\n      };\n\n      sse?.addEventListener(\"message\", onDataListener);\n      sse?.addEventListener(\"error\", onErrorListener);\n      liveCount = liveCount + 1;\n\n      return {\n        unsubscribe: () => {\n          sse?.removeEventListener(\"message\", onDataListener);\n          sse?.removeEventListener(\"error\", onErrorListener);\n          liveCount = liveCount - 1;\n          if (liveCount === 0) {\n            sse?.close();\n            sse = undefined;\n          }\n        },\n      };\n    },\n    getStatus: async () => {\n      const response = await fetch(getUrl(baseUrl, \"status\"), {\n        method: \"POST\",\n      });\n\n      return response.json();\n    },\n  };\n\n  return client;\n};\n\nexport {\n  sql,\n  eq,\n  gt,\n  gte,\n  lt,\n  lte,\n  ne,\n  isNull,\n  isNotNull,\n  inArray,\n  notInArray,\n  exists,\n  notExists,\n  between,\n  notBetween,\n  like,\n  notLike,\n  ilike,\n  notIlike,\n  not,\n  asc,\n  desc,\n  and,\n  or,\n  count,\n  countDistinct,\n  avg,\n  avgDistinct,\n  sum,\n  sumDistinct,\n  max,\n  min,\n  relations,\n} from \"drizzle-orm\";\n\nexport {\n  alias,\n  union,\n  unionAll,\n  intersect,\n  intersectAll,\n  except,\n  exceptAll,\n} from \"drizzle-orm/pg-core\";\n"],"mappings":"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","names":["sql"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ponder/client",
-  "version": "0.9.0-next.9",
+  "version": "0.9.1",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -26,9 +26,6 @@
       "import": "./dist/index.js"
     }
   },
-  "browser": {
-    "undici": false
-  },
   "peerDependencies": {
     "typescript": ">=5.0.4"
   },
@@ -39,7 +36,8 @@
   },
   "dependencies": {
     "drizzle-orm": "0.36.4",
-    "undici": "^7.2.0"
+    "eventsource": "^3.0.5",
+    "superjson": "^2.2.2"
   },
   "devDependencies": {
     "tsup": "^8.0.1"

package/src/index.ts

@@ -1,25 +1,8 @@
-import {
-  type QueryWithTypings,
-  type SQLWrapper,
-  Table,
-  is,
-  sql,
-} from "drizzle-orm";
+import type { QueryWithTypings, SQLWrapper } from "drizzle-orm";
 import type { PgDialect } from "drizzle-orm/pg-core";
 import { type PgRemoteDatabase, drizzle } from "drizzle-orm/pg-proxy";
-
-const getEventSource = async () => {
-  let SSE: typeof EventSource;
-  if (typeof window === "undefined") {
-    const undici = await import(/* webpackIgnore: true */ "undici");
-    // @ts-ignore
-    SSE = undici.EventSource;
-  } else {
-    SSE = EventSource;
-  }
-
-  return SSE;
-};
+import { EventSource } from "eventsource";
+import superjson from "superjson";
 
 type Schema = { [name: string]: unknown };
 
@@ -49,7 +32,27 @@ type ClientDb<schema extends Schema = Schema> = Prettify<
 export type Client<schema extends Schema = Schema> = {
   /** Query the database. */
   db: ClientDb<schema>;
-  /** Subscribe to live updates. */
+  /**
+   * Subscribe to live updates.
+   *
+   * @param queryFn - The query to subscribe to.
+   * @param onData - The callback to call with each new query result
+   * @param onError - The callback to call when an error occurs.
+   *
+   * @example
+   * ```ts
+   * import { createClient } from "@ponder/client";
+   * import * as schema from "../ponder.schema";
+   *
+   * const client = createClient("https://.../sql", { schema });
+   *
+   * client.live(
+   *   (db) => db.select().from(schema.account),
+   *   (result) => console.log(result),
+   *   (error) => console.error(error),
+   * );
+   * ```
+   */
   live: <result>(
     queryFn: (db: ClientDb<schema>) => Promise<result>,
     onData: (result: result) => void,
@@ -66,9 +69,10 @@ const getUrl = (
   method: "live" | "db" | "status",
   query?: QueryWithTypings,
 ) => {
-  const url = new URL(`${baseUrl}/client/${method}`);
+  const url = new URL(baseUrl);
+  url.pathname = `${url.pathname}/${method}`;
   if (query) {
-    url.searchParams.set("sql", JSON.stringify(query));
+    url.searchParams.set("sql", superjson.stringify(query));
   }
   return url;
 };
@@ -80,9 +84,8 @@ const noopDatabase = drizzle(() => Promise.resolve({ rows: [] }), {
 // @ts-ignore
 const dialect: PgDialect = noopDatabase.dialect;
 
-export const compileQuery = (query: SQLWrapper | string) => {
-  const sequel = typeof query === "string" ? sql.raw(query) : query.getSQL();
-  return dialect.sqlToQuery(sequel);
+export const compileQuery = (query: SQLWrapper) => {
+  return dialect.sqlToQuery(query.getSQL());
 };
 
 /**
@@ -96,7 +99,7 @@ export const compileQuery = (query: SQLWrapper | string) => {
  * import { createClient } from "@ponder/client";
  * import * as schema from "../ponder.schema";
  *
- * const client = createClient("https://...", { schema });
+ * const client = createClient("https://.../sql", { schema });
  * ```
  */
 export const createClient = <schema extends Schema>(
@@ -130,41 +133,31 @@ export const createClient = <schema extends Schema>(
       { schema, casing: "snake_case" },
     ),
     live: (queryFn, onData, onError) => {
-      // https://github.com/drizzle-team/drizzle-orm/blob/04c91434c7ac10aeb2923efd1d19a7ebf10ea9d4/drizzle-orm/src/pg-core/db.ts#L602-L621
-
-      const addEventListeners = () => {
-        sse!.addEventListener("message", (event) => {
-          const data = JSON.parse(event.data) as
-            | { status: "success"; result: unknown }
-            | { status: "error"; error: string };
-
-          if (data.status === "error") {
-            const error = new Error(data.error);
-            error.stack = undefined;
-            onError?.(error);
-          } else {
-            queryFn(client.db).then(onData).catch(onError);
-          }
-        });
+      if (sse === undefined) {
+        sse = new EventSource(getUrl(baseUrl, "live"));
+      }
 
-        sse!.addEventListener("error", () => {
-          onError?.(new Error("server disconnected"));
-        });
+      const onDataListener = (_event: MessageEvent) => {
+        queryFn(client.db).then(onData).catch(onError);
       };
 
-      liveCount++;
-      if (sse === undefined) {
-        getEventSource().then((SSE) => {
-          sse = new SSE(getUrl(baseUrl, "live"));
-          addEventListeners();
-        });
-      } else {
-        addEventListeners();
-      }
+      const onErrorListener = (_event: MessageEvent) => {
+        onError?.(new Error("server disconnected"));
+      };
+
+      sse?.addEventListener("message", onDataListener);
+      sse?.addEventListener("error", onErrorListener);
+      liveCount = liveCount + 1;
 
       return {
         unsubscribe: () => {
-          if (--liveCount === 0) sse?.close();
+          sse?.removeEventListener("message", onDataListener);
+          sse?.removeEventListener("error", onErrorListener);
+          liveCount = liveCount - 1;
+          if (liveCount === 0) {
+            sse?.close();
+            sse = undefined;
+          }
         },
       };
     },
@@ -197,6 +190,8 @@ export {
   between,
   notBetween,
   like,
+  notLike,
+  ilike,
   notIlike,
   not,
   asc,
@@ -223,18 +218,3 @@ export {
   except,
   exceptAll,
 } from "drizzle-orm/pg-core";
-
-const Schema = Symbol.for("drizzle:Schema");
-
-export const setDatabaseSchema = <T extends { [name: string]: unknown }>(
-  schema: T,
-  schemaName: string,
-): T => {
-  for (const table of Object.values(schema)) {
-    if (is(table, Table)) {
-      // @ts-ignore
-      table[Schema] = schemaName;
-    }
-  }
-  return schema;
-};