watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 06:07:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated log merge logic to prevent duplicates.

Browse source
This commit is contained in:
Mike Cao 2020-10-09 10:48:47 -07:00
parent 8e0ea48c87
commit 5dd3110fbf
5 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pages/api/collect.js
View file

@ -6,6 +6,8 @@ import { createToken } from 'lib/crypto';
import { getIpAddress } from '../../lib/request';
export default async (req, res) => {
await useCors(req, res);
if (isBot(req.headers['user-agent'])) {
return ok(res);
}
@ -19,7 +21,6 @@ export default async (req, res) => {
}
}
await useCors(req, res);
await useSession(req, res);
const { type, payload } = req.body;

33
pages/api/realtime.js
View file

@ -8,11 +8,30 @@ export default async (req, res) => {
await useAuth(req, res);
async function getData(websites, time) {
return Promise.all([
const [pageviews, sessions, events] = await Promise.all([
getPageviews(websites, time),
getSessions(websites, time),
getEvents(websites, time),
]);
return {
pageviews: pageviews.map(({ view_id, ...props }) => ({
__id: `p${view_id}`,
view_id,
...props,
})),
sessions: sessions.map(({ session_id, ...props }) => ({
__id: `s${session_id}`,
session_id,
...props,
})),
events: events.map(({ event_id, ...props }) => ({
__id: `e${event_id}`,
event_id,
...props,
})),
timestamp: Date.now(),
};
}
if (req.method === 'GET') {
@ -22,10 +41,14 @@ export default async (req, res) => {
if (type === 'init') {
const websites = await getUserWebsites(user_id);
const ids = websites.map(({ website_id }) => website_id);
const [pageviews, sessions, events] = await getData(ids, subMinutes(new Date(), 30));
const token = await createToken({ websites: ids });
const data = await getData(ids, subMinutes(new Date(), 30));
return ok(res, { websites, token, data: { pageviews, sessions, events } });
return ok(res, {
websites,
token,
data,
});
}
if (type === 'update') {
@ -37,9 +60,9 @@ export default async (req, res) => {
const { websites } = await parseToken(token);
const [pageviews, sessions, events] = await getData(websites, new Date(+start_at));
const data = await getData(websites, new Date(+start_at));
return ok(res, { pageviews, sessions, events });
return ok(res, data);
}
return badRequest(res);