Merge pull request #58 from TraceX-Project/develop

Develop

Author: Kittonn

package.json

@@ -32,6 +32,7 @@
     "@nestjs/platform-express": "^11.0.1",
     "@nestjs/schedule": "^6.1.0",
     "@nestjs/swagger": "^11.2.0",
+    "@resvg/resvg-js": "^2.6.2",
     "axios": "^1.12.1",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",

pnpm-lock.yaml

@@ -27,7 +27,7 @@ export class DeviceTemplatesService {
     frontPanel: Express.Multer.File,
     createDeviceTemplateDto: CreateDeviceTemplateDto,
   ) {
-    console.log("createDeviceTemplateWithPorts called with DTO:", createDeviceTemplateDto);
+    console.log('createDeviceTemplateWithPorts called with DTO:', createDeviceTemplateDto);
     const modelNameExistsForVendor = await this.deviceTemplatesRepository.findByModelNameAndVendor(
       createDeviceTemplateDto.modelName,
       createDeviceTemplateDto.vendor,
@@ -79,7 +79,7 @@ export class DeviceTemplatesService {
               throw new BadRequestException(`Missing bounding box for port number ${portNumber}`);
             }
             return {
-              name: `${portType}${prefix}${prefix&&'/'}${idx + runningNumber}`,
+              name: `${portType}${prefix}${prefix && '/'}${idx + runningNumber}`,
               x: boundingBox.x,
               y: boundingBox.y,
               width: boundingBox.width,

src/modules/device-templates/device-templates.service.ts

@@ -119,7 +119,6 @@ export class DevicesRepository {
         },
       })
       .prepare('find_device_by_id');
-
   }
 
   async createDeviceStack(newStack: NewDeviceStack): Promise<DeviceStack> {
@@ -137,13 +136,9 @@ export class DevicesRepository {
 
   async findPhysicalDevicesByProjectId(projectId: string, inRack?: boolean) {
     const inRackCondition =
-      inRack === undefined
-        ? undefined
-        : sql`(${devices.rackId} IS NOT NULL) = ${inRack}`;
+      inRack === undefined ? undefined : sql`(${devices.rackId} IS NOT NULL) = ${inRack}`;
     const inRackServerCondition =
-      inRack === undefined
-        ? undefined
-        : sql`(${servers.rackId} IS NOT NULL) = ${inRack}`;
+      inRack === undefined ? undefined : sql`(${servers.rackId} IS NOT NULL) = ${inRack}`;
 
     const devicesQuery = this.buildBaseDevicesQuery().where(
       and(eq(devices.projectId, projectId), inRackCondition),
@@ -152,9 +147,7 @@ export class DevicesRepository {
       and(eq(servers.projectId, projectId), inRackServerCondition),
     );
 
-    return this.db
-      .select()
-      .from(unionAll(devicesQuery, serversQuery).as('combined_devices'));
+    return this.db.select().from(unionAll(devicesQuery, serversQuery).as('combined_devices'));
   }
 
   async findPhysicalDevicesByIdsAndProjectId(
@@ -170,7 +163,9 @@ export class DevicesRepository {
 
     return this.db
       .select()
-      .from(unionAll(devicesQuery, serversQuery).as('combined_devices_by_ids')) as unknown as Promise<DeviceWithRelations[]>;
+      .from(
+        unionAll(devicesQuery, serversQuery).as('combined_devices_by_ids'),
+      ) as unknown as Promise<DeviceWithRelations[]>;
   }
 
   private buildBaseDevicesQuery() {

src/modules/devices/devices.repository.ts

@@ -3,6 +3,8 @@ import { DeviceDocumentData, DocumentFormat } from './generators/types';
 import { PdfGenerator } from './generators/pdf.generator';
 import { DocxGenerator } from './generators/docx.generate';
 import { Project } from '@/shared/types/drizzle';
+import { TopologyNode } from '@/shared/types/topology';
+import { generateTopologyPng } from './generators/topology-image.generator';
 @Injectable()
 export class DocumentService {
   constructor() {}
@@ -18,10 +20,21 @@ export class DocumentService {
     }
   }
 
-  async generateDocument(format: DocumentFormat, project: Project, devices: DeviceDocumentData[]) {
+  async generateDocument(
+    format: DocumentFormat,
+    project: Project,
+    devices: DeviceDocumentData[],
+    topology?: { nodes: TopologyNode[]; edges: { source: string; target: string }[] },
+  ) {
     const generator = this.getGenerator(format);
 
-    const buffer = await generator.generate({ devices });
+    let topologyImage: string | null = null;
+    if (topology) {
+      const pngBuffer = await generateTopologyPng(topology.nodes, topology.edges);
+      topologyImage = pngBuffer.toString('base64');
+    }
+
+    const buffer = await generator.generate({ devices, topologyImage });
 
     const mimeType =
       format === DocumentFormat.PDF