@fdm-monster/server 1.5.4 → 1.6.0-rc2

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,85 @@
+"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
+    },
+    customData: {
+        type: Object,
+        required: true
+    }
+});
+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","customData","model"],"mappings":";;;;;;;;;;;IAsFaA,WAAW;eAAXA;;IAhEAC,iBAAiB;eAAjBA;;;0BAtBiB;AAsBvB,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;IACAkB,YAAY;QACVrB,MAAMU;QACNP,UAAU;IACZ;AACF;AAEO,MAAMP,cAAc0B,IAAAA,eAAK,EAAC,eAAezB"}

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-rc4",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",
@@ -72,6 +72,8 @@ const AppConstants = {
     defaultSocketThrottleRate: 1,
     debugSocketStatesKey: "DEBUG_SOCKET_STATES",
     defaultDebugSocketStates: "false",
+    debugFileWritePrinterStatesKey: "DEBUG_FILE_WRITE_PRINTER_STATES",
+    defaultDebugFileWritePrinterStates: "false",
     enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
     enableMqttAutoDiscoveryDefault: "false",
     mqttUrlToken: "MQTT_HOST",
@@ -83,7 +85,7 @@ const AppConstants = {
     sentryCustomDsnToken: "SENTRY_CUSTOM_DSN",
     sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
     debugRoutesKey: "DEBUG_ROUTES",
-    enableExperimentalTypeormKey: "ENABLE_EXPERIMENTAL_TYPEORM",
+    ENABLE_EXPERIMENTAL_TYPEORM: "ENABLE_EXPERIMENTAL_TYPEORM",
     enableExperimentalTypeormDefault: "false"
 };
 

package/dist/server.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","enableExperimentalTypeormKey","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,8BAA8B;IAC9BC,kCAAkC;AACpC"}
+{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}

package/dist/server.core.js

@@ -18,6 +18,10 @@ const _container = require("./container");
 const _database = require("./middleware/database");
 const _globalmiddleware = require("./middleware/global.middleware");
 const _passport1 = require("./middleware/passport");
+const _serverconstants = require("./server.constants");
+const _path = require("path");
+const _fsutils = require("./utils/fs.utils");
+const _envutils = require("./utils/env.utils");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -66,7 +70,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 async function setupServer() {
     const httpServer = (0, _express.default)();
-    const container = (0, _container.configureContainer)();
+    const experimentalTypeormEnabled = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_TYPEORM, _serverconstants.AppConstants.enableExperimentalTypeormDefault) === "true";
+    if (experimentalTypeormEnabled) {
+        const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] || "./database";
+        (0, _fsutils.ensureDirExists)((0, _path.join)((0, _fsutils.superRootPath)(), dbFolder));
+    }
+    const container = (0, _container.configureContainer)(experimentalTypeormEnabled);
     (0, _passport1.initializePassportStrategies)(_passport.default, container);
     httpServer.use((0, _cors.default)({
         origin: "*",

package/dist/server.core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAWsBA;;;eAAAA;;;mDAXoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEtC,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,YAAYC,IAAAA,6BAAkB;IACpCC,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCF,WACGM,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLxB;QACAE;IACF;AACF"}
+{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;mDAfoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLpC;QACAc;IACF;AACF"}

package/dist/server.host.js

@@ -30,18 +30,22 @@ class ServerHost {
     socketIoGateway;
     appInstance = null;
     configService;
+    typeormService;
     isTypeormMode;
     logger;
-    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, isTypeormMode }){
+    constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode }){
         this.logger = loggerFactory(ServerHost.name);
         this.bootTask = bootTask;
         this.taskManagerService = taskManagerService;
         this.socketIoGateway = socketIoGateway;
         this.configService = configService;
+        this.typeormService = typeormService;
         this.isTypeormMode = isTypeormMode;
     }
     async boot(app, quick_boot = false, listenRequests = true) {
-        _mongoose.default.set("strictQuery", true);
+        if (!this.isTypeormMode) {
+            _mongoose.default.set("strictQuery", true);
+        }
         this.appInstance = app;
         this.serveControllerRoutes(this.appInstance);
         if (!quick_boot) {
@@ -50,7 +54,11 @@ class ServerHost {
         if (listenRequests) return this.httpListen();
     }
     hasConnected() {
-        return _mongoose.default.connections[0].readyState;
+        if (this.isTypeormMode) {
+            return this.typeormService.hasConnected();
+        } else {
+            return _mongoose.default.connections[0].readyState;
+        }
     }
     serveControllerRoutes(app) {
         const routePath = "./controllers";

package/dist/server.host.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
+{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}

package/dist/services/batch-call.service.js

@@ -8,6 +8,12 @@ Object.defineProperty(exports, "BatchCallService", {
         return BatchCallService;
     }
 });
+var ReprintState;
+(function(ReprintState) {
+    ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
+    ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
+    ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
+})(ReprintState || (ReprintState = {}));
 class BatchCallService {
     octoPrintApiService;
     printerSocketStore;
@@ -26,7 +32,7 @@ class BatchCallService {
     async batchTogglePrintersEnabled(printerIds, enabled) {
         const promises = [];
         for (const printerId of printerIds){
-            let promise = Promise.resolve();
+            let promise;
             const printerDto = await this.printerCache.getValue(printerId);
             if (!printerDto) continue;
             const time = Date.now();
@@ -98,30 +104,47 @@ class BatchCallService {
         }
         return await Promise.all(promises);
     }
-    async batchReprintCalls(printerIds) {
+    async getBatchPrinterReprintFile(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
-            let reprintPath = await this.printerEventsCache.getPrinterSocketEvents(printerId)?.current?.job?.file?.path;
-            if (!reprintPath?.length) {
-                const files = await this.printerFilesStore.getFiles(printerId)?.files;
-                if (files?.length) {
-                    files.sort((f1, f2)=>{
-                        return f1.date < f2.date ? 1 : -1;
+            const promise = new Promise(async (resolve, _)=>{
+                try {
+                    const login = await this.printerCache.getLoginDtoAsync(printerId);
+                    const files = (await this.octoPrintApiService.getLocalFiles(login, true)).filter((f)=>f?.prints?.last?.date);
+                    const connected = await this.octoPrintApiService.getConnection(login);
+                    const connectionState = connected.current?.state;
+                    if (files?.length == 0) {
+                        return resolve({
+                            connectionState,
+                            printerId,
+                            reprintState: 1
+                        });
+                    }
+                    return resolve({
+                        connectionState,
+                        file: files[0],
+                        printerId,
+                        reprintState: 2
+                    });
+                } catch (e) {
+                    return resolve({
+                        connectionState: null,
+                        printerId,
+                        reprintState: 0
                     });
-                    reprintPath = files[0].path;
-                }
-                if (!files?.length) {
-                    promises.push(Promise.resolve({
-                        failure: true,
-                        error: "No file to reprint",
-                        printerId
-                    }));
-                    continue;
                 }
-            }
+            });
+            promises.push(promise);
+        }
+        return await Promise.all(promises);
+    }
+    async batchReprintCalls(printerIdFileList) {
+        const promises = [];
+        for (const printerIdFile of printerIdFileList){
+            const { printerId, path } = printerIdFile;
+            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoPrintApiService.selectPrintFile(printerLogin, reprintPath, true).then(()=>{
+            const promise = this.octoPrintApiService.selectPrintFile(printerLogin, path, true).then(()=>{
                 return {
                     success: true,
                     printerId,

package/dist/services/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","Promise","resolve","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","all","batchConnectSocket","reconnectOctoPrint","batchConnectUsb","printerLogin","getLoginDtoAsync","command","connectCommand","sendConnectionCommand","batchReprintCalls","reprintPath","getPrinterSocketEvents","current","job","file","path","files","getFiles","sort","f1","f2","date","selectPrintFile"],"mappings":"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"}
+{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","batchConnectUsb","printerLogin","getLoginDtoAsync","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":"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"}