@fdm-monster/server 1.5.4 → 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
@@ -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/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/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/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;