@fdm-monster/server 2.0.8 → 2.0.9
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/README.md +1 -1
- package/RELEASE_NOTES.MD +12 -0
- package/dist/container.js +0 -6
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +0 -2
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +8 -75
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +7 -0
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/server.constants.js +1 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/services/bambu.api.js +24 -12
- package/dist/services/bambu.api.js.map +1 -1
- package/dist/services/file-storage.service.js.map +1 -1
- package/dist/services/moonraker.api.js +42 -9
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +30 -7
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +42 -5
- package/dist/services/octoprint/utils/file.utils.js.map +1 -1
- package/dist/services/octoprint.api.js +12 -8
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +21 -5
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/package.json +3 -3
- package/dist/state/file.cache.js +0 -68
- package/dist/state/file.cache.js.map +0 -1
- package/dist/state/printer-files.store.js +0 -92
- package/dist/state/printer-files.store.js.map +0 -1
- package/dist/tasks/printer-files-load.task.js +0 -29
- package/dist/tasks/printer-files-load.task.js.map +0 -1
|
@@ -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","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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"}
|
|
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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"}
|
|
@@ -89,16 +89,48 @@ class MoonrakerApi {
|
|
|
89
89
|
return {
|
|
90
90
|
size: file.size,
|
|
91
91
|
path,
|
|
92
|
-
date: file.modified
|
|
92
|
+
date: Math.floor(file.modified * 1000),
|
|
93
|
+
dir: false
|
|
93
94
|
};
|
|
94
95
|
}
|
|
95
|
-
async getFiles() {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
async getFiles(recursive = false, startDir = "") {
|
|
97
|
+
if (recursive && startDir) {
|
|
98
|
+
throw new Error("Recursive mode does not support startDir parameter for Moonraker");
|
|
99
|
+
}
|
|
100
|
+
const stripGcodes = (path)=>path.startsWith('gcodes/') ? path.substring(7) : path;
|
|
101
|
+
const buildPath = (name)=>startDir ? `${startDir}/${name}` : name;
|
|
102
|
+
if (recursive) {
|
|
103
|
+
const response = await this.client.getServerFilesList(this.login, "gcodes");
|
|
104
|
+
const dirsSet = new Set();
|
|
105
|
+
const files = response.data.result.map((f)=>{
|
|
106
|
+
const strippedPath = stripGcodes(f.path);
|
|
107
|
+
const pathParts = strippedPath.split('/');
|
|
108
|
+
for(let i = 0; i < pathParts.length - 1; i++){
|
|
109
|
+
dirsSet.add(pathParts.slice(0, i + 1).join('/'));
|
|
110
|
+
}
|
|
111
|
+
return this.toFileDto(strippedPath, f.size, f.modified, false);
|
|
112
|
+
});
|
|
113
|
+
dirsSet.forEach((dirPath)=>files.push(this.toFileDto(dirPath, 0, null, true)));
|
|
114
|
+
return {
|
|
115
|
+
dirs: files.filter((f)=>f.dir),
|
|
116
|
+
files: files.filter((f)=>!f.dir)
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
const moonrakerPath = startDir ? `gcodes/${startDir}` : "gcodes";
|
|
120
|
+
const response = await this.client.getServerFilesDirectoryInfo(this.login, moonrakerPath, false);
|
|
121
|
+
const { dirs: apiDirs, files: apiFiles } = response.data.result;
|
|
122
|
+
return {
|
|
123
|
+
dirs: apiDirs.map((d)=>this.toFileDto(buildPath(d.dirname), d.size, d.modified, true)),
|
|
124
|
+
files: apiFiles.map((f)=>this.toFileDto(buildPath(f.filename), f.size, f.modified, false))
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
toFileDto(path, size, modified, dir) {
|
|
128
|
+
return {
|
|
129
|
+
path,
|
|
130
|
+
size,
|
|
131
|
+
date: modified !== null ? Math.floor(modified * 1000) : null,
|
|
132
|
+
dir
|
|
133
|
+
};
|
|
102
134
|
}
|
|
103
135
|
async homeAxes(axes) {
|
|
104
136
|
let homeCommand = `G28`;
|
|
@@ -155,7 +187,8 @@ class MoonrakerApi {
|
|
|
155
187
|
file: {
|
|
156
188
|
date: job.start_time,
|
|
157
189
|
path: job.filename,
|
|
158
|
-
size: job.metadata.size
|
|
190
|
+
size: job.metadata.size,
|
|
191
|
+
dir: false
|
|
159
192
|
}
|
|
160
193
|
};
|
|
161
194
|
}
|
|
@@ -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","
|
|
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","Math","floor","modified","dir","getFiles","recursive","startDir","Error","stripGcodes","startsWith","substring","buildPath","name","response","getServerFilesList","dirsSet","Set","files","map","f","strippedPath","pathParts","split","i","length","add","slice","join","toFileDto","forEach","dirPath","push","dirs","filter","moonrakerPath","getServerFilesDirectoryInfo","apiDirs","apiFiles","d","dirname","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","getPrinterObjectsQuery","print_stats","webhooks","operational","status","state","response2","getServerHistoryList","jobs","sort","a","b","start_time","connectionState","reprintState","ReprintState","NoLastPrint","job","LastPrintReady"],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ class OctoprintRoutes {
|
|
|
71
71
|
};
|
|
72
72
|
apiFile = (path)=>`${this.apiFilesLocal}/${path}`;
|
|
73
73
|
downloadFileLocal = (path)=>`${this.octoPrintBase}downloads/files/local/${path}`;
|
|
74
|
-
apiGetFiles = (recursive = false)=>`${this.apiFiles}/local?recursive=${recursive}`;
|
|
74
|
+
apiGetFiles = (recursive = false, path = "")=>`${this.apiFiles}/local${path ? `/${path}` : ''}?recursive=${recursive}`;
|
|
75
75
|
selectCommand(print = false) {
|
|
76
76
|
return {
|
|
77
77
|
command: "select",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,gBAAgB,IAAI;IACpBC,UAAU,GAAG,IAAI,CAACD,aAAa,CAAC,GAAG,CAAC,CAAC;IACrCE,aAAa,GAAG,IAAI,CAACD,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCE,YAAY,GAAG,IAAI,CAACF,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCG,iBAAiB,GAAG,IAAI,CAACH,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/CI,kBAAkB,GAAG,IAAI,CAACJ,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7CK,WAAW,GAAG,IAAI,CAACL,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCM,gBAAgB,GAAG,IAAI,CAACD,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzCE,gBAAgB,GAAG,IAAI,CAACP,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7CQ,SAAS,GAAG,IAAI,CAACR,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/BS,aAAa,GAAG,IAAI,CAACT,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCU,iBAAiB,GAAG,IAAI,CAACV,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrDW,gBAAgB,GAAG,IAAI,CAACF,UAAU,CAAC,IAAI,CAAC,CAAC;IACzCG,0BAA0B,GAAG,IAAI,CAACH,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvDI,qBAAqB,GAAG,IAAI,CAACb,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvDc,YAAY,GAAG,IAAI,CAACd,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCe,gBAAgB,GAAG,IAAI,CAACD,SAAS,CAAC,KAAK,CAAC,CAAC;IACzCE,oBAAoB,GAAG,IAAI,CAACF,SAAS,CAAC,SAAS,CAAC,CAAC;IACjDG,0BAA0B,GAAG,IAAI,CAACD,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACnEE,WAAW,GAAG,IAAI,CAAClB,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCmB,WAAW,GAAG,IAAI,CAACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAIoB,oBAAoB;QACtB,OAAO;YAAEC,SAAS;QAAa;IACjC;IAEA,IAAIC,mBAAmB;QACrB,OAAO;YAAED,SAAS;QAAS;IAC7B;IAEA,IAAIE,kBAAkB;QACpB,OAAO;YAAEF,SAAS;YAASG,QAAQ;QAAQ;IAC7C;IAEA,IAAIC,mBAAmB;QACrB,OAAO;YAAEJ,SAAS;YAASG,QAAQ;QAAS;IAC9C;IAEA,IAAIE,iBAAiB;QACnB,OAAO;YAAEL,SAAS;QAAU;IAC9B;IAEAM,oBAAoBC,iBAAyB,EAAE;QAC7C,OAAO;YAAEP,SAAS;YAAUQ,QAAQD;QAAkB;IACxD;IAEAE,oBAAoB,CAACC,SAAmBC,OAAgBC;QACtDA,UAAUA,SAASC,OAAO,CAACC,IAAM,CAAC,CAACA,EAAEC,MAAM;QAC3C,MAAMC,eAAeJ,SAASG,SAAS,CAAC,SAAS,EAAEH,SAASK,KAAK,MAAM,GAAG;QAC1E,MAAMC,aAAa,CAAC,CAACP,QAAQ,CAAC,OAAO,EAAEA,OAAO,GAAG;QACjD,OAAO,GAAG,IAAI,CAACvB,UAAU,CAAC,SAAS,EAAE,CAAC,CAACsB,UAAUQ,aAAaF,cAAc;IAC9E,EAAE;IAEFG,UAAU,CAACC,OAAiB,GAAG,IAAI,CAACnC,aAAa,CAAC,CAAC,EAAEmC,MAAM,CAAC;IAE5DC,oBAAoB,CAACD,OAAiB,GAAG,IAAI,CAAC1C,aAAa,CAAC,sBAAsB,EAAE0C,MAAM,CAAC;IAE3FE,cAAc,CAACC,YAAY,KAAK,GAAK,GAAG,IAAI,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance"],"mappings":"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"}
|
|
@@ -107,16 +107,38 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
107
107
|
async getUsers(login) {
|
|
108
108
|
return await this.createClient(login).get(this.apiUsers);
|
|
109
109
|
}
|
|
110
|
-
async getLocalFiles(login, recursive = false) {
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
110
|
+
async getLocalFiles(login, recursive = false, startDir = "") {
|
|
111
|
+
const url = this.apiGetFiles(recursive, startDir);
|
|
112
|
+
const response = await this.createClient(login).get(url);
|
|
113
|
+
if (!response?.data) {
|
|
114
|
+
return [];
|
|
115
|
+
}
|
|
116
|
+
const data = response.data;
|
|
117
|
+
const items = data.files || (data.children ? data.children : []);
|
|
118
|
+
if (!items.length) {
|
|
119
|
+
return [];
|
|
120
|
+
}
|
|
121
|
+
if (recursive) {
|
|
122
|
+
return (0, _fileutils.flattenOctoPrintFiles)(items, startDir);
|
|
123
|
+
} else {
|
|
124
|
+
return items.map((item)=>({
|
|
125
|
+
path: item.path || item.name,
|
|
126
|
+
size: item.size || 0,
|
|
127
|
+
date: item.date || null,
|
|
128
|
+
dir: item.type === 'folder'
|
|
129
|
+
}));
|
|
130
|
+
}
|
|
115
131
|
}
|
|
116
132
|
async getFile(login, path) {
|
|
117
133
|
const urlPath = this.apiFile(path);
|
|
118
134
|
const response = await this.createClient(login).get(urlPath);
|
|
119
|
-
|
|
135
|
+
const file = response?.data;
|
|
136
|
+
return {
|
|
137
|
+
path: file.path,
|
|
138
|
+
size: file.size,
|
|
139
|
+
date: file.date,
|
|
140
|
+
dir: file.type === 'folder'
|
|
141
|
+
};
|
|
120
142
|
}
|
|
121
143
|
async downloadFile(login, path) {
|
|
122
144
|
const urlPath = this.downloadFileLocal(path);
|
|
@@ -146,7 +168,8 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
146
168
|
}
|
|
147
169
|
async postSelectPrintFile(login, path, print) {
|
|
148
170
|
const command = this.selectCommand(print);
|
|
149
|
-
|
|
171
|
+
const url = this.apiFile(path);
|
|
172
|
+
await this.createClient(login).post(url, command);
|
|
150
173
|
}
|
|
151
174
|
async uploadFileAsMultiPart(login, stream, fileName, contentLength, startPrint, progressToken) {
|
|
152
175
|
const urlPath = this.apiFilesLocal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","logger","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","passive","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","logger","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","passive","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","startDir","url","apiGetFiles","response","items","files","children","length","flattenOctoPrintFiles","map","item","path","size","date","dir","type","getFile","urlPath","apiFile","file","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","pathUrl","o","withHeaders","Range","createFolder","foldername","formData","FormData","append","headers","getHeaders","getLengthSync","toString","apiFilesLocal","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","stream","fileName","contentLength","startPrint","progressToken","filename","knownLength","result","Promise","resolve","reject","getLength","err","Error","builder","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","withXApiKeyHeader","apiKey","OctoprintHttpClientBuilder","createClientWithBaseUrl","b"],"mappings":"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"}
|
|
@@ -2,9 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
get flattenOctoPrintFiles () {
|
|
13
|
+
return flattenOctoPrintFiles;
|
|
14
|
+
},
|
|
15
|
+
get normalizePrinterFile () {
|
|
8
16
|
return normalizePrinterFile;
|
|
9
17
|
}
|
|
10
18
|
});
|
|
@@ -28,8 +36,37 @@ function normalizePrinterFile(file) {
|
|
|
28
36
|
customData[unknownKey] = fileCopy[unknownKey];
|
|
29
37
|
delete fileCopy[unknownKey];
|
|
30
38
|
}
|
|
31
|
-
|
|
32
|
-
|
|
39
|
+
return {
|
|
40
|
+
path: fileCopy.path,
|
|
41
|
+
size: fileCopy.size,
|
|
42
|
+
date: fileCopy.date,
|
|
43
|
+
dir: fileCopy.type === 'folder'
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
function flattenOctoPrintFiles(items, parentPath = '') {
|
|
47
|
+
const files = [];
|
|
48
|
+
for (const item of items){
|
|
49
|
+
const fullPath = parentPath ? `${parentPath}/${item.name}` : item.name;
|
|
50
|
+
if (item.type === 'folder') {
|
|
51
|
+
files.push({
|
|
52
|
+
path: fullPath,
|
|
53
|
+
size: 0,
|
|
54
|
+
date: item.date || null,
|
|
55
|
+
dir: true
|
|
56
|
+
});
|
|
57
|
+
if (item.children) {
|
|
58
|
+
files.push(...flattenOctoPrintFiles(item.children, fullPath));
|
|
59
|
+
}
|
|
60
|
+
} else if (item.type === 'machinecode') {
|
|
61
|
+
files.push({
|
|
62
|
+
path: fullPath,
|
|
63
|
+
size: item.size,
|
|
64
|
+
date: item.date,
|
|
65
|
+
dir: false
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return files;
|
|
33
70
|
}
|
|
34
71
|
|
|
35
72
|
//# sourceMappingURL=file.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/utils/file.utils.ts"],"names":["normalizePrinterFile","file","Error","keys","Object","fileCopy","knownKeys","unknownKeys","filter","k","includes","customData","unknownKey"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/utils/file.utils.ts"],"names":["flattenOctoPrintFiles","normalizePrinterFile","file","Error","keys","Object","fileCopy","knownKeys","unknownKeys","filter","k","includes","customData","unknownKey","path","size","date","dir","type","items","parentPath","files","item","fullPath","name","push","children"],"mappings":";;;;;;;;;;;QA6CgBA;eAAAA;;QA1CAC;eAAAA;;;AAAT,SAASA,qBAAqBC,IAAsB;IACzD,IAAI,CAACA,MAAM;QACT,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,OAAOC,OAAOD,IAAI,CAACF;IACzB,MAAMI,WAAW;QACf,GAAGJ,IAAI;IACT;IAEA,MAAMK,YAAY;QAChB;QACA;QACA;QAOA;KAID;IAED,MAAMC,cAAcJ,KAAKK,MAAM,CAAC,CAACC,IAAM,CAACH,UAAUI,QAAQ,CAACD;IAE3D,MAAME,aAAiC,CAAC;IACxC,KAAK,MAAMC,cAAcL,YAAa;QACpCI,UAAU,CAACC,WAAW,GAAGP,QAAQ,CAACO,WAAW;QAC7C,OAAOP,QAAQ,CAACO,WAAW;IAC7B;IAEA,OAAO;QACLC,MAAMR,SAASQ,IAAI;QACnBC,MAAMT,SAASS,IAAI;QACnBC,MAAMV,SAASU,IAAI;QACnBC,KAAKX,SAASY,IAAI,KAAK;IACzB;AACF;AAEO,SAASlB,sBAAsBmB,KAAyB,EAAEC,aAAqB,EAAE;IACtF,MAAMC,QAAmB,EAAE;IAE3B,KAAK,MAAMC,QAAQH,MAAO;QACxB,MAAMI,WAAWH,aAAa,GAAGA,WAAW,CAAC,EAAEE,KAAKE,IAAI,EAAE,GAAGF,KAAKE,IAAI;QAEtE,IAAIF,KAAKJ,IAAI,KAAK,UAAU;YAC1BG,MAAMI,IAAI,CAAC;gBACTX,MAAMS;gBACNR,MAAM;gBACNC,MAAMM,KAAKN,IAAI,IAAI;gBACnBC,KAAK;YACP;YAEA,IAAIK,KAAKI,QAAQ,EAAE;gBACjBL,MAAMI,IAAI,IAAIzB,sBAAsBsB,KAAKI,QAAQ,EAAEH;YACrD;QACF,OAAO,IAAID,KAAKJ,IAAI,KAAK,eAAe;YACtCG,MAAMI,IAAI,CAAC;gBACTX,MAAMS;gBACNR,MAAMO,KAAKP,IAAI;gBACfC,MAAMM,KAAKN,IAAI;gBACfC,KAAK;YACP;QACF;IACF;IAEA,OAAOI;AACT"}
|
|
@@ -75,13 +75,12 @@ class OctoprintApi {
|
|
|
75
75
|
async getFile(path) {
|
|
76
76
|
return this.client.getFile(this.login, path);
|
|
77
77
|
}
|
|
78
|
-
async getFiles() {
|
|
79
|
-
const
|
|
80
|
-
return
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}));
|
|
78
|
+
async getFiles(recursive = false, startDir = "") {
|
|
79
|
+
const items = await this.client.getLocalFiles(this.login, recursive, startDir);
|
|
80
|
+
return {
|
|
81
|
+
dirs: items.filter((f)=>f.dir),
|
|
82
|
+
files: items.filter((f)=>!f.dir)
|
|
83
|
+
};
|
|
85
84
|
}
|
|
86
85
|
async downloadFile(path) {
|
|
87
86
|
return await this.client.downloadFile(this.login, path);
|
|
@@ -117,7 +116,12 @@ class OctoprintApi {
|
|
|
117
116
|
}
|
|
118
117
|
return {
|
|
119
118
|
connectionState,
|
|
120
|
-
file:
|
|
119
|
+
file: {
|
|
120
|
+
path: currentJobFile.path,
|
|
121
|
+
size: currentJobFile.size,
|
|
122
|
+
date: currentJobFile.date,
|
|
123
|
+
dir: false
|
|
124
|
+
},
|
|
121
125
|
reprintState: _printerapiinterface.ReprintState.LastPrintReady
|
|
122
126
|
};
|
|
123
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","validateConnection","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","
|
|
1
|
+
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","validateConnection","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","recursive","startDir","items","getLocalFiles","dirs","filter","f","dir","files","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","input","validated","uploadFileInputSchema","parse","uploadFileAsMultiPart","stream","fileName","contentLength","uploadToken","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","size","date","LastPrintReady"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState","uploadFileInputSchema","z","object","stream","custom","val","pipe","fileName","string","min","contentLength","number","int","positive","startPrint","boolean","uploadToken","optional"],"mappings":";;;;;;;;;;;QAwBaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState","uploadFileInputSchema","z","object","stream","custom","val","pipe","fileName","string","min","contentLength","number","int","positive","startPrint","boolean","uploadToken","optional"],"mappings":";;;;;;;;;;;QAwBaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QAmDDC;eAAAA;;QAjECC;eAAAA;;;qBAHK;AAGX,MAAMA,wBAAwBC,MAAC,CAACC,MAAM,CAAC;IAC5CC,QAAQF,MAAC,CAACG,MAAM,CAAW,CAACC;QAC1B,OAAOA,OAAO,OAAOA,QAAQ,YAAY,UAAUA,OAAO,OAAOA,IAAIC,IAAI,KAAK;IAChF,GAAG;IACHC,UAAUN,MAAC,CAACO,MAAM,GAAGC,GAAG,CAAC;IACzBC,eAAeT,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,QAAQ;IACxCC,YAAYb,MAAC,CAACc,OAAO;IACrBC,aAAaf,MAAC,CAACO,MAAM,GAAGS,QAAQ;AAClC;AAIO,MAAMrB,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AAgDL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}
|
|
@@ -46,20 +46,36 @@ class PrusaLinkApi {
|
|
|
46
46
|
async validateConnection() {
|
|
47
47
|
await this.getVersion();
|
|
48
48
|
}
|
|
49
|
-
async getFiles() {
|
|
49
|
+
async getFiles(recursive = false, startDir = "/usb") {
|
|
50
|
+
if (recursive) {
|
|
51
|
+
throw new Error("Recursive listing not supported for PrusaLink printers");
|
|
52
|
+
}
|
|
50
53
|
const response = await this.client.get("/api/files");
|
|
51
|
-
|
|
52
|
-
|
|
54
|
+
const root = response.data.files.find((dir)=>dir.path === startDir);
|
|
55
|
+
if (!root || !root.children) {
|
|
56
|
+
return {
|
|
57
|
+
dirs: [],
|
|
58
|
+
files: []
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
const items = root.children.map((child)=>({
|
|
62
|
+
path: child.path,
|
|
63
|
+
size: null,
|
|
53
64
|
date: null,
|
|
54
|
-
|
|
65
|
+
dir: !child.refs?.download
|
|
55
66
|
}));
|
|
67
|
+
return {
|
|
68
|
+
dirs: items.filter((i)=>i.dir),
|
|
69
|
+
files: items.filter((i)=>!i.dir)
|
|
70
|
+
};
|
|
56
71
|
}
|
|
57
72
|
async getFile(path) {
|
|
58
73
|
const response = await this.getFileRaw(path);
|
|
59
74
|
return {
|
|
60
75
|
path: response.data.name,
|
|
61
76
|
size: response.data.size,
|
|
62
|
-
date: null
|
|
77
|
+
date: null,
|
|
78
|
+
dir: false
|
|
63
79
|
};
|
|
64
80
|
}
|
|
65
81
|
async getStatus() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","validateConnection","getFiles","files","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","validateConnection","getFiles","recursive","startDir","Error","root","files","find","dir","path","children","dirs","items","map","child","size","date","refs","download","filter","i","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","input","validated","uploadFileInputSchema","parse","b","contentLength","toString","Overwrite","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","uploadToken","emit","uploadProgressEvent","encodeURIComponent","fileName","stream","uploadDoneEvent","e","uploadFailedEvent","message","JSON","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","log","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "2.0.
|
|
9
|
+
"version": "2.0.9",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster-server": "dist/index.js",
|
|
12
12
|
"fdmm-server": "dist/index.js"
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"tr46": "6.0.0"
|
|
63
63
|
},
|
|
64
64
|
"dependencies": {
|
|
65
|
-
"@fdm-monster/client-next": "2.3.
|
|
65
|
+
"@fdm-monster/client-next": "2.3.3",
|
|
66
66
|
"@octokit/plugin-throttling": "8.2.0",
|
|
67
|
-
"@sentry/node": "10.
|
|
67
|
+
"@sentry/node": "10.38.0",
|
|
68
68
|
"adm-zip": "0.5.16",
|
|
69
69
|
"awilix": "12.0.5",
|
|
70
70
|
"awilix-express": "9.0.2",
|