Adding upload result, isCancelled upload session property

Author: nikithauc

src/tasks/FileUploadUtil/UploadResult.ts

@@ -0,0 +1,31 @@
+
+import { GraphResponseHandler } from "../../GraphResponseHandler";
+export class UploadResult {
+    private _location: string;
+    private _body: unknown;
+    private _uploadSuccess: boolean;
+
+    public get location(): string {
+        return this._location;
+    }
+
+    public set location(location: string) {
+        this._location = location;
+    }
+
+    public get body() {
+        return this._body;
+    }
+
+    public set body(body: unknown) {
+        // Body can be undefined. Empty body is expected.
+        this._body = body;
+    }
+
+    public async setUploadResult(response: Response) {
+        this._location = response.headers.get("Location");
+        this._body = await GraphResponseHandler.getResponse(response);
+        this._uploadSuccess = 
+    }
+
+}

src/tasks/LargeFileUploadTask.ts

@@ -9,8 +9,12 @@
  * @module LargeFileUploadTask
  */
 
+import { GraphClientError } from "../GraphClientError";
 import { Client } from "../index";
 import { Range } from "../Range";
+import { ResponseType } from "../ResponseType";
+import { GraphResponseHandler } from "../GraphResponseHandler";
+import { UploadResult } from "./FileUploadUtil/UploadResult";
 
 /**
  * @interface
@@ -50,6 +54,7 @@ export interface LargeFileUploadTaskOptions {
 export interface LargeFileUploadSession {
 	url: string;
 	expiry: Date;
+	isCancelled?: boolean;
 }
 
 /**
@@ -124,6 +129,7 @@ export class LargeFileUploadTask {
 		const largeFileUploadSession: LargeFileUploadSession = {
 			url: session.uploadUrl,
 			expiry: new Date(session.expirationDateTime),
+			isCancelled: false
 		};
 		return largeFileUploadSession;
 	}
@@ -215,22 +221,35 @@ export class LargeFileUploadTask {
 	 * @returns The promise resolves to uploaded response
 	 */
 	public async upload(): Promise<any> {
-		// eslint-disable-next-line no-constant-condition
-		while (true) {
+		while (!this.uploadSession.isCancelled) {
 			const nextRange = this.getNextRange();
 			if (nextRange.maxValue === -1) {
 				const err = new Error("Task with which you are trying to upload is already completed, Please check for your uploaded file");
 				err.name = "Invalid Session";
 				throw err;
 			}
 			const fileSlice = this.sliceFile(nextRange);
-			const response = await this.uploadSlice(fileSlice, nextRange, this.file.size);
-			// Upon completion of upload process incase of onedrive, driveItem is returned, which contains id
-			if (response.id !== undefined) {
-				return response;
-			} else {
-				this.updateTaskStatus(response);
+			const rawResponse = await this.uploadSliceGetRawResponse(fileSlice, nextRange, this.file.size);
+			if (!rawResponse) {
+				throw new GraphClientError("Something went wrong! Large file upload slice response is null.");
 			}
+
+			const responseBody = await GraphResponseHandler.getResponse(rawResponse);
+			if (rawResponse.status == 201 || (rawResponse.status == 200 && responseBody.id)) {
+				const result = new UploadResult();
+				return result.setUploadResult(rawResponse);
+			}
+
+			/* Handling an API issue where the case of Outlook upload 'nextExpectedRanges' property is not uniform.
+			* https://github.com/microsoftgraph/msgraph-sdk-serviceissues/issues/39
+			*/
+			const res: UploadStatusResponse = {
+				expirationDateTime: responseBody.expirationDateTime,
+				nextExpectedRanges: responseBody.NextExpectedRanges || responseBody.nextExpectedRanges,
+			};
+
+			this.updateTaskStatus(res);
+			this.updateTaskStatus(responseBody);
 		}
 	}
 
@@ -251,6 +270,23 @@ export class LargeFileUploadTask {
 			})
 			.put(fileSlice);
 	}
+	/**
+	 * @public
+	 * @async
+	 * Uploads given slice to the server
+	 * @param {ArrayBuffer | Blob | File} fileSlice - The file slice
+	 * @param {Range} range - The range value
+	 * @param {number} totalSize - The total size of a complete file
+	 */
+	public async uploadSliceGetRawResponse(fileSlice: unknown, range: Range, totalSize: number): Promise<Response> {
+		return await this.client
+			.api(this.uploadSession.url)
+			.headers({
+				"Content-Length": `${range.maxValue - range.minValue + 1}`,
+				"Content-Range": `bytes ${range.minValue}-${range.maxValue}/${totalSize}`,
+			}).responseType(ResponseType.RAW)
+			.put(fileSlice);
+	}
 
 	/**
 	 * @public
@@ -259,7 +295,11 @@ export class LargeFileUploadTask {
 	 * @returns The promise resolves to cancelled response
 	 */
 	public async cancel(): Promise<any> {
-		return await this.client.api(this.uploadSession.url).delete();
+		const deleteResponse = await this.client.api(this.uploadSession.url).responseType(ResponseType.RAW).delete()
+		if (deleteResponse.status && deleteResponse.status == 204) {
+			this.uploadSession.isCancelled = true;
+		}
+		return deleteResponse;
 	}
 
 	/**
@@ -284,4 +324,14 @@ export class LargeFileUploadTask {
 		await this.getStatus();
 		return await this.upload();
 	}
+
+	/**
+	 * @public
+	 * @async
+	 * Get the upload session information
+	 * @returns The large file upload large file session
+	 */
+	public getUploadSession(): LargeFileUploadSession {
+		return this.uploadSession;
+	}
 }