From 372b8c92c5fcae729bf5642e252e26bb42e85ae9 Mon Sep 17 00:00:00 2001 From: turtledreams <62231246+turtledreams@users.noreply.github.com> Date: Fri, 10 Jan 2025 00:51:43 +0900 Subject: [PATCH] logging update --- lib/countly.js | 14 ++++++++------ lib/countly.min.js | 43 +++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/lib/countly.js b/lib/countly.js index 22d771f2..16eb2eca 100644 --- a/lib/countly.js +++ b/lib/countly.js @@ -4046,7 +4046,6 @@ wrapper.appendChild(iframe); _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "present_feedback_widget, Appended the iframe"); add_event_listener(window, "message", function (e) { - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "present_feedback_widget, Received message from widget with origin: [" + e.origin + "] and data: [" + e.data + "]"); var data = {}; try { data = JSON.parse(e.data); @@ -4055,9 +4054,11 @@ } if (data.close !== true) { // to not mix with content we check against true value - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "present_feedback_widget, These are not the closing signals you are looking for"); + // this.#log(logLevelEnums.DEBUG, "present_feedback_widget, These are not the closing signals you are looking for"); + // silent ignore return; } + _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "present_feedback_widget, Received message from widget with origin: [" + e.origin + "] and data: [" + e.data + "]"); document.getElementById("countly-" + feedbackWidgetFamily + "-wrapper-" + presentableFeedback._id).style.display = "none"; document.getElementById("csbg").style.display = "none"; _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "present_feedback_widget, Closed the widget"); @@ -4432,20 +4433,21 @@ document.body.appendChild(iframe); }); _classPrivateFieldInitSpec(this, _interpretContentMessage, function (messageEvent) { - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Received message from: [" + messageEvent.origin + "] with data: [" + JSON.stringify(messageEvent.data) + "]"); if (messageEvent.origin !== _this.url) { - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.ERROR, "sendContentRequest, Received message from invalid origin"); + // this.#log(logLevelEnums.ERROR, "sendContentRequest, Received message from invalid origin"); + // silent ignore return; } + _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Received message from: [" + messageEvent.origin + "] with data: [" + JSON.stringify(messageEvent.data) + "]"); var _messageEvent$data = messageEvent.data, close = _messageEvent$data.close, link = _messageEvent$data.link, event = _messageEvent$data.event, resize_me = _messageEvent$data.resize_me; if (event) { - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Received event: [" + event + "]"); + _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Received event"); if (close === 1) { - _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Closing content frame for event: [" + event + "]"); + _classPrivateFieldGet2(_log, _this).call(_this, logLevelEnums.DEBUG, "sendContentRequest, Closing content frame for event"); _classPrivateFieldGet2(_closeContentFrame, _this).call(_this); } if (!Array.isArray(event)) { diff --git a/lib/countly.min.js b/lib/countly.min.js index f93a2151..27654838 100644 --- a/lib/countly.min.js +++ b/lib/countly.min.js @@ -134,28 +134,27 @@ a).call(a,f.DEBUG,"present_feedback_widget, Loading css for rating widget.");var h&&(u.sg=h);n+="&custom="+JSON.stringify(u);n+="&origin="+k;n+="&widget_v=web";var y=document.createElement("iframe");y.src=n;y.name="countly-"+r+"-iframe";y.id="countly-"+r+"-iframe";var G=!1;y.onload=function(){G&&(document.getElementById("countly-"+r+"-wrapper-"+c._id).style.display="none",document.getElementById("csbg").style.display="none");G=!0;b(e,a).call(a,f.DEBUG,"present_feedback_widget, Loaded iframe.")};for(var U=document.getElementById("csbg");U;)U.remove(),U=document.getElementById("csbg"), b(e,a).call(a,f.DEBUG,"present_feedback_widget, Removing past overlay.");var J=document.getElementsByClassName("countly-"+r+"-wrapper");for(h=0;h');Ya.appendChild(J);if("rating"===c.type){var $b=document.createElement("div");$b.className="countly-ratings-overlay";$b.id="countly-ratings-overlay-"+c._id;J.appendChild($b);b(e,a).call(a,f.DEBUG,"present_feedback_widget, appended the rating overlay to wrapper"); -D(document.getElementById("countly-ratings-overlay-"+c._id),"click",function(){document.getElementById("countly-ratings-wrapper-"+c._id).style.display="none"})}J.appendChild(y);b(e,a).call(a,f.DEBUG,"present_feedback_widget, Appended the iframe");D(window,"message",function(E){b(e,a).call(a,f.DEBUG,"present_feedback_widget, Received message from widget with origin: ["+E.origin+"] and data: ["+E.data+"]");var V={};try{V=JSON.parse(E.data)}catch(Ic){b(e,a).call(a,f.ERROR,"present_feedback_widget, Error while parsing message body "+ -Ic)}!0!==V.close?b(e,a).call(a,f.DEBUG,"present_feedback_widget, These are not the closing signals you are looking for"):(document.getElementById("countly-"+r+"-wrapper-"+c._id).style.display="none",document.getElementById("csbg").style.display="none",b(e,a).call(a,f.DEBUG,"present_feedback_widget, Closed the widget"))});var Ia=function(E){document.getElementById("countly-surveys-wrapper-"+E._id).style.display="block";document.getElementById("csbg").style.display="block"},Dc=function(E){for(var V= -document.getElementsByClassName("countly-feedback-sticker");0E.appearance.text_color.length?"#"+E.appearance.text_color:E.appearance.text_color,V.style.backgroundColor=7>E.appearance.bg_color.length?"#"+E.appearance.bg_color: -E.appearance.bg_color,V.className="countly-feedback-sticker "+E.appearance.position+"-"+E.appearance.size,V.id="countly-feedback-sticker-"+E._id,document.body.appendChild(V),D(document.getElementById("countly-feedback-sticker-"+E._id),"click",function(){document.getElementById("countly-ratings-wrapper-"+E._id).style.display="flex";document.getElementById("csbg").style.display="block"}));D(document.getElementById("countly-feedback-close-icon-"+E._id),"click",function(){document.getElementById("countly-ratings-wrapper-"+ -E._id).style.display="none";document.getElementById("csbg").style.display="none"})};if("survey"===c.type){var W=!1;switch(c.showPolicy){case "afterPageLoad":"complete"===document.readyState?W||(W=!0,Ia(c)):D(document,"readystatechange",function(E){"complete"!==E.target.readyState||W||(W=!0,Ia(c))});break;case "afterConstantDelay":setTimeout(function(){W||(W=!0,Ia(c))},1E4);break;case "onAbandon":"complete"===document.readyState?D(document,"mouseleave",function(){W||(W=!0,Ia(c))}):D(document,"readystatechange", -function(E){"complete"===E.target.readyState&&D(document,"mouseleave",function(){W||(W=!0,Ia(c))})});break;case "onScrollHalfwayDown":D(window,"scroll",function(){if(!W){var E=Math.max(window.scrollY,document.body.scrollTop,document.documentElement.scrollTop),V=nb();E>=V/2&&(W=!0,Ia(c))}});break;default:W||(W=!0,Ia(c))}}else if("nps"===c.type)document.getElementById("countly-"+r+"-wrapper-"+c._id).style.display="block",document.getElementById("csbg").style.display="block";else if("rating"===c.type){var Bb= -!1;"complete"===document.readyState?Bb||(Bb=!0,Dc(c)):D(document,"readystatechange",function(E){"complete"!==E.target.readyState||Bb||(Bb=!0,Dc(c))})}}catch(E){b(e,a).call(a,f.ERROR,"present_feedback_widget, Something went wrong while presenting the widget: "+E)}}}else b(e,a).call(a,f.WARNING,"present_feedback_widget, window object is not available. Not presenting feedback widget.")});w(this,"recordError",function(c,d,g){b(e,a).call(a,f.INFO,"recordError, Recording error");if(a.check_consent("crashes")&& -c){g=g||b(cb,a);var h="";"object"===R(c)?"undefined"!==typeof c.stack?h=c.stack:("undefined"!==typeof c.name&&(h+=c.name+":"),"undefined"!==typeof c.message&&(h+=c.message+"\n"),"undefined"!==typeof c.fileName&&(h+="in "+c.fileName+"\n"),"undefined"!==typeof c.lineNumber&&(h+="on "+c.lineNumber),"undefined"!==typeof c.columnNumber&&(h+=":"+c.columnNumber)):h=c+"";if(h.length>a.maxStackTraceLineLength*a.maxStackTraceLinesPerThread){b(e,a).call(a,f.DEBUG,"record_error, Error stack is too long will be truncated"); -c=h.split("\n");c.length>a.maxStackTraceLinesPerThread&&(c=c.splice(0,a.maxStackTraceLinesPerThread));h=0;for(var n=c.length;ha.maxStackTraceLineLength&&(c[h]=c[h].substring(0,a.maxStackTraceLineLength));h=c.join("\n")}d=!!d;c=b(jb,a).call(a);h={_resolution:c._resolution,_error:h,_app_version:c._app_version,_run:M()-b(pb,a),_not_os_specific:!0,_javascript:!0};if(n=navigator.battery||navigator.webkitBattery||navigator.mozBattery||navigator.msBattery)h._bat=Math.floor(100*n.level); -"undefined"!==typeof navigator.onLine&&(h._online=!!navigator.onLine);A&&(h._background=!document.hasFocus());0=h.height&& -(g=c.geo.l);d.style.left=g.x+"px";d.style.top=g.y+"px";d.style.width=g.w+"px";d.style.height=g.h+"px";d.style.border="none";d.style.zIndex="999999";document.body.appendChild(d)}else b(e,a).call(a,f.DEBUG,"displayContent, no content to display")});q(this,qc,function(c){b(e,a).call(a,f.DEBUG,"sendContentRequest, Received message from: ["+c.origin+"] with data: ["+JSON.stringify(c.data)+"]");if(c.origin!==a.url)b(e,a).call(a,f.ERROR,"sendContentRequest, Received message from invalid origin");else{var d= -c.data;c=d.close;var g=d.link,h=d.event;d=d.resize_me;if(h){b(e,a).call(a,f.DEBUG,"sendContentRequest, Received event: ["+h+"]");1===c&&(b(e,a).call(a,f.DEBUG,"sendContentRequest, Closing content frame for event: ["+h+"]"),b(tb,a).call(a));if(!Array.isArray(h)){if("object"===R(h))throw new TypeError('"event" is read-only');b(e,a).call(a,f.ERROR,"sendContentRequest, Invalid event type: ["+R(h)+"]");return}for(var n=0;n=h.height&&(g=d.l),d=document.getElementById(b(Xa,a)),d.style.left=g.x+"px",d.style.top=g.y+"px",d.style.width=g.w+"px",d.style.height=g.h+"px");1===c&&b(tb,a).call(a)}});q(this,tb,function(){var c=document.getElementById(b(Xa,a));c&&(c.remove(),b(e,a).call(a,f.DEBUG,"sendContentRequest, removed iframe"), -b(Ea,a)&&b(Qb,a).call(a,!0))});q(this,Fa,function(){0E.appearance.text_color.length?"#"+E.appearance.text_color:E.appearance.text_color,V.style.backgroundColor=7>E.appearance.bg_color.length?"#"+E.appearance.bg_color:E.appearance.bg_color,V.className="countly-feedback-sticker "+E.appearance.position+ +"-"+E.appearance.size,V.id="countly-feedback-sticker-"+E._id,document.body.appendChild(V),D(document.getElementById("countly-feedback-sticker-"+E._id),"click",function(){document.getElementById("countly-ratings-wrapper-"+E._id).style.display="flex";document.getElementById("csbg").style.display="block"}));D(document.getElementById("countly-feedback-close-icon-"+E._id),"click",function(){document.getElementById("countly-ratings-wrapper-"+E._id).style.display="none";document.getElementById("csbg").style.display= +"none"})};if("survey"===c.type){var W=!1;switch(c.showPolicy){case "afterPageLoad":"complete"===document.readyState?W||(W=!0,Ia(c)):D(document,"readystatechange",function(E){"complete"!==E.target.readyState||W||(W=!0,Ia(c))});break;case "afterConstantDelay":setTimeout(function(){W||(W=!0,Ia(c))},1E4);break;case "onAbandon":"complete"===document.readyState?D(document,"mouseleave",function(){W||(W=!0,Ia(c))}):D(document,"readystatechange",function(E){"complete"===E.target.readyState&&D(document,"mouseleave", +function(){W||(W=!0,Ia(c))})});break;case "onScrollHalfwayDown":D(window,"scroll",function(){if(!W){var E=Math.max(window.scrollY,document.body.scrollTop,document.documentElement.scrollTop),V=nb();E>=V/2&&(W=!0,Ia(c))}});break;default:W||(W=!0,Ia(c))}}else if("nps"===c.type)document.getElementById("countly-"+r+"-wrapper-"+c._id).style.display="block",document.getElementById("csbg").style.display="block";else if("rating"===c.type){var Bb=!1;"complete"===document.readyState?Bb||(Bb=!0,Dc(c)):D(document, +"readystatechange",function(E){"complete"!==E.target.readyState||Bb||(Bb=!0,Dc(c))})}}catch(E){b(e,a).call(a,f.ERROR,"present_feedback_widget, Something went wrong while presenting the widget: "+E)}}}else b(e,a).call(a,f.WARNING,"present_feedback_widget, window object is not available. Not presenting feedback widget.")});w(this,"recordError",function(c,d,g){b(e,a).call(a,f.INFO,"recordError, Recording error");if(a.check_consent("crashes")&&c){g=g||b(cb,a);var h="";"object"===R(c)?"undefined"!==typeof c.stack? +h=c.stack:("undefined"!==typeof c.name&&(h+=c.name+":"),"undefined"!==typeof c.message&&(h+=c.message+"\n"),"undefined"!==typeof c.fileName&&(h+="in "+c.fileName+"\n"),"undefined"!==typeof c.lineNumber&&(h+="on "+c.lineNumber),"undefined"!==typeof c.columnNumber&&(h+=":"+c.columnNumber)):h=c+"";if(h.length>a.maxStackTraceLineLength*a.maxStackTraceLinesPerThread){b(e,a).call(a,f.DEBUG,"record_error, Error stack is too long will be truncated");c=h.split("\n");c.length>a.maxStackTraceLinesPerThread&& +(c=c.splice(0,a.maxStackTraceLinesPerThread));h=0;for(var n=c.length;ha.maxStackTraceLineLength&&(c[h]=c[h].substring(0,a.maxStackTraceLineLength));h=c.join("\n")}d=!!d;c=b(jb,a).call(a);h={_resolution:c._resolution,_error:h,_app_version:c._app_version,_run:M()-b(pb,a),_not_os_specific:!0,_javascript:!0};if(n=navigator.battery||navigator.webkitBattery||navigator.mozBattery||navigator.msBattery)h._bat=Math.floor(100*n.level);"undefined"!==typeof navigator.onLine&&(h._online=!!navigator.onLine); +A&&(h._background=!document.hasFocus());0=h.height&&(g=c.geo.l);d.style.left=g.x+"px";d.style.top=g.y+"px";d.style.width= +g.w+"px";d.style.height=g.h+"px";d.style.border="none";d.style.zIndex="999999";document.body.appendChild(d)}else b(e,a).call(a,f.DEBUG,"displayContent, no content to display")});q(this,qc,function(c){if(c.origin===a.url){b(e,a).call(a,f.DEBUG,"sendContentRequest, Received message from: ["+c.origin+"] with data: ["+JSON.stringify(c.data)+"]");var d=c.data;c=d.close;var g=d.link,h=d.event;d=d.resize_me;if(h){b(e,a).call(a,f.DEBUG,"sendContentRequest, Received event");1===c&&(b(e,a).call(a,f.DEBUG,"sendContentRequest, Closing content frame for event"), +b(tb,a).call(a));if(!Array.isArray(h)){if("object"===R(h))throw new TypeError('"event" is read-only');b(e,a).call(a,f.ERROR,"sendContentRequest, Invalid event type: ["+R(h)+"]");return}for(var n=0;n=h.height&&(g=d.l),d=document.getElementById(b(Xa,a)),d.style.left=g.x+"px",d.style.top=g.y+"px",d.style.width=g.w+"px",d.style.height=g.h+"px");1===c&&b(tb,a).call(a)}});q(this,tb,function(){var c=document.getElementById(b(Xa,a));c&&(c.remove(),b(e,a).call(a,f.DEBUG,"sendContentRequest, removed iframe"),b(Ea,a)&&b(Qb,a).call(a,!0))});q(this,Fa,function(){0c.trigger_font_color.length?"#"+c.trigger_font_color:c.trigger_font_color;y.style.backgroundColor=7>c.trigger_bg_color.length?"#"+c.trigger_bg_color:c.trigger_bg_color;y.className="countly-feedback-sticker "+c.trigger_position+"-"+c.trigger_size;y.id="countly-feedback-sticker-"+c._id;k.appendChild(r);y.appendChild(k);y.appendChild(u);document.body.appendChild(y);var G=document.getElementById("smileyPathInStickerSvg"); G&&(G.style.fill=7>c.trigger_font_color.length?"#"+c.trigger_font_color:c.trigger_font_color);D(document.getElementById("countly-feedback-sticker-"+c._id),"click",function(){document.getElementById("countly-iframe-wrapper-"+c._id).style.display="block";document.getElementById("cfbg").style.display="block"})}else document.getElementById("countly-iframe-wrapper-"+c._id).style.display="block",document.getElementById("cfbg").style.display="block"}catch(U){b(e,a).call(a,f.ERROR,"Somethings went wrong while element injecting process: "+ U)}else b(e,a).call(a,f.WARNING,"processWidget, window object is not available. Not processing widget.")});q(this,Sb,function(){var c;if("undefined"!==typeof a.onload&&0