graphile-presigned-url-plugin 1.20.0 → 1.21.1

package/esm/plugin.d.ts

@@ -20,7 +20,17 @@
  */
 import 'graphile-build';
 import type { GraphileConfig } from 'graphile-config';
-import type { PresignedUrlPluginOptions } from './types';
+import { type FileProjection } from './managed-upload';
+import type { BucketConfig, PresignedUrlPluginOptions, S3Config, StorageModuleConfig } from './types';
 export declare function createPresignedUrlPlugin(options: PresignedUrlPluginOptions): GraphileConfig.Plugin;
+export declare function processSingleFile(options: PresignedUrlPluginOptions, txClient: any, storageConfig: StorageModuleConfig, databaseId: string, bucket: BucketConfig, s3ForDb: S3Config, input: any): Promise<{
+    uploadUrl: string | null;
+    fileId: string;
+    key: string;
+    deduplicated: boolean;
+    expiresAt: string | null;
+    previousVersionId: string | null;
+    file: FileProjection;
+}>;
 export declare const PresignedUrlPlugin: typeof createPresignedUrlPlugin;
 export default PresignedUrlPlugin;

package/esm/plugin.js

@@ -458,7 +458,7 @@ export function createPresignedUrlPlugin(options) {
     };
 }
 // --- Shared upload logic ---
