@fdm-monster/server 2.0.1 → 2.0.4

package/dist/services/orm/printer-maintenance-log.service.js

@@ -0,0 +1,151 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "PrinterMaintenanceLogService", {
+    enumerable: true,
+    get: function() {
+        return PrinterMaintenanceLogService;
+    }
+});
+const _printermaintenancelogentity = require("../../entities/printer-maintenance-log.entity");
+const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
+class PrinterMaintenanceLogService {
+    printerService;
+    logger;
+    repository;
+    constructor(loggerFactory, typeormService, printerService){
+        this.printerService = printerService;
+        this.logger = loggerFactory(PrinterMaintenanceLogService.name);
+        this.repository = typeormService.getDataSource().getRepository(_printermaintenancelogentity.PrinterMaintenanceLog);
+    }
+    toDto(entity) {
+        return {
+            id: entity.id,
+            createdAt: entity.createdAt,
+            createdBy: entity.createdBy,
+            createdByUserId: entity.createdByUserId,
+            printerId: entity.printerId,
+            printerName: entity.printerName,
+            printerUrl: entity.printerUrl,
+            metadata: entity.metadata,
+            completed: entity.completed,
+            completedAt: entity.completedAt,
+            completedByUserId: entity.completedByUserId,
+            completedBy: entity.completedBy
+        };
+    }
+    async create(dto, userId, username) {
+        const printer = await this.printerService.get(dto.printerId);
+        const existingLog = await this.repository.findOne({
+            where: {
+                printerId: dto.printerId,
+                completed: false
+            }
+        });
+        if (existingLog) {
+            throw new _runtimeexceptions.BadRequestException(`Printer ${printer.name} already has an active maintenance log`);
+        }
+        const log = this.repository.create({
+            printerId: dto.printerId,
+            printerName: printer.name,
+            printerUrl: printer.printerURL,
+            metadata: dto.metadata,
+            createdBy: username,
+            createdByUserId: userId,
+            completed: false
+        });
+        await this.repository.save(log);
+        await this.printerService.updateDisabledReason(dto.printerId, this.buildDisabledReasonFromMetadata(dto.metadata));
+        return log;
+    }
+    async complete(logId, dto, userId, username) {
+        const log = await this.repository.findOne({
+            where: {
+                id: logId
+            }
+        });
+        if (!log) {
+            throw new _runtimeexceptions.NotFoundException(`Maintenance log with id ${logId} not found`);
+        }
+        if (log.completed) {
+            throw new _runtimeexceptions.BadRequestException(`Maintenance log ${logId} is already completed`);
+        }
+        log.metadata = {
+            ...log.metadata,
+            completionNotes: dto.completionNotes
+        };
+        log.completed = true;
+        log.completedAt = new Date();
+        log.completedBy = username;
+        log.completedByUserId = userId;
+        await this.repository.save(log);
+        if (log.printerId) {
+            await this.printerService.updateDisabledReason(log.printerId, null);
+        }
+        return log;
+    }
+    async get(logId) {
+        const log = await this.repository.findOne({
+            where: {
+                id: logId
+            }
+        });
+        if (!log) {
+            throw new _runtimeexceptions.NotFoundException(`Maintenance log with id ${logId} not found`);
+        }
+        return log;
+    }
+    async getActiveByPrinterId(printerId) {
+        return this.repository.findOne({
+            where: {
+                printerId,
+                completed: false
+            }
+        });
+    }
+    async list(filters) {
+        const { printerId, completed, page = 1, pageSize = 20 } = filters;
+        const queryBuilder = this.repository.createQueryBuilder("log");
+        if (printerId !== undefined) {
+            queryBuilder.andWhere("log.printerId = :printerId", {
+                printerId
+            });
+        }
+        if (completed !== undefined) {
+            queryBuilder.andWhere("log.completed = :completed", {
+                completed
+            });
+        }
+        queryBuilder.orderBy("log.createdAt", "DESC");
+        queryBuilder.skip((page - 1) * pageSize);
+        queryBuilder.take(pageSize);
+        const [logs, total] = await queryBuilder.getManyAndCount();
+        return {
+            logs,
+            total
+        };
+    }
+    async delete(logId) {
+        const log = await this.get(logId);
+        if (!log.completed && log.printerId) {
+            await this.printerService.updateDisabledReason(log.printerId, null);
+        }
+        await this.repository.delete(logId);
+    }
+    buildDisabledReasonFromMetadata(metadata) {
+        const parts = [];
+        if (metadata.cause) {
+            parts.push(metadata.cause);
+        }
+        if (metadata.partsInvolved && metadata.partsInvolved.length > 0) {
+            parts.push(`Parts: ${metadata.partsInvolved.join(", ")}`);
+        }
+        if (metadata.notes) {
+            parts.push(metadata.notes);
+        }
+        return parts.join(" - ") || "Under maintenance";
+    }
+}
+
+//# sourceMappingURL=printer-maintenance-log.service.js.map

