gd-sprest 9.4.9 → 9.5.1

package/@types/utils/targetInfo.d.ts

@@ -65,6 +65,9 @@ export interface ITargetInfoProps {
     /** The endpoint of the request. */
     endpoint?: string;
 
+    /** Uses a fetch instead of xml http request. */
+    keepalive?: boolean;
+
     /** The method to execute. */
     method?: string;
 

package/build/lib/contextInfo.js

@@ -748,6 +748,7 @@ var _ContextInfo = /** @class */ (function () {
     };
     _ContextInfo.enableRefreshToken = function (callback) {
         var _this = this;
+        var isRunning = false;
         // Set the refresh event
         if (callback) {
             this._onRefresh.push(callback);
@@ -762,12 +763,18 @@ var _ContextInfo = /** @class */ (function () {
         }
         // Refresh method for REST
         var refreshREST = function () {
+            // Do nothing if it's currently running
+            if (isRunning) {
+                return;
+            }
             // See if the digest is valid
             if (_this.validateToken()) {
                 return;
             }
             // Log
             console.info("[gd-sprest] Token has expired. Trying to refresh the token.");
+            // Set the flag
+            isRunning = true;
             // Get the context
             _this.getWeb().execute(function (context) {
                 // Log
@@ -777,15 +784,23 @@ var _ContextInfo = /** @class */ (function () {
                 _this._contextInfo.formDigestValue = context.GetContextWebInformation.FormDigestValue;
                 // Call the events
                 _this._onRefresh.forEach(function (callback) { callback(); });
+                // Set the flag
+                isRunning = false;
             }, function () {
                 // Log
                 console.info("[gd-sprest] Unable to get the context information to refresh the token.");
                 // Stop the process
                 _this._worker.stop();
+                // Set the flag
+                isRunning = false;
             });
         };
         // Refresh method for Graph
         var refreshGraph = function () {
+            // Do nothing if it's currently running
+            if (isRunning) {
+                return;
+            }
             // Ensure we have a token
             if (graph_1.Graph.TokenExpiration) {
                 // See if the digest is valid
@@ -795,6 +810,8 @@ var _ContextInfo = /** @class */ (function () {
             }
             // Log
             console.info("[gd-sprest] Graph Token has expired. Trying to refresh the token.");
+            // Set the flag
+            isRunning = true;
             // Get the cloud access token
             graph_1.Graph.getAccessToken(graph_1.Graph.Cloud, "SPO").execute(function (auth) {
                 // Log
@@ -802,11 +819,15 @@ var _ContextInfo = /** @class */ (function () {
                 // Set the access token and expiration
                 graph_1.Graph.Token = auth.access_token;
                 graph_1.Graph.TokenExpiration = parseInt(auth.expires_on) * 1000;
+                // Set the flag
+                isRunning = false;
             }, function () {
                 // Log
                 console.info("[gd-sprest] Unable to refresh the graph token.");
                 // Stop the process
                 _this._worker.stop();
+                // Set the flag
+                isRunning = false;
             });
         };
         // Create the process

package/build/lib/graph.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Graph = void 0;
 var sptypes_1 = require("../sptypes");
 var utils_1 = require("../utils");
-var contextInfo_1 = require("./contextInfo");
 // Default Token
 //export const Token
 /**
@@ -46,7 +45,6 @@ exports.Graph.getAccessToken = function (resource, tokenType) {
     return new utils_1.Base({
         endpoint: "SP.OAuth.Token/Acquire",
         method: "POST",
-        requestDigest: contextInfo_1.ContextInfo.formDigestValue,
         data: data
     });
 };

package/build/rest.js

@@ -9,7 +9,7 @@ var sptypes_1 = require("./sptypes");
  * SharePoint REST Library
  */
 exports.$REST = {
-    __ver: 9.49,
+    __ver: 9.51,
     AppContext: function (siteUrl) { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

package/build/utils/request.js

@@ -59,7 +59,6 @@ exports.Request = {
             }
             // Get the methods for this object type
             methods = mapper_1.MapperV2[objType];
-            console.log("[gd-sprest] v2 response detected. Type is: " + objType, methods);
         }
         // Else, get the methods from the default mapper, otherwise get it from the custom mapper
         else if ((methods = mapper_1.Mapper[objType + (isCollection ? ".Collection" : "")]) == null) {

package/build/utils/xhrRequest.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XHRRequest = void 0;
+var webWorker_1 = require("../helper/methods/webWorker");
 var lib_1 = require("../lib");
 /**
  * XML HTTP Request Class
@@ -203,9 +204,9 @@ var XHRRequest = /** @class */ (function () {
         // Set the request digest
         var requestDigest = this.targetInfo.props.requestDigest || "";
         if (requestDigest == "") {
-            // Get the request digest
-            requestDigest = lib_1.ContextInfo.document ? lib_1.ContextInfo.document.querySelector("#__REQUESTDIGEST") : "";
+            // Set the request digest
             requestDigest = requestDigest ? requestDigest.value : lib_1.ContextInfo.formDigestValue;
+            requestDigest = requestDigest ? requestDigest : (lib_1.ContextInfo.document ? lib_1.ContextInfo.document.querySelector("#__REQUESTDIGEST") : "");
         }
         // See if we are targeting the context endpoint
         if (this.targetInfo.props.endpoint == "contextinfo") {
@@ -235,47 +236,68 @@ var XHRRequest = /** @class */ (function () {
     // Method to execute the xml http request
     XHRRequest.prototype.executeRequest = function (requestDigest) {
         var _this = this;
-        // Ensure the xml http request exists
-        if (this.xhr == null) {
-            return null;
-        }
-        // Open the request
-        if (this.isGraph) {
-            this.xhr.open(this.targetInfo.requestMethod, this.targetInfo.requestUrl, this.asyncFl);
-        }
-        else {
-            this.xhr.open(this.targetInfo.requestMethod == "GET" ? "GET" : "POST", this.targetInfo.requestUrl, this.asyncFl);
-        }
-        // See if we are making an asynchronous request
-        if (this.asyncFl) {
-            // Set the state change event
-            this.xhr.onreadystatechange = function () {
-                // See if the request has finished
-                if (_this.xhr.readyState == 4) {
-                    // Execute the request completed event
-                    _this.onRequestCompleted ? _this.onRequestCompleted(_this) : null;
+        // Executes the request
+        var sendRequest = function (onComplete) {
+            // Ensure the xml http request exists
+            if (_this.xhr == null) {
+                return null;
+            }
+            // Open the request
+            if (_this.isGraph) {
+                _this.xhr.open(_this.targetInfo.requestMethod, _this.targetInfo.requestUrl, _this.asyncFl);
+            }
+            else {
+                _this.xhr.open(_this.targetInfo.requestMethod == "GET" ? "GET" : "POST", _this.targetInfo.requestUrl, _this.asyncFl);
+            }
+            // See if we are making an asynchronous request
+            if (_this.asyncFl) {
+                // Set the state change event
+                _this.xhr.onreadystatechange = function () {
+                    // See if the request has finished
+                    if (_this.xhr.readyState == 4) {
+                        // Execute the request completed event
+                        _this.onRequestCompleted ? _this.onRequestCompleted(_this) : null;
+                        // Execute the event
+                        onComplete ? onComplete() : null;
+                    }
+                };
+            }
+            // See if we the response type is an array buffer
+            // Note - Updating the response type is only allow for asynchronous requests. Any error will be thrown otherwise.
+            if (_this.targetInfo.props.bufferFl && _this.asyncFl) {
+                // Set the response type
+                _this.xhr.responseType = "arraybuffer";
+            }
+            else {
+                // Default the headers
+                _this.defaultHeaders(requestDigest);
+                // Ensure the arguments passed is defaulted as a string, unless it's an array buffer
+                if (_this.targetInfo.requestData && typeof (_this.targetInfo.requestData) !== "string") {
+                    // Stringify the data object, if it's not an array buffer
+                    _this.targetInfo.requestData = _this.targetInfo.requestData.byteLength ? _this.targetInfo.requestData : JSON.stringify(_this.targetInfo.requestData);
                 }
-            };
-        }
-        // See if we the response type is an array buffer
-        // Note - Updating the response type is only allow for asynchronous requests. Any error will be thrown otherwise.
-        if (this.targetInfo.props.bufferFl && this.asyncFl) {
-            // Set the response type
-            this.xhr.responseType = "arraybuffer";
-        }
-        else {
-            // Default the headers
-            this.defaultHeaders(requestDigest);
-            // Ensure the arguments passed is defaulted as a string, unless it's an array buffer
-            if (this.targetInfo.requestData && typeof (this.targetInfo.requestData) !== "string") {
-                // Stringify the data object, if it's not an array buffer
-                this.targetInfo.requestData = this.targetInfo.requestData.byteLength ? this.targetInfo.requestData : JSON.stringify(this.targetInfo.requestData);
             }
+            // See if we are executing the request
+            if (_this.executeFl) {
+                // Execute the request
+                _this.targetInfo.props.bufferFl || _this.targetInfo.requestData == null ? _this.xhr.send() : _this.xhr.send(_this.targetInfo.requestData);
+            }
+        };
+        // See if this is an async request
+        if (this.asyncFl) {
+            // Execute the request within a worker process
+            var worker_1 = (0, webWorker_1.WebWorker)(function () {
+                // Stop the process so we don't send multiple
+                worker_1.stop();
+                // Execute the request
+                sendRequest();
+            }, 10);
+            // Start the process
+            worker_1.start();
         }
-        // See if we are executing the request
-        if (this.executeFl) {
+        else {
             // Execute the request
-            this.targetInfo.props.bufferFl || this.targetInfo.requestData == null ? this.xhr.send() : this.xhr.send(this.targetInfo.requestData);
+            sendRequest();
         }
     };
     return XHRRequest;

package/dist/gd-sprest.d.ts

@@ -7672,6 +7672,9 @@ declare module 'gd-sprest/utils/targetInfo' {
             /** The endpoint of the request. */
             endpoint?: string;
     
+            /** Uses a fetch instead of xml http request. */
+            keepalive?: boolean;
+    
             /** The method to execute. */
             method?: string;