@fdm-monster/server 1.5.1 → 1.5.4

package/dist/container.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "configureContainer", {
         return configureContainer;
     }
 });
-const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
-const _simplegit = /*#__PURE__*/ _interop_require_default(require("simple-git"));
+const _axios = _interop_require_default(require("axios"));
+const _simplegit = _interop_require_default(require("simple-git"));
 const _octokit = require("octokit");
 const _awilix = require("awilix");
 const _toadscheduler = require("toad-scheduler");
@@ -26,7 +26,7 @@ const _printerwebsockettask = require("./tasks/printer-websocket.task");
 const _socketiotask = require("./tasks/socketio.task");
 const _octoprintapiservice = require("./services/octoprint/octoprint-api.service");
 const _socketfactory = require("./services/octoprint/socket.factory");
-const _filesstore = require("./state/files.store");
+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");
@@ -75,86 +75,83 @@ function _interop_require_default(obj) {
     };
 }
 function configureContainer() {
-    // Create the container and set the injectionMode to PROXY (which is also the default).
     const container = (0, _awilix.createContainer)({
         injectionMode: _awilix.InjectionMode.PROXY
     });
+    const isSqlite = false;
+    const di = _containertokens.DITokens;
     container.register({
-        // -- asValue/asFunction constants --
-        [_containertokens.DITokens.serverTasks]: (0, _awilix.asValue)(_tasks.ServerTasks),
-        // TODO change the role to a non-admin role in the future once GUEST/OPERATOR have more meaningful permissions
-        [_containertokens.DITokens.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
-        [_containertokens.DITokens.appDefaultRoleNoLogin]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
-        [_containertokens.DITokens.serverVersion]: (0, _awilix.asFunction)(()=>{
+        [di.serverTasks]: (0, _awilix.asValue)(_tasks.ServerTasks),
+        [di.isTypeormMode]: (0, _awilix.asValue)(isSqlite),
+        [di.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
+        [di.appDefaultRoleNoLogin]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
+        [di.serverVersion]: (0, _awilix.asFunction)(()=>{
             return process.env[_serverconstants.AppConstants.VERSION_KEY];
         }),
-        [_containertokens.DITokens.socketFactory]: (0, _awilix.asClass)(_socketfactory.SocketFactory).transient(),
-        // -- asClass --
-        [_containertokens.DITokens.serverHost]: (0, _awilix.asClass)(_serverhost.ServerHost).singleton(),
-        [_containertokens.DITokens.settingsStore]: (0, _awilix.asClass)(_settingsstore.SettingsStore).singleton(),
-        [_containertokens.DITokens.settingsService]: (0, _awilix.asClass)(_settingsservice.SettingsService),
-        [_containertokens.DITokens.configService]: (0, _awilix.asClass)(_configservice.ConfigService),
-        [_containertokens.DITokens.authService]: (0, _awilix.asClass)(_authservice.AuthService).singleton(),
-        [_containertokens.DITokens.refreshTokenService]: (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton(),
-        [_containertokens.DITokens.userService]: (0, _awilix.asClass)(_userservice.UserService),
-        [_containertokens.DITokens.roleService]: (0, _awilix.asClass)(_roleservice.RoleService).singleton(),
-        [_containertokens.DITokens.permissionService]: (0, _awilix.asClass)(_permissionservice.PermissionService).singleton(),
-        [_containertokens.DITokens.jwtService]: (0, _awilix.asClass)(_jwtservice.JwtService).singleton(),
-        [_containertokens.DITokens.loggerFactory]: (0, _awilix.asFunction)(_loggerfactory.LoggerFactory).transient(),
-        [_containertokens.DITokens.taskManagerService]: (0, _awilix.asClass)(_taskmanagerservice.TaskManagerService).singleton(),
-        [_containertokens.DITokens.toadScheduler]: (0, _awilix.asClass)(_toadscheduler.ToadScheduler).singleton(),
-        [_containertokens.DITokens.eventEmitter2]: (0, _awilix.asFunction)(_eventemitter.configureEventEmitter).singleton(),
-        [_containertokens.DITokens.cacheManager]: (0, _awilix.asFunction)(_cachemanager.configureCacheManager).singleton(),
-        [_containertokens.DITokens.serverReleaseService]: (0, _awilix.asClass)(_serverreleaseservice.ServerReleaseService).singleton(),
-        [_containertokens.DITokens.monsterPiService]: (0, _awilix.asClass)(_monsterpiservice.MonsterPiService).singleton(),
-        [_containertokens.DITokens.serverUpdateService]: (0, _awilix.asClass)(_serverupdateservice.ServerUpdateService).singleton(),
-        [_containertokens.DITokens.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
-        [_containertokens.DITokens.octokitService]: (0, _awilix.asFunction)((cradle)=>{
+        [di.socketFactory]: (0, _awilix.asClass)(_socketfactory.SocketFactory).transient(),
+        [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(),
+        [di.toadScheduler]: (0, _awilix.asClass)(_toadscheduler.ToadScheduler).singleton(),
+        [di.eventEmitter2]: (0, _awilix.asFunction)(_eventemitter.configureEventEmitter).singleton(),
+        [di.cacheManager]: (0, _awilix.asFunction)(_cachemanager.configureCacheManager).singleton(),
+        [di.serverReleaseService]: (0, _awilix.asClass)(_serverreleaseservice.ServerReleaseService).singleton(),
+        [di.monsterPiService]: (0, _awilix.asClass)(_monsterpiservice.MonsterPiService).singleton(),
+        [di.serverUpdateService]: (0, _awilix.asClass)(_serverupdateservice.ServerUpdateService).singleton(),
+        [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
+        [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
             const config = cradle.configService;
-            // cradle.
             return new _octokit.Octokit({
                 auth: config.get(_serverconstants.AppConstants.GITHUB_PAT)
             });
         }),
-        [_containertokens.DITokens.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
-        [_containertokens.DITokens.logDumpService]: (0, _awilix.asClass)(_logsmanagerservice.LogDumpService),
-        [_containertokens.DITokens.simpleGitService]: (0, _awilix.asValue)((0, _simplegit.default)()),
-        [_containertokens.DITokens.httpClient]: (0, _awilix.asValue)(_axios.default.create({
+        [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
+        [di.logDumpService]: (0, _awilix.asClass)(_logsmanagerservice.LogDumpService),
+        [di.simpleGitService]: (0, _awilix.asValue)((0, _simplegit.default)()),
+        [di.httpClient]: (0, _awilix.asValue)(_axios.default.create({
             maxBodyLength: 1000 * 1000 * 1000,
             maxContentLength: 1000 * 1000 * 1000
         })),
-        [_containertokens.DITokens.socketIoGateway]: (0, _awilix.asClass)(_socketiogateway.SocketIoGateway).singleton(),
-        [_containertokens.DITokens.multerService]: (0, _awilix.asClass)(_multerservice.MulterService).singleton(),
-        [_containertokens.DITokens.printerService]: (0, _awilix.asClass)(_printerservice.PrinterService),
-        [_containertokens.DITokens.printerFilesService]: (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService),
-        [_containertokens.DITokens.floorService]: (0, _awilix.asClass)(_floorservice.FloorService).singleton(),
-        [_containertokens.DITokens.yamlService]: (0, _awilix.asClass)(_yamlservice.YamlService),
-        [_containertokens.DITokens.printCompletionService]: (0, _awilix.asClass)(_printcompletionservice.PrintCompletionService).singleton(),
-        [_containertokens.DITokens.octoPrintApiService]: (0, _awilix.asClass)(_octoprintapiservice.OctoPrintApiService).singleton(),
-        [_containertokens.DITokens.cameraStreamService]: (0, _awilix.asClass)(_camerastreamservice.CameraStreamService),
-        [_containertokens.DITokens.batchCallService]: (0, _awilix.asClass)(_batchcallservice.BatchCallService).singleton(),
-        [_containertokens.DITokens.pluginFirmwareUpdateService]: (0, _awilix.asClass)(_pluginfirmwareupdateservice.PluginFirmwareUpdateService).singleton(),
-        [_containertokens.DITokens.octoPrintSockIoAdapter]: (0, _awilix.asClass)(_octoprintsockioadapter.OctoPrintSockIoAdapter).transient(),
-        [_containertokens.DITokens.floorStore]: (0, _awilix.asClass)(_floorstore.FloorStore).singleton(),
-        [_containertokens.DITokens.pluginRepositoryCache]: (0, _awilix.asClass)(_pluginrepositorycache.PluginRepositoryCache).singleton(),
-        [_containertokens.DITokens.fileCache]: (0, _awilix.asClass)(_filecache.FileCache).singleton(),
-        [_containertokens.DITokens.fileUploadTrackerCache]: (0, _awilix.asClass)(_fileuploadtrackercache.FileUploadTrackerCache).singleton(),
-        [_containertokens.DITokens.filesStore]: (0, _awilix.asClass)(_filesstore.FilesStore).singleton(),
-        [_containertokens.DITokens.printerCache]: (0, _awilix.asClass)(_printercache.PrinterCache).singleton(),
-        [_containertokens.DITokens.printerEventsCache]: (0, _awilix.asClass)(_printereventscache.PrinterEventsCache).singleton(),
-        [_containertokens.DITokens.printerSocketStore]: (0, _awilix.asClass)(_printersocketstore.PrinterSocketStore).singleton(),
-        [_containertokens.DITokens.testPrinterSocketStore]: (0, _awilix.asClass)(_testprintersocketstore.TestPrinterSocketStore).singleton(),
-        // Extensibility and export
-        [_containertokens.DITokens.customGCodeService]: (0, _awilix.asClass)(_customgcodeservice.CustomGcodeService),
-        [_containertokens.DITokens.influxDbV2BaseService]: (0, _awilix.asClass)(_influxdbv2baseservice.InfluxDbV2BaseService),
-        [_containertokens.DITokens.bootTask]: (0, _awilix.asClass)(_boottask.BootTask),
-        [_containertokens.DITokens.softwareUpdateTask]: (0, _awilix.asClass)(_softwareupdatetask.SoftwareUpdateTask),
-        [_containertokens.DITokens.socketIoTask]: (0, _awilix.asClass)(_socketiotask.SocketIoTask).singleton(),
-        [_containertokens.DITokens.clientDistDownloadTask]: (0, _awilix.asClass)(_clientbundletask.ClientDistDownloadTask).singleton(),
-        [_containertokens.DITokens.printCompletionSocketIoTask]: (0, _awilix.asClass)(_printcompletionsocketiotask.PrintCompletionSocketIoTask).singleton(),
-        [_containertokens.DITokens.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
-        [_containertokens.DITokens.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
-        [_containertokens.DITokens.printerFileCleanTask]: (0, _awilix.asClass)(_printerfilecleantask.PrinterFileCleanTask).singleton()
+        [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(),
+        [di.floorStore]: (0, _awilix.asClass)(_floorstore.FloorStore).singleton(),
+        [di.pluginRepositoryCache]: (0, _awilix.asClass)(_pluginrepositorycache.PluginRepositoryCache).singleton(),
+        [di.fileCache]: (0, _awilix.asClass)(_filecache.FileCache).singleton(),
+        [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.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),
+        [di.socketIoTask]: (0, _awilix.asClass)(_socketiotask.SocketIoTask).singleton(),
+        [di.clientDistDownloadTask]: (0, _awilix.asClass)(_clientbundletask.ClientDistDownloadTask).singleton(),
+        [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.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","register","DITokens","serverTasks","asValue","ServerTasks","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","filesStore","FilesStore","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;;;8DA9DE;kEACI;yBACE;wBACqD;+BAC/C;iCACL;gCACM;+BACD;iCACE;sCACK;oCACF;qCACC;+BACN;2BACJ;sCACW;8BACR;qCACO;+BACN;4BACH;8BACW;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;IACd,uFAAuF;IACvF,MAAMC,YAAYC,IAAAA,uBAAe,EAAC;QAChCC,eAAeC,qBAAa,CAACC,KAAK;IACpC;IAEAJ,UAAUK,QAAQ,CAAC;QACjB,qCAAqC;QACrC,CAACC,yBAAQ,CAACC,WAAW,CAAC,EAAEC,IAAAA,eAAO,EAACC,kBAAW;QAC3C,8GAA8G;QAC9G,CAACH,yBAAQ,CAACI,cAAc,CAAC,EAAEF,IAAAA,eAAO,EAACG,6BAAK,CAACC,KAAK;QAC9C,CAACN,yBAAQ,CAACO,qBAAqB,CAAC,EAAEL,IAAAA,eAAO,EAACG,6BAAK,CAACC,KAAK;QACrD,CAACN,yBAAQ,CAACQ,aAAa,CAAC,EAAEC,IAAAA,kBAAU,EAAC;YACnC,OAAOC,QAAQC,GAAG,CAACC,6BAAY,CAACC,WAAW,CAAC;QAC9C;QACA,CAACb,yBAAQ,CAACc,aAAa,CAAC,EAAEC,IAAAA,eAAO,EAACC,4BAAa,EAAEC,SAAS;QAE1D,gBAAgB;QAChB,CAACjB,yBAAQ,CAACkB,UAAU,CAAC,EAAEH,IAAAA,eAAO,EAACI,sBAAU,EAAEC,SAAS;QACpD,CAACpB,yBAAQ,CAACqB,aAAa,CAAC,EAAEN,IAAAA,eAAO,EAACO,4BAAa,EAAEF,SAAS;QAC1D,CAACpB,yBAAQ,CAACuB,eAAe,CAAC,EAAER,IAAAA,eAAO,EAACS,gCAAe;QACnD,CAACxB,yBAAQ,CAACyB,aAAa,CAAC,EAAEV,IAAAA,eAAO,EAACW,4BAAa;QAC/C,CAAC1B,yBAAQ,CAAC2B,WAAW,CAAC,EAAEZ,IAAAA,eAAO,EAACa,wBAAW,EAAER,SAAS;QACtD,CAACpB,yBAAQ,CAAC6B,mBAAmB,CAAC,EAAEd,IAAAA,eAAO,EAACe,wCAAmB,EAAEV,SAAS;QACtE,CAACpB,yBAAQ,CAAC+B,WAAW,CAAC,EAAEhB,IAAAA,eAAO,EAACiB,wBAAW;QAC3C,CAAChC,yBAAQ,CAACiC,WAAW,CAAC,EAAElB,IAAAA,eAAO,EAACmB,wBAAW,EAAEd,SAAS;QACtD,CAACpB,yBAAQ,CAACmC,iBAAiB,CAAC,EAAEpB,IAAAA,eAAO,EAACqB,oCAAiB,EAAEhB,SAAS;QAClE,CAACpB,yBAAQ,CAACqC,UAAU,CAAC,EAAEtB,IAAAA,eAAO,EAACuB,sBAAU,EAAElB,SAAS;QAEpD,CAACpB,yBAAQ,CAACuC,aAAa,CAAC,EAAE9B,IAAAA,kBAAU,EAAC+B,4BAAa,EAAEvB,SAAS;QAC7D,CAACjB,yBAAQ,CAACyC,kBAAkB,CAAC,EAAE1B,IAAAA,eAAO,EAAC2B,sCAAkB,EAAEtB,SAAS;QACpE,CAACpB,yBAAQ,CAAC2C,aAAa,CAAC,EAAE5B,IAAAA,eAAO,EAAC6B,4BAAa,EAAExB,SAAS;QAC1D,CAACpB,yBAAQ,CAAC6C,aAAa,CAAC,EAAEpC,IAAAA,kBAAU,EAACqC,mCAAqB,EAAE1B,SAAS;QACrE,CAACpB,yBAAQ,CAAC+C,YAAY,CAAC,EAAEtC,IAAAA,kBAAU,EAACuC,mCAAqB,EAAE5B,SAAS;QACpE,CAACpB,yBAAQ,CAACiD,oBAAoB,CAAC,EAAElC,IAAAA,eAAO,EAACmC,0CAAoB,EAAE9B,SAAS;QACxE,CAACpB,yBAAQ,CAACmD,gBAAgB,CAAC,EAAEpC,IAAAA,eAAO,EAACqC,kCAAgB,EAAEhC,SAAS;QAChE,CAACpB,yBAAQ,CAACqD,mBAAmB,CAAC,EAAEtC,IAAAA,eAAO,EAACuC,wCAAmB,EAAElC,SAAS;QACtE,CAACpB,yBAAQ,CAACuD,aAAa,CAAC,EAAExC,IAAAA,eAAO,EAACyC,4BAAa;QAC/C,CAACxD,yBAAQ,CAACyD,cAAc,CAAC,EAAEhD,IAAAA,kBAAU,EAAC,CAACiD;YACrC,MAAMC,SAASD,OAAOjC,aAAa;YACnC,UAAU;YACV,OAAO,IAAImC,gBAAO,CAAC;gBACjBC,MAAMF,OAAOG,GAAG,CAAClD,6BAAY,CAACmD,UAAU;YAC1C;QACF;QACA,CAAC/D,yBAAQ,CAACgE,mBAAmB,CAAC,EAAEjD,IAAAA,eAAO,EAACkD,wCAAmB;QAC3D,CAACjE,yBAAQ,CAACkE,cAAc,CAAC,EAAEnD,IAAAA,eAAO,EAACoD,kCAAc;QACjD,CAACnE,yBAAQ,CAACoE,gBAAgB,CAAC,EAAElE,IAAAA,eAAO,EAACmE,IAAAA,kBAAS;QAC9C,CAACrE,yBAAQ,CAACsE,UAAU,CAAC,EAAEpE,IAAAA,eAAO,EAC5BqE,cAAK,CAACC,MAAM,CAAC;YACXC,eAAe,OAAO,OAAO;YAC7BC,kBAAkB,OAAO,OAAO;QAClC;QAGF,CAAC1E,yBAAQ,CAAC2E,eAAe,CAAC,EAAE5D,IAAAA,eAAO,EAAC6D,gCAAe,EAAExD,SAAS;QAC9D,CAACpB,yBAAQ,CAAC6E,aAAa,CAAC,EAAE9D,IAAAA,eAAO,EAAC+D,4BAAa,EAAE1D,SAAS;QAC1D,CAACpB,yBAAQ,CAAC+E,cAAc,CAAC,EAAEhE,IAAAA,eAAO,EAACiE,8BAAc;QACjD,CAAChF,yBAAQ,CAACiF,mBAAmB,CAAC,EAAElE,IAAAA,eAAO,EAACmE,wCAAmB;QAC3D,CAAClF,yBAAQ,CAACmF,YAAY,CAAC,EAAEpE,IAAAA,eAAO,EAACqE,0BAAY,EAAEhE,SAAS;QACxD,CAACpB,yBAAQ,CAACqF,WAAW,CAAC,EAAEtE,IAAAA,eAAO,EAACuE,wBAAW;QAC3C,CAACtF,yBAAQ,CAACuF,sBAAsB,CAAC,EAAExE,IAAAA,eAAO,EAACyE,8CAAsB,EAAEpE,SAAS;QAC5E,CAACpB,yBAAQ,CAACyF,mBAAmB,CAAC,EAAE1E,IAAAA,eAAO,EAAC2E,wCAAmB,EAAEtE,SAAS;QACtE,CAACpB,yBAAQ,CAAC2F,mBAAmB,CAAC,EAAE5E,IAAAA,eAAO,EAAC6E,wCAAmB;QAC3D,CAAC5F,yBAAQ,CAAC6F,gBAAgB,CAAC,EAAE9E,IAAAA,eAAO,EAAC+E,kCAAgB,EAAE1E,SAAS;QAChE,CAACpB,yBAAQ,CAAC+F,2BAA2B,CAAC,EAAEhF,IAAAA,eAAO,EAACiF,wDAA2B,EAAE5E,SAAS;QACtF,CAACpB,yBAAQ,CAACiG,sBAAsB,CAAC,EAAElF,IAAAA,eAAO,EAACmF,8CAAsB,EAAEjF,SAAS;QAC5E,CAACjB,yBAAQ,CAACmG,UAAU,CAAC,EAAEpF,IAAAA,eAAO,EAACqF,sBAAU,EAAEhF,SAAS;QACpD,CAACpB,yBAAQ,CAACqG,qBAAqB,CAAC,EAAEtF,IAAAA,eAAO,EAACuF,4CAAqB,EAAElF,SAAS;QAE1E,CAACpB,yBAAQ,CAACuG,SAAS,CAAC,EAAExF,IAAAA,eAAO,EAACyF,oBAAS,EAAEpF,SAAS;QAClD,CAACpB,yBAAQ,CAACyG,sBAAsB,CAAC,EAAE1F,IAAAA,eAAO,EAAC2F,8CAAsB,EAAEtF,SAAS;QAC5E,CAACpB,yBAAQ,CAAC2G,UAAU,CAAC,EAAE5F,IAAAA,eAAO,EAAC6F,sBAAU,EAAExF,SAAS;QACpD,CAACpB,yBAAQ,CAAC6G,YAAY,CAAC,EAAE9F,IAAAA,eAAO,EAAC+F,0BAAY,EAAE1F,SAAS;QACxD,CAACpB,yBAAQ,CAAC+G,kBAAkB,CAAC,EAAEhG,IAAAA,eAAO,EAACiG,sCAAkB,EAAE5F,SAAS;QACpE,CAACpB,yBAAQ,CAACiH,kBAAkB,CAAC,EAAElG,IAAAA,eAAO,EAACmG,sCAAkB,EAAE9F,SAAS;QACpE,CAACpB,yBAAQ,CAACmH,sBAAsB,CAAC,EAAEpG,IAAAA,eAAO,EAACqG,8CAAsB,EAAEhG,SAAS;QAE5E,2BAA2B;QAC3B,CAACpB,yBAAQ,CAACqH,kBAAkB,CAAC,EAAEtG,IAAAA,eAAO,EAACuG,sCAAkB;QACzD,CAACtH,yBAAQ,CAACuH,qBAAqB,CAAC,EAAExG,IAAAA,eAAO,EAACyG,4CAAqB;QAE/D,CAACxH,yBAAQ,CAACyH,QAAQ,CAAC,EAAE1G,IAAAA,eAAO,EAAC2G,kBAAQ;QACrC,CAAC1H,yBAAQ,CAAC2H,kBAAkB,CAAC,EAAE5G,IAAAA,eAAO,EAAC6G,sCAAkB;QACzD,CAAC5H,yBAAQ,CAAC6H,YAAY,CAAC,EAAE9G,IAAAA,eAAO,EAAC+G,0BAAY,EAAE1G,SAAS;QACxD,CAACpB,yBAAQ,CAAC+H,sBAAsB,CAAC,EAAEhH,IAAAA,eAAO,EAACiH,wCAAsB,EAAE5G,SAAS;QAC5E,CAACpB,yBAAQ,CAACiI,2BAA2B,CAAC,EAAElH,IAAAA,eAAO,EAACmH,wDAA2B,EAAE9G,SAAS;QACtF,CAACpB,yBAAQ,CAACmI,oBAAoB,CAAC,EAAEpH,IAAAA,eAAO,EAACqH,0CAAoB,EAAEhH,SAAS;QACxE,CAACpB,yBAAQ,CAACqI,2BAA2B,CAAC,EAAEtH,IAAAA,eAAO,EAACuH,wDAA2B,EAAElH,SAAS;QACtF,CAACpB,yBAAQ,CAACuI,oBAAoB,CAAC,EAAExH,IAAAA,eAAO,EAACyH,0CAAoB,EAAEpH,SAAS;IAC1E;IAEA,OAAO1B;AACT"}
+{"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":"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"}

package/dist/container.tokens.js

@@ -9,13 +9,11 @@ Object.defineProperty(exports, "DITokens", {
     }
 });
 const DITokens = {
-    // Values
     serverVersion: "serverVersion",
     isTypeormMode: "isTypeormMode",
     appDefaultRole: "appDefaultRole",
     appDefaultRoleNoLogin: "appDefaultRoleNoLogin",
     typeormService: "typeormService",
-    // Instances
     serverHost: "serverHost",
     loggerFactory: "loggerFactory",
     httpClient: "httpClient",
@@ -44,6 +42,7 @@ const DITokens = {
     authService: "authService",
     refreshTokenService: "refreshTokenService",
     userService: "userService",
+    userRoleService: "userRoleService",
     permissionService: "permissionService",
     jwtService: "jwtService",
     roleService: "roleService",
@@ -57,20 +56,16 @@ const DITokens = {
     systemInfoBundleService: "systemInfoBundleService",
     printerFilesService: "printerFilesService",
     customGCodeService: "customGCodeService",
-    // Stores/states
     settingsStore: "settingsStore",
     printerCache: "printerCache",
     printerEventsCache: "printerEventsCache",
     printerSocketStore: "printerSocketStore",
     testPrinterSocketStore: "testPrinterSocketStore",
-    octoPrintLogsCache: "printerTickerStore",
-    filesStore: "filesStore",
+    printerFilesStore: "printerFilesStore",
     octoPrintSockIoAdapter: "octoPrintSockIoAdapter",
-    // Caches
     floorStore: "floorStore",
     fileCache: "fileCache",
     fileUploadTrackerCache: "fileUploadTrackerCache",
-    // Tasks
     serverTasks: "serverTasks",
     bootTask: "bootTask",
     softwareUpdateTask: "softwareUpdateTask",

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","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","octoPrintLogsCache","filesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtB,SAAS;IACTC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAChB,YAAY;IACZC,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,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;IACpB,gBAAgB;IAChBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,oBAAoB;IACpBC,YAAY;IACZC,wBAAwB;IACxB,SAAS;IACTC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IACxB,QAAQ;IACRC,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","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"}

package/dist/controllers/auth.controller.js

@@ -99,7 +99,6 @@ class AuthController {
         if (!isLoginRequired) {
             return res.end();
         }
-        // Get token from header
         const jwtToken = req.headers.authorization?.replace("Bearer ", "") || undefined;
         const userId = req.user.id;
         await this.authService.logoutUserId(userId, jwtToken);
@@ -128,7 +127,6 @@ class AuthController {
             needsPasswordChange: false,
             isDemoUser: false,
             isRootUser: false,
-            // An admin needs to verify the user first
             isVerified: false
         });
         const userDto = this.userService.toDto(result);

package/dist/controllers/auth.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","log","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/auth.controller.ts"],"names":["AuthController","authService","settingsStore","userService","roleService","logger","configService","constructor","loggerFactory","name","login","req","res","log","ip","headers","tokens","loginUser","body","username","password","send","getLoginRequired","loginRequired","registration","isRegistrationEnabled","wizardState","getWizardState","isDemoMode","verifyLogin","success","needsPasswordChange","isLoginRequired","authenticated","isAuthenticated","user","refreshLogin","refreshToken","validateMiddleware","refreshTokenRules","idToken","renewLoginByRefreshToken","token","logout","end","jwtToken","authorization","replace","undefined","userId","id","logoutUserId","register","registrationEnabled","BadRequestException","registerUserRules","toLowerCase","includes","roles","getAppDefaultRoleIds","result","isDemoUser","isRootUser","isVerified","userDto","toDto","createController","prefix","AppConstants","apiRoute","post","demoUserNotAllowedInterceptor","get","before","authenticate"],"mappings":"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"}

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

@@ -24,26 +24,28 @@ const _authenticate = require("../middleware/authenticate");
 const _authorizationconstants = require("../constants/authorization.constants");
 class BatchCallController {
     batchCallService;
-    constructor({ batchCallService }){
+    isTypeormMode;
+    constructor({ batchCallService, isTypeormMode }){
         this.batchCallService = batchCallService;
+        this.isTypeormMode = isTypeormMode;
     }
     async batchConnectUsb(req, res) {
-        const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterRules);
+        const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
         const results = await this.batchCallService.batchConnectUsb(printerIds);
         res.send(results);
     }
     async batchConnectSocket(req, res) {
-        const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterRules);
+        const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
         await this.batchCallService.batchConnectSocket(printerIds);
         res.send({});
     }
     async batchReprintFiles(req, res) {
-        const { printerIds } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrinterRules);
+        const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
         const results = await this.batchCallService.batchReprintCalls(printerIds);
         res.send(results);
     }
     async batchTogglePrintersEnabled(req, res) {
-        const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, _batchcontrollervalidation.batchPrintersEnabledRules);
+        const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrintersEnabledRules)(this.isTypeormMode));
         const results = await this.batchCallService.batchTogglePrintersEnabled(printerIds, enabled);
         res.send(results);
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/batch-call.controller.ts"],"names":["BatchCallController","batchCallService","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;;IAgCb,OAMyD;eANzD;;;+BAzCiC;4BACH;2CAC+B;iCAChC;8BACgB;wCACvB;AAIf,MAAMA;IACXC,iBAAmC;IAEnCC,YAAY,EAAED,gBAAgB,EAA0C,CAAE;QACxE,IAAI,CAACA,gBAAgB,GAAGA;IAC1B;IAEA,MAAME,gBAAgBC,GAAY,EAAEC,GAAa,EAAE;QACjD,MAAM,EAAEC,UAAU,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACH,IAAII,IAAI,EAAEC,4CAAiB;QACtE,MAAMC,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACE,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,4CAAiB;QACtE,MAAM,IAAI,CAACR,gBAAgB,CAACW,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,4CAAiB;QACtE,MAAMC,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACa,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,oDAAyB;QACvF,MAAMP,UAAU,MAAM,IAAI,CAACT,gBAAgB,CAACc,0BAA0B,CAACT,YAAYU;QACnFX,IAAIM,IAAI,CAACD;IACX;AACF;MAEA,WAAeQ,IAAAA,+BAAgB,EAAClB,qBAC7BmB,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","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"}

package/dist/controllers/camera-stream.controller.js

@@ -23,15 +23,17 @@ const _genericvalidation = require("./validation/generic.validation");
 const _authenticate = require("../middleware/authenticate");
 class CameraStreamController {
     cameraStreamService;
-    constructor({ cameraStreamService }){
+    isTypeormMode;
+    constructor({ cameraStreamService, isTypeormMode }){
         this.cameraStreamService = cameraStreamService;
+        this.isTypeormMode = isTypeormMode;
     }
     async list(req, res) {
         const result = await this.cameraStreamService.list();
         res.send(result.map((item)=>this.cameraStreamService.toDto(item)));
     }
     async get(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const result = await this.cameraStreamService.get(id);
         res.send(this.cameraStreamService.toDto(result));
     }
@@ -40,12 +42,12 @@ class CameraStreamController {
         res.send(this.cameraStreamService.toDto(result));
     }
     async update(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const result = await this.cameraStreamService.update(id, req.body);
         res.send(this.cameraStreamService.toDto(result));
     }
     async delete(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         await this.cameraStreamService.delete(id);
         res.send();
     }

package/dist/controllers/camera-stream.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/camera-stream.controller.ts"],"names":["CameraStreamController","cameraStreamService","constructor","list","req","res","result","send","map","item","toDto","get","id","validateInput","params","idRules","create","body","update","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","post","put"],"mappings":";;;;;;;;;;;IAQaA,sBAAsB;eAAtBA;;IAoCb,OAOyB;eAPzB;;;+BA5CiC;iCACJ;4BACC;mCACN;8BACK;AAItB,MAAMA;IACXC,oBAA0C;IAE1CC,YAAY,EAAED,mBAAmB,EAAiD,CAAE;QAClF,IAAI,CAACA,mBAAmB,GAAGA;IAC7B;IAEA,MAAME,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACL,mBAAmB,CAACE,IAAI;QAClDE,IAAIE,IAAI,CAACD,OAAOE,GAAG,CAAC,CAACC,OAAS,IAAI,CAACR,mBAAmB,CAACS,KAAK,CAACD;IAC/D;IAEA,MAAME,IAAIP,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAMT,SAAS,MAAM,IAAI,CAACL,mBAAmB,CAACU,GAAG,CAACC;QAClDP,IAAIE,IAAI,CAAC,IAAI,CAACN,mBAAmB,CAACS,KAAK,CAACJ;IAC1C;IAEA,MAAMU,OAAOZ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMC,SAAS,MAAM,IAAI,CAACL,mBAAmB,CAACe,MAAM,CAACZ,IAAIa,IAAI;QAC7DZ,IAAIE,IAAI,CAAC,IAAI,CAACN,mBAAmB,CAACS,KAAK,CAACJ;IAC1C;IAEA,MAAMY,OAAOd,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAMT,SAAS,MAAM,IAAI,CAACL,mBAAmB,CAACiB,MAAM,CAACN,IAAIR,IAAIa,IAAI;QACjEZ,IAAIE,IAAI,CAAC,IAAI,CAACN,mBAAmB,CAACS,KAAK,CAACJ;IAC1C;IAEA,MAAMa,OAAOf,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAM,IAAI,CAACd,mBAAmB,CAACkB,MAAM,CAACP;QACtCP,IAAIE,IAAI;IACV;AACF;MAEA,WAAea,IAAAA,+BAAgB,EAACpB,wBAC7BqB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,kBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBd,GAAG,CAAC,KAAK,QACTA,GAAG,CAAC,QAAQ,OACZe,IAAI,CAAC,KAAK,UACVP,MAAM,CAAC,QAAQ,UACfQ,GAAG,CAAC,QAAQ"}
+{"version":3,"sources":["../../src/controllers/camera-stream.controller.ts"],"names":["CameraStreamController","cameraStreamService","isTypeormMode","constructor","list","req","res","result","send","map","item","toDto","get","id","validateInput","params","idRulesV2","create","body","update","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","post","put"],"mappings":";;;;;;;;;;;IAQaA,sBAAsB;eAAtBA;;IAsCb,OAOyB;eAPzB;;;+BA9CiC;iCACJ;4BACC;mCACJ;8BACG;AAItB,MAAMA;IACHC,oBAA0C;IACjCC,cAAuB;IAExCC,YAAY,EAAEF,mBAAmB,EAAEC,aAAa,EAAyE,CAAE;QACzH,IAAI,CAACD,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAME,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,SAAS,MAAM,IAAI,CAACN,mBAAmB,CAACG,IAAI;QAClDE,IAAIE,IAAI,CAACD,OAAOE,GAAG,CAAC,CAACC,OAAS,IAAI,CAACT,mBAAmB,CAACU,KAAK,CAACD;IAC/D;IAEA,MAAME,IAAIP,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACd,aAAa;QAC3E,MAAMK,SAAS,MAAM,IAAI,CAACN,mBAAmB,CAACW,GAAG,CAACC;QAClDP,IAAIE,IAAI,CAAC,IAAI,CAACP,mBAAmB,CAACU,KAAK,CAACJ;IAC1C;IAEA,MAAMU,OAAOZ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMC,SAAS,MAAM,IAAI,CAACN,mBAAmB,CAACgB,MAAM,CAACZ,IAAIa,IAAI;QAC7DZ,IAAIE,IAAI,CAAC,IAAI,CAACP,mBAAmB,CAACU,KAAK,CAACJ;IAC1C;IAEA,MAAMY,OAAOd,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACd,aAAa;QAC3E,MAAMK,SAAS,MAAM,IAAI,CAACN,mBAAmB,CAACkB,MAAM,CAACN,IAAIR,IAAIa,IAAI;QACjEZ,IAAIE,IAAI,CAAC,IAAI,CAACP,mBAAmB,CAACU,KAAK,CAACJ;IAC1C;IAEA,MAAMa,OAAOf,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,IAAAA,4BAAS,EAAC,IAAI,CAACd,aAAa;QAC3E,MAAM,IAAI,CAACD,mBAAmB,CAACmB,MAAM,CAACP;QACtCP,IAAIE,IAAI;IACV;AACF;MAEA,WAAea,IAAAA,+BAAgB,EAACrB,wBAC7BsB,MAAM,CAACC,6BAAY,CAACC,QAAQ,GAAG,kBAC/BC,MAAM,CAAC;IAACC,IAAAA,0BAAY;CAAG,EACvBd,GAAG,CAAC,KAAK,QACTA,GAAG,CAAC,QAAQ,OACZe,IAAI,CAAC,KAAK,UACVP,MAAM,CAAC,QAAQ,UACfQ,GAAG,CAAC,QAAQ"}

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

@@ -9,8 +9,8 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    CustomGCodeController: function() {
-        return CustomGCodeController;
+    CustomGcodeController: function() {
+        return CustomGcodeController;
     },
     default: function() {
         return _default;
@@ -23,25 +23,25 @@ const _authorizationconstants = require("../constants/authorization.constants");
 const _validators = require("../handlers/validators");
 const _genericvalidation = require("./validation/generic.validation");
 const _printer = require("../middleware/printer");
-class CustomGCodeController {
+class CustomGcodeController {
     octoPrintApiService;
     customGCodeService;
-    constructor({ customGCodeService, octoPrintApiService }){
+    isTypeormMode;
+    constructor({ customGCodeService, octoPrintApiService, isTypeormMode }){
         this.customGCodeService = customGCodeService;
         this.octoPrintApiService = octoPrintApiService;
+        this.isTypeormMode = isTypeormMode;
     }
     async list(req, res) {
         const entities = await this.customGCodeService.list();
         res.send(entities.map((e)=>this.customGCodeService.toDto(e)));
     }
     async get(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const entity = await this.customGCodeService.get(id);
         res.send(this.customGCodeService.toDto(entity));
     }
-    /**
-   * Sends gcode according to https://docs.octoprint.org/en/master/api/printer.html#send-an-arbitrary-command-to-the-printer
-   */ async sendEmergencyM112(req, res) {
+    async sendEmergencyM112(req, res) {
         const { printerLogin } = (0, _validators.getScopedPrinter)(req);
         const response = await this.octoPrintApiService.sendCustomGCodeCommand(printerLogin, "M112");
         res.send(response);
@@ -51,17 +51,17 @@ class CustomGCodeController {
         res.send(this.customGCodeService.toDto(entity));
     }
     async delete(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         await this.customGCodeService.delete(id);
         res.send();
     }
     async update(req, res) {
-        const { id } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const updatedScript = await this.customGCodeService.update(id, req.body);
         res.send(this.customGCodeService.toDto(updatedScript));
     }
 }
-const _default = (0, _awilixexpress.createController)(CustomGCodeController).prefix(`${_serverconstants.AppConstants.apiRoute}/custom-gcode`).before([
+const _default = (0, _awilixexpress.createController)(CustomGcodeController).prefix(`${_serverconstants.AppConstants.apiRoute}/custom-gcode`).before([
     (0, _authenticate.authenticate)(),
     (0, _authenticate.authorizeRoles)([
         _authorizationconstants.ROLES.ADMIN,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGCodeController","octoPrintApiService","customGCodeService","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRules","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":";;;;;;;;;;;IAWaA,qBAAqB;eAArBA;;IAqDb,OAQyB;eARzB;;;+BAhEiC;8BACY;iCAChB;wCACP;4BAC0B;mCACxB;yBACiB;AAKlC,MAAMA;IACHC,oBAAyC;IACzCC,mBAAwC;IAEhDC,YAAY,EACVD,kBAAkB,EAClBD,mBAAmB,EAIpB,CAAE;QACD,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACD,mBAAmB,GAAGA;IAC7B;IAEA,MAAMG,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,WAAW,MAAM,IAAI,CAACL,kBAAkB,CAACE,IAAI;QACnDE,IAAIE,IAAI,CAACD,SAASE,GAAG,CAAC,CAACC,IAAM,IAAI,CAACR,kBAAkB,CAACS,KAAK,CAACD;IAC7D;IAEA,MAAME,IAAIP,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAMC,SAAS,MAAM,IAAI,CAACf,kBAAkB,CAACU,GAAG,CAACC;QACjDP,IAAIE,IAAI,CAAC,IAAI,CAACN,kBAAkB,CAACS,KAAK,CAACM;IACzC;IAEA;;GAEC,GACD,MAAMC,kBAAkBb,GAAY,EAAEC,GAAa,EAAE;QACnD,MAAM,EAAEa,YAAY,EAAE,GAAGC,IAAAA,4BAAgB,EAACf;QAC1C,MAAMgB,WAAW,MAAM,IAAI,CAACpB,mBAAmB,CAACqB,sBAAsB,CAACH,cAAc;QACrFb,IAAIE,IAAI,CAACa;IACX;IAEA,MAAME,OAAOlB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMW,SAAS,MAAM,IAAI,CAACf,kBAAkB,CAACqB,MAAM,CAAClB,IAAImB,IAAI;QAC5DlB,IAAIE,IAAI,CAAC,IAAI,CAACN,kBAAkB,CAACS,KAAK,CAACM;IACzC;IAEA,MAAMQ,OAAOpB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAM,IAAI,CAACd,kBAAkB,CAACuB,MAAM,CAACZ;QACrCP,IAAIE,IAAI;IACV;IAEA,MAAMkB,OAAOrB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEO,EAAE,EAAE,GAAG,MAAMC,IAAAA,yBAAa,EAACT,IAAIU,MAAM,EAAEC,0BAAO;QACtD,MAAMW,gBAAgB,MAAM,IAAI,CAACzB,kBAAkB,CAACwB,MAAM,CAACb,IAAIR,IAAImB,IAAI;QACvElB,IAAIE,IAAI,CAAC,IAAI,CAACN,kBAAkB,CAACS,KAAK,CAACgB;IACzC;AACF;MAEA,WAAeC,IAAAA,+BAAgB,EAAC5B,uBAC7B6B,MAAM,CAAC,CAAC,EAAEC,6BAAY,CAACC,QAAQ,CAAC,aAAa,CAAC,EAC9CC,MAAM,CAAC;IAACC,IAAAA,0BAAY;IAAIC,IAAAA,4BAAc,EAAC;QAACC,6BAAK,CAACC,KAAK;QAAED,6BAAK,CAACE,QAAQ;KAAC;CAAE,EACtEzB,GAAG,CAAC,KAAK,QACTA,GAAG,CAAC,QAAQ,OACZ0B,IAAI,CAAC,KAAK,UACVA,IAAI,CAAC,mCAAmC,qBAAqB;IAAEN,QAAQ;QAACO,IAAAA,iCAAwB,EAAC;KAAa;AAAC,GAC/Gd,MAAM,CAAC,QAAQ,UACfe,GAAG,CAAC,QAAQ"}
+{"version":3,"sources":["../../src/controllers/custom-gcode.controller.ts"],"names":["CustomGcodeController","octoPrintApiService","customGCodeService","isTypeormMode","constructor","list","req","res","entities","send","map","e","toDto","get","id","validateInput","params","idRulesV2","entity","sendEmergencyM112","printerLogin","getScopedPrinter","response","sendCustomGCodeCommand","create","body","delete","update","updatedScript","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","post","printerResolveMiddleware","put"],"mappings":"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"}

package/dist/controllers/floor.controller.js

@@ -24,35 +24,32 @@ const _genericvalidation = require("./validation/generic.validation");
 const _authorizationconstants = require("../constants/authorization.constants");
 class FloorController {
     floorStore;
-    constructor({ floorStore }){
+    isTypeormMode;
+    constructor({ floorStore, isTypeormMode }){
         this.floorStore = floorStore;
+        this.isTypeormMode = isTypeormMode;
     }
     async create(req, res) {
-        // Has internal validation
         const floor = await this.floorStore.create(req.body);
         res.send(floor);
     }
     async updateName(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
-        // Has internal validation
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const floor = await this.floorStore.updateName(floorId, req.body.name);
         res.send(floor);
     }
     async updateFloorNumber(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
-        // Has internal validation
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const floor = await this.floorStore.updateFloorNumber(floorId, req.body.floor);
         res.send(floor);
     }
     async addPrinterToFloor(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
-        // Has internal validation
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const floor = await this.floorStore.addOrUpdatePrinter(floorId, req.body);
         res.send(floor);
     }
     async removePrinterFromFloor(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
-        // Has internal validation
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const floor = await this.floorStore.removePrinter(floorId, req.body.printerId);
         res.send(floor);
     }
@@ -61,12 +58,12 @@ class FloorController {
         res.send(floors);
     }
     async get(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         const floor = await this.floorStore.getFloor(floorId);
         res.send(floor);
     }
     async delete(req, res) {
-        const { id: floorId } = await (0, _validators.validateInput)(req.params, _genericvalidation.idRules);
+        const { id: floorId } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
         await this.floorStore.delete(floorId);
         res.send();
     }

package/dist/controllers/floor.controller.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","constructor","create","req","res","floor","body","send","updateName","id","floorId","validateInput","params","idRules","name","updateFloorNumber","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","list","floors","listCache","get","getFloor","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterFloors","List","Get","patch","Update","post","Delete","Create"],"mappings":"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"}
+{"version":3,"sources":["../../src/controllers/floor.controller.ts"],"names":["FloorController","floorStore","isTypeormMode","constructor","create","req","res","floor","body","send","updateName","id","floorId","validateInput","params","idRulesV2","name","updateFloorNumber","addPrinterToFloor","addOrUpdatePrinter","removePrinterFromFloor","removePrinter","printerId","list","floors","listCache","get","getFloor","delete","createController","prefix","AppConstants","apiRoute","before","authenticate","withPermission","PERMS","PrinterFloors","List","Get","patch","Update","post","Delete","Create"],"mappings":"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"}