cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: eventing + refactoring

Browse source
This commit is contained in:
Cory Dransfeldt 2024-03-24 21:00:49 -07:00
parent 13e7b489ef
commit 9a957159e9
No known key found for this signature in database
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
api/event.js
View file

@ -5,31 +5,34 @@ export default async (request, context) => {
const params = new URL(request['url']).searchParams const params = new URL(request['url']).searchParams
const ns = params.get('ns') const ns = params.get('ns')
const page = params.get('page') const page = params.get('page')
const num = params.get('num') || 'unknown' const ig = params.get('ig')
const setUrl = (id, event) => `https://cdn.usefathom.com/?h=${encodeURIComponent(page)}&sid=CWSVCDJC&cid=${id}&name=${encodeURIComponent(event)}`
const lang = decodeURIComponent(params.get('lang')) const lang = decodeURIComponent(params.get('lang'))
const nav = decodeURIComponent(params.get('nav')) const nav = decodeURIComponent(params.get('nav'))
const notLang = !lang || lang === 'null' || lang === 'undefined' const notLang = !lang || lang === 'null' || lang === 'undefined'
const notNav = !nav || nav === 'null' || nav === 'undefined' const notNav = !nav || nav === 'null' || nav === 'undefined'
const ig = params.get('ig')
const setUrl = (id, event) => `https://cdn.usefathom.com/?h=${encodeURIComponent(page)}&sid=CWSVCDJC&cid=${id}&name=${encodeURIComponent(event)}`
const acceptLanguage = notLang ? request['headers'].get('accept-language') : lang const acceptLanguage = notLang ? request['headers'].get('accept-language') : lang
const userAgent = notNav ? request['headers'].get('user-agent') : nav const userAgent = notNav ? request['headers'].get('user-agent') : nav
const headers = { const headers = {
'Accept-Language': acceptLanguage, 'Accept-Language': acceptLanguage,
'User-Agent': userAgent 'User-Agent': userAgent
} }
let url let url
const id = crypto.createHash('md5').update(`${context['ip']}${context['geo']['city']}`).digest('hex')
const ids = getStore('ids')
const userId = await ids.get(id)
if (!userId) await ids.set(id, id)
const idVal = await ids.get(id)
if (ig) return if (ig) return
if (ns) { if (ns) {
const id = crypto.createHash('md5').update(`${context['ip']}${context['geo']['city']}`).digest('hex')
const ids = getStore('ids')
const userId = await ids.get(id)
if (!userId) await ids.set(id, id)
const idVal = await ids.get(id)
url = setUrl(idVal, 'noscript visit') url = setUrl(idVal, 'noscript visit')
} else { } else {
url = setUrl(num, 'Blocked visit') url = setUrl(idVal, 'Blocked visit')
} }
fetch(url, { headers }) fetch(url, { headers })

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "coryd.dev", "name": "coryd.dev",
"version": "8.7.4", "version": "8.7.5",
"description": "The source for my personal site. Built using 11ty.", "description": "The source for my personal site. Built using 11ty.",
"type": "module", "type": "module",
"scripts": { "scripts": {

6
src/assets/scripts/index.js
View file

@ -1,7 +1,5 @@
const id = Math.floor(Math.random() * Date.now()) let ig;
let i; let url = `https://coryd.dev/api/event/?page=${encodeURIComponent(window.location.href)}&lang=${encodeURIComponent(navigator.language)}&nav=${encodeURIComponent(navigator.userAgent)}`
let url = `https://coryd.dev/api/event/?page=${encodeURIComponent(window.location.href)}&num=${sessionStorage.getItem('id' || id)}&lang=${encodeURIComponent(navigator.language)}&nav=${encodeURIComponent(navigator.userAgent)}`
if (window.sessionStorage && !window.sessionStorage?.getItem('id')) sessionStorage.setItem('id', id)
if (window.localStorage && window.localStorage.getItem('ig')) { if (window.localStorage && window.localStorage.getItem('ig')) {
ig = localStorage.getItem('ig') ig = localStorage.getItem('ig')
url = `${url}&ig=${ig}` url = `${url}&ig=${ig}`