graphile-settings 6.19.0 → 6.20.1

package/esm/presets/constructive-preset.js

@@ -13,7 +13,7 @@ import { createMatchesOperatorFactory, createTrgmOperatorFactories, UnifiedSearc
 import { UploadPreset } from 'graphile-upload-plugin';
 import { getBucketProvisionerConnection } from '../bucket-provisioner-resolver';
 import { ConflictDetectorPreset, EnableAllFilterColumnsPreset, InflectorLoggerPreset, InflektPreset, ManyToManyOptInPreset, MetaSchemaPreset, MinimalPreset, NoUniqueLookupPreset, PgTypeMappingsPreset, RequiredInputPreset } from '../plugins';
-import { createBucketNameResolver, createEnsureBucketProvisioned, createProvisionerBucketNameResolver, getAllowedOrigins, getPresignedUrlS3Config } from '../presigned-url-resolver';
+import { createBucketNameResolver, createEnsureBucketProvisioned, getAllowedOrigins, getPresignedUrlS3Config } from '../presigned-url-resolver';
 import { constructiveUploadFieldDefinitions } from '../upload-resolver';
 /**
  * grafast / @dataplan/pg require Node >= 22 (they call Promise.withResolvers()
@@ -145,16 +145,7 @@ export function createConstructivePreset(options) {
         }), BucketProvisionerPreset({
             connection: getBucketProvisionerConnection,
             allowedOrigins: getAllowedOrigins(),
-            // Same tenant-aware naming policy as the presigned (lazy) path, so the
-            // eager provisionBucket mutation mints the identical physical name
-            // (`{prefix}-{bucketKey}-{databaseId}`) instead of falling back to the
-            // bare logical bucket key.
-            resolveBucketName: createProvisionerBucketNameResolver(),
-            // S3 buckets are provisioned lazily (on first upload) or explicitly via
-            // the provisionBucket mutation. Disable the auto-provision-on-create
-            // hook so a createBucket GraphQL mutation records the row without
-            // eagerly minting an S3 bucket that may never receive an upload.
-            autoProvision: false
+            resolveBucketName: createBucketNameResolver()
         }));
     }
     if (opts.enableAggregates) {

package/esm/presigned-url-resolver.d.ts

@@ -10,7 +10,6 @@
  *
  * Follows the same lazy-init pattern as upload-resolver.ts.
  */
-import type { BucketNameResolver as ProvisionerBucketNameResolver } from 'graphile-bucket-provisioner-plugin';
 import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'graphile-presigned-url-plugin';
 /**
  * Lazily initialize and return the S3Config for the presigned URL plugin.
@@ -36,16 +35,6 @@ export declare function getPresignedUrlS3Config(): S3Config;
  * S3 buckets per logical bucket key.
  */
 export declare function createBucketNameResolver(): BucketNameResolver;
-/**
- * Create the bucket name resolver for the bucket provisioner plugin
- * (argument order: `(bucketKey, databaseId)`).
- *
- * Produces the exact same physical name as createBucketNameResolver()
- * (`{prefix}-{bucketKey}-{digest}`) so the eager `provisionBucket`
- * mutation mints the identical tenant-aware name that the lazy first-upload
- * path would. Throws on a missing prefix — no default bucket name.
- */
-export declare function createProvisionerBucketNameResolver(): ProvisionerBucketNameResolver;
 /**
  * Resolve CORS allowed origins from the env/config system.
  *

package/esm/presigned-url-resolver.js

@@ -10,11 +10,10 @@
  *
  * Follows the same lazy-init pattern as upload-resolver.ts.
  */
-import { BucketProvisioner } from '@constructive-io/bucket-provisioner';
+import { BucketProvisioner, mintPhysicalBucketName } from '@constructive-io/bucket-provisioner';
 import { getEnvOptions } from '@constructive-io/graphql-env';
 import { createS3Client } from '@constructive-io/s3-utils';
 import { Logger } from '@pgpmjs/logger';
-import { createHash } from 'crypto';
 import { getBucketProvisionerConnection } from './bucket-provisioner-resolver';
 const log = new Logger('presigned-url-resolver');
 let s3Config = null;
@@ -80,59 +79,6 @@ function getBucketNamePrefix() {
     }
     return prefix;
 }
