prostgles-server 4.2.613 → 4.2.615

package/lib/StorageClient/setupFileServeHandler.ts

@@ -8,6 +8,7 @@ import type { FileTableConfig } from "../ProstglesTypes";
 import { runClientRequest } from "../runClientRequest";
 import type { StorageClient } from "./StorageClientTypes";
 import type { FileTableRow } from "./getFileTableConfig";
+import { getFileStorageKey } from "./getFileStorageKey";
 
 export const getFileServeRoute = (config: FileTableConfig) => {
   const fileTableName = config.tableName;
@@ -39,6 +40,7 @@ export const setupFileServeHandler = (
       const selectParams = {
         select: {
           id: 1,
+          storage_key: 1,
           signed_url: 1,
           signed_url_expires: 1,
           content_type: 1,
@@ -71,13 +73,14 @@ export const setupFileServeHandler = (
         const HOUR = 3600 * 1000;
         const EXPIRES = Date.now() + HOUR;
         if (!url || expires < EXPIRES) {
-          url = await storageClient.getSignedUrlForDownload(file.id, 60 * 60);
+          url = await storageClient.getSignedUrlForDownload(getFileStorageKey(file), 60 * 60);
 
           await db.any(
-            "UPDATE ${fileTableName:name} SET signed_url = ${signed_url}, signed_url_expires = ${signed_url_expires} WHERE id = ${id}",
+            "UPDATE ${fileTableName:name} SET signed_url = ${signed_url}, signed_url_expires = ${signed_url_expires} WHERE id = ${id} AND storage_key IS NOT DISTINCT FROM ${storage_key}::uuid",
             {
               fileTableName,
               id: file.id,
+              storage_key: file.storage_key,
               signed_url: url,
               signed_url_expires: EXPIRES,
             },
@@ -86,7 +89,7 @@ export const setupFileServeHandler = (
 
         res.redirect(url);
       } else {
-        const localFilePath = join(storageClient.localFolderPath, file.id);
+        const localFilePath = join(storageClient.localFolderPath, getFileStorageKey(file));
         if (!fs.existsSync(localFilePath)) {
           throw new Error("File not found");
         }

package/lib/TableHooks/TableHooks.ts

@@ -7,6 +7,7 @@ import type {
   AfterAllTsTrigger,
   AfterEachTsTrigger,
   BeforeEachTsTrigger,
+  TransactionCallbacks,
 } from "../PublishParser/PublishParser";
 
 export type TableHooks<S = void, Context = undefined> =
@@ -26,9 +27,15 @@ export type TableHooksDefinition<
   Context = undefined,
 > = {
   /**
-   * Runs sequentially before validation and SQL for each insert row, or once per update request.
+   * Runs after input field permissions are checked, before row validation and mutation SQL.
+   * Runs for each insert row, or once per update request with permitted matching rows.
+   * The update filter includes the publish forcedFilter. Matching rows are locked before hooks.
+   * SQL-only requests (including updateBatch) cannot run applicable beforeEach hooks.
    * May replace the pending data and pass `hookContext` to the next hook.
    * `onInserted` also runs for updates, is not awaited, and runs before the transaction commits.
+   * Register `onCommit`/`onRollback` before starting external work so cleanup also runs if the
+   * hook throws. These callbacks are awaited after the outer transaction finishes and receive
+   * the non-transactional `db` and `dbo` objects.
    */
   beforeEach?: BeforeEachTsTrigger<RowDataType, DBX, Context>[];
 
@@ -52,17 +59,20 @@ export type TableHooksDefinition<
   /**
    * Replaces the generated DELETE. Must perform the mutation and shape its return value using
    * the prepared filter and returning arguments. Delete `afterEach`/`afterAll` hooks do not run.
+   * Use `onCommit`/`onRollback` for external side effects after the outer transaction finishes.
    */
-  onInsteadOfDelete?: (args: {
-    context: Context;
-    dbx: DBX;
-    tx: pgPromise.ITask<{}>;
-    returningQuery: string;
-    isOneOrNone: boolean;
-    queryType: "any" | "none";
-    filterOpts: {
-      where: string;
-      filter: AnyObject;
-    };
-  }) => Promise<AnyObject[] | undefined>;
+  onInsteadOfDelete?: (
+    args: {
+      context: Context;
+      dbx: DBX;
+      tx: pgPromise.ITask<{}>;
+      returningQuery: string;
+      isOneOrNone: boolean;
+      queryType: "any" | "none";
+      filterOpts: {
+        where: string;
+        filter: AnyObject;
+      };
+    } & TransactionCallbacks<DBX>,
+  ) => Promise<AnyObject[] | undefined>;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.613",
+  "version": "4.2.615",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,8 +38,8 @@
   ],
   "homepage": "https://prostgles.com",
   "dependencies": {
-    "@aws-sdk/client-sesv2": "^3.1108.0",
-    "@aws-sdk/credential-provider-node": "^3.972.79",
+    "@aws-sdk/client-sesv2": "^3.1128.0",
+    "@aws-sdk/credential-provider-node": "^3.972.82",
     "@types/passport": "^1.0.17",
     "@types/passport-facebook": "^3.0.4",
     "@types/passport-github2": "^1.2.9",
@@ -47,7 +47,7 @@
     "@types/passport-microsoft": "^1.0.3",
     "check-disk-space": "^3.4.0",
     "file-type": "^18.7.0",
-    "nodemailer": "^9.0.5",
+    "nodemailer": "^9.1.1",
     "passport": "^0.7.0",
     "passport-facebook": "^3.0.0",
     "passport-github2": "^0.1.12",
@@ -56,8 +56,8 @@
     "passport-oauth2": "^1.8.0",
     "pg": "^8.23.0",
     "pg-cursor": "^2.22.0",
-    "pg-promise": "^12.7.0",
-    "prostgles-types": "^4.0.280"
+    "pg-promise": "^12.7.1",
+    "prostgles-types": "^4.0.281"
   },
   "devDependencies": {
     "@eslint/js": "^9.22.0",
@@ -65,13 +65,13 @@
     "@types/json-schema": "^7.0.15",
     "@types/node": "^22.20.1",
     "@types/nodemailer": "^8.0.1",
-    "@types/pg": "^8.21.0",
+    "@types/pg": "^8.23.1",
     "@types/pg-cursor": "^2.7.2",
     "@types/sharp": "^0.30.5",
     "eslint": "^9.39.5",
     "prettier": "^3.9.6",
     "socket.io": "^4.8.3",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.67.0"
+    "typescript-eslint": "^8.70.0"
   }
 }