microsoft-graph 3.9.1 → 3.9.3

package/dist/cjs/operations/driveItem/createDriveItemContent.d.ts

@@ -6,12 +6,29 @@
 import type { DriveItem } from "@microsoft/microsoft-graph-types";
 import type { DriveRef } from "../../models/Drive.ts";
 import type { DriveItemPath, DriveItemRef } from "../../models/DriveItem.ts";
+/**
+ * The required chunk size multiple for upload sessions.
+ * @remarks Microsoft Graph requires that each upload chunk is a multiple of 320 KiB (327,680 bytes).
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ */
+export declare const chunkSizeMultiple: number;
+/**
+ * Options for creating a drive item with content upload.
+ * @property conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Can be 'fail', 'replace', or 'rename'.
+ * @property chunkSize Optional. The size of each upload chunk in bytes. Must be a multiple of 320 KiB (327,680 bytes).
+ * @property progress Optional. Callback function called with the number of bytes uploaded after each chunk.
+ */
+export interface CreateDriveItemContentOptions {
+    conflictBehavior?: "fail" | "replace" | "rename";
+    chunkSize?: number;
+    progress?: (bytes: number) => void;
+}
 /**
  * Creates a new drive item in the specified parent drive or folder using a stream as content.
  * @param parentRef Reference to the parent drive or folder where the drive item will be created.
  * @param itemPath Path (including the filename) for the new drive item within the given parent.
  * @param contentStream A Node.js readable stream containing the file content.
- * @param totalSize The total size in bytes of the content to be uploaded.
+ * @param contentLength The total size in bytes of the content to be uploaded.
  * @param options Optional. Additional options for the upload operation.
  * @param options.conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Default is 'fail'.
  * @param options.chunkSize Optional. The size of each chunk to be uploaded in bytes. Default is 10MB.
@@ -20,10 +37,5 @@ import type { DriveItemPath, DriveItemRef } from "../../models/DriveItem.ts";
  * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
  * @see https://learn.microsoft.com/en-us/graph/api/resources/uploadsession
  */
-export interface CreateDriveItemContentOptions {
-    conflictBehavior?: "fail" | "replace" | "rename";
-    chunkSize?: number;
-    progress?: (pct: number) => void;
-}
-export default function createDriveItemContent(parentRef: DriveRef | DriveItemRef, itemPath: DriveItemPath, contentStream: NodeJS.ReadableStream, totalSize: number, options?: CreateDriveItemContentOptions): Promise<DriveItem & DriveItemRef>;
+export default function createDriveItemContent(parentRef: DriveRef | DriveItemRef, itemPath: DriveItemPath, contentStream: NodeJS.ReadableStream, contentLength: number, options?: CreateDriveItemContentOptions): Promise<DriveItem & DriveItemRef>;
 //# sourceMappingURL=createDriveItemContent.d.ts.map

package/dist/cjs/operations/driveItem/createDriveItemContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/createDriveItemContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAe,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAkB1F;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,6BAA6B;IAC7C,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,wBAA8B,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,6BAAkC,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC,CAwGzP"}
+{"version":3,"file":"createDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/createDriveItemContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAe,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM1F;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QAAa,CAAC;AAc5C;;;;;GAKG;AACH,MAAM,WAAW,6BAA6B;IAC7C,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAA8B,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,6BAAkC,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC,CA+E7P"}

package/dist/cjs/operations/driveItem/createDriveItemContent.js

@@ -8,15 +8,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.chunkSizeMultiple = void 0;
 exports.default = createDriveItemContent;
+const InvalidArgumentError_ts_1 = __importDefault(require("../../errors/InvalidArgumentError.js"));
 const ProtocolError_ts_1 = __importDefault(require("../../errors/ProtocolError.js"));
 const driveItem_ts_1 = require("../../services/driveItem.js");
 const http_ts_1 = require("../../services/http.js");
 const operationInvoker_ts_1 = require("../../services/operationInvoker.js");
 const templatedPaths_ts_1 = require("../../services/templatedPaths.js");
