gd-sprest 9.7.7 → 9.7.8

package/build/rest.js

@@ -6,7 +6,7 @@ import { GraphTypes, SPTypes } from "./sptypes";
  * SharePoint REST Library
  */
 export const $REST = {
-    __ver: 9.77,
+    __ver: 9.78,
     AppContext: (siteUrl) => { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

package/build/utils/request.js

@@ -698,18 +698,13 @@ export const Request = {
                             targetInfo.accessToken = base.targetInfo.accessToken || (base.xhr.isGraph ? Graph.Token : null);
                             targetInfo.endpoint = "";
                             targetInfo.url = data["@odata.nextLink"] || data.d.__next;
-                            // Determine if we are about to get throttled
-                            let rateLimitRemaining = parseInt(xhr.getResponseHeader("RateLimit-Remaining"));
-                            let rateLimitReset = parseInt(xhr.getResponseHeader("RateLimit-Reset"));
+                            // Set the sleep value to prevent throttling
                             let sleepInMS = 0;
-                            if (typeof (rateLimitRemaining) === "number" && typeof (rateLimitReset) === "number") {
-                                // Ensure we are below the threshold
-                                if (rateLimitRemaining < 50) {
-                                    // Calculate the time to wait before executing the next call
-                                    sleepInMS = rateLimitReset * 1000;
-                                    // Log
-                                    console.info("[gd-sprest] Throttle approaching from response. Waiting " + sleepInMS + "ms before sending the next request.");
-                                }
+                            if (xhr.rateLimit && xhr.rateLimit.remaining < 50) {
+                                // Set the rate
+                                sleepInMS = xhr.rateLimit.reset * 1000;
+                                // Log
+                                console.info("[gd-sprest] Throttle approaching... Waiting " + sleepInMS + "ms before sending the next request.", xhr.rateLimit);
                             }
                             // Wait before we execute the call
                             setTimeout(() => {
@@ -726,6 +721,8 @@ export const Request = {
                                             // Update the expanded properties
                                             Helper.updateExpandedProperties(base);
                                         }
+                                        // Set the rate limit information
+                                        base.rateLimit = xhr.rateLimit;
                                         // Append the raw data results
                                         if ((_b = base["d"]) === null || _b === void 0 ? void 0 : _b.results) {
                                             base["d"].results = base["d"].results.concat(data.d.results);

package/build/utils/xhrRequest.js

@@ -41,6 +41,19 @@ export class XHRRequest {
     get request() { return this.xhr ? this.xhr : null; }
     // The data send in the body of the request
     get requestData() { return this.targetInfo.requestData; }
+    // Return the rate limit information
+    get rateLimit() {
+        // Ensure the rate limit information exists
+        if (this.xhr == null || this.getResponseHeader("RateLimit-Limit") == null) {
+            return null;
+        }
+        // Return the rate limit information
+        return {
+            limit: this.getResponseHeader("RateLimit-Limit"),
+            remaining: parseInt(this.getResponseHeader("RateLimit-Remaining")),
+            reset: parseInt(this.getResponseHeader("RateLimit-Reset"))
+        };
+    }
     // The request headers
     get requestHeaders() { return this.headers; }
     // The request information