merge master

CHANGELOG.md

@@ -14,11 +14,23 @@
 
 - `prevent-xhr` and `trusted-replace-xhr-response` closure bug on multiple requests [#261](https://github.com/AdguardTeam/Scriptlets/issues/261)
 
-## Unreleased 1.7.x
+## v1.7.20
+
+### Added
+
+- `isBlocking()` method for Redirects class
+- `file` field for redirect type
+
+### Fixed
+
+- Redirects types.
+
+## v1.7.19
 
 ### Fixed
 
 - `prevent-addEventListener` and `log-addEventListener` loosing context when encountering already bound `.addEventListener`
+- `google-ima3` conversion
 
 ## v1.7.14
 

README.md

@@ -427,6 +427,11 @@ const redirects = new Redirects(rawYaml)
  */
 const redirect = redirect.getRedirect('noopjs');
 
+/**
+ * Check if redirect is blocking, e.g. click2load.html
+ */
+const isBlocking = redirect.isBlocking('click2load.html');
+
 /**
  * Redirect - object with following props
  * {

dist/build.txt

@@ -1 +1 @@
-version=1.7.14
+version=1.7.20

dist/redirects.json

@@ -226,7 +226,10 @@
     },
     {
         "title": "google-ima3",
-        "aliases": [],
+        "aliases": [
+            "ubo-google-ima.js",
+            "google-ima.js"
+        ],
         "isBlocking": false,
         "contentType": "application/javascript;base64",
         "content": "!function(source,args){function noopFunc(){}function logMessage(source,message){var forced=arguments.length>2&&void 0!==arguments[2]&&arguments[2];(forced||source.verbose)&&console.log("".concat(source.name,": ").concat(message))}const updatedArgs=args?[].concat(source).concat(args):[source];try{(function(source){var ima={},AdDisplayContainer=function(){};AdDisplayContainer.prototype.destroy=noopFunc,AdDisplayContainer.prototype.initialize=noopFunc;var ImaSdkSettings=function(){};ImaSdkSettings.CompanionBackfillMode={ALWAYS:"always",ON_MASTER_AD:"on_master_ad"},ImaSdkSettings.VpaidMode={DISABLED:0,ENABLED:1,INSECURE:2},ImaSdkSettings.prototype={c:!0,f:{},i:!1,l:"",p:"",r:0,t:"",v:"",getCompanionBackfill:noopFunc,getDisableCustomPlaybackForIOS10Plus:function(){return this.i},getDisabledFlashAds:function(){return!0},getFeatureFlags:function(){return this.f},getLocale:function(){return this.l},getNumRedirects:function(){return this.r},getPlayerType:function(){return this.t},getPlayerVersion:function(){return this.v},getPpid:function(){return this.p},getVpaidMode:function(){return this.C},isCookiesEnabled:function(){return this.c},isVpaidAdapter:function(){return this.M},setCompanionBackfill:noopFunc,setAutoPlayAdBreaks:function(a){this.K=a},setCookiesEnabled:function(c){this.c=!!c},setDisableCustomPlaybackForIOS10Plus:function(i){this.i=!!i},setDisableFlashAds:noopFunc,setFeatureFlags:function(f){this.f=!!f},setIsVpaidAdapter:function(a){this.M=a},setLocale:function(l){this.l=!!l},setNumRedirects:function(r){this.r=!!r},setPageCorrelator:function(a){this.R=a},setPlayerType:function(t){this.t=!!t},setPlayerVersion:function(v){this.v=!!v},setPpid:function(p){this.p=!!p},setVpaidMode:function(a){this.C=a},setSessionId:noopFunc,setStreamCorrelator:noopFunc,setVpaidAllowed:noopFunc,CompanionBackfillMode:{ALWAYS:"always",ON_MASTER_AD:"on_master_ad"},VpaidMode:{DISABLED:0,ENABLED:1,INSECURE:2}};var EventHandler=function(){this.listeners=new Map,this._dispatch=function(e){for(var listeners=this.listeners.get(e.type)||[],_i=0,_Array$from=Array.from(listeners);_i<_Array$from.length;_i++){var listener=_Array$from[_i];try{listener(e)}catch(r){logMessage(source,r)}}},this.addEventListener=function(t,c){this.listeners.has(t)||this.listeners.set(t,new Set),this.listeners.get(t).add(c)},this.removeEventListener=function(t,c){var _this$listeners$get;null===(_this$listeners$get=this.listeners.get(t))||void 0===_this$listeners$get||_this$listeners$get.delete(c)}},AdsManager=new EventHandler;AdsManager.volume=1,AdsManager.collapse=noopFunc,AdsManager.configureAdsManager=noopFunc,AdsManager.destroy=noopFunc,AdsManager.discardAdBreak=noopFunc,AdsManager.expand=noopFunc,AdsManager.focus=noopFunc,AdsManager.getAdSkippableState=function(){return!1},AdsManager.getCuePoints=function(){return[0]},AdsManager.getCurrentAd=function(){return currentAd},AdsManager.getCurrentAdCuePoints=function(){return[]},AdsManager.getRemainingTime=function(){return 0},AdsManager.getVolume=function(){return this.volume},AdsManager.init=noopFunc,AdsManager.isCustomClickTrackingUsed=function(){return!1},AdsManager.isCustomPlaybackUsed=function(){return!1},AdsManager.pause=noopFunc,AdsManager.requestNextAdBreak=noopFunc,AdsManager.resize=noopFunc,AdsManager.resume=noopFunc,AdsManager.setVolume=function(v){this.volume=v},AdsManager.skip=noopFunc,AdsManager.start=function(){for(var _i2=0,_arr=[AdEvent.Type.ALL_ADS_COMPLETED,AdEvent.Type.CONTENT_RESUME_REQUESTED];_i2<_arr.length;_i2++){var type=_arr[_i2];try{this._dispatch(new ima.AdEvent(type))}catch(e){logMessage(source,e)}}},AdsManager.stop=noopFunc,AdsManager.updateAdsRenderingSettings=noopFunc;var manager=Object.create(AdsManager),AdsManagerLoadedEvent=function(type,adsRequest,userRequestContext){this.type=type,this.adsRequest=adsRequest,this.userRequestContext=userRequestContext};AdsManagerLoadedEvent.prototype={getAdsManager:function(){return manager},getUserRequestContext:function(){return this.userRequestContext?this.userRequestContext:{}}},AdsManagerLoadedEvent.Type={ADS_MANAGER_LOADED:"adsManagerLoaded"};var AdsLoader=EventHandler;AdsLoader.prototype.settings=new ImaSdkSettings,AdsLoader.prototype.contentComplete=noopFunc,AdsLoader.prototype.destroy=noopFunc,AdsLoader.prototype.getSettings=function(){return this.settings},AdsLoader.prototype.getVersion=function(){return"3.453.0"},AdsLoader.prototype.requestAds=function(adsRequest,userRequestContext){var _this=this;requestAnimationFrame((function(){var ADS_MANAGER_LOADED=AdsManagerLoadedEvent.Type.ADS_MANAGER_LOADED,event=new ima.AdsManagerLoadedEvent(ADS_MANAGER_LOADED,adsRequest,userRequestContext);_this._dispatch(event)}));var e=new ima.AdError("adPlayError",1205,1205,"The browser prevented playback initiated without user interaction.",adsRequest,userRequestContext);requestAnimationFrame((function(){_this._dispatch(new ima.AdErrorEvent(e))}))};var AdsRenderingSettings=noopFunc,AdsRequest=function(){};AdsRequest.prototype={setAdWillAutoPlay:noopFunc,setAdWillPlayMuted:noopFunc,setContinuousPlayback:noopFunc};var AdPodInfo=function(){};AdPodInfo.prototype={getAdPosition:function(){return 1},getIsBumper:function(){return!1},getMaxDuration:function(){return-1},getPodIndex:function(){return 1},getTimeOffset:function(){return 0},getTotalAds:function(){return 1}};var Ad=function(){};Ad.prototype={pi:new AdPodInfo,getAdId:function(){return""},getAdPodInfo:function(){return this.pi},getAdSystem:function(){return""},getAdvertiserName:function(){return""},getApiFramework:function(){return null},getCompanionAds:function(){return[]},getContentType:function(){return""},getCreativeAdId:function(){return""},getDealId:function(){return""},getDescription:function(){return""},getDuration:function(){return 8.5},getHeight:function(){return 0},getMediaUrl:function(){return null},getMinSuggestedDuration:function(){return-2},getSkipTimeOffset:function(){return-1},getSurveyUrl:function(){return null},getTitle:function(){return""},getTraffickingParametersString:function(){return""},getUiElements:function(){return[""]},getUniversalAdIdRegistry:function(){return"unknown"},getUniversalAdIds:function(){return[""]},getUniversalAdIdValue:function(){return"unknown"},getVastMediaBitrate:function(){return 0},getVastMediaHeight:function(){return 0},getVastMediaWidth:function(){return 0},getWidth:function(){return 0},getWrapperAdIds:function(){return[""]},getWrapperAdSystems:function(){return[""]},getWrapperCreativeIds:function(){return[""]},isLinear:function(){return!0},isSkippable:function(){return!0}};var CompanionAd=function(){};CompanionAd.prototype={getAdSlotId:function(){return""},getContent:function(){return""},getContentType:function(){return""},getHeight:function(){return 1},getWidth:function(){return 1}};var AdError=function(type,code,vast,message,adsRequest,userRequestContext){this.errorCode=code,this.message=message,this.type=type,this.adsRequest=adsRequest,this.userRequestContext=userRequestContext,this.getErrorCode=function(){return this.errorCode},this.getInnerError=function(){},this.getMessage=function(){return this.message},this.getType=function(){return this.type},this.getVastErrorCode=function(){return this.vastErrorCode},this.toString=function(){return"AdError ".concat(this.errorCode,": ").concat(this.message)}};AdError.ErrorCode={},AdError.Type={};var currentAd=function(){try{for(var _i3=0,_Object$values=Object.values(window.vidible._getContexts());_i3<_Object$values.length;_i3++){var _ctx$getPlayer,_ctx$getPlayer$div;if(null!==(_ctx$getPlayer=_Object$values[_i3].getPlayer())&&void 0!==_ctx$getPlayer&&null!==(_ctx$getPlayer$div=_ctx$getPlayer.div)&&void 0!==_ctx$getPlayer$div&&_ctx$getPlayer$div.innerHTML.includes("www.engadget.com"))return!0}}catch(e){}return!1}()?void 0:new Ad,AdEvent=function(type){this.type=type};AdEvent.prototype={getAd:function(){return currentAd},getAdData:function(){}},AdEvent.Type={AD_BREAK_READY:"adBreakReady",AD_BUFFERING:"adBuffering",AD_CAN_PLAY:"adCanPlay",AD_METADATA:"adMetadata",AD_PROGRESS:"adProgress",ALL_ADS_COMPLETED:"allAdsCompleted",CLICK:"click",COMPLETE:"complete",CONTENT_PAUSE_REQUESTED:"contentPauseRequested",CONTENT_RESUME_REQUESTED:"contentResumeRequested",DURATION_CHANGE:"durationChange",EXPANDED_CHANGED:"expandedChanged",FIRST_QUARTILE:"firstQuartile",IMPRESSION:"impression",INTERACTION:"interaction",LINEAR_CHANGE:"linearChange",LINEAR_CHANGED:"linearChanged",LOADED:"loaded",LOG:"log",MIDPOINT:"midpoint",PAUSED:"pause",RESUMED:"resume",SKIPPABLE_STATE_CHANGED:"skippableStateChanged",SKIPPED:"skip",STARTED:"start",THIRD_QUARTILE:"thirdQuartile",USER_CLOSE:"userClose",VIDEO_CLICKED:"videoClicked",VIDEO_ICON_CLICKED:"videoIconClicked",VIEWABLE_IMPRESSION:"viewable_impression",VOLUME_CHANGED:"volumeChange",VOLUME_MUTED:"mute"};var AdErrorEvent=function(error){this.error=error,this.type="adError",this.getError=function(){return this.error},this.getUserRequestContext=function(){var _this$error;return null!==(_this$error=this.error)&&void 0!==_this$error&&_this$error.userRequestContext?this.error.userRequestContext:{}}};AdErrorEvent.Type={AD_ERROR:"adError"};var CustomContentLoadedEvent=function(){};CustomContentLoadedEvent.Type={CUSTOM_CONTENT_LOADED:"deprecated-event"};var CompanionAdSelectionSettings=function(){};CompanionAdSelectionSettings.CreativeType={ALL:"All",FLASH:"Flash",IMAGE:"Image"},CompanionAdSelectionSettings.ResourceType={ALL:"All",HTML:"Html",IFRAME:"IFrame",STATIC:"Static"},CompanionAdSelectionSettings.SizeCriteria={IGNORE:"IgnoreSize",SELECT_EXACT_MATCH:"SelectExactMatch",SELECT_NEAR_MATCH:"SelectNearMatch"};var AdCuePoints=function(){};AdCuePoints.prototype={getCuePoints:function(){return[]},getAdIdRegistry:function(){return""},getAdIsValue:function(){return""}};var AdProgressData=noopFunc;Object.assign(ima,{AdCuePoints:AdCuePoints,AdDisplayContainer:AdDisplayContainer,AdError:AdError,AdErrorEvent:AdErrorEvent,AdEvent:AdEvent,AdPodInfo:AdPodInfo,AdProgressData:AdProgressData,AdsLoader:AdsLoader,AdsManager:manager,AdsManagerLoadedEvent:AdsManagerLoadedEvent,AdsRenderingSettings:AdsRenderingSettings,AdsRequest:AdsRequest,CompanionAd:CompanionAd,CompanionAdSelectionSettings:CompanionAdSelectionSettings,CustomContentLoadedEvent:CustomContentLoadedEvent,gptProxyInstance:{},ImaSdkSettings:ImaSdkSettings,OmidAccessMode:{DOMAIN:"domain",FULL:"full",LIMITED:"limited"},settings:new ImaSdkSettings,UiElements:{AD_ATTRIBUTION:"adAttribution",COUNTDOWN:"countdown"},UniversalAdIdInfo:function(){},VERSION:"3.453.0",ViewMode:{FULLSCREEN:"fullscreen",NORMAL:"normal"}}),window.google||(window.google={}),window.google.ima=ima,function(source){if(!0===source.verbose){try{var log=console.log.bind(console),trace=console.trace.bind(console),prefix=source.ruleText||"";if(source.domainName){var ruleStartIndex,AG_SCRIPTLET_MARKER="#%#//",UBO_SCRIPTLET_MARKER="##+js";source.ruleText.indexOf(AG_SCRIPTLET_MARKER)>-1?ruleStartIndex=source.ruleText.indexOf(AG_SCRIPTLET_MARKER):source.ruleText.indexOf(UBO_SCRIPTLET_MARKER)>-1&&(ruleStartIndex=source.ruleText.indexOf(UBO_SCRIPTLET_MARKER));var rulePart=source.ruleText.slice(ruleStartIndex);prefix="".concat(source.domainName).concat(rulePart)}log("".concat(prefix," trace start")),trace&&trace(),log("".concat(prefix," trace end"))}catch(e){}"function"==typeof window.__debug&&window.__debug(source)}}(source)}).apply(this,updatedArgs)}catch(e){console.log(e)}}({name:"google-ima3",args:[]},[]);"

dist/redirects.yml

@@ -1,6 +1,6 @@
 #
 #    AdGuard Scriptlets (Redirects Source)
-#    Version 1.7.14
+#    Version 1.7.20
 #
 - title: 1x1-transparent.gif
   description: |-
@@ -1428,7 +1428,9 @@
 
 - title: google-ima3
   comment: Mocks the IMA SDK of Google.
-  aliases: []
+  aliases:
+    - ubo-google-ima.js
+    - google-ima.js
   contentType: application/javascript
   content: |-
     (function(source, args) {