-const defaultChunkSize = 10 * 1024 * 1024;
-async function createDriveItemContent(parentRef, itemPath, contentStream, totalSize, options = {}) {
-    const { conflictBehavior = "fail", chunkSize = defaultChunkSize, progress } = options;
+/**
+ * The required chunk size multiple for upload sessions.
+ * @remarks Microsoft Graph requires that each upload chunk is a multiple of 320 KiB (327,680 bytes).
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ */
+exports.chunkSizeMultiple = 320 * 1024;
+const defaultChunkSize = exports.chunkSizeMultiple * 32;
+/**
+ * Creates a new drive item in the specified parent drive or folder using a stream as content.
+ * @param parentRef Reference to the parent drive or folder where the drive item will be created.
+ * @param itemPath Path (including the filename) for the new drive item within the given parent.
+ * @param contentStream A Node.js readable stream containing the file content.
+ * @param contentLength The total size in bytes of the content to be uploaded.
+ * @param options Optional. Additional options for the upload operation.
+ * @param options.conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Default is 'fail'.
+ * @param options.chunkSize Optional. The size of each chunk to be uploaded in bytes. Default is 10MB.
+ * @param options.progress Optional. A callback function that is called periodically with the upload progress as a percentage.
+ * @returns The newly created drive item.
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ * @see https://learn.microsoft.com/en-us/graph/api/resources/uploadsession
+ */
+async function createDriveItemContent(parentRef, itemPath, contentStream, contentLength, options = {}) {
+    const { conflictBehavior = "fail", chunkSize = defaultChunkSize, progress = () => { } } = options;
+    if (chunkSize % exports.chunkSizeMultiple !== 0) {
+        throw new InvalidArgumentError_ts_1.default(`Chunk size (${chunkSize.toLocaleString()}) must be a multiple of ${(exports.chunkSizeMultiple / 1024).toLocaleString()} KiB *${exports.chunkSizeMultiple.toLocaleString()} bytes).`);
+    }
     const pathSegment = parentRef.itemId ? "items/{item-id}" : "root";
     const uploadSessionUrl = `${operationInvoker_ts_1.endpoint}${(0, templatedPaths_ts_1.generatePath)(`/sites/{site-id}/drives/{drive-id}/${pathSegment}:/${itemPath}:/createUploadSession`, parentRef)}`;
     const accessToken = await parentRef.context.generateAccessToken();
@@ -36,80 +61,58 @@ async function createDriveItemContent(parentRef, itemPath, contentStream, totalS
         }),
         responseType: "json",
     });