-async function processSingleFile(options, txClient, storageConfig, databaseId, bucket, s3ForDb, input) {
+export async function processSingleFile(options, txClient, storageConfig, databaseId, bucket, s3ForDb, input) {
     const { contentHash, contentType, size, filename, key: customKey } = input;
     if (!contentHash || typeof contentHash !== 'string' || contentHash.length > MAX_CONTENT_HASH_LENGTH) {
         throw new Error('INVALID_CONTENT_HASH');
@@ -570,10 +570,24 @@ async function processSingleFile(options, txClient, storageConfig, databaseId, b
                 staleFileId = existing.id;
                 log.info(`Restarting upload of key ${s3Key}: file ${staleFileId} is ${existing.status}, so it carries no bytes`);
             }
-            else {
+            else if (storageConfig.hasVersioning) {
                 previousVersionId = existing.id;
                 log.info(`Versioning: new version of key ${s3Key}, previous=${previousVersionId}`);
             }
+            else if (storageConfig.hasContentHash) {
+                // GC of the deleted row counts references by its content hash, which the
+                // replacement does not share, so it would delete the object at this key
+                // after the new bytes land.
+                throw new Error(`STORAGE_REPLACE_UNSUPPORTED: key ${s3Key} already holds file ${existing.id}; ` +
+                    'a content-addressed module needs versioning to replace a custom key');
+            }
+            else {
+                // Without versioning a key names one row: the new bytes replace the old
+                // row in this transaction, and the PUT overwrites the object at the key.
+                // GC of the old row counts references by key, so the replacement keeps it.
+                staleFileId = existing.id;
+                log.info(`Replacing key ${s3Key}: file ${staleFileId} is superseded (module has no versioning)`);
+            }
         }
     }
     else {
@@ -604,10 +618,16 @@ async function processSingleFile(options, txClient, storageConfig, databaseId, b
         }
     }
     if (staleFileId !== null) {
-        await txClient.query({
-            text: `DELETE FROM ${storageConfig.filesQualifiedName} WHERE id = $1`,
+        // The DELETE runs under the request role, so RLS decides whether this caller
+        // may drop the row. A row the caller can see but not delete stays, and the
+        // upload fails here rather than colliding on (bucket_id, key) below.
+        const deleted = await txClient.query({
+            text: `DELETE FROM ${storageConfig.filesQualifiedName} WHERE id = $1 RETURNING id`,
             values: [staleFileId],
         });
+        if (deleted.rows.length === 0) {
+            throw new Error(`FILE_NOT_REPLACEABLE: file ${staleFileId} at key ${s3Key} cannot be replaced by this caller`);
+        }
     }
     // Auto-derive ltree path from custom key directory (only when has_path_shares)
     const derivedPath = isCustomKey && storageConfig.hasPathShares ? derivePathFromKey(s3Key) : null;

package/esm/storage-module-cache.js

@@ -55,6 +55,7 @@ const ALL_STORAGE_MODULES_QUERY = `
     sm.max_bulk_total_size,
     sm.has_path_shares,
     sm.has_versioning,
+    sm.has_content_hash,
     sm.has_confirm_upload,
     es.schema_name AS entity_schema,
     et.name AS entity_table
@@ -99,6 +100,7 @@ function buildConfig(row) {
         cacheTtlSeconds,
         hasPathShares: row.has_path_shares ?? false,
         hasVersioning: row.has_versioning ?? false,
+        hasContentHash: row.has_content_hash ?? false,
         hasConfirmUpload: row.has_confirm_upload ?? false,
         maxBulkFiles: row.max_bulk_files ?? DEFAULT_MAX_BULK_FILES,
         maxBulkTotalSize: row.max_bulk_total_size ?? DEFAULT_MAX_BULK_TOTAL_SIZE,

package/esm/types.d.ts

@@ -70,6 +70,11 @@ export interface StorageModuleConfig {
     hasConfirmUpload: boolean;
     /** Whether the files table carries the versioning chain. */
     hasVersioning: boolean;
+    /**
+     * Whether the module is content-addressed: GC counts an object's references by
+     * `(bucket_id, content_hash)` rather than by `(bucket_id, key)`.
+     */
+    hasContentHash: boolean;
     /** Max files per requestBulkUploadUrls batch (default: 100) */
     maxBulkFiles: number;
     /** Max total size per bulk upload batch in bytes (default: 1GB) */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-presigned-url-plugin",
-  "version": "1.20.0",
+  "version": "1.21.1",
   "description": "Presigned URL upload plugin for PostGraphile v5 — requestUploadUrl mutation and downloadUrl computed field",
   "author": "Constructive <developers@constructive.io>",
   "homepage": "https://github.com/constructive-io/constructive",
@@ -44,7 +44,7 @@
     "@aws-sdk/s3-request-presigner": "^3.1052.0",
     "@pgpmjs/logger": "^2.26.0",
     "@pgsql/quotes": "^18.2.4",
-    "graphile-plugin-utils": "^1.12.2",
+    "graphile-plugin-utils": "^1.13.0",
     "graphile-storage-registry": "^0.2.0",
     "lru-cache": "^11.2.7",
     "mime-bytes": "^0.33.0"
@@ -63,5 +63,5 @@
     "@types/node": "^22.19.11",
     "makage": "^0.8.0"
   },
-  "gitHead": "baa84094b8541eb5000701b0060aa5b298032dc7"
+  "gitHead": "ee458dba426522b0d06e315f6ef010938ed71e0e"
 }

package/plugin.d.ts

@@ -20,7 +20,17 @@
  */
 import 'graphile-build';
 import type { GraphileConfig } from 'graphile-config';
-import type { PresignedUrlPluginOptions } from './types';
+import { type FileProjection } from './managed-upload';
+import type { BucketConfig, PresignedUrlPluginOptions, S3Config, StorageModuleConfig } from './types';
 export declare function createPresignedUrlPlugin(options: PresignedUrlPluginOptions): GraphileConfig.Plugin;
+export declare function processSingleFile(options: PresignedUrlPluginOptions, txClient: any, storageConfig: StorageModuleConfig, databaseId: string, bucket: BucketConfig, s3ForDb: S3Config, input: any): Promise<{
+    uploadUrl: string | null;
+    fileId: string;
+    key: string;
+    deduplicated: boolean;
+    expiresAt: string | null;
+    previousVersionId: string | null;
+    file: FileProjection;
+}>;
 export declare const PresignedUrlPlugin: typeof createPresignedUrlPlugin;
 export default PresignedUrlPlugin;

package/plugin.js

@@ -22,6 +22,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresignedUrlPlugin = void 0;
 exports.createPresignedUrlPlugin = createPresignedUrlPlugin;
+exports.processSingleFile = processSingleFile;
 require("graphile-build");
 const logger_1 = require("@pgpmjs/logger");
 const grafast_1 = require("grafast");
@@ -574,10 +575,24 @@ async function processSingleFile(options, txClient, storageConfig, databaseId, b
                 staleFileId = existing.id;
                 log.info(`Restarting upload of key ${s3Key}: file ${staleFileId} is ${existing.status}, so it carries no bytes`);
             }
-            else {
+            else if (storageConfig.hasVersioning) {
                 previousVersionId = existing.id;
                 log.info(`Versioning: new version of key ${s3Key}, previous=${previousVersionId}`);
             }
+            else if (storageConfig.hasContentHash) {
+                // GC of the deleted row counts references by its content hash, which the
+                // replacement does not share, so it would delete the object at this key
+                // after the new bytes land.
+                throw new Error(`STORAGE_REPLACE_UNSUPPORTED: key ${s3Key} already holds file ${existing.id}; ` +
+                    'a content-addressed module needs versioning to replace a custom key');
+            }
+            else {
+                // Without versioning a key names one row: the new bytes replace the old
+                // row in this transaction, and the PUT overwrites the object at the key.
+                // GC of the old row counts references by key, so the replacement keeps it.
+                staleFileId = existing.id;
+                log.info(`Replacing key ${s3Key}: file ${staleFileId} is superseded (module has no versioning)`);
+            }
         }
     }
     else {
@@ -608,10 +623,16 @@ async function processSingleFile(options, txClient, storageConfig, databaseId, b
         }
     }
     if (staleFileId !== null) {
-        await txClient.query({
-            text: `DELETE FROM ${storageConfig.filesQualifiedName} WHERE id = $1`,
+        // The DELETE runs under the request role, so RLS decides whether this caller
+        // may drop the row. A row the caller can see but not delete stays, and the
+        // upload fails here rather than colliding on (bucket_id, key) below.
+        const deleted = await txClient.query({
+            text: `DELETE FROM ${storageConfig.filesQualifiedName} WHERE id = $1 RETURNING id`,
             values: [staleFileId],
         });
+        if (deleted.rows.length === 0) {
+            throw new Error(`FILE_NOT_REPLACEABLE: file ${staleFileId} at key ${s3Key} cannot be replaced by this caller`);
+        }
     }
     // Auto-derive ltree path from custom key directory (only when has_path_shares)
     const derivedPath = isCustomKey && storageConfig.hasPathShares ? derivePathFromKey(s3Key) : null;

package/storage-module-cache.js

@@ -64,6 +64,7 @@ const ALL_STORAGE_MODULES_QUERY = `
     sm.max_bulk_total_size,
     sm.has_path_shares,
     sm.has_versioning,
+    sm.has_content_hash,
     sm.has_confirm_upload,
     es.schema_name AS entity_schema,
     et.name AS entity_table
@@ -108,6 +109,7 @@ function buildConfig(row) {
         cacheTtlSeconds,
         hasPathShares: row.has_path_shares ?? false,
         hasVersioning: row.has_versioning ?? false,
+        hasContentHash: row.has_content_hash ?? false,
         hasConfirmUpload: row.has_confirm_upload ?? false,
         maxBulkFiles: row.max_bulk_files ?? DEFAULT_MAX_BULK_FILES,
         maxBulkTotalSize: row.max_bulk_total_size ?? DEFAULT_MAX_BULK_TOTAL_SIZE,

package/types.d.ts

@@ -70,6 +70,11 @@ export interface StorageModuleConfig {
     hasConfirmUpload: boolean;
     /** Whether the files table carries the versioning chain. */
     hasVersioning: boolean;
+    /**
+     * Whether the module is content-addressed: GC counts an object's references by
+     * `(bucket_id, content_hash)` rather than by `(bucket_id, key)`.
+     */
+    hasContentHash: boolean;
     /** Max files per requestBulkUploadUrls batch (default: 100) */
     maxBulkFiles: number;
     /** Max total size per bulk upload batch in bytes (default: 1GB) */