@travetto/model 3.1.7 → 3.1.8

package/README.md

@@ -317,7 +317,7 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream>;
   async describeStream(location: string): Promise<StreamMeta>;
   async deleteStream(location: string): Promise<void>;
-  // Expiry Support
+  // Expiry
   async deleteExpired<T extends ModelType>(cls: Class<T>): Promise<number>;
   // Storage Support
   async createStorage(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",

package/src/internal/service/stream.ts

@@ -6,9 +6,16 @@ export const StreamModel: Class<ModelType> = Cls;
 export const STREAMS = '_streams';
 
 export class ModelStreamUtil {
-  static checkRange(start: number, end: number, size: number): void {
-    if (Number.isNaN(start) || Number.isNaN(end) || !Number.isFinite(start) || start < 0 || end >= size) {
+  static enforceRange(start: number, end: number | undefined, size: number): [start: number, end: number] {
+
+    end ??= size - 1;
+
+    if (Number.isNaN(start) || Number.isNaN(end) || !Number.isFinite(start) || start >= size || start < 0) {
       throw new AppError('Invalid position, out of range', 'data');
     }
+    if (end >= size) {
+      end = size - 1;
+    }
+    return [start, end];
   }
 }

package/src/provider/file.ts

@@ -193,9 +193,8 @@ export class FileModelService implements ModelCrudSupport, ModelStreamSupport, M
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
     const file = await this.#find(STREAMS, BIN, location);
     const meta = await this.describeStream(location);
-    end ??= meta.size - 1;
 
-    ModelStreamUtil.checkRange(start, end, meta.size);
+    [start, end] = ModelStreamUtil.enforceRange(start, end, meta.size);
 
     const stream = createReadStream(file, { start, end });
     return { stream, range: [start, end] };

package/src/provider/memory.ts

@@ -252,8 +252,9 @@ export class MemoryModelService implements ModelCrudSupport, ModelStreamSupport,
   async getStreamPartial(location: string, start: number, end?: number): Promise<PartialStream> {
     const streams = this.#find(STREAMS, location, 'notfound');
     const buffer = streams.get(location)!;
-    end ??= (buffer.length - 1);
-    ModelStreamUtil.checkRange(start, end, buffer.length);
+
+    [start, end] = ModelStreamUtil.enforceRange(start, end, buffer.length);
+
     const stream = await StreamUtil.bufferToStream(buffer.subarray(start, end + 1));
     return { stream, range: [start, end] };
   }

package/support/test/stream.ts

@@ -98,7 +98,12 @@ export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport
     assert(subContent3.length === 1);
     assert(subContent3 === 'k');
 
+    const partialOverbounded = await service.getStreamPartial(meta.hash, 20, 40);
+    const subContent4 = (await StreamUtil.toBuffer(partialOverbounded.stream)).toString('utf8');
+    assert(subContent4.length === 6);
+    assert(subContent4.endsWith('xyz'));
+
     await assert.rejects(() => service.getStreamPartial(meta.hash, -10, 10));
-    await assert.rejects(() => service.getStreamPartial(meta.hash, 0, 27));
+    await assert.rejects(() => service.getStreamPartial(meta.hash, 30, 37));
   }
 }