-    let position = 0;
-    let driveItem = null;
-    let streamEnded = false;
-    const chunks = [];
-    contentStream.on("data", (chunk) => {
-        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-    });
-    contentStream.on("end", () => {
-        streamEnded = true;
-    });
-    contentStream.on("error", () => {
-        // error will be handled in readChunk
-    });
-    let chunk = await readChunk();
-    while (chunk !== null) {
-        let currentChunk = chunk;
-        while (currentChunk.length > 0) {
-            const thisChunk = currentChunk.subarray(0, chunkSize);
-            const start = position;
-            const end = position + thisChunk.length - 1;
-            const contentRange = `bytes ${start}-${end}/${totalSize}`;
-            const res = await (0, http_ts_1.execute)({
-                url: uploadUrl,
-                method: "PUT",
-                headers: {
-                    "Content-Length": thisChunk.length.toString(),
-                    "Content-Range": contentRange,
-                },
-                data: thisChunk,
-                responseType: "json",
-            });
-            position += thisChunk.length;
-            if (progress && totalSize > 0) {
-                progress(Math.min(100, (position / totalSize) * 100));
-            }
-            currentChunk = currentChunk.subarray(chunkSize);
-            if (isDriveItem(res)) {
-                driveItem = res;
-                break;
-            }
-        }
-        if (driveItem)
+    const reader = contentStream[Symbol.asyncIterator] ? contentStream[Symbol.asyncIterator]() : null;
+    if (!reader) {
+        throw new InvalidArgumentError_ts_1.default("contentStream is not an async iterable");
+    }
+    const buffer = Buffer.alloc(chunkSize);
+    let contentPosition = 0;
+    let item = null;
+    while (contentPosition < contentLength) {
+        const used = await read(chunkSize, contentPosition, contentLength, reader, buffer);
+        const subBuffer = buffer.subarray(0, used);
+        const start = contentPosition;
+        const end = contentPosition + subBuffer.length - 1;
+        const contentRange = `bytes ${start}-${end}/${contentLength}`;
+        const response = await (0, http_ts_1.execute)({
+            url: uploadUrl,
+            method: "PUT",
+            headers: {
+                "Content-Length": subBuffer.length.toString(),
+                "Content-Range": contentRange,
+            },
+            data: subBuffer,
+            responseType: "json",
+        });
+        contentPosition += used;
+        progress(contentPosition);
+        if (isDriveItem(response)) {
+            item = response;
             break;
-        chunk = await readChunk();
+        }
     }
-    if (!driveItem) {
-        throw new ProtocolError_ts_1.default(`Upload did not complete successfully. Last position: ${position}`);
+    if (!item) {
+        throw new ProtocolError_ts_1.default(`Upload did not complete successfully. Last position: ${contentPosition}`);
     }
-    const itemRef = (0, driveItem_ts_1.createDriveItemRef)(parentRef, driveItem.id);
+    const itemRef = (0, driveItem_ts_1.createDriveItemRef)(parentRef, item.id);
     return {
-        ...driveItem,
+        ...item,
         ...itemRef,
     };
     function isDriveItem(obj) {
         return typeof obj === "object" && obj !== null && "id" in obj;
     }
-    function readChunk() {
-        return new Promise((resolve, reject) => {
-            if (chunks.length > 0) {
-                const next = chunks.shift();
-                return resolve(next ?? null);
-            }
-            if (streamEnded)
-                return resolve(null);
-            contentStream.once("data", (chunk) => {
-                resolve(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-            });
-            contentStream.once("end", () => {
-                streamEnded = true;
-                resolve(null);
-            });
-            contentStream.once("error", (err) => {
-                reject(err);
-            });
-        });
+}
+async function read(chunkSize, contentPosition, contentLength, reader, buffer) {
+    let length = 0;
+    while (length < chunkSize && contentPosition + length < contentLength) {
+        const { value, done } = await reader.next();
+        if (done)
+            break;
+        const chunk = Buffer.isBuffer(value) ? value : Buffer.from(value);
+        const toCopy = Math.min(chunk.length, chunkSize - length, contentLength - contentPosition - length);
+        chunk.copy(buffer, length, 0, toCopy);
+        length += toCopy;
     }
+    return length;
 }

package/dist/cjs/services/http.js

@@ -201,14 +201,19 @@ function waitToString(milliseconds) {
 function errorObjectToString(obj) {
     const maxLength = 1024;
     const ellipses = "...";
-    let str = JSON.stringify(obj, null, 2)
-        .split("\n")
-        .map((line) => `    ${line}`)
-        .join("\n");
-    if (str.length > maxLength) {
-        str = `${str.substring(0, maxLength - ellipses.length)}${ellipses}`;
-    }
-    return `${str}\n`;
+    try {
+        let str = JSON.stringify(obj, null, 2)
+            .split("\n")
+            .map((line) => `    ${line}`)
+            .join("\n");
+        if (str.length > maxLength) {
+            str = `${str.substring(0, maxLength - ellipses.length)}${ellipses}`;
+        }
+        return `${str}\n`;
+    }
+    catch (_) {
+        return "<not displayable>\n";
+    }
 }
 function handleResponseError(response, errorLog, attempts, operationIndex = null) {
     const error = response.data;

package/dist/esm/operations/driveItem/createDriveItemContent.d.ts

@@ -6,12 +6,29 @@
 import type { DriveItem } from "@microsoft/microsoft-graph-types";
 import type { DriveRef } from "../../models/Drive.ts";
 import type { DriveItemPath, DriveItemRef } from "../../models/DriveItem.ts";
+/**
+ * The required chunk size multiple for upload sessions.
+ * @remarks Microsoft Graph requires that each upload chunk is a multiple of 320 KiB (327,680 bytes).
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ */
+export declare const chunkSizeMultiple: number;
+/**
+ * Options for creating a drive item with content upload.
+ * @property conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Can be 'fail', 'replace', or 'rename'.
+ * @property chunkSize Optional. The size of each upload chunk in bytes. Must be a multiple of 320 KiB (327,680 bytes).
+ * @property progress Optional. Callback function called with the number of bytes uploaded after each chunk.
+ */
+export interface CreateDriveItemContentOptions {
+    conflictBehavior?: "fail" | "replace" | "rename";
+    chunkSize?: number;
+    progress?: (bytes: number) => void;
+}
 /**
  * Creates a new drive item in the specified parent drive or folder using a stream as content.
  * @param parentRef Reference to the parent drive or folder where the drive item will be created.
  * @param itemPath Path (including the filename) for the new drive item within the given parent.
  * @param contentStream A Node.js readable stream containing the file content.
- * @param totalSize The total size in bytes of the content to be uploaded.
+ * @param contentLength The total size in bytes of the content to be uploaded.
  * @param options Optional. Additional options for the upload operation.
  * @param options.conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Default is 'fail'.
  * @param options.chunkSize Optional. The size of each chunk to be uploaded in bytes. Default is 10MB.
@@ -20,10 +37,5 @@ import type { DriveItemPath, DriveItemRef } from "../../models/DriveItem.ts";
  * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
  * @see https://learn.microsoft.com/en-us/graph/api/resources/uploadsession
  */
-export interface CreateDriveItemContentOptions {
-    conflictBehavior?: "fail" | "replace" | "rename";
-    chunkSize?: number;
-    progress?: (pct: number) => void;
-}
-export default function createDriveItemContent(parentRef: DriveRef | DriveItemRef, itemPath: DriveItemPath, contentStream: NodeJS.ReadableStream, totalSize: number, options?: CreateDriveItemContentOptions): Promise<DriveItem & DriveItemRef>;
+export default function createDriveItemContent(parentRef: DriveRef | DriveItemRef, itemPath: DriveItemPath, contentStream: NodeJS.ReadableStream, contentLength: number, options?: CreateDriveItemContentOptions): Promise<DriveItem & DriveItemRef>;
 //# sourceMappingURL=createDriveItemContent.d.ts.map

package/dist/esm/operations/driveItem/createDriveItemContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/createDriveItemContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAe,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAkB1F;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,6BAA6B;IAC7C,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,wBAA8B,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,6BAAkC,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC,CAwGzP"}
+{"version":3,"file":"createDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/createDriveItemContent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAe,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAM1F;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,QAAa,CAAC;AAc5C;;;;;GAKG;AACH,MAAM,WAAW,6BAA6B;IAC7C,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAA8B,sBAAsB,CAAC,SAAS,EAAE,QAAQ,GAAG,YAAY,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,6BAAkC,GAAG,OAAO,CAAC,SAAS,GAAG,YAAY,CAAC,CA+E7P"}

package/dist/esm/operations/driveItem/createDriveItemContent.js

@@ -3,14 +3,38 @@
  * @module createDriveItemContent
  * @category Operations
  */
+import InvalidArgumentError from "../../errors/InvalidArgumentError.js";
 import ProtocolError from "../../errors/ProtocolError.js";
 import { createDriveItemRef } from "../../services/driveItem.js";
 import { execute } from "../../services/http.js";
 import { endpoint } from "../../services/operationInvoker.js";
 import { generatePath } from "../../services/templatedPaths.js";
-const defaultChunkSize = 10 * 1024 * 1024;
-export default async function createDriveItemContent(parentRef, itemPath, contentStream, totalSize, options = {}) {
-    const { conflictBehavior = "fail", chunkSize = defaultChunkSize, progress } = options;
+/**
+ * The required chunk size multiple for upload sessions.
+ * @remarks Microsoft Graph requires that each upload chunk is a multiple of 320 KiB (327,680 bytes).
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ */
+export const chunkSizeMultiple = 320 * 1024;
+const defaultChunkSize = chunkSizeMultiple * 32;
+/**
+ * Creates a new drive item in the specified parent drive or folder using a stream as content.
+ * @param parentRef Reference to the parent drive or folder where the drive item will be created.
+ * @param itemPath Path (including the filename) for the new drive item within the given parent.
+ * @param contentStream A Node.js readable stream containing the file content.
+ * @param contentLength The total size in bytes of the content to be uploaded.
+ * @param options Optional. Additional options for the upload operation.
+ * @param options.conflictBehavior Optional. Specifies how to handle conflicts if the file already exists. Default is 'fail'.
+ * @param options.chunkSize Optional. The size of each chunk to be uploaded in bytes. Default is 10MB.
+ * @param options.progress Optional. A callback function that is called periodically with the upload progress as a percentage.
+ * @returns The newly created drive item.
+ * @see https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ * @see https://learn.microsoft.com/en-us/graph/api/resources/uploadsession
+ */
+export default async function createDriveItemContent(parentRef, itemPath, contentStream, contentLength, options = {}) {
+    const { conflictBehavior = "fail", chunkSize = defaultChunkSize, progress = () => { } } = options;
+    if (chunkSize % chunkSizeMultiple !== 0) {
+        throw new InvalidArgumentError(`Chunk size (${chunkSize.toLocaleString()}) must be a multiple of ${(chunkSizeMultiple / 1024).toLocaleString()} KiB *${chunkSizeMultiple.toLocaleString()} bytes).`);
+    }
     const pathSegment = parentRef.itemId ? "items/{item-id}" : "root";
     const uploadSessionUrl = `${endpoint}${generatePath(`/sites/{site-id}/drives/{drive-id}/${pathSegment}:/${itemPath}:/createUploadSession`, parentRef)}`;
     const accessToken = await parentRef.context.generateAccessToken();
@@ -30,80 +54,58 @@ export default async function createDriveItemContent(parentRef, itemPath, conten
         }),
         responseType: "json",
     });
-    let position = 0;
-    let driveItem = null;
-    let streamEnded = false;
-    const chunks = [];
-    contentStream.on("data", (chunk) => {
-        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-    });
-    contentStream.on("end", () => {
-        streamEnded = true;
-    });
-    contentStream.on("error", () => {
-        // error will be handled in readChunk
-    });
-    let chunk = await readChunk();
-    while (chunk !== null) {
-        let currentChunk = chunk;
-        while (currentChunk.length > 0) {
-            const thisChunk = currentChunk.subarray(0, chunkSize);
-            const start = position;
-            const end = position + thisChunk.length - 1;
-            const contentRange = `bytes ${start}-${end}/${totalSize}`;
-            const res = await execute({
-                url: uploadUrl,
-                method: "PUT",
-                headers: {
-                    "Content-Length": thisChunk.length.toString(),
-                    "Content-Range": contentRange,
-                },
-                data: thisChunk,
-                responseType: "json",
-            });
-            position += thisChunk.length;
-            if (progress && totalSize > 0) {
-                progress(Math.min(100, (position / totalSize) * 100));
-            }
-            currentChunk = currentChunk.subarray(chunkSize);
-            if (isDriveItem(res)) {
-                driveItem = res;
-                break;
-            }
-        }
-        if (driveItem)
+    const reader = contentStream[Symbol.asyncIterator] ? contentStream[Symbol.asyncIterator]() : null;
+    if (!reader) {
+        throw new InvalidArgumentError("contentStream is not an async iterable");
+    }
+    const buffer = Buffer.alloc(chunkSize);
+    let contentPosition = 0;
+    let item = null;
+    while (contentPosition < contentLength) {
+        const used = await read(chunkSize, contentPosition, contentLength, reader, buffer);
+        const subBuffer = buffer.subarray(0, used);
+        const start = contentPosition;
+        const end = contentPosition + subBuffer.length - 1;
+        const contentRange = `bytes ${start}-${end}/${contentLength}`;
+        const response = await execute({
+            url: uploadUrl,
+            method: "PUT",
+            headers: {
+                "Content-Length": subBuffer.length.toString(),
+                "Content-Range": contentRange,
+            },
+            data: subBuffer,
+            responseType: "json",
+        });
+        contentPosition += used;
+        progress(contentPosition);
+        if (isDriveItem(response)) {
+            item = response;
             break;
-        chunk = await readChunk();
+        }
     }
-    if (!driveItem) {
-        throw new ProtocolError(`Upload did not complete successfully. Last position: ${position}`);
+    if (!item) {
+        throw new ProtocolError(`Upload did not complete successfully. Last position: ${contentPosition}`);
     }
-    const itemRef = createDriveItemRef(parentRef, driveItem.id);
+    const itemRef = createDriveItemRef(parentRef, item.id);
     return {
-        ...driveItem,
+        ...item,
         ...itemRef,
     };
     function isDriveItem(obj) {
         return typeof obj === "object" && obj !== null && "id" in obj;
     }
-    function readChunk() {
-        return new Promise((resolve, reject) => {
-            if (chunks.length > 0) {
-                const next = chunks.shift();
-                return resolve(next ?? null);
-            }
-            if (streamEnded)
-                return resolve(null);
-            contentStream.once("data", (chunk) => {
-                resolve(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-            });
-            contentStream.once("end", () => {
-                streamEnded = true;
-                resolve(null);
-            });
-            contentStream.once("error", (err) => {
-                reject(err);
-            });
-        });
+}
+async function read(chunkSize, contentPosition, contentLength, reader, buffer) {
+    let length = 0;
+    while (length < chunkSize && contentPosition + length < contentLength) {
+        const { value, done } = await reader.next();
+        if (done)
+            break;
+        const chunk = Buffer.isBuffer(value) ? value : Buffer.from(value);
+        const toCopy = Math.min(chunk.length, chunkSize - length, contentLength - contentPosition - length);
+        chunk.copy(buffer, length, 0, toCopy);
+        length += toCopy;
     }
+    return length;
 }

package/dist/esm/services/http.js

@@ -193,14 +193,19 @@ function waitToString(milliseconds) {
 function errorObjectToString(obj) {
     const maxLength = 1024;
     const ellipses = "...";
-    let str = JSON.stringify(obj, null, 2)
-        .split("\n")
-        .map((line) => `    ${line}`)
-        .join("\n");
-    if (str.length > maxLength) {
-        str = `${str.substring(0, maxLength - ellipses.length)}${ellipses}`;
-    }
-    return `${str}\n`;
+    try {
+        let str = JSON.stringify(obj, null, 2)
+            .split("\n")
+            .map((line) => `    ${line}`)
+            .join("\n");
+        if (str.length > maxLength) {
+            str = `${str.substring(0, maxLength - ellipses.length)}${ellipses}`;
+        }
+        return `${str}\n`;
+    }
+    catch (_) {
+        return "<not displayable>\n";
+    }
 }
 function handleResponseError(response, errorLog, attempts, operationIndex = null) {
     const error = response.data;

package/docs/api/createDriveItemContent.md

@@ -10,44 +10,7 @@ Creates a new drive item in the specified parent drive or folder using a stream
 
 Defined in: [src/operations/driveItem/createDriveItemContent.ts:42](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L42)
 
-Creates a new drive item in the specified parent drive or folder using a stream as content.
-
-#### Param
-
-Reference to the parent drive or folder where the drive item will be created.
-
-#### Param
-
-Path (including the filename) for the new drive item within the given parent.
-
-#### Param
-
-A Node.js readable stream containing the file content.
-
-#### Param
-
-The total size in bytes of the content to be uploaded.
-
-#### Param
-
-Optional. Additional options for the upload operation.
-
-#### Param
-
-Optional. Specifies how to handle conflicts if the file already exists. Default is 'fail'.
-
-#### Param
-
-Optional. The size of each chunk to be uploaded in bytes. Default is 10MB.
-
-#### Param
-
-Optional. A callback function that is called periodically with the upload progress as a percentage.
-
-#### See
-
- - https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
- - https://learn.microsoft.com/en-us/graph/api/resources/uploadsession
+Options for creating a drive item with content upload.
 
 #### Properties
 
@@ -57,46 +20,79 @@ Optional. A callback function that is called periodically with the upload progre
 
 Defined in: [src/operations/driveItem/createDriveItemContent.ts:44](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L44)
 
+Optional. The size of each upload chunk in bytes. Must be a multiple of 320 KiB (327,680 bytes).
+
 ##### conflictBehavior?
 
 > `optional` **conflictBehavior**: `"replace"` \| `"fail"` \| `"rename"`
 
 Defined in: [src/operations/driveItem/createDriveItemContent.ts:43](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L43)
 
+Optional. Specifies how to handle conflicts if the file already exists. Can be 'fail', 'replace', or 'rename'.
+
 ##### progress()?
 
-> `optional` **progress**: (`pct`) => `void`
+> `optional` **progress**: (`bytes`) => `void`
 
 Defined in: [src/operations/driveItem/createDriveItemContent.ts:45](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L45)
 
+Optional. Callback function called with the number of bytes uploaded after each chunk.
+
 ###### Parameters
 
 | Parameter | Type |
 | ------ | ------ |
-| `pct` | `number` |
+| `bytes` | `number` |
 
 ###### Returns
 
 `void`
 
+## Variables
+
+### chunkSizeMultiple
+
+> `const` **chunkSizeMultiple**: `number`
+
+Defined in: [src/operations/driveItem/createDriveItemContent.ts:22](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L22)
+
+The required chunk size multiple for upload sessions.
+
+#### Remarks
+
+Microsoft Graph requires that each upload chunk is a multiple of 320 KiB (327,680 bytes).
+
+#### See
+
+https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+
 ## Functions
 
 ### createDriveItemContent()
 
-> **createDriveItemContent**(`parentRef`, `itemPath`, `contentStream`, `totalSize`, `options`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`DriveItem` & [`SiteRef`](Site-1.md#siteref) & `object` & `object`\>
+> **createDriveItemContent**(`parentRef`, `itemPath`, `contentStream`, `contentLength`, `options`): [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`DriveItem` & [`SiteRef`](Site-1.md#siteref) & `object` & `object`\>
+
+Defined in: [src/operations/driveItem/createDriveItemContent.ts:62](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L62)
 
-Defined in: [src/operations/driveItem/createDriveItemContent.ts:48](https://github.com/Future-Secure-AI/microsoft-graph/blob/main/src/operations/driveItem/createDriveItemContent.ts#L48)
+Creates a new drive item in the specified parent drive or folder using a stream as content.
 
 #### Parameters
 
-| Parameter | Type |
-| ------ | ------ |
-| `parentRef` | [`DriveRef`](Drive-1.md#driveref) \| [`DriveItemRef`](DriveItem-1.md#driveitemref) |
-| `itemPath` | [`DriveItemPath`](DriveItem-1.md#driveitempath) |
-| `contentStream` | [`ReadableStream`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/globals.d.ts#L202) |
-| `totalSize` | `number` |
-| `options` | [`CreateDriveItemContentOptions`](#createdriveitemcontentoptions) |
+| Parameter | Type | Description |
+| ------ | ------ | ------ |
+| `parentRef` | [`DriveRef`](Drive-1.md#driveref) \| [`DriveItemRef`](DriveItem-1.md#driveitemref) | Reference to the parent drive or folder where the drive item will be created. |
+| `itemPath` | [`DriveItemPath`](DriveItem-1.md#driveitempath) | Path (including the filename) for the new drive item within the given parent. |
+| `contentStream` | [`ReadableStream`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/globals.d.ts#L202) | A Node.js readable stream containing the file content. |
+| `contentLength` | `number` | The total size in bytes of the content to be uploaded. |
+| `options` | [`CreateDriveItemContentOptions`](#createdriveitemcontentoptions) | Optional. Additional options for the upload operation. |
 
 #### Returns
 
 [`Promise`](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise)\<`DriveItem` & [`SiteRef`](Site-1.md#siteref) & `object` & `object`\>
+
+The newly created drive item.
+
+#### See
+
+ - https://learn.microsoft.com/en-us/graph/api/driveitem-createuploadsession
+ - https://learn.microsoft.com/en-us/graph/api/resources/uploadsession

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "microsoft-graph",
-	"version": "3.9.1",
+	"version": "3.9.3",
 	"description": "Microsoft GraphAPI SDK for NodeJS",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.js",