@fdm-monster/server 2.0.0-rc1 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.template +8 -3
- package/.yarn/install-state.gz +0 -0
- package/CONTRIBUTING.md +1 -1
- package/README.md +5 -4
- package/RELEASE_NOTES.MD +39 -0
- package/SECURITY.md +1 -1
- package/dist/consoles/download-github-releases.js +3 -3
- package/dist/consoles/launch-http-servers.js +4 -4
- package/dist/consoles/launch-http-servers.js.map +1 -1
- package/dist/consoles/mock-bambu.server.js +35 -16
- package/dist/consoles/mock-bambu.server.js.map +1 -1
- package/dist/consoles/mock-camera/default-image.js +13 -0
- package/dist/consoles/mock-camera/default-image.js.map +1 -0
- package/dist/consoles/mock-camera/mock-camera.server.js +160 -0
- package/dist/consoles/mock-camera/mock-camera.server.js.map +1 -0
- package/dist/consoles/mock-octoprint.server.js +281 -73
- package/dist/consoles/mock-octoprint.server.js.map +1 -1
- package/dist/consoles/mock-prusalink.server.js +11 -11
- package/dist/consoles/mock-prusalink.server.js.map +1 -1
- package/dist/consoles/typeorm-create.js +135 -0
- package/dist/consoles/typeorm-create.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +8 -8
- package/dist/consoles/typeorm-generate.js.map +1 -1
- package/dist/constants/authorization.constants.js +13 -26
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +3 -18
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +18 -10
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +9 -5
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +0 -15
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/file-storage.controller.js +248 -0
- package/dist/controllers/file-storage.controller.js.map +1 -0
- package/dist/controllers/first-time-setup.controller.js +2 -1
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +12 -12
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/print-job.controller.js +666 -0
- package/dist/controllers/print-job.controller.js.map +1 -0
- package/dist/controllers/print-queue.controller.js +375 -0
- package/dist/controllers/print-queue.controller.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +86 -59
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +0 -21
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/{printer-group.controller.js → printer-tag.controller.js} +51 -34
- package/dist/controllers/printer-tag.controller.js.map +1 -0
- package/dist/controllers/printer.controller.js +15 -0
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +2 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +6 -2
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -68
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/slicer-compat.controller.js +216 -0
- package/dist/controllers/slicer-compat.controller.js.map +1 -0
- package/dist/data-source.js +20 -8
- package/dist/data-source.js.map +1 -1
- package/dist/entities/camera-stream.entity.js +2 -1
- package/dist/entities/camera-stream.entity.js.map +1 -1
- package/dist/entities/floor.entity.js +3 -5
- package/dist/entities/floor.entity.js.map +1 -1
- package/dist/entities/index.js +15 -7
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-job.entity.js +195 -0
- package/dist/entities/print-job.entity.js.map +1 -0
- package/dist/entities/{printer-group.entity.js → printer-tag.entity.js} +17 -17
- package/dist/entities/printer-tag.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +4 -10
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/entities/settings.entity.js +3 -12
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/entities/{group.entity.js → tag.entity.js} +15 -8
- package/dist/entities/tag.entity.js.map +1 -0
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/dist/middleware/exception.filter.js +114 -90
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +6 -6
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js +186 -0
- package/dist/migrations/1767278216516-ChangeCameraPrinterOnDeleteSetNull.js.map +1 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js +31 -0
- package/dist/migrations/1767279607392-DropCustomGcode.js.map +1 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js +37 -0
- package/dist/migrations/1767291804417-DropPrintCompletions.js.map +1 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js +88 -0
- package/dist/migrations/1767352862576-DropSettingsFileClean.js.map +1 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js +107 -0
- package/dist/migrations/1767355639023-ChangeFloorLevelToOrder.js.map +1 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js +62 -0
- package/dist/migrations/1767370191762-ChangeFloorNonUniqueOrder.js.map +1 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js +86 -0
- package/dist/migrations/1767432108916-RenameGroupToTag.js.map +1 -0
- package/dist/migrations/1767451444137-AddPrintJob.js +207 -0
- package/dist/migrations/1767451444137-AddPrintJob.js.map +1 -0
- package/dist/server.constants.js +9 -9
- package/dist/server.constants.js.map +1 -1
- package/dist/server.host.js +24 -32
- package/dist/server.host.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js +73 -76
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -1
- package/dist/services/core/batch-call.service.js +0 -25
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/multer.service.js +5 -9
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +208 -153
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-analysis.service.js +146 -0
- package/dist/services/file-analysis.service.js.map +1 -0
- package/dist/services/file-storage.service.js +386 -0
- package/dist/services/file-storage.service.js.map +1 -0
- package/dist/services/interfaces/floor.dto.js +3 -3
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/{printer-group.dto.js → printer-tag.dto.js} +9 -8
- package/dist/services/interfaces/printer-tag.dto.js.map +1 -0
- package/dist/services/interfaces/{print-completion.interface.js → printer-tag.service.interface.js} +1 -1
- package/dist/services/interfaces/{printer-group.service.interface.js.map → printer-tag.service.interface.js.map} +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/{group.dto.js → tag.dto.js} +1 -1
- package/dist/services/interfaces/tag.dto.js.map +1 -0
- package/dist/services/octoprint/dto/files/gcode-analysis.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +0 -7
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +0 -4
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/orm/floor.service.js +9 -16
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/print-job.service.js +539 -0
- package/dist/services/orm/print-job.service.js.map +1 -0
- package/dist/services/orm/printer-tag.service.js +120 -0
- package/dist/services/orm/printer-tag.service.js.map +1 -0
- package/dist/services/orm/settings.service.js +0 -8
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/print-file-downloader.service.js +169 -0
- package/dist/services/print-file-downloader.service.js.map +1 -0
- package/dist/services/print-queue.service.js +268 -0
- package/dist/services/print-queue.service.js.map +1 -0
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +1 -3
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +10 -10
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/print-job.validation.js +31 -0
- package/dist/services/validators/print-job.validation.js.map +1 -0
- package/dist/services/validators/settings-service.validation.js +0 -22
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +7 -13
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/load-controllers.js +2 -1
- package/dist/shared/load-controllers.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -11
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/floor.store.js +2 -9
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +179 -19
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +98 -183
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/settings.store.js +2 -33
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +1 -1
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/tasks/boot.task.js +7 -5
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-job-analysis.task.js +116 -0
- package/dist/tasks/print-job-analysis.task.js.map +1 -0
- package/dist/tasks/printer-files-load.task.js +29 -0
- package/dist/tasks/printer-files-load.task.js.map +1 -0
- package/dist/tasks/socketio.task.js +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +3 -2
- package/dist/tasks.js.map +1 -1
- package/dist/utils/parsers/3mf.parser.js +337 -0
- package/dist/utils/parsers/3mf.parser.js.map +1 -0
- package/dist/utils/parsers/bgcode.parser.js +223 -0
- package/dist/utils/parsers/bgcode.parser.js.map +1 -0
- package/dist/utils/parsers/gcode.parser.js +254 -0
- package/dist/utils/parsers/gcode.parser.js.map +1 -0
- package/dist/utils/swagger/decorators.js +39 -0
- package/dist/utils/swagger/decorators.js.map +1 -0
- package/dist/utils/swagger/generator.js +196 -0
- package/dist/utils/swagger/generator.js.map +1 -0
- package/dist/utils/swagger/swagger.js +93 -0
- package/dist/utils/swagger/swagger.js.map +1 -0
- package/package.json +19 -15
- package/dist/controllers/custom-gcode.controller.js +0 -147
- package/dist/controllers/custom-gcode.controller.js.map +0 -1
- package/dist/controllers/print-completion.controller.js +0 -118
- package/dist/controllers/print-completion.controller.js.map +0 -1
- package/dist/controllers/printer-group.controller.js.map +0 -1
- package/dist/entities/custom-gcode.entity.js +0 -49
- package/dist/entities/custom-gcode.entity.js.map +0 -1
- package/dist/entities/group.entity.js.map +0 -1
- package/dist/entities/print-completion.entity.js +0 -90
- package/dist/entities/print-completion.entity.js.map +0 -1
- package/dist/entities/printer-group.entity.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.dto.js +0 -18
- package/dist/services/interfaces/custom-gcode.dto.js.map +0 -1
- package/dist/services/interfaces/custom-gcode.service.interface.js +0 -6
- package/dist/services/interfaces/custom-gcode.service.interface.js.map +0 -1
- package/dist/services/interfaces/gcode-analysis.dto.js.map +0 -1
- package/dist/services/interfaces/group.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion-context.dto.js +0 -6
- package/dist/services/interfaces/print-completion-context.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.dto.js +0 -38
- package/dist/services/interfaces/print-completion.dto.js.map +0 -1
- package/dist/services/interfaces/print-completion.interface.js.map +0 -1
- package/dist/services/interfaces/printer-group.dto.js.map +0 -1
- package/dist/services/interfaces/printer-group.service.interface.js +0 -6
- package/dist/services/orm/custom-gcode.service.js +0 -42
- package/dist/services/orm/custom-gcode.service.js.map +0 -1
- package/dist/services/orm/print-completion.service.js +0 -87
- package/dist/services/orm/print-completion.service.js.map +0 -1
- package/dist/services/orm/print-completion.shared.js +0 -59
- package/dist/services/orm/print-completion.shared.js.map +0 -1
- package/dist/services/orm/printer-group.service.js +0 -109
- package/dist/services/orm/printer-group.service.js.map +0 -1
- package/dist/tasks/print-completion.socketio.task.js +0 -91
- package/dist/tasks/print-completion.socketio.task.js.map +0 -1
- package/dist/tasks/printer-file-clean.task.js +0 -74
- package/dist/tasks/printer-file-clean.task.js.map +0 -1
- /package/dist/services/{interfaces → octoprint/dto/files}/gcode-analysis.dto.js +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer-tag.service.ts"],"names":["PrinterTagService","BaseService","PrinterTag","PrinterTagDto","tagRepository","typeormService","getDataSource","getRepository","Tag","listTags","tags","find","tagRecords","tag","id","name","color","printers","repository","findBy","tagId","Object","values","getTag","findOneBy","NotFoundException","getPrintersByTag","printerTags","createTag","dto","validate","entity","create","save","updateTagName","updateDto","assign","update","updateTagColor","deleteTag","delete","addPrinterToTag","printerId","alreadyExisting","removePrinterFromTag","toDto"],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
20
20
|
return {
|
|
21
21
|
[_serversettingsconstants.serverSettingsKey]: entity[_serversettingsconstants.serverSettingsKey],
|
|
22
22
|
[_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
|
|
23
|
-
[_serversettingsconstants.printerFileCleanSettingKey]: entity[_serversettingsconstants.printerFileCleanSettingKey],
|
|
24
23
|
[_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
|
|
25
24
|
[_serversettingsconstants.timeoutSettingKey]: entity[_serversettingsconstants.timeoutSettingKey]
|
|
26
25
|
};
|
|
@@ -58,13 +57,6 @@ class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
58
57
|
await this.update(entity.id, entity);
|
|
59
58
|
return entity;
|
|
60
59
|
}
|
|
61
|
-
async updateFileCleanSettings(update) {
|
|
62
|
-
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.fileCleanSettingsUpdateSchema);
|
|
63
|
-
const entity = await this.getOrCreate();
|
|
64
|
-
entity[_serversettingsconstants.printerFileCleanSettingKey] = validatedInput;
|
|
65
|
-
await this.update(entity.id, entity);
|
|
66
|
-
return entity;
|
|
67
|
-
}
|
|
68
60
|
async updateFrontendSettings(update) {
|
|
69
61
|
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.frontendSettingsUpdateSchema);
|
|
70
62
|
const entity = await this.getOrCreate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","frontendSettingKey","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","frontendSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","migrateSettingsRuntime","settingsId","id","update","create","getDefaultSettings","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCredentialSettings","credentialSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrintFileDownloaderService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrintFileDownloaderService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _node = require("@sentry/node");
|
|
12
|
+
const _nodefs = require("node:fs");
|
|
13
|
+
const _nodepath = require("node:path");
|
|
14
|
+
const _nodeos = require("node:os");
|
|
15
|
+
class PrintFileDownloaderService {
|
|
16
|
+
eventEmitter2;
|
|
17
|
+
printJobService;
|
|
18
|
+
fileStorageService;
|
|
19
|
+
fileAnalysisService;
|
|
20
|
+
printerApiFactory;
|
|
21
|
+
printerCache;
|
|
22
|
+
logger;
|
|
23
|
+
constructor(loggerFactory, eventEmitter2, printJobService, fileStorageService, fileAnalysisService, printerApiFactory, printerCache){
|
|
24
|
+
this.eventEmitter2 = eventEmitter2;
|
|
25
|
+
this.printJobService = printJobService;
|
|
26
|
+
this.fileStorageService = fileStorageService;
|
|
27
|
+
this.fileAnalysisService = fileAnalysisService;
|
|
28
|
+
this.printerApiFactory = printerApiFactory;
|
|
29
|
+
this.printerCache = printerCache;
|
|
30
|
+
this.logger = loggerFactory(PrintFileDownloaderService.name);
|
|
31
|
+
this.eventEmitter2.on("printJob.needsFileDownload", (event)=>{
|
|
32
|
+
this.handleFileDownloadRequest(event.jobId).catch((error)=>{
|
|
33
|
+
this.logger.error(`Failed to handle file download for job ${event.jobId}`, error);
|
|
34
|
+
(0, _node.captureException)(error);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
this.logger.log("Print file downloader service initialized");
|
|
38
|
+
}
|
|
39
|
+
async handleFileDownloadRequest(jobId) {
|
|
40
|
+
this.logger.log(`Handling file download request for job ${jobId}`);
|
|
41
|
+
try {
|
|
42
|
+
const job = await this.printJobService.getJobByIdOrFail(jobId);
|
|
43
|
+
if (job.fileStorageId) {
|
|
44
|
+
this.logger.log(`Job ${jobId} already has fileStorageId ${job.fileStorageId} - skipping download`);
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
if (!job.printerId) {
|
|
48
|
+
this.logger.error(`Job ${jobId} has no printerId - cannot download file`);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
const printer = await this.printerCache.getValue(job.printerId);
|
|
52
|
+
if (!printer) {
|
|
53
|
+
this.logger.error(`Printer ${job.printerId} not found for job ${jobId}`);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const printerApi = this.printerApiFactory.getById(job.printerId);
|
|
57
|
+
this.logger.log(`Downloading file ${job.fileName} from printer ${printer.name} (${printer.printerType})`);
|
|
58
|
+
let fileBuffer;
|
|
59
|
+
try {
|
|
60
|
+
const response = await printerApi.downloadFile(job.fileName);
|
|
61
|
+
const chunks = [];
|
|
62
|
+
const stream = response.data;
|
|
63
|
+
await new Promise((resolve, reject)=>{
|
|
64
|
+
stream.on('data', (chunk)=>chunks.push(chunk));
|
|
65
|
+
stream.on('end', ()=>resolve());
|
|
66
|
+
stream.on('error', (err)=>reject(err));
|
|
67
|
+
});
|
|
68
|
+
fileBuffer = Buffer.concat(chunks);
|
|
69
|
+
} catch (downloadError) {
|
|
70
|
+
this.logger.error(`Failed to download file from printer: ${downloadError}`);
|
|
71
|
+
job.analysisState = "FAILED";
|
|
72
|
+
job.statusReason = `File download failed: ${downloadError instanceof Error ? downloadError.message : "Unknown error"}`;
|
|
73
|
+
await this.printJobService.printJobRepository.save(job);
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
this.logger.log(`Downloaded ${fileBuffer.length} bytes for job ${jobId}`);
|
|
77
|
+
const tempPath = (0, _nodepath.join)((0, _nodeos.tmpdir)(), `fdm-monster-download-${jobId}-${Date.now()}-${job.fileName}`);
|
|
78
|
+
(0, _nodefs.writeFileSync)(tempPath, fileBuffer);
|
|
79
|
+
try {
|
|
80
|
+
const fileHash = await this.fileStorageService.calculateFileHash(tempPath);
|
|
81
|
+
this.logger.log(`File hash for job ${jobId}: ${fileHash.substring(0, 12)}...`);
|
|
82
|
+
const existingJob = await this.fileStorageService.findDuplicateByHash(fileHash);
|
|
83
|
+
let metadata;
|
|
84
|
+
let fileStorageId;
|
|
85
|
+
if (existingJob?.fileStorageId) {
|
|
86
|
+
const cachedMetadata = await this.fileStorageService.loadMetadata(existingJob.fileStorageId);
|
|
87
|
+
if (cachedMetadata) {
|
|
88
|
+
this.logger.log(`Duplicate file detected (job ${existingJob.id}, hash match) - reusing storage ${existingJob.fileStorageId}`);
|
|
89
|
+
metadata = {
|
|
90
|
+
...cachedMetadata,
|
|
91
|
+
fileName: job.fileName
|
|
92
|
+
};
|
|
93
|
+
fileStorageId = existingJob.fileStorageId;
|
|
94
|
+
} else if (existingJob.analysisState === "ANALYZED" && existingJob.metadata) {
|
|
95
|
+
this.logger.log(`Duplicate file with DB metadata (job ${existingJob.id}) - reusing storage ${existingJob.fileStorageId}`);
|
|
96
|
+
metadata = {
|
|
97
|
+
...existingJob.metadata,
|
|
98
|
+
fileName: job.fileName
|
|
99
|
+
};
|
|
100
|
+
fileStorageId = existingJob.fileStorageId;
|
|
101
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, job.fileName);
|
|
102
|
+
} else {
|
|
103
|
+
this.logger.log(`Duplicate file not analyzed - reusing storage ${existingJob.fileStorageId}, analyzing now`);
|
|
104
|
+
const existingFilePath = this.fileStorageService.getFilePath(existingJob.fileStorageId);
|
|
105
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(existingFilePath);
|
|
106
|
+
metadata = analysisResult.metadata;
|
|
107
|
+
fileStorageId = existingJob.fileStorageId;
|
|
108
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, job.fileName);
|
|
109
|
+
}
|
|
110
|
+
} else {
|
|
111
|
+
this.logger.log(`Analyzing downloaded file: ${job.fileName}`);
|
|
112
|
+
const analysisResult = await this.fileAnalysisService.analyzeFile(tempPath);
|
|
113
|
+
metadata = analysisResult.metadata;
|
|
114
|
+
const thumbnails = analysisResult.thumbnails;
|
|
115
|
+
this.logger.log(`Analysis complete: format=${metadata.fileFormat}, layers=${metadata.totalLayers}, time=${metadata.gcodePrintTimeSeconds}s, filament=${metadata.filamentUsedGrams}g`);
|
|
116
|
+
const fileObject = {
|
|
117
|
+
path: tempPath,
|
|
118
|
+
originalname: job.fileName,
|
|
119
|
+
mimetype: "application/octet-stream",
|
|
120
|
+
size: fileBuffer.length
|
|
121
|
+
};
|
|
122
|
+
fileStorageId = await this.fileStorageService.saveFile(fileObject, fileHash);
|
|
123
|
+
this.logger.log(`Saved file to storage: ${fileStorageId}`);
|
|
124
|
+
let thumbnailMetadata = [];
|
|
125
|
+
if (thumbnails.length > 0) {
|
|
126
|
+
thumbnailMetadata = await this.fileStorageService.saveThumbnails(fileStorageId, thumbnails);
|
|
127
|
+
this.logger.log(`Saved ${thumbnailMetadata.length} thumbnail(s) for ${fileStorageId}`);
|
|
128
|
+
}
|
|
129
|
+
await this.fileStorageService.saveMetadata(fileStorageId, metadata, fileHash, job.fileName, thumbnailMetadata);
|
|
130
|
+
this.logger.log(`Saved metadata JSON for ${fileStorageId}`);
|
|
131
|
+
}
|
|
132
|
+
job.fileStorageId = fileStorageId;
|
|
133
|
+
job.fileHash = fileHash;
|
|
134
|
+
job.fileSize = fileBuffer.length;
|
|
135
|
+
job.fileFormat = metadata.fileFormat;
|
|
136
|
+
job.metadata = metadata;
|
|
137
|
+
job.analysisState = "ANALYZED";
|
|
138
|
+
job.analyzedAt = new Date();
|
|
139
|
+
await this.printJobService.printJobRepository.save(job);
|
|
140
|
+
this.logger.log(`Successfully processed downloaded file for job ${jobId}: storageId=${fileStorageId}, analysisState=${job.analysisState}`);
|
|
141
|
+
} finally{
|
|
142
|
+
try {
|
|
143
|
+
(0, _nodefs.unlinkSync)(tempPath);
|
|
144
|
+
} catch (cleanupError) {
|
|
145
|
+
this.logger.warn(`Failed to clean up temp file ${tempPath}: ${cleanupError}`);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
} catch (error) {
|
|
149
|
+
this.logger.error(`Failed to download and analyze file for job ${jobId}`, error);
|
|
150
|
+
(0, _node.captureException)(error);
|
|
151
|
+
try {
|
|
152
|
+
const job = await this.printJobService.printJobRepository.findOne({
|
|
153
|
+
where: {
|
|
154
|
+
id: jobId
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
if (job) {
|
|
158
|
+
job.analysisState = "FAILED";
|
|
159
|
+
job.statusReason = `File download/analysis failed: ${error instanceof Error ? error.message : "Unknown error"}`;
|
|
160
|
+
await this.printJobService.printJobRepository.save(job);
|
|
161
|
+
}
|
|
162
|
+
} catch (updateError) {
|
|
163
|
+
this.logger.error(`Failed to mark job ${jobId} as failed`, updateError);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
//# sourceMappingURL=print-file-downloader.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/print-file-downloader.service.ts"],"names":["PrintFileDownloaderService","logger","loggerFactory","eventEmitter2","printJobService","fileStorageService","fileAnalysisService","printerApiFactory","printerCache","name","on","event","handleFileDownloadRequest","jobId","catch","error","captureException","log","job","getJobByIdOrFail","fileStorageId","printerId","printer","getValue","printerApi","getById","fileName","printerType","fileBuffer","response","downloadFile","chunks","stream","data","Promise","resolve","reject","chunk","push","err","Buffer","concat","downloadError","analysisState","statusReason","Error","message","printJobRepository","save","length","tempPath","join","tmpdir","Date","now","writeFileSync","fileHash","calculateFileHash","substring","existingJob","findDuplicateByHash","metadata","cachedMetadata","loadMetadata","id","saveMetadata","existingFilePath","getFilePath","analysisResult","analyzeFile","thumbnails","fileFormat","totalLayers","gcodePrintTimeSeconds","filamentUsedGrams","fileObject","path","originalname","mimetype","size","saveFile","thumbnailMetadata","saveThumbnails","fileSize","analyzedAt","unlinkSync","cleanupError","warn","findOne","where","updateError"],"mappings":";;;;+BAiBaA;;;eAAAA;;;sBAToB;wBACS;0BACrB;wBACE;AAMhB,MAAMA;;;;;;;IACXC,OAAsB;IAEtB,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,eAAgC,EACjD,AAAiBC,kBAAsC,EACvD,AAAiBC,mBAAwC,EACzD,AAAiBC,iBAAoC,EACrD,AAAiBC,YAA0B,CAC3C;aANiBL,gBAAAA;aACAC,kBAAAA;aACAC,qBAAAA;aACAC,sBAAAA;aACAC,oBAAAA;aACAC,eAAAA;QAEjB,IAAI,CAACP,MAAM,GAAGC,cAAcF,2BAA2BS,IAAI;QAG3D,IAAI,CAACN,aAAa,CAACO,EAAE,CAAC,8BAA8B,CAACC;YACnD,IAAI,CAACC,yBAAyB,CAACD,MAAME,KAAK,EAAEC,KAAK,CAAC,CAACC;gBACjD,IAAI,CAACd,MAAM,CAACc,KAAK,CAAC,CAAC,uCAAuC,EAAGJ,MAAME,KAAK,EAAG,EAAEE;gBAC7EC,IAAAA,sBAAgB,EAACD;YACnB;QACF;QAEA,IAAI,CAACd,MAAM,CAACgB,GAAG,CAAC;IAClB;IAEA,MAAcL,0BAA0BC,KAAa,EAAiB;QACpE,IAAI,CAACZ,MAAM,CAACgB,GAAG,CAAC,CAAC,uCAAuC,EAAGJ,OAAQ;QAEnE,IAAI;YACF,MAAMK,MAAM,MAAM,IAAI,CAACd,eAAe,CAACe,gBAAgB,CAACN;YAGxD,IAAIK,IAAIE,aAAa,EAAE;gBACrB,IAAI,CAACnB,MAAM,CAACgB,GAAG,CAAC,CAAC,IAAI,EAAGJ,MAAO,2BAA2B,EAAGK,IAAIE,aAAa,CAAE,oBAAoB,CAAC;gBACrG;YACF;YAEA,IAAI,CAACF,IAAIG,SAAS,EAAE;gBAClB,IAAI,CAACpB,MAAM,CAACc,KAAK,CAAC,CAAC,IAAI,EAAGF,MAAO,wCAAwC,CAAC;gBAC1E;YACF;YAEA,MAAMS,UAAU,MAAM,IAAI,CAACd,YAAY,CAACe,QAAQ,CAACL,IAAIG,SAAS;YAC9D,IAAI,CAACC,SAAS;gBACZ,IAAI,CAACrB,MAAM,CAACc,KAAK,CAAC,CAAC,QAAQ,EAAGG,IAAIG,SAAS,CAAE,mBAAmB,EAAGR,OAAQ;gBAC3E;YACF;YAGA,MAAMW,aAAa,IAAI,CAACjB,iBAAiB,CAACkB,OAAO,CAACP,IAAIG,SAAS;YAE/D,IAAI,CAACpB,MAAM,CAACgB,GAAG,CAAC,CAAC,iBAAiB,EAAGC,IAAIQ,QAAQ,CAAE,cAAc,EAAGJ,QAAQb,IAAI,CAAE,EAAE,EAAGa,QAAQK,WAAW,CAAE,CAAC,CAAC;YAG9G,IAAIC;YACJ,IAAI;gBACF,MAAMC,WAAW,MAAML,WAAWM,YAAY,CAACZ,IAAIQ,QAAQ;gBAG3D,MAAMK,SAAmB,EAAE;gBAC3B,MAAMC,SAASH,SAASI,IAAI;gBAE5B,MAAM,IAAIC,QAAc,CAACC,SAASC;oBAChCJ,OAAOtB,EAAE,CAAC,QAAQ,CAAC2B,QAAkBN,OAAOO,IAAI,CAACD;oBACjDL,OAAOtB,EAAE,CAAC,OAAO,IAAMyB;oBACvBH,OAAOtB,EAAE,CAAC,SAAS,CAAC6B,MAAQH,OAAOG;gBACrC;gBAEAX,aAAaY,OAAOC,MAAM,CAACV;YAC7B,EAAE,OAAOW,eAAe;gBACtB,IAAI,CAACzC,MAAM,CAACc,KAAK,CAAC,CAAC,sCAAsC,EAAG2B,eAAgB;gBAG5ExB,IAAIyB,aAAa,GAAG;gBACpBzB,IAAI0B,YAAY,GAAG,CAAC,sBAAsB,EAAGF,yBAAyBG,QAAQH,cAAcI,OAAO,GAAG,iBAAkB;gBACxH,MAAM,IAAI,CAAC1C,eAAe,CAAC2C,kBAAkB,CAACC,IAAI,CAAC9B;gBACnD;YACF;YAEA,IAAI,CAACjB,MAAM,CAACgB,GAAG,CAAC,CAAC,WAAW,EAAGW,WAAWqB,MAAM,CAAE,eAAe,EAAGpC,OAAQ;YAG5E,MAAMqC,WAAWC,IAAAA,cAAI,EAACC,IAAAA,cAAM,KAAI,CAAC,qBAAqB,EAAGvC,MAAO,CAAC,EAAGwC,KAAKC,GAAG,GAAI,CAAC,EAAGpC,IAAIQ,QAAQ,EAAG;YACnG6B,IAAAA,qBAAa,EAACL,UAAUtB;YAExB,IAAI;gBAEF,MAAM4B,WAAW,MAAM,IAAI,CAACnD,kBAAkB,CAACoD,iBAAiB,CAACP;gBACjE,IAAI,CAACjD,MAAM,CAACgB,GAAG,CAAC,CAAC,kBAAkB,EAAGJ,MAAO,EAAE,EAAG2C,SAASE,SAAS,CAAC,GAAG,IAAK,GAAG,CAAC;gBAGjF,MAAMC,cAAc,MAAM,IAAI,CAACtD,kBAAkB,CAACuD,mBAAmB,CAACJ;gBAEtE,IAAIK;gBACJ,IAAIzC;gBAEJ,IAAIuC,aAAavC,eAAe;oBAE9B,MAAM0C,iBAAiB,MAAM,IAAI,CAACzD,kBAAkB,CAAC0D,YAAY,CAACJ,YAAYvC,aAAa;oBAE3F,IAAI0C,gBAAgB;wBAClB,IAAI,CAAC7D,MAAM,CAACgB,GAAG,CAAC,CAAC,6BAA6B,EAAG0C,YAAYK,EAAE,CAAE,gCAAgC,EAAGL,YAAYvC,aAAa,EAAG;wBAChIyC,WAAW;4BACT,GAAGC,cAAc;4BACjBpC,UAAUR,IAAIQ,QAAQ;wBACxB;wBACAN,gBAAgBuC,YAAYvC,aAAa;oBAC3C,OAAO,IAAIuC,YAAYhB,aAAa,KAAK,cAAcgB,YAAYE,QAAQ,EAAE;wBAC3E,IAAI,CAAC5D,MAAM,CAACgB,GAAG,CAAC,CAAC,qCAAqC,EAAG0C,YAAYK,EAAE,CAAE,oBAAoB,EAAGL,YAAYvC,aAAa,EAAG;wBAC5HyC,WAAW;4BACT,GAAGF,YAAYE,QAAQ;4BACvBnC,UAAUR,IAAIQ,QAAQ;wBACxB;wBACAN,gBAAgBuC,YAAYvC,aAAa;wBAGzC,MAAM,IAAI,CAACf,kBAAkB,CAAC4D,YAAY,CAAC7C,eAAeyC,UAAUL,UAAUtC,IAAIQ,QAAQ;oBAC5F,OAAO;wBAEL,IAAI,CAACzB,MAAM,CAACgB,GAAG,CAAC,CAAC,8CAA8C,EAAG0C,YAAYvC,aAAa,CAAE,eAAe,CAAC;wBAC7G,MAAM8C,mBAAmB,IAAI,CAAC7D,kBAAkB,CAAC8D,WAAW,CAACR,YAAYvC,aAAa;wBACtF,MAAMgD,iBAAiB,MAAM,IAAI,CAAC9D,mBAAmB,CAAC+D,WAAW,CAACH;wBAClEL,WAAWO,eAAeP,QAAQ;wBAClCzC,gBAAgBuC,YAAYvC,aAAa;wBACzC,MAAM,IAAI,CAACf,kBAAkB,CAAC4D,YAAY,CAAC7C,eAAeyC,UAAUL,UAAUtC,IAAIQ,QAAQ;oBAC5F;gBACF,OAAO;oBAEL,IAAI,CAACzB,MAAM,CAACgB,GAAG,CAAC,CAAC,2BAA2B,EAAGC,IAAIQ,QAAQ,EAAG;oBAC9D,MAAM0C,iBAAiB,MAAM,IAAI,CAAC9D,mBAAmB,CAAC+D,WAAW,CAACnB;oBAClEW,WAAWO,eAAeP,QAAQ;oBAClC,MAAMS,aAAaF,eAAeE,UAAU;oBAE5C,IAAI,CAACrE,MAAM,CAACgB,GAAG,CAAC,CAAC,0BAA0B,EAAG4C,SAASU,UAAU,CAAE,SAAS,EAAGV,SAASW,WAAW,CAAE,OAAO,EAAGX,SAASY,qBAAqB,CAAE,YAAY,EAAGZ,SAASa,iBAAiB,CAAE,CAAC,CAAC;oBAG5L,MAAMC,aAAa;wBACjBC,MAAM1B;wBACN2B,cAAc3D,IAAIQ,QAAQ;wBAC1BoD,UAAU;wBACVC,MAAMnD,WAAWqB,MAAM;oBACzB;oBAEA7B,gBAAgB,MAAM,IAAI,CAACf,kBAAkB,CAAC2E,QAAQ,CAACL,YAAYnB;oBACnE,IAAI,CAACvD,MAAM,CAACgB,GAAG,CAAC,CAAC,uBAAuB,EAAGG,eAAgB;oBAE3D,IAAI6D,oBAA2B,EAAE;oBACjC,IAAIX,WAAWrB,MAAM,GAAG,GAAG;wBACzBgC,oBAAoB,MAAM,IAAI,CAAC5E,kBAAkB,CAAC6E,cAAc,CAAC9D,eAAekD;wBAChF,IAAI,CAACrE,MAAM,CAACgB,GAAG,CAAC,CAAC,MAAM,EAAGgE,kBAAkBhC,MAAM,CAAE,kBAAkB,EAAG7B,eAAgB;oBAC3F;oBAEA,MAAM,IAAI,CAACf,kBAAkB,CAAC4D,YAAY,CAAC7C,eAAeyC,UAAUL,UAAUtC,IAAIQ,QAAQ,EAAEuD;oBAC5F,IAAI,CAAChF,MAAM,CAACgB,GAAG,CAAC,CAAC,wBAAwB,EAAGG,eAAgB;gBAC9D;gBAEAF,IAAIE,aAAa,GAAGA;gBACpBF,IAAIsC,QAAQ,GAAGA;gBACftC,IAAIiE,QAAQ,GAAGvD,WAAWqB,MAAM;gBAChC/B,IAAIqD,UAAU,GAAGV,SAASU,UAAU;gBACpCrD,IAAI2C,QAAQ,GAAGA;gBACf3C,IAAIyB,aAAa,GAAG;gBACpBzB,IAAIkE,UAAU,GAAG,IAAI/B;gBACrB,MAAM,IAAI,CAACjD,eAAe,CAAC2C,kBAAkB,CAACC,IAAI,CAAC9B;gBAEnD,IAAI,CAACjB,MAAM,CAACgB,GAAG,CAAC,CAAC,+CAA+C,EAAGJ,MAAO,YAAY,EAAGO,cAAe,gBAAgB,EAAGF,IAAIyB,aAAa,EAAG;YACjJ,SAAU;gBACR,IAAI;oBACF0C,IAAAA,kBAAU,EAACnC;gBACb,EAAE,OAAOoC,cAAc;oBACrB,IAAI,CAACrF,MAAM,CAACsF,IAAI,CAAC,CAAC,6BAA6B,EAAGrC,SAAU,EAAE,EAAGoC,cAAe;gBAClF;YACF;QAEF,EAAE,OAAOvE,OAAO;YACd,IAAI,CAACd,MAAM,CAACc,KAAK,CAAC,CAAC,4CAA4C,EAAGF,OAAQ,EAAEE;YAC5EC,IAAAA,sBAAgB,EAACD;YAEjB,IAAI;gBACF,MAAMG,MAAM,MAAM,IAAI,CAACd,eAAe,CAAC2C,kBAAkB,CAACyC,OAAO,CAAC;oBAAEC,OAAO;wBAAEzB,IAAInD;oBAAM;gBAAE;gBACzF,IAAIK,KAAK;oBACPA,IAAIyB,aAAa,GAAG;oBACpBzB,IAAI0B,YAAY,GAAG,CAAC,+BAA+B,EAAG7B,iBAAiB8B,QAAQ9B,MAAM+B,OAAO,GAAG,iBAAkB;oBACjH,MAAM,IAAI,CAAC1C,eAAe,CAAC2C,kBAAkB,CAACC,IAAI,CAAC9B;gBACrD;YACF,EAAE,OAAOwE,aAAa;gBACpB,IAAI,CAACzF,MAAM,CAACc,KAAK,CAAC,CAAC,mBAAmB,EAAGF,MAAO,UAAU,CAAC,EAAE6E;YAC/D;QACF;IACF;AACF"}
|
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrintQueueService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrintQueueService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _printjobentity = require("../entities/print-job.entity");
|
|
13
|
+
const _node = require("@sentry/node");
|
|
14
|
+
class PrintQueueService {
|
|
15
|
+
printerApiFactory;
|
|
16
|
+
fileStorageService;
|
|
17
|
+
printJobRepository;
|
|
18
|
+
eventEmitter2;
|
|
19
|
+
logger;
|
|
20
|
+
constructor(loggerFactory, typeormService, eventEmitter2, printerApiFactory, fileStorageService){
|
|
21
|
+
this.printerApiFactory = printerApiFactory;
|
|
22
|
+
this.fileStorageService = fileStorageService;
|
|
23
|
+
this.printJobRepository = typeormService.getDataSource().getRepository(_printjobentity.PrintJob);
|
|
24
|
+
this.eventEmitter2 = eventEmitter2;
|
|
25
|
+
this.logger = loggerFactory(PrintQueueService.name);
|
|
26
|
+
this.eventEmitter2.on("printQueue.jobSubmitted", (event)=>{
|
|
27
|
+
this.handleJobSubmission(event.printerId, event.jobId, event.fileName, event.fileStorageId).catch((error)=>{
|
|
28
|
+
this.logger.error(`Failed to handle job submission for job ${event.jobId}`, error);
|
|
29
|
+
(0, _node.captureException)(error);
|
|
30
|
+
});
|
|
31
|
+
});
|
|
32
|
+
this.logger.log("Print queue service initialized");
|
|
33
|
+
}
|
|
34
|
+
async addToQueue(printerId, jobId, position) {
|
|
35
|
+
const job = await this.printJobRepository.findOne({
|
|
36
|
+
where: {
|
|
37
|
+
id: jobId
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
if (!job) {
|
|
41
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
42
|
+
}
|
|
43
|
+
if (!job.printerId) {
|
|
44
|
+
job.printerId = printerId;
|
|
45
|
+
} else if (job.printerId !== printerId) {
|
|
46
|
+
throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot add to printer ${printerId}`);
|
|
47
|
+
}
|
|
48
|
+
if (position === undefined || position === null) {
|
|
49
|
+
const maxPosition = await this.getMaxQueuePosition(printerId);
|
|
50
|
+
job.queuePosition = (maxPosition ?? -1) + 1;
|
|
51
|
+
} else {
|
|
52
|
+
await this.shiftQueuePositions(printerId, position);
|
|
53
|
+
job.queuePosition = position;
|
|
54
|
+
}
|
|
55
|
+
job.status = "QUEUED";
|
|
56
|
+
await this.printJobRepository.save(job);
|
|
57
|
+
this.logger.log(`Added job ${jobId} to printer ${printerId} queue at position ${job.queuePosition}`);
|
|
58
|
+
this.eventEmitter2.emit("printQueue.jobAdded", {
|
|
59
|
+
printerId,
|
|
60
|
+
jobId,
|
|
61
|
+
position: job.queuePosition
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
async removeFromQueue(jobId) {
|
|
65
|
+
const job = await this.printJobRepository.findOne({
|
|
66
|
+
where: {
|
|
67
|
+
id: jobId
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
if (!job) {
|
|
71
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
72
|
+
}
|
|
73
|
+
const printerId = job.printerId;
|
|
74
|
+
const oldPosition = job.queuePosition;
|
|
75
|
+
job.queuePosition = null;
|
|
76
|
+
if (job.status === "QUEUED") {
|
|
77
|
+
job.status = "PENDING";
|
|
78
|
+
}
|
|
79
|
+
await this.printJobRepository.save(job);
|
|
80
|
+
if (oldPosition !== null && printerId) {
|
|
81
|
+
await this.compactQueuePositions(printerId, oldPosition);
|
|
82
|
+
}
|
|
83
|
+
this.logger.log(`Removed job ${jobId} from queue`);
|
|
84
|
+
this.eventEmitter2.emit("printQueue.jobRemoved", {
|
|
85
|
+
printerId,
|
|
86
|
+
jobId
|
|
87
|
+
});
|
|
88
|
+
}
|
|
89
|
+
async getQueue(printerId) {
|
|
90
|
+
const jobs = await this.printJobRepository.find({
|
|
91
|
+
where: {
|
|
92
|
+
printerId,
|
|
93
|
+
status: "QUEUED",
|
|
94
|
+
queuePosition: (0, _typeorm.Not)((0, _typeorm.IsNull)())
|
|
95
|
+
},
|
|
96
|
+
order: {
|
|
97
|
+
queuePosition: "ASC"
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
return jobs.map((j)=>({
|
|
101
|
+
id: j.id,
|
|
102
|
+
fileName: j.fileName,
|
|
103
|
+
queuePosition: j.queuePosition,
|
|
104
|
+
status: j.status,
|
|
105
|
+
estimatedTimeSeconds: j.metadata?.gcodePrintTimeSeconds,
|
|
106
|
+
filamentGrams: j.metadata?.filamentUsedGrams,
|
|
107
|
+
createdAt: j.createdAt
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
async getNextInQueue(printerId) {
|
|
111
|
+
return this.printJobRepository.findOne({
|
|
112
|
+
where: {
|
|
113
|
+
printerId,
|
|
114
|
+
status: "QUEUED",
|
|
115
|
+
queuePosition: (0, _typeorm.Not)((0, _typeorm.IsNull)())
|
|
116
|
+
},
|
|
117
|
+
order: {
|
|
118
|
+
queuePosition: "ASC"
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
async reorderQueue(printerId, jobIds) {
|
|
123
|
+
for(let i = 0; i < jobIds.length; i++){
|
|
124
|
+
const job = await this.printJobRepository.findOne({
|
|
125
|
+
where: {
|
|
126
|
+
id: jobIds[i]
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
if (job && job.printerId === printerId) {
|
|
130
|
+
job.queuePosition = i;
|
|
131
|
+
await this.printJobRepository.save(job);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
this.logger.log(`Reordered queue for printer ${printerId}`);
|
|
135
|
+
this.eventEmitter2.emit("printQueue.reordered", {
|
|
136
|
+
printerId
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
async clearQueue(printerId) {
|
|
140
|
+
const jobs = await this.printJobRepository.find({
|
|
141
|
+
where: {
|
|
142
|
+
printerId,
|
|
143
|
+
status: "QUEUED"
|
|
144
|
+
}
|
|
145
|
+
});
|
|
146
|
+
for (const job of jobs){
|
|
147
|
+
job.status = "PENDING";
|
|
148
|
+
job.queuePosition = null;
|
|
149
|
+
await this.printJobRepository.save(job);
|
|
150
|
+
}
|
|
151
|
+
this.logger.log(`Cleared queue for printer ${printerId} (${jobs.length} jobs)`);
|
|
152
|
+
this.eventEmitter2.emit("printQueue.cleared", {
|
|
153
|
+
printerId
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
async processQueue(printerId) {
|
|
157
|
+
const nextJob = await this.getNextInQueue(printerId);
|
|
158
|
+
if (!nextJob) {
|
|
159
|
+
this.logger.log(`No jobs in queue for printer ${printerId}`);
|
|
160
|
+
return null;
|
|
161
|
+
}
|
|
162
|
+
this.logger.log(`Processing queue: next job is ${nextJob.id} (${nextJob.fileName})`);
|
|
163
|
+
this.eventEmitter2.emit("printQueue.processNext", {
|
|
164
|
+
printerId,
|
|
165
|
+
jobId: nextJob.id,
|
|
166
|
+
fileName: nextJob.fileName,
|
|
167
|
+
fileStorageId: nextJob.fileStorageId
|
|
168
|
+
});
|
|
169
|
+
return nextJob;
|
|
170
|
+
}
|
|
171
|
+
async getMaxQueuePosition(printerId) {
|
|
172
|
+
const result = await this.printJobRepository.createQueryBuilder("job").select("MAX(job.queuePosition)", "max").where("job.printerId = :printerId", {
|
|
173
|
+
printerId
|
|
174
|
+
}).getRawOne();
|
|
175
|
+
return result?.max ?? null;
|
|
176
|
+
}
|
|
177
|
+
async shiftQueuePositions(printerId, fromPosition) {
|
|
178
|
+
await this.printJobRepository.createQueryBuilder().update(_printjobentity.PrintJob).set({
|
|
179
|
+
queuePosition: ()=>"queuePosition + 1"
|
|
180
|
+
}).where("printerId = :printerId", {
|
|
181
|
+
printerId
|
|
182
|
+
}).andWhere("queuePosition >= :fromPosition", {
|
|
183
|
+
fromPosition
|
|
184
|
+
}).execute();
|
|
185
|
+
}
|
|
186
|
+
async compactQueuePositions(printerId, removedPosition) {
|
|
187
|
+
await this.printJobRepository.createQueryBuilder().update(_printjobentity.PrintJob).set({
|
|
188
|
+
queuePosition: ()=>"queuePosition - 1"
|
|
189
|
+
}).where("printerId = :printerId", {
|
|
190
|
+
printerId
|
|
191
|
+
}).andWhere("queuePosition > :removedPosition", {
|
|
192
|
+
removedPosition
|
|
193
|
+
}).execute();
|
|
194
|
+
}
|
|
195
|
+
async handleJobCompleted(printerId) {
|
|
196
|
+
const nextJob = await this.getNextInQueue(printerId);
|
|
197
|
+
if (nextJob) {
|
|
198
|
+
this.logger.log(`Auto-processing queue after completion: starting job ${nextJob.id}`);
|
|
199
|
+
await this.processQueue(printerId);
|
|
200
|
+
} else {
|
|
201
|
+
this.logger.log(`Queue empty for printer ${printerId} after job completion`);
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
async submitToPrinter(printerId, jobId) {
|
|
205
|
+
const job = await this.printJobRepository.findOne({
|
|
206
|
+
where: {
|
|
207
|
+
id: jobId
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
if (!job) {
|
|
211
|
+
throw new Error(`Print job ${jobId} not found`);
|
|
212
|
+
}
|
|
213
|
+
if (job.printerId && job.printerId !== printerId) {
|
|
214
|
+
throw new Error(`Job ${jobId} belongs to printer ${job.printerId}, cannot submit to printer ${printerId}`);
|
|
215
|
+
}
|
|
216
|
+
if (!job.printerId) {
|
|
217
|
+
job.printerId = printerId;
|
|
218
|
+
}
|
|
219
|
+
if (job.queuePosition !== null) {
|
|
220
|
+
const oldPosition = job.queuePosition;
|
|
221
|
+
job.queuePosition = null;
|
|
222
|
+
await this.compactQueuePositions(printerId, oldPosition);
|
|
223
|
+
}
|
|
224
|
+
job.status = "PRINTING";
|
|
225
|
+
await this.printJobRepository.save(job);
|
|
226
|
+
this.logger.log(`Submitting job ${jobId} (${job.fileName}) to printer ${printerId}`);
|
|
227
|
+
this.eventEmitter2.emit("printQueue.jobSubmitted", {
|
|
228
|
+
printerId,
|
|
229
|
+
jobId: job.id,
|
|
230
|
+
fileName: job.fileName,
|
|
231
|
+
fileStorageId: job.fileStorageId
|
|
232
|
+
});
|
|
233
|
+
}
|
|
234
|
+
async handleJobSubmission(printerId, jobId, fileName, fileStorageId) {
|
|
235
|
+
this.logger.log(`Handling job submission for job ${jobId} on printer ${printerId}`);
|
|
236
|
+
try {
|
|
237
|
+
if (!fileStorageId) {
|
|
238
|
+
throw new Error(`Job ${jobId} has no fileStorageId - cannot submit to printer`);
|
|
239
|
+
}
|
|
240
|
+
const fileBuffer = this.fileStorageService.readFile(fileStorageId);
|
|
241
|
+
this.logger.log(`Read ${fileBuffer.length} bytes for job ${jobId}`);
|
|
242
|
+
const printerApi = this.printerApiFactory.getById(printerId);
|
|
243
|
+
this.logger.log(`Uploading file ${fileName} to printer ${printerId} and starting print`);
|
|
244
|
+
await printerApi.uploadFile(fileBuffer, true);
|
|
245
|
+
this.logger.log(`Successfully submitted job ${jobId} to printer ${printerId}`);
|
|
246
|
+
} catch (error) {
|
|
247
|
+
this.logger.error(`Failed to submit job ${jobId} to printer ${printerId}`, error);
|
|
248
|
+
try {
|
|
249
|
+
const job = await this.printJobRepository.findOne({
|
|
250
|
+
where: {
|
|
251
|
+
id: jobId
|
|
252
|
+
}
|
|
253
|
+
});
|
|
254
|
+
if (job) {
|
|
255
|
+
job.status = "FAILED";
|
|
256
|
+
job.statusReason = `Print submission failed: ${error instanceof Error ? error.message : "Unknown error"}`;
|
|
257
|
+
await this.printJobRepository.save(job);
|
|
258
|
+
this.logger.log(`Updated job ${jobId} status to FAILED`);
|
|
259
|
+
}
|
|
260
|
+
} catch (updateError) {
|
|
261
|
+
this.logger.error(`Failed to update job ${jobId} status after submission error`, updateError);
|
|
262
|
+
}
|
|
263
|
+
throw error;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
//# sourceMappingURL=print-queue.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/print-queue.service.ts"],"names":["PrintQueueService","printJobRepository","eventEmitter2","logger","loggerFactory","typeormService","printerApiFactory","fileStorageService","getDataSource","getRepository","PrintJob","name","on","event","handleJobSubmission","printerId","jobId","fileName","fileStorageId","catch","error","captureException","log","addToQueue","position","job","findOne","where","id","Error","undefined","maxPosition","getMaxQueuePosition","queuePosition","shiftQueuePositions","status","save","emit","removeFromQueue","oldPosition","compactQueuePositions","getQueue","jobs","find","Not","IsNull","order","map","j","estimatedTimeSeconds","metadata","gcodePrintTimeSeconds","filamentGrams","filamentUsedGrams","createdAt","getNextInQueue","reorderQueue","jobIds","i","length","clearQueue","processQueue","nextJob","result","createQueryBuilder","select","getRawOne","max","fromPosition","update","set","andWhere","execute","removedPosition","handleJobCompleted","submitToPrinter","fileBuffer","readFile","printerApi","getById","uploadFile","statusReason","message","updateError"],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ const defaultLog = {
|
|
|
20
20
|
class PrusaLinkHttpPollingAdapter {
|
|
21
21
|
prusaLinkApi;
|
|
22
22
|
eventEmitter2;
|
|
23
|
-
configService;
|
|
24
23
|
printerType = _printerapiinterface.PrusaLinkType;
|
|
25
24
|
printerId;
|
|
26
25
|
login;
|
|
@@ -29,10 +28,9 @@ class PrusaLinkHttpPollingAdapter {
|
|
|
29
28
|
lastMessageReceivedTimestamp;
|
|
30
29
|
refreshPrinterCurrentInterval;
|
|
31
30
|
eventEmittingAllowed = true;
|
|
32
|
-
constructor(loggerFactory, prusaLinkApi, eventEmitter2
|
|
31
|
+
constructor(loggerFactory, prusaLinkApi, eventEmitter2){
|
|
33
32
|
this.prusaLinkApi = prusaLinkApi;
|
|
34
33
|
this.eventEmitter2 = eventEmitter2;
|
|
35
|
-
this.configService = configService;
|
|
36
34
|
this.logger = loggerFactory(PrusaLinkHttpPollingAdapter.name);
|
|
37
35
|
}
|
|
38
36
|
allowEmittingEvents() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","PrusaLinkType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","loggerFactory","prusaLinkApi","eventEmitter2","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","PrusaLinkType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","loggerFactory","prusaLinkApi","eventEmitter2","logger","name","allowEmittingEvents","disallowEmittingEvents","needsReopen","needsSetup","needsReauth","Error","isClosedOrAborted","reauthSession","registerCredentials","socketLogin","loginDto","open","startPolling","close","debug","logMeta","stopPolling","setupSocketSession","warn","Promise","resolve","resetSocketState","setInterval","updateSocketState","SOCKET_STATE","opening","printerURL","username","password","apiKey","authenticating","printerState","getPrinterState","state","flags","link_state","text","jobState","getJobState","authenticated","updateApiState","API_STATE","responding","emitEvent","job","progress","printTime","printTimeLeft","completion","error","errorSummary","clearInterval","undefined","closed","event","payload","prusaLinkEvent","emitAsync","emitEventSync","emit","WsMessage","WS_STATE_UPDATED","API_STATE_UPDATED"],"mappings":"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"}
|
|
@@ -12,21 +12,21 @@ _export(exports, {
|
|
|
12
12
|
get createOrUpdateFloorSchema () {
|
|
13
13
|
return createOrUpdateFloorSchema;
|
|
14
14
|
},
|
|
15
|
-
get floorLevelValidator () {
|
|
16
|
-
return floorLevelValidator;
|
|
17
|
-
},
|
|
18
15
|
get floorNameValidator () {
|
|
19
16
|
return floorNameValidator;
|
|
20
17
|
},
|
|
18
|
+
get floorOrderValidator () {
|
|
19
|
+
return floorOrderValidator;
|
|
20
|
+
},
|
|
21
21
|
get printerInFloorSchema () {
|
|
22
22
|
return printerInFloorSchema;
|
|
23
23
|
},
|
|
24
|
-
get updateFloorLevelSchema () {
|
|
25
|
-
return updateFloorLevelSchema;
|
|
26
|
-
},
|
|
27
24
|
get updateFloorNameSchema () {
|
|
28
25
|
return updateFloorNameSchema;
|
|
29
26
|
},
|
|
27
|
+
get updateFloorOrderSchema () {
|
|
28
|
+
return updateFloorOrderSchema;
|
|
29
|
+
},
|
|
30
30
|
get xValidator () {
|
|
31
31
|
return xValidator;
|
|
32
32
|
},
|
|
@@ -39,7 +39,7 @@ const _serviceconstants = require("../../constants/service.constants");
|
|
|
39
39
|
const _genericvalidation = require("../../controllers/validation/generic.validation");
|
|
40
40
|
const xValidator = _zod.z.number().int().min(0).max(12);
|
|
41
41
|
const yValidator = _zod.z.number().int().min(0).max(12);
|
|
42
|
-
const
|
|
42
|
+
const floorOrderValidator = _zod.z.number().int();
|
|
43
43
|
const floorNameValidator = _zod.z.string().min(_serviceconstants.minFloorNameLength);
|
|
44
44
|
const printerInFloorSchema = _zod.z.object({
|
|
45
45
|
printerId: _genericvalidation.idRuleV2,
|
|
@@ -50,12 +50,12 @@ const printerInFloorSchema = _zod.z.object({
|
|
|
50
50
|
const updateFloorNameSchema = _zod.z.object({
|
|
51
51
|
name: floorNameValidator
|
|
52
52
|
});
|
|
53
|
-
const
|
|
54
|
-
|
|
53
|
+
const updateFloorOrderSchema = _zod.z.object({
|
|
54
|
+
order: floorOrderValidator
|
|
55
55
|
});
|
|
56
56
|
const createOrUpdateFloorSchema = _zod.z.object({
|
|
57
57
|
name: floorNameValidator,
|
|
58
|
-
|
|
58
|
+
order: floorOrderValidator,
|
|
59
59
|
printers: _zod.z.array(_zod.z.object({
|
|
60
60
|
printerId: _genericvalidation.idRuleV2,
|
|
61
61
|
floorId: _genericvalidation.idRuleV2.optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","floorNameValidator","floorOrderValidator","printerInFloorSchema","updateFloorNameSchema","updateFloorOrderSchema","xValidator","yValidator","z","number","int","min","max","string","minFloorNameLength","object","printerId","idRuleV2","floorId","x","y","name","order","printers","array","optional"],"mappings":";;;;;;;;;;;QAuBaA;eAAAA;;QAjBAC;eAAAA;;QADAC;eAAAA;;QAGAC;eAAAA;;QAOAC;eAAAA;;QAIAC;eAAAA;;QAhBAC;eAAAA;;QACAC;eAAAA;;;qBAJK;kCACiB;mCACV;AAClB,MAAMD,aAAaE,MAAC,CAACC,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAML,aAAaC,MAAC,CAACC,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMV,sBAAsBM,MAAC,CAACC,MAAM,GAAGC,GAAG;AAC1C,MAAMT,qBAAqBO,MAAC,CAACK,MAAM,GAAGF,GAAG,CAACG,oCAAkB;AAE5D,MAAMX,uBAAuBK,MAAC,CAACO,MAAM,CAAC;IAC3CC,WAAWC,2BAAQ;IACnBC,SAASD,2BAAQ;IACjBE,GAAGb;IACHc,GAAGb;AACL;AAEO,MAAMH,wBAAwBI,MAAC,CAACO,MAAM,CAAC;IAC5CM,MAAMpB;AACR;AAEO,MAAMI,yBAAyBG,MAAC,CAACO,MAAM,CAAC;IAC7CO,OAAOpB;AACT;AAEO,MAAMF,4BAA4BQ,MAAC,CAACO,MAAM,CAAC;IAChDM,MAAMpB;IACNqB,OAAOpB;IACPqB,UAAUf,MAAC,CACRgB,KAAK,CACJhB,MAAC,CAACO,MAAM,CAAC;QACPC,WAAWC,2BAAQ;QACnBC,SAASD,2BAAQ,CAACQ,QAAQ;QAC1BN,GAAGb;QACHc,GAAGb;IACL,IAEDkB,QAAQ;AACb"}
|