From c7c18ec2fd605ec50f01e2d898b835a5bc2d707d Mon Sep 17 00:00:00 2001 From: iotcat Date: Sat, 15 Aug 2020 12:50:49 +0800 Subject: [PATCH] v3.0.3 --- dist/fp.js | 4 ++-- dist/fp.min.js | 2 +- fp.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/fp.js b/dist/fp.js index 229faf5..799a416 100644 --- a/dist/fp.js +++ b/dist/fp.js @@ -1,6 +1,6 @@ /* * @package: fp - * @version: v3.0.1 + * @version: v3.0.3 * @Author: IoTcat (https://iotcat.me) * @Date: 2020-08-15 11:34:32 * @Last Modified by: iotcat @@ -1545,7 +1545,7 @@ var getLowFp = function(highFp, midFp, components, resolve, reject){ var lowFp = Fingerprint2.x64hash128(JSON.stringify(components), 15).substring(0, 2); var fullFp = lowFp + midFp + highFp; - console.log('\n' + ' %c fp v3.0.1 %c ' + fullFp + '::' + (new Date().valueOf() - startTime) + 'ms %c https://fp.yimian.xyz/ \n', 'color: #00FFFF; background: #030307; padding:5px 0;', 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;'); + console.log('\n' + ' %c fp v3.0.3 %c ' + fullFp + '::' + (new Date().valueOf() - startTime) + 'ms %c https://fp.yimian.xyz/ \n', 'color: #00FFFF; background: #030307; padding:5px 0;', 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #4682B4; padding:5px 0;'); resolve(fullFp); } diff --git a/dist/fp.min.js b/dist/fp.min.js index 11d9b68..433a34f 100644 --- a/dist/fp.min.js +++ b/dist/fp.min.js @@ -1,2 +1,2 @@ -(function(e,r,t){"use strict";if(typeof window!=="undefined"&&typeof define==="function"&&define.amd){define(t)}else if(typeof module!=="undefined"&&module.exports){module.exports=t()}else if(r.exports){r.exports=t()}else{r[e]=t()}})("Fingerprint2",this,function(){"use strict";if(typeof Array.isArray==="undefined"){Array.isArray=function(e){return Object.prototype.toString.call(e)==="[object Array]"}}var d=function(e,r){e=[e[0]>>>16,e[0]&65535,e[1]>>>16,e[1]&65535];r=[r[0]>>>16,r[0]&65535,r[1]>>>16,r[1]&65535];var t=[0,0,0,0];t[3]+=e[3]+r[3];t[2]+=t[3]>>>16;t[3]&=65535;t[2]+=e[2]+r[2];t[1]+=t[2]>>>16;t[2]&=65535;t[1]+=e[1]+r[1];t[0]+=t[1]>>>16;t[1]&=65535;t[0]+=e[0]+r[0];t[0]&=65535;return[t[0]<<16|t[1],t[2]<<16|t[3]]};var f=function(e,r){e=[e[0]>>>16,e[0]&65535,e[1]>>>16,e[1]&65535];r=[r[0]>>>16,r[0]&65535,r[1]>>>16,r[1]&65535];var t=[0,0,0,0];t[3]+=e[3]*r[3];t[2]+=t[3]>>>16;t[3]&=65535;t[2]+=e[2]*r[3];t[1]+=t[2]>>>16;t[2]&=65535;t[2]+=e[3]*r[2];t[1]+=t[2]>>>16;t[2]&=65535;t[1]+=e[1]*r[3];t[0]+=t[1]>>>16;t[1]&=65535;t[1]+=e[2]*r[2];t[0]+=t[1]>>>16;t[1]&=65535;t[1]+=e[3]*r[1];t[0]+=t[1]>>>16;t[1]&=65535;t[0]+=e[0]*r[3]+e[1]*r[2]+e[2]*r[1]+e[3]*r[0];t[0]&=65535;return[t[0]<<16|t[1],t[2]<<16|t[3]]};var g=function(e,r){r%=64;if(r===32){return[e[1],e[0]]}else if(r<32){return[e[0]<>>32-r,e[1]<>>32-r]}else{r-=32;return[e[1]<>>32-r,e[0]<>>32-r]}};var v=function(e,r){r%=64;if(r===0){return e}else if(r<32){return[e[0]<>>32-r,e[1]<>>1]);e=f(e,[4283543511,3981806797]);e=h(e,[0,e[0]>>>1]);e=f(e,[3301882366,444984403]);e=h(e,[0,e[0]>>>1]);return e};var u=function(e,r){e=e||"";r=r||0;var t=e.length%16;var a=e.length-t;var n=[0,r];var i=[0,r];var o=[0,0];var u=[0,0];var s=[2277735313,289559509];var l=[1291169091,658871167];for(var c=0;c>>0).toString(16)).slice(-8)+("00000000"+(n[1]>>>0).toString(16)).slice(-8)+("00000000"+(i[0]>>>0).toString(16)).slice(-8)+("00000000"+(i[1]>>>0).toString(16)).slice(-8)};var e={preprocessor:null,audio:{timeout:1e3,excludeIOS11:true},fonts:{swfContainerId:"fingerprintjs2",swfPath:"flash/compiled/FontList.swf",userDefinedFonts:[],extendedJsFonts:false},screen:{detectScreenOrientation:true},plugins:{sortPluginsFor:[/palemoon/i],excludeIE:false},extraComponents:[],excludes:{enumerateDevices:true,pixelRatio:true,doNotTrack:true,fontsFlash:true},NOT_AVAILABLE:"not available",ERROR:"error",EXCLUDED:"excluded"};var p=function(e,r){if(Array.prototype.forEach&&e.forEach===Array.prototype.forEach){e.forEach(r)}else if(e.length===+e.length){for(var t=0,a=e.length;tr.name){return 1}if(e.name=0){a="Windows Phone"}else if(e.indexOf("windows")>=0||e.indexOf("win16")>=0||e.indexOf("win32")>=0||e.indexOf("win64")>=0||e.indexOf("win95")>=0||e.indexOf("win98")>=0||e.indexOf("winnt")>=0||e.indexOf("wow64")>=0){a="Windows"}else if(e.indexOf("android")>=0){a="Android"}else if(e.indexOf("linux")>=0||e.indexOf("cros")>=0||e.indexOf("x11")>=0){a="Linux"}else if(e.indexOf("iphone")>=0||e.indexOf("ipad")>=0||e.indexOf("ipod")>=0||e.indexOf("crios")>=0||e.indexOf("fxios")>=0){a="iOS"}else if(e.indexOf("macintosh")>=0||e.indexOf("mac_powerpc)")>=0){a="Mac"}else{a="Other"}var n="ontouchstart"in window||navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0;if(n&&a!=="Windows"&&a!=="Windows Phone"&&a!=="Android"&&a!=="iOS"&&a!=="Other"&&e.indexOf("cros")===-1){return true}if(typeof r!=="undefined"){r=r.toLowerCase();if(r.indexOf("win")>=0&&a!=="Windows"&&a!=="Windows Phone"){return true}else if(r.indexOf("linux")>=0&&a!=="Linux"&&a!=="Android"){return true}else if(r.indexOf("mac")>=0&&a!=="Mac"&&a!=="iOS"){return true}else if((r.indexOf("win")===-1&&r.indexOf("linux")===-1&&r.indexOf("mac")===-1)!==(a==="Other")){return true}}if(t.indexOf("win")>=0&&a!=="Windows"&&a!=="Windows Phone"){return true}else if((t.indexOf("linux")>=0||t.indexOf("android")>=0||t.indexOf("pike")>=0)&&a!=="Linux"&&a!=="Android"){return true}else if((t.indexOf("mac")>=0||t.indexOf("ipad")>=0||t.indexOf("ipod")>=0||t.indexOf("iphone")>=0)&&a!=="Mac"&&a!=="iOS"){return true}else if(t.indexOf("arm")>=0&&a==="Windows Phone"){return false}else if(t.indexOf("pike")>=0&&e.indexOf("opera mini")>=0){return false}else{var i=t.indexOf("win")<0&&t.indexOf("linux")<0&&t.indexOf("mac")<0&&t.indexOf("iphone")<0&&t.indexOf("ipad")<0&&t.indexOf("ipod")<0;if(i!==(a==="Other")){return true}}return typeof navigator.plugins==="undefined"&&a!=="Windows"&&a!=="Windows Phone"};var de=function(){var e=navigator.userAgent.toLowerCase();var r=navigator.productSub;var t;if(e.indexOf("edge/")>=0||e.indexOf("iemobile/")>=0){return false}else if(e.indexOf("opera mini")>=0){return false}else if(e.indexOf("firefox/")>=0){t="Firefox"}else if(e.indexOf("opera/")>=0||e.indexOf(" opr/")>=0){t="Opera"}else if(e.indexOf("chrome/")>=0){t="Chrome"}else if(e.indexOf("safari/")>=0){if(e.indexOf("android 1.")>=0||e.indexOf("android 2.")>=0||e.indexOf("android 3.")>=0||e.indexOf("android 4.")>=0){t="AOSP"}else{t="Safari"}}else if(e.indexOf("trident/")>=0){t="Internet Explorer"}else{t="Other"}if((t==="Chrome"||t==="Safari"||t==="Opera")&&r!=="20030107"){return true}var a=eval.toString().length;if(a===37&&t!=="Safari"&&t!=="Firefox"&&t!=="Other"){return true}else if(a===39&&t!=="Internet Explorer"&&t!=="Other"){return true}else if(a===33&&t!=="Chrome"&&t!=="AOSP"&&t!=="Opera"&&t!=="Other"){return true}var n;try{throw"a"}catch(e){try{e.toSource();n=true}catch(e){n=false}}return n&&t!=="Firefox"&&t!=="Other"};var fe=function(){var e=document.createElement("canvas");return!!(e.getContext&&e.getContext("2d"))};var ge=function(){if(!fe()){return false}var e=Ae();var r=!!window.WebGLRenderingContext&&!!e;Se(e);return r};var ve=function(){if(navigator.appName==="Microsoft Internet Explorer"){return true}else if(navigator.appName==="Netscape"&&/Trident/.test(navigator.userAgent)){return true}return false};var he=function(){return typeof window.swfobject!=="undefined"};var me=function(){return window.swfobject.hasFlashPlayerVersion("9.0.0")};var pe=function(e){var r=document.createElement("div");r.setAttribute("id",e.fonts.swfContainerId);document.body.appendChild(r)};var Te=function(r,e){var t="___fp_swf_loaded";window[t]=function(e){r(e)};var a=e.fonts.swfContainerId;pe();var n={onReady:t};var i={allowScriptAccess:"always",menu:"false"};window.swfobject.embedSWF(e.fonts.swfPath,a,"1","1","9.0.0",false,n,i,{})};var Ae=function(){var e=document.createElement("canvas");var r=null;try{r=e.getContext("webgl")||e.getContext("experimental-webgl")}catch(e){}if(!r){r=null}return r};var Se=function(e){var r=e.getExtension("WEBGL_lose_context");if(r!=null){r.loseContext()}};var we=[{key:"userAgent",getData:i},{key:"webdriver",getData:o},{key:"language",getData:l},{key:"colorDepth",getData:c},{key:"deviceMemory",getData:T},{key:"pixelRatio",getData:A},{key:"hardwareConcurrency",getData:J},{key:"screenResolution",getData:S},{key:"availableScreenResolution",getData:y},{key:"timezoneOffset",getData:B},{key:"timezone",getData:x},{key:"sessionStorage",getData:E},{key:"localStorage",getData:O},{key:"indexedDb",getData:M},{key:"addBehavior",getData:b},{key:"openDatabase",getData:P},{key:"cpuClass",getData:k},{key:"platform",getData:L},{key:"doNotTrack",getData:I},{key:"plugins",getData:X},{key:"canvas",getData:R},{key:"webgl",getData:D},{key:"webglVendorAndRenderer",getData:N},{key:"adBlock",getData:_},{key:"hasLiedLanguages",getData:F},{key:"hasLiedResolution",getData:G},{key:"hasLiedOs",getData:U},{key:"hasLiedBrowser",getData:V},{key:"touchSupport",getData:Z},{key:"fonts",getData:W,pauseBefore:true},{key:"fontsFlash",getData:H,pauseBefore:true},{key:"audio",getData:n},{key:"enumerateDevices",getData:t}];var ye=function(e){throw new Error("'new Fingerprint()' is deprecated, see https://github.com/Valve/fingerprintjs2#upgrade-guide-from-182-to-200")};ye.get=function(t,a){if(!a){a=t;t={}}else if(!t){t={}}r(t,e);t.components=t.extraComponents.concat(we);var n={data:[],addPreprocessedComponent:function(e,r){if(typeof t.preprocessor==="function"){r=t.preprocessor(e,r)}n.data.push({key:e,value:r})}};var i=-1;var o=function(e){i+=1;if(i>=t.components.length){a(n.data);return}var r=t.components[i];if(t.excludes[r.key]){o(false);return}if(!e&&r.pauseBefore){i-=1;setTimeout(function(){o(true)},1);return}try{r.getData(function(e){n.addPreprocessedComponent(r.key,e);o(false)},t)}catch(e){n.addPreprocessedComponent(r.key,String(e));o(false)}};o(false)};ye.getPromise=function(t){return new Promise(function(e,r){ye.get(t,e)})};ye.getV18=function(i,o){if(o==null){o=i;i={}}return ye.get(i,function(e){var r=[];for(var t=0;t>>16,e[0]&65535,e[1]>>>16,e[1]&65535];r=[r[0]>>>16,r[0]&65535,r[1]>>>16,r[1]&65535];var t=[0,0,0,0];t[3]+=e[3]+r[3];t[2]+=t[3]>>>16;t[3]&=65535;t[2]+=e[2]+r[2];t[1]+=t[2]>>>16;t[2]&=65535;t[1]+=e[1]+r[1];t[0]+=t[1]>>>16;t[1]&=65535;t[0]+=e[0]+r[0];t[0]&=65535;return[t[0]<<16|t[1],t[2]<<16|t[3]]};var f=function(e,r){e=[e[0]>>>16,e[0]&65535,e[1]>>>16,e[1]&65535];r=[r[0]>>>16,r[0]&65535,r[1]>>>16,r[1]&65535];var t=[0,0,0,0];t[3]+=e[3]*r[3];t[2]+=t[3]>>>16;t[3]&=65535;t[2]+=e[2]*r[3];t[1]+=t[2]>>>16;t[2]&=65535;t[2]+=e[3]*r[2];t[1]+=t[2]>>>16;t[2]&=65535;t[1]+=e[1]*r[3];t[0]+=t[1]>>>16;t[1]&=65535;t[1]+=e[2]*r[2];t[0]+=t[1]>>>16;t[1]&=65535;t[1]+=e[3]*r[1];t[0]+=t[1]>>>16;t[1]&=65535;t[0]+=e[0]*r[3]+e[1]*r[2]+e[2]*r[1]+e[3]*r[0];t[0]&=65535;return[t[0]<<16|t[1],t[2]<<16|t[3]]};var g=function(e,r){r%=64;if(r===32){return[e[1],e[0]]}else if(r<32){return[e[0]<>>32-r,e[1]<>>32-r]}else{r-=32;return[e[1]<>>32-r,e[0]<>>32-r]}};var v=function(e,r){r%=64;if(r===0){return e}else if(r<32){return[e[0]<>>32-r,e[1]<>>1]);e=f(e,[4283543511,3981806797]);e=h(e,[0,e[0]>>>1]);e=f(e,[3301882366,444984403]);e=h(e,[0,e[0]>>>1]);return e};var u=function(e,r){e=e||"";r=r||0;var t=e.length%16;var a=e.length-t;var n=[0,r];var i=[0,r];var o=[0,0];var u=[0,0];var s=[2277735313,289559509];var l=[1291169091,658871167];for(var c=0;c>>0).toString(16)).slice(-8)+("00000000"+(n[1]>>>0).toString(16)).slice(-8)+("00000000"+(i[0]>>>0).toString(16)).slice(-8)+("00000000"+(i[1]>>>0).toString(16)).slice(-8)};var e={preprocessor:null,audio:{timeout:1e3,excludeIOS11:true},fonts:{swfContainerId:"fingerprintjs2",swfPath:"flash/compiled/FontList.swf",userDefinedFonts:[],extendedJsFonts:false},screen:{detectScreenOrientation:true},plugins:{sortPluginsFor:[/palemoon/i],excludeIE:false},extraComponents:[],excludes:{enumerateDevices:true,pixelRatio:true,doNotTrack:true,fontsFlash:true},NOT_AVAILABLE:"not available",ERROR:"error",EXCLUDED:"excluded"};var p=function(e,r){if(Array.prototype.forEach&&e.forEach===Array.prototype.forEach){e.forEach(r)}else if(e.length===+e.length){for(var t=0,a=e.length;tr.name){return 1}if(e.name=0){a="Windows Phone"}else if(e.indexOf("windows")>=0||e.indexOf("win16")>=0||e.indexOf("win32")>=0||e.indexOf("win64")>=0||e.indexOf("win95")>=0||e.indexOf("win98")>=0||e.indexOf("winnt")>=0||e.indexOf("wow64")>=0){a="Windows"}else if(e.indexOf("android")>=0){a="Android"}else if(e.indexOf("linux")>=0||e.indexOf("cros")>=0||e.indexOf("x11")>=0){a="Linux"}else if(e.indexOf("iphone")>=0||e.indexOf("ipad")>=0||e.indexOf("ipod")>=0||e.indexOf("crios")>=0||e.indexOf("fxios")>=0){a="iOS"}else if(e.indexOf("macintosh")>=0||e.indexOf("mac_powerpc)")>=0){a="Mac"}else{a="Other"}var n="ontouchstart"in window||navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0;if(n&&a!=="Windows"&&a!=="Windows Phone"&&a!=="Android"&&a!=="iOS"&&a!=="Other"&&e.indexOf("cros")===-1){return true}if(typeof r!=="undefined"){r=r.toLowerCase();if(r.indexOf("win")>=0&&a!=="Windows"&&a!=="Windows Phone"){return true}else if(r.indexOf("linux")>=0&&a!=="Linux"&&a!=="Android"){return true}else if(r.indexOf("mac")>=0&&a!=="Mac"&&a!=="iOS"){return true}else if((r.indexOf("win")===-1&&r.indexOf("linux")===-1&&r.indexOf("mac")===-1)!==(a==="Other")){return true}}if(t.indexOf("win")>=0&&a!=="Windows"&&a!=="Windows Phone"){return true}else if((t.indexOf("linux")>=0||t.indexOf("android")>=0||t.indexOf("pike")>=0)&&a!=="Linux"&&a!=="Android"){return true}else if((t.indexOf("mac")>=0||t.indexOf("ipad")>=0||t.indexOf("ipod")>=0||t.indexOf("iphone")>=0)&&a!=="Mac"&&a!=="iOS"){return true}else if(t.indexOf("arm")>=0&&a==="Windows Phone"){return false}else if(t.indexOf("pike")>=0&&e.indexOf("opera mini")>=0){return false}else{var i=t.indexOf("win")<0&&t.indexOf("linux")<0&&t.indexOf("mac")<0&&t.indexOf("iphone")<0&&t.indexOf("ipad")<0&&t.indexOf("ipod")<0;if(i!==(a==="Other")){return true}}return typeof navigator.plugins==="undefined"&&a!=="Windows"&&a!=="Windows Phone"};var de=function(){var e=navigator.userAgent.toLowerCase();var r=navigator.productSub;var t;if(e.indexOf("edge/")>=0||e.indexOf("iemobile/")>=0){return false}else if(e.indexOf("opera mini")>=0){return false}else if(e.indexOf("firefox/")>=0){t="Firefox"}else if(e.indexOf("opera/")>=0||e.indexOf(" opr/")>=0){t="Opera"}else if(e.indexOf("chrome/")>=0){t="Chrome"}else if(e.indexOf("safari/")>=0){if(e.indexOf("android 1.")>=0||e.indexOf("android 2.")>=0||e.indexOf("android 3.")>=0||e.indexOf("android 4.")>=0){t="AOSP"}else{t="Safari"}}else if(e.indexOf("trident/")>=0){t="Internet Explorer"}else{t="Other"}if((t==="Chrome"||t==="Safari"||t==="Opera")&&r!=="20030107"){return true}var a=eval.toString().length;if(a===37&&t!=="Safari"&&t!=="Firefox"&&t!=="Other"){return true}else if(a===39&&t!=="Internet Explorer"&&t!=="Other"){return true}else if(a===33&&t!=="Chrome"&&t!=="AOSP"&&t!=="Opera"&&t!=="Other"){return true}var n;try{throw"a"}catch(e){try{e.toSource();n=true}catch(e){n=false}}return n&&t!=="Firefox"&&t!=="Other"};var fe=function(){var e=document.createElement("canvas");return!!(e.getContext&&e.getContext("2d"))};var ge=function(){if(!fe()){return false}var e=Ae();var r=!!window.WebGLRenderingContext&&!!e;Se(e);return r};var ve=function(){if(navigator.appName==="Microsoft Internet Explorer"){return true}else if(navigator.appName==="Netscape"&&/Trident/.test(navigator.userAgent)){return true}return false};var he=function(){return typeof window.swfobject!=="undefined"};var me=function(){return window.swfobject.hasFlashPlayerVersion("9.0.0")};var pe=function(e){var r=document.createElement("div");r.setAttribute("id",e.fonts.swfContainerId);document.body.appendChild(r)};var Te=function(r,e){var t="___fp_swf_loaded";window[t]=function(e){r(e)};var a=e.fonts.swfContainerId;pe();var n={onReady:t};var i={allowScriptAccess:"always",menu:"false"};window.swfobject.embedSWF(e.fonts.swfPath,a,"1","1","9.0.0",false,n,i,{})};var Ae=function(){var e=document.createElement("canvas");var r=null;try{r=e.getContext("webgl")||e.getContext("experimental-webgl")}catch(e){}if(!r){r=null}return r};var Se=function(e){var r=e.getExtension("WEBGL_lose_context");if(r!=null){r.loseContext()}};var we=[{key:"userAgent",getData:i},{key:"webdriver",getData:o},{key:"language",getData:l},{key:"colorDepth",getData:c},{key:"deviceMemory",getData:T},{key:"pixelRatio",getData:A},{key:"hardwareConcurrency",getData:J},{key:"screenResolution",getData:S},{key:"availableScreenResolution",getData:y},{key:"timezoneOffset",getData:B},{key:"timezone",getData:x},{key:"sessionStorage",getData:E},{key:"localStorage",getData:O},{key:"indexedDb",getData:M},{key:"addBehavior",getData:b},{key:"openDatabase",getData:P},{key:"cpuClass",getData:k},{key:"platform",getData:L},{key:"doNotTrack",getData:I},{key:"plugins",getData:X},{key:"canvas",getData:R},{key:"webgl",getData:D},{key:"webglVendorAndRenderer",getData:N},{key:"adBlock",getData:_},{key:"hasLiedLanguages",getData:F},{key:"hasLiedResolution",getData:G},{key:"hasLiedOs",getData:U},{key:"hasLiedBrowser",getData:V},{key:"touchSupport",getData:Z},{key:"fonts",getData:W,pauseBefore:true},{key:"fontsFlash",getData:H,pauseBefore:true},{key:"audio",getData:n},{key:"enumerateDevices",getData:t}];var ye=function(e){throw new Error("'new Fingerprint()' is deprecated, see https://github.com/Valve/fingerprintjs2#upgrade-guide-from-182-to-200")};ye.get=function(t,a){if(!a){a=t;t={}}else if(!t){t={}}r(t,e);t.components=t.extraComponents.concat(we);var n={data:[],addPreprocessedComponent:function(e,r){if(typeof t.preprocessor==="function"){r=t.preprocessor(e,r)}n.data.push({key:e,value:r})}};var i=-1;var o=function(e){i+=1;if(i>=t.components.length){a(n.data);return}var r=t.components[i];if(t.excludes[r.key]){o(false);return}if(!e&&r.pauseBefore){i-=1;setTimeout(function(){o(true)},1);return}try{r.getData(function(e){n.addPreprocessedComponent(r.key,e);o(false)},t)}catch(e){n.addPreprocessedComponent(r.key,String(e));o(false)}};o(false)};ye.getPromise=function(t){return new Promise(function(e,r){ye.get(t,e)})};ye.getV18=function(i,o){if(o==null){o=i;i={}}return ye.get(i,function(e){var r=[];for(var t=0;t