microsoft-graph 2.8.0 → 2.9.1

package/dist/cjs/graphApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphApi.d.ts","sourceRoot":"","sources":["../../src/graphApi.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAgB,cAAc,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACzG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQ/C,eAAO,MAAM,mBAAmB,EAA6C,KAAK,CAAC;AACnF,eAAO,MAAM,QAAQ,qCAAqC,CAAC;AAC3D,eAAO,MAAM,aAAa,4CAAuB,CAAC;AAElD,8KAA8K;AAC9K,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAQvF;AAED,6LAA6L;AAC7L,wBAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAInH;AAED,2DAA2D;AAC3D,wBAAsB,UAAU,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAOrH;AAoBD,KAAK,iBAAiB,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAChE,CAAC"}
+{"version":3,"file":"graphApi.d.ts","sourceRoot":"","sources":["../../src/graphApi.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAgB,cAAc,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACzG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQ/C,eAAO,MAAM,mBAAmB,EAA6C,KAAK,CAAC;AACnF,eAAO,MAAM,QAAQ,qCAAqC,CAAC;AAC3D,eAAO,MAAM,aAAa,4CAAuB,CAAC;AAElD,8KAA8K;AAC9K,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAQvF;AAED,6LAA6L;AAC7L,wBAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAInH;AAED,2DAA2D;AAC3D,wBAAsB,UAAU,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAOrH;AAoBD,KAAK,iBAAiB,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAChE,CAAC"}

package/dist/cjs/graphApi.js

@@ -7,7 +7,7 @@ exports.batchEndpoint = exports.endpoint = exports.authenticationScope = void 0;
 exports.operation = operation;
 exports.parallel = parallel;
 exports.sequential = sequential;
-const node_fetch_1 = __importDefault(require("node-fetch"));
+const axios_1 = __importDefault(require("axios"));
 const InconsistentContextError_ts_1 = __importDefault(require("./errors/InconsistentContextError.js"));
 const InvalidArgumentError_ts_1 = __importDefault(require("./errors/InvalidArgumentError.js"));
 const NeverError_ts_1 = __importDefault(require("./errors/NeverError.js"));
@@ -51,7 +51,7 @@ const consecutiveRetryDelayMultiplier = 2;
 async function executeSingle(definition) {
     const context = (0, context_ts_1.getContext)(definition.contextId);
     const accessToken = await (0, accessToken_ts_1.getCurrentAccessToken)(context.tenantId, context.clientId, context.clientSecret, exports.authenticationScope);
-    const agent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
+    const httpAgent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
     const response = await innerFetch({
         url: `${exports.endpoint}${definition.path}`,
         method: definition.method,
@@ -59,8 +59,8 @@ async function executeSingle(definition) {
             authorization: createAuthorizationHeader(accessToken),
             ...headersToObject(definition.headers),
         },
-        body: definition.body === null ? null : JSON.stringify(definition.body),
-        agent,
+        data: definition.body === null ? null : definition.body,
+        httpAgent,
     });
     return definition.responseTransform(response);
 }
@@ -79,7 +79,7 @@ async function executeBatch(...ops) {
     }
     const context = (0, context_ts_1.getContext)(contextId);
     const accessToken = await (0, accessToken_ts_1.getCurrentAccessToken)(context.tenantId, context.clientId, context.clientSecret, exports.authenticationScope);
-    const agent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
+    const httpAgent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
     const body = await innerFetch({
         url: exports.batchEndpoint,
         method: "POST",
@@ -88,7 +88,7 @@ async function executeBatch(...ops) {
             accept: "application/json",
             "content-type": "application/json",
         },
-        body: JSON.stringify({
+        data: {
             requests: ops.map((op, index) => ({
                 id: (0, operationId_ts_1.operationIndexToId)(index),
                 method: op.method,
@@ -97,8 +97,8 @@ async function executeBatch(...ops) {
                 body: op.body === null ? undefined : op.body,
                 dependsOn: op.dependsOn?.map((id) => id.toString()),
             })),
-        }),
-        agent,
+        },
+        httpAgent,
     });
     const responses = [];
     for (const r of body.responses) {
@@ -123,27 +123,48 @@ async function executeBatch(...ops) {
     return responses; // TODO: Is there a neater way to massage the types correctly? This is functionally correct, but I do want to avoid using `unknown` here if possible.
 }
 /** Execute request, supporting GraphAPI retry logic */
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: This function does need to be simplified, though it is a TODO for another day
 async function innerFetch(args) {
     const { url, ...options } = args;
+    if (!url) {
+        throw new Error("URL is required for request");
+    }
     let retryAfterMilliseconds = defaultRetryDelayMilliseconds;
     let response = null;
     let attempts = 0; // Track the number of attempts
+    const instance = axios_1.default.create({
+        httpsAgent: options.httpAgent,
+    });
     while (attempts < maxRetries) {
-        // Retry at most 3 times
-        response = await (0, node_fetch_1.default)(url, options);
-        if (!((0, httpStatus_ts_1.isHttpTooManyRequests)(response.status) || (0, httpStatus_ts_1.isServiceUnavailable)(response.status))) {
-            break;
+        try {
+            response = await instance({
+                url,
+                ...options,
+            });
+            break; // If successful, exit the loop
         }
-        const requestedRetryAfterSeconds = Number.parseInt(response.headers.get("Retry-After") ?? "0", 10);
-        if (requestedRetryAfterSeconds) {
-            retryAfterMilliseconds = requestedRetryAfterSeconds * 1000;
+        catch (error) {
+            if (axios_1.default.isAxiosError(error) && error.response) {
+                response = error.response;
+                if (!((0, httpStatus_ts_1.isHttpTooManyRequests)(response.status) || (0, httpStatus_ts_1.isServiceUnavailable)(response.status) || (0, httpStatus_ts_1.isGatewayTimeout)(response.status))) {
+                    throw error; // Don't retry for other error codes
+                }
+                const requestedRetryAfterSeconds = Number.parseInt(response.headers["retry-after"] ?? "0", 10);
+                if (requestedRetryAfterSeconds) {
+                    retryAfterMilliseconds = requestedRetryAfterSeconds * 1000;
+                }
+                await (0, sleep_ts_1.sleep)(retryAfterMilliseconds);
+                retryAfterMilliseconds *= consecutiveRetryDelayMultiplier;
+                attempts++; // Increment the attempt counter
+                if (attempts >= maxRetries) {
+                    RequestFailedError_ts_1.default.throw(`GraphAPI fetch exceed retry limit of ${maxRetries} attempts.`, args);
+                }
+            }
+            else {
+                // For non-Axios errors or errors without response, just throw
+                throw error;
+            }
         }
-        await (0, sleep_ts_1.sleep)(retryAfterMilliseconds);
-        retryAfterMilliseconds *= consecutiveRetryDelayMultiplier;
-        attempts++; // Increment the attempt counter
-    }
-    if (attempts >= maxRetries) {
-        RequestFailedError_ts_1.default.throw(`GraphAPI fetch exceed retry limit of ${maxRetries} attempts.`, args);
     }
     if (!response) {
         throw new NeverError_ts_1.default("Response is null. Should be impossible");
@@ -151,17 +172,15 @@ async function innerFetch(args) {
     if ((0, httpStatus_ts_1.isHttpTooManyRequests)(response.status)) {
         RequestFailedError_ts_1.default.throw("GraphAPI fetch failed after 3 retries due to too many requests.", args);
     }
-    const replyContentType = response.headers.get("content-type")?.toLowerCase();
-    const body = replyContentType?.startsWith("application/json") ? await response.json() : null;
     if (!(0, httpStatus_ts_1.isHttpOk)(response.status)) {
-        const bodyError = body;
+        const bodyError = response.data;
         let errorMessage = `${response.status} '${response.statusText}'`;
         if (bodyError?.error) {
             errorMessage += `: [${bodyError.error.code}] '${bodyError.error.message}'`;
         }
-        RequestFailedError_ts_1.default.throw(`GraphAPI fetch failed: ${errorMessage}`, args, body);
+        RequestFailedError_ts_1.default.throw(`GraphAPI fetch failed: ${errorMessage}`, args, response.data);
     }
-    return body;
+    return response.data;
 }
 function normalizeBatchBody(contentType, body) {
     if (contentType?.startsWith("application/json") && typeof body === "string") {

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

@@ -1 +1 @@
-{"version":3,"file":"getDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/getDriveItemContent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAMjE;;;;;;;GAOG;AACH,wBAA8B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAmB7F"}
+{"version":3,"file":"getDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/getDriveItemContent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAOjE;;;;;;;GAOG;AACH,wBAA8B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAgC7F"}

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

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getDriveItemContent;
-const node_fetch_1 = __importDefault(require("node-fetch"));
+const axios_1 = __importDefault(require("axios"));
 const graphApi_ts_1 = require("../../graphApi.js");
 const accessToken_ts_1 = require("../../services/accessToken.js");
 const context_ts_1 = require("../../services/context.js");
 const httpAgent_ts_1 = require("../../services/httpAgent.js");
+const httpStatus_ts_1 = require("../../services/httpStatus.js");
 const templatedPaths_ts_1 = require("../../services/templatedPaths.js");
 /**
  * Download the content of a drive item.
@@ -23,15 +24,25 @@ async function getDriveItemContent(itemRef) {
     const url = `${graphApi_ts_1.endpoint}${(0, templatedPaths_ts_1.generatePath)("/sites/{site-id}/drives/{drive-id}/items/{item-id}/content", itemRef)}`;
     const context = (0, context_ts_1.getContext)(itemRef.contextId);
     const accessToken = await (0, accessToken_ts_1.getCurrentAccessToken)(context.tenantId, context.clientId, context.clientSecret, graphApi_ts_1.authenticationScope);
-    const agent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
-    const response = await (0, node_fetch_1.default)(url, {
+    const httpAgent = (0, httpAgent_ts_1.tryGetHttpAgent)(context.httpProxy);
+    const response = await (0, axios_1.default)({
+        url,
+        method: "GET",
         headers: {
             authorization: `Bearer ${accessToken}`,
         },
-        agent,
+        responseType: "arraybuffer",
+        httpsAgent: httpAgent,
     });
-    if (!response.ok) {
+    if (!(0, httpStatus_ts_1.isHttpOk)(response.status)) {
         throw new Error(`Failed to download file: ${response.status} ${response.statusText}`);
     }
-    return await response.arrayBuffer();
+    if (!Buffer.isBuffer(response.data)) {
+        throw new Error(`Unexpected response type: ${typeof response.data}`);
+    }
+    const buffer = response.data.buffer.slice(response.data.byteOffset, response.data.byteOffset + response.data.byteLength);
+    if (!(buffer instanceof ArrayBuffer)) {
+        throw new Error("Failed to convert Buffer to ArrayBuffer");
+    }
+    return buffer;
 }

package/dist/cjs/operations/workbookRange/autoFitWorkbookRangeColumns.d.ts

@@ -1,7 +1,7 @@
 import type { GraphOperation } from "../../models/GraphOperation.ts";
 import type { WorkbookRangeRef } from "../../models/WorkbookRangeRef.ts";
 /**
- * Autofit the columns in a range.
+ * Auto-fit the columns in a range.
  *
  * @param rangeRef - A reference to the range, optionally including session information.
  * @returns Nothing.

package/dist/cjs/operations/workbookRange/autoFitWorkbookRangeColumns.js

@@ -4,7 +4,7 @@ exports.default = autoFitWorkbookRangeColumns;
 const graphApi_ts_1 = require("../../graphApi.js");
 const templatedPaths_ts_1 = require("../../services/templatedPaths.js");
 /**
- * Autofit the columns in a range.
+ * Auto-fit the columns in a range.
  *
  * @param rangeRef - A reference to the range, optionally including session information.
  * @returns Nothing.

package/dist/cjs/services/httpStatus.d.ts

@@ -16,4 +16,10 @@ export declare function isHttpTooManyRequests(status: number): boolean;
  * @returns True if the status code is 503, otherwise false.
  */
 export declare function isServiceUnavailable(status: number): boolean;
+/**
+ * Checks if the HTTP status code indicates a gateway has timed out.
+ * @param status - The HTTP status code.
+ * @returns True if the status code is 504, otherwise false.
+ */
+export declare function isGatewayTimeout(status: number): boolean;
 //# sourceMappingURL=httpStatus.d.ts.map

package/dist/cjs/services/httpStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D"}
+{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAExD"}

package/dist/cjs/services/httpStatus.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isHttpOk = isHttpOk;
 exports.isHttpTooManyRequests = isHttpTooManyRequests;
 exports.isServiceUnavailable = isServiceUnavailable;
+exports.isGatewayTimeout = isGatewayTimeout;
 /**
  * Checks if the HTTP status code indicates a successful response.
  * @param status - The HTTP status code.
@@ -27,3 +28,11 @@ function isHttpTooManyRequests(status) {
 function isServiceUnavailable(status) {
     return status === 503;
 }
+/**
+ * Checks if the HTTP status code indicates a gateway has timed out.
+ * @param status - The HTTP status code.
+ * @returns True if the status code is 504, otherwise false.
+ */
+function isGatewayTimeout(status) {
+    return status === 504;
+}

package/dist/esm/graphApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphApi.d.ts","sourceRoot":"","sources":["../../src/graphApi.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAgB,cAAc,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACzG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQ/C,eAAO,MAAM,mBAAmB,EAA6C,KAAK,CAAC;AACnF,eAAO,MAAM,QAAQ,qCAAqC,CAAC;AAC3D,eAAO,MAAM,aAAa,4CAAuB,CAAC;AAElD,8KAA8K;AAC9K,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAQvF;AAED,6LAA6L;AAC7L,wBAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAInH;AAED,2DAA2D;AAC3D,wBAAsB,UAAU,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAOrH;AAoBD,KAAK,iBAAiB,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAChE,CAAC"}
+{"version":3,"file":"graphApi.d.ts","sourceRoot":"","sources":["../../src/graphApi.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAgB,cAAc,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACzG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQ/C,eAAO,MAAM,mBAAmB,EAA6C,KAAK,CAAC;AACnF,eAAO,MAAM,QAAQ,qCAAqC,CAAC;AAC3D,eAAO,MAAM,aAAa,4CAAuB,CAAC;AAElD,8KAA8K;AAC9K,wBAAgB,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,wBAAwB,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAQvF;AAED,6LAA6L;AAC7L,wBAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAInH;AAED,2DAA2D;AAC3D,wBAAsB,UAAU,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAOrH;AAoBD,KAAK,iBAAiB,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAChE,CAAC"}

package/dist/esm/graphApi.js

@@ -1,4 +1,4 @@
-import fetch from "node-fetch";
+import axios from "axios";
 import InconsistentContextError from "./errors/InconsistentContextError.js";
 import InvalidArgumentError from "./errors/InvalidArgumentError.js";
 import NeverError from "./errors/NeverError.js";
@@ -7,7 +7,7 @@ import RequestFailedError from "./errors/RequestFailedError.js";
 import { getCurrentAccessToken } from "./services/accessToken.js";
 import { getContext } from "./services/context.js";
 import { tryGetHttpAgent } from "./services/httpAgent.js";
-import { isHttpOk, isHttpTooManyRequests, isServiceUnavailable } from "./services/httpStatus.js";
+import { isGatewayTimeout, isHttpOk, isHttpTooManyRequests, isServiceUnavailable } from "./services/httpStatus.js";
 import { operationIdToIndex, operationIndexToId } from "./services/operationId.js";
 import { sleep } from "./services/sleep.js";
 export const authenticationScope = "https://graph.microsoft.com/.default";
@@ -42,7 +42,7 @@ const consecutiveRetryDelayMultiplier = 2;
 async function executeSingle(definition) {
     const context = getContext(definition.contextId);
     const accessToken = await getCurrentAccessToken(context.tenantId, context.clientId, context.clientSecret, authenticationScope);
-    const agent = tryGetHttpAgent(context.httpProxy);
+    const httpAgent = tryGetHttpAgent(context.httpProxy);
     const response = await innerFetch({
         url: `${endpoint}${definition.path}`,
         method: definition.method,
@@ -50,8 +50,8 @@ async function executeSingle(definition) {
             authorization: createAuthorizationHeader(accessToken),
             ...headersToObject(definition.headers),
         },
-        body: definition.body === null ? null : JSON.stringify(definition.body),
-        agent,
+        data: definition.body === null ? null : definition.body,
+        httpAgent,
     });
     return definition.responseTransform(response);
 }
@@ -70,7 +70,7 @@ async function executeBatch(...ops) {
     }
     const context = getContext(contextId);
     const accessToken = await getCurrentAccessToken(context.tenantId, context.clientId, context.clientSecret, authenticationScope);
-    const agent = tryGetHttpAgent(context.httpProxy);
+    const httpAgent = tryGetHttpAgent(context.httpProxy);
     const body = await innerFetch({
         url: batchEndpoint,
         method: "POST",
@@ -79,7 +79,7 @@ async function executeBatch(...ops) {
             accept: "application/json",
             "content-type": "application/json",
         },
-        body: JSON.stringify({
+        data: {
             requests: ops.map((op, index) => ({
                 id: operationIndexToId(index),
                 method: op.method,
@@ -88,8 +88,8 @@ async function executeBatch(...ops) {
                 body: op.body === null ? undefined : op.body,
                 dependsOn: op.dependsOn?.map((id) => id.toString()),
             })),
-        }),
-        agent,
+        },
+        httpAgent,
     });
     const responses = [];
     for (const r of body.responses) {
@@ -114,27 +114,48 @@ async function executeBatch(...ops) {
     return responses; // TODO: Is there a neater way to massage the types correctly? This is functionally correct, but I do want to avoid using `unknown` here if possible.
 }
 /** Execute request, supporting GraphAPI retry logic */
+// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: This function does need to be simplified, though it is a TODO for another day
 async function innerFetch(args) {
     const { url, ...options } = args;
+    if (!url) {
+        throw new Error("URL is required for request");
+    }
     let retryAfterMilliseconds = defaultRetryDelayMilliseconds;
     let response = null;
     let attempts = 0; // Track the number of attempts
+    const instance = axios.create({
+        httpsAgent: options.httpAgent,
+    });
     while (attempts < maxRetries) {
-        // Retry at most 3 times
-        response = await fetch(url, options);
-        if (!(isHttpTooManyRequests(response.status) || isServiceUnavailable(response.status))) {
-            break;
+        try {
+            response = await instance({
+                url,
+                ...options,
+            });
+            break; // If successful, exit the loop
         }
-        const requestedRetryAfterSeconds = Number.parseInt(response.headers.get("Retry-After") ?? "0", 10);
-        if (requestedRetryAfterSeconds) {
-            retryAfterMilliseconds = requestedRetryAfterSeconds * 1000;
+        catch (error) {
+            if (axios.isAxiosError(error) && error.response) {
+                response = error.response;
+                if (!(isHttpTooManyRequests(response.status) || isServiceUnavailable(response.status) || isGatewayTimeout(response.status))) {
+                    throw error; // Don't retry for other error codes
+                }
+                const requestedRetryAfterSeconds = Number.parseInt(response.headers["retry-after"] ?? "0", 10);
+                if (requestedRetryAfterSeconds) {
+                    retryAfterMilliseconds = requestedRetryAfterSeconds * 1000;
+                }
+                await sleep(retryAfterMilliseconds);
+                retryAfterMilliseconds *= consecutiveRetryDelayMultiplier;
+                attempts++; // Increment the attempt counter
+                if (attempts >= maxRetries) {
+                    RequestFailedError.throw(`GraphAPI fetch exceed retry limit of ${maxRetries} attempts.`, args);
+                }
+            }
+            else {
+                // For non-Axios errors or errors without response, just throw
+                throw error;
+            }
         }
-        await sleep(retryAfterMilliseconds);
-        retryAfterMilliseconds *= consecutiveRetryDelayMultiplier;
-        attempts++; // Increment the attempt counter
-    }
-    if (attempts >= maxRetries) {
-        RequestFailedError.throw(`GraphAPI fetch exceed retry limit of ${maxRetries} attempts.`, args);
     }
     if (!response) {
         throw new NeverError("Response is null. Should be impossible");
@@ -142,17 +163,15 @@ async function innerFetch(args) {
     if (isHttpTooManyRequests(response.status)) {
         RequestFailedError.throw("GraphAPI fetch failed after 3 retries due to too many requests.", args);
     }
-    const replyContentType = response.headers.get("content-type")?.toLowerCase();
-    const body = replyContentType?.startsWith("application/json") ? await response.json() : null;
     if (!isHttpOk(response.status)) {
-        const bodyError = body;
+        const bodyError = response.data;
         let errorMessage = `${response.status} '${response.statusText}'`;
         if (bodyError?.error) {
             errorMessage += `: [${bodyError.error.code}] '${bodyError.error.message}'`;
         }
-        RequestFailedError.throw(`GraphAPI fetch failed: ${errorMessage}`, args, body);
+        RequestFailedError.throw(`GraphAPI fetch failed: ${errorMessage}`, args, response.data);
     }
-    return body;
+    return response.data;
 }
 function normalizeBatchBody(contentType, body) {
     if (contentType?.startsWith("application/json") && typeof body === "string") {

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

@@ -1 +1 @@
-{"version":3,"file":"getDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/getDriveItemContent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAMjE;;;;;;;GAOG;AACH,wBAA8B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAmB7F"}
+{"version":3,"file":"getDriveItemContent.d.ts","sourceRoot":"","sources":["../../../../src/operations/driveItem/getDriveItemContent.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAOjE;;;;;;;GAOG;AACH,wBAA8B,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAgC7F"}

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

@@ -1,8 +1,9 @@
-import fetch from "node-fetch";
+import axios from "axios";
 import { authenticationScope, endpoint } from "../../graphApi.js";
 import { getCurrentAccessToken } from "../../services/accessToken.js";
 import { getContext } from "../../services/context.js";
 import { tryGetHttpAgent } from "../../services/httpAgent.js";
+import { isHttpOk } from "../../services/httpStatus.js";
 import { generatePath } from "../../services/templatedPaths.js";
 /**
  * Download the content of a drive item.
@@ -17,15 +18,25 @@ export default async function getDriveItemContent(itemRef) {
     const url = `${endpoint}${generatePath("/sites/{site-id}/drives/{drive-id}/items/{item-id}/content", itemRef)}`;
     const context = getContext(itemRef.contextId);
     const accessToken = await getCurrentAccessToken(context.tenantId, context.clientId, context.clientSecret, authenticationScope);
-    const agent = tryGetHttpAgent(context.httpProxy);
-    const response = await fetch(url, {
+    const httpAgent = tryGetHttpAgent(context.httpProxy);
+    const response = await axios({
+        url,
+        method: "GET",
         headers: {
             authorization: `Bearer ${accessToken}`,
         },
-        agent,
+        responseType: "arraybuffer",
+        httpsAgent: httpAgent,
     });
-    if (!response.ok) {
+    if (!isHttpOk(response.status)) {
         throw new Error(`Failed to download file: ${response.status} ${response.statusText}`);
     }
-    return await response.arrayBuffer();
+    if (!Buffer.isBuffer(response.data)) {
+        throw new Error(`Unexpected response type: ${typeof response.data}`);
+    }
+    const buffer = response.data.buffer.slice(response.data.byteOffset, response.data.byteOffset + response.data.byteLength);
+    if (!(buffer instanceof ArrayBuffer)) {
+        throw new Error("Failed to convert Buffer to ArrayBuffer");
+    }
+    return buffer;
 }

package/dist/esm/operations/workbookRange/autoFitWorkbookRangeColumns.d.ts

@@ -1,7 +1,7 @@
 import type { GraphOperation } from "../../models/GraphOperation.ts";
 import type { WorkbookRangeRef } from "../../models/WorkbookRangeRef.ts";
 /**
- * Autofit the columns in a range.
+ * Auto-fit the columns in a range.
  *
  * @param rangeRef - A reference to the range, optionally including session information.
  * @returns Nothing.

package/dist/esm/operations/workbookRange/autoFitWorkbookRangeColumns.js

@@ -1,7 +1,7 @@
 import { operation } from "../../graphApi.js";
 import { generatePath } from "../../services/templatedPaths.js";
 /**
- * Autofit the columns in a range.
+ * Auto-fit the columns in a range.
  *
  * @param rangeRef - A reference to the range, optionally including session information.
  * @returns Nothing.

package/dist/esm/services/httpStatus.d.ts

@@ -16,4 +16,10 @@ export declare function isHttpTooManyRequests(status: number): boolean;
  * @returns True if the status code is 503, otherwise false.
  */
 export declare function isServiceUnavailable(status: number): boolean;
+/**
+ * Checks if the HTTP status code indicates a gateway has timed out.
+ * @param status - The HTTP status code.
+ * @returns True if the status code is 504, otherwise false.
+ */
+export declare function isGatewayTimeout(status: number): boolean;
 //# sourceMappingURL=httpStatus.d.ts.map

package/dist/esm/services/httpStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D"}
+{"version":3,"file":"httpStatus.d.ts","sourceRoot":"","sources":["../../../src/services/httpStatus.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAExD"}

package/dist/esm/services/httpStatus.js

@@ -22,3 +22,11 @@ export function isHttpTooManyRequests(status) {
 export function isServiceUnavailable(status) {
     return status === 503;
 }
+/**
+ * Checks if the HTTP status code indicates a gateway has timed out.
+ * @param status - The HTTP status code.
+ * @returns True if the status code is 504, otherwise false.
+ */
+export function isGatewayTimeout(status) {
+    return status === 504;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microsoft-graph",
-  "version": "2.8.0",
+  "version": "2.9.1",
   "description": "Microsoft GraphAPI SDK for NodeJS",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "@azure/identity": "^4.8.0",
-    "https-proxy-agent": "^7.0.6",
-    "node-fetch": "^3.3.2"
+    "axios": "^1.7.9",
+    "https-proxy-agent": "^7.0.6"
   },
   "exports": {
     ".": {