@travetto/model-s3 5.0.6 → 5.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "5.0.6",
+  "version": "5.0.8",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -26,12 +26,13 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.658.1",
+    "@aws-sdk/s3-request-presigner": "^3.658.1",
     "@aws-sdk/credential-provider-ini": "^3.609.0",
-    "@travetto/config": "^5.0.6",
-    "@travetto/model": "^5.0.6"
+    "@travetto/config": "^5.0.7",
+    "@travetto/model": "^5.0.8"
   },
   "peerDependencies": {
-    "@travetto/command": "^5.0.6"
+    "@travetto/command": "^5.0.7"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/service.ts

@@ -2,16 +2,17 @@ import { Readable } from 'node:stream';
 import { text as toText } from 'node:stream/consumers';
 import { Agent } from 'node:https';
 
-import { S3, CompletedPart, type CreateMultipartUploadRequest } from '@aws-sdk/client-s3';
+import { S3, CompletedPart, type CreateMultipartUploadRequest, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3';
 import type { MetadataBearer } from '@aws-sdk/types';
 import { NodeHttpHandler } from '@smithy/node-http-handler';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 import {
   ModelCrudSupport, ModelStorageSupport, ModelType, ModelRegistry, ExistsError, NotFoundError, OptionalId,
   ModelBlobSupport
 } from '@travetto/model';
 import { Injectable } from '@travetto/di';
-import { Class, AppError, castTo, asFull, BlobMeta, ByteRange, BinaryInput, BinaryUtil } from '@travetto/runtime';
+import { Class, AppError, castTo, asFull, BlobMeta, ByteRange, BinaryInput, BinaryUtil, TimeSpan, TimeUtil } from '@travetto/runtime';
 
 import { MODEL_BLOB, ModelBlobUtil } from '@travetto/model/src/internal/service/blob';
 import { ModelCrudUtil } from '@travetto/model/src/internal/service/crud';
@@ -68,6 +69,9 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
       }
       key = `_data/${key}`; // Separate data
     }
+    if (key?.startsWith('/')) {
+      key = key.substring(1);
+    }
     if (this.config.namespace) {
       key = `${this.config.namespace}/${key}`;
     }
@@ -152,12 +156,26 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   }
 
   async #deleteKeys(items: { Key: string }[]): Promise<void> {
-    await this.client.deleteObjects({
-      Bucket: this.config.bucket,
-      Delete: {
-        Objects: items
+    try {
+      await this.client.deleteObjects({
+        Bucket: this.config.bucket,
+        Delete: {
+          Objects: items
+        }
+      });
+    } catch (err) {
+      // Handle GCS
+      if (err instanceof Error && err.name === 'NotImplemented') {
+        for (const item of items) {
+          await this.client.deleteObject({
+            Bucket: this.config.bucket,
+            Key: item.Key
+          });
+        }
+      } else {
+        throw err;
       }
-    });
+    }
   }
 
   async postConstruct(): Promise<void> {
@@ -293,7 +311,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
 
   // Blob support
   async upsertBlob(location: string, input: BinaryInput, meta?: BlobMeta, overwrite = true): Promise<void> {
-    if (!overwrite && await this.describeBlob(location).then(() => true, () => false)) {
+    if (!overwrite && await this.getBlobMeta(location).then(() => true, () => false)) {
       return;
     }
 
@@ -332,7 +350,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
   }
 
   async getBlob(location: string, range?: ByteRange): Promise<Blob> {
-    const meta = await this.describeBlob(location);
+    const meta = await this.getBlobMeta(location);
     const final = range ? ModelBlobUtil.enforceRange(range, meta.size!) : undefined;
     const res = (): Promise<Readable> => this.#getObject(location, final);
     return BinaryUtil.readableBlob(res, { ...meta, range: final });
@@ -352,7 +370,7 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     }
   }
 
-  async describeBlob(location: string): Promise<BlobMeta> {
+  async getBlobMeta(location: string): Promise<BlobMeta> {
     const obj = await this.headBlob(location);
 
     if (obj) {
@@ -375,6 +393,42 @@ export class S3ModelService implements ModelCrudSupport, ModelBlobSupport, Model
     await this.client.deleteObject(this.#q(MODEL_BLOB, location));
   }
 
+  async updateBlobMeta(location: string, meta: BlobMeta): Promise<void> {
+    await this.client.copyObject({
+      Bucket: this.config.bucket,
+      Key: this.#resolveKey(MODEL_BLOB, location),
+      CopySource: `/${this.config.bucket}/${this.#resolveKey(MODEL_BLOB, location)}`,
+      ...this.#getMetaBase(meta),
+      MetadataDirective: 'REPLACE'
+    });
+  }
+
+  // Signed urls
+  async getBlobReadUrl(location: string, exp: TimeSpan = '1h'): Promise<string> {
+    return await getSignedUrl(
+      this.client,
+      new GetObjectCommand(this.#q(MODEL_BLOB, location)),
+      { expiresIn: TimeUtil.asSeconds(exp) }
+    );
+  }
+
+  async getBlobWriteUrl(location: string, meta: BlobMeta, exp: TimeSpan = '1h'): Promise<string> {
+    const base = this.#getMetaBase(meta);
+    return await getSignedUrl(
+      this.client,
+      new PutObjectCommand({
+        ...this.#q(MODEL_BLOB, location),
+        ...base,
+        ...(meta.size ? { ContentLength: meta.size } : {}),
+        ...((meta.hash && meta.hash !== '-1') ? { ChecksumSHA256: meta.hash } : {}),
+      }),
+      {
+        expiresIn: TimeUtil.asSeconds(exp),
+        ...(meta.contentType ? { signableHeaders: new Set(['content-type']) } : {})
+      }
+    );
+  }
+
   // Storage
   async truncateModel<T extends ModelType>(model: Class<T>): Promise<void> {
     for await (const items of this.#iterateBucket(model)) {