@fdm-monster/server 1.6.0-rc3 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/README.md +1 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +70 -0
- package/dist/controllers/printer-group.controller.js.map +1 -0
- package/dist/controllers/server-public.controller.js +8 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/data-source.js +8 -2
- package/dist/data-source.js.map +1 -1
- package/dist/entities/floor-position.entity.js +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/group.entity.js +35 -0
- package/dist/entities/group.entity.js.map +1 -0
- package/dist/entities/printer-group.entity.js +66 -0
- package/dist/entities/printer-group.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +6 -0
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +85 -0
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -0
- package/dist/server.constants.js +1 -1
- package/dist/services/interfaces/group.dto.js +6 -0
- package/dist/services/interfaces/group.dto.js.map +1 -0
- package/dist/services/interfaces/printer-group.dto.js +41 -0
- package/dist/services/interfaces/printer-group.dto.js.map +1 -0
- package/dist/services/interfaces/printer-group.service.interface.js +6 -0
- package/dist/services/interfaces/printer-group.service.interface.js.map +1 -0
- package/dist/services/orm/printer-group.service.js +114 -0
- package/dist/services/orm/printer-group.service.js.map +1 -0
- package/dist/state/file-upload-tracker.cache.js +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/tasks/boot.task.js +4 -3
- package/dist/tasks/boot.task.js.map +1 -1
- package/package.json +12 -12
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/README.md
CHANGED
|
@@ -82,7 +82,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
|
|
|
82
82
|
<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>
|
|
83
83
|
<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>
|
|
84
84
|
<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>
|
|
85
|
-
<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>
|
|
85
|
+
<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> <a href="#ideas-doucettom" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
86
86
|
</tr>
|
|
87
87
|
</tbody>
|
|
88
88
|
</table>
|
package/dist/container.js
CHANGED
|
@@ -94,6 +94,7 @@ const _floorservice1 = require("./services/orm/floor.service");
|
|
|
94
94
|
const _floorpositionservice = require("./services/orm/floor-position.service");
|
|
95
95
|
const _typeormservice = require("./services/typeorm/typeorm.service");
|
|
96
96
|
const _userroleservice = require("./services/orm/user-role.service");
|
|
97
|
+
const _printergroupservice = require("./services/orm/printer-group.service");
|
|
97
98
|
function _interop_require_default(obj) {
|
|
98
99
|
return obj && obj.__esModule ? obj : {
|
|
99
100
|
default: obj
|
|
@@ -124,6 +125,7 @@ function configureContainer(isSqlite = false) {
|
|
|
124
125
|
...config(di.floorPositionService, isSqlite, (0, _awilix.asClass)(_floorpositionservice.FloorPositionService).singleton(), (0, _awilix.asValue)(null)),
|
|
125
126
|
...config(di.cameraStreamService, isSqlite, (0, _awilix.asClass)(_camerastreamservice1.CameraStreamService).singleton(), (0, _awilix.asClass)(_camerastreamservice.CameraStreamService).singleton()),
|
|
126
127
|
...config(di.printerService, isSqlite, (0, _awilix.asClass)(_printerservice1.PrinterService), (0, _awilix.asClass)(_printerservice.PrinterService)),
|
|
128
|
+
...config(di.printerGroupService, isSqlite, (0, _awilix.asClass)(_printergroupservice.PrinterGroupService), (0, _awilix.asValue)(null)),
|
|
127
129
|
...config(di.printerFilesService, isSqlite, (0, _awilix.asClass)(_printerfilesservice1.PrinterFilesService), (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService)),
|
|
128
130
|
...config(di.refreshTokenService, isSqlite, (0, _awilix.asClass)(_refreshtokenservice1.RefreshTokenService).singleton(), (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton()),
|
|
129
131
|
...config(di.userService, isSqlite, (0, _awilix.asClass)(_userservice1.UserService).singleton(), (0, _awilix.asClass)(_userservice.UserService).singleton()),
|
package/dist/container.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerFilesService","PrinterFilesService2","PrinterFilesService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","octoPrintApiService","OctoPrintApiService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerConnectionCache","PrinterConnectionCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","printerFilesService","PrinterFilesService2","PrinterFilesService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","octoPrintApiService","OctoPrintApiService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerConnectionCache","PrinterConnectionCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
|
package/dist/container.tokens.js
CHANGED
|
@@ -26,6 +26,7 @@ const DITokens = {
|
|
|
26
26
|
eventEmitter2: "eventEmitter2",
|
|
27
27
|
cacheManager: "cacheManager",
|
|
28
28
|
printerService: "printerService",
|
|
29
|
+
printerGroupService: "printerGroupService",
|
|
29
30
|
floorPositionService: "floorPositionService",
|
|
30
31
|
printCompletionService: "printCompletionService",
|
|
31
32
|
floorService: "floorService",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerConnectionCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,wBAAwB;IACxBC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
|
|
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","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerConnectionCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,wBAAwB;IACxBC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","files","eagerLoadPrinterFiles","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","getLocalFiles","failedFiles","succeededFiles","file","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","selectAndPrintFile","print","body","selectAndPrintFileRules","selectPrintFile","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","response","uploadFileAsMultiPart","success","local","getFile","appendOrSetPrinterFile","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Get","Actions","delete","Delete"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer-files.controller.ts"],"names":["PrinterFilesController","printerFilesStore","settingsStore","octoPrintApiService","batchCallService","multerService","printerFileCleanTask","logger","isTypeormMode","constructor","loggerFactory","name","getTrackedUploads","req","res","sessions","getSessions","send","getFiles","currentPrinterId","getScopedPrinter","recursive","validateInput","query","getFilesRules","log","files","eagerLoadPrinterFiles","getFilesCache","currentPrinter","filesCache","id","clearPrinterFiles","printerLogin","nonRecursiveFiles","getLocalFiles","failedFiles","succeededFiles","file","deleteFileOrFolder","path","push","e","purgePrinterFiles","purgeIndexedFiles","purgeFiles","moveFileOrFolder","filePath","destination","validateMiddleware","moveFileOrFolderRules","result","createFolder","foldername","createFolderRules","getFileRules","deleteFile","selectAndPrintFile","print","body","selectAndPrintFileRules","selectPrintFile","uploadFile","uploadFileRules","multerLoadFileAsync","length","ValidationException","error","select","fileUploadCommandsRules","uploadedFile","fileCleanEnabled","isPreUploadFileCleanEnabled","cleanPrinterFiles","token","startTrackingSession","response","uploadFileAsMultiPart","success","local","getFile","appendOrSetPrinterFile","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","OPERATOR","printerResolveMiddleware","post","withPermission","PERMS","PrinterFiles","Clear","get","Upload","Get","Actions","delete","Delete"],"mappings":"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"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
PrinterGroupController: function() {
|
|
13
|
+
return PrinterGroupController;
|
|
14
|
+
},
|
|
15
|
+
default: function() {
|
|
16
|
+
return _default;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
const _awilixexpress = require("awilix-express");
|
|
20
|
+
const _serverconstants = require("../server.constants");
|
|
21
|
+
const _authenticate = require("../middleware/authenticate");
|
|
22
|
+
const _authorizationconstants = require("../constants/authorization.constants");
|
|
23
|
+
const _validators = require("../handlers/validators");
|
|
24
|
+
const _genericvalidation = require("./validation/generic.validation");
|
|
25
|
+
class PrinterGroupController {
|
|
26
|
+
printerGroupService;
|
|
27
|
+
isTypeormMode;
|
|
28
|
+
constructor({ printerGroupService, isTypeormMode }){
|
|
29
|
+
this.printerGroupService = printerGroupService;
|
|
30
|
+
this.isTypeormMode = isTypeormMode;
|
|
31
|
+
}
|
|
32
|
+
async listGroups(req, res) {
|
|
33
|
+
res.send(await this.printerGroupService.listGroups());
|
|
34
|
+
}
|
|
35
|
+
async getGroup(req, res) {
|
|
36
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
37
|
+
res.send(await this.printerGroupService.getGroupWithPrinters(id));
|
|
38
|
+
}
|
|
39
|
+
async createGroup(req, res) {
|
|
40
|
+
const entity = await this.printerGroupService.createGroup(req.body);
|
|
41
|
+
res.send(entity);
|
|
42
|
+
}
|
|
43
|
+
async updateGroupName(req, res) {
|
|
44
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
45
|
+
const entity = await this.printerGroupService.updateGroupName(id, req.body.name);
|
|
46
|
+
res.send(entity);
|
|
47
|
+
}
|
|
48
|
+
async deleteGroup(req, res) {
|
|
49
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
50
|
+
res.send(await this.printerGroupService.deleteGroup(id));
|
|
51
|
+
}
|
|
52
|
+
async addPrinterToGroup(req, res) {
|
|
53
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
54
|
+
const entity = await this.printerGroupService.addPrinterToGroup(id, req.body.printerId);
|
|
55
|
+
res.send(this.printerGroupService.toDto(entity));
|
|
56
|
+
}
|
|
57
|
+
async removePrinterFromGroup(req, res) {
|
|
58
|
+
const { id } = await (0, _validators.validateInput)(req.params, (0, _genericvalidation.idRulesV2)(this.isTypeormMode));
|
|
59
|
+
res.send(await this.printerGroupService.removePrinterFromGroup(id, req.body.printerId));
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const _default = (0, _awilixexpress.createController)(PrinterGroupController).prefix(_serverconstants.AppConstants.apiRoute + "/printer-group").before([
|
|
63
|
+
(0, _authenticate.authenticate)(),
|
|
64
|
+
(0, _authenticate.authorizeRoles)([
|
|
65
|
+
_authorizationconstants.ROLES.OPERATOR,
|
|
66
|
+
_authorizationconstants.ROLES.ADMIN
|
|
67
|
+
])
|
|
68
|
+
]).get("/", "listGroups").post("/", "createGroup").get("/:id", "getGroup").delete("/:id", "deleteGroup").patch("/:id/name", "updateGroupName").post("/:id/printer", "addPrinterToGroup").delete("/:id/printer", "removePrinterFromGroup");
|
|
69
|
+
|
|
70
|
+
//# sourceMappingURL=printer-group.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer-group.controller.ts"],"names":["PrinterGroupController","printerGroupService","isTypeormMode","constructor","listGroups","req","res","send","getGroup","id","validateInput","params","idRulesV2","getGroupWithPrinters","createGroup","entity","body","updateGroupName","name","deleteGroup","addPrinterToGroup","printerId","toDto","removePrinterFromGroup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","get","post","delete","patch"],"mappings":"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"}
|
|
@@ -30,7 +30,8 @@ class ServerPublicController {
|
|
|
30
30
|
monsterPiService;
|
|
31
31
|
userService;
|
|
32
32
|
roleService;
|
|
33
|
-
|
|
33
|
+
isTypeormMode;
|
|
34
|
+
constructor({ settingsStore, printerSocketStore, serverVersion, serverReleaseService, monsterPiService, userService, roleService, isTypeormMode }){
|
|
34
35
|
this.settingsStore = settingsStore;
|
|
35
36
|
this.serverVersion = serverVersion;
|
|
36
37
|
this.printerSocketStore = printerSocketStore;
|
|
@@ -38,6 +39,7 @@ class ServerPublicController {
|
|
|
38
39
|
this.monsterPiService = monsterPiService;
|
|
39
40
|
this.userService = userService;
|
|
40
41
|
this.roleService = roleService;
|
|
42
|
+
this.isTypeormMode = isTypeormMode;
|
|
41
43
|
}
|
|
42
44
|
welcome(req, res) {
|
|
43
45
|
const serverSettings = this.settingsStore.getSettings();
|
|
@@ -92,6 +94,11 @@ class ServerPublicController {
|
|
|
92
94
|
available: true,
|
|
93
95
|
version: 1,
|
|
94
96
|
subFeatures: {}
|
|
97
|
+
},
|
|
98
|
+
printerGroupsApi: {
|
|
99
|
+
available: this.isTypeormMode,
|
|
100
|
+
version: 1,
|
|
101
|
+
subFeatures: {}
|
|
95
102
|
}
|
|
96
103
|
});
|
|
97
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":";;;;;;;;;;;IAcaA,sBAAsB;eAAtBA;;
|
|
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","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","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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"}
|
package/dist/data-source.js
CHANGED
|
@@ -25,6 +25,9 @@ const _roleentity = require("./entities/role.entity");
|
|
|
25
25
|
const _printerfileentity = require("./entities/printer-file.entity");
|
|
26
26
|
const _userroleentity = require("./entities/user-role.entity");
|
|
27
27
|
const _1706829146617InitSqlite = require("./migrations/1706829146617-InitSqlite");
|
|
28
|
+
const _printergroupentity = require("./entities/printer-group.entity");
|
|
29
|
+
const _groupentity = require("./entities/group.entity");
|
|
30
|
+
const _1707494762198PrinterGroup = require("./migrations/1707494762198-PrinterGroup");
|
|
28
31
|
function _interop_require_default(obj) {
|
|
29
32
|
return obj && obj.__esModule ? obj : {
|
|
30
33
|
default: obj
|
|
@@ -55,10 +58,13 @@ const AppDataSource = new _typeorm.DataSource({
|
|
|
55
58
|
_entities.Permission,
|
|
56
59
|
_entities.RefreshToken,
|
|
57
60
|
_entities.PrintCompletion,
|
|
58
|
-
_userroleentity.UserRole
|
|
61
|
+
_userroleentity.UserRole,
|
|
62
|
+
_groupentity.Group,
|
|
63
|
+
_printergroupentity.PrinterGroup
|
|
59
64
|
],
|
|
60
65
|
migrations: [
|
|
61
|
-
_1706829146617InitSqlite.InitSqlite1706829146617
|
|
66
|
+
_1706829146617InitSqlite.InitSqlite1706829146617,
|
|
67
|
+
_1707494762198PrinterGroup.PrinterGroup1707494762198
|
|
62
68
|
],
|
|
63
69
|
subscribers: []
|
|
64
70
|
});
|
package/dist/data-source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","dotenv","config","path","join","superRootPath","dbFolder","process","env","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","isMemoryDb","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","PrinterFile","Settings","User","CameraStream","CustomGcode","Role","Permission","RefreshToken","PrintCompletion","UserRole","migrations","InitSqlite1706829146617","subscribers"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","dotenv","config","path","join","superRootPath","dbFolder","process","env","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","isMemoryDb","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","PrinterFile","Settings","User","CameraStream","CustomGcode","Role","Permission","RefreshToken","PrintCompletion","UserRole","Group","PrinterGroup","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","subscribers"],"mappings":";;;;+BAiCaA;;;eAAAA;;;QAjCN;yBACoB;iDACR;sBACE;iCACQ;yBACC;6BACR;qCACQ;+BACN;gCACC;0BACuC;oCACnC;mCACD;4BACP;mCACO;gCACH;yCACe;oCACX;6BACP;2CACoB;;;;;;AAE1CC,eAAM,CAACC,MAAM,CAAC;IACZC,MAAMC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAC9B;AAEA,MAAMC,WAAWC,QAAQC,GAAG,CAACC,6BAAY,CAACC,aAAa,CAAC,IAAI;AAC5D,MAAMC,SAASJ,QAAQC,GAAG,CAACC,6BAAY,CAACG,aAAa,CAAC,IAAI;AAC1D,MAAMC,aAAaF,WAAW;AAC9B,MAAMG,SAASD,aAAaF,SAASP,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,UAAUK;AAK9D,MAAMX,gBAAgB,IAAIe,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUH;IACVI,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,8BAAW;QACXC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,8BAAW;QACXC,gBAAI;QACJC,oBAAU;QACVC,sBAAY;QACZC,yBAAe;QACfC,wBAAQ;QACRC,kBAAK;QACLC,gCAAY;KACb;IACDC,YAAY;QAACC,gDAAuB;QAAEC,oDAAyB;KAAC;IAChEC,aAAa,EAAE;AACjB"}
|
|
@@ -53,7 +53,7 @@ _ts_decorate([
|
|
|
53
53
|
_ts_metadata("design:type", Number)
|
|
54
54
|
], FloorPosition.prototype, "floorId", void 0);
|
|
55
55
|
_ts_decorate([
|
|
56
|
-
(0, _typeorm.OneToOne)(()=>_printerentity.Printer,
|
|
56
|
+
(0, _typeorm.OneToOne)(()=>_printerentity.Printer, {
|
|
57
57
|
onDelete: "CASCADE",
|
|
58
58
|
nullable: false
|
|
59
59
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/floor-position.entity.ts"],"names":["FloorPosition","id","x","y","floor","floorId","printer","printerId","PrimaryGeneratedColumn","Column","ManyToOne","Floor","onDelete","nullable","OneToOne","Printer","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/floor-position.entity.ts"],"names":["FloorPosition","id","x","y","floor","floorId","printer","printerId","PrimaryGeneratedColumn","Column","ManyToOne","Floor","onDelete","nullable","OneToOne","Printer","JoinColumn","name","Entity","Unique"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBAN6F;6BACpF;+BACE;;;;;;;;;;AAIjB,MAAMA;IAEXC,GAAY;IAGZC,EAAW;IAGXC,EAAW;IAOXC,MAAwB;IAExBC,QAAiB;IAOjBC,QAA4B;IAE5BC,UAAmB;AACrB;;IA1BGC,IAAAA,+BAAsB;;GADZR;;IAIVS,IAAAA,eAAM;;GAJIT;;IAOVS,IAAAA,eAAM;;GAPIT;;IAWVU,IAAAA,kBAAS,EAAC,IAAMC,kBAAK,EAAE;QACtBC,UAAU;QACVC,UAAU;IACZ;uCACQ,iBAAQ,4BAAR,iBAAQ;GAfLb;;IAgBVS,IAAAA,eAAM;;GAhBIT;;IAmBVc,IAAAA,iBAAQ,EAAC,IAAMC,sBAAO,EAAE;QACvBH,UAAU;QACVC,UAAU;IACZ;IACCG,IAAAA,mBAAU,EAAC;QAAEC,MAAM;IAAY;uCACtB,iBAAQ,4BAAR,iBAAQ;GAxBPjB;;IAyBVS,IAAAA,eAAM;;GAzBIT;AAAAA;IAFZkB,IAAAA,eAAM;IACNC,IAAAA,eAAM,EAAC;QAAC;QAAK;QAAK;KAAU;GAChBnB"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "Group", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return Group;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _baseentity = require("./base.entity");
|
|
13
|
+
const _classvalidator = require("class-validator");
|
|
14
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
15
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
17
|
+
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;
|
|
18
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
+
}
|
|
20
|
+
function _ts_metadata(k, v) {
|
|
21
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
22
|
+
}
|
|
23
|
+
class Group extends _baseentity.BaseEntity {
|
|
24
|
+
name;
|
|
25
|
+
}
|
|
26
|
+
_ts_decorate([
|
|
27
|
+
(0, _typeorm.Column)(),
|
|
28
|
+
(0, _classvalidator.Length)(1),
|
|
29
|
+
_ts_metadata("design:type", String)
|
|
30
|
+
], Group.prototype, "name", void 0);
|
|
31
|
+
Group = _ts_decorate([
|
|
32
|
+
(0, _typeorm.Entity)()
|
|
33
|
+
], Group);
|
|
34
|
+
|
|
35
|
+
//# sourceMappingURL=group.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/group.entity.ts"],"names":["Group","BaseEntity","name","Column","Length","Entity"],"mappings":";;;;+BAKaA;;;eAAAA;;;yBALkB;4BACJ;gCACJ;;;;;;;;;;AAGhB,MAAMA,cAAcC,sBAAU;IAGnCC,KAAa;AACf;;IAHGC,IAAAA,eAAM;IACNC,IAAAA,sBAAM,EAAC;;GAFGJ;AAAAA;IADZK,IAAAA,eAAM;GACML"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterGroup", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterGroup;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _baseentity = require("./base.entity");
|
|
13
|
+
const _printerentity = require("./printer.entity");
|
|
14
|
+
const _groupentity = require("./group.entity");
|
|
15
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
16
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
17
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
18
|
+
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;
|
|
19
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
20
|
+
}
|
|
21
|
+
function _ts_metadata(k, v) {
|
|
22
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
23
|
+
}
|
|
24
|
+
class PrinterGroup extends _baseentity.BaseEntity {
|
|
25
|
+
printer;
|
|
26
|
+
printerId;
|
|
27
|
+
group;
|
|
28
|
+
groupId;
|
|
29
|
+
}
|
|
30
|
+
_ts_decorate([
|
|
31
|
+
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, {
|
|
32
|
+
onDelete: "CASCADE",
|
|
33
|
+
nullable: false
|
|
34
|
+
}),
|
|
35
|
+
(0, _typeorm.JoinColumn)({
|
|
36
|
+
name: "printerId"
|
|
37
|
+
}),
|
|
38
|
+
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
39
|
+
], PrinterGroup.prototype, "printer", void 0);
|
|
40
|
+
_ts_decorate([
|
|
41
|
+
(0, _typeorm.Column)(),
|
|
42
|
+
_ts_metadata("design:type", Number)
|
|
43
|
+
], PrinterGroup.prototype, "printerId", void 0);
|
|
44
|
+
_ts_decorate([
|
|
45
|
+
(0, _typeorm.ManyToOne)(()=>_groupentity.Group, {
|
|
46
|
+
onDelete: "CASCADE",
|
|
47
|
+
nullable: false
|
|
48
|
+
}),
|
|
49
|
+
(0, _typeorm.JoinColumn)({
|
|
50
|
+
name: "groupId"
|
|
51
|
+
}),
|
|
52
|
+
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
53
|
+
], PrinterGroup.prototype, "group", void 0);
|
|
54
|
+
_ts_decorate([
|
|
55
|
+
(0, _typeorm.Column)(),
|
|
56
|
+
_ts_metadata("design:type", Number)
|
|
57
|
+
], PrinterGroup.prototype, "groupId", void 0);
|
|
58
|
+
PrinterGroup = _ts_decorate([
|
|
59
|
+
(0, _typeorm.Entity)(),
|
|
60
|
+
(0, _typeorm.Unique)([
|
|
61
|
+
"printerId",
|
|
62
|
+
"groupId"
|
|
63
|
+
])
|
|
64
|
+
], PrinterGroup);
|
|
65
|
+
|
|
66
|
+
//# sourceMappingURL=printer-group.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/printer-group.entity.ts"],"names":["PrinterGroup","BaseEntity","printer","printerId","group","groupId","ManyToOne","Printer","onDelete","nullable","JoinColumn","name","Column","Group","Entity","Unique"],"mappings":";;;;+BAOaA;;;eAAAA;;;yBAP2D;4BAC7C;+BACH;6BACF;;;;;;;;;;AAIf,MAAMA,qBAAqBC,sBAAU;IAG1CC,QAA4B;IAG5BC,UAAkB;IAIlBC,MAAwB;IAGxBC,QAAgB;AAClB;;IAbGC,IAAAA,kBAAS,EAAC,IAAMC,sBAAO,EAAE;QAAEC,UAAU;QAAWC,UAAU;IAAM;IAChEC,IAAAA,mBAAU,EAAC;QAAEC,MAAM;IAAY;uCACtB,iBAAQ,4BAAR,iBAAQ;GAHPX;;IAKVY,IAAAA,eAAM;;GALIZ;;IAQVM,IAAAA,kBAAS,EAAC,IAAMO,kBAAK,EAAE;QAAEL,UAAU;QAAWC,UAAU;IAAM;IAC9DC,IAAAA,mBAAU,EAAC;QAAEC,MAAM;IAAU;uCACtB,iBAAQ,4BAAR,iBAAQ;GAVLX;;IAYVY,IAAAA,eAAM;;GAZIZ;AAAAA;IAFZc,IAAAA,eAAM;IACNC,IAAAA,eAAM,EAAC;QAAC;QAAa;KAAU;GACnBf"}
|
|
@@ -13,6 +13,7 @@ const _typeorm = require("typeorm");
|
|
|
13
13
|
const _printcompletionentity = require("./print-completion.entity");
|
|
14
14
|
const _baseentity = require("./base.entity");
|
|
15
15
|
const _printerfileentity = require("./printer-file.entity");
|
|
16
|
+
const _printergroupentity = require("./printer-group.entity");
|
|
16
17
|
function _ts_decorate(decorators, target, key, desc) {
|
|
17
18
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
18
19
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -31,6 +32,7 @@ class Printer extends _baseentity.BaseEntity {
|
|
|
31
32
|
disabledReason;
|
|
32
33
|
assignee;
|
|
33
34
|
printCompletions;
|
|
35
|
+
printerGroups;
|
|
34
36
|
printerFiles;
|
|
35
37
|
dateAdded;
|
|
36
38
|
feedRate;
|
|
@@ -76,6 +78,10 @@ _ts_decorate([
|
|
|
76
78
|
(0, _typeorm.OneToMany)(()=>_printcompletionentity.PrintCompletion, (pc)=>pc.printer),
|
|
77
79
|
_ts_metadata("design:type", Array)
|
|
78
80
|
], Printer.prototype, "printCompletions", void 0);
|
|
81
|
+
_ts_decorate([
|
|
82
|
+
(0, _typeorm.OneToMany)(()=>_printergroupentity.PrinterGroup, (pc)=>pc.printer),
|
|
83
|
+
_ts_metadata("design:type", Array)
|
|
84
|
+
], Printer.prototype, "printerGroups", void 0);
|
|
79
85
|
_ts_decorate([
|
|
80
86
|
(0, _typeorm.OneToMany)(()=>_printerfileentity.PrinterFile, (p)=>p.printerId),
|
|
81
87
|
_ts_metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","apiKey","enabled","disabledReason","assignee","printCompletions","printerFiles","dateAdded","feedRate","flowRate","PrimaryGeneratedColumn","Column","IsAlphanumeric","nullable","default","OneToMany","PrintCompletion","pc","printer","PrinterFile","p","printerId","CreateDateColumn","type","Entity"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;
|
|
1
|
+
{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","apiKey","enabled","disabledReason","assignee","printCompletions","printerGroups","printerFiles","dateAdded","feedRate","flowRate","PrimaryGeneratedColumn","Column","IsAlphanumeric","nullable","default","OneToMany","PrintCompletion","pc","printer","PrinterGroup","PrinterFile","p","printerId","CreateDateColumn","type","Entity"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;yBAC+D;uCAC9D;4BACL;mCACC;oCACC;;;;;;;;;;AAGtB,MAAMA,gBAAgBC,sBAAU;IAErCC,GAAY;IAGZC,KAAc;IAGdC,WAAoB;IAIpBC,OAAgB;IAMhBC,UAAmB,KAAK;IAKxBC,eAAwB;IAKxBC,SAAkB;IAGlBC,iBAA+C;IAG/CC,cAAyC;IAGzCC,aAAuC;IAGvCC,UAAmB;IAGnBC,SAAkB;IAGlBC,SAAkB;AACpB;;IA9CGC,IAAAA,+BAAsB;;GADZf;;IAIVgB,IAAAA,eAAM;;GAJIhB;;IAOVgB,IAAAA,eAAM;;GAPIhB;;IAUVgB,IAAAA,eAAM;IACNC,IAAAA,8BAAc;;GAXJjB;;IAcVgB,IAAAA,eAAM,EAAC;QACNE,UAAU;QACVC,SAAS;IACX;;GAjBWnB;;IAoBVgB,IAAAA,eAAM,EAAC;QACNE,UAAU;IACZ;;GAtBWlB;;IAyBVgB,IAAAA,eAAM,EAAC;QACNE,UAAU;IACZ;;GA3BWlB;;IA8BVoB,IAAAA,kBAAS,EAAC,IAAMC,sCAAe,EAAE,CAACC,KAAOA,GAAGC,OAAO;;GA9BzCvB;;IAiCVoB,IAAAA,kBAAS,EAAC,IAAMI,gCAAY,EAAE,CAACF,KAAOA,GAAGC,OAAO;;GAjCtCvB;;IAoCVoB,IAAAA,kBAAS,EAAC,IAAMK,8BAAW,EAAE,CAACC,IAAMA,EAAEC,SAAS;;GApCrC3B;;IAuCV4B,IAAAA,yBAAgB,EAAC;QAAEC,MAAM;IAAM;;GAvCrB7B;;IA0CVgB,IAAAA,eAAM,EAAC;QAAEE,UAAU;IAAK;;GA1CdlB;;IA6CVgB,IAAAA,eAAM,EAAC;QAAEE,UAAU;IAAK;;GA7CdlB;AAAAA;IADZ8B,IAAAA,eAAM;GACM9B"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterGroup1707494762198", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterGroup1707494762198;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class PrinterGroup1707494762198 {
|
|
12
|
+
name = 'PrinterGroup1707494762198';
|
|
13
|
+
async up(queryRunner) {
|
|
14
|
+
await queryRunner.query(`
|
|
15
|
+
CREATE TABLE "group" (
|
|
16
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
17
|
+
"name" varchar NOT NULL
|
|
18
|
+
)
|
|
19
|
+
`);
|
|
20
|
+
await queryRunner.query(`
|
|
21
|
+
CREATE TABLE "printer_group" (
|
|
22
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
23
|
+
"printerId" integer NOT NULL,
|
|
24
|
+
"groupId" integer NOT NULL,
|
|
25
|
+
CONSTRAINT "UQ_c9e2395912075256923415eb2c7" UNIQUE ("printerId", "groupId")
|
|
26
|
+
)
|
|
27
|
+
`);
|
|
28
|
+
await queryRunner.query(`
|
|
29
|
+
CREATE TABLE "temporary_printer_group" (
|
|
30
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
31
|
+
"printerId" integer NOT NULL,
|
|
32
|
+
"groupId" integer NOT NULL,
|
|
33
|
+
CONSTRAINT "UQ_c9e2395912075256923415eb2c7" UNIQUE ("printerId", "groupId"),
|
|
34
|
+
CONSTRAINT "FK_20e241cea3a77568c9372dad6a1" FOREIGN KEY ("printerId") REFERENCES "printer" ("id") ON DELETE CASCADE ON UPDATE NO ACTION,
|
|
35
|
+
CONSTRAINT "FK_789586afe1423a1dfd1104cb7bd" FOREIGN KEY ("groupId") REFERENCES "group" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
|
|
36
|
+
)
|
|
37
|
+
`);
|
|
38
|
+
await queryRunner.query(`
|
|
39
|
+
INSERT INTO "temporary_printer_group"("id", "printerId", "groupId")
|
|
40
|
+
SELECT "id",
|
|
41
|
+
"printerId",
|
|
42
|
+
"groupId"
|
|
43
|
+
FROM "printer_group"
|
|
44
|
+
`);
|
|
45
|
+
await queryRunner.query(`
|
|
46
|
+
DROP TABLE "printer_group"
|
|
47
|
+
`);
|
|
48
|
+
await queryRunner.query(`
|
|
49
|
+
ALTER TABLE "temporary_printer_group"
|
|
50
|
+
RENAME TO "printer_group"
|
|
51
|
+
`);
|
|
52
|
+
}
|
|
53
|
+
async down(queryRunner) {
|
|
54
|
+
await queryRunner.query(`
|
|
55
|
+
ALTER TABLE "printer_group"
|
|
56
|
+
RENAME TO "temporary_printer_group"
|
|
57
|
+
`);
|
|
58
|
+
await queryRunner.query(`
|
|
59
|
+
CREATE TABLE "printer_group" (
|
|
60
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
61
|
+
"printerId" integer NOT NULL,
|
|
62
|
+
"groupId" integer NOT NULL,
|
|
63
|
+
CONSTRAINT "UQ_c9e2395912075256923415eb2c7" UNIQUE ("printerId", "groupId")
|
|
64
|
+
)
|
|
65
|
+
`);
|
|
66
|
+
await queryRunner.query(`
|
|
67
|
+
INSERT INTO "printer_group"("id", "printerId", "groupId")
|
|
68
|
+
SELECT "id",
|
|
69
|
+
"printerId",
|
|
70
|
+
"groupId"
|
|
71
|
+
FROM "temporary_printer_group"
|
|
72
|
+
`);
|
|
73
|
+
await queryRunner.query(`
|
|
74
|
+
DROP TABLE "temporary_printer_group"
|
|
75
|
+
`);
|
|
76
|
+
await queryRunner.query(`
|
|
77
|
+
DROP TABLE "printer_group"
|
|
78
|
+
`);
|
|
79
|
+
await queryRunner.query(`
|
|
80
|
+
DROP TABLE "group"
|
|
81
|
+
`);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
//# sourceMappingURL=1707494762198-PrinterGroup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/migrations/1707494762198-PrinterGroup.ts"],"names":["PrinterGroup1707494762198","name","up","queryRunner","query","down"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACTC,OAAO,4BAA2B;IAElC,MAAaC,GAAGC,WAAwB,EAAiB;QACrD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;;;QAKzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;QAOzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;QASzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;QAMzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;IACL;IAEA,MAAaC,KAAKF,WAAwB,EAAiB;QACvD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;QAOzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;QAMzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;IACL;AAEJ"}
|
package/dist/server.constants.js
CHANGED
|
@@ -63,7 +63,7 @@ const AppConstants = {
|
|
|
63
63
|
serverRepoName: "fdm-monster",
|
|
64
64
|
orgName: "fdm-monster",
|
|
65
65
|
currentWizardVersion: 1,
|
|
66
|
-
defaultClientMinimum: "1.5.0
|
|
66
|
+
defaultClientMinimum: "1.5.0",
|
|
67
67
|
influxUrl: "INFLUX_URL",
|
|
68
68
|
influxToken: "INFLUX_TOKEN",
|
|
69
69
|
influxOrg: "INFLUX_ORG",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/group.dto.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
CreateGroupDto: function() {
|
|
13
|
+
return CreateGroupDto;
|
|
14
|
+
},
|
|
15
|
+
PrinterGroupDto: function() {
|
|
16
|
+
return PrinterGroupDto;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
const _classvalidator = require("class-validator");
|
|
20
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
21
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
22
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
23
|
+
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;
|
|
24
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
25
|
+
}
|
|
26
|
+
function _ts_metadata(k, v) {
|
|
27
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
28
|
+
}
|
|
29
|
+
class PrinterGroupDto {
|
|
30
|
+
printerId;
|
|
31
|
+
groupId;
|
|
32
|
+
}
|
|
33
|
+
class CreateGroupDto {
|
|
34
|
+
name;
|
|
35
|
+
}
|
|
36
|
+
_ts_decorate([
|
|
37
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
38
|
+
_ts_metadata("design:type", String)
|
|
39
|
+
], CreateGroupDto.prototype, "name", void 0);
|
|
40
|
+
|
|
41
|
+
//# sourceMappingURL=printer-group.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/printer-group.dto.ts"],"names":["CreateGroupDto","PrinterGroupDto","printerId","groupId","name","IsNotEmpty"],"mappings":";;;;;;;;;;;IAOaA,cAAc;eAAdA;;IALAC,eAAe;eAAfA;;;gCAFc;;;;;;;;;;AAEpB,MAAMA;IACXC,UAAmB;IACnBC,QAAiB;AACnB;AAEO,MAAMH;IAEXI,KAAa;AACf;;IAFGC,IAAAA,0BAAU;;GADAL"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/printer-group.service.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterGroupService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterGroupService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _baseservice = require("./base.service");
|
|
12
|
+
const _printergroupentity = require("../../entities/printer-group.entity");
|
|
13
|
+
const _printergroupdto = require("../interfaces/printer-group.dto");
|
|
14
|
+
const _groupentity = require("../../entities/group.entity");
|
|
15
|
+
const _classvalidator = require("class-validator");
|
|
16
|
+
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
17
|
+
class PrinterGroupService extends (0, _baseservice.BaseService)(_printergroupentity.PrinterGroup, _printergroupdto.PrinterGroupDto) {
|
|
18
|
+
groupRepository;
|
|
19
|
+
constructor({ typeormService }){
|
|
20
|
+
super({
|
|
21
|
+
typeormService
|
|
22
|
+
});
|
|
23
|
+
this.groupRepository = typeormService.getDataSource().getRepository(_groupentity.Group);
|
|
24
|
+
}
|
|
25
|
+
async listGroups() {
|
|
26
|
+
const groups = await this.groupRepository.find();
|
|
27
|
+
const groupListing = {};
|
|
28
|
+
for (const group of groups){
|
|
29
|
+
groupListing[group.id] = {
|
|
30
|
+
id: group.id,
|
|
31
|
+
name: group.name,
|
|
32
|
+
printers: []
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
for (const group of groups){
|
|
36
|
+
groupListing[group.id].printers = await this.repository.findBy({
|
|
37
|
+
groupId: group.id
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
return Object.values(groupListing);
|
|
41
|
+
}
|
|
42
|
+
async getGroup(groupId) {
|
|
43
|
+
const group = await this.groupRepository.findOneBy({
|
|
44
|
+
id: groupId
|
|
45
|
+
});
|
|
46
|
+
if (!group) {
|
|
47
|
+
throw new _runtimeexceptions.NotFoundException("Group does not exist");
|
|
48
|
+
}
|
|
49
|
+
return group;
|
|
50
|
+
}
|
|
51
|
+
async getGroupWithPrinters(groupId) {
|
|
52
|
+
const group = await this.getGroup(groupId);
|
|
53
|
+
const printerGroups = await this.repository.findBy({
|
|
54
|
+
groupId: group.id
|
|
55
|
+
});
|
|
56
|
+
return {
|
|
57
|
+
id: group.id,
|
|
58
|
+
name: group.name,
|
|
59
|
+
printers: printerGroups
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
async createGroup(dto) {
|
|
63
|
+
if (dto.id) {
|
|
64
|
+
delete dto.id;
|
|
65
|
+
}
|
|
66
|
+
await (0, _classvalidator.validate)(dto);
|
|
67
|
+
const entity = this.groupRepository.create(dto);
|
|
68
|
+
await (0, _classvalidator.validate)(entity);
|
|
69
|
+
const group = await this.groupRepository.save(entity);
|
|
70
|
+
return await this.getGroupWithPrinters(group.id);
|
|
71
|
+
}
|
|
72
|
+
async updateGroupName(groupId, name) {
|
|
73
|
+
const entity = await this.getGroup(groupId);
|
|
74
|
+
const updateDto = {
|
|
75
|
+
name
|
|
76
|
+
};
|
|
77
|
+
await (0, _classvalidator.validate)(updateDto);
|
|
78
|
+
await (0, _classvalidator.validate)(Object.assign(entity, updateDto));
|
|
79
|
+
await this.groupRepository.update(entity.id, updateDto);
|
|
80
|
+
}
|
|
81
|
+
async deleteGroup(groupId) {
|
|
82
|
+
const group = await this.getGroup(groupId);
|
|
83
|
+
await this.groupRepository.delete({
|
|
84
|
+
id: group.id
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
async addPrinterToGroup(groupId, printerId) {
|
|
88
|
+
const group = await this.getGroup(groupId);
|
|
89
|
+
const alreadyExisting = await this.repository.findOneBy({
|
|
90
|
+
groupId: group.id,
|
|
91
|
+
printerId
|
|
92
|
+
});
|
|
93
|
+
if (alreadyExisting) return alreadyExisting;
|
|
94
|
+
return await this.create({
|
|
95
|
+
groupId: group.id,
|
|
96
|
+
printerId
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
async removePrinterFromGroup(groupId, printerId) {
|
|
100
|
+
await this.getGroup(groupId);
|
|
101
|
+
await this.repository.delete({
|
|
102
|
+
groupId,
|
|
103
|
+
printerId
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
toDto(entity) {
|
|
107
|
+
return {
|
|
108
|
+
printerId: entity.printerId,
|
|
109
|
+
groupId: entity.groupId
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
//# sourceMappingURL=printer-group.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/printer-group.service.ts"],"names":["PrinterGroupService","BaseService","PrinterGroup","PrinterGroupDto","groupRepository","constructor","typeormService","getDataSource","getRepository","Group","listGroups","groups","find","groupListing","group","id","name","printers","repository","findBy","groupId","Object","values","getGroup","findOneBy","NotFoundException","getGroupWithPrinters","printerGroups","createGroup","dto","validate","entity","create","save","updateGroupName","updateDto","assign","update","deleteGroup","delete","addPrinterToGroup","printerId","alreadyExisting","removePrinterFromGroup","toDto"],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ class FileUploadTrackerCache {
|
|
|
53
53
|
return correlationToken;
|
|
54
54
|
}
|
|
55
55
|
updateUploadProgress(token, progress, reason) {
|
|
56
|
-
if (progress.
|
|
56
|
+
if (progress.progress === 1) {
|
|
57
57
|
this.logger.log("Upload tracker completed");
|
|
58
58
|
this.markUploadDone(token, true);
|
|
59
59
|
this.eventEmitter2.off((0, _eventconstants.uploadProgressEvent)(token), this.progressCallback);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","
|
|
1
|
+
{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","uploadsDone","uploadsFailed","eventEmitter2","logger","constructor","loggerFactory","name","progressCallback","token","p","updateUploadProgress","getUploads","filterHourOld","currentTime","Date","now","done","filter","d","startedAt","failed","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","generateCorrelationToken","log","on","uploadProgressEvent","push","progress","reason","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -193,15 +193,16 @@ class BootTask {
|
|
|
193
193
|
await this.settingsStore.setWizardCompleted(1);
|
|
194
194
|
}
|
|
195
195
|
async createConnection() {
|
|
196
|
-
if (this.isTypeormMode) {
|
|
197
|
-
|
|
196
|
+
if (!this.isTypeormMode) {
|
|
197
|
+
const envUrl = (0, _serverenv.fetchMongoDBConnectionString)();
|
|
198
|
+
await (0, _mongoose.connect)(envUrl, {
|
|
198
199
|
serverSelectionTimeoutMS: 1500
|
|
199
200
|
});
|
|
200
201
|
await (0, _mongoose.syncIndexes)();
|
|
201
202
|
}
|
|
202
203
|
}
|
|
203
204
|
async migrateDatabase() {
|
|
204
|
-
if (this.isTypeormMode) {
|
|
205
|
+
if (!this.isTypeormMode) {
|
|
205
206
|
await (0, _serverenv.runMigrations)(_mongoose.default.connection.db, _mongoose.default.connection.getClient());
|
|
206
207
|
}
|
|
207
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "1.6.0
|
|
9
|
+
"version": "1.6.0",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"format": "prettier --write \"src/**/*.js\" \"test/**/*.js\"",
|
|
32
32
|
"swc": "swc",
|
|
33
33
|
"tsc": "tsc --noEmit",
|
|
34
|
-
"test": "cross-env
|
|
35
|
-
"test:sqlite": "cross-env
|
|
36
|
-
"test:cov": "cross-env
|
|
37
|
-
"test:cov-sqlite": "cross-env
|
|
34
|
+
"test:mongodb": "cross-env MONGODB_MODE=true jest --forceExit --maxConcurrency=8 --runInBand ",
|
|
35
|
+
"test:sqlite": "cross-env MONGODB_MODE=false jest --forceExit --maxConcurrency=8 --runInBand ",
|
|
36
|
+
"test:cov-mongodb": "cross-env MONGODB_MODE=true jest --forceExit --coverage --maxConcurrency=8 --runInBand ",
|
|
37
|
+
"test:cov-sqlite": "cross-env MONGODB_MODE=false jest --forceExit --coverage --maxConcurrency=8 --runInBand ",
|
|
38
38
|
"cov:show": "./coverage/lcov-report/index.html",
|
|
39
39
|
"torm": "ts-node --swc -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
|
|
40
40
|
"typeorm:generate": "yarn torm migration:generate -d src/data-source.ts --pretty src/migrations/CustomGCode",
|
|
@@ -52,23 +52,23 @@
|
|
|
52
52
|
"vue"
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@fdm-monster/client": "1.5.0
|
|
55
|
+
"@fdm-monster/client": "1.5.0",
|
|
56
56
|
"@influxdata/influxdb-client": "1.33.2",
|
|
57
57
|
"@octokit/plugin-throttling": "8.1.3",
|
|
58
|
-
"@sentry/node": "7.
|
|
58
|
+
"@sentry/node": "7.100.1",
|
|
59
59
|
"adm-zip": "0.5.10",
|
|
60
60
|
"awilix": "10.0.1",
|
|
61
61
|
"awilix-express": "9.0.1",
|
|
62
62
|
"axios": "1.6.7",
|
|
63
63
|
"bcryptjs": "2.4.3",
|
|
64
|
-
"better-sqlite3": "9.4.
|
|
64
|
+
"better-sqlite3": "9.4.1",
|
|
65
65
|
"cache-manager": "4.1.0",
|
|
66
66
|
"class-validator": "0.14.1",
|
|
67
67
|
"connect-history-api-fallback": "2.0.0",
|
|
68
68
|
"cookie-parser": "1.4.6",
|
|
69
69
|
"cors": "2.8.5",
|
|
70
70
|
"cross-env": "7.0.3",
|
|
71
|
-
"dotenv": "16.4.
|
|
71
|
+
"dotenv": "16.4.2",
|
|
72
72
|
"eventemitter2": "6.4.9",
|
|
73
73
|
"express": "4.18.2",
|
|
74
74
|
"form-data": "4.0.0",
|
|
@@ -116,13 +116,13 @@
|
|
|
116
116
|
"@types/luxon": "3.4.2",
|
|
117
117
|
"@types/migrate-mongo": "10.0.4",
|
|
118
118
|
"@types/multer": "1.4.11",
|
|
119
|
-
"@types/node": "20.11.
|
|
119
|
+
"@types/node": "20.11.17",
|
|
120
120
|
"@types/passport-anonymous": "1.0.5",
|
|
121
121
|
"@types/passport-jwt": "4.0.1",
|
|
122
|
-
"@types/semver": "7.5.
|
|
122
|
+
"@types/semver": "7.5.7",
|
|
123
123
|
"@types/supertest": "6.0.2",
|
|
124
124
|
"@types/uuid": "9.0.8",
|
|
125
|
-
"chokidar": "3.
|
|
125
|
+
"chokidar": "3.6.0",
|
|
126
126
|
"concurrently": "8.2.2",
|
|
127
127
|
"eslint": "8.56.0",
|
|
128
128
|
"eslint-config-airbnb-base": "15.0.0",
|