@fdm-monster/server 1.5.4 → 1.6.0-rc2
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/.env.template +7 -0
- package/.gitattributes +2 -0
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.1.0.cjs +893 -0
- package/.yarnrc.yml +4 -0
- package/README.md +3 -2
- package/dist/consoles/sqlite-torm.js +31 -0
- package/dist/consoles/sqlite-torm.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +194 -0
- package/dist/consoles/typeorm-generate.js.map +1 -0
- package/dist/consoles/typeorm-migrate.js +48 -0
- package/dist/consoles/typeorm-migrate.js.map +1 -0
- package/dist/consoles/upload-test.js +52 -0
- package/dist/consoles/upload-test.js.map +1 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/service.constants.js +3 -18
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +64 -19
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +10 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +38 -0
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +10 -49
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +1 -1
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +25 -6
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +9 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/data-source.js +66 -0
- package/dist/data-source.js.map +1 -0
- package/dist/entities/base.entity.js +29 -0
- package/dist/entities/base.entity.js.map +1 -0
- package/dist/entities/camera-stream.entity.js +94 -0
- package/dist/entities/camera-stream.entity.js.map +1 -0
- package/dist/entities/custom-gcode.entity.js +50 -0
- package/dist/entities/custom-gcode.entity.js.map +1 -0
- package/dist/entities/floor-position.entity.js +78 -0
- package/dist/entities/floor-position.entity.js.map +1 -0
- package/dist/entities/floor.entity.js +53 -0
- package/dist/entities/floor.entity.js.map +1 -0
- package/dist/entities/index.js +58 -0
- package/dist/entities/index.js.map +1 -0
- package/dist/entities/permission.entity.js +38 -0
- package/dist/entities/permission.entity.js.map +1 -0
- package/dist/entities/print-completion.entity.js +91 -0
- package/dist/entities/print-completion.entity.js.map +1 -0
- package/dist/entities/printer-file.entity.js +140 -0
- package/dist/entities/printer-file.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +105 -0
- package/dist/entities/printer.entity.js.map +1 -0
- package/dist/entities/refresh-token.entity.js +70 -0
- package/dist/entities/refresh-token.entity.js.map +1 -0
- package/dist/entities/role.entity.js +46 -0
- package/dist/entities/role.entity.js.map +1 -0
- package/dist/entities/settings.entity.js +89 -0
- package/dist/entities/settings.entity.js.map +1 -0
- package/dist/entities/user-role.entity.js +70 -0
- package/dist/entities/user-role.entity.js.map +1 -0
- package/dist/entities/user.entity.js +90 -0
- package/dist/entities/user.entity.js.map +1 -0
- package/dist/middleware/exception.filter.js +2 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js +670 -0
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -0
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/Printer.js +4 -43
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/PrinterFile.js +85 -0
- package/dist/models/PrinterFile.js.map +1 -0
- package/dist/models/index.js +4 -0
- package/dist/models/index.js.map +1 -1
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js +41 -0
- package/dist/mongo-migrations/20231202183902-printer-files-simpler.js.map +1 -0
- package/dist/server.constants.js +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +10 -1
- package/dist/server.core.js.map +1 -1
- package/dist/server.host.js +11 -3
- package/dist/server.host.js.map +1 -1
- package/dist/services/batch-call.service.js +43 -20
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +92 -25
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js +18 -14
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/multer.service.js +3 -3
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +1 -1
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js +0 -2
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.interface.js +6 -0
- package/dist/services/interfaces/{print-completion.service.js.map → print-completion.interface.js.map} +1 -1
- package/dist/services/interfaces/printer-file.dto.js +32 -4
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +21 -0
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -0
- package/dist/services/{interfaces/print-completion.service.js → octoprint/dto/connection.dto.js} +1 -1
- package/dist/services/octoprint/dto/connection.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js +6 -0
- package/dist/services/octoprint/dto/octoprint-currentuser.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js +41 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-file.dto.js +84 -0
- package/dist/services/octoprint/dto/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-files.dto.js +17 -0
- package/dist/services/octoprint/dto/octoprint-files.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-session.dto.js +6 -0
- package/dist/services/octoprint/dto/octoprint-session.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-settings.dto.js +29 -0
- package/dist/services/octoprint/dto/octoprint-settings.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js +41 -0
- package/dist/services/octoprint/dto/octoprint-system-info.dto.js.map +1 -0
- package/dist/services/octoprint/dto/state.dto.js +38 -0
- package/dist/services/octoprint/dto/state.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/connection-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/current-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/event-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/event.type.js +54 -0
- package/dist/services/octoprint/dto/websocket-output/event.type.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-authed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-closed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/client-opened.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/dwelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-deselected.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/file-removed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/folder-added.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/home.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-finished.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-analysis-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/metadata-statistics-updated.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/position-update.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelled.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-cancelling.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-failed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-paused.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-resumed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/print-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/printer-state-changed.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-done.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/transfer-started.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/updated-files.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/upload.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/user-logged-in.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/events/z-change.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/history-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/plugin-message.dto.js.map +1 -0
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js +6 -0
- package/dist/services/octoprint/dto/websocket-output/timelapse-message.dto.js.map +1 -0
- package/dist/services/octoprint/models/octoprint-file.dto.js +6 -0
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +24 -18
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +201 -138
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +72 -66
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/utils/api.utils.js +0 -35
- package/dist/services/octoprint/utils/api.utils.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +44 -0
- package/dist/services/octoprint/utils/file.utils.js.map +1 -0
- package/dist/services/orm/base.interface.js +6 -0
- package/dist/services/orm/base.interface.js.map +1 -0
- package/dist/services/orm/base.service.js +72 -0
- package/dist/services/orm/base.service.js.map +1 -0
- package/dist/services/orm/camera-stream.service.js +25 -0
- package/dist/services/orm/camera-stream.service.js.map +1 -0
- package/dist/services/orm/custom-gcode.service.js +42 -0
- package/dist/services/orm/custom-gcode.service.js.map +1 -0
- package/dist/services/orm/floor-position.service.js +55 -0
- package/dist/services/orm/floor-position.service.js.map +1 -0
- package/dist/services/orm/floor.service.js +122 -0
- package/dist/services/orm/floor.service.js.map +1 -0
- package/dist/services/orm/permission.service.js +77 -0
- package/dist/services/orm/permission.service.js.map +1 -0
- package/dist/services/orm/print-completion.service.js +90 -0
- package/dist/services/orm/print-completion.service.js.map +1 -0
- package/dist/services/orm/printer-files.service.js +123 -0
- package/dist/services/orm/printer-files.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +145 -0
- package/dist/services/orm/printer.service.js.map +1 -0
- package/dist/services/orm/refresh-token.service.js +107 -0
- package/dist/services/orm/refresh-token.service.js.map +1 -0
- package/dist/services/orm/role.service.js +131 -0
- package/dist/services/orm/role.service.js.map +1 -0
- package/dist/services/orm/settings.service.js +208 -0
- package/dist/services/orm/settings.service.js.map +1 -0
- package/dist/services/orm/user-role.service.js +55 -0
- package/dist/services/orm/user-role.service.js.map +1 -0
- package/dist/services/orm/user.service.js +146 -0
- package/dist/services/orm/user.service.js.map +1 -0
- package/dist/services/orm-migration.service.js +20 -0
- package/dist/services/orm-migration.service.js.map +1 -0
- package/dist/services/print-completion.service.js +0 -1
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/services/printer-files.service.js +73 -49
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +0 -2
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js +48 -0
- package/dist/services/typeorm/typeorm.service.js.map +1 -0
- package/dist/shared/dtos/printer-login.dto.js +58 -0
- package/dist/shared/dtos/printer-login.dto.js.map +1 -0
- package/dist/{utils → shared}/websocket.adapter.js +3 -3
- package/dist/shared/websocket.adapter.js.map +1 -0
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +12 -35
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/printer-connection.cache.js +21 -0
- package/dist/state/printer-connection.cache.js.map +1 -0
- package/dist/state/printer-events.cache.js +13 -7
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +14 -18
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +3 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +3 -0
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +9 -1
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +30 -18
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +28 -19
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +14 -0
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js +89 -0
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -0
- package/dist/tasks/printer-websocket-restore.task.js +4 -3
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks.js +2 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/env.utils.js +0 -10
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/semver.utils.js +19 -4
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +58 -47
- package/dist/utils/find-predicate.utils.js +0 -18
- package/dist/utils/find-predicate.utils.js.map +0 -1
- package/dist/utils/websocket.adapter.js.map +0 -1
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "UserService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return UserService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _baseservice = require("./base.service");
|
|
12
|
+
const _userdto = require("../interfaces/user.dto");
|
|
13
|
+
const _entities = require("../../entities");
|
|
14
|
+
const _typeorm = require("typeorm");
|
|
15
|
+
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
16
|
+
const _validators = require("../../handlers/validators");
|
|
17
|
+
const _userservicevalidation = require("../validators/user-service.validation");
|
|
18
|
+
const _cryptoutils = require("../../utils/crypto.utils");
|
|
19
|
+
class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto.UserDto) {
|
|
20
|
+
typeormService;
|
|
21
|
+
userRoleService;
|
|
22
|
+
constructor({ typeormService, userRoleService }){
|
|
23
|
+
super({
|
|
24
|
+
typeormService
|
|
25
|
+
});
|
|
26
|
+
this.userRoleService = userRoleService;
|
|
27
|
+
}
|
|
28
|
+
toDto(user) {
|
|
29
|
+
return {
|
|
30
|
+
id: user.id,
|
|
31
|
+
createdAt: user.createdAt,
|
|
32
|
+
isVerified: user.isVerified,
|
|
33
|
+
isDemoUser: user.isDemoUser,
|
|
34
|
+
isRootUser: user.isRootUser,
|
|
35
|
+
username: user.username,
|
|
36
|
+
needsPasswordChange: user.needsPasswordChange,
|
|
37
|
+
roles: user.roles?.map((r)=>r.roleId)
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
listUsers(limit) {
|
|
41
|
+
return this.list({
|
|
42
|
+
take: limit
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
getUser(userId) {
|
|
46
|
+
return this.get(userId, true);
|
|
47
|
+
}
|
|
48
|
+
async getUserRoleIds(userId) {
|
|
49
|
+
const userRoles = await this.userRoleService.listUserRoles(userId);
|
|
50
|
+
return userRoles.map((ur)=>ur.roleId);
|
|
51
|
+
}
|
|
52
|
+
findRootUsers() {
|
|
53
|
+
return this.repository.findBy({
|
|
54
|
+
isRootUser: true
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
async findUsersByRoleId(roleId) {
|
|
58
|
+
const userRoles = await this.userRoleService.listByRoleId(roleId);
|
|
59
|
+
const ids = userRoles.map((u)=>u.id);
|
|
60
|
+
return this.repository.findBy({
|
|
61
|
+
id: (0, _typeorm.In)(ids)
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
findVerifiedUsers() {
|
|
65
|
+
return this.repository.findBy({
|
|
66
|
+
isVerified: true
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
async isUserRootUser(userId) {
|
|
70
|
+
const entity = await this.get(userId);
|
|
71
|
+
return entity.isRootUser;
|
|
72
|
+
}
|
|
73
|
+
deleteUser(userId) {
|
|
74
|
+
return this.delete(userId);
|
|
75
|
+
}
|
|
76
|
+
findRawByUsername(username) {
|
|
77
|
+
return this.repository.findOneBy({
|
|
78
|
+
username
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
async getDemoUserId() {
|
|
82
|
+
return (await this.repository.findOneBy({
|
|
83
|
+
isDemoUser: true
|
|
84
|
+
}))?.id;
|
|
85
|
+
}
|
|
86
|
+
async setIsRootUserById(userId, isRootUser) {
|
|
87
|
+
await this.update(userId, {
|
|
88
|
+
isRootUser
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
async setUserRoleIds(userId, roleIds) {
|
|
92
|
+
await this.userRoleService.setUserRoles(userId, roleIds);
|
|
93
|
+
return await this.get(userId, true);
|
|
94
|
+
}
|
|
95
|
+
async setVerifiedById(userId, isVerified) {
|
|
96
|
+
await this.update(userId, {
|
|
97
|
+
isVerified
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
async updatePasswordById(userId, oldPassword, newPassword) {
|
|
101
|
+
const user = await this.getUser(userId);
|
|
102
|
+
if (!(0, _cryptoutils.comparePasswordHash)(oldPassword, user.passwordHash)) {
|
|
103
|
+
throw new _runtimeexceptions.NotFoundException("User old password incorrect");
|
|
104
|
+
}
|
|
105
|
+
const { password } = await (0, _validators.validateInput)({
|
|
106
|
+
password: newPassword
|
|
107
|
+
}, _userservicevalidation.newPasswordRules);
|
|
108
|
+
const passwordHash = (0, _cryptoutils.hashPassword)(password);
|
|
109
|
+
return await this.update(userId, {
|
|
110
|
+
passwordHash,
|
|
111
|
+
needsPasswordChange: false
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
async updatePasswordUnsafeByUsername(username, newPassword) {
|
|
115
|
+
const { password } = await (0, _validators.validateInput)({
|
|
116
|
+
password: newPassword
|
|
117
|
+
}, _userservicevalidation.newPasswordRules);
|
|
118
|
+
const passwordHash = (0, _cryptoutils.hashPassword)(password);
|
|
119
|
+
const user = await this.findRawByUsername(username);
|
|
120
|
+
return await this.update(user.id, {
|
|
121
|
+
passwordHash,
|
|
122
|
+
needsPasswordChange: false
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
updateUsernameById(userId, newUsername) {
|
|
126
|
+
return this.update(userId, {
|
|
127
|
+
username: newUsername
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
async register(input) {
|
|
131
|
+
const { username, password, roles, isDemoUser, isRootUser, needsPasswordChange, isVerified } = await (0, _validators.validateInput)(input, (0, _userservicevalidation.registerUserRules)(true));
|
|
132
|
+
const passwordHash = (0, _cryptoutils.hashPassword)(password);
|
|
133
|
+
const result = await this.create({
|
|
134
|
+
username,
|
|
135
|
+
passwordHash,
|
|
136
|
+
isVerified: isVerified ?? false,
|
|
137
|
+
isDemoUser: isDemoUser ?? false,
|
|
138
|
+
isRootUser: isRootUser ?? false,
|
|
139
|
+
needsPasswordChange: needsPasswordChange ?? true
|
|
140
|
+
});
|
|
141
|
+
await this.userRoleService.setUserRoles(result.id, roles);
|
|
142
|
+
return this.get(result.id);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
//# sourceMappingURL=user.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","constructor","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","NotFoundException","password","validateInput","newPasswordRules","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserRules","result","create"],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
class OrmMigrationService {
|
|
6
|
+
typeormService;
|
|
7
|
+
constructor({ typeormService }){
|
|
8
|
+
this.typeormService = typeormService;
|
|
9
|
+
}
|
|
10
|
+
async changeToMongoose() {}
|
|
11
|
+
async changeToTypeorm() {}
|
|
12
|
+
async downloadTypeormSqliteBackup() {}
|
|
13
|
+
async downloadMongoBackup() {}
|
|
14
|
+
async syncSqliteToMongo() {}
|
|
15
|
+
async syncMongoToSqlite() {}
|
|
16
|
+
async uploadTypeormSqliteBackup() {}
|
|
17
|
+
async uploadMongoBackup() {}
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
//# sourceMappingURL=orm-migration.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/services/orm-migration.service.ts"],"names":["OrmMigrationService","typeormService","constructor","changeToMongoose","changeToTypeorm","downloadTypeormSqliteBackup","downloadMongoBackup","syncSqliteToMongo","syncMongoToSqlite","uploadTypeormSqliteBackup","uploadMongoBackup"],"mappings":";;;;AAEA,MAAMA;IACIC,eAA+B;IACvCC,YAAY,EAAED,cAAc,EAAsC,CAAE;QAClE,IAAI,CAACA,cAAc,GAAGA;IACxB;IAEA,MAAME,mBAAmB,CAAC;IAE1B,MAAMC,kBAAkB,CAAC;IAEzB,MAAMC,8BAA8B,CAAC;IAErC,MAAMC,sBAAsB,CAAC;IAE7B,MAAMC,oBAAoB,CAAC;IAE3B,MAAMC,oBAAoB,CAAC;IAE3B,MAAMC,4BAA4B,CAAC;IAEnC,MAAMC,oBAAoB,CAAC;AAC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","
|
|
1
|
+
{"version":3,"sources":["../../src/services/print-completion.service.ts"],"names":["PrintCompletionService","logger","constructor","loggerFactory","name","toDto","entity","id","completionLog","context","fileName","createdAt","status","printerId","toString","create","input","validateInput","createPrintCompletionRules","PrintCompletion","Date","now","list","find","findPrintCompletion","correlationId","updateContext","completionEntry","findOne","EVENT_TYPES","PrintStarted","warn","save","loadPrintContexts","contexts","aggregate","$sort","$group","_id","$first","$match","$nin","PrintDone","PrintFailed","Object","fromEntries","map","c","listGroupByPrinterStatus","printCompletionsAggr","printEvents","$push","processCompletions"],"mappings":";;;;+BAYaA;;;eAAAA;;;wBAZmB;kDACW;4BACb;6CACF;uCAOO;AAE5B,MAAMA;IACXC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcH,uBAAuBI,IAAI;IACzD;IAEAC,MAAMC,MAAwB,EAAmC;QAC/D,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,eAAeF,OAAOE,aAAa;YACnCC,SAASH,OAAOG,OAAO;YACvBC,UAAUJ,OAAOI,QAAQ;YACzBC,WAAWL,OAAOK,SAAS;YAC3BC,QAAQN,OAAOM,MAAM;YACrBC,WAAWP,OAAOO,SAAS,CAACC,QAAQ;QACtC;IACF;IAEA,MAAMC,OAAOC,KAA4C,EAAE;QACzD,MAAM,EAAEH,SAAS,EAAEH,QAAQ,EAAEF,aAAa,EAAEI,MAAM,EAAEH,OAAO,EAAE,GAAG,MAAMQ,IAAAA,yBAAa,EAACD,OAAOE,4DAA0B;QAErH,OAAOC,uBAAe,CAACJ,MAAM,CAAC;YAC5BF;YACAH;YACAF;YACAI;YACAD,WAAWS,KAAKC,GAAG;YACnBZ;QACF;IACF;IAEA,MAAMa,OAAO;QACX,OAAOH,uBAAe,CAACI,IAAI,CAAC,CAAC;IAC/B;IAEA,MAAMC,oBAAoBC,aAAqB,EAAE;QAC/C,OAAON,uBAAe,CAACI,IAAI,CAAC;YAC1B,yBAAyBE;QAC3B;IACF;IAEA,MAAMC,cAAcD,aAAqB,EAAEhB,OAA+B,EAAE;QAC1E,MAAMkB,kBAAkB,MAAMR,uBAAe,CAACS,OAAO,CAAC;YACpD,yBAAyBH;YACzBb,QAAQiB,wCAAW,CAACC,YAAY;QAClC;QAEA,IAAI,CAACH,iBAAiB;YACpB,IAAI,CAAC1B,MAAM,CAAC8B,IAAI,CAAC,CAAC,yBAAyB,EAAEN,cAAc,0DAA0D,CAAC;YACtH;QACF;QACAE,gBAAgBlB,OAAO,GAAGA;QAC1B,MAAMkB,gBAAgBK,IAAI;IAC5B;IAEA,MAAMC,oBAAoB;QACxB,MAAMC,WAAW,MAAMf,uBAAe,CAACgB,SAAS,CAAC;YAC/C;gBAAEC,OAAO;oBAAEvB,WAAW;oBAAGF,WAAW,CAAC;gBAAE;YAAE;YACzC;gBACE0B,QAAQ;oBACNC,KAAK;oBACL3B,WAAW;wBAAE4B,QAAQ;oBAAa;oBAClC9B,SAAS;wBAAE8B,QAAQ;oBAAW;oBAC9B3B,QAAQ;wBAAE2B,QAAQ;oBAAU;oBAC5B7B,UAAU;wBAAE6B,QAAQ;oBAAY;gBAClC;YACF;YACA;gBACEC,QAAQ;oBACN5B,QAAQ;wBACN6B,MAAM;4BAACZ,wCAAW,CAACa,SAAS;4BAAEb,wCAAW,CAACc,WAAW;yBAAC;oBACxD;gBACF;YACF;SACD;QAED,OAAOC,OAAOC,WAAW,CACvBX,SAASY,GAAG,CAAC,CAACC;YACZA,EAAElC,SAAS,GAAGkC,EAAET,GAAG;YACnB,OAAOS,EAAET,GAAG;YACZ,OAAO;gBAACS,EAAElC,SAAS;gBAAEkC;aAAE;QACzB;IAEJ;IAEA,MAAMC,2BAA2B;QAC/B,MAAMC,uBAAuB,MAAM9B,uBAAe,CAACgB,SAAS,CAAC;YAC3D;gBACEE,QAAQ;oBACNC,KAAK;oBACLY,aAAa;wBACXC,OAAO;4BACLtC,WAAW;4BACXJ,SAAS;4BACTD,eAAe;4BACfE,UAAU;4BACVE,QAAQ;4BACRD,WAAW;wBACb;oBACF;gBACF;YACF;SACD;QAED,OAAOyC,IAAAA,yCAAkB,EAACH;IAC5B;AACF"}
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "PrinterFilesService", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
12
|
-
const
|
|
12
|
+
const _models = require("../models");
|
|
13
13
|
class PrinterFilesService {
|
|
14
14
|
printerService;
|
|
15
15
|
logger;
|
|
@@ -17,70 +17,94 @@ class PrinterFilesService {
|
|
|
17
17
|
this.printerService = printerService;
|
|
18
18
|
this.logger = loggerFactory(PrinterFilesService.name);
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
const printer = await this.printerService.get(printerId);
|
|
20
|
+
toDto(entity) {
|
|
22
21
|
return {
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
id: entity.id,
|
|
23
|
+
printerId: entity.printerId?.toString(),
|
|
24
|
+
name: entity.name,
|
|
25
|
+
date: entity.date,
|
|
26
|
+
display: entity.display,
|
|
27
|
+
gcodeAnalysis: entity.gcodeAnalysis,
|
|
28
|
+
hash: entity.hash,
|
|
29
|
+
origin: entity.origin,
|
|
30
|
+
path: entity.path,
|
|
31
|
+
prints: entity.prints,
|
|
32
|
+
refs: entity.refs,
|
|
33
|
+
size: entity.size,
|
|
34
|
+
statistics: entity.statistics,
|
|
35
|
+
type: entity.type,
|
|
36
|
+
typePath: entity.typePath
|
|
25
37
|
};
|
|
26
38
|
}
|
|
27
|
-
async
|
|
39
|
+
async getPrinterFiles(printerId) {
|
|
28
40
|
const printer = await this.printerService.get(printerId);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
41
|
+
return _models.PrinterFile.find({
|
|
42
|
+
printerId: printer.id
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
async updateFiles(printerId, newFiles) {
|
|
46
|
+
const savedFiles = await this.getPrinterFiles(printerId);
|
|
47
|
+
const newPaths = newFiles.map((f)=>f.path);
|
|
48
|
+
const deletableSavedFiles = savedFiles.filter((f)=>!newPaths.includes(f.path));
|
|
49
|
+
const deletableSavedFilePaths = deletableSavedFiles.map((f)=>f.path);
|
|
50
|
+
await this.deletePrinterFiles(printerId, deletableSavedFilePaths, false);
|
|
51
|
+
for (const newFile of newFiles){
|
|
52
|
+
await this.appendOrReplaceFile(printerId, newFile);
|
|
53
|
+
}
|
|
54
|
+
return await this.getPrinterFiles(printerId);
|
|
33
55
|
}
|
|
34
56
|
async appendOrReplaceFile(printerId, addedFile) {
|
|
35
57
|
const printer = await this.printerService.get(printerId);
|
|
36
|
-
|
|
37
|
-
if (
|
|
38
|
-
|
|
39
|
-
} else {
|
|
40
|
-
printer.fileList.files[foundFileIndex] = addedFile;
|
|
58
|
+
addedFile.printerId = printer.id;
|
|
59
|
+
if (!addedFile.customData) {
|
|
60
|
+
addedFile.customData = {};
|
|
41
61
|
}
|
|
42
|
-
printer.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
62
|
+
const foundFile = await this.getPrinterFile(printer.id, addedFile.path);
|
|
63
|
+
if (!foundFile) {
|
|
64
|
+
await _models.PrinterFile.create(addedFile);
|
|
65
|
+
} else {
|
|
66
|
+
await _models.PrinterFile.replaceOne({
|
|
67
|
+
printerId: printer.id,
|
|
68
|
+
id: foundFile.id
|
|
69
|
+
}, addedFile);
|
|
49
70
|
}
|
|
50
|
-
return
|
|
51
|
-
fileList: printer.fileList,
|
|
52
|
-
lastPrintedFile
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
async setPrinterLastPrintedFile(printerId, fileName) {
|
|
56
|
-
await this.printerService.get(printerId);
|
|
57
|
-
const lastPrintedFile = {
|
|
58
|
-
fileName,
|
|
59
|
-
editTimestamp: Date.now()
|
|
60
|
-
};
|
|
61
|
-
const printer = await this.printerService.updateLastPrintedFile(printerId, lastPrintedFile);
|
|
62
|
-
this.logger.log("Parsed and updated printer file", printer.lastPrintedFile);
|
|
63
|
-
return printer.lastPrintedFile;
|
|
71
|
+
return await this.getPrinterFiles(printer.id);
|
|
64
72
|
}
|
|
65
73
|
async clearFiles(printerId) {
|
|
66
74
|
const printer = await this.printerService.get(printerId);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
75
|
+
await _models.PrinterFile.deleteMany({
|
|
76
|
+
printerId: printer.id
|
|
77
|
+
});
|
|
70
78
|
}
|
|
71
|
-
async
|
|
79
|
+
async deletePrinterFiles(printerId, filePaths, throwError = true) {
|
|
72
80
|
const printer = await this.printerService.get(printerId);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
81
|
+
if (!!filePaths && !filePaths?.length) {
|
|
82
|
+
return;
|
|
83
|
+
} else if (!filePaths) {
|
|
84
|
+
throw new Error("Cant delete specific printer files without specific file path array being provided");
|
|
85
|
+
}
|
|
86
|
+
for (const filePath of filePaths){
|
|
87
|
+
const file = await this.getPrinterFile(printerId, filePath);
|
|
88
|
+
if (!file) {
|
|
89
|
+
if (throwError) {
|
|
90
|
+
throw new _runtimeexceptions.NotFoundException(`A file removal was ordered but this file was not found in database for printer Id ${printerId}`, filePath);
|
|
91
|
+
} else {
|
|
92
|
+
this.logger.warn("File was not found in PrinterFile table");
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
79
95
|
}
|
|
96
|
+
await _models.PrinterFile.deleteOne({
|
|
97
|
+
printerId: printer.id,
|
|
98
|
+
path: filePath
|
|
99
|
+
});
|
|
80
100
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
await
|
|
101
|
+
}
|
|
102
|
+
async getPrinterFile(printerId, filePath) {
|
|
103
|
+
const printer = await this.printerService.get(printerId);
|
|
104
|
+
return _models.PrinterFile.findOne({
|
|
105
|
+
printerId: printer.id,
|
|
106
|
+
path: filePath
|
|
107
|
+
});
|
|
84
108
|
}
|
|
85
109
|
}
|
|
86
110
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-files.service.ts"],"names":["PrinterFilesService","printerService","logger","constructor","loggerFactory","name","toDto","entity","id","printerId","toString","date","display","gcodeAnalysis","hash","origin","path","prints","refs","size","statistics","type","typePath","getPrinterFiles","printer","get","PrinterFile","find","updateFiles","newFiles","savedFiles","newPaths","map","f","deletableSavedFiles","filter","includes","deletableSavedFilePaths","deletePrinterFiles","newFile","appendOrReplaceFile","addedFile","customData","foundFile","getPrinterFile","create","replaceOne","clearFiles","deleteMany","filePaths","throwError","length","Error","filePath","file","NotFoundException","warn","deleteOne","findOne"],"mappings":"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"}
|
|
@@ -12,7 +12,6 @@ const _models = require("../models");
|
|
|
12
12
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
13
13
|
const _validators = require("../handlers/validators");
|
|
14
14
|
const _printerservicevalidation = require("./validators/printer-service.validation");
|
|
15
|
-
const _serviceconstants = require("../constants/service.constants");
|
|
16
15
|
const _eventconstants = require("../constants/event.constants");
|
|
17
16
|
const _urlutils = require("../utils/url.utils");
|
|
18
17
|
class PrinterService {
|
|
@@ -221,7 +220,6 @@ class PrinterService {
|
|
|
221
220
|
}
|
|
222
221
|
async validateAndDefault(printer) {
|
|
223
222
|
const mergedPrinter = {
|
|
224
|
-
...(0, _serviceconstants.getDefaultPrinterEntry)(),
|
|
225
223
|
enabled: true,
|
|
226
224
|
...printer
|
|
227
225
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeURLWithProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateLastPrintedFile","lastPrintedFile","findByIdAndUpdate","new","useFindAndModify","updateFlowRate","flowRate","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "TypeormService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return TypeormService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _logger = require("../../handlers/logger");
|
|
12
|
+
const _datasource = require("../../data-source");
|
|
13
|
+
class TypeormService {
|
|
14
|
+
loaded = false;
|
|
15
|
+
dataSource;
|
|
16
|
+
logger = new _logger.LoggerService(TypeormService.name);
|
|
17
|
+
hasConnected() {
|
|
18
|
+
if (!this.dataSource) {
|
|
19
|
+
this.loadDataSources();
|
|
20
|
+
}
|
|
21
|
+
return this.dataSource.isInitialized ? 1 : 0;
|
|
22
|
+
}
|
|
23
|
+
getDataSource() {
|
|
24
|
+
if (!this.dataSource) {
|
|
25
|
+
this.loadDataSources();
|
|
26
|
+
}
|
|
27
|
+
return this.dataSource;
|
|
28
|
+
}
|
|
29
|
+
async createConnection() {
|
|
30
|
+
const dataSource = this.loadDataSources();
|
|
31
|
+
if (!dataSource.isInitialized) {
|
|
32
|
+
const connection = await dataSource.initialize();
|
|
33
|
+
await connection.runMigrations({
|
|
34
|
+
transaction: "all"
|
|
35
|
+
});
|
|
36
|
+
this.logger.log("Typeorm connection initialized");
|
|
37
|
+
} else {
|
|
38
|
+
this.logger.log("Typeorm connection already initialized, skipping");
|
|
39
|
+
}
|
|
40
|
+
this.loaded = true;
|
|
41
|
+
}
|
|
42
|
+
loadDataSources() {
|
|
43
|
+
this.dataSource = _datasource.AppDataSource;
|
|
44
|
+
return this.dataSource;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
//# sourceMappingURL=typeorm.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/typeorm/typeorm.service.ts"],"names":["TypeormService","loaded","dataSource","logger","LoggerService","name","hasConnected","loadDataSources","isInitialized","getDataSource","createConnection","connection","initialize","runMigrations","transaction","log","AppDataSource"],"mappings":";;;;+BAIaA;;;eAAAA;;;wBAHiB;4BACA;AAEvB,MAAMA;IACXC,SAAS,MAAM;IACPC,WAAwB;IACxBC,SAAS,IAAIC,qBAAa,CAACJ,eAAeK,IAAI,EAAE;IAEjDC,eAAe;QACpB,IAAI,CAAC,IAAI,CAACJ,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU,CAAEM,aAAa,GAAG,IAAI;IAC9C;IAEOC,gBAAgB;QACrB,IAAI,CAAC,IAAI,CAACP,UAAU,EAAE;YACpB,IAAI,CAACK,eAAe;QACtB;QAEA,OAAO,IAAI,CAACL,UAAU;IACxB;IAEA,MAAaQ,mBAAmB;QAC9B,MAAMR,aAAa,IAAI,CAACK,eAAe;QACvC,IAAI,CAACL,WAAWM,aAAa,EAAE;YAC7B,MAAMG,aAAa,MAAMT,WAAWU,UAAU;YAC9C,MAAMD,WAAWE,aAAa,CAAC;gBAAEC,aAAa;YAAM;YACpD,IAAI,CAACX,MAAM,CAACY,GAAG,CAAC;QAClB,OAAO;YACL,IAAI,CAACZ,MAAM,CAACY,GAAG,CAAC;QAClB;QACA,IAAI,CAACd,MAAM,GAAG;IAChB;IAEQM,kBAAkB;QACxB,IAAI,CAACL,UAAU,GAAGc,yBAAa;QAC/B,OAAO,IAAI,CAACd,UAAU;IACxB;AACF"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterLoginDto", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterLoginDto;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _classvalidator = require("class-validator");
|
|
12
|
+
const _serviceconstants = require("../../constants/service.constants");
|
|
13
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
14
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
15
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
16
|
+
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;
|
|
17
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
18
|
+
}
|
|
19
|
+
function _ts_metadata(k, v) {
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
21
|
+
}
|
|
22
|
+
class PrinterLoginDto {
|
|
23
|
+
printerURL;
|
|
24
|
+
apiKey;
|
|
25
|
+
context = null;
|
|
26
|
+
constructor(printerURL, apiKey, context = null){
|
|
27
|
+
this.printerURL = printerURL;
|
|
28
|
+
this.apiKey = apiKey;
|
|
29
|
+
this.context = context;
|
|
30
|
+
}
|
|
31
|
+
validateParams() {
|
|
32
|
+
return (0, _classvalidator.validateSync)(this);
|
|
33
|
+
}
|
|
34
|
+
toSocketLogin(printerId, protocol = "ws") {
|
|
35
|
+
return {
|
|
36
|
+
printerId,
|
|
37
|
+
loginDto: this,
|
|
38
|
+
protocol
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
_ts_decorate([
|
|
43
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
44
|
+
(0, _classvalidator.IsUrl)(),
|
|
45
|
+
_ts_metadata("design:type", String)
|
|
46
|
+
], PrinterLoginDto.prototype, "printerURL", void 0);
|
|
47
|
+
_ts_decorate([
|
|
48
|
+
(0, _classvalidator.Length)(_serviceconstants.apiKeyLengthMinimumDefault),
|
|
49
|
+
(0, _classvalidator.IsAlphanumeric)(),
|
|
50
|
+
(0, _classvalidator.IsNotEmpty)(),
|
|
51
|
+
_ts_metadata("design:type", String)
|
|
52
|
+
], PrinterLoginDto.prototype, "apiKey", void 0);
|
|
53
|
+
_ts_decorate([
|
|
54
|
+
(0, _classvalidator.IsOptional)(),
|
|
55
|
+
_ts_metadata("design:type", Object)
|
|
56
|
+
], PrinterLoginDto.prototype, "context", void 0);
|
|
57
|
+
|
|
58
|
+
//# sourceMappingURL=printer-login.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/shared/dtos/printer-login.dto.ts"],"names":["PrinterLoginDto","printerURL","apiKey","context","constructor","validateParams","validateSync","toSocketLogin","printerId","protocol","loginDto","IsNotEmpty","IsUrl","Length","apiKeyLengthMinimumDefault","IsAlphanumeric","IsOptional"],"mappings":";;;;+BAIaA;;;eAAAA;;;gCAJuE;kCAEzC;;;;;;;;;;AAEpC,MAAMA;IAGXC,WAAmB;IAKnBC,OAAe;IAGfC,UAAe,KAAK;IAEpBC,YAAYH,UAAkB,EAAEC,MAAc,EAAEC,UAAe,IAAI,CAAE;QACnE,IAAI,CAACF,UAAU,GAAGA;QAClB,IAAI,CAACC,MAAM,GAAGA;QACd,IAAI,CAACC,OAAO,GAAGA;IACjB;IAGOE,iBAAiB;QACtB,OAAOC,IAAAA,4BAAY,EAAC,IAAI;IAC1B;IAEAC,cAAcC,SAAiB,EAAEC,WAAuB,IAAI,EAAuB;QACjF,OAAO;YACLD;YACAE,UAAU,IAAI;YACdD;QACF;IACF;AACF;;IA9BGE,IAAAA,0BAAU;IACVC,IAAAA,qBAAK;;GAFKZ;;IAKVa,IAAAA,sBAAM,EAACC,4CAA0B;IACjCC,IAAAA,8BAAc;IACdJ,IAAAA,0BAAU;;GAPAX;;IAUVgB,IAAAA,0BAAU;;GAVAhB"}
|
|
@@ -12,9 +12,9 @@ const _serverconstants = require("../server.constants");
|
|
|
12
12
|
const _ws = require("ws");
|
|
13
13
|
class WebsocketAdapter {
|
|
14
14
|
socket;
|
|
15
|
-
|
|
15
|
+
logger;
|
|
16
16
|
constructor({ loggerFactory }){
|
|
17
|
-
this
|
|
17
|
+
this.logger = loggerFactory(WebsocketAdapter.name);
|
|
18
18
|
}
|
|
19
19
|
get isOpened() {
|
|
20
20
|
return this.socket?.readyState === _ws.WebSocket.OPEN;
|
|
@@ -34,7 +34,7 @@ class WebsocketAdapter {
|
|
|
34
34
|
}
|
|
35
35
|
async sendMessage(payload) {
|
|
36
36
|
if (!this.isOpened || !this.socket) {
|
|
37
|
-
this
|
|
37
|
+
this.logger.error("Websocket is not opened, cant send a message");
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
40
|
return await new Promise((resolve, reject)=>{
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOaA;;;eAAAA;;;iCAPgB;oBAC6C;AAMnE,MAAMA;IACXC,OAAmB;IACTC,OAAsB;IAEhCC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IASAU,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACX,MAAM,GAAG,IAAIO,aAAS,CAACI,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACd,MAAM,CAACe,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAAChB,MAAM,CAACkB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAAChB,MAAM,CAACuB,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAACvB,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACkB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAC/B,MAAM,CAAEgC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASUV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQxD,MAAcC,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}
|
|
@@ -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","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":";;;;+
|
|
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","percent","markUploadDone","off","upload","success","trackedUploadIndex","findIndex","warn","trackedUpload","failedAt","succeededAt","splice"],"mappings":"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"}
|