@fdm-monster/server 1.5.4 → 1.6.0-rc1

package/.env.template

@@ -44,3 +44,10 @@ OVERRIDE_DEMO_ROLE=ADMIN
 
 # Debug express routes
 DEBUG_ROUTES=false
+
+# Enables TypeORM
+ENABLE_EXPERIMENTAL_TYPEORM=false
+# Saves SQLite database to ./database/fdm-monster.sqlite
+DATABASE_PATH=./database
+# Optional, default: fdm-monster.sqlite
+DATABASE_FILE=fdm-monster.sqlite

package/README.md

@@ -61,7 +61,7 @@ Please join the discord, but stay professional and proactive!
 These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-11-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
@@ -82,6 +82,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
       <td align="center" valign="top" width="14.28%"><a href="http://www.tophattwaffle.com"><img src="https://avatars.githubusercontent.com/u/6774125?v=4?s=80" width="80px;" alt="tophattwaffle"/><br /><sub><b>tophattwaffle</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Atophattwaffle" title="Bug reports">🐛</a> <a href="#ideas-tophattwaffle" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rmhenn"><img src="https://avatars.githubusercontent.com/u/22482801?v=4?s=80" width="80px;" alt="rmhenn"/><br /><sub><b>rmhenn</b></sub></a><br /><a href="#ideas-rmhenn" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Armhenn" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cyrixdx4"><img src="https://avatars.githubusercontent.com/u/62126724?v=4?s=80" width="80px;" alt="cyrixdx4"/><br /><sub><b>cyrixdx4</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Acyrixdx4" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/doucettom"><img src="https://avatars.githubusercontent.com/u/6595645?v=4?s=80" width="80px;" alt="doucettom"/><br /><sub><b>doucettom</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Adoucettom" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
 </table>

package/dist/consoles/upload-test.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const Parser = require("stream-parser");
+const inherits = require("util").inherits;
+const Transform = require("stream").Transform;
+function Throttle(opts) {
+    if (!(this instanceof Throttle)) return new Throttle(opts);
+    if ("number" == typeof opts) opts = {
+        bps: opts
+    };
+    if (!opts) opts = {};
+    if (null == opts.lowWaterMark) opts.lowWaterMark = 0;
+    if (null == opts.highWaterMark) opts.highWaterMark = 0;
+    if (null == opts.bps) throw new Error('must pass a "bps" bytes-per-second option');
+    if (null == opts.chunkSize) opts.chunkSize = opts.bps / 10 | 0;
+    Transform.call(this, opts);
+    this.bps = opts.bps;
+    this.chunkSize = Math.max(1, opts.chunkSize);
+    this.totalBytes = 0;
+    this.startTime = Date.now();
+    this._passthroughChunk();
+}
+inherits(Throttle, Transform);
+Parser(Throttle.prototype);
+Throttle.prototype._passthroughChunk = function() {
+    this._passthrough(this.chunkSize, this._onchunk);
+    this.totalBytes += this.chunkSize;
+};
+Throttle.prototype._onchunk = function(output, done) {
+    const self = this;
+    const totalSeconds = (Date.now() - this.startTime) / 1000;
+    const expected = totalSeconds * this.bps;
+    function d() {
+        self._passthroughChunk();
+        done();
+    }
+    if (this.totalBytes > expected) {
+        const remainder = this.totalBytes - expected;
+        const sleepTime = remainder / this.bps * 1000;
+        if (sleepTime > 0) {
+            setTimeout(d, sleepTime);
+        } else {
+            d();
+        }
+    } else {
+        d();
+    }
+};
+
+//# sourceMappingURL=upload-test.js.map

