From 6b37abf045c23f154c853e5e01b1a24469b9d428 Mon Sep 17 00:00:00 2001
From: Nikos M <workingclasscode@gmail.com>
Date: Fri, 10 Jun 2022 11:21:55 +0300
Subject: [PATCH] v.1.0.0 contd

---
 README.md               |  2 +-
 src/AjaxListener.js     | 33 ++++++++++++++++++++++++++++-----
 src/AjaxListener.min.js |  2 +-
 test/listener.js        |  2 +-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e1df7b0..4aa98ca 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Version: **1.0.0** (5 kB minified)
 function mylistener(req, res)
 {
     console.log('REQUEST', 'API', req.getAPI(), 'Method', req.getMethod(), 'URL', req.getURL(), 'Headers', req.getHeaders(), 'Body', req.getBody());
-    console.log('RESPONSE', 'API', res.getAPI(), 'Status', res.getStatus(), 'Headers', res.getHeaders(), 'Body', res.getBody());
+    console.log('RESPONSE', 'API', res.getAPI(), 'Status', res.getStatus(), 'URL', res.getURL(), 'Headers', res.getHeaders(), 'Body', res.getBody());
 }
 
 AjaxListener.install().onRequest(mylistener);
diff --git a/src/AjaxListener.js b/src/AjaxListener.js
index 447d375..94c31c5 100644
--- a/src/AjaxListener.js
+++ b/src/AjaxListener.js
@@ -213,14 +213,16 @@ Request.prototype = {
 };
 AjaxListener.Request = Request;
 
-function Response(api, status, _headersFactory, _body)
+function Response(api, status, _url, _headersFactory, _body)
 {
-    var self = this, headers = null, body = null;
+    var self = this, url = null, headers = null, body = null;
 
     self.dispose = function() {
         status = null;
+        _url = null;
         _headersFactory = null;
         _body = null;
+        url = null;
         headers = null;
         body = null;
         return self;
@@ -231,6 +233,26 @@ function Response(api, status, _headersFactory, _body)
     self.getStatus = function() {
         return status;
     };
+    self.getURL = function(raw) {
+        if (true === raw) return _url;
+        if (null == url && null != _url)
+        {
+            var u = new window.URL(_url, get_base_url());
+            url = {
+                href: u.href,
+                origin: u.origin,
+                hostname: u.hostname,
+                protocol: u.protocol,
+                host: u.host,
+                port: u.port,
+                path: u.pathname,
+                query: u.search,
+                hash: u.hash,
+                queryParams: u.search && u.search.length ? parse_url_params(u.search.slice(1)) : {}
+            };
+        }
+        return url;
+    };
     self.getHeaders = function() {
         if (null == headers && null != _headersFactory)
         {
@@ -267,6 +289,7 @@ Response.prototype = {
     ,dispose: null
     ,getAPI: null
     ,getStatus: null
+    ,getURL: null
     ,getHeaders: null
     ,getBody: null
 };
@@ -284,7 +307,7 @@ function listenerFetch(request)
                     request.text().then(function(requestText) {
                         notify(
                         new Request('fetch', request.method, request.url, factory(extract_headers, request.headers), requestText),
-                        new Response('fetch', response.status, factory(extract_headers, response.headers), responseText)
+                        new Response('fetch', response.status, response.url || request.url, factory(extract_headers, response.headers), responseText)
                         );
                     });
                 }
@@ -292,7 +315,7 @@ function listenerFetch(request)
                 {
                     notify(
                     new Request('fetch', 'GET', request, factory(null, {}), ''),
-                    new Response('fetch', response.status, factory(extract_headers, response.headers), responseText)
+                    new Response('fetch', response.status, response. url || request, factory(extract_headers, response.headers), responseText)
                     );
                 }
             })/*.catch(function(err) {})*/;
@@ -323,7 +346,7 @@ function listenerOpen(method, url)
         {
             notify(
             new Request('xhr', method, url, factory(null, headers), null == body ? '' : body),
-            new Response('xhr', self.status, factory(parse_headers, self.getAllResponseHeaders()), self.responseText)
+            new Response('xhr', self.status, self.responseURL && self.responseURL.length ? self.responseURL : url, factory(parse_headers, self.getAllResponseHeaders()), self.responseText)
             );
         }
     };