package/dist/services/orm/printer-maintenance-log.service.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/orm/printer-maintenance-log.service.ts"],"names":["PrinterMaintenanceLogService","logger","repository","loggerFactory","typeormService","printerService","name","getDataSource","getRepository","PrinterMaintenanceLog","toDto","entity","id","createdAt","createdBy","createdByUserId","printerId","printerName","printerUrl","metadata","completed","completedAt","completedByUserId","completedBy","create","dto","userId","username","printer","get","existingLog","findOne","where","BadRequestException","log","printerURL","save","updateDisabledReason","buildDisabledReasonFromMetadata","complete","logId","NotFoundException","completionNotes","Date","getActiveByPrinterId","list","filters","page","pageSize","queryBuilder","createQueryBuilder","undefined","andWhere","orderBy","skip","take","logs","total","getManyAndCount","delete","parts","cause","push","partsInvolved","length","join","notes"],"mappings":"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"}

package/dist/services/orm/printer.service.js

@@ -70,8 +70,8 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             apiKey,
             enabled,
             printerType,
-            password,
-            username
+            password: password ?? undefined,
+            username: username ?? undefined
         });
         this.eventEmitter2.emit(_eventconstants.printerEvents.printerUpdated, {
             printer
@@ -80,12 +80,14 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
     }
     async batchImport(printers) {
         if (!printers?.length) return [];
-        this.logger.log("Validation passed");
+        const validatedPrinters = [];
         for (let printer of printers){
-            await this.validateAndDefault(printer);
+            const validated = await this.validateAndDefault(printer);
+            validatedPrinters.push(validated);
         }
+        this.logger.log("Validation passed");
         const newPrinters = [];
-        for (let printer of printers){
+        for (let printer of validatedPrinters){
             const createdPrinter = await this.create(printer, false);
             newPrinters.push(createdPrinter);
         }
@@ -115,12 +117,18 @@ class PrinterService extends (0, _baseservice.BaseService)(_printerentity.Printe
             });
         }
     }
