prostgles-server 4.2.559 → 4.2.561

package/dist/runClientRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAKL,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA2B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,EACf,kBAAkB,IAAI,EACtB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,mCA4FnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,MAAM,SAAS,EACf,WAAW,iBAAiB;;;;;;;;EAa7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,iBAqB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,eAAO,MAAM,eAAe,GAC1B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,qBAuC7B,CAAC"}
+{"version":3,"file":"runClientRequest.d.ts","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAA0B,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAML,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,sCAAsC,CAAC;AA8B5E,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAUF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,SAAS,EACf,kBAAkB,IAAI,EACtB,WAAW,iBAAiB,EAC5B,OAAO,eAAe,GAAG,SAAS,8BAgInC,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,MAAM,SAAS,EACf,WAAW,iBAAiB;;;;;;;;EAa7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,iBAqB7B,CAAC;AAEF,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AACF,eAAO,MAAM,eAAe,GAC1B,MAAM,SAAS,EACf,iBAAiB,UAAU,EAC3B,WAAW,iBAAiB,qBAuC7B,CAAC"}

package/dist/runClientRequest.js

@@ -20,12 +20,14 @@ const TABLE_METHODS = {
     getInfo: 1,
     sync: 1,
     insertMany: 1,
+    abort: 1,
 };
 const TABLE_METHODS_KEYS = (0, prostgles_types_1.getKeys)(TABLE_METHODS);
 const SOCKET_ONLY_COMMANDS = [
     "subscribe",
     "subscribeOne",
     "sync",
+    "abort",
 ];
 const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
     /* Channel name will only include client-sent params so we ignore table_rules enforced params */
@@ -37,7 +39,15 @@ const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
         command: { enum: TABLE_METHODS_KEYS },
         param1: { type: "any", optional: true },
         param2: { type: "any", optional: true },
-        param3: { type: "any", optional: true },
+        param3: {
+            type: {
+                abortSignalId: { type: "string", optional: true },
+                returning: { type: "any", optional: true },
+                returnQuery: { type: "boolean", optional: true },
+                returnType: { type: "string", optional: true },
+            },
+            optional: true,
+        },
     }, nonValidatedArgs, "tableName");
     if (validation.error !== undefined) {
         throw validation.error;
@@ -56,11 +66,6 @@ const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
         throw clientInfo;
     }
     const parsedTableRule = await this.publishParser.getParsedTableRule({ tableName, clientReq }, clientInfo, scope);
