Skip to content

Fix Edge browser detection in visit stats #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bonsaiborn wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −11
Open

Fix Edge browser detection in visit stats #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions server/queues/visit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,38 @@ const URL = require("node:url");

const { removeWww } = require("../utils");
const query = require("../queries");

const browsersList = ["IE", "Firefox", "Chrome", "Opera", "Safari", "Edge"];
const osList = ["Windows", "Mac OS", "Linux", "Android", "iOS"];

function filterInBrowser(agent) {
return function(item) {
return agent.family.toLowerCase().includes(item.toLocaleLowerCase());
}
}

function filterInOs(agent) {
return function(item) {
return agent.os.family.toLowerCase().includes(item.toLocaleLowerCase());
}
}

function detectBrowser(userAgent, agent) {
const source = (userAgent || "").toLowerCase();
const family = agent.family.toLowerCase();

// Check the more specific Chromium variants before generic Chrome/Safari.
if (/edg(e|a|ios)?\//i.test(source) || family.includes("edge")) return "Edge";
if (/opr\//i.test(source) || family.includes("opera")) return "Opera";
if (/firefox\/|fxios\//i.test(source) || family.includes("firefox")) return "Firefox";
if (/msie|trident\//i.test(source) || family.includes("ie")) return "IE";
if (/chrome\/|crios\//i.test(source) || family.includes("chrome")) return "Chrome";
if (/safari\//i.test(source) || family.includes("safari")) return "Safari";

return "Other";
}

module.exports = function({ data }) {
const tasks = [];

tasks.push(query.link.incrementVisit({ id: data.link.id }));

// the following line is for backward compatibility
// used to send the whole header to get the user agent
const userAgent = data.userAgent || data.headers?.["user-agent"];
const agent = useragent.parse(userAgent);
const [browser = "Other"] = browsersList.filter(filterInBrowser(agent));
const browser = detectBrowser(userAgent, agent);
const [os = "Other"] = osList.filter(filterInOs(agent));
const referrer =
data.referrer && removeWww(URL.parse(data.referrer).hostname);
Expand All @@ -48,4 +54,4 @@ module.exports = function({ data }) {
);

return Promise.all(tasks);
}
}