fcad-core-dragon 2.0.0-beta.1 → 2.0.0-beta.10

package/src/module/xapi/wrapper.js

@@ -9,7 +9,7 @@ export function xapiwrapper(ADL) {
   // from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString
 
   if (!Date.prototype.toISOString) {
-    ;(function() {
+    ;(function () {
       function pad(number) {
         let r = String(number)
         if (r.length === 1) {
@@ -18,7 +18,7 @@ export function xapiwrapper(ADL) {
         return r
       }
 
-      Date.prototype.toISOString = function() {
+      Date.prototype.toISOString = function () {
         return (
           this.getUTCFullYear() +
           '-' +
@@ -106,16 +106,16 @@ export function xapiwrapper(ADL) {
         c < 1 << 7
           ? 1
           : c < 1 << 11
-          ? 2
-          : c < 1 << 16
-          ? 3
-          : c < 1 << 21
-          ? 4
-          : c < 1 << 26
-          ? 5
-          : c < 1 << 31
-          ? 6
-          : Number.NaN
+            ? 2
+            : c < 1 << 16
+              ? 3
+              : c < 1 << 21
+                ? 4
+                : c < 1 << 26
+                  ? 5
+                  : c < 1 << 31
+                    ? 6
+                    : Number.NaN
     }
     return byteLen
   }
@@ -131,7 +131,7 @@ export function xapiwrapper(ADL) {
    * };
    * ADL.XAPIWrapper.changeConfig(conf);
    */
-  let Config = (function() {
+  let Config = (function () {
     let conf = {}
     conf['endpoint'] = 'http://localhost:8000/xapi/'
     //try
@@ -158,7 +158,7 @@ export function xapiwrapper(ADL) {
    * @param {object} config   with a minimum of an endoint property
    * @param {boolean} verifyxapiversion   indicating whether to verify the version of the LRS is compatible with this wrapper
    */
-  let XAPIWrapper = function(config, verifyxapiversion) {
+  let XAPIWrapper = function (config, verifyxapiversion) {
     this.lrs = getLRSObject(config || {})
     if (this.lrs.user && this.lrs.password)
       updateAuth(this.lrs, this.lrs.user, this.lrs.password)
@@ -198,10 +198,10 @@ export function xapiwrapper(ADL) {
         'GET',
         null,
         null,
-        function(r) {
+        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))
@@ -237,12 +237,12 @@ export function xapiwrapper(ADL) {
       )
     }
 
-    this.searchParams = function() {
+    this.searchParams = function () {
       let sp = { format: 'exact' }
       return sp
     }
 
-    this.hash = function(tohash) {
+    this.hash = function (tohash) {
       if (!tohash) return null
       try {
         return toSHA1(tohash)
@@ -252,7 +252,7 @@ export function xapiwrapper(ADL) {
       }
     }
 
-    this.changeConfig = function(config) {
+    this.changeConfig = function (config) {
       try {
         ADL.XAPIWrapper.log('updating lrs object with new configuration')
         this.lrs = mergeRecursive(this.lrs, config)
@@ -277,7 +277,7 @@ export function xapiwrapper(ADL) {
    * These values could be initialized from the Config object or from the url query string.
    * @param {object} stmt   the statement object
    */
-  XAPIWrapper.prototype.prepareStatement = function(stmt) {
+  XAPIWrapper.prototype.prepareStatement = function (stmt) {
     if (stmt.actor === undefined) {
       stmt.actor = JSON.parse(this.lrs.actor)
     } else if (typeof stmt.actor === 'string') {
@@ -354,7 +354,7 @@ export function xapiwrapper(ADL) {
    *     ADL.XAPIWrapper.log("[" + obj.id + "]: " + resp.status + " - " + resp.statusText);});
    * >> [4edfe763-8b84-41f1-a355-78b7601a6fe8]: 204 - NO CONTENT
    */
-  XAPIWrapper.prototype.sendStatement = function(stmt, callback, attachments) {
+  XAPIWrapper.prototype.sendStatement = function (stmt, callback, attachments) {
     if (this.testConfig()) {
       this.prepareStatement(stmt)
       let id
@@ -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 }
     }
   }
 
@@ -414,7 +414,7 @@ export function xapiwrapper(ADL) {
    *     ADL.XAPIWrapper.log("[" + obj.id + "]: " + resp.status + " - " + resp.statusText);});
    * >> [4edfe763-8b84-41f1-a355-78b7601a6fe8]: 204 - NO CONTENT
    */
-  XAPIWrapper.prototype.sendStatementWithFetch = async function(
+  XAPIWrapper.prototype.sendStatementWithFetch = async function (
     stmt,
     callback,
     attachments
@@ -452,13 +452,13 @@ export function xapiwrapper(ADL) {
     }
   }
 
-  XAPIWrapper.prototype.stringToArrayBuffer = function(content, encoding) {
+  XAPIWrapper.prototype.stringToArrayBuffer = function (content, encoding) {
     encoding = encoding || ADL.XAPIWrapper.defaultEncoding
 
     return new TextEncoder(encoding).encode(content).buffer
   }
 
-  XAPIWrapper.prototype.stringFromArrayBuffer = function(content, encoding) {
+  XAPIWrapper.prototype.stringFromArrayBuffer = function (content, encoding) {
     encoding = encoding || ADL.XAPIWrapper.defaultEncoding
 
     return new TextDecoder(encoding).decode(content)
@@ -477,7 +477,7 @@ export function xapiwrapper(ADL) {
        value : a UTF8 string containing the binary data of the attachment. For string values, this can just be the JS string.
     }
  */
-  XAPIWrapper.prototype.buildMultipartPost = function(
+  XAPIWrapper.prototype.buildMultipartPost = function (
     statement,
     attachments,
     extraHeaders
@@ -575,7 +575,7 @@ export function xapiwrapper(ADL) {
    *     "context": {"registration": "51a6f860-1997-11e3-8ffd-0800200c9a66"},
    *     "id": "ea9c1d01-0606-4ec7-8e5d-20f87b1211ed"}
    */
-  XAPIWrapper.prototype.sendStatements = function(stmtArray, callback) {
+  XAPIWrapper.prototype.sendStatements = function (stmtArray, callback) {
     if (this.testConfig()) {
       for (let i in stmtArray) {
         if (stmtArray.hasOwnProperty(i)) this.prepareStatement(stmtArray[i])
@@ -600,9 +600,64 @@ export function xapiwrapper(ADL) {
     }
   }
 
+  /*
+   * Send a list of statements to the LRS.
+   * @param {array} stmtArray   the list of statement objects to send
+   * @param {function} [callback]   function to be called after the LRS responds
+   *            to this request (makes the call asynchronous)
+   *            the function will be passed the XMLHttpRequest object
+   * @return {object} xhr response object
+   * @example
+   * let stmt = {"actor" : {"mbox" : "mailto:tom@example.com"},
+   *             "verb" : {"id" : "http://adlnet.gov/expapi/verbs/answered",
+   *                       "display" : {"en-US" : "answered"}},
+   *             "object" : {"id" : "http://adlnet.gov/expapi/activities/question"}};
+   * let resp_obj = ADL.XAPIWrapper.sendStatement(stmt);
+   * ADL.XAPIWrapper.getStatements({"statementId":resp_obj.id});
+   * >> {"version": "1.0.0",
+   *     "timestamp": "2013-09-09 21:36:40.185841+00:00",
+   *     "object": {"id": "http://adlnet.gov/expapi/activities/question", "objectType": "Activity"},
+   *     "actor": {"mbox": "mailto:tom@example.com", "name": "tom creighton", "objectType": "Agent"},
+   *     "stored": "2013-09-09 21:36:40.186124+00:00",
+   *     "verb": {"id": "http://adlnet.gov/expapi/verbs/answered", "display": {"en-US": "answered"}},
+   *     "authority": {"mbox": "mailto:tom@adlnet.gov", "name": "tom", "objectType": "Agent"},
+   *     "context": {"registration": "51a6f860-1997-11e3-8ffd-0800200c9a66"},
+   *     "id": "ea9c1d01-0606-4ec7-8e5d-20f87b1211ed"}
+   */
+  XAPIWrapper.prototype.sendStatementsWithFetch = async function (
+    stmtArray,
+    callback
+  ) {
+    if (this.testConfig()) {
+      for (let i in stmtArray) {
+        if (stmtArray.hasOwnProperty(i)) this.prepareStatement(stmtArray[i])
+      }
+
+      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',
+        headers,
+        body: payload,
+        keepalive: true // allow the request to outlive the closing of browser tab
+      })
+
+      //=============================================
+      if (!callback) {
+        return resp
+      }
+    }
+  }
+
   /*
    * 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();
@@ -622,30 +677,46 @@ export function xapiwrapper(ADL) {
    *
    * >> <Array of statements>
    */
-  XAPIWrapper.prototype.getStatements = function(searchparams, more, callback) {
+  XAPIWrapper.prototype.getStatements = async function (
+    searchparams,
+    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 = ADL.XHR_request(
+      let res = await ADL.XHR_request(
         this.lrs,
-        url,
+        URLS,
         'GET',
         null,
         this.lrs.auth,
@@ -662,9 +733,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(res.response)
+        return await res
       } catch (e) {
-        return res.response
+        return e
       }
     }
   }
@@ -681,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))
@@ -705,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
       }
     }
   }
@@ -731,7 +802,7 @@ export function xapiwrapper(ADL) {
    *                    {"mbox":"mailto:tom@example.com"},
    *                    "questionstate", null, stateval);
    */
-  XAPIWrapper.prototype.sendState = function(
+  XAPIWrapper.prototype.sendState = function (
     activityid,
     agent,
     stateid,
@@ -817,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,
@@ -867,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
       }
     }
   }
@@ -903,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,
@@ -953,7 +1024,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return await result[0].json()
       } catch (e) {
         return result
       }
@@ -976,7 +1047,7 @@ export function xapiwrapper(ADL) {
    * ADL.XAPIWrapper.sendActivityProfile("http://adlnet.gov/expapi/activities/question",
    *                                     "actprofile", profile, null, "*");
    */
-  XAPIWrapper.prototype.sendActivityProfile = function(
+  XAPIWrapper.prototype.sendActivityProfile = function (
     activityid,
     profileid,
     profileval,
@@ -1053,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,
@@ -1095,9 +1166,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
-        return result.response
+        return result
       }
     }
   }
@@ -1117,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,
@@ -1160,7 +1231,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result
       }
@@ -1181,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)))
@@ -1205,9 +1276,9 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
-        return result.response
+        return result
       }
     }
   }
@@ -1228,7 +1299,7 @@ export function xapiwrapper(ADL) {
    * ADL.XAPIWrapper.sendAgentProfile({"mbox":"mailto:tom@example.com"},
    *                                   "agentprofile", profile, null, "*");
    */
-  XAPIWrapper.prototype.sendAgentProfile = function(
+  XAPIWrapper.prototype.sendAgentProfile = function (
     agent,
     profileid,
     profileval,
@@ -1304,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,
@@ -1346,7 +1417,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result.response
       }
@@ -1368,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,
@@ -1410,7 +1481,7 @@ export function xapiwrapper(ADL) {
       }
 
       try {
-        return JSON.parse(result.response)
+        return result[0].json()
       } catch (e) {
         return result
       }
@@ -1581,12 +1652,15 @@ export function xapiwrapper(ADL) {
  Copyright (c) 2010 Robert Kieffer
  Dual licensed under the MIT and GPL licenses.
  */
-  ADL.ruuid = function() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      let r = (Math.random() * 16) | 0,
-        v = c == 'x' ? r : (r & 0x3) | 0x8
-      return v.toString(16)
-    })
+  ADL.ruuid = function () {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
+      /[xy]/g,
+      function (c) {
+        let r = (Math.random() * 16) | 0,
+          v = c == 'x' ? r : (r & 0x3) | 0x8
+        return v.toString(16)
+      }
+    )
   }
 
   /*
@@ -1594,7 +1668,7 @@ export function xapiwrapper(ADL) {
    * parses an ISO string into a date object
    * isostr - the ISO string
    */
-  ADL.dateFromISOString = function(isostr) {
+  ADL.dateFromISOString = function (isostr) {
     let regexp =
       '([0-9]{4})(-([0-9]{2})(-([0-9]{2})' +
       '([T| ]([0-9]{2}):([0-9]{2})(:([0-9]{2})(.([0-9]+))?)?' +
@@ -1639,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
@@ -1650,11 +1724,11 @@ 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(
+  ADL.XHR_request = function (
     lrs,
-    url,
+    urls,
     method,
     data,
     auth,
@@ -1666,170 +1740,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
@@ -1845,7 +1850,7 @@ export function xapiwrapper(ADL) {
    *   alert(xhr.status + " " + xhr.statusText + ": " + xhr.response);
    * };
    */
-  ADL.xhrRequestOnError = function(
+  ADL.xhrRequestOnError = function (
     xhr,
     method,
     url,
@@ -1881,7 +1886,7 @@ export function xapiwrapper(ADL) {
     }
   }
 
-  ADL.formatHash = function(hash) {
+  ADL.formatHash = function (hash) {
     return hash === '*' ? hash : '"' + hash + '"'
   }