-    updateDisabledReason(printerId, disabledReason) {
+    async updateDisabledReason(printerId, disabledReason) {
+        await (0, _validators.validateInput)({
+            disabledReason
+        }, _printerservicevalidation.updatePrinterDisabledReasonSchema);
         return this.update(printerId, {
             disabledReason
         });
     }
-    updateEnabled(printerId, enabled) {
+    async updateEnabled(printerId, enabled) {
+        await (0, _validators.validateInput)({
+            enabled
+        }, _printerservicevalidation.updatePrinterEnabledSchema);
         return this.update(printerId, {
             enabled
         });

package/dist/services/orm/printer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","printerUpdated","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updateEnabled","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/orm/printer.service.ts"],"names":["PrinterService","BaseService","Printer","PrinterDto","CreatePrinterDto","logger","loggerFactory","typeormService","eventEmitter2","name","toDto","entity","id","enabled","disabledReason","dateAdded","apiKey","username","password","printerURL","printerType","list","repository","find","order","create","newPrinter","emitEvent","mergedPrinter","validateAndDefault","Date","now","printer","emit","printerEvents","printerCreated","update","printerId","partial","get","normalizeUrl","defaultProtocol","defaultHttpProtocol","Object","assign","validateInput","createPrinterSchema","updatedPrinter","undefined","printerUpdated","batchImport","printers","length","validatedPrinters","validated","push","log","newPrinters","createdPrinter","batchPrinterCreated","delete","printersDeleted","printerIds","deleteMany","updateDisabledReason","updatePrinterDisabledReasonSchema","updateEnabled","updatePrinterEnabledSchema","updateFeedRate","feedRate","updateFlowRate","flowRate"],"mappings":"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"}

package/dist/services/typeorm/typeorm.service.js

@@ -28,14 +28,14 @@ class TypeormService {
     }
     async createConnection() {
         const dataSource = this.loadDataSources();
-        if (!dataSource.isInitialized) {
+        if (dataSource.isInitialized) {
+            this.logger.log("Typeorm connection already initialized, skipping");
+        } else {
             const connection = await dataSource.initialize();
-            await connection.runMigrations({
+            const migrations = await connection.runMigrations({
                 transaction: "all"
             });
-            this.logger.log("Typeorm connection initialized");
-        } else {
-            this.logger.log("Typeorm connection already initialized, skipping");
+            this.logger.log(`Typeorm connection initialized - ${migrations.length} migrations executed`);
         }
         this.loaded = true;
     }

package/dist/services/typeorm/typeorm.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/typeorm/typeorm.service.ts"],"names":["TypeormService","loaded","dataSource","logger","LoggerService","name","hasConnected","loadDataSources","isInitialized","getDataSource","createConnection","connection","initialize","runMigrations","transaction","log","AppDataSource"],"mappings":";;;;+BAIaA;;;eAAAA;;;wBAHiB;4BACA;AAEvB,MAAMA;IACXC,SAAS,MAAM;IACPC,WAAwB;IACxBC,SAAS,IAAIC,qBAAa,CAACJ,eAAeK,IAAI,EAAE;IAEjDC,eAAe;QACpB,IAAI,CAAC,IAAI,CAACJ,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU,CAAEM,aAAa,GAAG,IAAI;IAC9C;IAEOC,gBAAgB;QACrB,IAAI,CAAC,IAAI,CAACP,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU;IACxB;IAEA,MAAaQ,mBAAmB;QAC9B,MAAMR,aAAa,IAAI,CAACK,eAAe;QACvC,IAAI,CAACL,WAAWM,aAAa,EAAE;YAC7B,MAAMG,aAAa,MAAMT,WAAWU,UAAU;YAC9C,MAAMD,WAAWE,aAAa,CAAC;gBAAEC,aAAa;YAAM;YACpD,IAAI,CAACX,MAAM,CAACY,GAAG,CAAC;QAClB,OAAO;YACL,IAAI,CAACZ,MAAM,CAACY,GAAG,CAAC;QAClB;QACA,IAAI,CAACd,MAAM,GAAG;IAChB;IAEQM,kBAAkB;QACxB,IAAI,CAACL,UAAU,GAAGc,yBAAa;QAC/B,OAAO,IAAI,CAACd,UAAU;IACxB;AACF"}
+{"version":3,"sources":["../../../src/services/typeorm/typeorm.service.ts"],"names":["TypeormService","loaded","dataSource","logger","LoggerService","name","hasConnected","loadDataSources","isInitialized","getDataSource","createConnection","log","connection","initialize","migrations","runMigrations","transaction","length","AppDataSource"],"mappings":";;;;+BAIaA;;;eAAAA;;;wBAHiB;4BACA;AAEvB,MAAMA;IACXC,SAAS,MAAM;IACPC,WAAwB;IACfC,SAAS,IAAIC,qBAAa,CAACJ,eAAeK,IAAI,EAAE;IAE1DC,eAAe;QACpB,IAAI,CAAC,IAAI,CAACJ,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU,CAAEM,aAAa,GAAG,IAAI;IAC9C;IAEOC,gBAAgB;QACrB,IAAI,CAAC,IAAI,CAACP,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU;IACxB;IAEA,MAAaQ,mBAAmB;QAC9B,MAAMR,aAAa,IAAI,CAACK,eAAe;QACvC,IAAIL,WAAWM,aAAa,EAAE;YAC5B,IAAI,CAACL,MAAM,CAACQ,GAAG,CAAC;QAClB,OAAO;YACL,MAAMC,aAAa,MAAMV,WAAWW,UAAU;YAC9C,MAAMC,aAAa,MAAMF,WAAWG,aAAa,CAAC;gBAAEC,aAAa;YAAM;YACvE,IAAI,CAACb,MAAM,CAACQ,GAAG,CAAC,CAAC,iCAAiC,EAAEG,WAAWG,MAAM,CAAC,oBAAoB,CAAC;QAC7F;QACA,IAAI,CAAChB,MAAM,GAAG;IAChB;IAEQM,kBAAkB;QACxB,IAAI,CAACL,UAAU,GAAGgB,yBAAa;QAC/B,OAAO,IAAI,CAAChB,UAAU;IACxB;AACF"}

package/dist/services/validators/printer-maintenance-log.validation.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get completeMaintenanceLogSchema () {
+        return completeMaintenanceLogSchema;
+    },
+    get createMaintenanceLogSchema () {
+        return createMaintenanceLogSchema;
+    },
+    get getMaintenanceLogsQuerySchema () {
+        return getMaintenanceLogsQuerySchema;
+    }
+});
+const _zod = require("zod");
+const createMaintenanceLogSchema = _zod.z.object({
+    printerId: _zod.z.number().int().positive(),
+    metadata: _zod.z.object({
+        partsInvolved: _zod.z.array(_zod.z.string()).optional(),
+        cause: _zod.z.string().optional(),
+        notes: _zod.z.string().optional()
+    })
+});
+const completeMaintenanceLogSchema = _zod.z.object({
+    completionNotes: _zod.z.string().optional()
+});
+const getMaintenanceLogsQuerySchema = _zod.z.object({
+    printerId: _zod.z.coerce.number().int().positive().optional(),
+    completed: _zod.z.coerce.boolean().optional(),
+    page: _zod.z.coerce.number().int().positive().default(1),
+    pageSize: _zod.z.coerce.number().int().positive().max(100).default(20)
+});
+
+//# sourceMappingURL=printer-maintenance-log.validation.js.map

package/dist/services/validators/printer-maintenance-log.validation.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/services/validators/printer-maintenance-log.validation.ts"],"names":["completeMaintenanceLogSchema","createMaintenanceLogSchema","getMaintenanceLogsQuerySchema","z","object","printerId","number","int","positive","metadata","partsInvolved","array","string","optional","cause","notes","completionNotes","coerce","completed","boolean","page","default","pageSize","max"],"mappings":";;;;;;;;;;;QAWaA;eAAAA;;QATAC;eAAAA;;QAaAC;eAAAA;;;qBAfK;AAEX,MAAMD,6BAA6BE,MAAC,CAACC,MAAM,CAAC;IACjDC,WAAWF,MAAC,CAACG,MAAM,GAAGC,GAAG,GAAGC,QAAQ;IACpCC,UAAUN,MAAC,CAACC,MAAM,CAAC;QACjBM,eAAeP,MAAC,CAACQ,KAAK,CAACR,MAAC,CAACS,MAAM,IAAIC,QAAQ;QAC3CC,OAAOX,MAAC,CAACS,MAAM,GAAGC,QAAQ;QAC1BE,OAAOZ,MAAC,CAACS,MAAM,GAAGC,QAAQ;IAC5B;AACF;AAEO,MAAMb,+BAA+BG,MAAC,CAACC,MAAM,CAAC;IACnDY,iBAAiBb,MAAC,CAACS,MAAM,GAAGC,QAAQ;AACtC;AAEO,MAAMX,gCAAgCC,MAAC,CAACC,MAAM,CAAC;IACpDC,WAAWF,MAAC,CAACc,MAAM,CAACX,MAAM,GAAGC,GAAG,GAAGC,QAAQ,GAAGK,QAAQ;IACtDK,WAAWf,MAAC,CAACc,MAAM,CAACE,OAAO,GAAGN,QAAQ;IACtCO,MAAMjB,MAAC,CAACc,MAAM,CAACX,MAAM,GAAGC,GAAG,GAAGC,QAAQ,GAAGa,OAAO,CAAC;IACjDC,UAAUnB,MAAC,CAACc,MAAM,CAACX,MAAM,GAAGC,GAAG,GAAGC,QAAQ,GAAGe,GAAG,CAAC,KAAKF,OAAO,CAAC;AAChE"}

package/dist/services/validators/printer-service.validation.js

@@ -55,10 +55,10 @@ const _zod = require("zod");
 const octoPrintApiKeySchema = _zod.z.string().min(_serviceconstants.apiKeyLengthMinDefault).max(_serviceconstants.apiKeyLengthMaxDefault).regex(/^[a-zA-Z0-9_-]+$/, "Alpha-numeric, dash, and underscore only");
 const printerApiKeyValidator = _zod.z.string().optional();
 const printerNameValidator = _zod.z.string();
-const printerUsernameValidator = _zod.z.string();
-const printerPasswordValidator = _zod.z.string();
+const printerUsernameValidator = _zod.z.string().nullable();
+const printerPasswordValidator = _zod.z.string().nullable();
 const printerEnabledValidator = _zod.z.boolean();
-const printerDisabledReasonValidator = _zod.z.string().optional();
+const printerDisabledReasonValidator = _zod.z.string().nullable();
 const printerUrlValidator = _zod.z.string().url();
 const printerTypeValidator = _zod.z.nativeEnum(_printerapiinterface.PrinterTypesEnum);
 const printerDateAddedValidator = _zod.z.number().optional();
@@ -126,8 +126,7 @@ const updatePrinterEnabledSchema = _zod.z.object({
     enabled: printerEnabledValidator
 });
 const updatePrinterDisabledReasonSchema = _zod.z.object({
-    disabledReason: printerDisabledReasonValidator,
-    enabled: printerEnabledValidator.optional()
+    disabledReason: printerDisabledReasonValidator
 });
 
 //# sourceMappingURL=printer-service.validation.js.map

package/dist/services/validators/printer-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","nullable","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":"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"}

package/dist/services/validators/yaml-service.validation.js

@@ -63,7 +63,7 @@ const importPrinterPositionsSchema = _zod.z.object({
 });
 const importPrintersFloorsYamlSchema = _zod.z.object({
     version: _zod.z.string().optional(),
-    exportedAt: _zod.z.date().optional(),
+    exportedAt: _zod.z.any().optional(),
     databaseType: _zod.z.enum([
         "mongo",
         "sqlite"
@@ -95,11 +95,15 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
         username: _printerservicevalidation.printerUsernameValidator.optional(),
         password: _printerservicevalidation.printerPasswordValidator.optional(),
         enabled: _printerservicevalidation.printerEnabledValidator,
+        disabledReason: _printerservicevalidation.printerDisabledReasonValidator.optional(),
         name: _printerservicevalidation.printerNameValidator,
         printerName: _zod.z.string().optional(),
         settingsAppearance: _zod.z.object({
             name: _zod.z.string().optional()
-        }).optional()
+        }).optional(),
+        feedRate: _zod.z.string().nullable().optional(),
+        flowRate: _zod.z.string().nullable().optional(),
+        assignee: _zod.z.string().nullable().optional()
     })).min(0).default([]),
     floors: _zod.z.array(_zod.z.object({
         id: numberOrStringIdValidator,

package/dist/services/validators/yaml-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","password","printerPasswordValidator","enabled","printerEnabledValidator","name","printerNameValidator","printerName","settingsAppearance","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","any","users","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","any","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","username","printerUsernameValidator","password","printerPasswordValidator","enabled","printerEnabledValidator","disabledReason","printerDisabledReasonValidator","name","printerNameValidator","printerName","settingsAppearance","feedRate","nullable","flowRate","assignee","floors","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","users","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","date","roles"],"mappings":";;;;;;;;;;;QAiBaA;eAAAA;;QA6BAC;eAAAA;;QAIAC;eAAAA;;QAjBAC;eAAAA;;QAEAC;eAAAA;;;qBAnCK;0CASX;wCAMA;AAEA,MAAMJ,iCAAiCK,MAAC,CAACC,MAAM,CAAC;IACrDC,gBAAgBF,MAAC,CAACG,OAAO;IACzBC,iBAAiBJ,MAAC,CAACG,OAAO;IAC1BE,cAAcL,MAAC,CAACG,OAAO;IACvBG,YAAYN,MAAC,CAACG,OAAO;IAErBI,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;IAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACpCC,aAAaX,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACjCE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAO;SAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;IACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAS;SAAK,CAACC,QAAQ,CAACD;IACjGI,OAAOpB,MAAC,CAACc,MAAM,GAAGN,QAAQ;AAC5B;AAEO,MAAMV,4BAA4BE,MAAC,CAACqB,KAAK,CAAC;IAACrB,MAAC,CAACsB,MAAM;IAAItB,MAAC,CAACc,MAAM;CAAG;AAElE,MAAMf,yBAAyBC,MAAC,CACpCa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;IACPsB,WAAWzB;IACX0B,SAAS1B,0BAA0BU,QAAQ;IAC3CiB,GAAGC,kCAAU;IACbC,GAAGC,kCAAU;AACf,IAEDV,GAAG,CAAC;AAEA,MAAMtB,+BAA+BI,MAAC,CAACC,MAAM,CAAC;IACnD4B,UAAU9B,uBAAuBS,QAAQ;AAC3C;AAEO,MAAMX,iCAAiCG,MAAC,CAACC,MAAM,CAAC;IACrD6B,SAAS9B,MAAC,CAACc,MAAM,GAAGN,QAAQ;IAC5BuB,YAAY/B,MAAC,CAACgC,GAAG,GAAGxB,QAAQ;IAC5ByB,cAAcjC,MAAC,CAACkC,IAAI,CAAC;QAAC;QAAS;KAAS,EAAExB,OAAO,CAAC;IAClDyB,QAAQnC,MAAC,CAACC,MAAM,CAAC;QACfC,gBAAgBF,MAAC,CAACG,OAAO;QACzBC,iBAAiBJ,MAAC,CAACG,OAAO;QAC1BE,cAAcL,MAAC,CAACG,OAAO;QACvBG,YAAYN,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAEhCD,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC/CC,aAAaX,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC5CE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAO;aAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;QACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAS;aAAK,CAACC,QAAQ,CAACD;IACnG;IACAa,UAAU7B,MAAC,CACRa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJuC,YAAYC,6CAAmB;QAC/BC,aAAaC,8CAAoB;QACjCC,QAAQC,gDAAsB;QAC9BC,UAAUC,kDAAwB,CAACpC,QAAQ;QAC3CqC,UAAUC,kDAAwB,CAACtC,QAAQ;QAC3CuC,SAASC,iDAAuB;QAChCC,gBAAgBC,wDAA8B,CAAC1C,QAAQ;QACvD2C,MAAMC,8CAAoB;QAE1BC,aAAarD,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAChC8C,oBAAoBtD,MAAC,CAClBC,MAAM,CAAC;YACNkD,MAAMnD,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC3B,GACCA,QAAQ;QACX+C,UAAUvD,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;QACxCiD,UAAUzD,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;QACxCkD,UAAU1D,MAAC,CAACc,MAAM,GAAG0C,QAAQ,GAAGhD,QAAQ;IAC1C,IAEDU,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbiD,QAAQ3D,MAAC,CACNa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ8D,OAAOC,2CAAmB;QAE1BC,OAAOD,2CAAmB,CAACrD,QAAQ;QACnC2C,MAAMY,0CAAkB;QACxBlC,UAAU9B;IACZ,IAEDmB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbsD,MAAMhE,MAAC,CACJa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJqD,MAAMnD,MAAC,CAACc,MAAM;QACdmD,OAAOjE,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC1BqB,UAAU7B,MAAC,CAACa,KAAK,CACfb,MAAC,CAACC,MAAM,CAAC;YACPsB,WAAWzB;QACb;IAEJ,IAEDoB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbwD,UAAUlE,MAAC,CAACgC,GAAG,GAAGxB,QAAQ;IAC1B2D,OAAOnE,MAAC,CACLa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ6C,UAAU3C,MAAC,CAACc,MAAM;QAClBsD,YAAYpE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC6D,YAAYrE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC8D,YAAYtE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChC+D,qBAAqBvE,MAAC,CAACG,OAAO,GAAGK,QAAQ;QACzCgE,cAAcxE,MAAC,CAACc,MAAM;QACtB2D,WAAWzE,MAAC,CAAC0E,IAAI,GAAGlE,QAAQ;QAC5BmE,OAAO3E,MAAC,CAACa,KAAK,CAACb,MAAC,CAACgC,GAAG,IAAIxB,QAAQ;IAClC,IAEDA,QAAQ,GACRE,OAAO,CAAC,EAAE;AACf"}

package/dist/state/test-printer-socket.store.js

@@ -47,8 +47,8 @@ class TestPrinterSocketStore {
             printerId: testPrinterId,
             loginDto: {
                 apiKey: printer.apiKey,
-                username: printer.username,
-                password: printer.password,
+                username: printer.username ?? undefined,
+                password: printer.password ?? undefined,
                 printerURL: printer.printerURL,
                 printerType: printer.printerType
             }

package/dist/state/test-printer-socket.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","TEST_PRINTER_ID_BASE","testPrinterIdCounter","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","testPrinterId","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","TEST_PRINTER_ID_BASE","testPrinterIdCounter","testSocket","logger","loggerFactory","socketFactory","socketIoGateway","eventEmitter2","name","setupTestPrinter","correlationToken","printer","close","validatedData","validateInput","createTestPrinterSchema","enabled","testPrinterId","createInstance","printerType","registerCredentials","printerId","loginDto","apiKey","username","undefined","password","printerURL","testEvents","octoPrintEvent","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","moonrakerEvent","bambuEvent","prusaLinkEvent","listener","event","payload","send","forEach","te","on","log","setupSocketSession","promise","Promise","resolve","reject","error","open","_startTime","setInterval","warn","Error","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","e","errorSummary","captureException","disallowEmittingEvents","emit","printerEvents","printersDeleted","printerIds","off"],"mappings":"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"}

package/dist/tasks/print-job-analysis.task.js

@@ -37,7 +37,6 @@ class PrintJobAnalysisTask {
                 take: 10
             });
             if (pendingJobs.length === 0) {
-                this.logger.debug("No pending print jobs to analyze");
                 return;
             }
             this.logger.log(`Found ${pendingJobs.length} print job(s) to analyze`);

package/dist/tasks/print-job-analysis.task.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/tasks/print-job-analysis.task.ts"],"names":["PrintJobAnalysisTask","logger","printJobRepository","loggerFactory","printJobService","fileAnalysisService","fileStorageService","typeormService","name","getDataSource","getRepository","PrintJob","run","pendingJobs","find","where","analysisState","status","take","length","debug","log","job","analyzeJob","error","id","fileName","statusReason","Error","message","save","fileStorageId","cachedMetadata","loadMetadata","metadata","thumbnails","filePath","resolveFilePath","exists","needsAnalysis","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","fileHash","undefined","saveMetadata","handleFileAnalyzed","fileExists","warn","getFilePath"],"mappings":"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"}
+{"version":3,"sources":["../../src/tasks/print-job-analysis.task.ts"],"names":["PrintJobAnalysisTask","logger","printJobRepository","loggerFactory","printJobService","fileAnalysisService","fileStorageService","typeormService","name","getDataSource","getRepository","PrintJob","run","pendingJobs","find","where","analysisState","status","take","length","log","job","analyzeJob","error","id","fileName","statusReason","Error","message","save","fileStorageId","cachedMetadata","loadMetadata","metadata","thumbnails","filePath","resolveFilePath","exists","needsAnalysis","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","fileHash","undefined","saveMetadata","handleFileAnalyzed","fileExists","warn","getFilePath","debug"],"mappings":"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"}

package/dist/utils/env.utils.js

@@ -26,10 +26,11 @@ _export(exports, {
     }
 });
 const _serverconstants = require("../server.constants");
-function getEnvOrDefault(key, defaultVal) {
-    const val = process.env[key];
-    if (!val?.length) return defaultVal;
-    return val;
+function getEnvOrDefault(key, defaultValue) {
+    if (!Object.keys(process.env).includes(key) || !process.env[key]?.length) {
+        return defaultValue;
+    }
+    return process.env[key];
 }
 function isDevelopmentEnvironment() {
     return process.env.NODE_ENV === _serverconstants.AppConstants.defaultDevelopmentEnv;

package/dist/utils/env.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;QAEgBA;eAAAA;;QAMAC;eAAAA;;QAYAC;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;iCAZa;AAEtB,SAASJ,gBAAgBK,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASN;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAAST;IACd,OAAOI,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASX;IACd,OAAOK,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASb;IACd,OAAO,UAAUM,QAAQC,GAAG;AAC9B"}
+{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","key","defaultValue","Object","keys","process","env","includes","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;QAEgBA;eAAAA;;QAOAC;eAAAA;;QAYAC;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;iCAba;AAEtB,SAASJ,gBAAmBK,GAAW,EAAEC,YAAe;IAC7D,IAAI,CAACC,OAAOC,IAAI,CAACC,QAAQC,GAAG,EAAEC,QAAQ,CAACN,QAAQ,CAACI,QAAQC,GAAG,CAACL,IAAI,EAAEO,QAAQ;QACxE,OAAON;IACT;IACA,OAAOG,QAAQC,GAAG,CAACL,IAAI;AACzB;AAEO,SAASJ;IACd,OAAOQ,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASX;IACd,OAAOK,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOM,QAAQC,GAAG,CAACG,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,UAAUO,QAAQC,GAAG;AAC9B"}

package/dist/utils/fs.utils.js

@@ -12,27 +12,53 @@ _export(exports, {
     get ensureDirExists () {
         return ensureDirExists;
     },
-    get rootPath () {
-        return rootPath;
+    get getDatabaseFilePath () {
+        return getDatabaseFilePath;
+    },
+    get getDatabaseFolder () {
+        return getDatabaseFolder;
+    },
+    get getMediaPath () {
+        return getMediaPath;
+    },
+    get packageJsonPath () {
+        return packageJsonPath;
     },
     get superRootPath () {
         return superRootPath;
     }
 });
 const _nodefs = require("node:fs");
-const _path = require("path");
-function superRootPath() {
-    return (0, _path.join)(__dirname, "../..");
+const _nodepath = require("node:path");
+const _serverconstants = require("../server.constants");
+const _envutils = require("./env.utils");
+function getDatabaseFilePath() {
+    const dbFile = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.DATABASE_FILE, _serverconstants.AppConstants.defaultDatabaseFile);
+    if (dbFile === ":memory:") {
+        return dbFile;
+    }
+    const dbFolder = getDatabaseFolder();
+    return (0, _nodepath.join)(dbFolder, dbFile);
 }
-function rootPath() {
-    return (0, _path.join)(__dirname, "..");
+function getDatabaseFolder() {
+    return (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.DATABASE_PATH, (0, _nodepath.join)(superRootPath(), _serverconstants.AppConstants.defaultDatabasePath));
+}
+function getMediaPath() {
+    return (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.MEDIA_PATH, (0, _nodepath.join)(superRootPath(), _serverconstants.AppConstants.defaultBaseMediaPath));
+}
+function packageJsonPath() {
+    return (0, _nodepath.join)(superRootPath(), "./package.json");
 }
 function ensureDirExists(dir) {
-    if (!(0, _nodefs.existsSync)(dir)) {
-        (0, _nodefs.mkdirSync)(dir, {
-            recursive: true
-        });
+    if ((0, _nodefs.existsSync)(dir)) {
+        return;
     }
+    (0, _nodefs.mkdirSync)(dir, {
+        recursive: true
+    });
+}
+function superRootPath() {
+    return (0, _nodepath.join)(__dirname, "../..");
 }
 
 //# sourceMappingURL=fs.utils.js.map

package/dist/utils/fs.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/fs.utils.ts"],"names":["ensureDirExists","rootPath","superRootPath","join","__dirname","dir","existsSync","mkdirSync","recursive"],"mappings":";;;;;;;;;;;QAWgBA;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;wBAHsB;sBACjB;AAEd,SAASA;IACd,OAAOC,IAAAA,UAAI,EAACC,WAAW;AACzB;AAEO,SAASH;IACd,OAAOE,IAAAA,UAAI,EAACC,WAAW;AACzB;AAEO,SAASJ,gBAAgBK,GAAW;IACzC,IAAI,CAACC,IAAAA,kBAAU,EAACD,MAAM;QACpBE,IAAAA,iBAAS,EAACF,KAAK;YAAEG,WAAW;QAAK;IACnC;AACF"}
+{"version":3,"sources":["../../src/utils/fs.utils.ts"],"names":["ensureDirExists","getDatabaseFilePath","getDatabaseFolder","getMediaPath","packageJsonPath","superRootPath","dbFile","getEnvOrDefault","AppConstants","DATABASE_FILE","defaultDatabaseFile","dbFolder","join","DATABASE_PATH","defaultDatabasePath","MEDIA_PATH","defaultBaseMediaPath","dir","existsSync","mkdirSync","recursive","__dirname"],"mappings":";;;;;;;;;;;QA2BgBA;eAAAA;;QAtBAC;eAAAA;;QAUAC;eAAAA;;QAIAC;eAAAA;;QAIAC;eAAAA;;QAeAC;eAAAA;;;wBAtCsB;0BACjB;iCACQ;0BACG;AAEzB,SAASJ;IACd,MAAMK,SAASC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,aAAa,EAAED,6BAAY,CAACE,mBAAmB;IAC3F,IAAIJ,WAAW,YAAY;QACzB,OAAOA;IACT;IAEA,MAAMK,WAAWT;IACjB,OAAOU,IAAAA,cAAI,EAACD,UAAUL;AACxB;AAEO,SAASJ;IACd,OAAOK,IAAAA,yBAAe,EAACC,6BAAY,CAACK,aAAa,EAAED,IAAAA,cAAI,EAACP,iBAAiBG,6BAAY,CAACM,mBAAmB;AAC3G;AAEO,SAASX;IACd,OAAOI,IAAAA,yBAAe,EAACC,6BAAY,CAACO,UAAU,EAAEH,IAAAA,cAAI,EAACP,iBAAiBG,6BAAY,CAACQ,oBAAoB;AACzG;AAEO,SAASZ;IACd,OAAOQ,IAAAA,cAAI,EAACP,iBAAiB;AAC/B;AAEO,SAASL,gBAAgBiB,GAAW;IACzC,IAAIC,IAAAA,kBAAU,EAACD,MAAM;QACnB;IACF;IAEAE,IAAAA,iBAAS,EAACF,KAAK;QAAEG,WAAW;IAAK;AACnC;AAKO,SAASf;IACd,OAAOO,IAAAA,cAAI,EAACS,WAAW;AACzB"}

package/dist/utils/swagger/swagger.js

@@ -67,7 +67,7 @@ async function setupSwagger(app, logger) {
     const generateJsonFile = process.env[_serverconstants.AppConstants.GENERATE_SWAGGER_JSON] === "true";
     if (generateJsonFile) {
         try {
-            const mediaPath = (0, _nodepath.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
+            const mediaPath = (0, _fsutils.getMediaPath)();
             (0, _fsutils.ensureDirExists)(mediaPath);
             const swaggerJsonPath = (0, _nodepath.join)(mediaPath, "swagger.json");
             const jsonContent = JSON.stringify(specification, null, 2);

package/dist/utils/swagger/swagger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/swagger/swagger.ts"],"names":["setupSwagger","getSwaggerUiDistPath","dirname","require","resolve","join","process","cwd","generateSwaggerHTML","trim","app","logger","generator","SwaggerGenerator","specification","generate","generateJsonFile","env","AppConstants","GENERATE_SWAGGER_JSON","mediaPath","superRootPath","defaultFileStorageFolder","ensureDirExists","swaggerJsonPath","jsonContent","JSON","stringify","writeFile","log","error","swaggerUiPath","use","expressStatic","get","_req","res","setHeader","send"],"mappings":";;;;+BA6DsBA;;;eAAAA;;;2BA7DW;yBACoB;0BACvB;iCACD;yBACkB;0BAErB;AAG1B,SAASC;IACP,IAAI;QAEF,OAAOC,IAAAA,iBAAO,EAACC,QAAQC,OAAO,CAAC;IACjC,EAAE,OAAM;QAEN,OAAOC,IAAAA,cAAI,EAACC,QAAQC,GAAG,IAAI,gBAAgB;IAC7C;AACF;AAGA,SAASC;IACP,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCR,CAAC,CAACC,IAAI;AACR;AAEO,eAAeT,aAAaU,GAAgB,EAAEC,MAAqB;IACxE,MAAMC,YAAY,IAAIC,2BAAgB,CAACF;IACvC,MAAMG,gBAAgB,MAAMF,UAAUG,QAAQ;IAG9C,MAAMC,mBAAmBV,QAAQW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,CAAC,KAAK;IAE7E,IAAIH,kBAAkB;QACpB,IAAI;YACF,MAAMI,YAAYf,IAAAA,cAAI,EAACgB,IAAAA,sBAAa,KAAIH,6BAAY,CAACI,wBAAwB;YAC7EC,IAAAA,wBAAe,EAACH;YAEhB,MAAMI,kBAAkBnB,IAAAA,cAAI,EAACe,WAAW;YACxC,MAAMK,cAAcC,KAAKC,SAAS,CAACb,eAAe,MAAM;YAExD,MAAMc,IAAAA,mBAAS,EAACJ,iBAAiBC,aAAa;YAC9Cd,OAAOkB,GAAG,CAAC,CAAC,gCAAgC,EAAEL,iBAAiB;QACjE,EAAE,OAAOM,OAAO;YACdnB,OAAOmB,KAAK,CAAC,wCAAwCA;QACvD;IACF;IAGA,MAAMC,gBAAgB9B;IACtBS,IAAIsB,GAAG,CAAC,oBAAoBC,IAAAA,eAAa,EAACF;IAG1CrB,IAAIwB,GAAG,CAAC,0BAA0B,CAACC,MAAMC;QACvCA,IAAIC,SAAS,CAAC,gBAAgB;QAC9BD,IAAIE,IAAI,CAACxB;IACX;IAGAJ,IAAIwB,GAAG,CAAC,aAAa,CAACC,MAAMC;QAC1BA,IAAIC,SAAS,CAAC,gBAAgB;QAC9BD,IAAIE,IAAI,CAAC9B;IACX;IAEA,OAAOM;AACT"}
+{"version":3,"sources":["../../../src/utils/swagger/swagger.ts"],"names":["setupSwagger","getSwaggerUiDistPath","dirname","require","resolve","join","process","cwd","generateSwaggerHTML","trim","app","logger","generator","SwaggerGenerator","specification","generate","generateJsonFile","env","AppConstants","GENERATE_SWAGGER_JSON","mediaPath","getMediaPath","ensureDirExists","swaggerJsonPath","jsonContent","JSON","stringify","writeFile","log","error","swaggerUiPath","use","expressStatic","get","_req","res","setHeader","send"],"mappings":";;;;+BA6DsBA;;;eAAAA;;;2BA7DW;yBACoB;0BACvB;iCACD;yBACiB;0BAEpB;AAG1B,SAASC;IACP,IAAI;QAEF,OAAOC,IAAAA,iBAAO,EAACC,QAAQC,OAAO,CAAC;IACjC,EAAE,OAAM;QAEN,OAAOC,IAAAA,cAAI,EAACC,QAAQC,GAAG,IAAI,gBAAgB;IAC7C;AACF;AAGA,SAASC;IACP,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCR,CAAC,CAACC,IAAI;AACR;AAEO,eAAeT,aAAaU,GAAgB,EAAEC,MAAqB;IACxE,MAAMC,YAAY,IAAIC,2BAAgB,CAACF;IACvC,MAAMG,gBAAgB,MAAMF,UAAUG,QAAQ;IAG9C,MAAMC,mBAAmBV,QAAQW,GAAG,CAACC,6BAAY,CAACC,qBAAqB,CAAC,KAAK;IAE7E,IAAIH,kBAAkB;QACpB,IAAI;YACF,MAAMI,YAAYC,IAAAA,qBAAY;YAC9BC,IAAAA,wBAAe,EAACF;YAEhB,MAAMG,kBAAkBlB,IAAAA,cAAI,EAACe,WAAW;YACxC,MAAMI,cAAcC,KAAKC,SAAS,CAACZ,eAAe,MAAM;YAExD,MAAMa,IAAAA,mBAAS,EAACJ,iBAAiBC,aAAa;YAC9Cb,OAAOiB,GAAG,CAAC,CAAC,gCAAgC,EAAEL,iBAAiB;QACjE,EAAE,OAAOM,OAAO;YACdlB,OAAOkB,KAAK,CAAC,wCAAwCA;QACvD;IACF;IAGA,MAAMC,gBAAgB7B;IACtBS,IAAIqB,GAAG,CAAC,oBAAoBC,IAAAA,eAAa,EAACF;IAG1CpB,IAAIuB,GAAG,CAAC,0BAA0B,CAACC,MAAMC;QACvCA,IAAIC,SAAS,CAAC,gBAAgB;QAC9BD,IAAIE,IAAI,CAACvB;IACX;IAGAJ,IAAIuB,GAAG,CAAC,aAAa,CAACC,MAAMC;QAC1BA,IAAIC,SAAS,CAAC,gBAAgB;QAC9BD,IAAIE,IAAI,CAAC7B;IACX;IAEA,OAAOM;AACT"}