Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Merge branch 'master' into umami-import

Edward Cuif1e4ac4e38eb
diff --cc client/src/components/SiteSettings/SiteSettings.tsx
index 1a9a8d21c,8c7959a9b..d2c35620b
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@@ -59,11 -58,10 +59,11 @@@ function SiteSettingsInner({ siteMetada
<DialogDescription>Manage settings for {siteMetadata.domain}</DialogDescription>
</DialogHeader>
<Tabs value={activeTab} onValueChange={setActiveTab} className="pb-4">
- <TabsList className="grid w-full grid-cols-3">
+ <TabsList className="grid w-full grid-cols-4">
+ <TabsTrigger value="settings">Site Settings</TabsTrigger>
<TabsTrigger value="script">Tracking Script</TabsTrigger>
<TabsTrigger value="apikey">API Key</TabsTrigger>
+ <TabsTrigger value="import">Import</TabsTrigger>
- <TabsTrigger value="settings">Site Settings</TabsTrigger>
</TabsList>
<TabsContent value="script" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
diff --cc docker-compose.yml
index 82e8a0fde,6b4ca6e84..ad31338eb
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -61,19 -61,7 +61,9 @@@ services
retries: 5
start_period: 10s
restart: unless-stopped
+ ports:
+ - "5432:5432"
- # redis:
- # image: redis:7-alpine
- # container_name: redis
- # ports:
- # - "6379:6379" # Exposed to internet for remote connections
- # volumes:
- # - redis-data:/data
- # restart: unless-stopped
- # command: [ "redis-server", "--requirepass", "${REDIS_PASSWORD:-changeme}", "--appendonly", "yes" ]
-
backend:
image: ghcr.io/rybbit-io/rybbit-backend:${IMAGE_TAG:-latest}
container_name: backend
diff --cc server/package-lock.json
index 72abb5d33,9bca2ae21..ac819f45e
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@@ -33,9 -32,10 +35,11 @@@
"node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
+ "pg-boss": "^10.3.2",
"postgres": "3.4.5",
"psl": "^1.15.0",
+ "react": "19.2.0",
+ "react-dom": "19.2.0",
"resend": "^4.5.1",
"rrweb": "^2.0.0-alpha.11",
"sqlstring": "2.3.3",
diff --cc server/package.json
index c66fbf265,646bc6b86..c0668572b
--- a/server/package.json
+++ b/server/package.json
@@@ -48,9 -47,10 +50,11 @@@
"node-cache": "^5.1.2",
"node-cron": "4.0.6",
"pg": "8.16.0",
+ "pg-boss": "^10.3.2",
"postgres": "3.4.5",
"psl": "^1.15.0",
+ "react": "19.2.0",
+ "react-dom": "19.2.0",
"resend": "^4.5.1",
"rrweb": "^2.0.0-alpha.11",
"sqlstring": "2.3.3",
diff --cc server/src/db/clickhouse/clickhouse.ts
index 1fc49dc8e,555b3f211..e15f56a5b
--- a/server/src/db/clickhouse/clickhouse.ts
+++ b/server/src/db/clickhouse/clickhouse.ts
@@@ -55,7 -57,7 +57,8 @@@ export const initializeClickhouse = asy
ADD COLUMN IF NOT EXISTS inp Nullable(Float64),
ADD 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 ip Nullable(String),
+ ADD COLUMN IF NOT EXISTS import_id Nullable(String)
`,
});
diff --cc server/src/index.ts
index 61898aa60,0ba6fd275..2c0a319b2
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@@ -75,14 -72,10 +73,16 @@@ import { IS_CLOUD } from "./lib/const.j
import { trackEvent } from "./services/tracker/trackEvent.js";
// need to import telemetry service here to start it
import { telemetryService } from "./services/telemetryService.js";
- import { extractSiteId, isSitePublic } from "./utils.js";
+ import { weeklyReportService } from "./services/weekyReports/weeklyReportService.js";
+ import { extractSiteId } from "./utils.js";
+ import { getTrackingConfig } from "./api/sites/getTrackingConfig.js";
+import { getSiteImports } from "./api/sites/getSiteImports.js";
+import { importSiteData } from "./api/sites/importSiteData.js";
+import { deleteSiteImport } from "./api/sites/deleteSiteImport.js";
+import boss from "./db/postgres/boss.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);
@@@ -431,15 -407,13 +426,18 @@@ server.get("/api/health", { logLevel: "
const start = async () => {
try {
console.info("Starting server...");
- await Promise.all([initializeClickhouse(), loadAllowedDomains(), initPostgres()]);
+ await Promise.all([initializeClickhouse(), initPostgres()]);
telemetryService.startTelemetryCron();
+ if (IS_CLOUD) {
+ weeklyReportService.startWeeklyReportCron();
+ }
+ await boss.start();
+ await createJobQueues();
+ await registerCsvParseWorker();
+ await registerDataInsertWorker();
+
// Start the server first
await server.listen({ port: 3001, host: "0.0.0.0" });
server.log.info("Server is listening on http://0.0.0.0:3001");
diff --cc server/src/services/tracker/pageviewQueue.ts
index 4fe717caa,e5819cc97..1d7fa6f28
--- a/server/src/services/tracker/pageviewQueue.ts
+++ b/server/src/services/tracker/pageviewQueue.ts
@@@ -126,7 -111,7 +111,8 @@@ class PageviewQueue
inp: pv.inp || null,
fcp: pv.fcp || null,
ttfb: pv.ttfb || null,
+ ip: pv.storeIp ? pv.ipAddress : null,
+ import_id: null,
};
});