-/** S3's hard ceiling on a bucket name. */
-const MAX_BUCKET_NAME_LENGTH = 63;
-/** S3's floor, which a degenerate prefix/key could otherwise fall under. */
-const MIN_BUCKET_NAME_LENGTH = 3;
-/** Hex characters of the identity digest kept as the uniqueness tail. */
-const IDENTITY_DIGEST_LENGTH = 12;
-/** Readable budget: how much of the name the prefix and key may each occupy. */
-const PREFIX_BUDGET = 20;
-const BUCKET_KEY_BUDGET = 63 - IDENTITY_DIGEST_LENGTH - PREFIX_BUDGET - 3;
-/**
- * Reduce a component to the S3 bucket-name alphabet: lowercase, `[a-z0-9-]`,
- * with runs of separators collapsed and no leading or trailing hyphen.
- *
- * Dots are legal in a bucket name but deliberately dropped — a dotted name
- * cannot be used with virtual-hosted-style HTTPS, because the wildcard
- * certificate does not match a further label.
- */
-function sanitizeBucketNameComponent(value) {
-    return value
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-+|-+$/g, '');
-}
-/**
- * The single physical-bucket naming policy:
- * `{prefix}-{bucketKey}-{digest}` (e.g. `myapp-public-3f9c1a2b7e04`).
- *
- * Both the presigned-upload (lazy) path and the bucket-provisioner (eager) path
- * derive names from this one function, so a bucket's physical name is identical
- * regardless of which path mints it.
- *
- * The name is bounded and S3-legal by construction: the prefix and key are
- * sanitized to `[a-z0-9-]` and truncated to a readable budget, and the tail is a
- * digest of the *untruncated* identity — so two buckets whose keys agree only
- * past the truncation point, or the same key in two databases, still get distinct
- * names. Names remain stable for a given (prefix, databaseId, bucketKey) because
- * nothing here reads the clock or a counter; and an already-provisioned bucket
- * never consults this function at all, since `platform_buckets.physical_name` is
- * authoritative once recorded.
- */
-function mintPhysicalBucketName(prefix, databaseId, bucketKey) {
-    const identity = `${prefix}/${databaseId}/${bucketKey}`;
-    const digest = createHash('sha256').update(identity).digest('hex').slice(0, IDENTITY_DIGEST_LENGTH);
-    const safePrefix = sanitizeBucketNameComponent(prefix).slice(0, PREFIX_BUDGET).replace(/-+$/, '');
-    const safeKey = sanitizeBucketNameComponent(bucketKey).slice(0, BUCKET_KEY_BUDGET).replace(/-+$/, '');
-    const name = [safePrefix, safeKey, digest].filter((part) => part.length > 0).join('-');
-    // The digest alone already satisfies both bounds, so this is only reachable
-    // when both readable components sanitize away to nothing.
-    if (name.length < MIN_BUCKET_NAME_LENGTH || name.length > MAX_BUCKET_NAME_LENGTH) {
-        throw new Error(`[presigned-url-resolver] Cannot mint a legal S3 bucket name for key "${bucketKey}": got "${name}"`);
-    }
-    return name;
-}
 /**
  * Create a per-(database, bucketKey) bucket name resolver for the presigned
  * URL plugin (argument order: `(databaseId, bucketKey)`).
@@ -147,19 +93,6 @@ export function createBucketNameResolver() {
     const prefix = getBucketNamePrefix();
     return (databaseId, bucketKey) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
 }
-/**
- * Create the bucket name resolver for the bucket provisioner plugin
- * (argument order: `(bucketKey, databaseId)`).
- *
- * Produces the exact same physical name as createBucketNameResolver()
- * (`{prefix}-{bucketKey}-{digest}`) so the eager `provisionBucket`
- * mutation mints the identical tenant-aware name that the lazy first-upload
- * path would. Throws on a missing prefix — no default bucket name.
- */
-export function createProvisionerBucketNameResolver() {
-    const prefix = getBucketNamePrefix();
-    return (bucketKey, databaseId) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
-}
 /**
  * Resolve CORS allowed origins from the env/config system.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-settings",
-  "version": "6.19.0",
+  "version": "6.20.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "graphile settings",
   "main": "index.js",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1052.0",
-    "@constructive-io/bucket-provisioner": "^0.25.0",
+    "@constructive-io/bucket-provisioner": "^0.25.1",
     "@constructive-io/graphql-env": "^3.31.0",
     "@constructive-io/graphql-types": "^3.30.0",
     "@constructive-io/s3-streamer": "^2.42.0",
@@ -46,7 +46,7 @@
     "express": "^5.2.1",
     "grafast": "1.1.2",
     "grafserv": "1.0.1",
-    "graphile-bucket-provisioner-plugin": "1.14.0",
+    "graphile-bucket-provisioner-plugin": "1.14.1",
     "graphile-build": "5.1.1",
     "graphile-build-pg": "5.1.3",
     "graphile-bulk-mutations": "^1.14.0",
@@ -56,10 +56,10 @@
     "graphile-i18n": "^2.14.0",
     "graphile-llm": "^1.15.0",
     "graphile-ltree": "^2.14.0",
-    "graphile-meta": "^1.9.0",
+    "graphile-meta": "^1.9.1",
     "graphile-pg-aggregates": "^2.14.0",
     "graphile-postgis": "^3.15.0",
-    "graphile-presigned-url-plugin": "^1.15.1",
+    "graphile-presigned-url-plugin": "^1.16.1",
     "graphile-realtime-subscriptions": "^1.11.0",
     "graphile-search": "^2.14.0",
     "graphile-upload-plugin": "^2.26.0",
@@ -92,5 +92,5 @@
     "constructive",
     "graphql"
   ],
-  "gitHead": "7407d2cdbaed4ec0f7c9bcdd9f4290c4ea81aa52"
+  "gitHead": "7e6cc68f5659d12ec852835a7d8fcca6b05a8f50"
 }

package/presets/constructive-preset.js

@@ -149,16 +149,7 @@ function createConstructivePreset(options) {
         }), (0, graphile_bucket_provisioner_plugin_1.BucketProvisionerPreset)({
             connection: bucket_provisioner_resolver_1.getBucketProvisionerConnection,
             allowedOrigins: (0, presigned_url_resolver_1.getAllowedOrigins)(),
-            // Same tenant-aware naming policy as the presigned (lazy) path, so the
-            // eager provisionBucket mutation mints the identical physical name
-            // (`{prefix}-{bucketKey}-{databaseId}`) instead of falling back to the
-            // bare logical bucket key.
-            resolveBucketName: (0, presigned_url_resolver_1.createProvisionerBucketNameResolver)(),
-            // S3 buckets are provisioned lazily (on first upload) or explicitly via
-            // the provisionBucket mutation. Disable the auto-provision-on-create
-            // hook so a createBucket GraphQL mutation records the row without
-            // eagerly minting an S3 bucket that may never receive an upload.
-            autoProvision: false
+            resolveBucketName: (0, presigned_url_resolver_1.createBucketNameResolver)()
         }));
     }
     if (opts.enableAggregates) {

package/presigned-url-resolver.d.ts

@@ -10,7 +10,6 @@
  *
  * Follows the same lazy-init pattern as upload-resolver.ts.
  */
