@stacksjs/ts-cloud 0.7.56 → 0.7.57

package/dist/{chunk-jp2a8yad.js → chunk-vvkd46k1.js}

@@ -1,22 +1,22 @@
 import {
   CloudFrontClient
-} from "./chunk-tjjgajbh.js";
+} from "./chunk-01d86gt1.js";
 import {
   ACMClient,
   ACMDnsValidator,
   Route53Provider,
   UnifiedDnsValidator,
   createDnsProvider
-} from "./chunk-3bfv1z4v.js";
-import {
-  Route53Client
-} from "./chunk-tnztxpcb.js";
+} from "./chunk-fv1bj3yt.js";
 import {
   CloudFormationClient
-} from "./chunk-qpj3edwz.js";
+} from "./chunk-4cjrg98a.js";
+import {
+  Route53Client
+} from "./chunk-32e7ya18.js";
 import {
   S3Client
-} from "./chunk-vd87cpvn.js";
+} from "./chunk-wj3s95p9.js";
 import {
   __require
 } from "./chunk-v0bahtg2.js";
@@ -174,10 +174,12 @@ function generateExternalDnsStaticSiteTemplate(config) {
         CachePolicyId: "4135ea2d-6df8-44a3-9df3-4b5a84be39ad",
         OriginRequestPolicyId: "b689b0a8-53d0-40ab-baf2-68738e2966ac",
         ...passthroughUrls && installRootRedirectLogicalId ? {
-          FunctionAssociations: [{
-            EventType: "viewer-request",
-            FunctionARN: { "Fn::GetAtt": [installRootRedirectLogicalId, "FunctionARN"] }
-          }]
+          FunctionAssociations: [
+            {
+              EventType: "viewer-request",
+              FunctionARN: { "Fn::GetAtt": [installRootRedirectLogicalId, "FunctionARN"] }
+            }
+          ]
         } : {}
       } : {
         CachePolicyId: "658327ea-f89d-4fab-a63d-7e88639e58f6",
@@ -813,7 +815,7 @@ async function deployStaticSiteWithExternalDnsFull(config) {
     }
   }
   onProgress?.("upload", "Uploading files to S3...");
