@fdm-monster/server 2.0.7 → 2.0.8
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/.yarn/install-state.gz +0 -0
- package/RELEASE_NOTES.MD +23 -0
- package/dist/controllers/print-job.controller.js +12 -151
- package/dist/controllers/print-job.controller.js.map +1 -1
- package/dist/controllers/print-queue.controller.js +82 -17
- package/dist/controllers/print-queue.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +8 -2
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +3 -3
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/entities/print-job.entity.js.map +1 -1
- package/dist/server.constants.js +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +3 -13
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/bambu.api.js +7 -18
- package/dist/services/bambu.api.js.map +1 -1
- package/dist/services/file-storage.service.js +11 -2
- package/dist/services/file-storage.service.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +5 -17
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +3 -2
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +5 -17
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint.api.js +3 -2
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/print-job.service.js +55 -47
- package/dist/services/orm/print-job.service.js.map +1 -1
- package/dist/services/print-queue.service.js +90 -30
- package/dist/services/print-queue.service.js.map +1 -1
- package/dist/services/printer-api.interface.js +13 -0
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +12 -22
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/tasks/print-job-analysis.task.js.map +1 -1
- package/dist/utils/bgcode/bgcode-thumbnail.parser.js +50 -0
- package/dist/utils/bgcode/bgcode-thumbnail.parser.js.map +1 -0
- package/dist/utils/bgcode/bgcode.constants.js +57 -0
- package/dist/utils/bgcode/bgcode.constants.js.map +1 -0
- package/dist/utils/bgcode/bgcode.types.js +132 -0
- package/dist/utils/bgcode/bgcode.types.js.map +1 -0
- package/dist/utils/bgcode/bgcode.utils.js +288 -0
- package/dist/utils/bgcode/bgcode.utils.js.map +1 -0
- package/dist/utils/bgcode/heatshrink-decoder.js +172 -0
- package/dist/utils/bgcode/heatshrink-decoder.js.map +1 -0
- package/dist/utils/bgcode/png-encoder.js +76 -0
- package/dist/utils/bgcode/png-encoder.js.map +1 -0
- package/dist/utils/bgcode/qoi-decoder.js +141 -0
- package/dist/utils/bgcode/qoi-decoder.js.map +1 -0
- package/dist/utils/image-dimensions.js +62 -0
- package/dist/utils/image-dimensions.js.map +1 -0
- package/dist/utils/job-stats.util.js +79 -0
- package/dist/utils/job-stats.util.js.map +1 -0
- package/dist/utils/parsers/3mf.parser.js +39 -9
- package/dist/utils/parsers/3mf.parser.js.map +1 -1
- package/dist/utils/parsers/bgcode.parser.js +125 -144
- package/dist/utils/parsers/bgcode.parser.js.map +1 -1
- package/dist/utils/parsers/gcode.parser.js +13 -2
- package/dist/utils/parsers/gcode.parser.js.map +1 -1
- package/dist/utils/parsers/parser.types.js +6 -0
- package/dist/utils/parsers/parser.types.js.map +1 -0
- package/dist/utils/thumbnail.util.js +24 -0
- package/dist/utils/thumbnail.util.js.map +1 -0
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","logger","loggerFactory","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","printerApi","floorStore","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledSchema","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonSchema","updateDisabledReason","disabledReason","refreshPrinterSocket","reconnectPrinterAdapter","deletePrinterSocketEvents","testConnection","printerURL","length","normalizeUrl","defaultProtocol","defaultHttpProtocol","testPrinterApiSchema","printerCorrelationToken","generateCorrelationToken","log","setupTestPrinter","e","correlationToken","failure","error","toString","getPrinterLoginDetails","printerLogin","sendEmergencyM112","quickStop","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","setFeedRate","feedRateSchema","updateFeedRate","feedRate","setFlowRate","flowRateSchema","updateFlowRate","flowRate","inputLoginDto","validateInput","debug","printerType","validateConnection","AxiosError","message","status","response","FailedDependencyException","code","InternalServerException","stack","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","logger","loggerFactory","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","printerApi","floorStore","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledSchema","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonSchema","updateDisabledReason","disabledReason","refreshPrinterSocket","reconnectPrinterAdapter","deletePrinterSocketEvents","testConnection","printerURL","length","normalizeUrl","defaultProtocol","defaultHttpProtocol","testPrinterApiSchema","printerCorrelationToken","generateCorrelationToken","log","setupTestPrinter","e","correlationToken","failure","error","toString","getPrinterLoginDetails","printerLogin","sendEmergencyM112","quickStop","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","setFeedRate","feedRateSchema","updateFeedRate","feedRate","setFlowRate","flowRateSchema","updateFlowRate","flowRate","inputLoginDto","validateInput","debug","printerType","validateConnection","AxiosError","message","status","response","FailedDependencyException","code","InternalServerException","stack","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/print-job.entity.ts"],"names":["PrintJob","id","printer","printerId","printerName","fileName","fileStorageId","fileFormat","fileSize","fileHash","createdAt","updatedAt","analyzedAt","startedAt","endedAt","status","analysisState","statusReason","progress","metadata","statistics","queuePosition","queueGroup","Printer","nullable","onDelete","name","type","Date","default"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/entities/print-job.entity.ts"],"names":["PrintJob","id","printer","printerId","printerName","fileName","fileStorageId","fileFormat","fileSize","fileHash","createdAt","updatedAt","analyzedAt","startedAt","endedAt","status","analysisState","statusReason","progress","metadata","statistics","queuePosition","queueGroup","Printer","nullable","onDelete","name","type","Date","default"],"mappings":";;;;+BA6JaA;;;eAAAA;;;yBApJN;+BACiB;;;;;;;;;;AAmJjB,MAAMA;IAEXC,GAAW;IAIXC,QAA4B;IAE5BC,UAAyB;IAGzBC,YAA2B;IAI3BC,SAAiB;IAGjBC,cAA6B;IAG7BC,WAAkC;IAGlCC,SAAwB;IAGxBC,SAAwB;IAIxBC,UAAgB;IAGhBC,UAAgB;IAGhBC,WAAwB;IAGxBC,UAAuB;IAGvBC,QAAqB;IAIrBC,OAAuB;IAGvBC,cAA6B;IAG7BC,aAA4B;IAI5BC,SAAwB;IAIxBC,SAAkC;IAIlCC,WAAmC;IAInCC,cAA6B;IAG7BC,WAA0B;AAC5B;;;;;;gCArEmBC,sBAAO;QAAIC,UAAU;QAAMC,UAAU;;;QACxCC,MAAM;;;;;;QAEVF,UAAU;;;;;;QAGVG,MAAM;QAAWH,UAAU;;;;;;QAI3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAOH,UAAU;;;;;;QAGvBG,MAAM;QAAWH,UAAU;;;;;;;;;;;;;;QAU3BG,MAAMC;QAAMJ,UAAU;;;;;;QAGtBG,MAAMC;QAAMJ,UAAU;;;;;;QAGtBG,MAAMC;QAAMJ,UAAU;;;;;;QAItBG,MAAM;QAAWH,UAAU;QAAOK,SAAS;;;;;;QAG3CF,MAAM;QAAWH,UAAU;QAAOK,SAAS;;;;;;QAG3CF,MAAM;QAAWH,UAAU;;;;;;QAI3BG,MAAM;QAASH,UAAU;;;;;;QAIzBG,MAAM;QAAQH,UAAU;;;;;;QAIxBG,MAAM;QAAQH,UAAU;;;;;;QAIxBG,MAAM;QAAOH,UAAU;;;;;;QAGvBG,MAAM;QAAWH,UAAU"}
|
package/dist/server.constants.js
CHANGED
|
@@ -76,7 +76,7 @@ const AppConstants = {
|
|
|
76
76
|
docsUrl: "https://docs.fdm-monster.net",
|
|
77
77
|
orgName: "fdm-monster",
|
|
78
78
|
currentWizardVersion: 1,
|
|
79
|
-
defaultClientMinimum: "2.
|
|
79
|
+
defaultClientMinimum: "2.3.1",
|
|
80
80
|
defaultWebsocketHandshakeTimeout: 3000,
|
|
81
81
|
defaultSocketThrottleRate: 1,
|
|
82
82
|
debugSocketStatesKey: "DEBUG_SOCKET_STATES",
|
|
@@ -104,12 +104,9 @@ class BambuFtpAdapter {
|
|
|
104
104
|
}
|
|
105
105
|
return (0, _nodepath.join)(storagePath, filename);
|
|
106
106
|
}
|
|
107
|
-
async uploadFile(
|
|
107
|
+
async uploadFile(stream, remotePath, progressToken) {
|
|
108
108
|
this.ensureConnected();
|
|
109
|
-
const tempPath = this.getFileStoragePath(`bambu-upload-${Date.now()}-${remotePath}`);
|
|
110
109
|
try {
|
|
111
|
-
(0, _nodefs.writeFileSync)(tempPath, fileBuffer);
|
|
112
|
-
this.logger.debug(`Wrote temp file: ${tempPath}`);
|
|
113
110
|
if (progressToken) {
|
|
114
111
|
this.ftpClient.trackProgress((info)=>{
|
|
115
112
|
this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(progressToken)}`, progressToken, {
|
|
@@ -118,8 +115,8 @@ class BambuFtpAdapter {
|
|
|
118
115
|
});
|
|
119
116
|
});
|
|
120
117
|
}
|
|
121
|
-
this.logger.log(`Uploading
|
|
122
|
-
await this.ftpClient.uploadFrom(
|
|
118
|
+
this.logger.log(`Uploading stream to ${remotePath}`);
|
|
119
|
+
await this.ftpClient.uploadFrom(stream, remotePath);
|
|
123
120
|
this.ftpClient.trackProgress();
|
|
124
121
|
if (progressToken) {
|
|
125
122
|
this.eventEmitter2.emit(`${(0, _eventconstants.uploadDoneEvent)(progressToken)}`, progressToken);
|
|
@@ -131,13 +128,6 @@ class BambuFtpAdapter {
|
|
|
131
128
|
}
|
|
132
129
|
this.logger.error(`Upload failed for ${remotePath}:`, error);
|
|
133
130
|
throw error;
|
|
134
|
-
} finally{
|
|
135
|
-
try {
|
|
136
|
-
(0, _nodefs.unlinkSync)(tempPath);
|
|
137
|
-
this.logger.debug(`Cleaned up temp file: ${tempPath}`);
|
|
138
|
-
} catch (cleanupError) {
|
|
139
|
-
this.logger.warn(`Failed to cleanup temp file ${tempPath}:`, cleanupError);
|
|
140
|
-
}
|
|
141
131
|
}
|
|
142
132
|
}
|
|
143
133
|
async downloadFile(remotePath, localPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","checkServerIdentity","undefined","rejectUnauthorized","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","errorSummary","getFileStoragePath","filename","storagePath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/bambu/bambu-ftp.adapter.ts"],"names":["BambuFtpAdapter","logger","ftpClient","host","accessCode","isConnecting","settingsStore","loggerFactory","eventEmitter2","name","connect","closed","debug","Error","sanitizedHost","sanitizeHost","sanitizedAccessCode","sanitizeAccessCode","timeout","getTimeoutSettings","apiTimeout","log","Client","ftp","verbose","access","port","user","password","secure","secureOptions","checkServerIdentity","undefined","rejectUnauthorized","error","cleanup","disconnect","close","listFiles","dirPath","ensureConnected","files","list","length","errorSummary","getFileStoragePath","filename","storagePath","join","getMediaPath","AppConstants","defaultFileUploadsStorage","existsSync","mkdirSync","recursive","uploadFile","stream","remotePath","progressToken","trackProgress","info","emit","uploadProgressEvent","loaded","bytes","total","bytesOverall","uploadFrom","uploadDoneEvent","uploadFailedEvent","message","downloadFile","localPath","downloadTo","downloadFileAsStream","split","pop","tempPath","Date","now","createReadStream","unlinkSync","cleanupError","warn","on","deleteFile","remove","isConnected","trimmed","trim","ipv4Pattern","hostnamePattern","test","parts","map","Number","some","part","alphanumericPattern"],"mappings":"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"}
|
|
@@ -175,27 +175,16 @@ class BambuApi {
|
|
|
175
175
|
this.logger.warn("getFileChunk not implemented for Bambu Lab printers");
|
|
176
176
|
throw new Error("Method not implemented");
|
|
177
177
|
}
|
|
178
|
-
async uploadFile(
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
if (Buffer.isBuffer(fileOrBuffer)) {
|
|
182
|
-
this.logger.log("Using file directly from memory buffer for upload");
|
|
183
|
-
fileBuffer = fileOrBuffer;
|
|
184
|
-
filename = `upload_${Date.now()}.3mf`;
|
|
185
|
-
} else {
|
|
186
|
-
const filePath = fileOrBuffer.path;
|
|
187
|
-
filename = fileOrBuffer.originalname;
|
|
188
|
-
this.logger.log(`Reading file from disk for upload: ${filePath}`);
|
|
189
|
-
fileBuffer = (0, _nodefs.readFileSync)(filePath);
|
|
190
|
-
}
|
|
191
|
-
this.logger.log(`Uploading file: ${filename} (${fileBuffer.length} bytes)`, this.logMeta());
|
|
178
|
+
async uploadFile(input) {
|
|
179
|
+
const validated = _printerapiinterface.uploadFileInputSchema.parse(input);
|
|
180
|
+
this.logger.log(`Uploading file: ${validated.fileName} (${validated.contentLength} bytes)`, this.logMeta());
|
|
192
181
|
try {
|
|
193
182
|
await this.ensureFtpConnected();
|
|
194
|
-
await this.client.ftp.uploadFile(
|
|
195
|
-
if (startPrint) {
|
|
196
|
-
this.logger.log(`Starting print after upload: ${
|
|
183
|
+
await this.client.ftp.uploadFile(validated.stream, validated.fileName, validated.uploadToken);
|
|
184
|
+
if (validated.startPrint) {
|
|
185
|
+
this.logger.log(`Starting print after upload: ${validated.fileName}`, this.logMeta());
|
|
197
186
|
const mqttAdapter = this.getMqttAdapter();
|
|
198
|
-
await mqttAdapter.startPrint(
|
|
187
|
+
await mqttAdapter.startPrint(validated.fileName);
|
|
199
188
|
}
|
|
200
189
|
} catch (error) {
|
|
201
190
|
this.logger.error(`Upload failed: ${error.message}`, this.logMeta());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/bambu.api.ts"],"names":["BambuApi","defaultLog","adapter","logger","client","printerLogin","printerSocketStore","printerId","bambuClient","loggerFactory","name","debug","logMeta","setPrinterId","getMqttAdapter","Error","getPrinterSocket","BambuMqttAdapter","ensureFtpConnected","isConnected","connect","type","BambuType","login","getVersion","response","getApiVersion","version","validateConnection","files","ftp","listFiles","length","ftpError","disconnect","restartServer","warn","restartHost","restartPrinterFirmware","startPrint","path","log","mqttAdapter","pausePrint","resumePrint","cancelPrint","stopPrint","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","getFile","file","find","f","endsWith","size","date","modifiedAt","Date","getTime","getFiles","filter","isFile","map","downloadFile","stream","tempPath","downloadFileAsStream","stats","statSync","filename","split","pop","data","status","statusText","headers","String","config","getFileChunk","startBytes","endBytes","uploadFile","
|
|
1
|
+
{"version":3,"sources":["../../src/services/bambu.api.ts"],"names":["BambuApi","defaultLog","adapter","logger","client","printerLogin","printerSocketStore","printerId","bambuClient","loggerFactory","name","debug","logMeta","setPrinterId","getMqttAdapter","Error","getPrinterSocket","BambuMqttAdapter","ensureFtpConnected","isConnected","connect","type","BambuType","login","getVersion","response","getApiVersion","version","validateConnection","files","ftp","listFiles","length","ftpError","disconnect","restartServer","warn","restartHost","restartPrinterFirmware","startPrint","path","log","mqttAdapter","pausePrint","resumePrint","cancelPrint","stopPrint","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","getFile","file","find","f","endsWith","size","date","modifiedAt","Date","getTime","getFiles","filter","isFile","map","downloadFile","stream","tempPath","downloadFileAsStream","stats","statSync","filename","split","pop","data","status","statusText","headers","String","config","getFileChunk","startBytes","endBytes","uploadFile","input","validated","uploadFileInputSchema","parse","fileName","contentLength","uploadToken","error","message","deleteFile","deleteFolder","getSettings","getReprintState","state","getLastState","reprintState","ReprintState","PrinterNotAvailable","connectionState","lastFile","gcode_file","NoLastPrint","LastPrintReady"],"mappings":"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"}
|
|
@@ -84,9 +84,18 @@ class FileStorageService {
|
|
|
84
84
|
this.logger.error("Failed to create storage directories", error);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
|
|
87
|
+
readFileStream(fileStorageId) {
|
|
88
88
|
const filePath = this.getFilePath(fileStorageId);
|
|
89
|
-
|
|
89
|
+
const stream = (0, _nodefs.createReadStream)(filePath);
|
|
90
|
+
stream.on("error", (err)=>{
|
|
91
|
+
this.logger.error(`Failed to read file ${fileStorageId}: ${err.message}`, err);
|
|
92
|
+
});
|
|
93
|
+
return stream;
|
|
94
|
+
}
|
|
95
|
+
getFileSize(fileStorageId) {
|
|
96
|
+
const filePath = this.getFilePath(fileStorageId);
|
|
97
|
+
const stats = (0, _nodefs.statSync)(filePath);
|
|
98
|
+
return stats.size;
|
|
90
99
|
}
|
|
91
100
|
async saveFile(file, fileHash) {
|
|
92
101
|
const fileExt = (0, _nodepath.extname)(file.originalname).toLowerCase();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/file-storage.service.ts"],"names":["FileStorageService","printJobRepository","logger","storageBasePath","STORAGE_SUBDIRS","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","join","getMediaPath","AppConstants","defaultPrintFilesStorage","ensureStorageDirectories","mkdir","recursive","subdir","error","readFile","fileStorageId","filePath","getFilePath","readFileSync","saveFile","file","fileHash","fileExt","extname","originalname","toLowerCase","fileId","nameHash","createHash","update","digest","substring","crypto","randomUUID","includes","targetDir","targetPath","path","rename","buffer","writeFile","Error","log","getFile","findFilePath","deleteFile","warn","unlink","metadataPath","debug","thumbnailDir","replace","rm","force","ext","fullPath","existsSync","calculateFileHash","fileBuffer","hashSum","getDeterministicId","fileName","dirPath","files","readdir","matchingFile","find","f","startsWith","fileExists","findDuplicateByHash","findOne","where","order","createdAt","saveMetadata","metadata","originalFileName","thumbnailMetadata","existingOriginalFileName","existingThumbnails","existingContent","existing","JSON","parse","_originalFileName","_thumbnails","metadataWithMeta","_fileHash","_analyzedAt","Date","toISOString","_fileStorageId","stringify","thumbnailMeta","length","loadMetadata","content","hasMetadata","access","saveThumbnails","thumbnails","savedThumbnails","i","thumb","data","format","filename","thumbPath","Buffer","from","relativePath","relative","push","index","width","height","size","getThumbnail","listThumbnails","filter","sort","a","b","localeCompare","listAllFiles","dirFiles","endsWith","stats","stat","_fileName","fileFormat","fileSize","birthtime","thumbnailCount","getTime","getFileInfo","basename"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/services/file-storage.service.ts"],"names":["FileStorageService","printJobRepository","logger","storageBasePath","STORAGE_SUBDIRS","loggerFactory","typeormService","getDataSource","getRepository","PrintJob","name","join","getMediaPath","AppConstants","defaultPrintFilesStorage","ensureStorageDirectories","mkdir","recursive","subdir","error","readFileStream","fileStorageId","filePath","getFilePath","stream","createReadStream","on","err","message","getFileSize","stats","statSync","size","saveFile","file","fileHash","fileExt","extname","originalname","toLowerCase","fileId","nameHash","createHash","update","digest","substring","crypto","randomUUID","includes","targetDir","targetPath","path","rename","buffer","writeFile","Error","log","getFile","findFilePath","readFile","deleteFile","warn","unlink","metadataPath","debug","thumbnailDir","replace","rm","force","ext","fullPath","existsSync","calculateFileHash","fileBuffer","hashSum","getDeterministicId","fileName","dirPath","files","readdir","matchingFile","find","f","startsWith","fileExists","findDuplicateByHash","findOne","where","order","createdAt","saveMetadata","metadata","originalFileName","thumbnailMetadata","existingOriginalFileName","existingThumbnails","existingContent","existing","JSON","parse","_originalFileName","_thumbnails","metadataWithMeta","_fileHash","_analyzedAt","Date","toISOString","_fileStorageId","stringify","thumbnailMeta","length","loadMetadata","content","hasMetadata","access","saveThumbnails","thumbnails","savedThumbnails","i","thumb","data","format","filename","thumbPath","Buffer","from","relativePath","relative","push","index","width","height","getThumbnail","listThumbnails","filter","sort","a","b","localeCompare","listAllFiles","dirFiles","endsWith","stat","_fileName","fileFormat","fileSize","birthtime","thumbnailCount","getTime","getFileInfo","basename"],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "MoonrakerClient", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
|
|
12
|
-
const _fs = require("fs");
|
|
13
12
|
const _eventconstants = require("../../constants/event.constants");
|
|
14
13
|
const _defaulthttpclientbuilder = require("../../shared/default-http-client.builder");
|
|
15
14
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
@@ -197,7 +196,7 @@ class MoonrakerClient {
|
|
|
197
196
|
}
|
|
198
197
|
});
|
|
199
198
|
}
|
|
200
|
-
async postServerFileUpload(login,
|
|
199
|
+
async postServerFileUpload(login, stream, fileName, contentLength, startPrint, progressToken, root, path, checksum) {
|
|
201
200
|
const formData = new _formdata.default();
|
|
202
201
|
if (root?.length) {
|
|
203
202
|
formData.append("root", root);
|
|
@@ -211,21 +210,10 @@ class MoonrakerClient {
|
|
|
211
210
|
if (startPrint) {
|
|
212
211
|
formData.append("print", "true");
|
|
213
212
|
}
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
formData.append("file", fileBuffer, {
|
|
219
|
-
filename
|
|
220
|
-
});
|
|
221
|
-
} else {
|
|
222
|
-
const filePath = multerFileOrBuffer.path;
|
|
223
|
-
const fileStream = (0, _fs.createReadStream)(filePath);
|
|
224
|
-
this.logger.log(`Attaching file from disk to formdata for upload`);
|
|
225
|
-
formData.append("file", fileStream, {
|
|
226
|
-
filename
|
|
227
|
-
});
|
|
228
|
-
}
|
|
213
|
+
formData.append("file", stream, {
|
|
214
|
+
filename: fileName,
|
|
215
|
+
knownLength: contentLength
|
|
216
|
+
});
|
|
229
217
|
const result = await new Promise((resolve, reject)=>{
|
|
230
218
|
return formData.getLength((err, length)=>{
|
|
231
219
|
if (err) reject(new Error("Could not retrieve formData length"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/moonraker/moonraker.client.ts"],"names":["MoonrakerClient","logger","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getServerInfo","login","createClient","get","getServerConfig","getTemperatureStore","includeMonitors","getGcodeStore","count","postRolloverLogs","application","post","postRestartServer","postJsonRpc","method","params","id","jsonrpc","getPrinterInfo","postQuickStop","postHostRestart","postFirmwareRestart","getPrinterObjectsList","getPrinterObjectsQuery","query","queryString","convertToQueryString","postSubscribePrinterObjects","connectionId","getPrinterQueryEndstops","postGcodeScript","script","getGcodeHelp","postPrintStart","filename","postPrintPause","postPrintResume","postPrintCancel","getMachineSystemInfo","postMachineShutdown","postMachineReboot","postMachineRestartService","service","postMachineStartService","postMachineProcessStats","getMachineSudoInfo","checkAccess","postMachineSetSudoPassword","password","getMachineListPeripheralsUsb","getMachineListPeripheralsSerial","getMachineListPeripheralsVideo","getMachineListPeripheralsCanbus","canInterface","getServerFilesList","rootFolder","paramString","length","getServerFilesRoots","getServerFileMetadata","getServerFileMetadataScan","getServerFilesThumbnails","getServerFilesDirectoryInfo","path","extended","postServerFilesDirectory","deleteServerFilesDirectory","force","delete","postServerFilesMove","source","dest","postServerFilesCopy","postServerFilesZip","items","store_only","getServerFilesDownload","root","responseType","getServerFilesDownloadChunk","startBytes","endBytes","headers","Range","postServerFileUpload","multerFileOrBuffer","startPrint","progressToken","checksum","formData","FormData","append","fileBuffer","buffer","originalname","log","filePath","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","Error","response","b","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withHeaders","getHeaders","toString","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","data","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteServerFile","url","getServerFileKlippyLogDownload","getServerFileMoonrakerLogDownload","postAccessLoginUser","username","postAccessLogoutUser","getAccessUser","postAccessCreateUser","deleteAccessUser","listAccessUsers","postAccessResetPassword","refresh_token","getAccessOneshotToken","getAccessInfo","getAccessApiKey","postAccessApiKeyCreate","getDatabaseNamespaceList","getDatabaseNamespaceItem","namespace","key","postDatabaseNamespaceItem","value","typeHint","typeHintParam","deleteDatabaseNamespaceItem","getJobQueueStatus","postJobQueueJob","filenames","reset","deleteJobQueueJob","jobIds","all","base","join","postJobQueuePause","postJobQueueStart","postJobQueueJump","jobId","getAnnouncementsList","includeDismissed","postAnnouncementsUpdate","postAnnouncementsDismiss","entryId","wakeTime","encodeURIComponent","getAnnouncementsFeeds","postAnnouncementsFeedAdd","deleteAnnouncementsFeedRemove","getWebcamList","getWebcamItem","uid","postWebcamItemUpdate","webcam","deleteWebcamItem","postWebcamTest","getNotifierList","postMachineUpdateStatus","postMachineUpdateRefresh","postMachineUpdateFull","postMachineUpdateMoonraker","postMachineUpdateKlipper","postMachineUpdateClient","postMachineUpdateSystem","postMachineUpdateRecover","hard","postMachineUpdateRollback","getMachineDevicePowerDevices","getMachineDevicePowerDeviceState","device","postMachineDevicePowerDeviceState","action","getMachineDevicePowerBatchDeviceState","devices","postMachineDevicePowerBatchPowerOn","postMachineDevicePowerBatchPowerOff","getMachineWledStrips","getMachineWledStatuses","strips","postMachineWledPowerOn","postMachineWledPowerOff","postMachineWledPowerStripAction","getMachineWledStripAction","strip","controlParams","queryParams","Object","entries","map","k","v","getServerSensorsList","getServerSensorItem","sensor","getServerSensorMeasurements","getServerSensorMeasurementsBatch","getServerSpoolmanStatus","postServerSpoolmanActiveSpool","spoolId","spool_id","getServerSpoolmanActiveSpool","postServerSpoolmanProxyRequest","getApiVersion","getServerVersion","getApiLogin","getApiSettings","getApiJob","getApiPrinter","postApiPrinterCommand","commands","getApiProfiles","getServerHistoryList","limit","start","since","before","order","getServerHistoryTotals","postServerHistoryResetTotals","getServerHistoryJob","deleteServerHistoryJob","reduce","acc","push","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","o","builder","DefaultHttpClientBuilder","createClientWithBaseUrl"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/moonraker/moonraker.client.ts"],"names":["MoonrakerClient","logger","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getServerInfo","login","createClient","get","getServerConfig","getTemperatureStore","includeMonitors","getGcodeStore","count","postRolloverLogs","application","post","postRestartServer","postJsonRpc","method","params","id","jsonrpc","getPrinterInfo","postQuickStop","postHostRestart","postFirmwareRestart","getPrinterObjectsList","getPrinterObjectsQuery","query","queryString","convertToQueryString","postSubscribePrinterObjects","connectionId","getPrinterQueryEndstops","postGcodeScript","script","getGcodeHelp","postPrintStart","filename","postPrintPause","postPrintResume","postPrintCancel","getMachineSystemInfo","postMachineShutdown","postMachineReboot","postMachineRestartService","service","postMachineStartService","postMachineProcessStats","getMachineSudoInfo","checkAccess","postMachineSetSudoPassword","password","getMachineListPeripheralsUsb","getMachineListPeripheralsSerial","getMachineListPeripheralsVideo","getMachineListPeripheralsCanbus","canInterface","getServerFilesList","rootFolder","paramString","length","getServerFilesRoots","getServerFileMetadata","getServerFileMetadataScan","getServerFilesThumbnails","getServerFilesDirectoryInfo","path","extended","postServerFilesDirectory","deleteServerFilesDirectory","force","delete","postServerFilesMove","source","dest","postServerFilesCopy","postServerFilesZip","items","store_only","getServerFilesDownload","root","responseType","getServerFilesDownloadChunk","startBytes","endBytes","headers","Range","postServerFileUpload","stream","fileName","contentLength","startPrint","progressToken","checksum","formData","FormData","append","knownLength","result","Promise","resolve","reject","getLength","err","Error","response","b","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withHeaders","getHeaders","toString","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","data","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteServerFile","url","getServerFileKlippyLogDownload","getServerFileMoonrakerLogDownload","postAccessLoginUser","username","postAccessLogoutUser","getAccessUser","postAccessCreateUser","deleteAccessUser","listAccessUsers","postAccessResetPassword","refresh_token","getAccessOneshotToken","getAccessInfo","getAccessApiKey","postAccessApiKeyCreate","getDatabaseNamespaceList","getDatabaseNamespaceItem","namespace","key","postDatabaseNamespaceItem","value","typeHint","typeHintParam","deleteDatabaseNamespaceItem","getJobQueueStatus","postJobQueueJob","filenames","reset","deleteJobQueueJob","jobIds","all","base","join","postJobQueuePause","postJobQueueStart","postJobQueueJump","jobId","getAnnouncementsList","includeDismissed","postAnnouncementsUpdate","postAnnouncementsDismiss","entryId","wakeTime","encodeURIComponent","getAnnouncementsFeeds","postAnnouncementsFeedAdd","deleteAnnouncementsFeedRemove","getWebcamList","getWebcamItem","uid","postWebcamItemUpdate","webcam","deleteWebcamItem","postWebcamTest","getNotifierList","postMachineUpdateStatus","postMachineUpdateRefresh","postMachineUpdateFull","postMachineUpdateMoonraker","postMachineUpdateKlipper","postMachineUpdateClient","postMachineUpdateSystem","postMachineUpdateRecover","hard","postMachineUpdateRollback","getMachineDevicePowerDevices","getMachineDevicePowerDeviceState","device","postMachineDevicePowerDeviceState","action","getMachineDevicePowerBatchDeviceState","devices","postMachineDevicePowerBatchPowerOn","postMachineDevicePowerBatchPowerOff","getMachineWledStrips","getMachineWledStatuses","strips","postMachineWledPowerOn","postMachineWledPowerOff","postMachineWledPowerStripAction","getMachineWledStripAction","strip","controlParams","queryParams","Object","entries","map","k","v","getServerSensorsList","getServerSensorItem","sensor","getServerSensorMeasurements","getServerSensorMeasurementsBatch","getServerSpoolmanStatus","postServerSpoolmanActiveSpool","spoolId","spool_id","getServerSpoolmanActiveSpool","postServerSpoolmanProxyRequest","getApiVersion","getServerVersion","getApiLogin","getApiSettings","getApiJob","getApiPrinter","postApiPrinterCommand","commands","getApiProfiles","getServerHistoryList","limit","start","since","before","order","getServerHistoryTotals","postServerHistoryResetTotals","getServerHistoryJob","deleteServerHistoryJob","reduce","acc","push","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","o","builder","DefaultHttpClientBuilder","createClientWithBaseUrl"],"mappings":"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"}
|
|
@@ -119,8 +119,9 @@ class MoonrakerApi {
|
|
|
119
119
|
async getFileChunk(path, startBytes, endBytes) {
|
|
120
120
|
return await this.client.getServerFilesDownloadChunk(this.login, "gcodes", path, startBytes, endBytes);
|
|
121
121
|
}
|
|
122
|
-
async uploadFile(
|
|
123
|
-
|
|
122
|
+
async uploadFile(input) {
|
|
123
|
+
const validated = _printerapiinterface.uploadFileInputSchema.parse(input);
|
|
124
|
+
await this.client.postServerFileUpload(this.login, validated.stream, validated.fileName, validated.contentLength, validated.startPrint, validated.uploadToken);
|
|
124
125
|
}
|
|
125
126
|
async deleteFile(path) {
|
|
126
127
|
await this.client.deleteServerFile(this.login, "gcodes", path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","client","moonrakerClient","printerLogin","type","MoonrakerType","login","getVersion","result","getApiVersion","data","server","validateConnection","connect","NotImplementedException","disconnect","restartServer","postRestartServer","restartHost","postHostRestart","restartPrinterFirmware","postFirmwareRestart","startPrint","filename","postPrintStart","pausePrint","postPrintPause","resumePrint","postPrintResume","cancelPrint","postPrintCancel","sendGcode","script","postGcodeScript","quickStop","postQuickStop","movePrintHead","amounts","setSpeed","speed","g1CommandAxes","Number","isNaN","x","y","z","getFile","path","metadata","getServerFileMetadata","file","size","date","modified","getFiles","files","getServerFilesList","map","f","homeAxes","axes","homeCommand","downloadFile","getServerFilesDownload","getFileChunk","startBytes","endBytes","getServerFilesDownloadChunk","uploadFile","
|
|
1
|
+
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","client","moonrakerClient","printerLogin","type","MoonrakerType","login","getVersion","result","getApiVersion","data","server","validateConnection","connect","NotImplementedException","disconnect","restartServer","postRestartServer","restartHost","postHostRestart","restartPrinterFirmware","postFirmwareRestart","startPrint","filename","postPrintStart","pausePrint","postPrintPause","resumePrint","postPrintResume","cancelPrint","postPrintCancel","sendGcode","script","postGcodeScript","quickStop","postQuickStop","movePrintHead","amounts","setSpeed","speed","g1CommandAxes","Number","isNaN","x","y","z","getFile","path","metadata","getServerFileMetadata","file","size","date","modified","getFiles","files","getServerFilesList","map","f","homeAxes","axes","homeCommand","downloadFile","getServerFilesDownload","getFileChunk","startBytes","endBytes","getServerFilesDownloadChunk","uploadFile","input","validated","uploadFileInputSchema","parse","postServerFileUpload","stream","fileName","contentLength","uploadToken","deleteFile","deleteServerFile","deleteFolder","deleteServerFilesDirectory","getSettings","getServerConfig","getReprintState","response","getPrinterObjectsQuery","print_stats","webhooks","operational","status","state","response2","getServerHistoryList","jobs","sort","a","b","start_time","length","connectionState","reprintState","ReprintState","NoLastPrint","job","LastPrintReady"],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ Object.defineProperty(exports, "OctoprintClient", {
|
|
|
8
8
|
return OctoprintClient;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _fs = require("fs");
|
|
12
11
|
const _formdata = /*#__PURE__*/ _interop_require_default(require("form-data"));
|
|
13
12
|
const _eventconstants = require("../../constants/event.constants");
|
|
14
13
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
@@ -149,27 +148,16 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
149
148
|
const command = this.selectCommand(print);
|
|
150
149
|
await this.createClient(login).post(this.apiFile(path), command);
|
|
151
150
|
}
|
|
152
|
-
async uploadFileAsMultiPart(login,
|
|
151
|
+
async uploadFileAsMultiPart(login, stream, fileName, contentLength, startPrint, progressToken) {
|
|
153
152
|
const urlPath = this.apiFilesLocal;
|
|
154
153
|
const formData = new _formdata.default();
|
|
155
154
|
if (startPrint) {
|
|
156
155
|
formData.append("print", "true");
|
|
157
156
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
formData.append("file", fileBuffer, {
|
|
163
|
-
filename
|
|
164
|
-
});
|
|
165
|
-
} else {
|
|
166
|
-
const filePath = multerFileOrBuffer.path;
|
|
167
|
-
const fileStream = (0, _fs.createReadStream)(filePath);
|
|
168
|
-
this.logger.log(`Attaching file from disk to formdata for upload`);
|
|
169
|
-
formData.append("file", fileStream, {
|
|
170
|
-
filename
|
|
171
|
-
});
|
|
172
|
-
}
|
|
157
|
+
formData.append("file", stream, {
|
|
158
|
+
filename: fileName,
|
|
159
|
+
knownLength: contentLength
|
|
160
|
+
});
|
|
173
161
|
const result = await new Promise((resolve, reject)=>{
|
|
174
162
|
return formData.getLength((err, length)=>{
|
|
175
163
|
if (err) reject(new Error("Could not retrieve formData length"));
|