@restura/core 1.0.3 → 1.0.5

package/dist/index.d.ts

@@ -934,8 +934,10 @@ declare abstract class PsqlConnection {
     readonly instanceId: UUID;
     protected constructor(instanceId?: UUID);
     protected abstract query<R extends QueryResultRow = QueryResultRow, T extends Array<unknown> = unknown[]>(query: string, values?: QueryConfigValues<T>): Promise<QueryResult<R>>;
-    queryOne<T>(query: string, options: any[], requesterDetails: RequesterDetails): Promise<T>;
-    runQuery<T>(query: string, options: any[], requesterDetails: RequesterDetails): Promise<T[]>;
+    queryOne<T>(query: string, options: unknown[], requesterDetails: RequesterDetails): Promise<T>;
+    queryOneSchema<T>(query: string, params: unknown[], requesterDetails: RequesterDetails, zodSchema: z.ZodSchema<T>): Promise<T>;
+    runQuery<T>(query: string, options: unknown[], requesterDetails: RequesterDetails): Promise<T[]>;
+    runQuerySchema<T>(query: string, params: unknown[], requesterDetails: RequesterDetails, zodSchema: z.ZodSchema<T>): Promise<T[]>;
     private logQueryDuration;
     private logSqlStatement;
 }
@@ -1059,9 +1061,13 @@ declare class PsqlEngine extends SqlEngine {
     setupTriggerListeners: Promise<void> | undefined;
     private triggerClient;
     private scratchDbName;
+    private reconnectAttempts;
+    private readonly MAX_RECONNECT_ATTEMPTS;
+    private readonly INITIAL_RECONNECT_DELAY;
     constructor(psqlConnectionPool: PsqlPool, shouldListenForDbTriggers?: boolean, scratchDatabaseSuffix?: string);
     close(): Promise<void>;
     private setupPgReturnTypes;
+    private reconnectTriggerClient;
     private listenForDbTriggers;
     private handleTrigger;
     createDatabaseFromSchema(schema: ResturaSchema, connection: PsqlPool): Promise<string>;
@@ -1140,4 +1146,4 @@ declare function isValueNumber(value: unknown): value is number;
  */
 declare function SQL(strings: TemplateStringsArray, ...values: unknown[]): string;
 
-export { type ActionColumnChangeData, type ActionColumnChangeFilter, type ActionRowDeleteData, type ActionRowDeleteFilter, type ActionRowInsertData, type ActionRowInsertFilter, type ApiMethod, type AsyncExpressApplication, type AuthenticateHandler, type AuthenticatedRequesterDetails, type ConjunctionTypes, type DatabaseActionData, type DynamicObject, type ErrorCode, type EventType, HtmlStatusCodes, type LoggerConfigSchema, type MatchTypes, type MutationType, type OnValidAuthenticationCallback, type PageQuery, PsqlConnection, PsqlEngine, PsqlPool, PsqlTransaction, type QueryMetadata, type RequesterDetails, type ResturaConfigSchema, RsError, type RsErrorData, type RsErrorInternalData, type RsHeaders, type RsPagedResponseData, type RsRequest, type RsResponse, type RsResponseData, type RsRouteHandler, SQL, type SchemaChangeValue, type SchemaPreview, type SqlMutationData, type StandardOrderTypes, type TriggerResult, apiGenerator, escapeColumnName, eventManager, filterPsqlParser, insertObjectQuery, isSchemaValid, isValueNumber, logger, modelGenerator, questionMarksToOrderedParams, restura, resturaGlobalTypesGenerator, updateObjectQuery };
+export { type ActionColumnChangeData, type ActionColumnChangeFilter, type ActionRowDeleteData, type ActionRowDeleteFilter, type ActionRowInsertData, type ActionRowInsertFilter, type ApiMethod, type AsyncExpressApplication, type AuthenticateHandler, type AuthenticatedRequesterDetails, type ConjunctionTypes, type DatabaseActionData, type DynamicObject, type ErrorCode, type EventType, HtmlStatusCodes, type LoggerConfigSchema, type MatchTypes, type MutationType, type OnValidAuthenticationCallback, type PageQuery, PsqlConnection, PsqlEngine, PsqlPool, PsqlTransaction, type QueryMetadata, type RequesterDetails, type ResturaConfigSchema, type ResturaSchema, RsError, type RsErrorData, type RsErrorInternalData, type RsHeaders, type RsPagedResponseData, type RsRequest, type RsResponse, type RsResponseData, type RsRouteHandler, SQL, type SchemaChangeValue, type SchemaPreview, type SqlMutationData, type StandardOrderTypes, type TriggerResult, apiGenerator, escapeColumnName, eventManager, filterPsqlParser, insertObjectQuery, isSchemaValid, isValueNumber, logger, modelGenerator, questionMarksToOrderedParams, restura, resturaGlobalTypesGenerator, resturaSchema, updateObjectQuery };

package/dist/index.js

@@ -1617,6 +1617,7 @@ import pg from "pg";
 import crypto from "crypto";
 import format3 from "pg-format";
 import { format as sqlFormat } from "sql-formatter";
+import { z as z6 } from "zod/v4";
 
 // src/restura/sql/PsqlUtils.ts
 import format2 from "pg-format";
@@ -1691,7 +1692,6 @@ var PsqlConnection = class {
   constructor(instanceId) {
     this.instanceId = instanceId || crypto.randomUUID();
   }
-  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
   async queryOne(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     const meta = { connectionInstanceId: this.instanceId, ...requesterDetails };
@@ -1713,7 +1713,21 @@ var PsqlConnection = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
-  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  async queryOneSchema(query, params, requesterDetails, zodSchema) {
+    const result = await this.queryOne(query, params, requesterDetails);
+    try {
+      return zodSchema.parse(result);
+    } catch (error) {
+      if (error instanceof z6.ZodError) {
+        logger.error("Invalid data returned from database:");
+        logger.silly("\n" + JSON.stringify(result, null, 2));
+        logger.error("\n" + z6.prettifyError(error));
+      } else {
+        logger.error(error);
+      }
+      throw new RsError("DATABASE_ERROR", `Invalid data returned from database`);
+    }
+  }
   async runQuery(query, options, requesterDetails) {
     const formattedQuery = questionMarksToOrderedParams(query);
     const meta = { connectionInstanceId: this.instanceId, ...requesterDetails };
@@ -1732,6 +1746,21 @@ var PsqlConnection = class {
       throw new RsError("DATABASE_ERROR", `${error.message}`);
     }
   }
+  async runQuerySchema(query, params, requesterDetails, zodSchema) {
+    const result = await this.runQuery(query, params, requesterDetails);
+    try {
+      return z6.array(zodSchema).parse(result);
+    } catch (error) {
+      if (error instanceof z6.ZodError) {
+        logger.error("Invalid data returned from database:");
+        logger.silly("\n" + JSON.stringify(result, null, 2));
+        logger.error("\n" + z6.prettifyError(error));
+      } else {
+        logger.error(error);
+      }
+      throw new RsError("DATABASE_ERROR", `Invalid data returned from database`);
+    }
+  }
   logQueryDuration(startTime) {
     if (logger.level === "silly") {
       const [seconds, nanoseconds] = process.hrtime(startTime);
@@ -2045,6 +2074,7 @@ var systemUser = {
   isSystemUser: true
 };
 var PsqlEngine = class extends SqlEngine {
+  // 5 seconds
   constructor(psqlConnectionPool, shouldListenForDbTriggers = false, scratchDatabaseSuffix = "") {
     super();
     this.psqlConnectionPool = psqlConnectionPool;
@@ -2057,6 +2087,9 @@ var PsqlEngine = class extends SqlEngine {
   setupTriggerListeners;
   triggerClient;
   scratchDbName = "";
+  reconnectAttempts = 0;
+  MAX_RECONNECT_ATTEMPTS = 5;
+  INITIAL_RECONNECT_DELAY = 5e3;
   async close() {
     if (this.triggerClient) {
       await this.triggerClient.end();
@@ -2072,6 +2105,34 @@ var PsqlEngine = class extends SqlEngine {
       return val === null ? null : Number(val);
     });
   }
+  async reconnectTriggerClient() {
+    if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
+      logger.error("Max reconnection attempts reached for trigger client. Stopping reconnection attempts.");
+      return;
+    }
+    if (this.triggerClient) {
+      try {
+        await this.triggerClient.end();
+      } catch (error) {
+        logger.error(`Error closing trigger client: ${error}`);
+      }
+    }
+    const delay = this.INITIAL_RECONNECT_DELAY * Math.pow(2, this.reconnectAttempts);
+    logger.info(
+      `Attempting to reconnect trigger client in ${delay / 1e3} seconds... (Attempt ${this.reconnectAttempts + 1}/${this.MAX_RECONNECT_ATTEMPTS})`
+    );
+    await new Promise((resolve2) => setTimeout(resolve2, delay));
+    this.reconnectAttempts++;
+    try {
+      await this.listenForDbTriggers();
+      this.reconnectAttempts = 0;
+    } catch (error) {
+      logger.error(`Reconnection attempt ${this.reconnectAttempts} failed: ${error}`);
+      if (this.reconnectAttempts < this.MAX_RECONNECT_ATTEMPTS) {
+        await this.reconnectTriggerClient();
+      }
+    }
+  }
   async listenForDbTriggers() {
     this.triggerClient = new Client({
       user: this.psqlConnectionPool.poolConfig.user,
@@ -2081,18 +2142,28 @@ var PsqlEngine = class extends SqlEngine {
       port: this.psqlConnectionPool.poolConfig.port,
       connectionTimeoutMillis: this.psqlConnectionPool.poolConfig.connectionTimeoutMillis
     });
-    await this.triggerClient.connect();
-    const promises = [];
-    promises.push(this.triggerClient.query("LISTEN insert"));
-    promises.push(this.triggerClient.query("LISTEN update"));
-    promises.push(this.triggerClient.query("LISTEN delete"));
-    await Promise.all(promises);
-    this.triggerClient.on("notification", async (msg) => {
-      if (msg.channel === "insert" || msg.channel === "update" || msg.channel === "delete") {
-        const payload = ObjectUtils4.safeParse(msg.payload);
-        await this.handleTrigger(payload, msg.channel.toUpperCase());
-      }
-    });
+    try {
+      await this.triggerClient.connect();
+      const promises = [];
+      promises.push(this.triggerClient.query("LISTEN insert"));
+      promises.push(this.triggerClient.query("LISTEN update"));
+      promises.push(this.triggerClient.query("LISTEN delete"));
+      await Promise.all(promises);
+      this.triggerClient.on("error", async (error) => {
+        logger.error(`Trigger client error: ${error}`);
+        await this.reconnectTriggerClient();
+      });
+      this.triggerClient.on("notification", async (msg) => {
+        if (msg.channel === "insert" || msg.channel === "update" || msg.channel === "delete") {
+          const payload = ObjectUtils4.safeParse(msg.payload);
+          await this.handleTrigger(payload, msg.channel.toUpperCase());
+        }
+      });
+      logger.info("Successfully connected to database triggers");
+    } catch (error) {
+      logger.error(`Failed to setup trigger listeners: ${error}`);
+      await this.reconnectTriggerClient();
+    }
   }
   async handleTrigger(payload, mutationType) {
     if (payload.queryMetadata && payload.queryMetadata.connectionInstanceId === this.psqlConnectionPool.instanceId) {
@@ -3232,6 +3303,7 @@ export {
   questionMarksToOrderedParams,
   restura,
   resturaGlobalTypesGenerator,
+  resturaSchema,
   updateObjectQuery
 };
 //# sourceMappingURL=index.js.map