-  const { uploadStaticFiles } = await import("./chunk-73vcqg6z.js");
+  const { uploadStaticFiles } = await import("./chunk-0z43x8re.js");
   const uploadResult = await uploadStaticFiles({
     sourceDir,
     bucket: infraResult.bucket,
@@ -833,7 +835,7 @@ async function deployStaticSiteWithExternalDnsFull(config) {
   }
   if (infraResult.distributionId && uploadResult.uploaded > 0) {
     onProgress?.("invalidate", "Invalidating CloudFront cache...");
-    const { invalidateCache } = await import("./chunk-73vcqg6z.js");
+    const { invalidateCache } = await import("./chunk-0z43x8re.js");
     await invalidateCache(infraResult.distributionId);
   }
   onProgress?.("complete", "Deployment complete!");

package/dist/{chunk-vd87cpvn.js → chunk-wj3s95p9.js}

@@ -1,12 +1,16 @@
 import {
-  AWSClient
-} from "./chunk-arsh1g5h.js";
+  AWSClient,
+  resolveS3Endpoint
+} from "./chunk-zqtpg06c.js";
 import {
   __require
 } from "./chunk-v0bahtg2.js";
 
 // src/aws/s3.ts
 import * as crypto from "node:crypto";
+import { readFileSync } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { join } from "node:path";
 
 // src/aws/credentials.ts
 function resolveCredentials(profile) {
@@ -79,9 +83,6 @@ function loadProfileFromFile(profile) {
 }
 
 // src/aws/s3.ts
-import { readdir } from "node:fs/promises";
-import { join } from "node:path";
-import { readFileSync } from "node:fs";
 function toFetchBody(data) {
   const { buffer, byteOffset, byteLength } = data;
   if (buffer instanceof ArrayBuffer) {
@@ -97,15 +98,25 @@ class S3Client {
   region;
   explicitProfile;
   endpoint;
+  endpointProtocol = "https";
   forcePathStyle;
   explicitCredentials;
-  constructor(region = "us-east-1", profile, options) {
+  constructor(regionOrOptions = "us-east-1", profile, options) {
+    const resolvedOptions = typeof regionOrOptions === "string" ? options : regionOrOptions;
+    const region = typeof regionOrOptions === "string" ? regionOrOptions : regionOrOptions.region ?? "us-east-1";
+    const resolvedProfile = typeof regionOrOptions === "string" ? profile : regionOrOptions.profile;
+    const endpoint = resolvedOptions?.endpoint ? resolveS3Endpoint({ region, path: "/", endpoint: resolvedOptions.endpoint }) : undefined;
     this.region = region;
-    this.explicitProfile = profile;
-    this.endpoint = options?.endpoint;
-    this.forcePathStyle = options?.forcePathStyle;
-    this.explicitCredentials = options?.credentials;
-    this.client = new AWSClient(options?.credentials, { profile, endpoint: options?.endpoint, forcePathStyle: options?.forcePathStyle });
+    this.explicitProfile = resolvedProfile;
+    this.endpoint = endpoint?.host;
+    this.endpointProtocol = endpoint?.protocol ?? "https";
+    this.forcePathStyle = resolvedOptions?.forcePathStyle;
+    this.explicitCredentials = resolvedOptions?.credentials;
+    this.client = new AWSClient(resolvedOptions?.credentials, {
+      profile: resolvedProfile,
+      endpoint: resolvedOptions?.endpoint,
+      forcePathStyle: resolvedOptions?.forcePathStyle
+    });
   }
   getCredentials() {
     if (this.explicitCredentials?.accessKeyId && this.explicitCredentials.secretAccessKey) {
@@ -123,6 +134,12 @@ class S3Client {
   s3VirtualHost(bucket) {
     return this.forcePathStyle ? this.s3BaseHost() : `${bucket}.${this.s3BaseHost()}`;
   }
+  objectPath(bucket, encodedKey) {
+    return this.forcePathStyle ? `/${bucket}/${encodedKey}` : `/${encodedKey}`;
+  }
+  objectUrl(bucket, encodedKey) {
+    return `${this.endpointProtocol}://${this.s3VirtualHost(bucket)}${this.objectPath(bucket, encodedKey)}`;
+  }
   async listBuckets() {
     const result = await this.client.request({
       service: "s3",
@@ -280,7 +297,8 @@ class S3Client {
       const binaryBody = Buffer.isBuffer(normalizedBody) ? normalizedBody : Buffer.from(normalizedBody);
       const { accessKeyId, secretAccessKey, sessionToken } = this.getCredentials();
       const host = this.s3VirtualHost(options.bucket);
-      const url = `https://${host}/${encodedKey}`;
+      const canonicalUri = this.objectPath(options.bucket, encodedKey);
+      const url = this.objectUrl(options.bucket, encodedKey);
       const now = new Date;
       const amzDate = now.toISOString().replace(/[:-]|\.\d{3}/g, "");
       const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
@@ -297,14 +315,7 @@ class S3Client {
       const canonicalHeaders = Object.keys(requestHeaders).sort().map((key) => `${key.toLowerCase()}:${requestHeaders[key].trim()}
 `).join("");
       const signedHeaders = Object.keys(requestHeaders).sort().map((key) => key.toLowerCase()).join(";");
-      const canonicalRequest = [
-        "PUT",
-        `/${encodedKey}`,
-        "",
-        canonicalHeaders,
-        signedHeaders,
-        payloadHash
-      ].join(`
+      const canonicalRequest = ["PUT", canonicalUri, "", canonicalHeaders, signedHeaders, payloadHash].join(`
 `);
       const algorithm = "AWS4-HMAC-SHA256";
       const credentialScope = `${dateStamp}/${this.region}/s3/aws4_request`;
@@ -351,7 +362,8 @@ class S3Client {
       service: "s3",
       region: this.region,
       method: "GET",
-      path: `/${bucket}/${encodedKey}`,
+      path: `/${encodedKey}`,
+      bucket,
       rawResponse: true
     });
     return result;
@@ -360,8 +372,8 @@ class S3Client {
     const { accessKeyId, secretAccessKey, sessionToken } = this.getCredentials();
     const host = this.s3VirtualHost(bucket);
     const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
-    const canonicalUri = this.forcePathStyle ? `/${bucket}/${encodedKey}` : `/${encodedKey}`;
-    const url = `https://${host}${canonicalUri}`;
+    const canonicalUri = this.objectPath(bucket, encodedKey);
+    const url = this.objectUrl(bucket, encodedKey);
     const now = new Date;
     const amzDate = now.toISOString().replace(/[:-]|\.\d{3}/g, "");
     const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
@@ -377,14 +389,7 @@ class S3Client {
     const canonicalHeaders = Object.keys(requestHeaders).sort().map((k) => `${k.toLowerCase()}:${requestHeaders[k].trim()}
 `).join("");
     const signedHeaders = Object.keys(requestHeaders).sort().map((k) => k.toLowerCase()).join(";");
-    const canonicalRequest = [
-      "GET",
-      canonicalUri,
-      "",
-      canonicalHeaders,
-      signedHeaders,
-      payloadHash
-    ].join(`
+    const canonicalRequest = ["GET", canonicalUri, "", canonicalHeaders, signedHeaders, payloadHash].join(`
 `);
     const algorithm = "AWS4-HMAC-SHA256";
     const credentialScope = `${dateStamp}/${this.region}/s3/aws4_request`;
@@ -446,7 +451,8 @@ class S3Client {
       service: "s3",
       region: this.region,
       method: "DELETE",
-      path: `/${bucket}/${encodedKey}`
+      path: `/${encodedKey}`,
+      bucket
     });
   }
   async deleteObjects(bucket, keys) {
@@ -593,7 +599,7 @@ class S3Client {
     const kSigning = crypto.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     const authHeader = `${algorithm} Credential=${accessKeyId}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signature}`;
-    const url = `https://${host}${canonicalUri}?${canonicalQuerystring}`;
+    const url = `${this.endpointProtocol}://${host}${canonicalUri}?${canonicalQuerystring}`;
     const response = await fetch(url, {
       method: "PUT",
       headers: {
@@ -651,7 +657,7 @@ class S3Client {
     const kSigning = crypto.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     const authHeader = `${algorithm} Credential=${accessKeyId}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signature}`;
-    const url = `https://${host}${canonicalUri}?${canonicalQuerystring}`;
+    const url = `${this.endpointProtocol}://${host}${canonicalUri}?${canonicalQuerystring}`;
     const response = await fetch(url, {
       method: "GET",
       headers: {
@@ -1316,7 +1322,7 @@ class S3Client {
     });
     const canonicalRequest = [
       "GET",
-      `/${encodedKey}`,
+      this.objectPath(bucket, encodedKey),
       queryParams.toString(),
       `host:${host}
 `,
@@ -1337,7 +1343,7 @@ class S3Client {
     const kSigning = crypto.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     queryParams.append("X-Amz-Signature", signature);
-    return `https://${host}/${encodedKey}?${queryParams.toString()}`;
+    return `${this.endpointProtocol}://${host}${this.objectPath(bucket, encodedKey)}?${queryParams.toString()}`;
   }
   generatePresignedPutUrl(bucket, key, contentType, expiresInSeconds = 3600) {
     const { accessKeyId, secretAccessKey } = this.getCredentials();
@@ -1357,7 +1363,7 @@ class S3Client {
     });
     const canonicalRequest = [
       "PUT",
-      `/${encodedKey}`,
+      this.objectPath(bucket, encodedKey),
       queryParams.toString(),
       `content-type:${contentType}
 host:${host}
@@ -1379,7 +1385,7 @@ host:${host}
     const kSigning = crypto.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     queryParams.append("X-Amz-Signature", signature);
-    return `https://${host}/${encodedKey}?${queryParams.toString()}`;
+    return `${this.endpointProtocol}://${host}${this.objectPath(bucket, encodedKey)}?${queryParams.toString()}`;
   }
   async createMultipartUpload(bucket, key, options) {
     const headers = {};
@@ -1391,11 +1397,13 @@ host:${host}
         headers[`x-amz-meta-${k}`] = v;
       }
     }
+    const encodedKey = key.split("/").map((segment) => encodeURIComponent(segment)).join("/");
     const result = await this.client.request({
       service: "s3",
       region: this.region,
       method: "POST",
-      path: `/${bucket}/${key}`,
+      path: `/${encodedKey}`,
+      bucket,
       queryParams: { uploads: "" },
       headers
     });
@@ -1404,7 +1412,9 @@ host:${host}
   async uploadPart(bucket, key, uploadId, partNumber, body) {
     const { accessKeyId, secretAccessKey, sessionToken } = this.getCredentials();
     const host = this.s3VirtualHost(bucket);
-    const url = `https://${host}/${key}?partNumber=${partNumber}&uploadId=${encodeURIComponent(uploadId)}`;
+    const encodedKey = key.split("/").map((segment) => encodeURIComponent(segment)).join("/");
+    const canonicalUri = this.objectPath(bucket, encodedKey);
+    const url = `${this.objectUrl(bucket, encodedKey)}?partNumber=${partNumber}&uploadId=${encodeURIComponent(uploadId)}`;
     const now = new Date;
     const amzDate = now.toISOString().replace(/[:-]|\.\d{3}/g, "");
     const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
@@ -1422,7 +1432,7 @@ host:${host}
     const signedHeaders = Object.keys(requestHeaders).sort().map((k) => k.toLowerCase()).join(";");
     const canonicalRequest = [
       "PUT",
-      `/${key}`,
+      canonicalUri,
       `partNumber=${partNumber}&uploadId=${encodeURIComponent(uploadId)}`,
       canonicalHeaders,
       signedHeaders,
@@ -1459,6 +1469,7 @@ host:${host}
     return { ETag: response.headers.get("etag") || "" };
   }
   async completeMultipartUpload(bucket, key, uploadId, parts) {
+    const encodedKey = key.split("/").map((segment) => encodeURIComponent(segment)).join("/");
     const partsXml = parts.sort((a, b) => a.PartNumber - b.PartNumber).map((p) => `<Part><PartNumber>${p.PartNumber}</PartNumber><ETag>${p.ETag}</ETag></Part>`).join("");
     const body = `<?xml version="1.0" encoding="UTF-8"?>
 <CompleteMultipartUpload>${partsXml}</CompleteMultipartUpload>`;
@@ -1466,18 +1477,21 @@ host:${host}
       service: "s3",
       region: this.region,
       method: "POST",
-      path: `/${bucket}/${key}`,
+      path: `/${encodedKey}`,
+      bucket,
       queryParams: { uploadId },
       headers: { "Content-Type": "application/xml" },
       body
     });
   }
   async abortMultipartUpload(bucket, key, uploadId) {
+    const encodedKey = key.split("/").map((segment) => encodeURIComponent(segment)).join("/");
     await this.client.request({
       service: "s3",
       region: this.region,
       method: "DELETE",
-      path: `/${bucket}/${key}`,
+      path: `/${encodedKey}`,
+      bucket,
       queryParams: { uploadId }
     });
   }
@@ -1486,7 +1500,8 @@ host:${host}
       service: "s3",
       region: this.region,
       method: "GET",
-      path: `/${bucket}`,
+      path: "/",
+      bucket,
       queryParams: { uploads: "" }
     });
     const uploads = result?.ListMultipartUploadsResult?.Upload;
@@ -1574,7 +1589,8 @@ host:${host}
     }
     const sortedParams = Object.keys(queryParams).sort();
     const canonicalQuerystring = sortedParams.map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(queryParams[k])}`).join("&");
-    const canonicalUri = "/" + key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
+    const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
+    const canonicalUri = this.objectPath(bucket, encodedKey);
     const canonicalHeaders = `host:${host}
 `;
     const signedHeaders = "host";
@@ -1600,7 +1616,7 @@ host:${host}
     const kService = crypto.createHmac("sha256", kRegion).update("s3").digest();
     const kSigning = crypto.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
-    const presignedUrl = `https://${host}${canonicalUri}?${canonicalQuerystring}&X-Amz-Signature=${signature}`;
+    const presignedUrl = `${this.endpointProtocol}://${host}${canonicalUri}?${canonicalQuerystring}&X-Amz-Signature=${signature}`;
     return presignedUrl;
   }
   async listObjects(options) {

package/dist/{chunk-mj1tmhte.js → chunk-x9s0cqfx.js}

@@ -3,7 +3,7 @@ import {
   buildQueryParams,
   detectCredentialSource,
   resolveS3Endpoint
-} from "./chunk-arsh1g5h.js";
+} from "./chunk-zqtpg06c.js";
 import"./chunk-v0bahtg2.js";
 export {
   resolveS3Endpoint,