prostgles-server 4.2.647 → 4.2.649

package/lib/PubSubManager/init/getDataWatchFunctionQuery.ts

@@ -13,8 +13,7 @@ export const getDataWatchFunctionQuery = (debugMode: boolean | undefined) => {
         CREATE OR REPLACE FUNCTION ${DB_OBJ_NAMES.data_watch_func}() RETURNS TRIGGER 
         AS $$
  
-            DECLARE c_ids INTEGER[];  
-            DECLARE err_c_ids INTEGER[]; 
+            DECLARE c_ids BIGINT[];
             DECLARE condition_checks_union_query TEXT := '';          
             DECLARE query TEXT := '';            
             DECLARE v_trigger RECORD;

package/lib/PubSubManager/init/getPubSubManagerInitQuery.ts

@@ -195,6 +195,8 @@ BEGIN
         COMMENT ON TABLE prostgles.apps IS 'Keep track of prostgles server apps connected to db to combine common triggers. Heartbeat used due to no logout triggers in postgres';
 
         CREATE TABLE IF NOT EXISTS prostgles.app_triggers (
+          /* Stable notification IDs, capped at JavaScript's maximum safe integer. */
+          table_condition_id BIGINT GENERATED BY DEFAULT AS IDENTITY (MAXVALUE 9007199254740991) UNIQUE,
           app_id          TEXT NOT NULL,
           table_name      TEXT NOT NULL,
           condition       TEXT NOT NULL,
@@ -219,9 +221,8 @@ BEGIN
         CREATE OR REPLACE VIEW prostgles.v_triggers AS
         SELECT *
           , (ROW_NUMBER() OVER( ORDER BY table_name, condition ))::text AS id 
-          , ROW_NUMBER() OVER(PARTITION BY app_id, table_name ORDER BY table_name, condition ) - 1 AS table_condition_id
         FROM prostgles.app_triggers;
-        COMMENT ON VIEW prostgles.v_triggers IS 'Augment trigger table with natural IDs and per app IDs';
+        COMMENT ON VIEW prostgles.v_triggers IS 'Augment trigger table with natural IDs';
 
         ${getDataWatchFunctionQuery(debugMode)}
 

package/lib/PubSubManager/notifListener.ts

@@ -102,11 +102,11 @@ export async function notifListener(this: PubSubManager, data: { payload: string
       conditionIds.includes(table_condition_id),
     );
     const orphanedTableConditions = conditionIds.filter((condId) => {
-      const tc = tableTriggerConditions.at(condId);
+      const tc = tableTriggerConditions.find((trigger) => trigger.table_condition_id === condId);
       return !tc || (tc.subs.length === 0 && tc.syncs.length === 0);
     });
     if (orphanedTableConditions.length) {
-      void this.deleteOrphanedTriggers(new Set(table_name));
+      void this.deleteOrphanedTriggers(new Set([table_name]));
     }
 
     const triggeredSubs = new Set<Subscription>();

package/lib/PubSubManager/refreshTriggers.ts

@@ -1,4 +1,4 @@
-import type { PubSubManager, TableTriggerInfo } from "./PubSubManager";
+import type { PubSubManager, PubSubManagerTriggers, TableTriggerInfo } from "./PubSubManager";
 
 export async function refreshTriggers(this: PubSubManager) {
   const start = Date.now();
@@ -18,14 +18,15 @@ export async function refreshTriggers(this: PubSubManager) {
     [this.dboBuilder.prostgles.appId],
   );
 
-  const oldTriggers = new Map(this._triggers);
+  const oldTriggers = this._triggers;
+  const newTriggers: PubSubManagerTriggers = new Map();
 
   triggers.forEach((t) => {
-    this._triggers.set(
+    newTriggers.set(
       t.table_name,
-      this._triggers.get(t.table_name) ?? new Map<number, TableTriggerInfo>(),
+      newTriggers.get(t.table_name) ?? new Map<number, TableTriggerInfo>(),
     );
-    const tableTriggers = this._triggers.get(t.table_name)!;
+    const tableTriggers = newTriggers.get(t.table_name)!;
     const table_condition_id = Number(t.table_condition_id);
     tableTriggers.set(table_condition_id, {
       condition: t.condition,
@@ -34,6 +35,7 @@ export async function refreshTriggers(this: PubSubManager) {
       table_condition_id,
     });
   });
+  this._triggers = newTriggers;
 
   await this._log({
     type: "syncOrSub",

package/lib/PublishParser/PublishParser.ts

@@ -36,6 +36,9 @@ import {
   type PublishObject,
 } from "./publishTypesAndUtils";
 import { validatePublishProfiles } from "./validatePublishProfiles";
+import { randomUUID } from "node:crypto";
+import { createExecutionContext } from "../ExecutionContext";
+import { getFunctionRelatedRecords } from "./getFunctionRelatedRecords";
 
 export class PublishParser {
   parsedPublish: ReturnType<typeof getParsedPublish>;
@@ -144,7 +147,20 @@ export class PublishParser {
           })();
 
           this.prostgles.checkNotDestroyed();
-          return method.run(args, ctx);
+          const parent = createExecutionContext(this.prostgles.getExecution());
+          const relatedRecords = getFunctionRelatedRecords(method.input, args);
+          return this.prostgles.runWithExecution(
+            {
+              ...parent,
+              user,
+              clientReq,
+              invocations: [
+                ...parent.invocations,
+                { type: "function", id: randomUUID(), functionName: name, relatedRecords },
+              ],
+            },
+            () => method.run(args, ctx),
+          );
         };
         allowedFunctionsMap.set(name, { ...method, run: runWithContext });
       }

package/lib/PublishParser/getFunctionRelatedRecords.ts

@@ -0,0 +1,25 @@
+import type { FunctionInvocation } from "../ExecutionContext";
+import type { ServerFunctionDefinition } from "./defineServerFunction";
+
+/** Capture top-level RowLookup/ValueLookup inputs without querying the database. */
+export const getFunctionRelatedRecords = (
+  input: ServerFunctionDefinition["input"],
+  args: Record<string, unknown> | undefined,
+): FunctionInvocation["relatedRecords"] => {
+  const records: FunctionInvocation["relatedRecords"] = [];
+  for (const [argName, schema] of Object.entries(input ?? {})) {
+    if (typeof schema !== "object" || !("table" in schema)) continue;
+    const isRow = schema.type === "RowLookup" || schema.type === "RowLookup[]";
+    const isValue = schema.type === "ValueLookup" || schema.type === "ValueLookup[]";
+    if (!isRow && !isValue) continue;
+    const value = args?.[argName];
+    if (value === undefined || value === null) continue;
+    const values: unknown[] = schema.type.endsWith("[]") ? (value as unknown[]) : [value];
+    for (const item of values) {
+      const rowPart =
+        "column" in schema ? { [schema.column]: item } : (item as Record<string, unknown>);
+      records.push({ argName, tableName: schema.table, rowPart });
+    }
+  }
+  return records;
+};

package/lib/index.ts

@@ -28,6 +28,7 @@ export const createProstgles = <
 };
 export * from "./PublishParser/defineServerFunction";
 export * from "./Auth/AuthTypes";
+export type { ExecutionContext, FunctionInvocation, TriggerInvocation } from "./ExecutionContext";
 
 export type {
   PublishContextValue,
@@ -42,10 +43,7 @@ export type {
   PublishProfile,
   PublishParams,
 } from "./PublishParser/publishTypesAndUtils";
-export type {
-  ClientDBHandlerRequest,
-  GetClientDBHandlers,
-} from "./WebsocketAPI/getClientHandlers";
+export type { ClientDBHandlerRequest, GetClientDBHandlers } from "./WebsocketAPI/getClientHandlers";
 export type { DBOFullyTyped, DBOFullyTypedClient } from "./DBSchemaBuilder/DBSchemaBuilder";
 export type { DBHandlerServer } from "./Prostgles";
 export type { StorageClient as CloudClient } from "./StorageClient/StorageClientTypes";

package/lib/initProstgles.ts

@@ -1,4 +1,5 @@
 import { syncTableTriggers } from "./TableConfig/syncTableTriggers";
+import type { ExecutionContext } from "./ExecutionContext";
 import { deferDbQueries } from "./deferDbQueries";
 import type pgPromise from "pg-promise";
 import type pg from "pg-promise/typescript/pg-subset";
@@ -18,10 +19,7 @@ import { runSQLFile } from "./TableConfig/runSQLFile";
 import { updateConfiguration, type clientOnlyUpdateKeys } from "./updateConfiguration";
 import { sleep } from "./utils/utils";
 import { getAdminClient } from "./DboBuilder/runSql/getAdminClient";
-import type {
-  ClientDBHandlerRequest,
-  GetClientDBHandlers,
-} from "./WebsocketAPI/getClientHandlers";
+import type { ClientDBHandlerRequest, GetClientDBHandlers } from "./WebsocketAPI/getClientHandlers";
 
 /**
  * Database connection details
@@ -93,6 +91,8 @@ export type OnReadyParams<S, Context = undefined> = OnReadyParamsCommon & {
 export type ContextCleanup = () => MaybePromise<void>;
 export type CreateContextParams<S> = OnReadyParamsCommon & {
   dbo: DBOFullyTyped<S>;
+  /** Read at call time; undefined outside a function, client operation, or table hook. */
+  getExecution: () => ExecutionContext | undefined;
   onCleanup: (cleanup: ContextCleanup) => void;
 };
 export type CreateContext<S, Context> = (params: CreateContextParams<S>) => MaybePromise<Context>;
@@ -324,6 +324,7 @@ export const initProstgles = async function (
         }
         this.restApi?.destroy();
         await this.cleanupContext();
+        this.executionStorage.disable();
         await this.dboBuilder.destroy();
         this.authHandler.destroy();
         await this.tableConfigurator?.destroy();

package/lib/runClientRequest.ts

@@ -12,10 +12,10 @@ import type { LocalParams } from "./DboBuilder/DboBuilder";
 import type { DbTxTableHandlers } from "./DboBuilder/DboBuilderTypes";
 import type { TableHandler as TableHandlerServer } from "./DboBuilder/TableHandler/TableHandler";
 import { canRunSQL } from "./DboBuilder/runSql/runSQL";
+import { createExecutionContext } from "./ExecutionContext";
 import type { Prostgles } from "./Prostgles";
 import type { ParsedTableRule } from "./PublishParser/publishTypesAndUtils";
 import { type PermissionScope } from "./PublishParser/publishTypesAndUtils";
-import { getAbortSignalKeys } from "./DboBuilder/ViewHandler/getDbHandlerWithAbort";
 
 const TABLE_METHODS = {
   find: 1,
@@ -184,13 +184,21 @@ export const runClientRequest = async function (
     undefined | TableMethodFunctionWithRulesAndLocalParams;
 
   this.checkNotDestroyed();
-  return (tableHandler[command] as TableMethodFunctionWithRulesAndLocalParams)(
-    param1,
-    param2,
-    param3,
-    parsedTableRule,
-    localParams,
-  ) as AnyObject | undefined;
+  return this.runWithExecution(
+    {
+      ...createExecutionContext(this.getExecution()),
+      user: clientInfo.user,
+      clientReq,
+    },
+    () =>
+      (tableHandler[command] as TableMethodFunctionWithRulesAndLocalParams)(
+        param1,
+        param2,
+        param3,
+        parsedTableRule,
+        localParams,
+      ) as AnyObject | undefined,
+  );
 };
 
 export const clientCanRunSqlRequest = async function (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.647",
+  "version": "4.2.649",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",