🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Merge branch 'master' into umami-import
Edward Cui4a6a7d625300
diff --cc server/package-lock.jsonindex 926b5e61f,e2cba53aa..951e72c23--- a/server/package-lock.json+++ b/server/package-lock.json@@@ -6,15 -6,12 +6,15 @@@"packages": {"": {"name": "rybbit-backend",- "version": "2.0.0",+ "version": "2.1.0","dependencies": {"@aws-sdk/client-s3": "^3.842.0",+ "@aws-sdk/lib-storage": "^3.917.0","@axiomhq/pino": "^1.3.1","@clickhouse/client": "1.11.1",+ "@fast-csv/parse": "^5.0.5","@fastify/cors": "11.0.1",+ "@fastify/multipart": "^9.3.0","@fastify/one-line-logger": "2.0.2","@fastify/rate-limit": "^10.3.0","@fastify/static": "8.1.1",diff --cc server/src/db/clickhouse/clickhouse.tsindex e15f56a5b,46bcf2f69..55d63af7b--- a/server/src/db/clickhouse/clickhouse.ts+++ b/server/src/db/clickhouse/clickhouse.ts@@@ -58,7 -58,7 +58,8 @@@ export const initializeClickhouse = asyADD COLUMN IF NOT EXISTS fcp Nullable(Float64),ADD COLUMN IF NOT EXISTS ttfb Nullable(Float64),ADD COLUMN IF NOT EXISTS ip Nullable(String),- ADD COLUMN IF NOT EXISTS timezone LowCardinality(String) DEFAULT ''++ ADD COLUMN IF NOT EXISTS timezone LowCardinality(String) DEFAULT '',+ ADD COLUMN IF NOT EXISTS import_id Nullable(String)`,});diff --cc server/src/index.tsindex e9d5dd2db,922aa5a5d..f75705cb6--- a/server/src/index.ts+++ b/server/src/index.ts@@@ -75,16 -75,10 +76,18 @@@ import { trackEvent } from "./services/// need to import telemetry service here to start itimport { telemetryService } from "./services/telemetryService.js";import { weeklyReportService } from "./services/weekyReports/weeklyReportService.js";+import { importCleanupService } from "./services/import/importCleanupService.js";import { extractSiteId } from "./utils.js";import { getTrackingConfig } from "./api/sites/getTrackingConfig.js";+ import { updateSitePrivateLinkConfig } from "./api/sites/updateSitePrivateLinkConfig.js";+ import { getSitePrivateLinkConfig } from "./api/sites/getSitePrivateLinkConfig.js";+import { getSiteImports } from "./api/sites/getSiteImports.js";+import { importSiteData } from "./api/sites/importSiteData.js";+import { deleteSiteImport } from "./api/sites/deleteSiteImport.js";+import { getJobQueue } from "./queues/jobQueueFactory.js";+import { registerCsvParseWorker } from "./services/import/workers/csvParseWorker.js";+import { registerDataInsertWorker } from "./services/import/workers/dataInsertWorker.js";+import { createJobQueues } from "./services/import/workers/queues.js";const __filename = fileURLToPath(import.meta.url);const __dirname = dirname(__filename);diff --cc server/src/services/tracker/pageviewQueue.tsindex 1d7fa6f28,ac20e1f76..527fb407d--- a/server/src/services/tracker/pageviewQueue.ts+++ b/server/src/services/tracker/pageviewQueue.ts@@@ -112,7 -96,22 +96,23 @@@ class PageviewQueuefcp: pv.fcp || null,ttfb: pv.ttfb || null,ip: pv.storeIp ? pv.ipAddress : null,+ timezone: timezone,+ import_id: null,+ company: dataForIp?.company?.name || "",+ company_domain: dataForIp?.company?.domain || "",+ company_type: dataForIp?.company?.type || "",+ company_abuse_score: dataForIp?.company?.abuseScore ?? null,+ asn: dataForIp?.asn?.asn || null,+ asn_org: dataForIp?.asn?.org || "",+ asn_domain: dataForIp?.asn?.domain || "",+ asn_type: dataForIp?.asn?.type || "",+ asn_abuse_score: dataForIp?.asn?.abuseScore ?? null,+ vpn: dataForIp?.vpn || "",+ crawler: dataForIp?.crawler || "",+ datacenter: dataForIp?.datacenter || "",+ is_proxy: dataForIp?.isProxy ?? null,+ is_tor: dataForIp?.isTor ?? null,+ is_satellite: dataForIp?.isSatellite ?? null,};});