fix: host json resources on github #197

abrahamjuliot · Aug 17, 2022 · 074f049 · 074f049
1 parent 6fe4fec
commit 074f049
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/docs/data/samples.json b/docs/data/samples.json
diff --git a/docs/tests/iframes.js b/docs/tests/iframes.js
@@ -137,8 +137,8 @@
 	}
 
 	// get feature data
-	const webapp = 'https://script.google.com/macros/s/AKfycbw26MLaK1PwIGzUiStwweOeVfl-sEmIxFIs5Ax7LMoP1Cuw-s0llN-aJYS7F8vxQuVG-A/exec'
-	const samples = await fetch(webapp)
+	const url = '../data/samples.json'
+	const samples = await fetch(url)
 		.then(response => response.json())
 		.catch(error => {
 			console.error(error)
@@ -477,7 +477,7 @@
 			let uaBase, verBase, platformBase, canvasBase
 			return contexts.map((context, i) => {
 				const { uaReported, verReported, uaRestored, verRestored, features, platform, canvas } = context || {}
-				
+
 				// set base values
 				if (i == 0) {
 					uaBase = uaReported

diff --git a/docs/tests/window.js b/docs/tests/window.js
@@ -169,8 +169,8 @@
 	}
 
 	// get data
-	const webapp = 'https://script.google.com/macros/s/AKfycbw26MLaK1PwIGzUiStwweOeVfl-sEmIxFIs5Ax7LMoP1Cuw-s0llN-aJYS7F8vxQuVG-A/exec'
-	const samples = await fetch(webapp)
+	const url = '../data/samples.json'
+	const samples = await fetch(url)
 		.then(response => response.json())
 		.catch(error => {
 			console.error(error)
@@ -188,10 +188,10 @@
 			</div>
 		`)
 	}
-	
+
 	const { window: windowSamples } = samples || {}
 
-	// construct template 
+	// construct template
 	let matchingIndex
 	const computeTemplate = ({ name, fingerprints, index }) => {
 		fingerprints = fingerprints.sort((a, b) => (a.systems[0] > b.systems[0]) ? 1 : -1)

diff --git a/src/creep.ts b/src/creep.ts
@@ -96,7 +96,10 @@ import getBestWorkerScope, { Scope, spawnWorker, workerScopeHTML } from './worke
 			headlessComputed,
 			featuresComputed,
 		] = await Promise.all([
-			getHeadlessFeatures(workerScopeComputed),
+			getHeadlessFeatures({
+				webgl: canvasWebglComputed,
+				workerScope: workerScopeComputed,
+			}),
 			getEngineFeatures({
 				cssComputed,
 				navigatorComputed,
@@ -574,7 +577,7 @@ import getBestWorkerScope, { Scope, spawnWorker, workerScopeHTML } from './worke
 		capturedErrors: !!errorsLen,
 		lies: !!liesLen,
 		resistance: fp.resistance || undefined,
-		forceRenew: 1660540659730,
+		forceRenew: 1660712729417,
 	}
 
 	console.log('%c✔ stable fingerprint passed', 'color:#4cca9f')
@@ -1433,7 +1436,10 @@ import getBestWorkerScope, { Scope, spawnWorker, workerScopeHTML } from './worke
 						samplesDidLoadFromSession: true,
 					}
 				}
-				const url = 'https://script.google.com/macros/s/AKfycbw26MLaK1PwIGzUiStwweOeVfl-sEmIxFIs5Ax7LMoP1Cuw-s0llN-aJYS7F8vxQuVG-A/exec'
+				const url = (
+					/\.github\.io/.test(location.origin) ? './data/samples.json' :
+						'../docs/data/samples.json'
+				)
 				const cloudSamples = await fetch(url).then((res) => res.json()).catch((error) => {
 					console.error(error)
 					return