@fdm-monster/server 1.6.0-rc1 → 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/.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 +1 -1
- 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/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/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 +2 -8
- 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/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/PrinterFile.js +4 -0
- package/dist/models/PrinterFile.js.map +1 -1
- 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/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/printer-file.dto.js +29 -3
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +0 -25
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection.dto.js +6 -0
- package/dist/services/octoprint/dto/connection.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- 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 +9 -3
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +17 -2
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +53 -45
- package/dist/services/octoprint/octoprint-sockio.adapter.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.service.js +3 -0
- package/dist/services/orm/base.service.js.map +1 -1
- 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/printer-files.service.js +3 -0
- package/dist/services/printer-files.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/state/file.cache.js +2 -9
- 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 +3 -4
- 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 +3 -0
- 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 +15 -1
- 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/semver.utils.js +19 -4
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +30 -29
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "SettingsService2", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return SettingsService2;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _entities = require("../../entities");
|
|
12
|
+
const _serversettingsconstants = require("../../constants/server-settings.constants");
|
|
13
|
+
const _baseservice = require("./base.service");
|
|
14
|
+
const _settingsdto = require("../interfaces/settings.dto");
|
|
15
|
+
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
16
|
+
const _serverconstants = require("../../server.constants");
|
|
17
|
+
const _validators = require("../../handlers/validators");
|
|
18
|
+
const _settingsservicevalidation = require("../validators/settings-service.validation");
|
|
19
|
+
class SettingsService2 extends (0, _baseservice.BaseService)(_entities.Settings, _settingsdto.SettingsDto) {
|
|
20
|
+
configService;
|
|
21
|
+
constructor({ configService, typeormService }){
|
|
22
|
+
super({
|
|
23
|
+
typeormService
|
|
24
|
+
});
|
|
25
|
+
this.configService = configService;
|
|
26
|
+
}
|
|
27
|
+
toDto(entity) {
|
|
28
|
+
return {
|
|
29
|
+
[_serversettingsconstants.serverSettingsKey]: entity[_serversettingsconstants.serverSettingsKey],
|
|
30
|
+
[_serversettingsconstants.frontendSettingKey]: entity[_serversettingsconstants.frontendSettingKey],
|
|
31
|
+
[_serversettingsconstants.fileCleanSettingKey]: entity[_serversettingsconstants.fileCleanSettingKey],
|
|
32
|
+
[_serversettingsconstants.wizardSettingKey]: entity[_serversettingsconstants.wizardSettingKey],
|
|
33
|
+
[_serversettingsconstants.timeoutSettingKey]: entity[_serversettingsconstants.timeoutSettingKey]
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
async getOrCreate() {
|
|
37
|
+
let settings = await this.get();
|
|
38
|
+
if (!settings) {
|
|
39
|
+
const settings = await this.create({
|
|
40
|
+
[_serversettingsconstants.serverSettingsKey]: (0, _serversettingsconstants.getDefaultServerSettings)(),
|
|
41
|
+
[_serversettingsconstants.credentialSettingsKey]: (0, _serversettingsconstants.getDefaultCredentialSettings)(),
|
|
42
|
+
[_serversettingsconstants.wizardSettingKey]: (0, _serversettingsconstants.getDefaultWizardSettings)(),
|
|
43
|
+
[_serversettingsconstants.fileCleanSettingKey]: (0, _serversettingsconstants.getDefaultFileCleanSettings)(),
|
|
44
|
+
[_serversettingsconstants.frontendSettingKey]: (0, _serversettingsconstants.getDefaultFrontendSettings)(),
|
|
45
|
+
[_serversettingsconstants.timeoutSettingKey]: (0, _serversettingsconstants.getDefaultTimeout)()
|
|
46
|
+
});
|
|
47
|
+
return settings;
|
|
48
|
+
} else {
|
|
49
|
+
settings = this.migrateSettingsRuntime(settings);
|
|
50
|
+
}
|
|
51
|
+
return settings;
|
|
52
|
+
}
|
|
53
|
+
async getServerSettings() {
|
|
54
|
+
const settings = await this.getOrCreate();
|
|
55
|
+
return settings[_serversettingsconstants.serverSettingsKey];
|
|
56
|
+
}
|
|
57
|
+
async patchServerSettings(serverSettingsPartial) {
|
|
58
|
+
const entity = await this.getOrCreate();
|
|
59
|
+
if (!entity[_serversettingsconstants.serverSettingsKey]) {
|
|
60
|
+
throw new Error("No existing server settings found, cant patch");
|
|
61
|
+
}
|
|
62
|
+
const newServerSettings = {
|
|
63
|
+
...entity[_serversettingsconstants.serverSettingsKey],
|
|
64
|
+
...serverSettingsPartial
|
|
65
|
+
};
|
|
66
|
+
return await this.updateServerSettings(newServerSettings);
|
|
67
|
+
}
|
|
68
|
+
async updateServerSettings(serverSettings) {
|
|
69
|
+
const entity = await this.getOrCreate();
|
|
70
|
+
entity[_serversettingsconstants.serverSettingsKey] = serverSettings;
|
|
71
|
+
await this.update(entity.id, entity);
|
|
72
|
+
return entity;
|
|
73
|
+
}
|
|
74
|
+
async updateCredentialSettings(credentialSettings) {
|
|
75
|
+
const entity = await this.getOrCreate();
|
|
76
|
+
entity[_serversettingsconstants.credentialSettingsKey] = credentialSettings;
|
|
77
|
+
await this.update(entity.id, entity);
|
|
78
|
+
return entity;
|
|
79
|
+
}
|
|
80
|
+
async updateFileCleanSettings(fileCleanSettings) {
|
|
81
|
+
const entity = await this.getOrCreate();
|
|
82
|
+
entity[_serversettingsconstants.fileCleanSettingKey] = fileCleanSettings;
|
|
83
|
+
await this.update(entity.id, entity);
|
|
84
|
+
return entity;
|
|
85
|
+
}
|
|
86
|
+
async updateFrontendSettings(frontendSettings) {
|
|
87
|
+
const entity = await this.getOrCreate();
|
|
88
|
+
entity[_serversettingsconstants.frontendSettingKey] = frontendSettings;
|
|
89
|
+
await this.update(entity.id, entity);
|
|
90
|
+
return entity;
|
|
91
|
+
}
|
|
92
|
+
async updateTimeoutSettings(timeoutSettings) {
|
|
93
|
+
const entity = await this.getOrCreate();
|
|
94
|
+
entity[_serversettingsconstants.timeoutSettingKey] = timeoutSettings;
|
|
95
|
+
await this.update(entity.id, entity);
|
|
96
|
+
return entity;
|
|
97
|
+
}
|
|
98
|
+
async patchWizardSettings(wizardSettingsPartial) {
|
|
99
|
+
const entity = await this.getOrCreate();
|
|
100
|
+
if (!entity[_serversettingsconstants.wizardSettingKey]) {
|
|
101
|
+
throw new Error("No existing wizard settings found, cant patch");
|
|
102
|
+
}
|
|
103
|
+
const newWizardSettings = {
|
|
104
|
+
...entity[_serversettingsconstants.wizardSettingKey],
|
|
105
|
+
...wizardSettingsPartial
|
|
106
|
+
};
|
|
107
|
+
return await this.updateWizardSettings(newWizardSettings);
|
|
108
|
+
}
|
|
109
|
+
async updateWizardSettings(wizardSettings) {
|
|
110
|
+
const entity = await this.getOrCreate();
|
|
111
|
+
entity[_serversettingsconstants.wizardSettingKey] = wizardSettings;
|
|
112
|
+
await this.update(entity.id, entity);
|
|
113
|
+
return entity;
|
|
114
|
+
}
|
|
115
|
+
async get() {
|
|
116
|
+
const settingsList = await this.repository.find({
|
|
117
|
+
take: 1
|
|
118
|
+
});
|
|
119
|
+
return settingsList?.length ? settingsList[0] : null;
|
|
120
|
+
}
|
|
121
|
+
migrateSettingsRuntime(knownSettings) {
|
|
122
|
+
const entity = knownSettings;
|
|
123
|
+
if (!entity[_serversettingsconstants.fileCleanSettingKey]) {
|
|
124
|
+
entity[_serversettingsconstants.fileCleanSettingKey] = (0, _serversettingsconstants.getDefaultFileCleanSettings)();
|
|
125
|
+
}
|
|
126
|
+
if (!entity[_serversettingsconstants.wizardSettingKey]) {
|
|
127
|
+
entity[_serversettingsconstants.wizardSettingKey] = (0, _serversettingsconstants.getDefaultWizardSettings)();
|
|
128
|
+
}
|
|
129
|
+
if (!entity[_serversettingsconstants.timeoutSettingKey]) {
|
|
130
|
+
entity[_serversettingsconstants.timeoutSettingKey] = (0, _serversettingsconstants.getDefaultTimeout)();
|
|
131
|
+
}
|
|
132
|
+
if (!entity[_serversettingsconstants.serverSettingsKey]) {
|
|
133
|
+
entity[_serversettingsconstants.serverSettingsKey] = (0, _serversettingsconstants.getDefaultServerSettings)();
|
|
134
|
+
}
|
|
135
|
+
if (!entity[_serversettingsconstants.credentialSettingsKey]) {
|
|
136
|
+
entity[_serversettingsconstants.credentialSettingsKey] = (0, _serversettingsconstants.getDefaultCredentialSettings)();
|
|
137
|
+
}
|
|
138
|
+
if (!this.isWhiteListSettingEnabled()) {
|
|
139
|
+
entity.server.whitelistEnabled = false;
|
|
140
|
+
entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
|
|
141
|
+
} else if (!entity.server.whitelistedIpAddresses?.length) {
|
|
142
|
+
entity.server.whitelistedIpAddresses = (0, _serversettingsconstants.getDefaultWhitelistIpAddresses)();
|
|
143
|
+
}
|
|
144
|
+
if (!entity[_serversettingsconstants.frontendSettingKey]) {
|
|
145
|
+
entity[_serversettingsconstants.frontendSettingKey] = (0, _serversettingsconstants.getDefaultFrontendSettings)();
|
|
146
|
+
}
|
|
147
|
+
return entity;
|
|
148
|
+
}
|
|
149
|
+
async patchCredentialSettings(patchUpdate) {
|
|
150
|
+
const entity = await this.getOrCreate();
|
|
151
|
+
if (!entity[_serversettingsconstants.credentialSettingsKey]) {
|
|
152
|
+
throw new Error("No existing wizard settings found, cant patch");
|
|
153
|
+
}
|
|
154
|
+
const newCredentialSettings = {
|
|
155
|
+
...entity[_serversettingsconstants.credentialSettingsKey],
|
|
156
|
+
...patchUpdate
|
|
157
|
+
};
|
|
158
|
+
return await this.updateCredentialSettings(newCredentialSettings);
|
|
159
|
+
}
|
|
160
|
+
async patchFileCleanSettings(patchUpdate) {
|
|
161
|
+
const entity = await this.getOrCreate();
|
|
162
|
+
if (!entity[_serversettingsconstants.fileCleanSettingKey]) {
|
|
163
|
+
throw new Error("No existing wizard settings found, cant patch");
|
|
164
|
+
}
|
|
165
|
+
const newFileCleanSettings = {
|
|
166
|
+
...entity[_serversettingsconstants.fileCleanSettingKey],
|
|
167
|
+
...patchUpdate
|
|
168
|
+
};
|
|
169
|
+
return await this.updateFileCleanSettings(newFileCleanSettings);
|
|
170
|
+
}
|
|
171
|
+
async setLoginRequired(enabled) {
|
|
172
|
+
const entity = await this.getOrCreate();
|
|
173
|
+
entity[_serversettingsconstants.serverSettingsKey].loginRequired = enabled;
|
|
174
|
+
await this.update(entity.id, entity);
|
|
175
|
+
return entity;
|
|
176
|
+
}
|
|
177
|
+
async setRegistrationEnabled(enabled) {
|
|
178
|
+
const entity = await this.getOrCreate();
|
|
179
|
+
entity[_serversettingsconstants.serverSettingsKey].registration = enabled;
|
|
180
|
+
await this.update(entity.id, entity);
|
|
181
|
+
return entity;
|
|
182
|
+
}
|
|
183
|
+
async setSentryDiagnosticsEnabled(enabled) {
|
|
184
|
+
const entity = await this.getOrCreate();
|
|
185
|
+
entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled = enabled;
|
|
186
|
+
await this.update(entity.id, entity);
|
|
187
|
+
return entity;
|
|
188
|
+
}
|
|
189
|
+
async setWhitelist(enabled, ipAddresses) {
|
|
190
|
+
if (!this.isWhiteListSettingEnabled()) {
|
|
191
|
+
throw new _runtimeexceptions.BadRequestException("Whitelist settings are not enabled");
|
|
192
|
+
}
|
|
193
|
+
await (0, _validators.validateInput)({
|
|
194
|
+
whitelistEnabled: enabled,
|
|
195
|
+
whitelistedIpAddresses: ipAddresses
|
|
196
|
+
}, _settingsservicevalidation.whitelistSettingUpdateRules);
|
|
197
|
+
const entity = await this.getOrCreate();
|
|
198
|
+
entity[_serversettingsconstants.serverSettingsKey].whitelistEnabled = enabled;
|
|
199
|
+
entity[_serversettingsconstants.serverSettingsKey].whitelistedIpAddresses = ipAddresses;
|
|
200
|
+
await this.update(entity.id, entity);
|
|
201
|
+
return entity;
|
|
202
|
+
}
|
|
203
|
+
isWhiteListSettingEnabled() {
|
|
204
|
+
return this.configService.get(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS, "false") === "true";
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
//# sourceMappingURL=settings.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService2","BaseService","Settings","SettingsDto","configService","constructor","typeormService","toDto","entity","serverSettingsKey","frontendSettingKey","fileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","get","create","getDefaultServerSettings","credentialSettingsKey","getDefaultCredentialSettings","getDefaultWizardSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultTimeout","migrateSettingsRuntime","getServerSettings","patchServerSettings","serverSettingsPartial","Error","newServerSettings","updateServerSettings","serverSettings","update","id","updateCredentialSettings","credentialSettings","updateFileCleanSettings","fileCleanSettings","updateFrontendSettings","frontendSettings","updateTimeoutSettings","timeoutSettings","patchWizardSettings","wizardSettingsPartial","newWizardSettings","updateWizardSettings","wizardSettings","settingsList","repository","find","take","length","knownSettings","isWhiteListSettingEnabled","server","whitelistEnabled","whitelistedIpAddresses","getDefaultWhitelistIpAddresses","patchCredentialSettings","patchUpdate","newCredentialSettings","patchFileCleanSettings","newFileCleanSettings","setLoginRequired","enabled","loginRequired","setRegistrationEnabled","registration","setSentryDiagnosticsEnabled","sentryDiagnosticsEnabled","setWhitelist","ipAddresses","BadRequestException","validateInput","whitelistSettingUpdateRules","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS"],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "UserRoleService", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return UserRoleService;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _baseservice = require("./base.service");
|
|
12
|
+
const _userroleentity = require("../../entities/user-role.entity");
|
|
13
|
+
const _userroledto = require("../interfaces/user-role.dto");
|
|
14
|
+
const _typeorm = require("typeorm");
|
|
15
|
+
class UserRoleService extends (0, _baseservice.BaseService)(_userroleentity.UserRole, _userroledto.UserRoleDto) {
|
|
16
|
+
toDto(entity) {
|
|
17
|
+
return {
|
|
18
|
+
id: entity.id,
|
|
19
|
+
roleId: entity.roleId,
|
|
20
|
+
userId: entity.userId,
|
|
21
|
+
createdAt: entity.createdAt
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
async setUserRoles(userId, roleIds) {
|
|
25
|
+
const previousRoles = await this.listUserRoles(userId);
|
|
26
|
+
const previousIds = previousRoles.map((p)=>p.roleId);
|
|
27
|
+
const deletedRoleIds = previousIds.filter((p)=>!roleIds.includes(p));
|
|
28
|
+
await this.deleteManyUserRoles(userId, deletedRoleIds);
|
|
29
|
+
const createdRoleIds = roleIds.filter((r)=>!previousIds.includes(r));
|
|
30
|
+
for (let roleId of createdRoleIds){
|
|
31
|
+
await this.create({
|
|
32
|
+
roleId,
|
|
33
|
+
userId
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
deleteManyUserRoles(userId, roleIds) {
|
|
38
|
+
return this.repository.delete({
|
|
39
|
+
userId,
|
|
40
|
+
roleId: (0, _typeorm.In)(roleIds)
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
listByRoleId(roleId) {
|
|
44
|
+
return this.repository.findBy({
|
|
45
|
+
roleId
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
async listUserRoles(userId) {
|
|
49
|
+
return this.repository.findBy({
|
|
50
|
+
userId
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
//# sourceMappingURL=user-role.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/user-role.service.ts"],"names":["UserRoleService","BaseService","UserRole","UserRoleDto","toDto","entity","id","roleId","userId","createdAt","setUserRoles","roleIds","previousRoles","listUserRoles","previousIds","map","p","deletedRoleIds","filter","includes","deleteManyUserRoles","createdRoleIds","r","create","repository","delete","In","listByRoleId","findBy"],"mappings":";;;;+BAKaA;;;eAAAA;;;6BALe;gCACH;6BACG;yBACT;AAEZ,MAAMA,wBAAwBC,IAAAA,wBAAW,EAACC,wBAAQ,EAAEC,wBAAW;IACpEC,MAAMC,MAAgB,EAAe;QACnC,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,QAAQF,OAAOE,MAAM;YACrBC,QAAQH,OAAOG,MAAM;YACrBC,WAAWJ,OAAOI,SAAS;QAC7B;IACF;IAEA,MAAMC,aAAaF,MAAc,EAAEG,OAAiB,EAAE;QACpD,MAAMC,gBAAgB,MAAM,IAAI,CAACC,aAAa,CAACL;QAC/C,MAAMM,cAAcF,cAAcG,GAAG,CAAC,CAACC,IAAMA,EAAET,MAAM;QAErD,MAAMU,iBAAiBH,YAAYI,MAAM,CAAC,CAACF,IAAM,CAACL,QAAQQ,QAAQ,CAACH;QACnE,MAAM,IAAI,CAACI,mBAAmB,CAACZ,QAAQS;QACvC,MAAMI,iBAAiBV,QAAQO,MAAM,CAAC,CAACI,IAAM,CAACR,YAAYK,QAAQ,CAACG;QACnE,KAAK,IAAIf,UAAUc,eAAgB;YACjC,MAAM,IAAI,CAACE,MAAM,CAAC;gBAChBhB;gBACAC;YACF;QACF;IACF;IAEAY,oBAAoBZ,MAAc,EAAEG,OAAiB,EAAE;QACrD,OAAO,IAAI,CAACa,UAAU,CAACC,MAAM,CAAC;YAC5BjB;YACAD,QAAQmB,IAAAA,WAAE,EAACf;QACb;IACF;IAEAgB,aAAapB,MAAc,EAAE;QAC3B,OAAO,IAAI,CAACiB,UAAU,CAACI,MAAM,CAAC;YAAErB;QAAO;IACzC;IAEA,MAAMM,cAAcL,MAAc,EAAE;QAClC,OAAO,IAAI,CAACgB,UAAU,CAACI,MAAM,CAAC;YAAEpB;QAAO;IACzC;AACF"}
|
|
@@ -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"}
|
|
@@ -56,6 +56,9 @@ class PrinterFilesService {
|
|
|
56
56
|
async appendOrReplaceFile(printerId, addedFile) {
|
|
57
57
|
const printer = await this.printerService.get(printerId);
|
|
58
58
|
addedFile.printerId = printer.id;
|
|
59
|
+
if (!addedFile.customData) {
|
|
60
|
+
addedFile.customData = {};
|
|
61
|
+
}
|
|
59
62
|
const foundFile = await this.getPrinterFile(printer.id, addedFile.path);
|
|
60
63
|
if (!foundFile) {
|
|
61
64
|
await _models.PrinterFile.create(addedFile);
|
|
@@ -1 +1 @@
|
|
|
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","foundFile","getPrinterFile","create","replaceOne","clearFiles","deleteMany","filePaths","throwError","length","Error","filePath","file","NotFoundException","warn","deleteOne","findOne"],"mappings":";;;;+BAcaA;;;eAAAA;;;mCAdqB;wBAON;AAOrB,MAAMA;IACXC,eAAuD;IAC/CC,OAAsB;IAE9BC,YAAY,EACVF,cAAc,EACdG,aAAa,EAId,CAAE;QACD,IAAI,CAACH,cAAc,GAAGA;QACtB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEAC,MAAMC,MAAoB,EAA+B;QACvD,OAAO;YACLC,IAAID,OAAOC,EAAE;YACbC,WAAWF,OAAOE,SAAS,EAAEC;YAC7BL,MAAME,OAAOF,IAAI;YACjBM,MAAMJ,OAAOI,IAAI;YACjBC,SAASL,OAAOK,OAAO;YACvBC,eAAeN,OAAOM,aAAa;YACnCC,MAAMP,OAAOO,IAAI;YACjBC,QAAQR,OAAOQ,MAAM;YACrBC,MAAMT,OAAOS,IAAI;YACjBC,QAAQV,OAAOU,MAAM;YACrBC,MAAMX,OAAOW,IAAI;YACjBC,MAAMZ,OAAOY,IAAI;YACjBC,YAAYb,OAAOa,UAAU;YAC7BC,MAAMd,OAAOc,IAAI;YACjBC,UAAUf,OAAOe,QAAQ;QAC3B;IACF;IAEA,MAAMC,gBAAgBd,SAAsB,EAAE;QAC5C,MAAMe,UAAU,MAAM,IAAI,CAACvB,cAAc,CAACwB,GAAG,CAAChB;QAC9C,OAAOiB,mBAAW,CAACC,IAAI,CAAC;YAAElB,WAAWe,QAAQhB,EAAE;QAAC;IAClD;IAEA,MAAMoB,YAAYnB,SAAsB,EAAEoB,
|
|
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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"}
|
|
@@ -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"}
|
package/dist/state/file.cache.js
CHANGED
|
@@ -27,8 +27,7 @@ class FileCache {
|
|
|
27
27
|
if (!printerId) {
|
|
28
28
|
throw new Error("File Cache cant get a null/undefined printer id");
|
|
29
29
|
}
|
|
30
|
-
this.printerFileStorage[printerId]
|
|
31
|
-
return this.getPrinterFileStorage(printerId);
|
|
30
|
+
return this.printerFileStorage[printerId];
|
|
32
31
|
}
|
|
33
32
|
updateCacheFileRefCount() {
|
|
34
33
|
let totalFiles = 0;
|
|
@@ -54,7 +53,7 @@ class FileCache {
|
|
|
54
53
|
this.logger.log(`Purged printerId '${printerId}' file cache`);
|
|
55
54
|
}
|
|
56
55
|
purgeFile(printerId, filePath) {
|
|
57
|
-
const files = this.
|
|
56
|
+
const files = this.getPrinterFiles(printerId);
|
|
58
57
|
if (!files) return;
|
|
59
58
|
const fileIndex = files.findIndex((f)=>f.path === filePath);
|
|
60
59
|
if (fileIndex === -1) {
|
|
@@ -64,12 +63,6 @@ class FileCache {
|
|
|
64
63
|
files.splice(fileIndex, 1);
|
|
65
64
|
this.logger.log(`File ${filePath} was removed`);
|
|
66
65
|
}
|
|
67
|
-
getPrinterFileStorage(printerId) {
|
|
68
|
-
if (!printerId) {
|
|
69
|
-
throw new Error("File Cache cant get a null/undefined printer id");
|
|
70
|
-
}
|
|
71
|
-
return this.printerFileStorage[printerId];
|
|
72
|
-
}
|
|
73
66
|
}
|
|
74
67
|
|
|
75
68
|
//# sourceMappingURL=file.cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","
|
|
1
|
+
{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","constructor","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAOaA;;;eAAAA;;;mCAPuB;AAO7B,MAAMA;IACHC,qBAAwE,CAAC,EAAE;IAC3EC,iBAAiB,EAAE;IAEnBC,OAAsB;IAE9BC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAACF,MAAM,GAAGE,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAwC,EAAE;QAC7E,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACO,UAAU,GAAGC;QACrC,IAAI,CAACE,uBAAuB;IAC9B;IAEAC,gBAAgBJ,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,OAAO,IAAI,CAACT,kBAAkB,CAACO,UAAU;IAC3C;IAEAG,0BAA0B;QACxB,IAAIE,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAACf,kBAAkB,EAAG;YAC5DY,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACX,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGW;YACtB,IAAI,CAACV,MAAM,CAACe,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAAChB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOW;IACT;IAEAM,eAAeX,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIY,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACpB,kBAAkB,CAACO,UAAU;QAEtD,IAAI,CAACa,aAAa;YAChB,IAAI,CAAClB,MAAM,CAACmB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACrB,kBAAkB,CAACO,UAAU;QAEzC,IAAI,CAACL,MAAM,CAACe,GAAG,CAAC,CAAC,kBAAkB,EAAEV,UAAU,YAAY,CAAC;IAC9D;IAEAe,UAAUf,SAAiB,EAAEgB,QAAgB,EAAE;QAC7C,MAAMf,QAAQ,IAAI,CAACG,eAAe,CAACJ;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMgB,YAAYhB,MAAMiB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACtB,MAAM,CAACmB,IAAI,CACd,CAAC,qFAAqF,EAAEd,UAAU,CAAC,EACnGgB;YAGF,OAAO,IAAI,CAACrB,MAAM,CAACe,GAAG,CAAC;QACzB;QAEAT,MAAMoB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACtB,MAAM,CAACe,GAAG,CAAC,CAAC,KAAK,EAAEM,SAAS,YAAY,CAAC;IAChD;AACF"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterConnectionCache", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterConnectionCache;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _keydiffcache = require("../utils/cache/key-diff.cache");
|
|
12
|
+
class PrinterConnectionCache extends _keydiffcache.KeyDiffCache {
|
|
13
|
+
async getPrinterConnection(printerId, connection) {
|
|
14
|
+
await this.setKeyValue(printerId, connection);
|
|
15
|
+
}
|
|
16
|
+
async setPrinterConnection(printerId, connection) {
|
|
17
|
+
await this.setKeyValue(printerId, connection);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
//# sourceMappingURL=printer-connection.cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-connection.cache.ts"],"names":["PrinterConnectionCache","KeyDiffCache","getPrinterConnection","printerId","connection","setKeyValue","setPrinterConnection"],"mappings":";;;;+BAMaA;;;eAAAA;;;8BAJgB;AAItB,MAAMA,+BAA+BC,0BAAY;IACtD,MAAMC,qBAAqBC,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;IAEA,MAAME,qBAAqBH,SAAiB,EAAEC,UAAyB,EAAE;QACvE,MAAM,IAAI,CAACC,WAAW,CAACF,WAAWC;IACpC;AACF"}
|