@restura/core 0.1.0-alpha.22 → 0.1.0-alpha.24

package/dist/index.mjs

@@ -711,9 +711,7 @@ function addApiResponseFunctions(req, res, next) {
 function authenticateUser(applicationAuthenticateHandler) {
   return (req, res, next) => {
     applicationAuthenticateHandler(req, res, (userDetails) => {
-      req.requesterDetails.host = req.hostname;
-      req.requesterDetails.ipAddress = req.ip || "";
-      req.requesterDetails = __spreadValues(__spreadValues({}, req.requesterDetails), userDetails);
+      req.requesterDetails = __spreadValues({ host: req.hostname, ipAddress: req.ip || "" }, userDetails);
       next();
     });
   };
@@ -1229,6 +1227,133 @@ import getDiff from "@wmfs/pg-diff-sync";
 import pgInfo from "@wmfs/pg-info";
 import pg2 from "pg";
 
+// src/restura/eventManager.ts
+import Bluebird2 from "bluebird";
+var EventManager = class {
+  constructor() {
+    this.actionHandlers = {
+      DATABASE_ROW_DELETE: [],
+      DATABASE_ROW_INSERT: [],
+      DATABASE_COLUMN_UPDATE: []
+    };
+  }
+  addRowInsertHandler(onInsert, filter) {
+    this.actionHandlers.DATABASE_ROW_INSERT.push({
+      callback: onInsert,
+      filter
+    });
+  }
+  addColumnChangeHandler(onUpdate, filter) {
+    this.actionHandlers.DATABASE_COLUMN_UPDATE.push({
+      callback: onUpdate,
+      filter
+    });
+  }
+  addRowDeleteHandler(onDelete, filter) {
+    this.actionHandlers.DATABASE_ROW_DELETE.push({
+      callback: onDelete,
+      filter
+    });
+  }
+  async fireActionFromDbTrigger(sqlMutationData, result) {
+    if (sqlMutationData.mutationType === "INSERT") {
+      await this.fireInsertActions(sqlMutationData, result);
+    } else if (sqlMutationData.mutationType === "UPDATE") {
+      await this.fireUpdateActions(sqlMutationData, result);
+    } else if (sqlMutationData.mutationType === "DELETE") {
+      await this.fireDeleteActions(sqlMutationData, result);
+    }
+  }
+  async fireInsertActions(data, triggerResult) {
+    await Bluebird2.map(
+      this.actionHandlers.DATABASE_ROW_INSERT,
+      ({ callback, filter }) => {
+        if (!this.hasHandlersForEventType("DATABASE_ROW_INSERT", filter, triggerResult)) return;
+        const insertData = {
+          tableName: triggerResult.table,
+          insertId: triggerResult.record.id,
+          insertObject: triggerResult.record,
+          queryMetadata: data.queryMetadata
+        };
+        callback(insertData, data.queryMetadata);
+      },
+      { concurrency: 10 }
+    );
+  }
+  async fireDeleteActions(data, triggerResult) {
+    await Bluebird2.map(
+      this.actionHandlers.DATABASE_ROW_DELETE,
+      ({ callback, filter }) => {
+        if (!this.hasHandlersForEventType("DATABASE_ROW_DELETE", filter, triggerResult)) return;
+        const deleteData = {
+          tableName: triggerResult.table,
+          deletedRow: triggerResult.previousRecord,
+          queryMetadata: data.queryMetadata
+        };
+        callback(deleteData, data.queryMetadata);
+      },
+      { concurrency: 10 }
+    );
+  }
+  async fireUpdateActions(data, triggerResult) {
+    await Bluebird2.map(
+      this.actionHandlers.DATABASE_COLUMN_UPDATE,
+      ({ callback, filter }) => {
+        if (!this.hasHandlersForEventType("DATABASE_COLUMN_UPDATE", filter, triggerResult)) return;
+        const columnChangeData = {
+          tableName: triggerResult.table,
+          rowId: triggerResult.record.id,
+          newData: triggerResult.record,
+          oldData: triggerResult.previousRecord,
+          queryMetadata: data.queryMetadata
+        };
+        callback(columnChangeData, data.queryMetadata);
+      },
+      { concurrency: 10 }
+    );
+  }
+  hasHandlersForEventType(eventType, filter, triggerResult) {
+    if (filter) {
+      switch (eventType) {
+        case "DATABASE_ROW_INSERT":
+        case "DATABASE_ROW_DELETE":
+          if (filter.tableName && filter.tableName !== triggerResult.table) return false;
+          break;
+        case "DATABASE_COLUMN_UPDATE":
+          const filterColumnChange = filter;
+          if (filterColumnChange.tableName !== filter.tableName) return false;
+          if (!filterColumnChange.columns.some((item) => {
+            const updatedColumns = Object.keys(
+              changedValues(triggerResult.record, triggerResult.previousRecord)
+            );
+            return updatedColumns.includes(item);
+          }))
+            return false;
+          break;
+      }
+    }
+    return true;
+  }
+};
+var eventManager = new EventManager();
+var eventManager_default = eventManager;
+function changedValues(record, previousRecord) {
+  const changed = {};
+  for (const i in previousRecord) {
+    if (previousRecord[i] !== record[i]) {
+      if (typeof previousRecord[i] === "object" && typeof record[i] === "object") {
+        const nestedChanged = changedValues(record[i], previousRecord[i]);
+        if (Object.keys(nestedChanged).length > 0) {
+          changed[i] = record[i];
+        }
+      } else {
+        changed[i] = record[i];
+      }
+    }
+  }
+  return changed;
+}
+
 // src/restura/sql/PsqlPool.ts
 import pg from "pg";
 
@@ -1573,133 +1698,6 @@ var filterPsqlParser = peg.generate(filterSqlGrammar, {
 });
 var filterPsqlParser_default = filterPsqlParser;
 
-// src/restura/eventManager.ts
-import Bluebird2 from "bluebird";
-var EventManager = class {
-  constructor() {
-    this.actionHandlers = {
-      DATABASE_ROW_DELETE: [],
-      DATABASE_ROW_INSERT: [],
-      DATABASE_COLUMN_UPDATE: []
-    };
-  }
-  addRowInsertHandler(onInsert, filter) {
-    this.actionHandlers.DATABASE_ROW_INSERT.push({
-      callback: onInsert,
-      filter
-    });
-  }
-  addColumnChangeHandler(onUpdate, filter) {
-    this.actionHandlers.DATABASE_COLUMN_UPDATE.push({
-      callback: onUpdate,
-      filter
-    });
-  }
-  addRowDeleteHandler(onDelete, filter) {
-    this.actionHandlers.DATABASE_ROW_DELETE.push({
-      callback: onDelete,
-      filter
-    });
-  }
-  async fireActionFromDbTrigger(sqlMutationData, result) {
-    if (sqlMutationData.mutationType === "INSERT") {
-      await this.fireInsertActions(sqlMutationData, result);
-    } else if (sqlMutationData.mutationType === "UPDATE") {
-      await this.fireUpdateActions(sqlMutationData, result);
-    } else if (sqlMutationData.mutationType === "DELETE") {
-      await this.fireDeleteActions(sqlMutationData, result);
-    }
-  }
-  async fireInsertActions(data, triggerResult) {
-    await Bluebird2.map(
-      this.actionHandlers.DATABASE_ROW_INSERT,
-      ({ callback, filter }) => {
-        if (!this.hasHandlersForEventType("DATABASE_ROW_INSERT", filter, triggerResult)) return;
-        const insertData = {
-          tableName: triggerResult.table,
-          insertId: triggerResult.record.id,
-          insertObject: triggerResult.record,
-          queryMetadata: data.queryMetadata
-        };
-        callback(insertData, data.queryMetadata);
-      },
-      { concurrency: 10 }
-    );
-  }
-  async fireDeleteActions(data, triggerResult) {
-    await Bluebird2.map(
-      this.actionHandlers.DATABASE_ROW_DELETE,
-      ({ callback, filter }) => {
-        if (!this.hasHandlersForEventType("DATABASE_ROW_DELETE", filter, triggerResult)) return;
-        const deleteData = {
-          tableName: triggerResult.table,
-          deletedRow: triggerResult.previousRecord,
-          queryMetadata: data.queryMetadata
-        };
-        callback(deleteData, data.queryMetadata);
-      },
-      { concurrency: 10 }
-    );
-  }
-  async fireUpdateActions(data, triggerResult) {
-    await Bluebird2.map(
-      this.actionHandlers.DATABASE_COLUMN_UPDATE,
-      ({ callback, filter }) => {
-        if (!this.hasHandlersForEventType("DATABASE_COLUMN_UPDATE", filter, triggerResult)) return;
-        const columnChangeData = {
-          tableName: triggerResult.table,
-          rowId: triggerResult.record.id,
-          newData: triggerResult.record,
-          oldData: triggerResult.previousRecord,
-          queryMetadata: data.queryMetadata
-        };
-        callback(columnChangeData, data.queryMetadata);
-      },
-      { concurrency: 10 }
-    );
-  }
-  hasHandlersForEventType(eventType, filter, triggerResult) {
-    if (filter) {
-      switch (eventType) {
-        case "DATABASE_ROW_INSERT":
-        case "DATABASE_ROW_DELETE":
-          if (filter.tableName && filter.tableName !== triggerResult.table) return false;
-          break;
-        case "DATABASE_COLUMN_UPDATE":
-          const filterColumnChange = filter;
-          if (filterColumnChange.tableName !== filter.tableName) return false;
-          if (!filterColumnChange.columns.some((item) => {
-            const updatedColumns = Object.keys(
-              changedValues(triggerResult.record, triggerResult.previousRecord)
-            );
-            return updatedColumns.includes(item);
-          }))
-            return false;
-          break;
-      }
-    }
-    return true;
-  }
-};
-var eventManager = new EventManager();
-var eventManager_default = eventManager;
-function changedValues(record, previousRecord) {
-  const changed = {};
-  for (const i in previousRecord) {
-    if (previousRecord[i] !== record[i]) {
-      if (typeof previousRecord[i] === "object" && typeof record[i] === "object") {
-        const nestedChanged = changedValues(record[i], previousRecord[i]);
-        if (Object.keys(nestedChanged).length > 0) {
-          changed[i] = record[i];
-        }
-      } else {
-        changed[i] = record[i];
-      }
-    }
-  }
-  return changed;
-}
-
 // src/restura/sql/PsqlEngine.ts
 var { Client } = pg2;
 var systemUser = {
@@ -1728,7 +1726,7 @@ var PsqlEngine = class extends SqlEngine {
       database: this.psqlConnectionPool.poolConfig.database,
       password: this.psqlConnectionPool.poolConfig.password,
       port: this.psqlConnectionPool.poolConfig.port,
-      connectionTimeoutMillis: 2e3
+      connectionTimeoutMillis: this.psqlConnectionPool.poolConfig.connectionTimeoutMillis
     });
     await this.triggerClient.connect();
     const promises = [];