@travetto/model-s3 5.0.20 → 6.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "5.0.20",
+  "version": "6.0.0-rc.0",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -25,12 +25,12 @@
     "directory": "module/model-s3"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.713.0",
+    "@aws-sdk/client-s3": "^3.731.1",
     "@aws-sdk/credential-provider-ini": "^3.713.0",
-    "@aws-sdk/s3-request-presigner": "^3.713.0",
-    "@travetto/cli": "^5.0.19",
-    "@travetto/config": "^5.0.16",
-    "@travetto/model": "^5.0.17"
+    "@aws-sdk/s3-request-presigner": "^3.731.1",
+    "@travetto/cli": "^6.0.0-rc.0",
+    "@travetto/config": "^6.0.0-rc.0",
+    "@travetto/model": "^6.0.0-rc.0"
   },
   "travetto": {
     "displayName": "S3 Model Support"

package/src/service.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'node:stream';
-import { text as toText } from 'node:stream/consumers';
+import { text as toText, buffer as toBuffer } from 'node:stream/consumers';
 import { Agent } from 'node:https';
 
 import { S3, CompletedPart, type CreateMultipartUploadRequest, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
@@ -42,8 +42,9 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
 
   idSource = ModelCrudUtil.uuidSource();
   client: S3;
+  config: S3ModelConfig;
 
-  constructor(public readonly config: S3ModelConfig) { }
+  constructor(config: S3ModelConfig) { this.config = config; }
 
   #getMetaBase({ range, size, ...meta }: BlobMeta): MetaBase {
     return {
@@ -245,9 +246,11 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     if (preStore) {
       prepped = await ModelCrudUtil.preStore(cls, item, this);
     }
+    const content = Buffer.from(JSON.stringify(prepped), 'utf8');
     await this.client.putObject(this.#q(cls, prepped.id, {
-      Body: JSON.stringify(prepped),
+      Body: content,
       ContentType: 'application/json',
+      ContentLength: content.length,
       ...this.#getExpiryConfig(cls, prepped)
     }));
     return prepped;
@@ -320,7 +323,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     if (blobMeta.size && blobMeta.size < this.config.chunkSize) { // If smaller than chunk size
       // Upload to s3
       await this.client.putObject(this.#q(MODEL_BLOB, location, {
-        Body: stream,
+        Body: await toBuffer(stream),
         ContentLength: blobMeta.size,
         ...this.#getMetaBase(blobMeta),
       }));

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 ArcSine Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.