diff --git a/src/AjaxListener.min.js b/src/AjaxListener.min.js
index 3db3e42..de99dc7 100644
--- a/src/AjaxListener.min.js
+++ b/src/AjaxListener.min.js
@@ -5,4 +5,4 @@
 * https://github.com/foo123/AjaxListener.js
 *
 **/
-!function(e,t){"use strict";e[t]=function(){"use strict";var r={VERSION:"1.0.0"},l=[],n=false,s=Object.prototype.hasOwnProperty,e=Function.prototype.toString,t=/[\r\n]+/,o=/^[^\[\]\.]+(\[[^\[\]\.]+\])+(\[\])?$/,i=/\[([^\[\]]+)\]/g,u=/^\s*function\s*[A-Za-z0-9_$]+\s*\([^\(\)]*\)\s*\{\s*\[native code\]\s*\}\s*$/i,f=window.fetch,a=window.XMLHttpRequest,c,p,d;function h(){return window.location.origin+window.location.pathname}function g(n){return"function"===typeof n&&u.test(e.call(n))}function w(n){return window.FormData&&n instanceof window.FormData}function y(n){return o.test(n)?n.replace(i,".$1").split(".").map(function(n){return decodeURIComponent(n)}):[decodeURIComponent(n)]}function v(n,e,t){for(var r,o=0,i=e.length;o<i;++o){r=e[o];if(o+1<i){if(!s.call(n,r))n[r]={};n=n[r]}else{if("[]"===r.slice(-2))r=r.slice(0,-2);if(s.call(n,r)){if(n[r].push)n[r].push(t);else n[r]=[n[r],t]}else{n[r]=t}}}}function m(n,e){return String(n).trim().split("&").reduce(function(n,e){e=e.split("=");var t=e[0].length?y(e[0]):null;if(t&&t.length)v(n,t,e[1]?e[1].length?decodeURIComponent(e[1]):"":true);return n},e||{})}function x(n){return JSON.parse(n)}function L(r,n){return Array.from(r.keys()).reduce(function(n,e){var t=r.getAll(e);n[e]=1===t.length?t[0]:t;return n},n||{})}function R(n){return String(n).trim().split(t).reduce(function(n,e){e=e.trim();if(e.length){var t=e.split(": "),r=t.shift(),o=t.join(": ");n[r.toLowerCase()]=o}return n},{})}function j(t){return Array.from(t.keys()).reduce(function(n,e){n[e.toLowerCase()]=t.get(e);return n},{})}function S(n,e){return"function"===typeof n?function(){return n(e)}:function(){return e}}function O(r,o){setTimeout(function(){for(var n=l.slice(),e=0,t=n.length;e<t;++e)n[e](r,o);r.dispose();o.dispose();r=null;o=null},0)}function A(n,e,t,r,o){var i=this,u=null,l=null,s=null;e=String(e).toUpperCase();i.dispose=function(){t=null;r=null;o=null;e=null;u=null;l=null;s=null;return i};i.getAPI=function(){return n};i.getMethod=function(){return e};i.getURL=function(n){if(true===n)return t;if(null==u&&null!=t){var e=new window.URL(t,h());u={href:e.href,origin:e.origin,hostname:e.hostname,protocol:e.protocol,host:e.host,port:e.port,path:e.pathname,query:e.search,hash:e.hash,queryParams:e.search&&e.search.length?m(e.search.slice(1)):{}}}return u};i.getHeaders=function(){if(null==l&&null!=r){l=r()}return l};i.getBody=function(n){if(true===n)return o;if(null==s&&null!=o){if(w(o)){return s=L(o)}var e=String(i.getHeaders()["content-type"]||"");if(-1!==e.indexOf("application/x-www-form-urlencoded")){s=m(o)}else if(-1!==e.indexOf("application/json")||-1!==e.indexOf("application/vnd.api+json")){s=x(o)}else{s=o}}return s}}function H(n,e,t,r){var o=this,i=null,u=null;o.dispose=function(){e=null;t=null;r=null;i=null;u=null;return o};o.getAPI=function(){return n};o.getStatus=function(){return e};o.getHeaders=function(){if(null==i&&null!=t){i=t()}return i};o.getBody=function(n){if(true===n)return r;if(null==u&&null!=r){var e=String(o.getHeaders()["content-type"]||"");if(-1!==e.indexOf("application/x-www-form-urlencoded")){u=m(r)}else if(-1!==e.indexOf("application/json")||-1!==e.indexOf("application/vnd.api+json")){u=x(r)}else{u=r}}return u}}function E(r){return f.apply(f,arguments).then(function(t){if(l.length){t.text().then(function(e){if(r instanceof window.Request){r.text().then(function(n){O(new A("fetch",r.method,r.url,S(j,r.headers),n),new H("fetch",t.status,S(j,t.headers),e))})}else{O(new A("fetch","GET",r,S(null,{}),""),new H("fetch",t.status,S(j,t.headers),e))}})}return t})}function I(t,r){var o=this,i=null,u={},n;o.send=function(){if(arguments.length)i=arguments[0];return p.apply(o,arguments)};o.setRequestHeader=function(n,e){var t=String(n).toLowerCase();u[t]=s.call(u,t)?u[t]+", "+String(e):String(e);return d.apply(o,arguments)};n=function n(e){o.removeEventListener("load",n);o.removeEventListener("error",n);o.removeEventListener("abort",n);if("load"===e.type&&l.length){O(new A("xhr",t,r,S(null,u),null==i?"":i),new H("xhr",o.status,S(R,o.getAllResponseHeaders()),o.responseText))}};o.addEventListener("load",n);o.addEventListener("error",n);o.addEventListener("abort",n);if(arguments.length<1)t="GET";if(arguments.length<2)r="";return c.apply(o,arguments)}return A.prototype={constructor:A,dispose:null,getAPI:null,getMethod:null,getURL:null,getHeaders:null,getBody:null},r.Request=A,H.prototype={constructor:H,dispose:null,getAPI:null,getStatus:null,getHeaders:null,getBody:null},r.Response=H,(I.ajaxListener=E.ajaxListener=r).install=function(){return n||(f&&(f.ajaxListener&&(f.ajaxListener.uninstall(),f=window.fetch),g(f)&&(window.fetch=E,n=!0)),a&&(a.prototype.open.ajaxListener&&a.prototype.open.ajaxListener.uninstall(),g(a.prototype.open)&&(c=a.prototype.open,p=a.prototype.send,d=a.prototype.setRequestHeader,a.prototype.open=I,n=!0))),r},r.isInstalled=function(){return n},r.uninstall=function(){return n&&(g(f)&&(window.fetch=f),g(c)&&(a.prototype.open=c),d=p=c=null,n=!1),r},r.onRequest=function(n,e){var t;return"function"==typeof n&&(t=l.indexOf(n),!1===e?-1!==t&&l.splice(t,1):-1===t&&l.push(n)),r},r}(),"function"==typeof define&&define.amd&&define(function(n){return e[t]})}("undefined"!=typeof self?self:this,"AjaxListener");
\ No newline at end of file
+!function(e,t){"use strict";e[t]=function(){"use strict";var r={VERSION:"1.0.0"},l=[],n=false,s=Object.prototype.hasOwnProperty,e=Function.prototype.toString,t=/[\r\n]+/,o=/^[^\[\]\.]+(\[[^\[\]\.]+\])+(\[\])?$/,u=/\[([^\[\]]+)\]/g,i=/^\s*function\s*[A-Za-z0-9_$]+\s*\([^\(\)]*\)\s*\{\s*\[native code\]\s*\}\s*$/i,a=window.fetch,f=window.XMLHttpRequest,c,p,d;function h(){return window.location.origin+window.location.pathname}function g(n){return"function"===typeof n&&i.test(e.call(n))}function w(n){return window.FormData&&n instanceof window.FormData}function y(n){return o.test(n)?n.replace(u,".$1").split(".").map(function(n){return decodeURIComponent(n)}):[decodeURIComponent(n)]}function m(n,e,t){for(var r,o=0,u=e.length;o<u;++o){r=e[o];if(o+1<u){if(!s.call(n,r))n[r]={};n=n[r]}else{if("[]"===r.slice(-2))r=r.slice(0,-2);if(s.call(n,r)){if(n[r].push)n[r].push(t);else n[r]=[n[r],t]}else{n[r]=t}}}}function v(n,e){return String(n).trim().split("&").reduce(function(n,e){e=e.split("=");var t=e[0].length?y(e[0]):null;if(t&&t.length)m(n,t,e[1]?e[1].length?decodeURIComponent(e[1]):"":true);return n},e||{})}function L(n){return JSON.parse(n)}function x(r,n){return Array.from(r.keys()).reduce(function(n,e){var t=r.getAll(e);n[e]=1===t.length?t[0]:t;return n},n||{})}function R(n){return String(n).trim().split(t).reduce(function(n,e){e=e.trim();if(e.length){var t=e.split(": "),r=t.shift(),o=t.join(": ");n[r.toLowerCase()]=o}return n},{})}function j(t){return Array.from(t.keys()).reduce(function(n,e){n[e.toLowerCase()]=t.get(e);return n},{})}function S(n,e){return"function"===typeof n?function(){return n(e)}:function(){return e}}function U(r,o){setTimeout(function(){for(var n=l.slice(),e=0,t=n.length;e<t;++e)n[e](r,o);r.dispose();o.dispose();r=null;o=null},0)}function O(n,e,t,r,o){var u=this,i=null,l=null,s=null;e=String(e).toUpperCase();u.dispose=function(){t=null;r=null;o=null;e=null;i=null;l=null;s=null;return u};u.getAPI=function(){return n};u.getMethod=function(){return e};u.getURL=function(n){if(true===n)return t;if(null==i&&null!=t){var e=new window.URL(t,h());i={href:e.href,origin:e.origin,hostname:e.hostname,protocol:e.protocol,host:e.host,port:e.port,path:e.pathname,query:e.search,hash:e.hash,queryParams:e.search&&e.search.length?v(e.search.slice(1)):{}}}return i};u.getHeaders=function(){if(null==l&&null!=r){l=r()}return l};u.getBody=function(n){if(true===n)return o;if(null==s&&null!=o){if(w(o)){return s=x(o)}var e=String(u.getHeaders()["content-type"]||"");if(-1!==e.indexOf("application/x-www-form-urlencoded")){s=v(o)}else if(-1!==e.indexOf("application/json")||-1!==e.indexOf("application/vnd.api+json")){s=L(o)}else{s=o}}return s}}function q(n,e,t,r,o){var u=this,i=null,l=null,s=null;u.dispose=function(){e=null;t=null;r=null;o=null;i=null;l=null;s=null;return u};u.getAPI=function(){return n};u.getStatus=function(){return e};u.getURL=function(n){if(true===n)return t;if(null==i&&null!=t){var e=new window.URL(t,h());i={href:e.href,origin:e.origin,hostname:e.hostname,protocol:e.protocol,host:e.host,port:e.port,path:e.pathname,query:e.search,hash:e.hash,queryParams:e.search&&e.search.length?v(e.search.slice(1)):{}}}return i};u.getHeaders=function(){if(null==l&&null!=r){l=r()}return l};u.getBody=function(n){if(true===n)return o;if(null==s&&null!=o){var e=String(u.getHeaders()["content-type"]||"");if(-1!==e.indexOf("application/x-www-form-urlencoded")){s=v(o)}else if(-1!==e.indexOf("application/json")||-1!==e.indexOf("application/vnd.api+json")){s=L(o)}else{s=o}}return s}}function A(r){return a.apply(a,arguments).then(function(t){if(l.length){t.text().then(function(e){if(r instanceof window.Request){r.text().then(function(n){U(new O("fetch",r.method,r.url,S(j,r.headers),n),new q("fetch",t.status,t.url||r.url,S(j,t.headers),e))})}else{U(new O("fetch","GET",r,S(null,{}),""),new q("fetch",t.status,t.url||r,S(j,t.headers),e))}})}return t})}function H(t,r){var o=this,u=null,i={},n;o.send=function(){if(arguments.length)u=arguments[0];return p.apply(o,arguments)};o.setRequestHeader=function(n,e){var t=String(n).toLowerCase();i[t]=s.call(i,t)?i[t]+", "+String(e):String(e);return d.apply(o,arguments)};n=function n(e){o.removeEventListener("load",n);o.removeEventListener("error",n);o.removeEventListener("abort",n);if("load"===e.type&&l.length){U(new O("xhr",t,r,S(null,i),null==u?"":u),new q("xhr",o.status,o.responseURL&&o.responseURL.length?o.responseURL:r,S(R,o.getAllResponseHeaders()),o.responseText))}};o.addEventListener("load",n);o.addEventListener("error",n);o.addEventListener("abort",n);if(arguments.length<1)t="GET";if(arguments.length<2)r="";return c.apply(o,arguments)}return O.prototype={constructor:O,dispose:null,getAPI:null,getMethod:null,getURL:null,getHeaders:null,getBody:null},r.Request=O,q.prototype={constructor:q,dispose:null,getAPI:null,getStatus:null,getURL:null,getHeaders:null,getBody:null},r.Response=q,(H.ajaxListener=A.ajaxListener=r).install=function(){return n||(a&&(a.ajaxListener&&(a.ajaxListener.uninstall(),a=window.fetch),g(a)&&(window.fetch=A,n=!0)),f&&(f.prototype.open.ajaxListener&&f.prototype.open.ajaxListener.uninstall(),g(f.prototype.open)&&(c=f.prototype.open,p=f.prototype.send,d=f.prototype.setRequestHeader,f.prototype.open=H,n=!0))),r},r.isInstalled=function(){return n},r.uninstall=function(){return n&&(g(a)&&(window.fetch=a),g(c)&&(f.prototype.open=c),d=p=c=null,n=!1),r},r.onRequest=function(n,e){var t;return"function"==typeof n&&(t=l.indexOf(n),!1===e?-1!==t&&l.splice(t,1):-1===t&&l.push(n)),r},r}(),"function"==typeof define&&define.amd&&define(function(n){return e[t]})}("undefined"!=typeof self?self:this,"AjaxListener");
\ No newline at end of file
diff --git a/test/listener.js b/test/listener.js
index e91675c..e4508a7 100644
--- a/test/listener.js
+++ b/test/listener.js
@@ -3,7 +3,7 @@
 function mylistener(req, res)
 {
     console.log('REQUEST', 'API', req.getAPI(), 'Method', req.getMethod(), 'URL', req.getURL(), 'Headers', req.getHeaders(), 'Body', req.getBody());
-    console.log('RESPONSE', 'API', res.getAPI(), 'Status', res.getStatus(), 'Headers', res.getHeaders(), 'Body', res.getBody());
+    console.log('RESPONSE', 'API', res.getAPI(), 'Status', res.getStatus(), 'URL', res.getURL(), 'Headers', res.getHeaders(), 'Body', res.getBody());
 }
 
 AjaxListener.install().onRequest(mylistener);