arcway 0.4.12 → 0.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/files/drivers/s3.js

@@ -11,17 +11,53 @@ import {
   AbortMultipartUploadCommand,
 } from '@aws-sdk/client-s3';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+
+function publicEndpoint(endpoint) {
+  if (typeof endpoint !== 'string') {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  let url;
+  try {
+    url = new URL(endpoint);
+  } catch {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  if (
+    url.protocol !== 'https:' ||
+    url.username ||
+    url.password ||
+    url.pathname !== '/' ||
+    url.search ||
+    url.hash
+  ) {
+    throw new Error('files.s3.publicEndpoint must be an HTTPS origin');
+  }
+
+  return url.origin;
+}
+
 class S3FileDriver {
   client;
+  signingClient;
   bucket;
   constructor(config) {
     this.bucket = config.bucket;
-    this.client = new S3Client({
+    const clientConfig = {
       region: config.region ?? 'us-east-1',
       ...(config.endpoint ? { endpoint: config.endpoint } : {}),
       ...(config.forcePathStyle ? { forcePathStyle: true } : {}),
       ...(config.credentials ? { credentials: config.credentials } : {}),
-    });
+    };
+    this.client = new S3Client(clientConfig);
+    this.signingClient =
+      config.publicEndpoint === undefined
+        ? this.client
+        : new S3Client({
+            ...clientConfig,
+            endpoint: publicEndpoint(config.publicEndpoint),
+          });
   }
   async init() {}
 
@@ -158,7 +194,7 @@ class S3FileDriver {
     });
     return {
       method: 'PUT',
-      url: await getSignedUrl(this.client, command, {
+      url: await getSignedUrl(this.signingClient, command, {
         expiresIn,
         signableHeaders: new Set([
           'content-type',
@@ -188,7 +224,7 @@ class S3FileDriver {
           bytes: part.bytes,
           method: 'PUT',
           url: await getSignedUrl(
-            this.client,
+            this.signingClient,
             new UploadPartCommand({
               Bucket: this.bucket,
               Key: key,