package/dist/consoles/upload-test.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/upload-test.ts"],"names":["Parser","require","inherits","Transform","Throttle","opts","bps","lowWaterMark","highWaterMark","Error","chunkSize","call","Math","max","totalBytes","startTime","Date","now","_passthroughChunk","prototype","_passthrough","_onchunk","output","done","self","totalSeconds","expected","d","remainder","sleepTime","setTimeout"],"mappings":";;;;AAQA,MAAMA,SAASC,QAAQ;AACvB,MAAMC,WAAWD,QAAQ,QAAQC,QAAQ;AACzC,MAAMC,YAAYF,QAAQ,UAAUE,SAAS;AAG7C,SAASC,SAASC,IAAI;IACpB,IAAI,CAAE,CAAA,IAAI,YAAYD,QAAO,GAAI,OAAO,IAAIA,SAASC;IAErD,IAAI,YAAY,OAAOA,MAAMA,OAAO;QAAEC,KAAKD;IAAK;IAChD,IAAI,CAACA,MAAMA,OAAO,CAAC;IACnB,IAAI,QAAQA,KAAKE,YAAY,EAAEF,KAAKE,YAAY,GAAG;IACnD,IAAI,QAAQF,KAAKG,aAAa,EAAEH,KAAKG,aAAa,GAAG;IACrD,IAAI,QAAQH,KAAKC,GAAG,EAAE,MAAM,IAAIG,MAAM;IACtC,IAAI,QAAQJ,KAAKK,SAAS,EAAEL,KAAKK,SAAS,GAAG,AAACL,KAAKC,GAAG,GAAG,KAAM;IAE/DH,UAAUQ,IAAI,CAAC,IAAI,EAAEN;IAErB,IAAI,CAACC,GAAG,GAAGD,KAAKC,GAAG;IACnB,IAAI,CAACI,SAAS,GAAGE,KAAKC,GAAG,CAAC,GAAGR,KAAKK,SAAS;IAE3C,IAAI,CAACI,UAAU,GAAG;IAClB,IAAI,CAACC,SAAS,GAAGC,KAAKC,GAAG;IAEzB,IAAI,CAACC,iBAAiB;AACxB;AAEAhB,SAASE,UAAUD;AAMnBH,OAAOI,SAASe,SAAS;AAQzBf,SAASe,SAAS,CAACD,iBAAiB,GAAG;IACrC,IAAI,CAACE,YAAY,CAAC,IAAI,CAACV,SAAS,EAAE,IAAI,CAACW,QAAQ;IAC/C,IAAI,CAACP,UAAU,IAAI,IAAI,CAACJ,SAAS;AACnC;AASAN,SAASe,SAAS,CAACE,QAAQ,GAAG,SAAUC,MAAM,EAAEC,IAAI;IAClD,MAAMC,OAAO,IAAI;IACjB,MAAMC,eAAe,AAACT,CAAAA,KAAKC,GAAG,KAAK,IAAI,CAACF,SAAS,AAAD,IAAK;IACrD,MAAMW,WAAWD,eAAe,IAAI,CAACnB,GAAG;IAExC,SAASqB;QACPH,KAAKN,iBAAiB;QACtBK;IACF;IAEA,IAAI,IAAI,CAACT,UAAU,GAAGY,UAAU;QAE9B,MAAME,YAAY,IAAI,CAACd,UAAU,GAAGY;QACpC,MAAMG,YAAY,AAACD,YAAY,IAAI,CAACtB,GAAG,GAAI;QAE3C,IAAIuB,YAAY,GAAG;YACjBC,WAAWH,GAAGE;QAChB,OAAO;YACLF;QACF;IACF,OAAO;QACLA;IACF;AACF"}

