@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/controllers/server-private.controller.js

@@ -2,60 +2,71 @@
 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, {
-    ServerPrivateController: function() {
+Object.defineProperty(exports, "ServerPrivateController", {
+    enumerable: true,
+    get: function() {
         return ServerPrivateController;
-    },
-    default: function() {
-        return _default;
     }
 });
 const _stream = require("stream");
 const _awilixexpress = require("awilix-express");
 const _authenticate = require("../middleware/authenticate");
-const _logger = require("../handlers/logger");
 const _serverconstants = require("../server.constants");
 const _authorizationconstants = require("../constants/authorization.constants");
 const _validators = require("../handlers/validators");
+const _serverreleaseservice = require("../services/core/server-release.service");
+const _clientbundleservice = require("../services/core/client-bundle.service");
+const _printercache = require("../state/printer.cache");
+const _yamlservice = require("../services/core/yaml.service");
+const _multerservice = require("../services/core/multer.service");
+const _logsmanagerservice = require("../services/core/logs-manager.service");
+const _express = require("express");
 const _demomiddleware = require("../middleware/demo.middleware");
+const _githubservice = require("../services/core/github.service");
+const _printerserviceinterface = require("../services/interfaces/printer.service.interface");
+const _serverprivatevalidation = require("./validation/server-private.validation");
+const _loggerfactory = require("../handlers/logger-factory");
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
 class ServerPrivateController {
-    clientBundleService;
+    serverReleaseService;
     printerCache;
     printerService;
-    printerSocketStore;
+    clientBundleService;
     githubService;
+    logDumpService;
     yamlService;
     multerService;
-    logDumpService;
-    logger = new _logger.LoggerService(ServerPrivateController.name);
-    serverReleaseService;
-    constructor({ serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
+    logger;
+    constructor(loggerFactory, serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, yamlService, multerService){
         this.serverReleaseService = serverReleaseService;
+        this.printerCache = printerCache;
+        this.printerService = printerService;
         this.clientBundleService = clientBundleService;
         this.githubService = githubService;
         this.logDumpService = logDumpService;
-        this.printerSocketStore = printerSocketStore;
-        this.printerCache = printerCache;
-        this.printerService = printerService;
         this.yamlService = yamlService;
         this.multerService = multerService;
+        this.logger = loggerFactory(ServerPrivateController.name);
     }
-    async getClientReleases(req, res) {
+    async getReleaseStateInfo(req, res) {
+        await this.serverReleaseService.syncLatestRelease();
+        const updateState = this.serverReleaseService.getState();
+        res.send(updateState);
+    }
+    async getClientReleases(_req, res) {
         const releaseSpec = await this.clientBundleService.getReleases();
         res.send(releaseSpec);
     }
     async updateClientBundleGithub(req, res) {
-        const inputRules = {
-            downloadRelease: "string",
-            allowDowngrade: "boolean"
-        };
-        const updateDto = await (0, _validators.validateMiddleware)(req, inputRules);
+        const updateDto = await (0, _validators.validateMiddleware)(req, _serverprivatevalidation.updateClientBundleSchema);
         const willExecute = await this.clientBundleService.shouldUpdateWithReason(true, _serverconstants.AppConstants.defaultClientMinimum, updateDto.downloadRelease, updateDto.allowDowngrade);
         this.logger.log(`Will execute: ${willExecute?.shouldUpdate}, reason: ${willExecute?.reason}`);
         if (!willExecute?.shouldUpdate) {
@@ -69,7 +80,9 @@ class ServerPrivateController {
                 reason: willExecute?.reason
             });
         }
-        const tag_name = await this.clientBundleService.downloadClientUpdate(willExecute.targetVersion);
+        if (willExecute.targetVersion) {
+            await this.clientBundleService.downloadClientUpdate(willExecute.targetVersion);
+        }
         return res.send({
             executed: true,
             requestedVersion: willExecute.requestedVersion,
@@ -84,11 +97,6 @@ class ServerPrivateController {
         const rateLimitResponse = await this.githubService.getRateLimit();
         res.send(rateLimitResponse.data);
     }
-    async getReleaseStateInfo(req, res) {
-        await this.serverReleaseService.syncLatestRelease();
-        const updateState = this.serverReleaseService.getState();
-        res.send(updateState);
-    }
     async importPrintersAndFloorsYaml(req, res) {
         const files = await this.multerService.multerLoadFileAsync(req, res, [
             ".yaml"
@@ -125,12 +133,118 @@ class ServerPrivateController {
         res.sendFile(filePath);
     }
 }
-const _default = (0, _awilixexpress.createController)(ServerPrivateController).prefix(_serverconstants.AppConstants.apiRoute + "/server").before([
-    (0, _authenticate.authenticate)(),
-    (0, _authenticate.authorizeRoles)([
-        _authorizationconstants.ROLES.ADMIN
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "getReleaseStateInfo", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/client-releases"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "getClientReleases", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/update-client-bundle-github"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "updateClientBundleGithub", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/github-rate-limit"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "getGithubRateLimit", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/import-printers-floors-yaml"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "importPrintersAndFloorsYaml", null);
+_ts_decorate([
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/export-printers-floors-yaml"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "exportPrintersAndFloorsYaml", null);
+_ts_decorate([
+    (0, _awilixexpress.DELETE)(),
+    (0, _awilixexpress.route)("/delete-all-printers"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "deleteAllPrinters", null);
+_ts_decorate([
+    (0, _awilixexpress.DELETE)(),
+    (0, _awilixexpress.route)("/clear-outdated-fdm-monster-logs"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "clearLogs", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.POST)(),
+    (0, _awilixexpress.route)("/dump-fdm-monster-logs"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPrivateController.prototype, "dumpLogZips", null);
+ServerPrivateController = _ts_decorate([
+    (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/server"),
+    (0, _awilixexpress.before)([
+        (0, _authenticate.authenticate)(),
+        (0, _authenticate.authorizeRoles)([
+            _authorizationconstants.ROLES.ADMIN
+        ]),
+        _demomiddleware.demoUserNotAllowed
     ]),
-    _demomiddleware.demoUserNotAllowed
-]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
+        typeof _serverreleaseservice.ServerReleaseService === "undefined" ? Object : _serverreleaseservice.ServerReleaseService,
+        typeof _printercache.PrinterCache === "undefined" ? Object : _printercache.PrinterCache,
+        typeof _printerserviceinterface.IPrinterService === "undefined" ? Object : _printerserviceinterface.IPrinterService,
+        typeof _clientbundleservice.ClientBundleService === "undefined" ? Object : _clientbundleservice.ClientBundleService,
+        typeof _githubservice.GithubService === "undefined" ? Object : _githubservice.GithubService,
+        typeof _logsmanagerservice.LogDumpService === "undefined" ? Object : _logsmanagerservice.LogDumpService,
+        typeof _yamlservice.YamlService === "undefined" ? Object : _yamlservice.YamlService,
+        typeof _multerservice.MulterService === "undefined" ? Object : _multerservice.MulterService
+    ])
+], ServerPrivateController);
 
 //# sourceMappingURL=server-private.controller.js.map

package/dist/controllers/server-private.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":";;;;;;;;;;;IAmBaA,uBAAuB;eAAvBA;;IAmJb,OAYuD;eAZvD;;;wBAtK4B;+BACK;8BACY;wBACL;iCACX;wCACP;4BACa;gCASA;AAI5B,MAAMA;IACXC,oBAAyC;IACzCC,aAA2B;IAC3BC,eAAgC;IAChCC,mBAAuC;IACvCC,cAA6B;IAC7BC,YAAyB;IACzBC,cAA6B;IAC7BC,eAA+B;IACvBC,SAAS,IAAIC,qBAAM,CAACV,wBAAwBW,IAAI,EAAE;IAClDC,qBAA2C;IAEnDC,YAAY,EACVD,oBAAoB,EACpBV,YAAY,EACZC,cAAc,EACdF,mBAAmB,EACnBI,aAAa,EACbG,cAAc,EACdJ,kBAAkB,EAClBE,WAAW,EACXC,aAAa,EAWd,CAAE;QACD,IAAI,CAACK,oBAAoB,GAAGA;QAC5B,IAAI,CAACX,mBAAmB,GAAGA;QAC3B,IAAI,CAACI,aAAa,GAAGA;QACrB,IAAI,CAACG,cAAc,GAAGA;QACtB,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACF,YAAY,GAAGA;QACpB,IAAI,CAACC,cAAc,GAAGA;QACtB,IAAI,CAACG,WAAW,GAAGA;QACnB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAMO,kBAAkBC,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAMC,cAAc,MAAM,IAAI,CAAChB,mBAAmB,CAACiB,WAAW;QAC9DF,IAAIG,IAAI,CAACF;IACX;IAOA,MAAMG,yBAAyBL,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAMK,aAAa;YACjBC,iBAAiB;YACjBC,gBAAgB;QAClB;QACA,MAAMC,YAAY,MAAMC,IAAAA,8BAAkB,EAACV,KAAKM;QAEhD,MAAMK,cAAc,MAAM,IAAI,CAACzB,mBAAmB,CAAC0B,sBAAsB,CACvE,MACAC,6BAAY,CAACC,oBAAoB,EACjCL,UAAUF,eAAe,EACzBE,UAAUD,cAAc;QAG1B,IAAI,CAACd,MAAM,CAACqB,GAAG,CAAC,CAAC,cAAc,EAAEJ,aAAaK,aAAa,UAAU,EAAEL,aAAaM,QAAQ;QAC5F,IAAI,CAACN,aAAaK,cAAc;YAC9B,OAAOf,IAAIG,IAAI,CAAC;gBACdc,UAAU;gBACVC,kBAAkBR,YAAYQ,gBAAgB;gBAC9CC,gBAAgBT,YAAYS,cAAc;gBAC1CC,gBAAgBV,YAAYU,cAAc;gBAC1CL,cAAcL,YAAYK,YAAY;gBACtCM,eAAeX,YAAYW,aAAa;gBACxCL,QAAQN,aAAaM;YACvB;QACF;QAEA,MAAMM,WAAW,MAAM,IAAI,CAACrC,mBAAmB,CAACsC,oBAAoB,CAACb,YAAYW,aAAa;QAE9F,OAAOrB,IAAIG,IAAI,CAAC;YACdc,UAAU;YACVC,kBAAkBR,YAAYQ,gBAAgB;YAC9CC,gBAAgBT,YAAYS,cAAc;YAC1CC,gBAAgBV,YAAYU,cAAc;YAC1CL,cAAcL,YAAYK,YAAY;YACtCM,eAAeX,YAAYW,aAAa;YACxCL,QAAQN,aAAaM;QACvB;IACF;IAEA,MAAMQ,mBAAmBzB,GAAY,EAAEC,GAAa,EAAE;QACpD,MAAMyB,oBAAoB,MAAM,IAAI,CAACpC,aAAa,CAACqC,YAAY;QAC/D1B,IAAIG,IAAI,CAACsB,kBAAkBE,IAAI;IACjC;IAEA,MAAMC,oBAAoB7B,GAAY,EAAEC,GAAa,EAAE;QACrD,MAAM,IAAI,CAACJ,oBAAoB,CAACiC,iBAAiB;QACjD,MAAMC,cAAc,IAAI,CAAClC,oBAAoB,CAACmC,QAAQ;QACtD/B,IAAIG,IAAI,CAAC2B;IACX;IAEA,MAAME,4BAA4BjC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAMiC,QAAQ,MAAM,IAAI,CAAC1C,aAAa,CAAC2C,mBAAmB,CAACnC,KAAKC,KAAK;YAAC;SAAQ,EAAE;QAChF,MAAMmC,YAAYF,KAAK,CAAC,EAAE;QAC1B,MAAMG,OAAO,MAAM,IAAI,CAAC9C,WAAW,CAAC+C,uBAAuB,CAACF,UAAUG,MAAM,CAACC,QAAQ;QAErFvC,IAAIG,IAAI,CAAC;YACPqC,SAAS;YACTJ;QACF;IACF;IAEA,MAAMK,4BAA4B1C,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM0C,OAAO,MAAM,IAAI,CAACpD,WAAW,CAACqD,uBAAuB,CAAC5C,IAAI6C,IAAI;QACpE,MAAMC,eAAeC,OAAOC,IAAI,CAACL;QACjC,MAAMM,aAAa,IAAIC,mBAAW;QAClCD,WAAWE,GAAG,CAACL;QAEf,MAAMM,WAAW,CAAC,OAAO,EAAEvC,6BAAY,CAACwC,cAAc,CAAC,CAAC,CAAC,GAAGC,KAAKC,GAAG,KAAK;QACzEtD,IAAIuD,GAAG,CAAC,uBAAuB,0BAA0BJ;QACzDnD,IAAIuD,GAAG,CAAC,gBAAgB;QACxBP,WAAWQ,IAAI,CAACxD;IAClB;IAEA,MAAMyD,kBAAkB1D,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM0D,WAAW,MAAM,IAAI,CAACxE,YAAY,CAACyE,kBAAkB,CAAC;QAC5D,MAAMC,aAAaF,SAASG,GAAG,CAAC,CAACC,IAAMA,EAAEC,EAAE;QAC3C,MAAM,IAAI,CAAC5E,cAAc,CAAC6E,UAAU,CAACJ;QACrC5D,IAAIG,IAAI;IACV;IAEA,MAAM8D,UAAUlE,GAAY,EAAEC,GAAa,EAAE;QAC3C,MAAMkE,SAAS,MAAM,IAAI,CAAC1E,cAAc,CAAC2E,yCAAyC;QAClFnE,IAAIG,IAAI,CAAC+D;IACX;IAEA,MAAME,YAAYrE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMqE,WAAW,MAAM,IAAI,CAAC7E,cAAc,CAAC8E,OAAO;QAClDtE,IAAIuE,QAAQ,CAACF;IACf;AACF;MAGA,WAAeG,IAAAA,+BAAgB,EAACxF,yBAC7ByF,MAAM,CAAC7D,6BAAY,CAAC8D,QAAQ,GAAG,WAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;IAAIC,IAAAA,4BAAc,EAAC;QAACC,6BAAK,CAACC,KAAK;KAAC;IAAGC,kCAAkB;CAAC,EAC1EC,GAAG,CAAC,KAAK,uBACTA,GAAG,CAAC,oBAAoB,qBACxBA,GAAG,CAAC,sBAAsB,sBAC1BC,IAAI,CAAC,gCAAgC,4BACrCA,IAAI,CAAC,gCAAgC,+BACrCA,IAAI,CAAC,gCAAgC,+BACrCD,GAAG,CAAC,0BAA0B,eAC9BC,IAAI,CAAC,0BAA0B,eAC/BC,MAAM,CAAC,oCAAoC,aAC3CA,MAAM,CAAC,wBAAwB"}
+{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","logger","constructor","loggerFactory","serverReleaseService","printerCache","printerService","clientBundleService","githubService","logDumpService","yamlService","multerService","name","getReleaseStateInfo","req","res","syncLatestRelease","updateState","getState","send","getClientReleases","_req","releaseSpec","getReleases","updateClientBundleGithub","updateDto","validateMiddleware","updateClientBundleSchema","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","downloadRelease","allowDowngrade","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","apiRoute","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed"],"mappings":"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"}

package/dist/controllers/server-public.controller.js

@@ -2,18 +2,10 @@
 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, {
-    ServerPublicController: function() {
+Object.defineProperty(exports, "ServerPublicController", {
+    enumerable: true,
+    get: function() {
         return ServerPublicController;
-    },
-    default: function() {
-        return _default;
     }
 });
 const _awilixexpress = require("awilix-express");
@@ -21,28 +13,34 @@ const _serverconstants = require("../server.constants");
 const _envutils = require("../utils/env.utils");
 const _authenticate = require("../middleware/authenticate");
 const _authorizationconstants = require("../constants/authorization.constants");
-const _isdocker = require("../utils/is-docker");
+const _settingsstore = require("../state/settings.store");
+const _serverreleaseservice = require("../services/core/server-release.service");
+const _monsterpiservice = require("../services/core/monsterpi.service");
+const _express = require("express");
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
 class ServerPublicController {
-    serverVersion;
     settingsStore;
-    printerSocketStore;
+    serverVersion;
     serverReleaseService;
     monsterPiService;
-    userService;
-    roleService;
     isTypeormMode;
-    constructor({ settingsStore, printerSocketStore, serverVersion, serverReleaseService, monsterPiService, userService, roleService, isTypeormMode }){
+    constructor(settingsStore, serverVersion, serverReleaseService, monsterPiService, isTypeormMode){
         this.settingsStore = settingsStore;
         this.serverVersion = serverVersion;
-        this.printerSocketStore = printerSocketStore;
         this.serverReleaseService = serverReleaseService;
         this.monsterPiService = monsterPiService;
-        this.userService = userService;
-        this.roleService = roleService;
         this.isTypeormMode = isTypeormMode;
     }
     welcome(req, res) {
-        const serverSettings = this.settingsStore.getSettings();
+        this.settingsStore.getSettings();
         if (!this.settingsStore.getLoginRequired()) {
             return res.send({
                 message: "Login disabled. Please load the Vue app."
@@ -56,60 +54,11 @@ class ServerPublicController {
         const serverSettings = this.settingsStore.getServerSettings();
         const moonrakerEnabled = serverSettings.experimentalMoonrakerSupport;
         res.send({
-            batchReprintCalls: {
-                available: true,
-                version: 2
-            },
-            batchConnectSocketCalls: {
-                available: true,
-                version: 1
-            },
-            batchConnectUsbCalls: {
-                available: true,
-                version: 1
-            },
-            newSockets: {
-                available: true,
-                version: 1
-            },
-            anonymousDiagnosticsToggle: {
-                available: true,
-                version: 1
-            },
-            pauseResumePrinterCommand: {
-                available: true,
-                version: 1
-            },
-            logDumpZip: {
-                available: true,
-                version: 1
-            },
-            clearLogFiles: {
-                available: true,
-                version: 1
-            },
-            batchTogglePrinterEnabled: {
-                available: true,
-                version: 1
-            },
-            cameraStream: {
-                available: true,
-                version: 1,
-                subFeatures: {}
-            },
             printerGroupsApi: {
                 available: this.isTypeormMode,
                 version: 1,
                 subFeatures: {}
             },
-            printerControlApi: {
-                available: true,
-                version: 1
-            },
-            githubRateLimitApi: {
-                available: true,
-                version: 1
-            },
             multiplePrinterServices: {
                 available: true,
                 version: 1,
@@ -125,11 +74,10 @@ class ServerPublicController {
         });
     }
     async getVersion(req, res) {
-        let updateState = this.serverReleaseService.getState();
+        const updateState = this.serverReleaseService.getState();
         const monsterPiVersion = this.monsterPiService.getMonsterPiVersionSafe();
         res.json({
             version: this.serverVersion,
-            isDockerContainer: (0, _isdocker.isDocker)(),
             isNode: (0, _envutils.isNode)(),
             os: process.env.OS,
             monsterPi: monsterPiVersion,
@@ -146,20 +94,67 @@ class ServerPublicController {
         });
     }
 }
-const _default = (0, _awilixexpress.createController)(ServerPublicController).prefix(_serverconstants.AppConstants.apiRoute + "/").get("", "welcome", {
-    before: [
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authenticate)(),
-        (0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.ServerInfo.Get)
-    ]
-}).get("test", "test").get("features", "getFeatures", {
-    before: [
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.ServerInfo.Get)
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", void 0)
+], ServerPublicController.prototype, "welcome", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/features"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authenticate)()
-    ]
-}).get("version", "getVersion", {
-    before: [
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", void 0)
+], ServerPublicController.prototype, "getFeatures", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/version"),
+    (0, _awilixexpress.before)([
         (0, _authenticate.authenticate)(),
-        (0, _authenticate.authorizePermission)(_authorizationconstants.PERMS.ServerInfo.Get)
-    ]
-});
+        (0, _authenticate.permission)(_authorizationconstants.PERMS.ServerInfo.Get)
+    ]),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPublicController.prototype, "getVersion", null);
+_ts_decorate([
+    (0, _awilixexpress.GET)(),
+    (0, _awilixexpress.route)("/test"),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _express.Request === "undefined" ? Object : _express.Request,
+        typeof _express.Response === "undefined" ? Object : _express.Response
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ServerPublicController.prototype, "test", null);
+ServerPublicController = _ts_decorate([
+    (0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _settingsstore.SettingsStore === "undefined" ? Object : _settingsstore.SettingsStore,
+        String,
+        typeof _serverreleaseservice.ServerReleaseService === "undefined" ? Object : _serverreleaseservice.ServerReleaseService,
+        typeof _monsterpiservice.MonsterPiService === "undefined" ? Object : _monsterpiservice.MonsterPiService,
+        Boolean
+    ])
+], ServerPublicController);
 
 //# sourceMappingURL=server-public.controller.js.map

package/dist/controllers/server-public.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","constructor","settingsStore","serverVersion","serverReleaseService","monsterPiService","isTypeormMode","welcome","req","res","getSettings","getLoginRequired","send","message","getFeatures","serverSettings","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","printerGroupsApi","available","version","subFeatures","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isNode","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","authenticate","permission","PERMS","ServerInfo","Get","apiRoute"],"mappings":";;;;+BAWaA;;;eAAAA;;;+BAXsB;iCACN;0BACN;8BACkB;wCACnB;+BACQ;sCACO;kCACJ;yBACC;;;;;;;;;;AAG3B,MAAMA;;;;;;IACXC,YACE,AAAiBC,aAA4B,EAC7C,AAAiBC,aAAqB,EACtC,AAAiBC,oBAA0C,EAC3D,AAAiBC,gBAAkC,EACnD,AAAiBC,aAAsB,CACvC;aALiBJ,gBAAAA;aACAC,gBAAAA;aACAC,uBAAAA;aACAC,mBAAAA;aACAC,gBAAAA;IAChB;IAKHC,QAAQC,GAAY,EAAEC,GAAa,EAAE;QACnC,IAAI,CAACP,aAAa,CAACQ,WAAW;QAE9B,IAAI,CAAC,IAAI,CAACR,aAAa,CAACS,gBAAgB,IAAI;YAC1C,OAAOF,IAAIG,IAAI,CAAC;gBACdC,SAAS;YACX;QACF;QAEA,OAAOJ,IAAIG,IAAI,CAAC;YACdC,SAAS;QACX;IACF;IAKAC,YAAYN,GAAY,EAAEC,GAAa,EAAE;QACvC,MAAMM,iBAAiB,IAAI,CAACb,aAAa,CAACc,iBAAiB;QAC3D,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpET,IAAIG,IAAI,CAAC;YACPO,kBAAkB;gBAEhBC,WAAW,IAAI,CAACd,aAAa;gBAC7Be,SAAS;gBACTC,aAAa,CAAC;YAChB;YACAC,yBAAyB;gBACvBH,WAAW;gBACXC,SAAS;gBACTC,aAAa;oBACXE,OAAOP,mBAAmB;wBAAC;wBAAa;qBAAU,GAAG;wBAAC;qBAAY;gBACpE;YACF;QACF;IACF;IAEA,MAGMQ,WAAWjB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAMiB,cAAc,IAAI,CAACtB,oBAAoB,CAACuB,QAAQ;QACtD,MAAMC,mBAAmB,IAAI,CAACvB,gBAAgB,CAACwB,uBAAuB;QAEtEpB,IAAIqB,IAAI,CAAC;YACPT,SAAS,IAAI,CAAClB,aAAa;YAC3B4B,QAAQA,IAAAA,gBAAM;YACdC,IAAIC,QAAQC,GAAG,CAACC,EAAE;YAClBC,WAAWR;YACXS,QAAQ;gBACNC,QAAQZ,YAAYY,MAAM;gBAC1BC,iBAAiBb,YAAYa,eAAe;gBAC5CC,WAAWd,YAAYc,SAAS;YAClC;QACF;IACF;IAEA,MAEMC,KAAKjC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIG,IAAI,CAAC;YACPC,SAAS;QACX;IACF;AACF;;;;;QAjEW6B,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;QAiB/CJ,IAAAA,0BAAY;;;;;;;;;;;;;QAuBZA,IAAAA,0BAAY;QAAIC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,UAAU,CAACC,GAAG;;;;;;;;;;;;;;;;;;;;4DApDtCC"}