Skip to content

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

Error handling

Edward Cui8a7c5e06b00e
diff --git a/server/src/api/importData.ts b/server/src/api/importData.ts
index 16afe7c83..5b44cde69 100644
--- a/server/src/api/importData.ts
+++ b/server/src/api/importData.ts
@@ -11,58 +11,79 @@ import { importInitiationQueue } from "../types/import.js";
const IMPORT_DIR = "/tmp/imports";
const importRequestSchema = z.object({
- Params: z.object({
+ params: z.object({
site: z.string().min(1),
}),
- Body: z.object({
+ body: z.object({
source: z.enum(["umami"]),
}),
});
-type ImportRequest = z.infer<typeof importRequestSchema>;
+type ImportRequest = {
+ Params: z.infer<typeof importRequestSchema.shape.params>;
+ Body: z.infer<typeof importRequestSchema.shape.body>;
+};
export async function importData(
request: FastifyRequest<ImportRequest>,
reply: FastifyReply,
) {
- const { site } = request.params;
- const { source } = request.body;
+ try {
+ const { site } = request.params;
+ const { source } = request.body;
- const userHasAccess = await getUserHasAccessToSite(request, site);
- if (!userHasAccess) {
- return reply.status(403).send({ error: "Forbidden" });
- }
+ if (!source) {
+ return reply.status(400).send({ error: "Missing 'source' in request body." });
+ }
- const fileData = await request.file();
- if (!fileData) {
- return reply.status(400).send({ error: "No file uploaded." });
- }
+ const userHasAccess = await getUserHasAccessToSite(request, site);
+ if (!userHasAccess) {
+ return reply.status(403).send({ error: "Forbidden" });
+ }
- if (!fileData.filename.endsWith(".csv")) {
- return reply.status(400).send({ error: "Invalid file type. Only .csv files are accepted." });
- }
+ const fileData = await request.file();
+ if (!fileData) {
+ return reply.status(400).send({ error: "No file uploaded." });
+ }
- const importId = `${source}_${crypto.randomUUID()};`
- const tempFilePath = path.join(IMPORT_DIR, importId);
+ if (!fileData.filename.endsWith(".csv")) {
+ return reply.status(400).send({
+ error: "Invalid file type. Only .csv files are accepted.",
+ });
+ }
- try {
- await fs.promises.mkdir(IMPORT_DIR, { recursive: true });
- await pipeline(fileData.file, fs.createWriteStream(tempFilePath));
- } catch (error) {
- console.error("🚨 Failed to save uploaded file to disk:", error);
- return reply.status(500).send({ error: "Could not process file upload." });
- }
+ const importId = `${source}_${crypto.randomUUID()}`;
+ const tempFilePath = path.join(IMPORT_DIR, importId);
+
+ try {
+ await fs.promises.mkdir(IMPORT_DIR, { recursive: true });
+ await pipeline(fileData.file, fs.createWriteStream(tempFilePath));
+ } catch (fileError) {
+ console.error("🚨 Failed to save uploaded file to disk:", fileError);
+ return reply.status(500).send({ error: "Could not process file upload." });
+ }
- await boss.send(importInitiationQueue, {
- tempFilePath,
- site,
- importId,
- source,
- });
+ try {
+ await boss.send(importInitiationQueue, {
+ tempFilePath,
+ site,
+ importId,
+ source,
+ });
+ } catch (queueError) {
+ console.error("🚨 Failed to enqueue import job:", queueError);
+ return reply.status(500).send({ error: "Failed to initiate import process." });
+ }
- reply.status(202).send({
- success: true,
- message: "File upload accepted and is now being processed.",
- importId
- });
+ return reply.status(202).send({
+ success: true,
+ message: "File upload accepted and is now being processed.",
+ importId,
+ });
+ } catch (error) {
+ console.error("🚨 Unexpected error during import:", error);
+ return reply.status(500).send({
+ error: "An unexpected error occurred. Please try again later.",
+ });
+ }
}