package/dist/constants/event.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;IAeaA,6BAA6B;eAA7BA;;IACAC,0BAA0B;eAA1BA;;IAJAC,wBAAwB;eAAxBA;;IAFAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAKAC,MAAM;eAANA;;IAZAC,aAAa;eAAbA;;IAFAC,sBAAsB;eAAtBA;;IAWAC,mBAAmB;eAAnBA;;;AAXN,MAAMD,yBAAyB;AAE/B,MAAMD,gBAAgB;IAC3BG,iBAAiB;IACjBC,gBAAgB;IAChBC,gBAAgB;IAChBC,qBAAqB;AACvB;AAEO,MAAMR,0BAA0B,CAACS,YAAc,CAAC,UAAU,EAAEA,UAAU,CAAC;AACvE,MAAMV,iCAAiC,CAACU,YAAc,CAAC,UAAU,EAAEA,UAAU,QAAQ,CAAC;AACtF,MAAML,sBAAsB,CAACM,QAAU,CAAC,gBAAgB,EAAEA,MAAM,CAAC;AACjE,MAAMZ,2BAA2B,CAACW,YAAc,CAAC,gBAAgB,EAAEA,UAAU,CAAC;AAE9E,MAAMR,SAAS;AACf,MAAML,gCAAgC,CAACa,YAAc,CAAC,EAAER,OAAO,CAAC,EAAEQ,UAAU,gBAAgB,CAAC;AAC7F,MAAMZ,6BAA6B,CAACc,QAAUA,MAAMC,KAAK,CAAC,IAAI,CAAC,EAAE"}
+{"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;IAeaA,6BAA6B;eAA7BA;;IACAC,0BAA0B;eAA1BA;;IAJAC,wBAAwB;eAAxBA;;IAFAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAKAC,MAAM;eAANA;;IAZAC,aAAa;eAAbA;;IAFAC,sBAAsB;eAAtBA;;IAWAC,mBAAmB;eAAnBA;;;AAXN,MAAMD,yBAAyB;AAE/B,MAAMD,gBAAgB;IAC3BG,iBAAiB;IACjBC,gBAAgB;IAChBC,gBAAgB;IAChBC,qBAAqB;AACvB;AAEO,MAAMR,0BAA0B,CAACS,YAAsB,CAAC,UAAU,EAAEA,UAAU,CAAC;AAC/E,MAAMV,iCAAiC,CAACU,YAAsB,CAAC,UAAU,EAAEA,UAAU,QAAQ,CAAC;AAC9F,MAAML,sBAAsB,CAACM,QAAkB,CAAC,gBAAgB,EAAEA,MAAM,CAAC;AACzE,MAAMZ,2BAA2B,CAACW,YAAsB,CAAC,gBAAgB,EAAEA,UAAU,CAAC;AAEtF,MAAMR,SAAS;AACf,MAAML,gCAAgC,CAACa,YAAsB,CAAC,EAAER,OAAO,CAAC,EAAEQ,UAAU,gBAAgB,CAAC;AACrG,MAAMZ,6BAA6B,CAACc,QAAkBA,MAAMC,KAAK,CAAC,IAAI,CAAC,EAAE"}

package/dist/constants/service.constants.js

@@ -12,30 +12,15 @@ _export(exports, {
     UUID_LENGTH: function() {
         return UUID_LENGTH;
     },
-    getDefaultPrinterEntry: function() {
-        return getDefaultPrinterEntry;
-    },
-    getFileListDefault: function() {
-        return getFileListDefault;
+    apiKeyLengthMinimumDefault: function() {
+        return apiKeyLengthMinimumDefault;
     },
     minFloorNameLength: function() {
         return minFloorNameLength;
     }
 });
-function getFileListDefault() {
-    return {
-        files: [],
-        folders: [],
-        free: 0,
-        total: 0
-    };
-}
-function getDefaultPrinterEntry() {
-    return {
-        fileList: getFileListDefault()
-    };
-}
 const UUID_LENGTH = 32;
 const minFloorNameLength = 3;
+const apiKeyLengthMinimumDefault = 32;
 
 //# sourceMappingURL=service.constants.js.map

package/dist/constants/service.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["UUID_LENGTH","getDefaultPrinterEntry","getFileListDefault","minFloorNameLength","files","folders","free","total","fileList"],"mappings":";;;;;;;;;;;IAeaA,WAAW;eAAXA;;IANGC,sBAAsB;eAAtBA;;IATAC,kBAAkB;eAAlBA;;IAgBHC,kBAAkB;eAAlBA;;;AAhBN,SAASD;IACd,OAAO;QACLE,OAAO,EAAE;QACTC,SAAS,EAAE;QACXC,MAAM;QACNC,OAAO;IACT;AACF;AAEO,SAASN;IACd,OAAO;QACLO,UAAUN;IACZ;AACF;AAEO,MAAMF,cAAc;AACpB,MAAMG,qBAAqB"}
+{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["UUID_LENGTH","apiKeyLengthMinimumDefault","minFloorNameLength"],"mappings":";;;;;;;;;;;IAAaA,WAAW;eAAXA;;IAGAC,0BAA0B;eAA1BA;;IAFAC,kBAAkB;eAAlBA;;;AADN,MAAMF,cAAc;AACpB,MAAME,qBAAqB;AAE3B,MAAMD,6BAA6B"}