-import type { BucketNameResolver as ProvisionerBucketNameResolver } from 'graphile-bucket-provisioner-plugin';
 import type { BucketNameResolver, EnsureBucketProvisioned, S3Config } from 'graphile-presigned-url-plugin';
 /**
  * Lazily initialize and return the S3Config for the presigned URL plugin.
@@ -36,16 +35,6 @@ export declare function getPresignedUrlS3Config(): S3Config;
  * S3 buckets per logical bucket key.
  */
 export declare function createBucketNameResolver(): BucketNameResolver;
-/**
- * Create the bucket name resolver for the bucket provisioner plugin
- * (argument order: `(bucketKey, databaseId)`).
- *
- * Produces the exact same physical name as createBucketNameResolver()
- * (`{prefix}-{bucketKey}-{digest}`) so the eager `provisionBucket`
- * mutation mints the identical tenant-aware name that the lazy first-upload
- * path would. Throws on a missing prefix — no default bucket name.
- */
-export declare function createProvisionerBucketNameResolver(): ProvisionerBucketNameResolver;
 /**
  * Resolve CORS allowed origins from the env/config system.
  *

package/presigned-url-resolver.js

@@ -14,14 +14,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPresignedUrlS3Config = getPresignedUrlS3Config;
 exports.createBucketNameResolver = createBucketNameResolver;
-exports.createProvisionerBucketNameResolver = createProvisionerBucketNameResolver;
 exports.getAllowedOrigins = getAllowedOrigins;
 exports.createEnsureBucketProvisioned = createEnsureBucketProvisioned;
 const bucket_provisioner_1 = require("@constructive-io/bucket-provisioner");
 const graphql_env_1 = require("@constructive-io/graphql-env");
 const s3_utils_1 = require("@constructive-io/s3-utils");
 const logger_1 = require("@pgpmjs/logger");
-const crypto_1 = require("crypto");
 const bucket_provisioner_resolver_1 = require("./bucket-provisioner-resolver");
 const log = new logger_1.Logger('presigned-url-resolver');
 let s3Config = null;
@@ -87,59 +85,6 @@ function getBucketNamePrefix() {
     }
     return prefix;
 }
-/** S3's hard ceiling on a bucket name. */
-const MAX_BUCKET_NAME_LENGTH = 63;
-/** S3's floor, which a degenerate prefix/key could otherwise fall under. */
-const MIN_BUCKET_NAME_LENGTH = 3;
-/** Hex characters of the identity digest kept as the uniqueness tail. */
-const IDENTITY_DIGEST_LENGTH = 12;
-/** Readable budget: how much of the name the prefix and key may each occupy. */
-const PREFIX_BUDGET = 20;
-const BUCKET_KEY_BUDGET = 63 - IDENTITY_DIGEST_LENGTH - PREFIX_BUDGET - 3;
-/**
- * Reduce a component to the S3 bucket-name alphabet: lowercase, `[a-z0-9-]`,
- * with runs of separators collapsed and no leading or trailing hyphen.
- *
- * Dots are legal in a bucket name but deliberately dropped — a dotted name
- * cannot be used with virtual-hosted-style HTTPS, because the wildcard
- * certificate does not match a further label.
- */
-function sanitizeBucketNameComponent(value) {
-    return value
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-+|-+$/g, '');
-}
-/**
- * The single physical-bucket naming policy:
- * `{prefix}-{bucketKey}-{digest}` (e.g. `myapp-public-3f9c1a2b7e04`).
- *
- * Both the presigned-upload (lazy) path and the bucket-provisioner (eager) path
- * derive names from this one function, so a bucket's physical name is identical
- * regardless of which path mints it.
- *
- * The name is bounded and S3-legal by construction: the prefix and key are
- * sanitized to `[a-z0-9-]` and truncated to a readable budget, and the tail is a
- * digest of the *untruncated* identity — so two buckets whose keys agree only
- * past the truncation point, or the same key in two databases, still get distinct
- * names. Names remain stable for a given (prefix, databaseId, bucketKey) because
- * nothing here reads the clock or a counter; and an already-provisioned bucket
- * never consults this function at all, since `platform_buckets.physical_name` is
- * authoritative once recorded.
- */
-function mintPhysicalBucketName(prefix, databaseId, bucketKey) {
-    const identity = `${prefix}/${databaseId}/${bucketKey}`;
-    const digest = (0, crypto_1.createHash)('sha256').update(identity).digest('hex').slice(0, IDENTITY_DIGEST_LENGTH);
-    const safePrefix = sanitizeBucketNameComponent(prefix).slice(0, PREFIX_BUDGET).replace(/-+$/, '');
-    const safeKey = sanitizeBucketNameComponent(bucketKey).slice(0, BUCKET_KEY_BUDGET).replace(/-+$/, '');
-    const name = [safePrefix, safeKey, digest].filter((part) => part.length > 0).join('-');
-    // The digest alone already satisfies both bounds, so this is only reachable
-    // when both readable components sanitize away to nothing.
-    if (name.length < MIN_BUCKET_NAME_LENGTH || name.length > MAX_BUCKET_NAME_LENGTH) {
-        throw new Error(`[presigned-url-resolver] Cannot mint a legal S3 bucket name for key "${bucketKey}": got "${name}"`);
-    }
-    return name;
-}
 /**
  * Create a per-(database, bucketKey) bucket name resolver for the presigned
  * URL plugin (argument order: `(databaseId, bucketKey)`).
@@ -152,20 +97,7 @@ function mintPhysicalBucketName(prefix, databaseId, bucketKey) {
  */
 function createBucketNameResolver() {
     const prefix = getBucketNamePrefix();
-    return (databaseId, bucketKey) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
-}
-/**
- * Create the bucket name resolver for the bucket provisioner plugin
- * (argument order: `(bucketKey, databaseId)`).
- *
- * Produces the exact same physical name as createBucketNameResolver()
- * (`{prefix}-{bucketKey}-{digest}`) so the eager `provisionBucket`
- * mutation mints the identical tenant-aware name that the lazy first-upload
- * path would. Throws on a missing prefix — no default bucket name.
- */
-function createProvisionerBucketNameResolver() {
-    const prefix = getBucketNamePrefix();
-    return (bucketKey, databaseId) => mintPhysicalBucketName(prefix, databaseId, bucketKey);
+    return (databaseId, bucketKey) => (0, bucket_provisioner_1.mintPhysicalBucketName)(prefix, databaseId, bucketKey);
 }
 /**
  * Resolve CORS allowed origins from the env/config system.