@stacksjs/ts-cloud 0.2.17 → 0.2.19

package/dist/index.js

@@ -2041,12 +2041,13 @@ class S3Client2 {
         headers[`x-amz-meta-${key}`] = value;
       }
     }
+    const encodedKey = options.key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     const normalizedBody = options.body instanceof Uint8Array && !Buffer.isBuffer(options.body) ? Buffer.from(options.body) : options.body;
     if (Buffer.isBuffer(normalizedBody) || normalizedBody instanceof Uint8Array) {
       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}/${options.key}`;
+      const url = `https://${host}/${encodedKey}`;
       const now = new Date;
       const amzDate = now.toISOString().replace(/[:-]|\.\d{3}/g, "");
       const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
@@ -2065,7 +2066,7 @@ class S3Client2 {
       const signedHeaders = Object.keys(requestHeaders).sort().map((key) => key.toLowerCase()).join(";");
       const canonicalRequest = [
         "PUT",
-        `/${options.key}`,
+        `/${encodedKey}`,
         "",
         canonicalHeaders,
         signedHeaders,
@@ -2105,18 +2106,19 @@ class S3Client2 {
       service: "s3",
       region: this.region,
       method: "PUT",
-      path: `/${options.key}`,
+      path: `/${encodedKey}`,
       bucket: options.bucket,
       headers,
       body: options.body
     });
   }
   async getObject(bucket, key) {
+    const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     const result = await this.client.request({
       service: "s3",
       region: this.region,
       method: "GET",
-      path: `/${bucket}/${key}`,
+      path: `/${bucket}/${encodedKey}`,
       rawResponse: true
     });
     return result;
@@ -2145,11 +2147,12 @@ class S3Client2 {
     });
   }
   async deleteObject(bucket, key) {
+    const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     await this.client.request({
       service: "s3",
       region: this.region,
       method: "DELETE",
-      path: `/${bucket}/${key}`
+      path: `/${bucket}/${encodedKey}`
     });
   }
   async deleteObjects(bucket, keys) {
@@ -3009,6 +3012,7 @@ class S3Client2 {
     const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
     const credentialScope = `${dateStamp}/${this.region}/s3/aws4_request`;
     const credential = `${accessKeyId}/${credentialScope}`;
+    const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     const queryParams = new URLSearchParams({
       "X-Amz-Algorithm": "AWS4-HMAC-SHA256",
       "X-Amz-Credential": credential,
@@ -3018,7 +3022,7 @@ class S3Client2 {
     });
     const canonicalRequest = [
       "GET",
-      `/${key}`,
+      `/${encodedKey}`,
       queryParams.toString(),
       `host:${host}
 `,
@@ -3039,7 +3043,7 @@ class S3Client2 {
     const kSigning = crypto3.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto3.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     queryParams.append("X-Amz-Signature", signature);
-    return `https://${host}/${key}?${queryParams.toString()}`;
+    return `https://${host}/${encodedKey}?${queryParams.toString()}`;
   }
   generatePresignedPutUrl(bucket, key, contentType, expiresInSeconds = 3600) {
     const { accessKeyId, secretAccessKey } = this.getCredentials();
@@ -3049,6 +3053,7 @@ class S3Client2 {
     const dateStamp = now.toISOString().slice(0, 10).replace(/-/g, "");
     const credentialScope = `${dateStamp}/${this.region}/s3/aws4_request`;
     const credential = `${accessKeyId}/${credentialScope}`;
+    const encodedKey = key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     const queryParams = new URLSearchParams({
       "X-Amz-Algorithm": "AWS4-HMAC-SHA256",
       "X-Amz-Credential": credential,
@@ -3058,7 +3063,7 @@ class S3Client2 {
     });
     const canonicalRequest = [
       "PUT",
-      `/${key}`,
+      `/${encodedKey}`,
       queryParams.toString(),
       `content-type:${contentType}
 host:${host}
@@ -3080,7 +3085,7 @@ host:${host}
     const kSigning = crypto3.createHmac("sha256", kService).update("aws4_request").digest();
     const signature = crypto3.createHmac("sha256", kSigning).update(stringToSign).digest("hex");
     queryParams.append("X-Amz-Signature", signature);
-    return `https://${host}/${key}?${queryParams.toString()}`;
+    return `https://${host}/${encodedKey}?${queryParams.toString()}`;
   }
   async createMultipartUpload(bucket, key, options) {
     const headers = {};
@@ -3275,7 +3280,7 @@ host:${host}
     }
     const sortedParams = Object.keys(queryParams).sort();
     const canonicalQuerystring = sortedParams.map((k) => `${encodeURIComponent(k)}=${encodeURIComponent(queryParams[k])}`).join("&");
-    const canonicalUri = "/" + key;
+    const canonicalUri = "/" + key.split("/").map((seg) => encodeURIComponent(seg)).join("/");
     const canonicalHeaders = `host:${host}
 `;
     const signedHeaders = "host";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/ts-cloud",
   "type": "module",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "description": "A lightweight, performant infrastructure-as-code library and CLI for deploying both server-based (EC2) and serverless applications.",
   "author": "Chris Breuer <chris@stacksjs.com>",
   "license": "MIT",
@@ -89,8 +89,8 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@ts-cloud/aws-types": "0.2.17",
-    "@ts-cloud/core": "0.2.17",
+    "@ts-cloud/aws-types": "0.2.19",
+    "@ts-cloud/core": "0.2.19",
     "@stacksjs/ts-xml": "^0.1.0"
   },
   "devDependencies": {