package/dist/controllers/custom-gcode.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGcodeController","octoPrintApiService","customGCodeService","isTypeormMode","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRulesV2","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGcodeController","octoPrintApiService","customGCodeService","isTypeormMode","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRulesV2","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":"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"}

package/dist/controllers/printer-files.controller.js

@@ -25,7 +25,6 @@ const _batchcontrollervalidation = require("./validation/batch-controller.valida
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 const _printer = require("../middleware/printer");
 const _authorizationconstants = require("../constants/authorization.constants");
-const _nodefs = require("node:fs");
 class PrinterFilesController {
     printerFilesStore;
     settingsStore;
@@ -53,8 +52,8 @@ class PrinterFilesController {
         const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
         const { recursive } = await (0, _validators.validateInput)(req.query, _printerfilescontrollervalidation.getFilesRules);
         this.logger.log("Refreshing file storage by eager load");
-        const response = await this.printerFilesStore.eagerLoadPrinterFiles(currentPrinterId, recursive);
-        this.statusResponse(res, response);
+        const files = await this.printerFilesStore.eagerLoadPrinterFiles(currentPrinterId, recursive);
+        res.send(files);
     }
     async getFilesCache(req, res) {
         const { currentPrinter } = (0, _validators.getScopedPrinter)(req);
@@ -63,7 +62,7 @@ class PrinterFilesController {
     }
     async clearPrinterFiles(req, res) {
         const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
-        const nonRecursiveFiles = await this.octoPrintApiService.getFiles(printerLogin, false);
+        const nonRecursiveFiles = await this.octoPrintApiService.getLocalFiles(printerLogin, false);
         const failedFiles = [];
         const succeededFiles = [];
         for (let file of nonRecursiveFiles.files){
@@ -110,10 +109,9 @@ class PrinterFilesController {
         res.send(results);
     }
     async selectAndPrintFile(req, res) {
-        const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
+        const { printerLogin } = (0, _validators.getScopedPrinter)(req);
         const { filePath: path, print } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.selectAndPrintFileRules);
         const result = await this.octoPrintApiService.selectPrintFile(printerLogin, path, print);
-        await this.printerFilesStore.setExistingFileForPrint(currentPrinterId, path);
         res.send(result);
     }
     async uploadFile(req, res) {
@@ -136,48 +134,17 @@ class PrinterFilesController {
         if (fileCleanEnabled) {
             await this.printerFileCleanTask.cleanPrinterFiles(currentPrinterId);
         }
-        const token = this.multerService.startTrackingSession(files);
+        const token = this.multerService.startTrackingSession(uploadedFile);
         const response = await this.octoPrintApiService.uploadFileAsMultiPart(printerLogin, uploadedFile, {
             print,
             select
         }, token);
-        if (response.success !== false) {
-            const newOrUpdatedFile = response.files.local;
-            await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
+        if (response.success !== false && response?.files?.local?.path?.length) {
+            const file = await this.octoPrintApiService.getFile(printerLogin, response?.files?.local?.path);
+            await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, file);
         }
         res.send(response);
     }
-    async localUploadFile(req, res) {
-        const { currentPrinterId, printerLogin } = (0, _validators.getScopedPrinter)(req);
-        const { select, print, localLocation } = await (0, _validators.validateInput)(req.body, _printerfilescontrollervalidation.localFileUploadRules);
-        if (!localLocation.endsWith(".gcode")) {
-            throw new _runtimeexceptions.ValidationException({
-                localLocation: "The indicated file extension did not match '.gcode'"
-            });
-        }
-        if (!(0, _nodefs.existsSync)(localLocation)) {
-            throw new _runtimeexceptions.NotFoundException("The indicated file was not found.");
-        }
-        if ((0, _nodefs.lstatSync)(localLocation).isDirectory()) {
-            throw new _runtimeexceptions.ValidationException({
-                localLocation: "The indicated file was not correctly found."
-            });
-        }
-        const stream = (0, _nodefs.createReadStream)(localLocation);
-        const response = await this.octoPrintApiService.uploadFileAsMultiPart(printerLogin, stream, {
-            select,
-            print
-        });
-        if (response.success !== false) {
-            const newOrUpdatedFile = response.files.local;
-            await this.printerFilesStore.appendOrSetPrinterFile(currentPrinterId, newOrUpdatedFile);
-        }
-        res.send(response);
-    }
-    statusResponse(res, response) {
-        res.statusCode = response.status;
-        res.send(response.data);
-    }
 }
 const _default = (0, _awilixexpress.createController)(PrinterFilesController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-files").before([
     (0, _authenticate.authenticate)(),
@@ -186,6 +153,6 @@ const _default = (0, _awilixexpress.createController)(PrinterFilesController).pr
         _authorizationconstants.ROLES.OPERATOR
     ]),
     (0, _printer.printerResolveMiddleware)()
-]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/local-upload", "localUploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
+]).post("/purge", "purgeIndexedFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear)).get("/tracked-uploads", "getTrackedUploads", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/batch/reprint-files", "batchReprintFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).get("/:id", "getFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).get("/:id/cache", "getFilesCache", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Get)).post("/:id/upload", "uploadFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Upload)).post("/:id/create-folder", "createFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/select", "selectAndPrintFile", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).post("/:id/move", "moveFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Actions)).delete("/:id", "deleteFileOrFolder", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Delete)).delete("/:id/clear", "clearPrinterFiles", (0, _authenticate.withPermission)(_authorizationconstants.PERMS.PrinterFiles.Clear));
 
 //# sourceMappingURL=printer-files.controller.js.map

