External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: refactoring logs and adding pino logger for production and dev. (#236)

Browse Source
This commit is contained in:
Charles GTE
2026-03-29 11:22:28 +02:00
committed by GitHub
parent 057c192314
commit e1c0fc6917
24 changed files with 354 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/agent/[agentId]/backup/helpers.ts
+14 -12
View File
@@ -1,7 +1,10 @@
import { NextResponse } from "next/server";
import { eq } from "drizzle-orm";
import { db } from "@/db";
import {NextResponse} from "next/server";
import {eq} from "drizzle-orm";
import {db} from "@/db";
import * as drizzleDb from "@/db";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/backup/helpers"});
export function withAgentCheck(handler: Function) {
return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
@@ -14,23 +17,22 @@ export function withAgentCheck(handler: Function) {
if (!agent) {
return NextResponse.json(
{ error: "Agent not found" },
{ status: 404 }
{error: "Agent not found"},
{status: 404}
);
}
return handler(request, { ...context, agent });
return handler(request, {...context, agent});
} catch (err) {
console.error("Error in agent middleware:", err);
log.error({error: err, name: "withAgentCheck"}, "Error in agent middleware");
return NextResponse.json(
{ error: "Internal server error" },
{ status: 500 }
{error: "Internal server error"},
{status: 500}
);
}
};
}
export async function getDatabaseOrThrow(generatedId: string) {
const database = await db.query.database.findFirst({
where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
@@ -43,8 +45,8 @@ export async function getDatabaseOrThrow(generatedId: string) {
if (!database) {
throw NextResponse.json(
{ error: "Database associated with generatedId not found" },
{ status: 404 }
{error: "Database associated with generatedId not found"},
{status: 404}
);
}
app/api/agent/[agentId]/backup/route.ts
+6 -6
View File
@@ -8,6 +8,9 @@ import {withUpdatedAt} from "@/db/utils";
import {eventEmitter} from "@/features/shared/event";
import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
import {EventKind} from "@/features/notifications/types";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/backup/route"});
export type BodyPost = {
method: "manual" | "automatic"
@@ -77,7 +80,6 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
}
}
eventEmitter.emit('modification', {update: true});
return NextResponse.json(
@@ -88,7 +90,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
{status: 200}
);
} catch (error) {
console.error("Error in POST for INIT backup:", error);
log.error({error: error}, "Error in POST for INIT backup");
return NextResponse.json(
{error: "Internal server error"},
{status: 500}
@@ -102,7 +104,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
}) => {
try {
const body: BodyPatch = await request.json();
console.log("body", body);
log.debug({data: body}, "Body from PATH in backup route");
const status = body.status
const backupId = body.backupId
@@ -142,9 +144,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
{status: 200}
);
} catch (error) {
console.error("Error in PATCH backup:", error);
log.error({error: error}, "Error in PATCH backup")
return NextResponse.json(
{error: "Internal server error"},
{status: 500}
app/api/agent/[agentId]/backup/upload/init/route.ts
+5 -2
View File
@@ -5,6 +5,9 @@ import {db} from "@/db";
import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
import {isUuidv4} from "@/utils/verify-uuid";
import {eventEmitter} from "@/features/shared/event";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/backup/upload/init"});
export type Body = {
generatedId: string
@@ -18,7 +21,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
try {
const body: Body = await request.json();
console.log("body", body);
log.debug({data: body}, "Body for backup upload init");
const generatedId = body.generatedId;
const storageChannelId = body.storageChannelId;
@@ -66,7 +69,7 @@ export const POST = withAgentCheck(async (request: Request, {params, agent}: {
{status: 200}
);
} catch (error) {
console.error("Error in POST for INIT backup:", error);
log.error({error: error}, "Error in POST for INIT backup");
return NextResponse.json(
{error: "Internal server error"},
{status: 500}
app/api/agent/[agentId]/backup/upload/status/route.ts
+5 -3
View File
@@ -5,6 +5,9 @@ import {db as dbClient, db} from "@/db";
import {withUpdatedAt} from "@/db/utils";
import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
import {eventEmitter} from "@/features/shared/event";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/backup/upload/status"});
export type Body = {
generatedId: string
@@ -27,8 +30,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
const backupStorageId = body.backupStorageId;
const backupId = body.backupId;
console.log("body", body);
log.debug({data: body}, "Body for backup upload status");
const database = await getDatabaseOrThrow(generatedId);
@@ -85,7 +87,7 @@ export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
{status: 200}
);
} catch (error) {
console.error("Error in POST for INIT backup:", error);
log.error({error: error},"Error in POST for INIT backup");
return NextResponse.json(
{error: "Internal server error"},
{status: 500}
app/api/agent/[agentId]/restore/route.ts
+4 -3
View File
@@ -4,7 +4,9 @@ import * as drizzleDb from "@/db";
import {db} from "@/db";
import {and, eq} from "drizzle-orm";
import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
import {eventEmitter} from "@/features/shared/event";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/restore"});
export type BodyResultRestore = {
generatedId: string
@@ -70,10 +72,9 @@ export async function POST(
message: "Restoration successfully updated"
}
return Response.json(response, {status: 200})
} catch (error) {
console.error('Error in POST handler:', error);
log.error({error: error}, "Error in POST handler")
return NextResponse.json(
{error: 'Internal server error'},
{status: 500}
app/api/agent/[agentId]/status/helpers.ts
+7 -5
View File
@@ -2,7 +2,7 @@ import {NextResponse} from "next/server";
import {Body} from "./route";
import {isUuidv4} from "@/utils/verify-uuid";
import {Agent} from "@/db/schema/08_agent";
import {Database, DatabaseWith} from "@/db/schema/07_database";
import {DatabaseWith} from "@/db/schema/07_database";
import * as drizzleDb from "@/db";
import {db, db as dbClient} from "@/db";
import {and, eq, inArray} from "drizzle-orm";
@@ -11,6 +11,9 @@ import {withUpdatedAt} from "@/db/utils";
import type {StorageInput} from "@/features/storages/types";
import {dispatchStorage} from "@/features/storages/dispatch";
import {Setting} from "@/db/schema/01_setting";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/status/helpers"});
export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
const databasesResponse = [];
@@ -56,7 +59,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
}
if (!dbmsEnumSchema.safeParse(db.dbms).success) {
console.log(`Database type not available: ${db.dbms}`);
log.error({name: "handleDatabases"},`Database type not available: ${db.dbms}`);
continue;
}
@@ -85,7 +88,6 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
date: lastContact
})
const storages = await getDatabaseStorageChannels(databaseCreated.id)
databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
@@ -185,11 +187,11 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
.where(eq(drizzleDb.schemas.restoration.id, restoration.id));
const errorMessage = "Failed to get backup URL";
console.error("Restoration failed: ", errorMessage);
log.error({error: errorMessage, name: "handleDatabases"}, "Restoration failed");
continue;
}
} catch (err) {
console.error("Restoration crashed unexpectedly:", err);
log.error({error: err, name: "handleDatabases"}, "Restoration crashed unexpectedly");
await dbClient
.update(drizzleDb.schemas.restoration)
.set({status: "failed"})
app/api/agent/[agentId]/status/route.ts
+8 -7
View File
@@ -6,8 +6,11 @@ import {EDbmsSchema} from "@/db/schema/types";
import {eq} from "drizzle-orm";
import {isUuidv4} from "@/utils/verify-uuid";
import {withUpdatedAt} from "@/db/utils";
import {eventEmitter} from "@/features/shared/event";
import {notFound} from "next/navigation";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/agent/status/route"});
export type databaseAgent = {
name: string,
@@ -28,14 +31,14 @@ export async function POST(
) {
try {
const agentId = (await params).agentId
console.log(agentId)
log.debug(`Agent ID: ${agentId}`)
const body: Body = await request.json();
const lastContact = new Date();
let message: string
if (!isUuidv4(agentId)) {
message = "agentId is not a valid uuid"
console.error(message)
log.error({error: message}, "An error occurred")
return NextResponse.json(
{error: "agentId is not a valid uuid"},
{status: 500}
@@ -56,7 +59,6 @@ export async function POST(
return NextResponse.json({error: "An error occured"}, {status: 404})
}
const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
await db
@@ -85,10 +87,9 @@ export async function POST(
databases: databasesResponse
}
return Response.json(response)
} catch (error) {
console.error('Error in POST handler:', error);
log.error({error: error}, "Error in POST handler")
return NextResponse.json(
{error: 'Internal server error'},
{status: 500}
app/api/events/route.ts
+6 -3
View File
@@ -2,6 +2,9 @@ import {auth} from "@/lib/auth/auth";
import {headers} from "next/headers";
import {NextResponse} from "next/server";
import {eventEmitter} from "@/features/shared/event";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/events"});
export async function GET(request: Request) {
@@ -16,9 +19,9 @@ export async function GET(request: Request) {
return new Response(
new ReadableStream({
start(controller) {
console.log('Stream started');
log.info("Stream started");
const handleModification = (data: any) => {
console.log('Modification event triggered:', data);
log.info({data: data},"Modification event triggered");
controller.enqueue(`event: modification\n`);
controller.enqueue(`data: ${JSON.stringify(data)}\n\n`);
};
@@ -26,7 +29,7 @@ export async function GET(request: Request) {
eventEmitter.on('modification', handleModification);
request.signal.addEventListener('abort', () => {
console.log('Client disconnected');
log.info("Client disconnected");
controller.close();
eventEmitter.off('modification', handleModification);
});
app/api/files/backups/route.ts
+4 -1
View File
@@ -3,6 +3,9 @@ import path from "path";
import type {StorageInput} from "@/features/storages/types";
import {dispatchStorage} from "@/features/storages/dispatch";
import {Readable} from "node:stream";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/files/backups"});
export async function GET(
request: Request,
@@ -30,7 +33,7 @@ export async function GET(
}
};
console.debug(input);
log.debug({input: input}, "Dispatch Storage");
const result = await dispatchStorage(input, undefined, storageId);
app/api/files/images/[fileName]/route.ts
+5 -5
View File
@@ -1,12 +1,12 @@
import {NextResponse} from "next/server";
import {auth} from "@/lib/auth/auth";
import {headers} from "next/headers";
import {db} from "@/db";
import * as drizzleDb from "@/db";
import {eq} from "drizzle-orm";
import {StorageInput} from "@/features/storages/types";
import {dispatchStorage} from "@/features/storages/dispatch";
import {Readable} from "node:stream";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/files/images"});
export async function GET(
req: Request,
@@ -56,7 +56,7 @@ export async function GET(
const result = await dispatchStorage(input, undefined, storageId);
if (!result.file || !(result.file instanceof Readable)) {
console.error(`An error occurred while getting file :`, result);
log.error({error: result}, `An error occurred while getting file`);
return NextResponse.json(
{error: "Invalid file payload"},
{status: 500}
@@ -82,7 +82,7 @@ export async function GET(
});
} catch (err) {
console.error("Error streaming image:", err);
log.error({error: err}, `Error streaming image`);
return NextResponse.json({error: "Error fetching file"}, {status: 500});
}
}
app/api/tus/hooks/route.ts
+5 -5
View File
@@ -2,7 +2,9 @@ import {NextResponse} from "next/server";
import fs from "fs";
import path from "path";
import {env} from "@/env.mjs";
import {logger} from "@/lib/logger";
const log = logger.child({module: "api/tus/hooks"});
export async function POST(request: Request) {
try {
@@ -13,7 +15,7 @@ export async function POST(request: Request) {
const uploadOffset = headers["Upload-Offset"]?.[0];
const status = headers["X-Status"]?.[0];
console.log(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
log.info(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
if (status === "success") {
if (
@@ -29,9 +31,7 @@ export async function POST(request: Request) {
return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
}
// const uploadDir = path.join(process.cwd(), "/private/uploads/");
const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
const uploadDir = path.join(env.PRIVATE_PATH!, "/uploads/");
const oldFilePath = path.join(uploadDir, "tmp", id);
const newFilePath = path.join(uploadDir, filePath);
@@ -74,7 +74,7 @@ export async function POST(request: Request) {
}
return NextResponse.json({});
} catch (error) {
console.error("Hook error:", error);
log.error({error: error},"TUS Hook error");
return NextResponse.json({error: "Internal server error"}, {status: 500});
}
}