-    this.publishParser.validateRequestRule({ tableName, command, clientReq }, parsedTableRule, scope);
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (!parsedTableRule) {
-        throw `Invalid OR disallowed request: ${tableName}.${command} `;
-    }
     const sessionUser = !clientInfo.user ? undefined : ({
         ...(0, parseFieldFilter_1.parseFieldFilter)(
         //@ts-ignore
@@ -72,6 +77,24 @@ const runClientRequest = async function (nonValidatedArgs, clientReq, scope) {
         isRemoteRequest: { user: sessionUser },
         scope,
     };
+    if (command === "abort") {
+        const validation = (0, prostgles_types_1.getJSONBObjectSchemaValidationError)({
+            tableName: { type: "string" },
+            command: { enum: ["abort"] },
+            param1: {
+                type: { command: { enum: prostgles_types_1.ABORTABLE_METHODS }, abortSignalId: "string" },
+            },
+        }, nonValidatedArgs, "tableName", undefined, { allowExtraProperties: true });
+        if (validation.error !== undefined) {
+            throw validation.error;
+        }
+        this.publishParser.validateRequestRule({ tableName, command: validation.data.param1.command, clientReq }, parsedTableRule, scope);
+        tableHandler.abortRequests.add(validation.data.param1.abortSignalId);
+        return tableHandler.abortRemoteQuery(validation.data.param1.abortSignalId, localParams);
+    }
+    else {
+        this.publishParser.validateRequestRule({ tableName, command, clientReq }, parsedTableRule, scope);
+    }
     if (param3 && param3.returnQuery) {
         const isAllowed = await (0, runSQL_1.canRunSQL)(this, clientReq);
         if (isAllowed) {

package/dist/runClientRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runClientRequest.js","sourceRoot":"","sources":["../lib/runClientRequest.ts"],"names":[],"mappings":"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"}

package/lib/DboBuilder/DboBuilder.ts

@@ -20,7 +20,7 @@ import type {
   TableSchema,
   TxCB,
 } from "./DboBuilderTypes";
-import { QueryStreamer } from "./QueryStreamer";
+import { QueryStreamer } from "./runSql/QueryStreamer";
 import { TableHandler } from "./TableHandler/TableHandler";
 import type { JoinPaths } from "./ViewHandler/ViewHandler";
 import { parseJoinPath } from "./ViewHandler/parseJoinPath";
@@ -69,18 +69,27 @@ export class DboBuilder {
 
   queryStreamer: QueryStreamer;
 
+  private constructor(prostgles: Prostgles) {
+    this.prostgles = prostgles;
+    if (!this.prostgles.db) throw "db missing";
+    this.db = this.prostgles.db;
+    this.dbo = {};
+    this.dboMap = new Map();
+    this.queryStreamer = new QueryStreamer(this);
+  }
+
+  private init = async () => {
+    await this.build();
+    /* If watchSchema is enabled then PubSubManager must be created (if possible) because it creates the event trigger */
+    if (this.prostgles.schemaWatch?.type.watchType === "DDL_trigger") {
+      await this.getPubSubManager();
+    }
+
+    return this;
+  };
+
   get tables(): TableSchema[] {
     return this.tablesOrViews ?? [];
-    // .map(({ name, columns }) => {
-    //   const info = this.dboMap.get(name)?.tableOrViewInfo;
-    //   if (!info) return undefined;
-    //   return {
-    //     name,
-    //     info,
-    //     columns,
-    //   } satisfies DbTableInfo;
-    // })
-    // .filter(isDefined);
   }
 
   getDetailedFieldInfo = async (fields: pg.IColumn[]) => {
@@ -130,32 +139,12 @@ export class DboBuilder {
 
   onSchemaChange?: (event: { command: string; query: string }) => void;
 
-  private constructor(prostgles: Prostgles) {
-    this.prostgles = prostgles;
-    if (!this.prostgles.db) throw "db missing";
-    this.db = this.prostgles.db;
-    this.dbo = {};
-    this.dboMap = new Map();
-    this.queryStreamer = new QueryStreamer(this);
-  }
-
-  private init = async () => {
-    await this.build();
-    /* If watchSchema is enabled then PubSubManager must be created (if possible) because it creates the event trigger */
-    if (this.prostgles.schemaWatch?.type.watchType === "DDL_trigger") {
-      await this.getPubSubManager();
-    }
-
-    return this;
-  };
-
   public static create = async (prostgles: Prostgles): Promise<DboBuilder> => {
     const res = new DboBuilder(prostgles);
     return await res.init();
   };
 
   destroy = async () => {
-    await this.queryStreamer.destroy().catch(console.error);
     return this._pubSubManager?.destroy();
   };
 

package/lib/DboBuilder/ViewHandler/ViewHandler.ts

@@ -20,7 +20,7 @@ import type { TableSchema } from "../DboBuilderTypes";
 import { getValidatedTableRules } from "../TableRules/getValidatedTableRules";
 import { getColumns } from "../getColumns";
 import { count } from "./count";
-import { find } from "./find";
+import { find, type Param3 } from "./find";
 import { getInfo } from "./getInfo";
 import { parseFieldFilter } from "./parseFieldFilter";
 import { prepareWhere } from "./prepareWhere";
@@ -30,6 +30,8 @@ import { subscribe } from "./subscribe";
 import { validateViewRules } from "./validateViewRules";
 import { escapeTSNames } from "../../utils/utils";
 import type { TableDefinition } from "../../TableConfig/TableConfig";
+import { getDbHandlerWithAbort } from "./getDbHandlerWithAbort";
+import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
 
 export type JoinPaths = {
   t1: string;
@@ -112,6 +114,36 @@ export class ViewHandler {
     return localParams?.tx || this.tx;
   };
 
+  abortRemoteQuery = (abortSignalId: string, localParams: LocalParams) => {
+    const sid = this.dboBuilder.prostgles.authHandler.getSIDNoError(localParams.clientReq);
+    if (!sid) {
+      throw new Error(
+        "Cannot get SID from client request. Ensure that the client is authenticated before using abortable queries.",
+      );
+    }
+    const abortableQuery = this.activeQueries.get(abortSignalId);
+    if (!abortableQuery || abortableQuery.sid !== sid) {
+      throw new Error(
+        `No active query found with abortSignalId ${abortSignalId}. Ensure that the query was initiated with the correct abortSignalId.`,
+      );
+    }
+    abortableQuery.abort();
+    this.abortRequests.delete(abortSignalId);
+  };
+
+  activeQueries = new Map<
+    string,
+    {
+      abort: VoidFunction;
+      query: string;
+      start: number;
+      sid: string | undefined;
+      socketId: string | undefined;
+    }
+  >();
+  abortRequests = new Set<string>();
+  getDbHandlerWithAbort = getDbHandlerWithAbort.bind(this);
+
   _log = ({
     command,
     data,
@@ -178,7 +210,7 @@ export class ViewHandler {
   async findOne(
     filter?: Filter,
     selectParams?: SelectParams,
-    _param3_unused?: undefined,
+    param3?: Param3,
     table_rules?: ParsedTableRule,
     localParams?: LocalParams,
   ): Promise<any> {
@@ -191,7 +223,7 @@ export class ViewHandler {
       const result = await this.find(
         filter,
         { ...params, limit: 1, returnType: "row" },
-        undefined,
+        param3,
         table_rules,
         localParams,
       );

package/lib/DboBuilder/ViewHandler/count.ts

@@ -8,12 +8,13 @@ import {
 } from "../dboBuilderUtils";
 import type { ViewHandler } from "./ViewHandler";
 import { getReturnTypeQuery } from "./getReturnTypeQuery";
+import type { Param3 } from "./find";
 
 export async function count(
   this: ViewHandler,
   _filter?: Filter,
   selectParams?: SelectParams,
-  _param3_unused?: undefined,
+  param3?: Param3,
   table_rules?: ParsedTableRule,
   localParams?: LocalParams,
 ): Promise<number> {
@@ -54,7 +55,10 @@ export async function count(
         return queryToReturn as unknown[];
       }
 
-      const handler = this.tx?.t ?? this.db;
+      const handler = this.getDbHandlerWithAbort(localParams, {
+        abortSignal: selectParams?.abortSignal,
+        abortSignalId: param3?.abortSignalId,
+      });
       return handler.one(queryWithRLS).then(({ count }) => +count);
     });
 

package/lib/DboBuilder/ViewHandler/find.ts

@@ -13,19 +13,23 @@ import { getSelectQuery } from "../QueryBuilder/getSelectQuery";
 import { getReturnTypeQuery } from "./getReturnTypeQuery";
 import type { ViewHandler } from "./ViewHandler";
 
+export type Param3 = {
+  abortSignalId?: string;
+};
+
 export const find = async function (
   this: ViewHandler,
-  filter?: Filter,
+  filter: Filter = {},
   selectParams?: SelectParams,
-  _?: undefined,
+  param3?: Param3,
   tableRules?: ParsedTableRule,
   localParams?: LocalParams,
 ): Promise<any[]> {
   const start = Date.now();
-  const command =
-    selectParams?.limit === 1 && selectParams.returnType === "row" ? "findOne" : "find";
+  const { limit, returnType, abortSignal } = selectParams ?? {};
+
+  const command = limit === 1 && returnType === "row" ? "findOne" : "find";
   try {
-    filter = filter || {};
     const allowedReturnTypes = Object.keys({
       row: 1,
       statement: 1,
@@ -52,6 +56,7 @@ export const find = async function (
         returnType: 1,
         groupBy: 1,
         having: 1,
+        abortSignal: 1,
       } satisfies Record<keyof SelectParams, 1>);
 
       const invalidParams = Object.keys(selectParams).filter((k) => !validParamNames.includes(k));
@@ -96,7 +101,7 @@ export const find = async function (
       this,
       filter,
       selectParamsLimitCheck,
-      _,
+      undefined,
       tableRules,
       localParams,
     );
@@ -109,6 +114,7 @@ export const find = async function (
     );
 
     const queryWithRLS = withUserRLS(localParams, queryWithoutRLS);
+
     const queryToReturn = await getReturnTypeQuery({
       handler: this,
       localParams,
@@ -123,7 +129,10 @@ export const find = async function (
 
     const query = queryWithRLS;
     const isOneOrNone = returnType === "row" || returnType === "value";
-    const dbHandler = this.getTransaction(localParams)?.t ?? this.db;
+    const dbHandler = this.getDbHandlerWithAbort(localParams, {
+      abortSignal,
+      abortSignalId: param3?.abortSignalId,
+    });
     const queryPromise =
       isOneOrNone ?
         dbHandler.oneOrNone<AnyObject>(query).then((data) => (data ? [data] : []))

package/lib/DboBuilder/ViewHandler/getDbHandlerWithAbort.ts

@@ -0,0 +1,108 @@
+import type { DB } from "../../initProstgles";
+import { QUERY_ID_PREFIX, type LocalParams } from "../DboBuilder";
+import type { ViewHandler } from "./ViewHandler";
+import type * as pgPromise from "pg-promise";
+
+export function getDbHandlerWithAbort(
+  this: ViewHandler,
+  localParams: LocalParams | undefined,
+  params: { abortSignal: AbortSignal | undefined; abortSignalId: string | undefined },
+): Pick<DB | pgPromise.ITask<{}>, "any" | "one" | "many" | "manyOrNone" | "none" | "oneOrNone"> {
+  if (params.abortSignal && params.abortSignalId) {
+    throw new Error("Cannot provide both abortSignal and abortSignalId");
+  }
+
+  if (params.abortSignal?.aborted) {
+    throw new Error("Query aborted before execution");
+  }
+
+  const abortSignal =
+    params.abortSignal ?? AbortSignal.timeout(localParams?.clientReq ? 7_000 : 120_000);
+  const abortSignalId = params.abortSignalId ?? crypto.randomUUID();
+
+  if (this.activeQueries.has(abortSignalId)) {
+    throw new Error(
+      `A query with abortSignalId ${params.abortSignalId} is already active. Ensure that each query has a unique abortSignalId.`,
+    );
+  }
+  const handler = this.getTransaction(localParams)?.t ?? this.db;
+  const { adminClient } = this.dboBuilder.prostgles;
+  if (!adminClient) {
+    throw new Error(
+      "adminClient not available. Ensure prostgles.adminClient is initialized before using abortable queries.",
+    );
+  }
+  const sid = this.dboBuilder.prostgles.authHandler.getSIDNoError(localParams?.clientReq);
+  if (!sid && localParams?.clientReq) {
+    throw new Error(
+      "Cannot get SID from client request. Ensure that the client is authenticated before using abortable queries.",
+    );
+  }
+  const withAbortQuery = <Args extends unknown[], R extends Promise<any>>(
+    func: (query: string, ...args: Args) => R,
+  ) => {
+    return (query: string, ...args: Args) => {
+      const queryIdPrefix = query.split("\n", 1)[0];
+
+      const queryHasIdPrefix = queryIdPrefix?.startsWith(QUERY_ID_PREFIX);
+      if (!queryIdPrefix || !queryHasIdPrefix) {
+        throw new Error(
+          "Query does not have a prostgles query id prefix. Ensure that the query is generated using prostgles methods that include the query id.",
+        );
+      }
+
+      const abort = () => {
+        void this._log({
+          data: { query, abortSignalId },
+          command: "abort",
+          localParams,
+          duration: Date.now() - (this.activeQueries.get(abortSignalId)?.start ?? Date.now()),
+          error: new Error("Query aborted"),
+        });
+        /** Only terminate if there is exactly one matching query with a query id prefix */
+
+        this.abortRequests.delete(abortSignalId);
+        void adminClient
+          .query(
+            `
+            SELECT pg_cancel_backend(pid), * 
+            FROM pg_stat_activity 
+            WHERE query LIKE $1 AND pid <> pg_backend_pid()
+            `,
+            [`${queryIdPrefix}%`],
+          )
+          .catch((err) => {
+            // ignore error
+          });
+      };
+
+      if (this.abortRequests.has(abortSignalId)) {
+        this.abortRequests.delete(abortSignalId);
+        throw new Error(`Abort requested`);
+      }
+
+      this.activeQueries.set(abortSignalId, {
+        query,
+        start: Date.now(),
+        sid,
+        abort,
+        socketId: localParams?.clientReq?.socket?.id,
+      });
+      abortSignal.addEventListener("abort", abort);
+      return func(query, ...args).finally(() => {
+        abortSignal.removeEventListener("abort", abort);
+        this.activeQueries.delete(abortSignalId);
+        this.abortRequests.delete(abortSignalId);
+      });
+    };
+  };
+
+  return {
+    manyOrNone: withAbortQuery(handler.manyOrNone.bind(handler)),
+    one: withAbortQuery(handler.one.bind(handler)),
+    oneOrNone: withAbortQuery(handler.oneOrNone.bind(handler)),
+    any: withAbortQuery(handler.any.bind(handler)),
+    none: withAbortQuery(handler.none.bind(handler)),
+    many: withAbortQuery(handler.many.bind(handler)),
+  };
+}

package/lib/DboBuilder/ViewHandler/size.ts

@@ -8,11 +8,12 @@ import {
 } from "../dboBuilderUtils";
 import type { ViewHandler } from "./ViewHandler";
 import { getReturnTypeQuery } from "./getReturnTypeQuery";
+import type { Param3 } from "./find";
 export async function size(
   this: ViewHandler,
   _filter?: Filter,
   selectParams?: SelectParams,
-  param3_unused?: undefined,
+  param3?: Param3,
   table_rules?: ParsedTableRule,
   localParams?: LocalParams,
 ): Promise<string> {
@@ -22,7 +23,7 @@ export async function size(
     const result = await this.find(
       filter,
       { ...selectParams, limit: 2 },
-      undefined,
+      param3,
       table_rules,
       localParams,
     ).then(async (_allowed) => {
@@ -57,9 +58,11 @@ export async function size(
         return queryToReturn as unknown[];
       }
 
-      return (this.tx?.t || this.db)
-        .one<{ size: string | null }>(queryWithRLS)
-        .then(({ size }) => size || "0");
+      const handler = this.getDbHandlerWithAbort(localParams, {
+        abortSignal: selectParams?.abortSignal,
+        abortSignalId: param3?.abortSignalId,
+      });
+      return handler.one<{ size: string | null }>(queryWithRLS).then(({ size }) => size || "0");
     });
     await this._log({
       command: "size",

package/lib/DboBuilder/dboBuilderUtils.ts

@@ -176,6 +176,8 @@ export const getCanExecute = async (db: DB) => {
   return false;
 };
 
+export const QUERY_ID_PREFIX = "-- prostgles query id: ";
+
 export const withUserRLS = (localParams: LocalParams | undefined, query: string) => {
   const user = localParams?.isRemoteRequest?.user;
   const queryPrefix = `SET SESSION "prostgles.user" \nTO`;
@@ -184,5 +186,6 @@ export const withUserRLS = (localParams: LocalParams | undefined, query: string)
     firstQuery = pgp.as.format(`${queryPrefix} \${user};`, { user });
   }
 
-  return [firstQuery, query].join("\n");
+  const queryId = crypto.randomUUID();
+  return [QUERY_ID_PREFIX + queryId, firstQuery, query].filter(Boolean).join("\n");
 };

package/lib/DboBuilder/{QueryStreamer.ts → runSql/QueryStreamer.ts}

@@ -2,13 +2,14 @@ import * as pg from "pg";
 import type CursorType from "pg-cursor";
 import type { SQLOptions, SocketSQLStreamPacket, SocketSQLStreamServer } from "prostgles-types";
 import { CHANNELS, omitKeys, pickKeys } from "prostgles-types";
-import type { BasicCallback } from "../PubSubManager/PubSubManager";
-import type { VoidFunction } from "../SchemaWatch/SchemaWatch";
-import type { DB } from "../initProstgles";
-import type { DboBuilder } from "./DboBuilder";
-import type { PRGLIOSocket } from "./DboBuilderTypes";
-import { getErrorAsObject, getSerializedClientErrorFromPGError } from "./dboBuilderUtils";
-import { getDetailedFieldInfo } from "./runSql/runSqlUtils";
+import type { BasicCallback } from "../../PubSubManager/PubSubManager";
+import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
+import type { DB } from "../../initProstgles";
+import type { DboBuilder } from "../DboBuilder";
+import type { PRGLIOSocket } from "../DboBuilderTypes";
+import { getErrorAsObject, getSerializedClientErrorFromPGError } from "../dboBuilderUtils";
+import { getDetailedFieldInfo } from "./runSqlUtils";
+import { getConnectionDetails } from "./getAdminClient";
 const Cursor = require("pg-cursor") as typeof CursorType;
 
 type ClientStreamedRequest = {
@@ -44,36 +45,13 @@ export class QueryStreamer {
   db: DB;
   dboBuilder: DboBuilder;
   socketQueries: Map<string, Map<number, StreamedQuery>> = new Map();
-  adminClient: pg.Client;
   constructor(dboBuilder: DboBuilder) {
     this.dboBuilder = dboBuilder;
     this.db = dboBuilder.db;
-    const setAdminClient = () => {
-      this.adminClient = this.getConnection(undefined, { keepAlive: true });
-      return this.adminClient.connect();
-    };
-    this.adminClient = this.getConnection(
-      (error) => {
-        if (error.message?.includes("database") && error.message?.includes("does not exist"))
-          return;
-        console.log("Admin client error. Reconnecting...", error);
-        void setAdminClient();
-      },
-      { keepAlive: true },
-    );
-    void this.adminClient.connect();
-  }
-
-  destroy() {
-    return this.adminClient.end().catch((err) => {
-      console.error("Error ending admin client connection", err);
-    });
   }
 
   getConnection = (onError: ((err: any) => void) | undefined, extraOptions?: pg.ClientConfig) => {
-    const connectionInfo =
-      typeof this.db.$cn === "string" ? { connectionString: this.db.$cn } : (this.db.$cn as any);
-    const client = new pg.Client({ ...connectionInfo, ...extraOptions });
+    const client = new pg.Client({ ...getConnectionDetails(this.db), ...extraOptions });
     client.on("error", (err) => {
       onError?.(err);
     });
@@ -272,7 +250,7 @@ export class QueryStreamer {
       }
       try {
         const stopFunction = opts?.terminate ? "pg_terminate_backend" : "pg_cancel_backend";
-        const rows = await this.adminClient.query(
+        const rows = await this.dboBuilder.prostgles.adminClient!.query(
           `SELECT ${stopFunction}(pid), pid, state, query FROM pg_stat_activity WHERE pid = $1`,
           [processID],
         );

package/lib/DboBuilder/runSql/getAdminClient.ts

@@ -0,0 +1,31 @@
+import * as pg from "pg";
+import type { DB } from "../../initProstgles";
+
+export const getAdminClient = async (db: DB, onDbDropped?: () => void): Promise<pg.Client> => {
+  const adminClient = new pg.Client({
+    ...getConnectionDetails(db),
+    application_name: "prostgles-admin-client",
+    keepAlive: true,
+  });
+  if (onDbDropped) {
+    adminClient.on("error", (err) => {
+      if (
+        err.message.includes("terminating connection due to administrator command") ||
+        (err.message.includes("database") && err.message.includes("does not exist"))
+      ) {
+        onDbDropped();
+      }
+    });
+  }
+  await adminClient.connect();
+  return adminClient;
+};
+
+export const getConnectionDetails = (db: DB) => {
+  const opts = db.$pool.options as pg.ClientConfig;
+  return {
+    ...opts,
+    password: opts.password,
+    keepAlive: true,
+  } satisfies pg.ClientConfig;
+};

package/lib/Logging.ts

@@ -1,4 +1,4 @@
-import type { AnyObject, ClientSchema, TableHandler } from "prostgles-types";
+import type { ABORTABLE_METHODS, AnyObject, ClientSchema, TableHandler } from "prostgles-types";
 import type { LocalParams } from "./DboBuilder/DboBuilder";
 import type { PubSubManagerTriggers, SyncParams } from "./PubSubManager/PubSubManager";
 import type { NotifTypeName } from "./PubSubManager/PubSubManagerUtils";
@@ -14,15 +14,25 @@ export namespace EventTypes {
     error?: any;
   };
 
-  export type Table = ClientInfo &
-    DebugInfo & {
-      type: "table";
-      tableName: string;
-      command: keyof TableHandler | "sync";
-      txInfo: AnyObject | undefined;
-      data: AnyObject;
-      localParams: LocalParams | undefined;
-    };
+  export type Table =
+    | (ClientInfo &
+        DebugInfo & {
+          type: "table";
+          tableName: string;
+          command: keyof TableHandler | "sync";
+          txInfo: AnyObject | undefined;
+          data: AnyObject;
+          localParams: LocalParams | undefined;
+        })
+    | (ClientInfo &
+        DebugInfo & {
+          type: "table";
+          tableName: string;
+          command: "abort";
+          txInfo: AnyObject | undefined;
+          data: AnyObject;
+          localParams: LocalParams | undefined;
+        });
 
   export type Sync = ClientInfo &
     DebugInfo & {