package/dist/controllers/printer-files.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","response","eagerLoadPrinterFiles","statusResponse","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","failedFiles","succeededFiles","file","files","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","setExistingFileForPrint","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","uploadFileAsMultiPart","success","newOrUpdatedFile","local","appendOrSetPrinterFile","localUploadFile","localLocation","localFileUploadRules","endsWith","existsSync","NotFoundException","lstatSync","isDirectory","stream","createReadStream","statusCode","status","data","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","files","eagerLoadPrinterFiles","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","getLocalFiles","failedFiles","succeededFiles","file","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","batchReprintFiles","printerIds","body","batchPrinterRules","results","batchReprintCalls","selectAndPrintFile","print","selectAndPrintFileRules","selectPrintFile","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","response","uploadFileAsMultiPart","success","local","getFile","appendOrSetPrinterFile","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Actions","Get","delete","Delete"],"mappings":"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"}

package/dist/entities/base.entity.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "BaseEntity", {
+    enumerable: true,
+    get: function() {
+        return BaseEntity;
+    }
+});
+const _typeorm = require("typeorm");
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+class BaseEntity {
+    id;
+}
+_ts_decorate([
+    (0, _typeorm.PrimaryGeneratedColumn)(),
+    _ts_metadata("design:type", Number)
+], BaseEntity.prototype, "id", void 0);
+
+//# sourceMappingURL=base.entity.js.map

package/dist/entities/base.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/entities/base.entity.ts"],"names":["BaseEntity","id","PrimaryGeneratedColumn"],"mappings":";;;;+BAEaA;;;eAAAA;;;yBAF0B;;;;;;;;;;AAEhC,MAAMA;IAEXC,GAAY;AACd;;IAFGC,IAAAA,+BAAsB;;GADZF"}

package/dist/models/Printer.js

