@travetto/model-s3 3.1.5 → 3.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-s3",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "description": "S3 backing for the travetto model module.",
   "keywords": [
     "s3",
@@ -28,10 +28,10 @@
     "@aws-sdk/client-s3": "^3.272.0",
     "@aws-sdk/credential-provider-ini": "^3.218.0",
     "@travetto/config": "^3.1.2",
-    "@travetto/model": "^3.1.6"
+    "@travetto/model": "^3.1.7"
   },
   "peerDependencies": {
-    "@travetto/command": "^3.1.1"
+    "@travetto/command": "^3.1.2"
   },
   "peerDependenciesMeta": {
     "@travetto/command": {

package/src/service.ts

@@ -5,7 +5,7 @@ import type { MetadataBearer } from '@aws-sdk/types';
 
 import {
   ModelCrudSupport, ModelStreamSupport, ModelStorageSupport, StreamMeta,
-  ModelType, ModelRegistry, ExistsError, NotFoundError, OptionalId
+  ModelType, ModelRegistry, ExistsError, NotFoundError, OptionalId, PartialStream
 } from '@travetto/model';
 import { Injectable } from '@travetto/di';
 import { StreamUtil, Class, AppError } from '@travetto/base';
@@ -16,6 +16,7 @@ import { ModelExpiryUtil } from '@travetto/model/src/internal/service/expiry';
 import { ModelStorageUtil } from '@travetto/model/src/internal/service/storage';
 
 import { S3ModelConfig } from './config';
+import { ModelStreamUtil } from '@travetto/model/src/internal/service/stream';
 
 function isMetadataBearer(o: unknown): o is MetadataBearer {
   return !!o && typeof o === 'object' && '$metadata' in o;
@@ -93,6 +94,10 @@ export class S3ModelService implements ModelCrudSupport, ModelStreamSupport, Mod
     const { UploadId } = await this.client.createMultipartUpload(this.#q(STREAM_SPACE, id, {
       ContentType: meta.contentType,
       ContentLength: meta.size,
+      Metadata: {
+        ...meta,
+        size: `${meta.size}`
+      }
     }));
 
     const parts: s3.CompletedPart[] = [];
@@ -299,6 +304,25 @@ export class S3ModelService implements ModelCrudSupport, ModelStreamSupport, Mod
     throw new AppError(`Unable to read type: ${typeof res.Body}`);
   }
 
+  async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
+    const meta = await this.describeStream(location);
+    end ??= meta.size - 1;
+
+    ModelStreamUtil.checkRange(start, end, meta.size);
+
+    // Read from s3
+    const res = await this.client.getObject(this.#q(STREAM_SPACE, location, {
+      Range: `bytes=${start}-${end}`
+    }));
+    if (res.Body instanceof Buffer || // Buffer
+      typeof res.Body === 'string' || // string
+      res.Body && ('pipe' in res.Body) // Stream
+    ) {
+      return { stream: await StreamUtil.toStream(res.Body), range: [start, end] };
+    }
+    throw new AppError(`Unable to read type: ${typeof res.Body}`);
+  }
+
   async headStream(location: string): Promise<{ Metadata?: Partial<StreamMeta>, ContentLength?: number }> {
     const query = this.#q(STREAM_SPACE, location);
     try {