mirrors/rybbit
1
0
Fork 0
mirror of https://github.com/rybbit-io/rybbit.git synced 2025-05-11 12:25:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update package.json and package-lock.json to include @maxmind/geoip2-node dependency; refactor pageviewQueue to utilize local geolocation service for IP address tracking

Browse source
This commit is contained in:
Bill Yang 2025-04-21 22:33:05 -07:00
parent 75d21d2cd6
commit 03152db284
5 changed files with 112 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
server/src/tracker/pageviewQueue.ts
View file

@ -4,6 +4,7 @@ import { TrackingPayload } from "../types.js";
import { getDeviceType } from "../utils.js";
import { getChannel } from "./getChannel.js";
import { clearSelfReferrer, getUTMParams } from "./trackingUtils.js";
import { getLocation } from "../db/geolocation/geolocation.js";
type TotalPayload = TrackingPayload & {
userId: string;
@ -40,20 +41,21 @@ class PageviewQueue {
const batch = this.queue.splice(0, this.batchSize);
const ips = [...new Set(batch.map((pv) => pv.ipAddress))];
let geoData: any;
let geoData: Record<string, { data: any }> = {};
try {
// Get geo data for all IPs in batch
const geoResponse = await fetch("https://tracking.tomato.gg/geoip/bulk", {
method: "POST",
headers: {
"Content-Type": "application/json",
// "Accept-Encoding": "gzip",
},
body: JSON.stringify({ ips }),
// Process each IP to get geo data using local implementation
const geoPromises = ips.map(async (ip) => {
const locationData = await getLocation(ip);
return { ip, locationData };
});
const results = await Promise.all(geoPromises);
// Format results to match expected structure
results.forEach(({ ip, locationData }) => {
geoData[ip] = { data: locationData };
});
geoData = await geoResponse.json();
} catch (error) {
console.error("Error getting geo data:", error);
}