@@ -35,6 +35,10 @@ const PrinterSchema = new _mongoose.Schema({
         type: String,
         required: false
     },
+    assignee: {
+        type: String,
+        required: false
+    },
     name: {
         type: String,
         required: true
@@ -47,49 +51,6 @@ const PrinterSchema = new _mongoose.Schema({
         type: Number,
         required: false
     },
-    lastPrintedFile: {
-        type: {
-            fileName: {
-                type: String,
-                required: true
-            },
-            editTimestamp: {
-                type: Number,
-                required: true
-            },
-            parsedColor: {
-                type: String,
-                required: false
-            },
-            parsedVisualizationRAL: {
-                type: Number,
-                required: false
-            },
-            parsedAmount: {
-                type: Number,
-                required: false
-            },
-            parsedMaterial: {
-                type: String,
-                required: false
-            },
-            parsedOrderCode: {
-                type: String,
-                required: false
-            }
-        },
-        required: false
-    },
-    fileList: {
-        type: Object,
-        default: {
-            files: [],
-            folders: [],
-            free: 0,
-            total: 0
-        },
-        required: true
-    },
     feedRate: {
         type: Number,
         required: false

package/dist/models/Printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","name","currentUser","dateAdded","Number","lastPrintedFile","fileName","editTimestamp","parsedColor","parsedVisualizationRAL","parsedAmount","parsedMaterial","parsedOrderCode","fileList","Object","files","folders","free","total","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoHaA,OAAO;eAAPA;;IAtFAC,aAAa;eAAbA;;;0BA9BiB;AA8BvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,SAAS;QACPJ,MAAMK;QACNH,UAAU;QACVI,SAAS;IACX;IACAC,gBAAgB;QACdP,MAAMC;QACNC,UAAU;IACZ;IACAM,MAAM;QACJR,MAAMC;QACNC,UAAU;IACZ;IAEAO,aAAa;QACXT,MAAMC;QACNC,UAAU;IACZ;IACAQ,WAAW;QACTV,MAAMW;QACNT,UAAU;IACZ;IAEAU,iBAAiB;QACfZ,MAAM;YACJa,UAAU;gBACRb,MAAMC;gBACNC,UAAU;YACZ;YACAY,eAAe;gBACbd,MAAMW;gBACNT,UAAU;YACZ;YACAa,aAAa;gBACXf,MAAMC;gBACNC,UAAU;YACZ;YACAc,wBAAwB;gBACtBhB,MAAMW;gBACNT,UAAU;YACZ;YACAe,cAAc;gBACZjB,MAAMW;gBACNT,UAAU;YACZ;YACAgB,gBAAgB;gBACdlB,MAAMC;gBACNC,UAAU;YACZ;YACAiB,iBAAiB;gBACfnB,MAAMC;gBACNC,UAAU;YACZ;QACF;QACAA,UAAU;IACZ;IAEAkB,UAAU;QACRpB,MAAMqB;QACNf,SAAS;YACPgB,OAAO,EAAE;YACTC,SAAS,EAAE;YACXC,MAAM;YACNC,OAAO;QACT;QACAvB,UAAU;IACZ;IACAwB,UAAU;QACR1B,MAAMW;QACNT,UAAU;IACZ;IACAyB,UAAU;QACR3B,MAAMW;QACNT,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUgC,IAAAA,eAAK,EAAC,WAAW/B"}
+{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","enabled","Boolean","default","disabledReason","assignee","name","currentUser","dateAdded","Number","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IA6DaA,OAAO;eAAPA;;IA7CAC,aAAa;eAAbA;;;0BAhBiB;AAgBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,SAAS;QACPJ,MAAMK;QACNH,UAAU;QACVI,SAAS;IACX;IACAC,gBAAgB;QACdP,MAAMC;QACNC,UAAU;IACZ;IACAM,UAAU;QACRR,MAAMC;QACNC,UAAU;IACZ;IACAO,MAAM;QACJT,MAAMC;QACNC,UAAU;IACZ;IAEAQ,aAAa;QACXV,MAAMC;QACNC,UAAU;IACZ;IACAS,WAAW;QACTX,MAAMY;QACNV,UAAU;IACZ;IACAW,UAAU;QACRb,MAAMY;QACNV,UAAU;IACZ;IACAY,UAAU;QACRd,MAAMY;QACNV,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUmB,IAAAA,eAAK,EAAC,WAAWlB"}

package/dist/models/PrinterFile.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    PrinterFile: function() {
+        return PrinterFile;
+    },
+    PrinterFileSchema: function() {
+        return PrinterFileSchema;
+    }
+});
+const _mongoose = require("mongoose");
+const PrinterFileSchema = new _mongoose.Schema({
+    printerId: {
+        type: _mongoose.Schema.Types.ObjectId,
+        required: true
+    },
+    name: {
+        type: String,
+        required: true
+    },
+    date: {
+        type: Number,
+        required: true
+    },
+    display: {
+        type: String,
+        required: true
+    },
+    gcodeAnalysis: {
+        type: Object,
+        default: null,
+        required: false
+    },
+    hash: {
+        type: String,
+        required: true
+    },
+    origin: {
+        type: String,
+        required: true
+    },
+    path: {
+        type: String,
+        required: true
+    },
+    prints: {
+        type: Object,
+        required: false
+    },
+    refs: {
+        type: Object,
+        required: false
+    },
+    size: {
+        type: Number,
+        required: false
+    },
+    statistics: {
+        type: Object,
+        required: false
+    },
+    type: {
+        type: String,
+        required: false
+    },
+    typePath: {
+        type: Array(String),
+        required: false
+    }
+});
+const PrinterFile = (0, _mongoose.model)("PrinterFile", PrinterFileSchema);
+
+//# sourceMappingURL=PrinterFile.js.map

package/dist/models/PrinterFile.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/models/PrinterFile.ts"],"names":["PrinterFile","PrinterFileSchema","Schema","printerId","type","Types","ObjectId","required","name","String","date","Number","display","gcodeAnalysis","Object","default","hash","origin","path","prints","refs","size","statistics","typePath","Array","model"],"mappings":";;;;;;;;;;;IAgFaA,WAAW;eAAXA;;IA5DAC,iBAAiB;eAAjBA;;;0BApBiB;AAoBvB,MAAMA,oBAAoB,IAAIC,gBAAM,CAAe;IACxDC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,UAAU;IACZ;IACAC,MAAM;QACJJ,MAAMK;QACNF,UAAU;IACZ;IACAG,MAAM;QACJN,MAAMO;QACNJ,UAAU;IACZ;IACAK,SAAS;QACPR,MAAMK;QACNF,UAAU;IACZ;IACAM,eAAe;QACbT,MAAMU;QACNC,SAAS;QACTR,UAAU;IACZ;IACAS,MAAM;QACJZ,MAAMK;QACNF,UAAU;IACZ;IACAU,QAAQ;QACNb,MAAMK;QACNF,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMK;QACNF,UAAU;IACZ;IACAY,QAAQ;QACNf,MAAMU;QACNP,UAAU;IACZ;IACAa,MAAM;QACJhB,MAAMU;QACNP,UAAU;IACZ;IACAc,MAAM;QACJjB,MAAMO;QACNJ,UAAU;IACZ;IACAe,YAAY;QACVlB,MAAMU;QACNP,UAAU;IACZ;IACAH,MAAM;QACJA,MAAMK;QACNF,UAAU;IACZ;IACAgB,UAAU;QACRnB,MAAMoB,MAAMf;QACZF,UAAU;IACZ;AACF;AAEO,MAAMP,cAAcyB,IAAAA,eAAK,EAAC,eAAexB"}

package/dist/models/index.js

@@ -27,6 +27,9 @@ _export(exports, {
     Printer: function() {
         return _Printer.Printer;
     },
+    PrinterFile: function() {
+        return _PrinterFile.PrinterFile;
+    },
     RefreshToken: function() {
         return _RefreshToken.RefreshToken;
     },
@@ -50,5 +53,6 @@ const _PrintCompletion = require("./PrintCompletion");
 const _RefreshToken = require("./Auth/RefreshToken");
 const _CameraStream = require("./CameraStream");
 const _CustomGcode = require("./CustomGcode");
+const _PrinterFile = require("./PrinterFile");
 
 //# sourceMappingURL=index.js.map

package/dist/models/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/index.ts"],"names":["CameraStream","CustomGcode","Floor","Permission","PrintCompletion","Printer","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;IAWuGA,YAAY;eAAZA,0BAAY;;IAAzEC,WAAW;eAAXA,wBAAW;;IAAnCC,KAAK;eAALA,YAAK;;IAAsDC,UAAU;eAAVA,sBAAU;;IAA9DC,eAAe;eAAfA,gCAAe;;IAA/BC,OAAO;eAAPA,gBAAO;;IAAyEC,YAAY;eAAZA,0BAAY;;IAA9BC,IAAI;eAAJA,UAAI;;IAApBC,QAAQ;eAARA,kBAAQ;;IAAEC,IAAI;eAAJA,UAAI;;;yBAX7C;uBACF;0BACG;sBACJ;sBACA;4BACM;iCACK;8BACH;8BACA;6BACD"}
+{"version":3,"sources":["../../src/models/index.ts"],"names":["CameraStream","CustomGcode","Floor","Permission","PrintCompletion","Printer","PrinterFile","RefreshToken","Role","Settings","User"],"mappings":";;;;;;;;;;;IAuBEA,YAAY;eAAZA,0BAAY;;IANZC,WAAW;eAAXA,wBAAW;;IAFXC,KAAK;eAALA,YAAK;;IAMLC,UAAU;eAAVA,sBAAU;;IALVC,eAAe;eAAfA,gCAAe;;IAHfC,OAAO;eAAPA,gBAAO;;IACPC,WAAW;eAAXA,wBAAW;;IAQXC,YAAY;eAAZA,0BAAY;;IAFZC,IAAI;eAAJA,UAAI;;IAFJC,QAAQ;eAARA,kBAAQ;;IACRC,IAAI;eAAJA,UAAI;;;yBAnBkB;uBACF;0BACG;sBACJ;sBACA;4BACM;iCACK;8BACH;8BACA;6BACD;6BACA"}

package/dist/mongo-migrations/20231202183902-printer-files-simpler.js

@@ -0,0 +1,41 @@
+"use strict";
+module.exports = {
+    async up (db, client) {
+        const session = client.startSession();
+        try {
+            await session.withTransaction(async ()=>{
+                const dbCollection = db.collection("printers");
+                await dbCollection.updateMany({}, {
+                    $set: {
+                        fileList: []
+                    }
+                });
+            });
+        } catch (e) {
+            console.log("Error executing up migration", e);
+            throw e;
+        } finally{
+            await session.endSession();
+        }
+    },
+    async down (db, client) {
+        const session = client.startSession();
+        try {
+            await session.withTransaction(async ()=>{
+                const dbCollection = db.collection("printers");
+                await dbCollection.updateMany({}, {
+                    $set: {
+                        fileList: {}
+                    }
+                });
+            });
+        } catch (e) {
+            console.log("Error executing down migration", e);
+            throw e;
+        } finally{
+            await session.endSession();
+        }
+    }
+};
+
+//# sourceMappingURL=20231202183902-printer-files-simpler.js.map

package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/mongo-migrations/20231202183902-printer-files-simpler.ts"],"names":["module","exports","up","db","client","session","startSession","withTransaction","dbCollection","collection","updateMany","$set","fileList","e","console","log","endSession","down"],"mappings":";AAAAA,OAAOC,OAAO,GAAG;IACf,MAAMC,IAAGC,EAAE,EAAEC,MAAM;QACjB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YACF,MAAMD,QAAQE,eAAe,CAAC;gBAC5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,EAAE;oBAAC;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,gCAAgCF;YAC5C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;IAEA,MAAMC,MAAKd,EAAE,EAAEC,MAAM;QACnB,MAAMC,UAAUD,OAAOE,YAAY;QACnC,IAAI;YAEF,MAAMD,QAAQE,eAAe,CAAC;gBAE5B,MAAMC,eAAeL,GAAGM,UAAU,CAAC;gBACnC,MAAMD,aAAaE,UAAU,CAAC,CAAC,GAAG;oBAAEC,MAAM;wBAAEC,UAAU,CAAC;oBAAE;gBAAE;YAC7D;QACF,EAAE,OAAOC,GAAG;YACVC,QAAQC,GAAG,CAAC,kCAAkCF;YAC9C,MAAMA;QACR,SAAU;YACR,MAAMR,QAAQW,UAAU;QAC1B;IACF;AACF"}

package/dist/server.constants.js

@@ -63,7 +63,7 @@ const AppConstants = {
     serverRepoName: "fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.4.4",
+    defaultClientMinimum: "1.5.0-rc3",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/services/core/multer.service.js

@@ -63,12 +63,12 @@ class MulterService {
                 return reject(err);
             });
             fileStream.on("finish", async ()=>{
-                return resolve();
+                return resolve(null);
             });
             fileStream.on("close", async ()=>{
-                return resolve();
+                return resolve(null);
             });
-            resolve();
+            resolve(null);
         });
     }
     getMulterGCodeFileFilter(storeAsFile = true) {

package/dist/services/core/multer.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClient","constructor","getNewestFile","collection","dirPath","collectionPath","files","orderRecentFiles","latestFile","length","undefined","join","file","clearUploadsFolder","fileStoragePath","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","readdirSync","withFileTypes","filter","item","isDirectory","map","name","unlink","err","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","res","get","Promise","resolve","reject","write","data","on","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","multerLoadFileAsync","req","fileExtension","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extension","callback","ext","extname","originalname","Error","startTrackingSession","multerFile","addUploadTracker","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}