🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Merge branch 'master' into umami-import
Edward Cui68b66afa5918
diff --cc server/src/index.tsindex d475cc936,00f931c32..9d7d034f7--- a/server/src/index.ts+++ b/server/src/index.ts@@@ -89,14 -75,7 +76,13 @@@ import { siteConfig } from "./lib/siteCimport { trackEvent } from "./services/tracker/trackEvent.js";// need to import telemetry service here to start itimport { telemetryService } from "./services/telemetryService.js";- import { uptimeService } from "./services/uptime/uptimeService.js";import { extractSiteId, isSitePublic } from "./utils.js";+import { getSiteImports } from "./api/sites/getSiteImports.js";+import { importSiteData } from "./api/sites/importSiteData.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);@@@ -444,20 -425,19 +448,20 @@@ const start = async () =>server.log.info({ axiom: true, dataset: process.env.AXIOM_DATASET }, "Axiom logging is configured");}- if (process.env.NODE_ENV === "production") {- // Initialize uptime monitoring service in the background (non-blocking)- uptimeService- .initialize()- .then(() => {- server.log.info("Uptime monitoring service initialized successfully");- })- .catch((error) => {- server.log.error("Failed to initialize uptime service:", error);- // Continue running without uptime monitoring- });- }+ // if (process.env.NODE_ENV === "production") {+ // // Initialize uptime monitoring service in the background (non-blocking)+ // uptimeService+ // .initialize()+ // .then(() => {+ // server.log.info("Uptime monitoring service initialized successfully");+ // })+ // .catch((error) => {+ // server.log.error("Failed to initialize uptime service:", error);+ // // Continue running without uptime monitoring+ // });+ // }} catch (err) {+ await boss.stop();server.log.error(err);process.exit(1);}diff --cc server/src/services/storage/r2StorageService.tsindex 2613c20ec,87a588196..07101237c--- a/server/src/services/storage/r2StorageService.ts+++ b/server/src/services/storage/r2StorageService.ts@@@ -1,5 -1,11 +1,11 @@@- import { S3Client, PutObjectCommand, GetObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";+ import {+ S3Client,+ PutObjectCommand,+ GetObjectCommand,+ DeleteObjectCommand,- GetObjectCommandOutput,+ } from "@aws-sdk/client-s3";+import { Upload } from "@aws-sdk/lib-storage";+ import { NodeHttpHandler } from "@smithy/node-http-handler";import { Readable } from "stream";import { gunzipSync } from "zlib";import { compress as zstdCompress, decompress as zstdDecompress } from "@mongodb-js/zstd";