added content range header support on webdav GET petitions

Author: larryrider

src/commands/download-file.ts

@@ -80,6 +80,7 @@ export default class DownloadFile extends Command {
       user.mnemonic,
       driveFile.fileId,
       StreamUtils.writeStreamToWritableStream(fileWriteStream),
+      undefined,
       {
         abortController: new AbortController(),
         progressCallback: (progress) => {

src/services/network/download.service.ts

@@ -5,7 +5,11 @@ export class DownloadService {
 
   async downloadFile(
     url: string,
-    options: { progressCallback?: (progress: number) => void; abortController?: AbortController },
+    options: {
+      progressCallback?: (progress: number) => void;
+      abortController?: AbortController;
+      rangeHeader?: string;
+    },
   ): Promise<ReadableStream<Uint8Array>> {
     const response = await axios.get(url, {
       responseType: 'stream',
@@ -16,6 +20,9 @@ export class DownloadService {
           options.progressCallback(reportedProgress);
         }
       },
+      headers: {
+        range: options.rangeHeader,
+      },
     });
 
     const readable = new ReadableStream<Uint8Array>({

src/services/network/network-facade.service.ts

@@ -17,6 +17,7 @@ import { DownloadService } from './download.service';
 import { ValidationService } from '../validation.service';
 import { HashStream } from '../../utils/hash.utils';
 import { ProgressTransform } from '../../utils/stream.utils';
+import { RangeOptions } from '../../utils/network.utils';
 
 export class NetworkFacade {
   private readonly cryptoLib: Network.Crypto;
@@ -54,6 +55,7 @@ export class NetworkFacade {
     mnemonic: string,
     fileId: string,
     to: WritableStream,
+    rangeOptions?: RangeOptions,
     options?: DownloadOptions,
   ): Promise<[Promise<void>, AbortController]> {
     const encryptedContentStreams: ReadableStream<Uint8Array>[] = [];
@@ -80,6 +82,10 @@ export class NetworkFacade {
     };
 
     const downloadFile: DownloadFileFunction = async (downloadables) => {
+      if (rangeOptions && downloadables.length > 1) {
+        throw new Error('Multi-Part Download with Range-Requests is not implemented');
+      }
+
       for (const downloadable of downloadables) {
         if (abortable.signal.aborted) {
           throw new Error('Download aborted');
@@ -88,6 +94,7 @@ export class NetworkFacade {
         const encryptedContentStream = await this.downloadService.downloadFile(downloadable.url, {
           progressCallback: onDownloadProgress,
           abortController: options?.abortController,
+          rangeHeader: rangeOptions?.range,
         });
 
         encryptedContentStreams.push(encryptedContentStream);

src/utils/network.utils.ts

@@ -3,6 +3,7 @@ import { createHash, X509Certificate } from 'node:crypto';
 import { readFile, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import selfsigned from 'selfsigned';
+import parseRange from 'range-parser';
 import { ConfigService } from '../services/config.service';
 
 export class NetworkUtils {
@@ -74,4 +75,41 @@ export class NetworkUtils {
     const pems = selfsigned.generate(attrs, { days: 365, algorithm: 'sha256', keySize: 2048, extensions });
     return pems;
   }
+
+  static parseRangeHeader(rangeOptions: { range?: string; totalFileSize: number }): RangeOptions | undefined {
+    if (!rangeOptions.range) {
+      return;
+    }
+    const parsed = parseRange(rangeOptions.totalFileSize, rangeOptions.range);
+    if (Array.isArray(parsed)) {
+      if (parsed.length > 1) {
+        throw new Error(`Multi Range-Requests functionality is not implemented. ${JSON.stringify(rangeOptions)}`);
+      } else if (parsed.length <= 0) {
+        throw new Error(`Empty Range-Request. ${JSON.stringify(rangeOptions)}`);
+      } else if (parsed.type !== 'bytes') {
+        throw new Error(`Unkwnown Range-Request type "${parsed.type}". ${JSON.stringify(rangeOptions)}`);
+      } else {
+        const rangeSize = parsed[0].end - parsed[0].start + 1;
+        return {
+          range: rangeOptions.range,
+          rangeSize: rangeSize,
+          totalFileSize: rangeOptions.totalFileSize,
+          parsed: parsed[0],
+        };
+      }
+    } else if (parsed === -1) {
+      throw new Error(`Malformed Range-Request. ${JSON.stringify(rangeOptions)}`);
+    } else if (parsed === -2) {
+      throw new Error(`Unsatisfiable Range-Request. ${JSON.stringify(rangeOptions)}`);
+    } else {
+      throw new Error(`Unknown error from Range-Request. ${JSON.stringify(rangeOptions)}`);
+    }
+  }
+}
+
+export interface RangeOptions {
+  range: string;
+  rangeSize: number;
+  totalFileSize: number;
+  parsed: parseRange.Range;
 }

src/webdav/handlers/GET.handler.ts

@@ -8,9 +8,10 @@ import { UploadService } from '../../services/network/upload.service';
 import { DownloadService } from '../../services/network/download.service';
 import { CryptoService } from '../../services/crypto.service';
 import { AuthService } from '../../services/auth.service';
-import { NotFoundError, NotImplementedError } from '../../utils/errors.utils';
+import { NotFoundError } from '../../utils/errors.utils';
 import { webdavLogger } from '../../utils/logger.utils';
 import { DriveFileItem } from '../../types/drive.types';
+import { NetworkUtils } from '../../utils/network.utils';
 
 export class GETRequestHandler implements WebDavMethodHandler {
   constructor(
@@ -29,8 +30,6 @@ export class GETRequestHandler implements WebDavMethodHandler {
     const { driveDatabaseManager, driveFileService, authService, networkFacade } = this.dependencies;
     const resource = await WebDavUtils.getRequestedResource(req);
 
-    if (req.headers['content-range'] || req.headers['range'])
-      throw new NotImplementedError('Range requests not supported');
     if (resource.name.startsWith('._')) throw new NotFoundError('File not found');
 
     webdavLogger.info(`GET request received for file at ${resource.url}`);
@@ -42,9 +41,6 @@ export class GETRequestHandler implements WebDavMethodHandler {
 
     webdavLogger.info(`✅ Found Drive File with uuid ${driveFile.uuid}`);
 
-    res.set('Content-Type', 'application/octet-stream');
-    res.set('Content-length', driveFile.size.toString());
-
     const { user } = await authService.getAuthDetails();
     webdavLogger.info('✅ Network ready for download');
 
@@ -57,12 +53,27 @@ export class GETRequestHandler implements WebDavMethodHandler {
       },
     });
 
+    const range = req.headers['range'];
+    const rangeOptions = NetworkUtils.parseRangeHeader({
+      range,
+      totalFileSize: driveFile.size,
+    });
+    let contentLength = driveFile.size;
+    if (rangeOptions) {
+      webdavLogger.info('✅ Range request received:', { rangeOptions });
+      contentLength = rangeOptions.rangeSize;
+    }
+
+    res.set('Content-Type', 'application/octet-stream');
+    res.set('Content-length', contentLength.toString());
+
     let lastLoggedProgress = 0;
     const [executeDownload] = await networkFacade.downloadToStream(
       driveFile.bucket,
       user.mnemonic,
       driveFile.fileId,
       writable,
+      rangeOptions,
       {
         progressCallback: (progress) => {
           const percentage = Math.floor(100 * progress);

test/services/network/network-facade.service.test.ts

@@ -224,6 +224,7 @@ describe('Network Facade Service', () => {
       'index course habit soon assist dragon tragic helmet salute stuff later twice consider grit pulse cement obvious trick sponsor stereo hello win royal more',
       'f1858bc9675f9e4f7ab29429',
       writable,
+      undefined,
       options,
     );