fcad-core-dragon 2.0.0-beta.5 → 2.0.0-beta.6

package/src/module/xapi/wrapper.js

@@ -201,7 +201,7 @@ export function xapiwrapper(ADL) {
         function (r) {
           if (r.status == 200) {
             try {
-              let lrsabout = JSON.parse(r.response)
+              let lrsabout = r.json()
               let versionOK = false
               for (let idx in lrsabout.version) {
                 if (lrsabout.version.hasOwnProperty(idx))
@@ -384,7 +384,7 @@ export function xapiwrapper(ADL) {
         this.withCredentials,
         this.strictCallbacks
       )
-      if (!callback) return { xhr: resp, id: id }
+      if (!callback) return { xhr: resp[0], id: id }
     }
   }
 
@@ -632,26 +632,14 @@ export function xapiwrapper(ADL) {
       for (let i in stmtArray) {
         if (stmtArray.hasOwnProperty(i)) this.prepareStatement(stmtArray[i])
       }
-      // let resp = ADL.XHR_request(
-      //   this.lrs,
-      //   this.lrs.endpoint + 'statements',
-      //   'POST',
-      //   JSON.stringify(stmtArray),
-      //   this.lrs.auth,
-      //   callback,
-      //   null,
-      //   false,
-      //   null,
-      //   this.withCredentials,
-      //   this.strictCallbacks
-      // )
-      //=============================================
+
       let headers = {}
       headers['Content-type'] = 'application/json; charset=UTF-8'
       headers['Authorization'] = this.lrs.auth
       headers['X-Experience-API-Version'] = ADL.XAPIWrapper.xapiVersion
 
       let payload = JSON.stringify(stmtArray)
+
       // fecth API used to allow the delivery of the request after the browser is closed
       let resp = await fetch(this.lrs.endpoint + 'statements', {
         method: 'POST',
@@ -669,7 +657,7 @@ export function xapiwrapper(ADL) {
 
   /*
    * Get statement(s) based on the searchparams or more url.
-   * @param {object} searchparams   an ADL.XAPIWrapper.searchParams object of
+   * @param {object || array } searchparams   an ADL.XAPIWrapper.searchParams object of
    *                key(search parameter)-value(parameter value) pairs.
    *                Example:
    *                  let myparams = ADL.XAPIWrapper.searchParams();
@@ -694,28 +682,41 @@ export function xapiwrapper(ADL) {
     more,
     callback
   ) {
+    const listSearchParams = []
+
+    searchparams.constructor == Array
+      ? listSearchParams.push(...searchparams)
+      : listSearchParams.push(searchparams)
+
     if (this.testConfig()) {
       let url = this.lrs.endpoint + 'statements'
+      const URLS = []
       if (more) {
         url = this.base + more
       } else {
-        let urlparams = new Array()
-
-        for (let s in searchparams) {
-          if (searchparams.hasOwnProperty(s)) {
-            if (s == 'until' || s == 'since') {
-              let d = new Date(searchparams[s])
-              urlparams.push(s + '=' + encodeURIComponent(d.toISOString()))
-            } else {
-              urlparams.push(s + '=' + encodeURIComponent(searchparams[s]))
+        for (let searchparams of listSearchParams) {
+          let urlparams = new Array()
+          let _urls = url
+          for (let s in searchparams) {
+            if (searchparams.hasOwnProperty(s)) {
+              if (s == 'until' || s == 'since') {
+                let d = new Date(searchparams[s])
+                urlparams.push(s + '=' + encodeURIComponent(d.toISOString()))
+              } else {
+                urlparams.push(s + '=' + encodeURIComponent(searchparams[s]))
+              }
             }
           }
+          if (urlparams.length > 0) {
+            _urls = _urls + '?' + urlparams.join('&')
+          }
+          URLS.push(_urls)
         }
-        if (urlparams.length > 0) url = url + '?' + urlparams.join('&')
       }
+
       let res = await ADL.XHR_request(
         this.lrs,
-        url,
+        URLS,
         'GET',
         null,
         this.lrs.auth,
@@ -732,9 +733,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(res.response)
+        return await res
       } catch (e) {
-        return res.response
+        return e
       }
     }
   }
@@ -751,7 +752,7 @@ export function xapiwrapper(ADL) {
    * ADL.XAPIWrapper.log(res);
    * >> <Activity object>
    */
-  XAPIWrapper.prototype.getActivities = function (activityid, callback) {
+  XAPIWrapper.prototype.getActivities = async function (activityid, callback) {
     if (this.testConfig()) {
       let url = this.lrs.endpoint + 'activities?activityId=<activityid>'
       url = url.replace('<activityid>', encodeURIComponent(activityid))
@@ -775,9 +776,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return await result[0].json()
       } catch (e) {
-        return result.response
+        return result
       }
     }
   }
@@ -887,7 +888,7 @@ export function xapiwrapper(ADL) {
    *                  {"mbox":"mailto:tom@example.com"}, "questionstate");
    * >> {info: "the state info"}
    */
-  XAPIWrapper.prototype.getState = function (
+  XAPIWrapper.prototype.getState = async function (
     activityid,
     agent,
     stateid,
@@ -937,9 +938,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return await result[0].json()
       } catch (e) {
-        return result.response
+        return e
       }
     }
   }
@@ -973,7 +974,7 @@ export function xapiwrapper(ADL) {
    *                         {"mbox":"mailto:tom@example.com"}, "questionstate");
    * >> 404
    */
-  XAPIWrapper.prototype.deleteState = function (
+  XAPIWrapper.prototype.deleteState = async function (
     activityid,
     agent,
     stateid,
@@ -1023,7 +1024,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return await result[0].json()
       } catch (e) {
         return result
       }
@@ -1123,7 +1124,7 @@ export function xapiwrapper(ADL) {
    *                                    function(r){ADL.XAPIWrapper.log(JSON.parse(r.response));});
    * >> {info: "the profile"}
    */
-  XAPIWrapper.prototype.getActivityProfile = function (
+  XAPIWrapper.prototype.getActivityProfile = async function (
     activityid,
     profileid,
     since,
@@ -1165,9 +1166,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
-        return result.response
+        return result
       }
     }
   }
@@ -1187,7 +1188,7 @@ export function xapiwrapper(ADL) {
    *                                       "actprofile");
    * >> XMLHttpRequest {statusText: "NO CONTENT", status: 204, response: "", responseType: "", responseXML: null…}
    */
-  XAPIWrapper.prototype.deleteActivityProfile = function (
+  XAPIWrapper.prototype.deleteActivityProfile = async function (
     activityid,
     profileid,
     matchHash,
@@ -1230,7 +1231,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result
       }
@@ -1251,7 +1252,7 @@ export function xapiwrapper(ADL) {
    * ADL.XAPIWrapper.log(res);
    * >> <Person object>
    */
-  XAPIWrapper.prototype.getAgents = function (agent, callback) {
+  XAPIWrapper.prototype.getAgents = async function (agent, callback) {
     if (this.testConfig()) {
       let url = this.lrs.endpoint + 'agents?agent=<agent>'
       url = url.replace('<agent>', encodeURIComponent(JSON.stringify(agent)))
@@ -1275,9 +1276,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
-        return result.response
+        return result
       }
     }
   }
@@ -1374,7 +1375,7 @@ export function xapiwrapper(ADL) {
    *                                  function(r){ADL.XAPIWrapper.log(JSON.parse(r.response));});
    * >> {info: "the agent profile"}
    */
-  XAPIWrapper.prototype.getAgentProfile = function (
+  XAPIWrapper.prototype.getAgentProfile = async function (
     agent,
     profileid,
     since,
@@ -1416,7 +1417,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result.response
       }
@@ -1438,7 +1439,7 @@ export function xapiwrapper(ADL) {
    *                                     "agentprofile");
    * >> XMLHttpRequest {statusText: "NO CONTENT", status: 204, response: "", responseType: "", responseXML: null…}
    */
-  XAPIWrapper.prototype.deleteAgentProfile = function (
+  XAPIWrapper.prototype.deleteAgentProfile = async function (
     agent,
     profileid,
     matchHash,
@@ -1480,7 +1481,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result
       }
@@ -1712,7 +1713,7 @@ export function xapiwrapper(ADL) {
   /*
    * makes a request to a server (if possible, use functions provided in XAPIWrapper)
    * @param {string} lrs   the lrs connection info, such as endpoint, auth, etc
-   * @param {string} url   the url of this request
+   * @param {string | Array } urls    the url of this request
    * @param {string} method   the http request method
    * @param {string} data   the payload
    * @param {string} auth   the value for the Authorization header
@@ -1723,11 +1724,12 @@ export function xapiwrapper(ADL) {
    * @param {object} extraHeaders   other header key-values to be added to this request
    * @param {boolean} withCredentials
    * @param {boolean} strictCallbacks Callback must be executed and first param is error or null if no error
-   * @return {object} xhr response object
+   * @return {Objec} containing the status of last promise request and Array of the responses;
    */
+
   ADL.XHR_request = function (
     lrs,
-    url,
+    urls,
     method,
     data,
     auth,
@@ -1739,170 +1741,101 @@ export function xapiwrapper(ADL) {
     strictCallbacks
   ) {
     'use strict'
+    let URLList = urls.constructor == Array ? [...urls] : [urls]
+    // Consolidate headers
+    let headers = {
+      'Content-Type': 'application/json',
+      Authorization: auth,
+      'X-Experience-API-Version': ADL.XAPIWrapper.xapiVersion
+    }
 
-    let xhr,
-      finished = false,
-      xDomainRequest = false,
-      ieXDomain = false,
-      ieModeRequest,
-      urlparts = url.toLowerCase().match(/^(.+):\/\/([^:/]*):?(\d+)?(\/.*)?$/),
-      location = window.location,
-      urlPort,
-      result,
-      extended,
-      prop,
-      until
-
-    //Consolidate headers
-    let headers = {}
-    headers['Content-Type'] = 'application/json'
-    headers['Authorization'] = auth
-    headers['X-Experience-API-Version'] = ADL.XAPIWrapper.xapiVersion
     if (extraHeaders !== null) {
       for (let headerName in extraHeaders) {
-        if (extraHeaders.hasOwnProperty(headerName))
+        if (extraHeaders.hasOwnProperty(headerName)) {
           headers[headerName] = extraHeaders[headerName]
+        }
       }
     }
 
-    //See if this really is a cross domain
-    xDomainRequest =
-      location.protocol.toLowerCase() !== urlparts[1] ||
-      location.hostname.toLowerCase() !== urlparts[2]
-    if (!xDomainRequest) {
-      urlPort =
-        urlparts[3] === null
-          ? urlparts[1] === 'http'
-            ? '80'
-            : '443'
-          : urlparts[3]
-      xDomainRequest = urlPort === location.port
-    }
-
-    //Add extended LMS-specified values to the URL
+    // Add extended LMS-specified values to the URL
     if (lrs !== null && lrs.extended !== undefined) {
-      extended = new Array()
-      for (prop in lrs.extended) {
+      let extended = []
+      for (let prop in lrs.extended) {
         extended.push(prop + '=' + encodeURIComponent(lrs.extended[prop]))
       }
       if (extended.length > 0) {
-        url += (url.indexOf('?') > -1 ? '&' : '?') + extended.join('&')
+        URLList.map(
+          (url) =>
+            (url += (url.indexOf('?') > -1 ? '&' : '?') + extended.join('&'))
+        )
       }
     }
+    let requestArray = []
 
-    //If it's not cross domain or we're not using IE, use the usual XmlHttpRequest
-    let windowsVersionCheck =
-      window.XDomainRequest &&
-      window.XMLHttpRequest &&
-      new XMLHttpRequest().responseType === undefined
-    if (
-      !xDomainRequest ||
-      windowsVersionCheck === undefined ||
-      windowsVersionCheck === false
-    ) {
-      xhr = new XMLHttpRequest()
-      xhr.withCredentials = withCredentials //allow cross domain cookie based auth
-      xhr.open(method, url, callback != null)
-      for (let headerName in headers) {
-        xhr.setRequestHeader(headerName, headers[headerName])
+    for (const url of URLList) {
+      // Prepare request options for fetch
+      const fetchOptions = {
+        method: method,
+        headers: headers,
+        body: data ? JSON.stringify(data) : null,
+        credentials: withCredentials ? 'include' : 'same-origin'
       }
-    }
-    //Otherwise, use IE's XDomainRequest object
-    else {
-      ieXDomain = true
-      // ieModeRequest = ie_request(method, url, headers, data)
-      // xhr = new XDomainRequest()
-      xhr.open(ieModeRequest.method, ieModeRequest.url)
+      requestArray.push(fetch(url, fetchOptions))
     }
 
-    //Setup request callback
-    function requestComplete() {
-      if (!finished) {
-        // may be in sync or async mode, using XMLHttpRequest or IE XDomainRequest, onreadystatechange or
-        // onload or both might fire depending upon browser, just covering all bases with event hooks and
-        // using 'finished' flag to avoid triggering events multiple times
-        finished = true
-        let notFoundOk = ignore404 && xhr.status === 404
-        if (
-          xhr.status === undefined ||
-          (xhr.status >= 200 && xhr.status < 400) ||
-          notFoundOk
-        ) {
-          if (callback) {
-            if (callbackargs) {
-              strictCallbacks
-                ? callback(null, xhr, callbackargs)
-                : callback(xhr, callbackargs)
-            } else {
-              let body
-
-              try {
-                body = JSON.parse(xhr.responseText)
-              } catch (e) {
-                body = xhr.responseText
-              }
+    // If no callback, we assume synchronous mode (using Promise)
+    const makeRequest = async (requests) => {
+      try {
+        const response = await Promise.all(requests)
+        const status = response[response.length - 1].status
+        let body
 
-              strictCallbacks ? callback(null, xhr, body) : callback(xhr, body)
-            }
-          } else {
-            result = xhr
-            return xhr
-          }
+        if (status === 404 && ignore404) {
+          // If we are ignoring 404s
+          body = null
+        } else if (status >= 200 && status < 400) {
+          // Successful response
+          body = await response
         } else {
-          let warning
-          try {
-            warning =
-              'There was a problem communicating with the Learning Record Store. ( ' +
-              xhr.status +
-              ' | ' +
-              xhr.response +
-              ' )' +
-              url
-          } catch (ex) {
-            warning = ex.toString()
-          }
-          ADL.XAPIWrapper.log(warning)
-          ADL.xhrRequestOnError(
-            xhr,
-            method,
-            url,
-            callback,
-            callbackargs,
-            strictCallbacks
+          throw new Error(
+            `There was a problem communicating with the Learning Record Store. (${status} | ${response.statusText}) ${urls}`
           )
-          result = xhr
-          return xhr
         }
-      } else {
-        return result
-      }
-    }
 
-    xhr.onreadystatechange = function () {
-      if (xhr.readyState === 4) {
-        return requestComplete()
+        // Callback handling
+        if (callback) {
+          if (strictCallbacks) {
+            callback(null, response, body, status)
+          } else {
+            callback(response, body, status)
+          }
+        }
+        return { response, status }
+      } catch (error) {
+        // Log error to the console or call error handler
+        ADL.XAPIWrapper.log(error.toString())
+        if (callback) {
+          if (strictCallbacks) {
+            callback(error, null, callbackargs)
+          } else {
+            callback(null, callbackargs)
+          }
+        }
+        return null
       }
     }
 
-    xhr.onload = requestComplete
-    xhr.onerror = requestComplete
-    //xhr.onerror =  ADL.xhrRequestOnError(xhr, method, url);
-
-    xhr.send(ieXDomain ? ieModeRequest.data : data)
-
     if (!callback) {
-      // synchronous
-      if (ieXDomain) {
-        // synchronous call in IE, with no asynchronous mode available.
-        until = 1000 + new Date()
-        while (new Date() < until && xhr.readyState !== 4 && !finished) {
-          delay()
-        }
-      }
-      return requestComplete()
+      // If no callback, we return the Promise (synchronous behavior)
+      return makeRequest(requestArray)
     }
+
+    // If there's a callback, proceed with asynchronous request
+    makeRequest(requestArray)
   }
 
+  //====================================================================
+
   /*
    * Holder for custom global error callback
    * @param {object} xhr   xhr object or null