@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc2

package/.yarnrc.yml

@@ -0,0 +1,4 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.0.cjs
+httpTimeout: 1000000

package/README.md

@@ -40,7 +40,7 @@ This server is has been battle-tested in the field for 100+ printers, so give it
 - Import printers from OctoFarm
 - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
 
-![Image](docs/images/server-running.png)
+![docs/images/server-running.png](https://github.com/fdm-monster/fdm-monster-docs/blob/main/docs/images/server-running.png)
 _The FDM Monster grid after placing one OctoPrint instance._
 
 ## Getting started

package/dist/consoles/sqlite-torm.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _serverconstants = require("../server.constants");
+const _datasource = require("../data-source");
+const _printerentity = require("../entities/printer.entity");
+process.env[_serverconstants.AppConstants.DATABASE_FILE] = ":memory:";
+async function main() {
+    console.log("Running test sqlite with TypeORM");
+    const ds = await _datasource.AppDataSource.initialize();
+    const printerRepo = ds.getRepository(_printerentity.Printer);
+    const entity = printerRepo.create({
+        name: "Default Printer",
+        printerUrl: "http://localhost:3000",
+        apiKey: "1234567890"
+    });
+    await ds.transaction(async (manager)=>{
+        const result = await manager.save(entity);
+        const printer = await printerRepo.findOneByOrFail({
+            id: result.id
+        });
+        console.log("Printer found", printer.id, printer.name, printer.printerUrl, printer.apiKey);
+    });
+}
+main().then(()=>{
+    console.log("Done!");
+    process.exit(0);
+});
+
+//# sourceMappingURL=sqlite-torm.js.map

package/dist/consoles/sqlite-torm.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/sqlite-torm.ts"],"names":["process","env","AppConstants","DATABASE_FILE","main","console","log","ds","AppDataSource","initialize","printerRepo","getRepository","Printer","entity","create","name","printerUrl","apiKey","transaction","manager","result","save","printer","findOneByOrFail","id","then","exit"],"mappings":";;;;iCAA6B;4BAIC;+BACN;AAHxBA,QAAQC,GAAG,CAACC,6BAAY,CAACC,aAAa,CAAC,GAAG;AAM1C,eAAeC;IACbC,QAAQC,GAAG,CAAC;IAEZ,MAAMC,KAAK,MAAMC,yBAAa,CAACC,UAAU;IAEzC,MAAMC,cAAcH,GAAGI,aAAa,CAACC,sBAAO;IAC5C,MAAMC,SAASH,YAAYI,MAAM,CAAC;QAChCC,MAAM;QACNC,YAAY;QACZC,QAAQ;IACV;IAEA,MAAMV,GAAGW,WAAW,CAAC,OAAOC;QAC1B,MAAMC,SAAS,MAAMD,QAAQE,IAAI,CAACR;QAClC,MAAMS,UAAU,MAAMZ,YAAYa,eAAe,CAAC;YAAEC,IAAIJ,OAAOI,EAAE;QAAC;QAClEnB,QAAQC,GAAG,CAAC,iBAAiBgB,QAAQE,EAAE,EAAEF,QAAQP,IAAI,EAAEO,QAAQN,UAAU,EAAEM,QAAQL,MAAM;IAC3F;AACF;AAEAb,OAAOqB,IAAI,CAAC;IACVpB,QAAQC,GAAG,CAAC;IAEZN,QAAQ0B,IAAI,CAAC;AACf"}

package/dist/consoles/typeorm-generate.js

@@ -0,0 +1,194 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _PlatformTools = require("typeorm/platform/PlatformTools");
+const _CommandUtils = require("typeorm/commands/CommandUtils");
+const _path = _interop_require_default(require("path"));
+const _chalk = _interop_require_default(require("chalk"));
+const _StringUtils = require("typeorm/util/StringUtils");
+const _sqlFormatter = require("@sqltools/formatter/lib/sqlFormatter");
+const _readline = _interop_require_wildcard(require("readline"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function _getRequireWildcardCache(nodeInterop) {
+    if (typeof WeakMap !== "function") return null;
+    var cacheBabelInterop = new WeakMap();
+    var cacheNodeInterop = new WeakMap();
+    return (_getRequireWildcardCache = function(nodeInterop) {
+        return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
+    })(nodeInterop);
+}
+function _interop_require_wildcard(obj, nodeInterop) {
+    if (!nodeInterop && obj && obj.__esModule) {
+        return obj;
+    }
+    if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
+        return {
+            default: obj
+        };
+    }
+    var cache = _getRequireWildcardCache(nodeInterop);
+    if (cache && cache.has(obj)) {
+        return cache.get(obj);
+    }
+    var newObj = {
+        __proto__: null
+    };
+    var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
+    for(var key in obj){
+        if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
+            var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
+            if (desc && (desc.get || desc.set)) {
+                Object.defineProperty(newObj, key, desc);
+            } else {
+                newObj[key] = obj[key];
+            }
+        }
+    }
+    newObj.default = obj;
+    if (cache) {
+        cache.set(obj, newObj);
+    }
+    return newObj;
+}
+function queryParams(parameters) {
+    if (!parameters || !parameters.length) {
+        return "";
+    }
+    return `, ${JSON.stringify(parameters)}`;
+}
+function getTemplate(name, timestamp, upSqls, downSqls) {
+    const migrationName = `${(0, _StringUtils.camelCase)(name, true)}${timestamp}`;
+    return `import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class ${migrationName} implements MigrationInterface {
+    name = '${migrationName}'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+${upSqls.join(`
+`)}
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+${downSqls.join(`
+`)}
+    }
+
+}
+`;
+}
+function getJavascriptTemplate(name, timestamp, upSqls, downSqls) {
+    const migrationName = `${(0, _StringUtils.camelCase)(name, true)}${timestamp}`;
+    return `const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class ${migrationName} {
+    name = '${migrationName}'
+
+    async up(queryRunner) {
+${upSqls.join(`
+`)}
+    }
+
+    async down(queryRunner) {
+${downSqls.join(`
+`)}
+    }
+}
+`;
+}
+function prettifyQuery(query) {
+    const formattedQuery = (0, _sqlFormatter.format)(query, {
+        indent: "    "
+    });
+    return "\n" + formattedQuery.replace(/^/gm, "            ") + "\n        ";
+}
+async function confirm(question, hint) {
+    const line = _readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    return new Promise((resolve)=>{
+        line.question(question, (response)=>{
+            line.close();
+            resolve(response);
+        });
+        line.write(hint);
+    });
+}
+async function main() {
+    const timestamp = _CommandUtils.CommandUtils.getTimestamp(Date.now());
+    const extension = ".ts";
+    let dataSource = undefined;
+    try {
+        dataSource = await _CommandUtils.CommandUtils.loadDataSource(_path.default.resolve(process.cwd(), "dist/data-source.js"));
+        dataSource.setOptions({
+            synchronize: false,
+            migrationsRun: false,
+            dropSchema: false,
+            logging: false
+        });
+        await dataSource.initialize();
+        const hasPendingMigrations = await dataSource.showMigrations();
+        if (hasPendingMigrations) {
+            console.log(_chalk.default.yellow(`ATTENTION: you have pending migrations (${_chalk.default.blue(hasPendingMigrations)}). Running those first, before generating a new migration.`));
+            await dataSource.runMigrations({
+                transaction: "each"
+            });
+            console.log(_chalk.default.green(`Migrations successfully executed.`));
+        }
+        const upSqls = [], downSqls = [];
+        try {
+            const sqlInMemory = await dataSource.driver.createSchemaBuilder().log();
+            if (true) {
+                sqlInMemory.upQueries.forEach((upQuery)=>{
+                    upQuery.query = prettifyQuery(upQuery.query);
+                });
+                sqlInMemory.downQueries.forEach((downQuery)=>{
+                    downQuery.query = prettifyQuery(downQuery.query);
+                });
+            }
+            sqlInMemory.upQueries.forEach((upQuery)=>{
+                upSqls.push("        await queryRunner.query(`" + upQuery.query.replace(new RegExp("`", "g"), "\\`") + "`" + queryParams(upQuery.parameters) + ");");
+            });
+            sqlInMemory.downQueries.forEach((downQuery)=>{
+                downSqls.push("        await queryRunner.query(`" + downQuery.query.replace(new RegExp("`", "g"), "\\`") + "`" + queryParams(downQuery.parameters) + ");");
+            });
+        } finally{
+            await dataSource.destroy();
+        }
+        if (!upSqls.length) {
+            console.log(_chalk.default.green(`No changes in database schema were found`));
+            process.exit(0);
+        }
+        console.log(_chalk.default.green(`Migration ready to be saved...`));
+        console.log(_chalk.default.blue(upSqls.map((s)=>s).join("\n")));
+        let name;
+        while(!name){
+            name = (await confirm("Please provide a name for the migration: ", "Change"))?.trim();
+            if (name) break;
+            console.log(_chalk.default.red(`Name is required, try again`));
+            process.exit(1);
+        }
+        const fullPath = _path.default.resolve(process.cwd(), `src/migrations/${name}`);
+        const filename = timestamp + "-" + _path.default.basename(fullPath) + extension;
+        const fileContent = false ? getJavascriptTemplate(_path.default.basename(fullPath), timestamp, upSqls, downSqls.reverse()) : getTemplate(_path.default.basename(fullPath), timestamp, upSqls, downSqls.reverse());
+        const migrationFileName = _path.default.dirname(fullPath) + "/" + filename;
+        await _CommandUtils.CommandUtils.createFile(migrationFileName, fileContent);
+        console.log(_chalk.default.green(`Migration ${_chalk.default.blue(migrationFileName)} has been generated successfully.`));
+    } catch (err) {
+        _PlatformTools.PlatformTools.logCmdErr("Error during migration generation:", err);
+        process.exit(1);
+    }
+}
+let start = new Date().getTime();
+main().then(()=>{
+    let end = new Date().getTime();
+    console.log("done", end - start, "ms");
+    process.exit(0);
+});
+
+//# sourceMappingURL=typeorm-generate.js.map

package/dist/consoles/typeorm-generate.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/typeorm-generate.ts"],"names":["queryParams","parameters","length","JSON","stringify","getTemplate","name","timestamp","upSqls","downSqls","migrationName","camelCase","join","getJavascriptTemplate","prettifyQuery","query","formattedQuery","format","indent","replace","confirm","question","hint","line","readline","createInterface","input","process","stdin","output","stdout","Promise","resolve","response","close","write","main","CommandUtils","getTimestamp","Date","now","extension","dataSource","undefined","loadDataSource","path","cwd","setOptions","synchronize","migrationsRun","dropSchema","logging","initialize","hasPendingMigrations","showMigrations","console","log","chalk","yellow","blue","runMigrations","transaction","green","sqlInMemory","driver","createSchemaBuilder","upQueries","forEach","upQuery","downQueries","downQuery","push","RegExp","destroy","exit","map","s","trim","red","fullPath","filename","basename","fileContent","reverse","migrationFileName","dirname","createFile","err","PlatformTools","logCmdErr","start","getTime","then","end"],"mappings":"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"}

package/dist/consoles/typeorm-migrate.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _PlatformTools = require("typeorm/platform/PlatformTools");
+const _CommandUtils = require("typeorm/commands/CommandUtils");
+const _path = _interop_require_default(require("path"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function main() {
+    let dataSource = undefined;
+    try {
+        dataSource = await _CommandUtils.CommandUtils.loadDataSource(_path.default.resolve(process.cwd(), "dist/data-source.js"));
+        dataSource.setOptions({
+            subscribers: [],
+            synchronize: false,
+            migrationsRun: false,
+            dropSchema: false,
+            logging: [
+                "query",
+                "error",
+                "schema"
+            ]
+        });
+        await dataSource.initialize();
+        const options = {
+            transaction: dataSource.options.migrationsTransactionMode ?? "all"
+        };
+        options.transaction = "all";
+        await dataSource.runMigrations(options);
+        await dataSource.destroy();
+    } catch (err) {
+        _PlatformTools.PlatformTools.logCmdErr("Error during migration run:", err);
+        if (dataSource && dataSource.isInitialized) await dataSource.destroy();
+        process.exit(1);
+    }
+}
+let start = new Date().getTime();
+main().then(()=>{
+    let end = new Date().getTime();
+    console.log("done", end - start, "ms");
+    process.exit(0);
+});
+
+//# sourceMappingURL=typeorm-migrate.js.map

package/dist/consoles/typeorm-migrate.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/typeorm-migrate.ts"],"names":["main","dataSource","undefined","CommandUtils","loadDataSource","path","resolve","process","cwd","setOptions","subscribers","synchronize","migrationsRun","dropSchema","logging","initialize","options","transaction","migrationsTransactionMode","runMigrations","destroy","err","PlatformTools","logCmdErr","isInitialized","exit","start","Date","getTime","then","end","console","log"],"mappings":";;;;+BAC8B;8BACD;+CACZ;;;;;;AAEjB,eAAeA;IACb,IAAIC,aAAqCC;IACzC,IAAI;QACFD,aAAa,MAAME,0BAAY,CAACC,cAAc,CAACC,aAAI,CAACC,OAAO,CAACC,QAAQC,GAAG,IAAI;QAC3EP,WAAWQ,UAAU,CAAC;YACpBC,aAAa,EAAE;YACfC,aAAa;YACbC,eAAe;YACfC,YAAY;YACZC,SAAS;gBAAC;gBAAS;gBAAS;aAAS;QACvC;QACA,MAAMb,WAAWc,UAAU;QAE3B,MAAMC,UAAU;YACdC,aAAahB,WAAWe,OAAO,CAACE,yBAAyB,IAAK;QAEhE;QACAF,QAAQC,WAAW,GAAG;QAEtB,MAAMhB,WAAWkB,aAAa,CAACH;QAC/B,MAAMf,WAAWmB,OAAO;IAC1B,EAAE,OAAOC,KAAK;QACZC,4BAAa,CAACC,SAAS,CAAC,+BAA+BF;QAEvD,IAAIpB,cAAcA,WAAWuB,aAAa,EAAE,MAAMvB,WAAWmB,OAAO;QACpEb,QAAQkB,IAAI,CAAC;IACf;AACF;AAEA,IAAIC,QAAQ,IAAIC,OAAOC,OAAO;AAC9B5B,OAAO6B,IAAI,CAAC;IACV,IAAIC,MAAM,IAAIH,OAAOC,OAAO;IAC5BG,QAAQC,GAAG,CAAC,QAAQF,MAAMJ,OAAO;IAGjCnB,QAAQkB,IAAI,CAAC;AACf"}

package/dist/container.js

@@ -2,9 +2,17 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "configureContainer", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    config: function() {
+        return config;
+    },
+    configureContainer: function() {
         return configureContainer;
     }
 });
@@ -15,6 +23,7 @@ const _awilix = require("awilix");
 const _toadscheduler = require("toad-scheduler");
 const _containertokens = require("./container.tokens");
 const _printerservice = require("./services/printer.service");
+const _printerservice1 = require("./services/orm/printer.service");
 const _settingsstore = require("./state/settings.store");
 const _settingsservice = require("./services/settings.service");
 const _serverreleaseservice = require("./services/core/server-release.service");
@@ -30,6 +39,7 @@ const _printerfilesstore = require("./state/printer-files.store");
 const _eventemitter = require("./handlers/event-emitter");
 const _serverconstants = require("./server.constants");
 const _printerfilesservice = require("./services/printer-files.service");
+const _printerfilesservice1 = require("./services/orm/printer-files.service");
 const _softwareupdatetask = require("./tasks/software-update.task");
 const _loggerfactory = require("./handlers/logger-factory");
 const _multerservice = require("./services/core/multer.service");
@@ -37,12 +47,16 @@ const _fileuploadtrackercache = require("./state/file-upload-tracker.cache");
 const _serverhost = require("./server.host");
 const _boottask = require("./tasks/boot.task");
 const _userservice = require("./services/authentication/user.service");
+const _userservice1 = require("./services/orm/user.service");
 const _roleservice = require("./services/authentication/role.service");
+const _roleservice1 = require("./services/orm/role.service");
 const _tasks = require("./tasks");
 const _permissionservice = require("./services/authentication/permission.service");
+const _permissionservice1 = require("./services/orm/permission.service");
 const _printerfilecleantask = require("./tasks/printer-file-clean.task");
 const _authorizationconstants = require("./constants/authorization.constants");
 const _customgcodeservice = require("./services/custom-gcode.service");
+const _customgcodeservice1 = require("./services/orm/custom-gcode.service");
 const _printerwebsocketrestoretask = require("./tasks/printer-websocket-restore.task");
 const _pluginfirmwareupdateservice = require("./services/octoprint/plugin-firmware-update.service");
 const _pluginrepositorycache = require("./services/octoprint/plugin-repository.cache");
@@ -51,6 +65,7 @@ const _influxdbv2baseservice = require("./services/influxdb-v2/influx-db-v2-base
 const _configservice = require("./services/core/config.service");
 const _printcompletionsocketiotask = require("./tasks/print-completion.socketio.task");
 const _printcompletionservice = require("./services/print-completion.service");
+const _printcompletionservice1 = require("./services/orm/print-completion.service");
 const _socketiogateway = require("./state/socket-io.gateway");
 const _clientbundleservice = require("./services/core/client-bundle.service");
 const _floorservice = require("./services/floor.service");
@@ -66,38 +81,61 @@ const _testprintersocketstore = require("./state/test-printer-socket.store");
 const _printereventscache = require("./state/printer-events.cache");
 const _logsmanagerservice = require("./services/core/logs-manager.service");
 const _camerastreamservice = require("./services/camera-stream.service");
+const _camerastreamservice1 = require("./services/orm/camera-stream.service");
 const _jwtservice = require("./services/authentication/jwt.service");
 const _authservice = require("./services/authentication/auth.service");
 const _refreshtokenservice = require("./services/authentication/refresh-token.service");
+const _pluginthrottling = require("@octokit/plugin-throttling");
+const _printerstateupdatepolltask = require("./tasks/printer-state-update-poll.task");
+const _printerconnectioncache = require("./state/printer-connection.cache");
+const _refreshtokenservice1 = require("./services/orm/refresh-token.service");
+const _settingsservice1 = require("./services/orm/settings.service");
+const _floorservice1 = require("./services/orm/floor.service");
+const _floorpositionservice = require("./services/orm/floor-position.service");
+const _typeormservice = require("./services/typeorm/typeorm.service");
+const _userroleservice = require("./services/orm/user-role.service");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function configureContainer() {
+function config(key, experimentalMode, serviceTypeorm, serviceMongoose) {
+    return {
+        [key]: experimentalMode ? serviceTypeorm : serviceMongoose
+    };
+}
+function configureContainer(isSqlite = false) {
     const container = (0, _awilix.createContainer)({
         injectionMode: _awilix.InjectionMode.PROXY
     });
-    const isSqlite = false;
     const di = _containertokens.DITokens;
     container.register({
         [di.serverTasks]: (0, _awilix.asValue)(_tasks.ServerTasks),
         [di.isTypeormMode]: (0, _awilix.asValue)(isSqlite),
-        [di.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
+        [di.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.GUEST),
         [di.appDefaultRoleNoLogin]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
         [di.serverVersion]: (0, _awilix.asFunction)(()=>{
             return process.env[_serverconstants.AppConstants.VERSION_KEY];
         }),
         [di.socketFactory]: (0, _awilix.asClass)(_socketfactory.SocketFactory).transient(),
+        ...config(di.typeormService, isSqlite, (0, _awilix.asClass)(_typeormservice.TypeormService).singleton(), (0, _awilix.asValue)(null)),
+        ...config(di.settingsService, isSqlite, (0, _awilix.asClass)(_settingsservice1.SettingsService2), (0, _awilix.asClass)(_settingsservice.SettingsService)),
+        ...config(di.floorService, isSqlite, (0, _awilix.asClass)(_floorservice1.FloorService).singleton(), (0, _awilix.asClass)(_floorservice.FloorService).singleton()),
+        ...config(di.floorPositionService, isSqlite, (0, _awilix.asClass)(_floorpositionservice.FloorPositionService).singleton(), (0, _awilix.asValue)(null)),
+        ...config(di.cameraStreamService, isSqlite, (0, _awilix.asClass)(_camerastreamservice1.CameraStreamService).singleton(), (0, _awilix.asClass)(_camerastreamservice.CameraStreamService).singleton()),
+        ...config(di.printerService, isSqlite, (0, _awilix.asClass)(_printerservice1.PrinterService), (0, _awilix.asClass)(_printerservice.PrinterService)),
+        ...config(di.printerFilesService, isSqlite, (0, _awilix.asClass)(_printerfilesservice1.PrinterFilesService), (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService)),
+        ...config(di.refreshTokenService, isSqlite, (0, _awilix.asClass)(_refreshtokenservice1.RefreshTokenService).singleton(), (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton()),
+        ...config(di.userService, isSqlite, (0, _awilix.asClass)(_userservice1.UserService).singleton(), (0, _awilix.asClass)(_userservice.UserService).singleton()),
+        ...config(di.userRoleService, isSqlite, (0, _awilix.asClass)(_userroleservice.UserRoleService).singleton(), (0, _awilix.asValue)(null)),
+        ...config(di.roleService, isSqlite, (0, _awilix.asClass)(_roleservice1.RoleService).singleton(), (0, _awilix.asClass)(_roleservice.RoleService).singleton()),
+        ...config(di.permissionService, isSqlite, (0, _awilix.asClass)(_permissionservice1.PermissionService).singleton(), (0, _awilix.asClass)(_permissionservice.PermissionService).singleton()),
+        ...config(di.customGCodeService, isSqlite, (0, _awilix.asClass)(_customgcodeservice1.CustomGcodeService).singleton(), (0, _awilix.asClass)(_customgcodeservice.CustomGcodeService).singleton()),
+        ...config(di.printCompletionService, isSqlite, (0, _awilix.asClass)(_printcompletionservice1.PrintCompletionService).singleton(), (0, _awilix.asClass)(_printcompletionservice.PrintCompletionService).singleton()),
         [di.serverHost]: (0, _awilix.asClass)(_serverhost.ServerHost).singleton(),
         [di.settingsStore]: (0, _awilix.asClass)(_settingsstore.SettingsStore).singleton(),
-        [di.settingsService]: (0, _awilix.asClass)(_settingsservice.SettingsService),
         [di.configService]: (0, _awilix.asClass)(_configservice.ConfigService),
         [di.authService]: (0, _awilix.asClass)(_authservice.AuthService).singleton(),
-        [di.refreshTokenService]: (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton(),
-        [di.userService]: (0, _awilix.asClass)(_userservice.UserService),
-        [di.roleService]: (0, _awilix.asClass)(_roleservice.RoleService).singleton(),
-        [di.permissionService]: (0, _awilix.asClass)(_permissionservice.PermissionService).singleton(),
         [di.jwtService]: (0, _awilix.asClass)(_jwtservice.JwtService).singleton(),
         [di.loggerFactory]: (0, _awilix.asFunction)(_loggerfactory.LoggerFactory).transient(),
         [di.taskManagerService]: (0, _awilix.asClass)(_taskmanagerservice.TaskManagerService).singleton(),
@@ -110,8 +148,19 @@ function configureContainer() {
         [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
         [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
             const config = cradle.configService;
-            return new _octokit.Octokit({
-                auth: config.get(_serverconstants.AppConstants.GITHUB_PAT)
+            const CustomOctoKit = _octokit.Octokit.plugin(_pluginthrottling.throttling);
+            return new CustomOctoKit({
+                auth: config.get(_serverconstants.AppConstants.GITHUB_PAT),
+                throttle: {
+                    onRateLimit: (retryAfter, options, octokit, retryCount)=>{
+                        const logger = (0, _loggerfactory.LoggerFactory)()("OctoKitThrottle");
+                        logger.warn(`Request quota exhaustedd for request ${options.method} ${options.url}`);
+                    },
+                    onSecondaryRateLimit: (retryAfter, options, octokit)=>{
+                        const logger = (0, _loggerfactory.LoggerFactory)()("OctoKitThrottle");
+                        logger.warn(`SecondaryRateLimit detected for request ${options.method} ${options.url}`);
+                    }
+                }
             });
         }),
         [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
@@ -123,13 +172,8 @@ function configureContainer() {
         })),
         [di.socketIoGateway]: (0, _awilix.asClass)(_socketiogateway.SocketIoGateway).singleton(),
         [di.multerService]: (0, _awilix.asClass)(_multerservice.MulterService).singleton(),
-        [di.printerService]: (0, _awilix.asClass)(_printerservice.PrinterService),
-        [di.printerFilesService]: (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService),
-        [di.floorService]: (0, _awilix.asClass)(_floorservice.FloorService).singleton(),
         [di.yamlService]: (0, _awilix.asClass)(_yamlservice.YamlService),
-        [di.printCompletionService]: (0, _awilix.asClass)(_printcompletionservice.PrintCompletionService).singleton(),
         [di.octoPrintApiService]: (0, _awilix.asClass)(_octoprintapiservice.OctoPrintApiService).singleton(),
-        [di.cameraStreamService]: (0, _awilix.asClass)(_camerastreamservice.CameraStreamService),
         [di.batchCallService]: (0, _awilix.asClass)(_batchcallservice.BatchCallService).singleton(),
         [di.pluginFirmwareUpdateService]: (0, _awilix.asClass)(_pluginfirmwareupdateservice.PluginFirmwareUpdateService).singleton(),
         [di.octoPrintSockIoAdapter]: (0, _awilix.asClass)(_octoprintsockioadapter.OctoPrintSockIoAdapter).transient(),
@@ -139,10 +183,10 @@ function configureContainer() {
         [di.fileUploadTrackerCache]: (0, _awilix.asClass)(_fileuploadtrackercache.FileUploadTrackerCache).singleton(),
         [di.printerFilesStore]: (0, _awilix.asClass)(_printerfilesstore.PrinterFilesStore).singleton(),
         [di.printerCache]: (0, _awilix.asClass)(_printercache.PrinterCache).singleton(),
+        [di.printerConnectionCache]: (0, _awilix.asClass)(_printerconnectioncache.PrinterConnectionCache).singleton(),
         [di.printerEventsCache]: (0, _awilix.asClass)(_printereventscache.PrinterEventsCache).singleton(),
         [di.printerSocketStore]: (0, _awilix.asClass)(_printersocketstore.PrinterSocketStore).singleton(),
         [di.testPrinterSocketStore]: (0, _awilix.asClass)(_testprintersocketstore.TestPrinterSocketStore).singleton(),
-        [di.customGCodeService]: (0, _awilix.asClass)(_customgcodeservice.CustomGcodeService),
         [di.influxDbV2BaseService]: (0, _awilix.asClass)(_influxdbv2baseservice.InfluxDbV2BaseService),
         [di.bootTask]: (0, _awilix.asClass)(_boottask.BootTask),
         [di.softwareUpdateTask]: (0, _awilix.asClass)(_softwareupdatetask.SoftwareUpdateTask),
@@ -151,6 +195,7 @@ function configureContainer() {
         [di.printCompletionSocketIoTask]: (0, _awilix.asClass)(_printcompletionsocketiotask.PrintCompletionSocketIoTask).singleton(),
         [di.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
         [di.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
+        [di.printerStateUpdatePollTask]: (0, _awilix.asClass)(_printerstateupdatepolltask.PrinterStateUpdatePollTask).singleton(),
         [di.printerFileCleanTask]: (0, _awilix.asClass)(_printerfilecleantask.PrinterFileCleanTask).singleton()
     });
     return container;

package/dist/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","PROXY","isSqlite","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","ADMIN","appDefaultRoleNoLogin","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","serverHost","ServerHost","singleton","settingsStore","SettingsStore","settingsService","SettingsService","configService","ConfigService","authService","AuthService","refreshTokenService","RefreshTokenService","userService","UserService","roleService","RoleService","permissionService","PermissionService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","config","Octokit","auth","get","GITHUB_PAT","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","printerService","PrinterService","printerFilesService","PrinterFilesService","floorService","FloorService","yamlService","YamlService","printCompletionService","PrintCompletionService","octoPrintApiService","OctoPrintApiService","cameraStreamService","CameraStreamService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","customGCodeService","CustomGcodeService","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":";;;;+BA8DgBA;;;eAAAA;;;gDA9DE;oDACI;yBACE;wBACqD;+BAC/C;iCACL;gCACM;+BACD;iCACE;sCACK;oCACF;qCACC;+BACN;2BACJ;sCACW;8BACR;qCACO;+BACN;mCACI;8BACI;iCACT;qCACO;oCACD;+BACL;+BACA;wCACS;4BACZ;0BACF;6BACG;6BACA;uBACA;mCACM;sCACG;wCACf;oCACa;6CACS;6CACA;uCACN;8BACA;uCACA;+BACR;6CACc;wCACL;iCACP;qCACI;8BACP;4BACF;6BACC;kCACK;kCACA;kCACM;wCACA;8BACV;oCACM;wCACI;oCACJ;oCACJ;qCACK;4BACT;6BACC;qCACQ;;;;;;AAE7B,SAASA;IAEd,MAAMC,YAAYC,IAAAA,uBAAe,EAAC;QAChCC,eAAeC,qBAAa,CAACC,KAAK;IACpC;IAEA,MAAMC,WAAW;IACjB,MAAMC,KAAKC,yBAAQ;IAEnBP,UAAUQ,QAAQ,CAAC;QAEjB,CAACF,GAAGG,WAAW,CAAC,EAAEC,IAAAA,eAAO,EAACC,kBAAW;QACrC,CAACL,GAAGM,aAAa,CAAC,EAAEF,IAAAA,eAAO,EAACL;QAE5B,CAACC,GAAGO,cAAc,CAAC,EAAEH,IAAAA,eAAO,EAACI,6BAAK,CAACC,KAAK;QACxC,CAACT,GAAGU,qBAAqB,CAAC,EAAEN,IAAAA,eAAO,EAACI,6BAAK,CAACC,KAAK;QAC/C,CAACT,GAAGW,aAAa,CAAC,EAAEC,IAAAA,kBAAU,EAAC;YAC7B,OAAOC,QAAQC,GAAG,CAACC,6BAAY,CAACC,WAAW,CAAC;QAC9C;QACA,CAAChB,GAAGiB,aAAa,CAAC,EAAEC,IAAAA,eAAO,EAACC,4BAAa,EAAEC,SAAS;QAGpD,CAACpB,GAAGqB,UAAU,CAAC,EAAEH,IAAAA,eAAO,EAACI,sBAAU,EAAEC,SAAS;QAC9C,CAACvB,GAAGwB,aAAa,CAAC,EAAEN,IAAAA,eAAO,EAACO,4BAAa,EAAEF,SAAS;QACpD,CAACvB,GAAG0B,eAAe,CAAC,EAAER,IAAAA,eAAO,EAACS,gCAAe;QAC7C,CAAC3B,GAAG4B,aAAa,CAAC,EAAEV,IAAAA,eAAO,EAACW,4BAAa;QACzC,CAAC7B,GAAG8B,WAAW,CAAC,EAAEZ,IAAAA,eAAO,EAACa,wBAAW,EAAER,SAAS;QAChD,CAACvB,GAAGgC,mBAAmB,CAAC,EAAEd,IAAAA,eAAO,EAACe,wCAAmB,EAAEV,SAAS;QAChE,CAACvB,GAAGkC,WAAW,CAAC,EAAEhB,IAAAA,eAAO,EAACiB,wBAAW;QACrC,CAACnC,GAAGoC,WAAW,CAAC,EAAElB,IAAAA,eAAO,EAACmB,wBAAW,EAAEd,SAAS;QAChD,CAACvB,GAAGsC,iBAAiB,CAAC,EAAEpB,IAAAA,eAAO,EAACqB,oCAAiB,EAAEhB,SAAS;QAC5D,CAACvB,GAAGwC,UAAU,CAAC,EAAEtB,IAAAA,eAAO,EAACuB,sBAAU,EAAElB,SAAS;QAE9C,CAACvB,GAAG0C,aAAa,CAAC,EAAE9B,IAAAA,kBAAU,EAAC+B,4BAAa,EAAEvB,SAAS;QACvD,CAACpB,GAAG4C,kBAAkB,CAAC,EAAE1B,IAAAA,eAAO,EAAC2B,sCAAkB,EAAEtB,SAAS;QAC9D,CAACvB,GAAG8C,aAAa,CAAC,EAAE5B,IAAAA,eAAO,EAAC6B,4BAAa,EAAExB,SAAS;QACpD,CAACvB,GAAGgD,aAAa,CAAC,EAAEpC,IAAAA,kBAAU,EAACqC,mCAAqB,EAAE1B,SAAS;QAC/D,CAACvB,GAAGkD,YAAY,CAAC,EAAEtC,IAAAA,kBAAU,EAACuC,mCAAqB,EAAE5B,SAAS;QAC9D,CAACvB,GAAGoD,oBAAoB,CAAC,EAAElC,IAAAA,eAAO,EAACmC,0CAAoB,EAAE9B,SAAS;QAClE,CAACvB,GAAGsD,gBAAgB,CAAC,EAAEpC,IAAAA,eAAO,EAACqC,kCAAgB,EAAEhC,SAAS;QAC1D,CAACvB,GAAGwD,mBAAmB,CAAC,EAAEtC,IAAAA,eAAO,EAACuC,wCAAmB,EAAElC,SAAS;QAChE,CAACvB,GAAG0D,aAAa,CAAC,EAAExC,IAAAA,eAAO,EAACyC,4BAAa;QACzC,CAAC3D,GAAG4D,cAAc,CAAC,EAAEhD,IAAAA,kBAAU,EAAC,CAACiD;YAC/B,MAAMC,SAASD,OAAOjC,aAAa;YAEnC,OAAO,IAAImC,gBAAO,CAAC;gBACjBC,MAAMF,OAAOG,GAAG,CAAClD,6BAAY,CAACmD,UAAU;YAC1C;QACF;QACA,CAAClE,GAAGmE,mBAAmB,CAAC,EAAEjD,IAAAA,eAAO,EAACkD,wCAAmB;QACrD,CAACpE,GAAGqE,cAAc,CAAC,EAAEnD,IAAAA,eAAO,EAACoD,kCAAc;QAC3C,CAACtE,GAAGuE,gBAAgB,CAAC,EAAEnE,IAAAA,eAAO,EAACoE,IAAAA,kBAAS;QACxC,CAACxE,GAAGyE,UAAU,CAAC,EAAErE,IAAAA,eAAO,EACtBsE,cAAK,CAACC,MAAM,CAAC;YACXC,eAAe,OAAO,OAAO;YAC7BC,kBAAkB,OAAO,OAAO;QAClC;QAGF,CAAC7E,GAAG8E,eAAe,CAAC,EAAE5D,IAAAA,eAAO,EAAC6D,gCAAe,EAAExD,SAAS;QACxD,CAACvB,GAAGgF,aAAa,CAAC,EAAE9D,IAAAA,eAAO,EAAC+D,4BAAa,EAAE1D,SAAS;QACpD,CAACvB,GAAGkF,cAAc,CAAC,EAAEhE,IAAAA,eAAO,EAACiE,8BAAc;QAC3C,CAACnF,GAAGoF,mBAAmB,CAAC,EAAElE,IAAAA,eAAO,EAACmE,wCAAmB;QACrD,CAACrF,GAAGsF,YAAY,CAAC,EAAEpE,IAAAA,eAAO,EAACqE,0BAAY,EAAEhE,SAAS;QAClD,CAACvB,GAAGwF,WAAW,CAAC,EAAEtE,IAAAA,eAAO,EAACuE,wBAAW;QACrC,CAACzF,GAAG0F,sBAAsB,CAAC,EAAExE,IAAAA,eAAO,EAACyE,8CAAsB,EAAEpE,SAAS;QACtE,CAACvB,GAAG4F,mBAAmB,CAAC,EAAE1E,IAAAA,eAAO,EAAC2E,wCAAmB,EAAEtE,SAAS;QAChE,CAACvB,GAAG8F,mBAAmB,CAAC,EAAE5E,IAAAA,eAAO,EAAC6E,wCAAmB;QACrD,CAAC/F,GAAGgG,gBAAgB,CAAC,EAAE9E,IAAAA,eAAO,EAAC+E,kCAAgB,EAAE1E,SAAS;QAC1D,CAACvB,GAAGkG,2BAA2B,CAAC,EAAEhF,IAAAA,eAAO,EAACiF,wDAA2B,EAAE5E,SAAS;QAChF,CAACvB,GAAGoG,sBAAsB,CAAC,EAAElF,IAAAA,eAAO,EAACmF,8CAAsB,EAAEjF,SAAS;QACtE,CAACpB,GAAGsG,UAAU,CAAC,EAAEpF,IAAAA,eAAO,EAACqF,sBAAU,EAAEhF,SAAS;QAC9C,CAACvB,GAAGwG,qBAAqB,CAAC,EAAEtF,IAAAA,eAAO,EAACuF,4CAAqB,EAAElF,SAAS;QAEpE,CAACvB,GAAG0G,SAAS,CAAC,EAAExF,IAAAA,eAAO,EAACyF,oBAAS,EAAEpF,SAAS;QAC5C,CAACvB,GAAG4G,sBAAsB,CAAC,EAAE1F,IAAAA,eAAO,EAAC2F,8CAAsB,EAAEtF,SAAS;QACtE,CAACvB,GAAG8G,iBAAiB,CAAC,EAAE5F,IAAAA,eAAO,EAAC6F,oCAAiB,EAAExF,SAAS;QAC5D,CAACvB,GAAGgH,YAAY,CAAC,EAAE9F,IAAAA,eAAO,EAAC+F,0BAAY,EAAE1F,SAAS;QAClD,CAACvB,GAAGkH,kBAAkB,CAAC,EAAEhG,IAAAA,eAAO,EAACiG,sCAAkB,EAAE5F,SAAS;QAC9D,CAACvB,GAAGoH,kBAAkB,CAAC,EAAElG,IAAAA,eAAO,EAACmG,sCAAkB,EAAE9F,SAAS;QAC9D,CAACvB,GAAGsH,sBAAsB,CAAC,EAAEpG,IAAAA,eAAO,EAACqG,8CAAsB,EAAEhG,SAAS;QAGtE,CAACvB,GAAGwH,kBAAkB,CAAC,EAAEtG,IAAAA,eAAO,EAACuG,sCAAkB;QACnD,CAACzH,GAAG0H,qBAAqB,CAAC,EAAExG,IAAAA,eAAO,EAACyG,4CAAqB;QAEzD,CAAC3H,GAAG4H,QAAQ,CAAC,EAAE1G,IAAAA,eAAO,EAAC2G,kBAAQ;QAC/B,CAAC7H,GAAG8H,kBAAkB,CAAC,EAAE5G,IAAAA,eAAO,EAAC6G,sCAAkB;QACnD,CAAC/H,GAAGgI,YAAY,CAAC,EAAE9G,IAAAA,eAAO,EAAC+G,0BAAY,EAAE1G,SAAS;QAClD,CAACvB,GAAGkI,sBAAsB,CAAC,EAAEhH,IAAAA,eAAO,EAACiH,wCAAsB,EAAE5G,SAAS;QACtE,CAACvB,GAAGoI,2BAA2B,CAAC,EAAElH,IAAAA,eAAO,EAACmH,wDAA2B,EAAE9G,SAAS;QAChF,CAACvB,GAAGsI,oBAAoB,CAAC,EAAEpH,IAAAA,eAAO,EAACqH,0CAAoB,EAAEhH,SAAS;QAClE,CAACvB,GAAGwI,2BAA2B,CAAC,EAAEtH,IAAAA,eAAO,EAACuH,wDAA2B,EAAElH,SAAS;QAChF,CAACvB,GAAG0I,oBAAoB,CAAC,EAAExH,IAAAA,eAAO,EAACyH,0CAAoB,EAAEpH,SAAS;IACpE;IAEA,OAAO7B;AACT"}
+{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerFilesService","PrinterFilesService2","PrinterFilesService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","octoPrintApiService","OctoPrintApiService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerConnectionCache","PrinterConnectionCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}

package/dist/container.tokens.js

@@ -58,6 +58,7 @@ const DITokens = {
     customGCodeService: "customGCodeService",
     settingsStore: "settingsStore",
     printerCache: "printerCache",
+    printerConnectionCache: "printerConnectionCache",
     printerEventsCache: "printerEventsCache",
     printerSocketStore: "printerSocketStore",
     testPrinterSocketStore: "testPrinterSocketStore",
@@ -73,6 +74,7 @@ const DITokens = {
     socketIoTask: "socketIoTask",
     printCompletionSocketIoTask: "printCompletionSocketIoTask",
     printerWebsocketTask: "printerWebsocketTask",
+    printerStateUpdatePollTask: "printerStateUpdatePollTask",
     printerWebsocketRestoreTask: "printerWebsocketRestoreTask",
     printerFileCleanTask: "printerFileCleanTask"
 };

package/dist/container.tokens.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
+{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerConnectionCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,wBAAwB;IACxBC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}

package/dist/controllers/batch-call.controller.js

@@ -36,13 +36,18 @@ class BatchCallController {
     }
     async batchConnectSocket(req, res) {
         const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
-        await this.batchCallService.batchConnectSocket(printerIds);
+        this.batchCallService.batchConnectSocket(printerIds);
         res.send({});
     }
-    async batchReprintFiles(req, res) {
+    async getLastPrintedFiles(req, res) {
         const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
-        const results = await this.batchCallService.batchReprintCalls(printerIds);
-        res.send(results);
+        const files = await this.batchCallService.getBatchPrinterReprintFile(printerIds);
+        res.send(files);
+    }
+    async batchReprintFiles(req, res) {
+        const { prints } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.executeBatchRePrinterRule)(this.isTypeormMode));
+        const files = await this.batchCallService.batchReprintCalls(prints);
+        res.send(files);
     }
     async batchTogglePrintersEnabled(req, res) {
         const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrintersEnabledRules)(this.isTypeormMode));
@@ -56,6 +61,6 @@ const _default = (0, _awilixexpress.createController)(BatchCallController).prefi
         _authorizationconstants.ROLES.ADMIN,
         _authorizationconstants.ROLES.OPERATOR
     ])
-]).post("/connect/usb", "batchConnectUsb").post("/connect/socket", "batchConnectSocket").post("/reprint", "batchReprintFiles").post("/toggle-enabled", "batchTogglePrintersEnabled");
+]).post("/connect/usb", "batchConnectUsb").post("/connect/socket", "batchConnectSocket").post("/reprint/list", "getLastPrintedFiles").post("/reprint/execute", "batchReprintFiles").post("/toggle-enabled", "batchTogglePrintersEnabled");
 
 //# sourceMappingURL=batch-call.controller.js.map

package/dist/controllers/batch-call.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","batchCallService","isTypeormMode","constructor","batchConnectUsb","req","res","printerIds","validateInput","body","batchPrinterRules","results","send","batchConnectSocket","batchReprintFiles","batchReprintCalls","batchTogglePrintersEnabled","enabled","batchPrintersEnabledRules","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post"],"mappings":";;;;;;;;;;;IASaA,mBAAmB;eAAnBA;;IAkCb,OAMyD;eANzD;;;+BA3CiC;4BACH;2CAC+B;iCAChC;8BACgB;wCACvB;AAIf,MAAMA;IACXC,iBAAmC;IACnCC,cAAuB;IAEvBC,YAAY,EAAEF,gBAAgB,EAAEC,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACD,gBAAgB,GAAGA;QACxB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,gBAAgBC,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,MAAMS,UAAU,MAAM,IAAI,CAACV,gBAAgB,CAACG,eAAe,CAACG;QAC5DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAAME,mBAAmBR,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,MAAM,IAAI,CAACD,gBAAgB,CAACY,kBAAkB,CAACN;QAC/CD,IAAIM,IAAI,CAAC,CAAC;IACZ;IAEA,MAAME,kBAAkBT,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,MAAMS,UAAU,MAAM,IAAI,CAACV,gBAAgB,CAACc,iBAAiB,CAACR;QAC9DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAAMK,2BAA2BX,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAEC,UAAU,EAAEU,OAAO,EAAE,GAAG,MAAMT,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAES,IAAAA,oDAAyB,EAAC,IAAI,CAAChB,aAAa;QAC1G,MAAMS,UAAU,MAAM,IAAI,CAACV,gBAAgB,CAACe,0BAA0B,CAACT,YAAYU;QACnFX,IAAIM,IAAI,CAACD;IACX;AACF;MAEA,WAAeQ,IAAAA,+BAAgB,EAACnB,qBAC7BoB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,UAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;IAAIC,IAAAA,4BAAc,EAAC;QAACC,6BAAK,CAACC,KAAK;QAAED,6BAAK,CAACE,QAAQ;KAAC;CAAE,EACtEC,IAAI,CAAC,gBAAgB,mBACrBA,IAAI,CAAC,mBAAmB,sBACxBA,IAAI,CAAC,YAAY,qBACjBA,IAAI,CAAC,mBAAmB"}
+{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","batchCallService","isTypeormMode","constructor","batchConnectUsb","req","res","printerIds","validateInput","body","batchPrinterRules","results","send","batchConnectSocket","getLastPrintedFiles","files","getBatchPrinterReprintFile","batchReprintFiles","prints","executeBatchRePrinterRule","batchReprintCalls","batchTogglePrintersEnabled","enabled","batchPrintersEnabledRules","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post"],"mappings":";;;;;;;;;;;IAaaA,mBAAmB;eAAnBA;;IAwCb,OAOyD;eAPzD;;;+BArDiC;4BACH;2CAKvB;iCACsB;8BACgB;wCACvB;AAIf,MAAMA;IACXC,iBAAmC;IACnCC,cAAuB;IAEvBC,YAAY,EAAEF,gBAAgB,EAAEC,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACD,gBAAgB,GAAGA;QACxB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,gBAAgBC,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,MAAMS,UAAU,MAAM,IAAI,CAACV,gBAAgB,CAACG,eAAe,CAACG;QAC5DD,IAAIM,IAAI,CAACD;IACX;IAEA,MAAME,mBAAmBR,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,IAAI,CAACD,gBAAgB,CAACY,kBAAkB,CAACN;QACzCD,IAAIM,IAAI,CAAC,CAAC;IACZ;IAEA,MAAME,oBAAoBT,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,IAAAA,4CAAiB,EAAC,IAAI,CAACR,aAAa;QACzF,MAAMa,QAAQ,MAAM,IAAI,CAACd,gBAAgB,CAACe,0BAA0B,CAACT;QACrED,IAAIM,IAAI,CAACG;IACX;IAEA,MAAME,kBAAkBZ,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEY,MAAM,EAAE,GAAG,MAAMV,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEU,IAAAA,oDAAyB,EAAC,IAAI,CAACjB,aAAa;QAC7F,MAAMa,QAAQ,MAAM,IAAI,CAACd,gBAAgB,CAACmB,iBAAiB,CAACF;QAC5DZ,IAAIM,IAAI,CAACG;IACX;IAEA,MAAMM,2BAA2BhB,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAEC,UAAU,EAAEe,OAAO,EAAE,GAAG,MAAMd,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEc,IAAAA,oDAAyB,EAAC,IAAI,CAACrB,aAAa;QAC1G,MAAMS,UAAU,MAAM,IAAI,CAACV,gBAAgB,CAACoB,0BAA0B,CAACd,YAAYe;QACnFhB,IAAIM,IAAI,CAACD;IACX;AACF;MAEA,WAAea,IAAAA,+BAAgB,EAACxB,qBAC7ByB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,UAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;IAAIC,IAAAA,4BAAc,EAAC;QAACC,6BAAK,CAACC,KAAK;QAAED,6BAAK,CAACE,QAAQ;KAAC;CAAE,EACtEC,IAAI,CAAC,gBAAgB,mBACrBA,IAAI,CAAC,mBAAmB,sBACxBA,IAAI,CAAC,iBAAiB,uBACtBA,IAAI,CAAC,oBAAoB,qBACzBA,IAAI,CAAC,mBAAmB"}