@fdm-monster/server 1.9.0 → 1.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.9.1.cjs → yarn-4.12.0.cjs} +329 -335
- package/.yarnrc.yml +1 -1
- package/README.md +3 -2
- package/RELEASE_NOTES.MD +17 -0
- package/dist/consoles/mock-bambu.server.js +305 -0
- package/dist/consoles/mock-bambu.server.js.map +1 -0
- package/dist/consoles/utils/api-messages.js +5 -5
- package/dist/consoles/utils/api-messages.js.map +1 -1
- package/dist/constants/authorization.constants.js +9 -9
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/event.constants.js +8 -8
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +15 -14
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +4 -4
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +11 -3
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +33 -2
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/metrics.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +10 -10
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +4 -0
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +22 -0
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +4 -4
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +3 -3
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/printer-controller.validation.js +6 -6
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +5 -5
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js +4 -4
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/controllers/validation/user-controller.validation.js +8 -8
- package/dist/controllers/validation/user-controller.validation.js.map +1 -1
- package/dist/entities/index.js +12 -12
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/exceptions/failed-dependency.exception.js.map +1 -1
- package/dist/exceptions/job.exceptions.js.map +1 -1
- package/dist/exceptions/runtime.exceptions.js +10 -10
- package/dist/exceptions/runtime.exceptions.js.map +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/logging/static.logger.js +4 -4
- package/dist/handlers/logging/static.logger.js.map +1 -1
- package/dist/handlers/validators.js +3 -3
- package/dist/handlers/validators.js.map +1 -1
- package/dist/middleware/authenticate.js +4 -4
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/global.middleware.js +4 -3
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/param-converter.middleware.js +5 -5
- package/dist/middleware/param-converter.middleware.js.map +1 -1
- package/dist/middleware/passport.js +4 -4
- package/dist/middleware/passport.js.map +1 -1
- package/dist/middleware/printer.js +17 -6
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Printer.js +3 -3
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +5 -0
- package/dist/models/Settings.js.map +1 -1
- package/dist/models/index.js +11 -11
- package/dist/models/index.js.map +1 -1
- package/dist/server.constants.js +1 -1
- package/dist/server.env.js +9 -9
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +1 -2
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +204 -0
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js +387 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -0
- package/dist/services/bambu/bambu.client.js +67 -0
- package/dist/services/bambu/bambu.client.js.map +1 -0
- package/dist/services/bambu/mqtt-message.types.js +6 -0
- package/dist/services/bambu/mqtt-message.types.js.map +1 -0
- package/dist/services/bambu.api.js +221 -0
- package/dist/services/bambu.api.js.map +1 -0
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +4 -8
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/cradle.service.js.map +1 -1
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/http-client.factory.js.map +1 -1
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/monsterpi.service.js.map +1 -1
- package/dist/services/core/multer.service.js +6 -7
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +6 -12
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +123 -37
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/camera-stream.dto.js +4 -4
- package/dist/services/interfaces/camera-stream.dto.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +6 -6
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion.dto.js +3 -3
- package/dist/services/interfaces/print-completion.dto.js.map +1 -1
- package/dist/services/interfaces/printer-group.dto.js +3 -3
- package/dist/services/interfaces/printer-group.dto.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js +3 -3
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/user.dto.js +3 -3
- package/dist/services/interfaces/user.dto.js.map +1 -1
- package/dist/services/mongoose/camera-stream.service.js +1 -2
- package/dist/services/mongoose/camera-stream.service.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +1 -1
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/permission.service.js.map +1 -1
- package/dist/services/mongoose/print-completion.service.js.map +1 -1
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/mongoose/refresh-token.service.js.map +1 -1
- package/dist/services/mongoose/role.service.js +1 -2
- package/dist/services/mongoose/role.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +7 -0
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/moonraker/constants/moonraker-event.dto.js +3 -3
- package/dist/services/moonraker/constants/moonraker-event.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/idle-timeout.dto.js +3 -3
- package/dist/services/moonraker/dto/objects/idle-timeout.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/print-stats.dto.js +3 -3
- package/dist/services/moonraker/dto/objects/print-stats.dto.js.map +1 -1
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js +3 -3
- package/dist/services/moonraker/dto/objects/printer-objects-list.dto.js.map +1 -1
- package/dist/services/moonraker/dto/printer-info.dto.js +3 -3
- package/dist/services/moonraker/dto/printer-info.dto.js.map +1 -1
- package/dist/services/moonraker/dto/server-history/job.dto.js +3 -3
- package/dist/services/moonraker/dto/server-history/job.dto.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/methods.js +3 -3
- package/dist/services/moonraker/dto/websocket/methods.js.map +1 -1
- package/dist/services/moonraker/dto/websocket/notify-update-response.params.js +3 -3
- package/dist/services/moonraker/dto/websocket/notify-update-response.params.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +13 -13
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-service.constants.js +7 -7
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js +3 -3
- package/dist/services/octoprint/constants/octoprint-websocket.constants.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +4 -4
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +17 -17
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/api.utils.js +3 -3
- package/dist/services/octoprint/utils/api.utils.js.map +1 -1
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +1 -1
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/permission.service.js.map +1 -1
- package/dist/services/orm/print-completion.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js.map +1 -1
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/refresh-token.service.js.map +1 -1
- package/dist/services/orm/role.service.js +2 -2
- package/dist/services/orm/role.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +0 -4
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +8 -0
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +7 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +11 -6
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js +2 -4
- package/dist/services/prusa-link/prusa-link-http-polling.adapter.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +1 -2
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/services/socket.factory.js +3 -0
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/task-manager.service.js +1 -2
- package/dist/services/task-manager.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +10 -10
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +15 -15
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +21 -14
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +3 -3
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +33 -7
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/default-http-client.builder.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +1 -2
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +13 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +1 -2
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer-thumbnail.cache.js +3 -3
- package/dist/state/printer-thumbnail.cache.js.map +1 -1
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +14 -6
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +3 -3
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/client-bundle.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +1 -2
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks/software-update.task.js.map +1 -1
- package/dist/tasks.js +3 -3
- package/dist/tasks.js.map +1 -1
- package/dist/utils/array.util.js +3 -3
- package/dist/utils/array.util.js.map +1 -1
- package/dist/utils/crypto.utils.js +3 -3
- package/dist/utils/crypto.utils.js.map +1 -1
- package/dist/utils/env.utils.js +6 -6
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/fs.utils.js +4 -4
- package/dist/utils/fs.utils.js.map +1 -1
- package/dist/utils/gcode.utils.js +3 -3
- package/dist/utils/gcode.utils.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +3 -3
- package/dist/utils/pretty-print.utils.js.map +1 -1
- package/dist/utils/semver.utils.js +3 -3
- package/dist/utils/semver.utils.js.map +1 -1
- package/dist/utils/url.utils.js +3 -3
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +48 -41
- package/dist/utils/printer-type.utils.js +0 -32
- package/dist/utils/printer-type.utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCredentialSettings","credentialSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateFileCleanSettings","fileCleanSettingsUpdateSchema","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}
|
|
@@ -155,6 +155,14 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
|
|
|
155
155
|
needsPasswordChange: false
|
|
156
156
|
});
|
|
157
157
|
}
|
|
158
|
+
async updatePasswordHashUnsafeByUsername(username, passwordHash) {
|
|
159
|
+
const user = await this.findRawByUsername(username);
|
|
160
|
+
if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
|
|
161
|
+
return await this.update(user.id, {
|
|
162
|
+
passwordHash,
|
|
163
|
+
needsPasswordChange: false
|
|
164
|
+
});
|
|
165
|
+
}
|
|
158
166
|
updateUsernameById(userId, newUsername) {
|
|
159
167
|
return this.update(userId, {
|
|
160
168
|
username: newUsername
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","roleService","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","InternalServerException","length","role","getRoleByName","ROLES","ADMIN","find","administrators","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","updatePasswordHashUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserSchema","result","create"],"mappings":"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"}
|
|
@@ -18,7 +18,11 @@ class PrinterApiFactory {
|
|
|
18
18
|
getById(id) {
|
|
19
19
|
const printerCache = this.cradleService.resolve(_containertokens.DITokens.printerCache);
|
|
20
20
|
const login = printerCache.getLoginDto(id);
|
|
21
|
-
|
|
21
|
+
const printerApi = this.getScopedPrinter(login);
|
|
22
|
+
if (login.printerType === _printerapiinterface.BambuType && 'setPrinterId' in printerApi) {
|
|
23
|
+
printerApi.setPrinterId(id);
|
|
24
|
+
}
|
|
25
|
+
return printerApi;
|
|
22
26
|
}
|
|
23
27
|
getScopedPrinter(login) {
|
|
24
28
|
let printerApi;
|
|
@@ -28,6 +32,8 @@ class PrinterApiFactory {
|
|
|
28
32
|
printerApi = this.cradleService.resolve(_containertokens.DITokens.moonrakerApi);
|
|
29
33
|
} else if (login.printerType === _printerapiinterface.PrusaLinkType) {
|
|
30
34
|
printerApi = this.cradleService.resolve(_containertokens.DITokens.prusaLinkApi);
|
|
35
|
+
} else if (login.printerType === _printerapiinterface.BambuType) {
|
|
36
|
+
printerApi = this.cradleService.resolve(_containertokens.DITokens.bambuApi);
|
|
31
37
|
} else {
|
|
32
38
|
throw new Error("PrinterType is unknown, cant pick the right socket adapter");
|
|
33
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","printerApi","getScopedPrinter","printerType","BambuType","setPrinterId","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","PrusaLinkType","prusaLinkApi","bambuApi","Error"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAPuE;iCAC3D;AAMlB,MAAMA;;IACX,YACE,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;IAEnB;IAEAC,QAAQC,EAAU,EAAe;QAC/B,MAAMC,eAAe,IAAI,CAACH,aAAa,CAACI,OAAO,CAAeC,yBAAQ,CAACF,YAAY;QACnF,MAAMG,QAAQH,aAAaI,WAAW,CAACL;QACvC,MAAMM,aAAa,IAAI,CAACC,gBAAgB,CAACH;QAGzC,IAAIA,MAAMI,WAAW,KAAKC,8BAAS,IAAI,kBAAkBH,YAAY;YAClEA,WAAmBI,YAAY,CAACV;QACnC;QAEA,OAAOM;IACT;IAEAC,iBAAiBH,KAAe,EAAe;QAC7C,IAAIE;QACJ,IAAIF,MAAMI,WAAW,KAAKG,kCAAa,EAAE;YACvCL,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACS,YAAY;QAC5E,OAAO,IAAIR,MAAMI,WAAW,KAAKK,kCAAa,EAAE;YAC9CP,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACW,YAAY;QAC5E,OAAO,IAAIV,MAAMI,WAAW,KAAKO,kCAAa,EAAE;YAC9CT,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACa,YAAY;QAC5E,OAAO,IAAIZ,MAAMI,WAAW,KAAKC,8BAAS,EAAE;YAC1CH,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACc,QAAQ;QACxE,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAZ,WAAWF,KAAK,GAAGA;QACnB,OAAOE;IACT;AACF"}
|
|
@@ -5,33 +5,38 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
function _export(target, all) {
|
|
6
6
|
for(var name in all)Object.defineProperty(target, name, {
|
|
7
7
|
enumerable: true,
|
|
8
|
-
get: all
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
|
|
12
|
+
get BambuType () {
|
|
13
|
+
return BambuType;
|
|
14
|
+
},
|
|
15
|
+
get MoonrakerType () {
|
|
13
16
|
return MoonrakerType;
|
|
14
17
|
},
|
|
15
|
-
OctoprintType
|
|
18
|
+
get OctoprintType () {
|
|
16
19
|
return OctoprintType;
|
|
17
20
|
},
|
|
18
|
-
PrinterTypesEnum
|
|
21
|
+
get PrinterTypesEnum () {
|
|
19
22
|
return PrinterTypesEnum;
|
|
20
23
|
},
|
|
21
|
-
PrusaLinkType
|
|
24
|
+
get PrusaLinkType () {
|
|
22
25
|
return PrusaLinkType;
|
|
23
26
|
},
|
|
24
|
-
ReprintState
|
|
27
|
+
get ReprintState () {
|
|
25
28
|
return ReprintState;
|
|
26
29
|
}
|
|
27
30
|
});
|
|
28
31
|
const OctoprintType = 0;
|
|
29
32
|
const MoonrakerType = 1;
|
|
30
33
|
const PrusaLinkType = 2;
|
|
34
|
+
const BambuType = 3;
|
|
31
35
|
var PrinterTypesEnum = /*#__PURE__*/ function(PrinterTypesEnum) {
|
|
32
36
|
PrinterTypesEnum[PrinterTypesEnum["Octoprint"] = 0] = "Octoprint";
|
|
33
37
|
PrinterTypesEnum[PrinterTypesEnum["Moonraker"] = 1] = "Moonraker";
|
|
34
38
|
PrinterTypesEnum[PrinterTypesEnum["PrusaLink"] = 2] = "PrusaLink";
|
|
39
|
+
PrinterTypesEnum[PrinterTypesEnum["Bambu"] = 3] = "Bambu";
|
|
35
40
|
return PrinterTypesEnum;
|
|
36
41
|
}({});
|
|
37
42
|
var ReprintState = /*#__PURE__*/ function(ReprintState) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;QAWaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QA6CDC;eAAAA;;;AA/CL,MAAMH,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AA0CL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}
|
|
@@ -18,20 +18,18 @@ class PrusaLinkHttpPollingAdapter {
|
|
|
18
18
|
prusaLinkApi;
|
|
19
19
|
eventEmitter2;
|
|
20
20
|
configService;
|
|
21
|
-
printerType;
|
|
21
|
+
printerType = _printerapiinterface.PrusaLinkType;
|
|
22
22
|
printerId;
|
|
23
23
|
login;
|
|
24
24
|
socketState;
|
|
25
25
|
apiState;
|
|
26
26
|
lastMessageReceivedTimestamp;
|
|
27
27
|
refreshPrinterCurrentInterval;
|
|
28
|
-
eventEmittingAllowed;
|
|
28
|
+
eventEmittingAllowed = true;
|
|
29
29
|
constructor(loggerFactory, prusaLinkApi, eventEmitter2, configService){
|
|
30
30
|
this.prusaLinkApi = prusaLinkApi;
|
|
31
31
|
this.eventEmitter2 = eventEmitter2;
|
|
32
32
|
this.configService = configService;
|
|
33
|
-
this.printerType = _printerapiinterface.PrusaLinkType;
|
|
34
|
-
this.eventEmittingAllowed = true;
|
|
35
33
|
this.logger = loggerFactory(PrusaLinkHttpPollingAdapter.name);
|
|
36
34
|
}
|
|
37
35
|
allowEmittingEvents() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link-http-polling.adapter.ts"],"names":["PrusaLinkHttpPollingAdapter","defaultLog","adapter","printerType","PrusaLinkType","printerId","login","socketState","apiState","lastMessageReceivedTimestamp","refreshPrinterCurrentInterval","eventEmittingAllowed","loggerFactory","prusaLinkApi","eventEmitter2","configService","logger","name","allowEmittingEvents","disallowEmittingEvents","needsReopen","needsSetup","needsReauth","Error","isClosedOrAborted","reauthSession","registerCredentials","socketLogin","loginDto","open","startPolling","close","debug","logMeta","stopPolling","setupSocketSession","warn","Promise","resolve","resetSocketState","setInterval","printerURL","username","password","apiKey","printerState","getPrinterState","state","flags","link_state","text","jobState","getJobState","emitEvent","job","progress","printTime","printTimeLeft","completion","error","errorSummary","clearInterval","undefined","event","payload","prusaLinkEvent","emitAsync"],"mappings":"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"}
|
|
@@ -22,13 +22,12 @@ class PrusaLinkApi {
|
|
|
22
22
|
settingsStore;
|
|
23
23
|
printerLogin;
|
|
24
24
|
logger;
|
|
25
|
-
authHeader;
|
|
25
|
+
authHeader = null;
|
|
26
26
|
constructor(loggerFactory, eventEmitter2, httpClientFactory, settingsStore, printerLogin){
|
|
27
27
|
this.eventEmitter2 = eventEmitter2;
|
|
28
28
|
this.httpClientFactory = httpClientFactory;
|
|
29
29
|
this.settingsStore = settingsStore;
|
|
30
30
|
this.printerLogin = printerLogin;
|
|
31
|
-
this.authHeader = null;
|
|
32
31
|
this.logger = loggerFactory(PrusaLinkApi.name);
|
|
33
32
|
this.logger.debug("Constructed api client", this.logMeta());
|
|
34
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}
|
|
@@ -20,12 +20,15 @@ class SocketFactory {
|
|
|
20
20
|
const serverSettings = settingsStore.getServerSettings();
|
|
21
21
|
const moonrakerSupport = serverSettings.experimentalMoonrakerSupport;
|
|
22
22
|
const prusaLinkSupport = serverSettings.experimentalPrusaLinkSupport;
|
|
23
|
+
const bambuSupport = serverSettings.experimentalBambuSupport;
|
|
23
24
|
if (printerType === _printerapiinterface.OctoprintType) {
|
|
24
25
|
return this.cradleService.resolve(_containertokens.DITokens.octoPrintSockIoAdapter);
|
|
25
26
|
} else if (moonrakerSupport && printerType === _printerapiinterface.MoonrakerType) {
|
|
26
27
|
return this.cradleService.resolve(_containertokens.DITokens.moonrakerWebsocketAdapter);
|
|
27
28
|
} else if (prusaLinkSupport && printerType === _printerapiinterface.PrusaLinkType) {
|
|
28
29
|
return this.cradleService.resolve(_containertokens.DITokens.prusaLinkPollingAdapter);
|
|
30
|
+
} else if (bambuSupport && printerType === _printerapiinterface.BambuType) {
|
|
31
|
+
return this.cradleService.resolve(_containertokens.DITokens.bambuMqttAdapter);
|
|
29
32
|
} else {
|
|
30
33
|
throw new Error("PrinterType is unknown, cant pick the right socket adapter");
|
|
31
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","
|
|
1
|
+
{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradleService","createInstance","printerType","settingsStore","resolve","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","prusaLinkSupport","experimentalPrusaLinkSupport","bambuSupport","experimentalBambuSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","PrusaLinkType","prusaLinkPollingAdapter","BambuType","bambuMqttAdapter","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANY;qCAC8C;AAKhE,MAAMA;;IACX,YAAY,AAAiBC,aAA4B,CAAE;aAA9BA,gBAAAA;IAA+B;IAE5DC,eAAeC,WAAmB,EAAqB;QACrD,MAAMC,gBAAgB,IAAI,CAACH,aAAa,CAACI,OAAO,CAAgBC,yBAAQ,CAACF,aAAa;QACtF,MAAMG,iBAAiBH,cAAcI,iBAAiB;QACtD,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpE,MAAMC,eAAeN,eAAeO,wBAAwB;QAE5D,IAAIX,gBAAgBY,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACd,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACU,sBAAsB;QACnE,OAAO,IAAIP,oBAAoBN,gBAAgBc,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAAChB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACY,yBAAyB;QACtE,OAAO,IAAIP,oBAAoBR,gBAAgBgB,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAAClB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACc,uBAAuB;QACpE,OAAO,IAAIP,gBAAgBV,gBAAgBkB,8BAAS,EAAE;YACpD,OAAO,IAAI,CAACpB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACgB,gBAAgB;QAC7D,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}
|
|
@@ -15,12 +15,11 @@ const _errorutils = require("../utils/error.utils");
|
|
|
15
15
|
class TaskManagerService {
|
|
16
16
|
cradleService;
|
|
17
17
|
toadScheduler;
|
|
18
|
-
taskStates;
|
|
18
|
+
taskStates = {};
|
|
19
19
|
logger;
|
|
20
20
|
constructor(loggerFactory, cradleService, toadScheduler){
|
|
21
21
|
this.cradleService = cradleService;
|
|
22
22
|
this.toadScheduler = toadScheduler;
|
|
23
|
-
this.taskStates = {};
|
|
24
23
|
this.logger = loggerFactory(TaskManagerService.name);
|
|
25
24
|
}
|
|
26
25
|
registerJobOrTask(registration) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/task-manager.service.ts"],"names":["TaskManagerService","taskStates","logger","
|
|
1
|
+
{"version":3,"sources":["../../src/services/task-manager.service.ts"],"names":["TaskManagerService","taskStates","logger","loggerFactory","cradleService","toadScheduler","name","registerJobOrTask","registration","id","taskId","task","serviceIdentifier","preset","schedulerOptions","validateInput","e","error","errorSummary","timedTask","getSafeTimedTask","options","runOnce","execute","runDelayed","delay","milliseconds","seconds","runTimeoutTaskInstance","scheduleEnabledPeriodicJob","scheduleDisabledJob","failIfEnabled","taskState","getTaskState","disabled","JobValidationException","disableJob","failIfDisabled","isTaskDisabled","job","stop","deregisterTask","removeById","timeoutMs","log","setTimeout","stopSchedulerTasks","serviceName","prefix","resolvedService","resolve","AwilixResolutionError","stack","run","periodic","minutes","hours","days","asyncHandler","timeTask","AsyncTask","getErrorHandler","started","Date","now","taskService","duration","logFirstCompletion","firstCompletion","lastError","time","runImmediately","SimpleIntervalJob","addSimpleIntervalJob"],"mappings":"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"}
|
|
@@ -5,35 +5,35 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
function _export(target, all) {
|
|
6
6
|
for(var name in all)Object.defineProperty(target, name, {
|
|
7
7
|
enumerable: true,
|
|
8
|
-
get: all
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
createOrUpdateFloorSchema
|
|
12
|
+
get createOrUpdateFloorSchema () {
|
|
13
13
|
return createOrUpdateFloorSchema;
|
|
14
14
|
},
|
|
15
|
-
floorLevelValidator
|
|
15
|
+
get floorLevelValidator () {
|
|
16
16
|
return floorLevelValidator;
|
|
17
17
|
},
|
|
18
|
-
floorNameValidator
|
|
18
|
+
get floorNameValidator () {
|
|
19
19
|
return floorNameValidator;
|
|
20
20
|
},
|
|
21
|
-
printerInFloorSchema
|
|
21
|
+
get printerInFloorSchema () {
|
|
22
22
|
return printerInFloorSchema;
|
|
23
23
|
},
|
|
24
|
-
removePrinterInFloorSchema
|
|
24
|
+
get removePrinterInFloorSchema () {
|
|
25
25
|
return removePrinterInFloorSchema;
|
|
26
26
|
},
|
|
27
|
-
updateFloorLevelSchema
|
|
27
|
+
get updateFloorLevelSchema () {
|
|
28
28
|
return updateFloorLevelSchema;
|
|
29
29
|
},
|
|
30
|
-
updateFloorNameSchema
|
|
30
|
+
get updateFloorNameSchema () {
|
|
31
31
|
return updateFloorNameSchema;
|
|
32
32
|
},
|
|
33
|
-
xValidator
|
|
33
|
+
get xValidator () {
|
|
34
34
|
return xValidator;
|
|
35
35
|
},
|
|
36
|
-
yValidator
|
|
36
|
+
get yValidator () {
|
|
37
37
|
return yValidator;
|
|
38
38
|
}
|
|
39
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","floorLevelValidator","floorNameValidator","printerInFloorSchema","removePrinterInFloorSchema","updateFloorLevelSchema","updateFloorNameSchema","xValidator","yValidator","isSqlite","z","object","printerId","idRuleV2","number","int","min","max","string","minFloorNameLength","floorId","x","y","name","floor","printers","array","optional"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/floor-service.validation.ts"],"names":["createOrUpdateFloorSchema","floorLevelValidator","floorNameValidator","printerInFloorSchema","removePrinterInFloorSchema","updateFloorLevelSchema","updateFloorNameSchema","xValidator","yValidator","isSqlite","z","object","printerId","idRuleV2","number","int","min","max","string","minFloorNameLength","floorId","x","y","name","floor","printers","array","optional"],"mappings":";;;;;;;;;;;QA8BaA;eAAAA;;QAnBAC;eAAAA;;QACAC;eAAAA;;QAEAC;eAAAA;;QAVAC;eAAAA;;QAsBAC;eAAAA;;QAJAC;eAAAA;;QAbAC;eAAAA;;QACAC;eAAAA;;;qBAVK;kCACiB;mCACV;AAElB,MAAMJ,6BAA6B,CAACK,WACzCC,MAAC,CAACC,MAAM,CAAC;QACPC,WAAWC,IAAAA,2BAAQ,EAACJ;IACtB;AAEK,MAAMF,aAAaG,MAAC,CAACI,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMT,aAAaE,MAAC,CAACI,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,GAAGC,GAAG,CAAC;AAC/C,MAAMhB,sBAAsBS,MAAC,CAACI,MAAM,GAAGC,GAAG;AAC1C,MAAMb,qBAAqBQ,MAAC,CAACQ,MAAM,GAAGF,GAAG,CAACG,oCAAkB;AAE5D,MAAMhB,uBAAuB,CAACM,WACnCC,MAAC,CAACC,MAAM,CAAC;QACPC,WAAWC,IAAAA,2BAAQ,EAACJ;QACpBW,SAASP,IAAAA,2BAAQ,EAACJ;QAClBY,GAAGd;QACHe,GAAGd;IACL;AAEK,MAAMF,wBAAwBI,MAAC,CAACC,MAAM,CAAC;IAC5CY,MAAMrB;AACR;AAEO,MAAMG,yBAAyBK,MAAC,CAACC,MAAM,CAAC;IAC7Ca,OAAOvB;AACT;AAEO,MAAMD,4BAA4B,CAACS,WACxCC,MAAC,CAACC,MAAM,CAAC;QACPY,MAAMrB;QACNsB,OAAOvB;QACPwB,UAAUf,MAAC,CACRgB,KAAK,CACJhB,MAAC,CAACC,MAAM,CAAC;YACPC,WAAWC,IAAAA,2BAAQ,EAACJ;YACpBW,SAASP,IAAAA,2BAAQ,EAACJ,UAAUkB,QAAQ;YACpCN,GAAGd;YACHe,GAAGd;QACL,IAEDmB,QAAQ;IACb"}
|
|
@@ -5,47 +5,47 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
function _export(target, all) {
|
|
6
6
|
for(var name in all)Object.defineProperty(target, name, {
|
|
7
7
|
enumerable: true,
|
|
8
|
-
get: all
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
createPrinterSchema
|
|
12
|
+
get createPrinterSchema () {
|
|
13
13
|
return createPrinterSchema;
|
|
14
14
|
},
|
|
15
|
-
printerApiKeyValidator
|
|
15
|
+
get printerApiKeyValidator () {
|
|
16
16
|
return printerApiKeyValidator;
|
|
17
17
|
},
|
|
18
|
-
printerDateAddedValidator
|
|
18
|
+
get printerDateAddedValidator () {
|
|
19
19
|
return printerDateAddedValidator;
|
|
20
20
|
},
|
|
21
|
-
printerDisabledReasonValidator
|
|
21
|
+
get printerDisabledReasonValidator () {
|
|
22
22
|
return printerDisabledReasonValidator;
|
|
23
23
|
},
|
|
24
|
-
printerEnabledValidator
|
|
24
|
+
get printerEnabledValidator () {
|
|
25
25
|
return printerEnabledValidator;
|
|
26
26
|
},
|
|
27
|
-
printerNameValidator
|
|
27
|
+
get printerNameValidator () {
|
|
28
28
|
return printerNameValidator;
|
|
29
29
|
},
|
|
30
|
-
printerPasswordValidator
|
|
30
|
+
get printerPasswordValidator () {
|
|
31
31
|
return printerPasswordValidator;
|
|
32
32
|
},
|
|
33
|
-
printerTypeValidator
|
|
33
|
+
get printerTypeValidator () {
|
|
34
34
|
return printerTypeValidator;
|
|
35
35
|
},
|
|
36
|
-
printerUrlValidator
|
|
36
|
+
get printerUrlValidator () {
|
|
37
37
|
return printerUrlValidator;
|
|
38
38
|
},
|
|
39
|
-
printerUsernameValidator
|
|
39
|
+
get printerUsernameValidator () {
|
|
40
40
|
return printerUsernameValidator;
|
|
41
41
|
},
|
|
42
|
-
refineApiKeyValidator
|
|
42
|
+
get refineApiKeyValidator () {
|
|
43
43
|
return refineApiKeyValidator;
|
|
44
44
|
},
|
|
45
|
-
updatePrinterDisabledReasonSchema
|
|
45
|
+
get updatePrinterDisabledReasonSchema () {
|
|
46
46
|
return updatePrinterDisabledReasonSchema;
|
|
47
47
|
},
|
|
48
|
-
updatePrinterEnabledSchema
|
|
48
|
+
get updatePrinterEnabledSchema () {
|
|
49
49
|
return updatePrinterEnabledSchema;
|
|
50
50
|
}
|
|
51
51
|
});
|
|
@@ -96,7 +96,7 @@ const refineApiKeyValidator = (data, ctx)=>{
|
|
|
96
96
|
});
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
|
-
} else if (data.printerType === _printerapiinterface.PrusaLinkType) {
|
|
99
|
+
} else if (data.printerType === _printerapiinterface.PrusaLinkType || data.printerType === _printerapiinterface.BambuType) {
|
|
100
100
|
const result = prusaLinkAuthSchema.safeParse({
|
|
101
101
|
username: data.username,
|
|
102
102
|
password: data.password
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","superRefine","disabledReason"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":";;;;;;;;;;;QAkFaA;eAAAA;;QAxEAC;eAAAA;;QAQAC;eAAAA;;QAHAC;eAAAA;;QADAC;eAAAA;;QAHAC;eAAAA;;QAEAC;eAAAA;;QAIAC;eAAAA;;QADAC;eAAAA;;QAJAC;eAAAA;;QAmCAC;eAAAA;;QAyCAC;eAAAA;;QAJAC;eAAAA;;;kCApFkD;qCACW;qBACzC;AAEjC,MAAMC,wBAAwBC,MAAC,CAC5BC,MAAM,GACNC,GAAG,CAACC,wCAAsB,EAC1BC,GAAG,CAACC,wCAAsB,EAC1BC,KAAK,CAAC,oBAAoB;AAEtB,MAAMnB,yBAAyBa,MAAC,CAACC,MAAM,GAAGM,QAAQ;AAClD,MAAMhB,uBAAuBS,MAAC,CAACC,MAAM;AACrC,MAAMN,2BAA2BK,MAAC,CAACC,MAAM;AACzC,MAAMT,2BAA2BQ,MAAC,CAACC,MAAM;AACzC,MAAMX,0BAA0BU,MAAC,CAACQ,OAAO;AACzC,MAAMnB,iCAAiCW,MAAC,CAACC,MAAM,GAAGM,QAAQ;AAC1D,MAAMb,sBAAsBM,MAAC,CAACC,MAAM,GAAGQ,GAAG;AAC1C,MAAMhB,uBAAuBO,MAAC,CAACU,UAAU,CAACC,qCAAgB;AAC1D,MAAMvB,4BAA4BY,MAAC,CAACY,MAAM,GAAGL,QAAQ;AAE5D,MAAMM,sBAAsBb,MAAC,CAACc,MAAM,CAAC;IACnCC,UAAUpB;IACVqB,UAAUxB;AACZ;AAEA,MAAMyB,oBAAoBjB,MAAC,CACxBc,MAAM,CAAC;IACNI,WAAW9B;IACX+B,YAAYzB;IACZ0B,aAAa3B;IACb4B,QAAQlC;IACR4B,UAAUpB,yBAAyBY,QAAQ;IAC3CS,UAAUxB,yBAAyBe,QAAQ;IAC3Ce,SAAShC,wBAAwBiB,QAAQ;IACzCgB,MAAMhC;AACR,GACCiC,KAAK;AAGR,MAAMC,0BAA0BzB,MAAC,CAACc,MAAM,CAAC;IACvCO,QAAQlC;IACRiC,aAAa3B;IACbsB,UAAUpB,yBAAyBY,QAAQ;IAC3CS,UAAUxB,yBAAyBe,QAAQ;AAC7C;AAGO,MAAMX,wBAAwB,CAAoC8B,MAASC;IAEhF,IAAID,KAAKN,WAAW,KAAKQ,kCAAa,EAAE;QACtC,MAAMC,SAAS9B,sBAAsB+B,SAAS,CAACJ,KAAKL,MAAM;QAC1D,IAAI,CAACQ,OAAOE,OAAO,EAAE;YACnBF,OAAOG,KAAK,CAACC,MAAM,CAACC,OAAO,CAAC,CAACC;gBAC3BR,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAaF,MAAME,IAAI;qBAAC;gBACjC;YACF;QACF;IACF,OAAO,IAAIX,KAAKN,WAAW,KAAKkB,kCAAa,IAAIZ,KAAKN,WAAW,KAAKmB,8BAAS,EAAE;QAC/E,MAAMV,SAAShB,oBAAoBiB,SAAS,CAAC;YAC3Cf,UAAUW,KAAKX,QAAQ;YACvBC,UAAUU,KAAKV,QAAQ;QACzB;QACA,IAAI,CAACa,OAAOE,OAAO,EAAE;YACnBF,OAAOG,KAAK,CAACC,MAAM,CAACC,OAAO,CAAC,CAACC;gBAC3BR,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAeF,MAAME,IAAI;qBAAC;gBACnC;gBACAV,IAAIS,QAAQ,CAAC;oBACX,GAAGD,KAAK;oBAERE,MAAM;wBAAC;2BAAeF,MAAME,IAAI;qBAAC;gBACnC;YACF;QACF;IACF;AACF;AAEO,MAAMnD,sBAAsB+B,kBAAkBuB,WAAW,CAAC5C;AAE1D,MAAME,6BAA6BE,MAAC,CAACc,MAAM,CAAC;IACjDQ,SAAShC;AACX;AAEO,MAAMO,oCAAoCG,MAAC,CAACc,MAAM,CAAC;IACxD2B,gBAAgBpD;IAChBiC,SAAShC,wBAAwBiB,QAAQ;AAC3C"}
|
|
@@ -5,44 +5,47 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
function _export(target, all) {
|
|
6
6
|
for(var name in all)Object.defineProperty(target, name, {
|
|
7
7
|
enumerable: true,
|
|
8
|
-
get: all
|
|
8
|
+
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
|
|
12
|
+
get bambuSupportSchema () {
|
|
13
|
+
return bambuSupportSchema;
|
|
14
|
+
},
|
|
15
|
+
get clientNextSchema () {
|
|
13
16
|
return clientNextSchema;
|
|
14
17
|
},
|
|
15
|
-
credentialSettingUpdateSchema
|
|
18
|
+
get credentialSettingUpdateSchema () {
|
|
16
19
|
return credentialSettingUpdateSchema;
|
|
17
20
|
},
|
|
18
|
-
fileCleanSettingsUpdateSchema
|
|
21
|
+
get fileCleanSettingsUpdateSchema () {
|
|
19
22
|
return fileCleanSettingsUpdateSchema;
|
|
20
23
|
},
|
|
21
|
-
frontendSettingsUpdateSchema
|
|
24
|
+
get frontendSettingsUpdateSchema () {
|
|
22
25
|
return frontendSettingsUpdateSchema;
|
|
23
26
|
},
|
|
24
|
-
jwtSecretCredentialSettingUpdateSchema
|
|
27
|
+
get jwtSecretCredentialSettingUpdateSchema () {
|
|
25
28
|
return jwtSecretCredentialSettingUpdateSchema;
|
|
26
29
|
},
|
|
27
|
-
moonrakerSupportSchema
|
|
30
|
+
get moonrakerSupportSchema () {
|
|
28
31
|
return moonrakerSupportSchema;
|
|
29
32
|
},
|
|
30
|
-
prusaLinkSupportSchema
|
|
33
|
+
get prusaLinkSupportSchema () {
|
|
31
34
|
return prusaLinkSupportSchema;
|
|
32
35
|
},
|
|
33
|
-
sentryDiagnosticsEnabledSchema
|
|
36
|
+
get sentryDiagnosticsEnabledSchema () {
|
|
34
37
|
return sentryDiagnosticsEnabledSchema;
|
|
35
38
|
},
|
|
36
|
-
serverSettingsUpdateSchema
|
|
39
|
+
get serverSettingsUpdateSchema () {
|
|
37
40
|
return serverSettingsUpdateSchema;
|
|
38
41
|
},
|
|
39
|
-
thumbnailSupportSchema
|
|
42
|
+
get thumbnailSupportSchema () {
|
|
40
43
|
return thumbnailSupportSchema;
|
|
41
44
|
},
|
|
42
|
-
timeoutSettingsUpdateSchema
|
|
45
|
+
get timeoutSettingsUpdateSchema () {
|
|
43
46
|
return timeoutSettingsUpdateSchema;
|
|
44
47
|
},
|
|
45
|
-
wizardUpdateSchema
|
|
48
|
+
get wizardUpdateSchema () {
|
|
46
49
|
return wizardUpdateSchema;
|
|
47
50
|
}
|
|
48
51
|
});
|
|
@@ -52,9 +55,10 @@ const serverSettingsUpdateSchema = _zod.z.object({
|
|
|
52
55
|
registration: _zod.z.boolean(),
|
|
53
56
|
loginRequired: _zod.z.boolean(),
|
|
54
57
|
experimentalMoonrakerSupport: _zod.z.boolean(),
|
|
58
|
+
experimentalBambuSupport: _zod.z.boolean(),
|
|
59
|
+
experimentalPrusaLinkSupport: _zod.z.boolean(),
|
|
55
60
|
experimentalThumbnailSupport: _zod.z.boolean(),
|
|
56
61
|
experimentalClientSupport: _zod.z.boolean(),
|
|
57
|
-
experimentalPrusaLinkSupport: _zod.z.boolean(),
|
|
58
62
|
sentryDiagnosticsEnabled: _zod.z.boolean()
|
|
59
63
|
});
|
|
60
64
|
const timeoutSettingsUpdateSchema = _zod.z.object({
|
|
@@ -94,6 +98,9 @@ const moonrakerSupportSchema = _zod.z.object({
|
|
|
94
98
|
const prusaLinkSupportSchema = _zod.z.object({
|
|
95
99
|
enabled: _zod.z.boolean()
|
|
96
100
|
});
|
|
101
|
+
const bambuSupportSchema = _zod.z.object({
|
|
102
|
+
enabled: _zod.z.boolean()
|
|
103
|
+
});
|
|
97
104
|
const thumbnailSupportSchema = _zod.z.object({
|
|
98
105
|
enabled: _zod.z.boolean()
|
|
99
106
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextSchema","credentialSettingUpdateSchema","fileCleanSettingsUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","thumbnailSupportSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["bambuSupportSchema","clientNextSchema","credentialSettingUpdateSchema","fileCleanSettingsUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","thumbnailSupportSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","experimentalThumbnailSupport","experimentalClientSupport","sentryDiagnosticsEnabled","apiTimeout","number","int","min","apiUploadTimeout","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","jwtSecret","string","jwtExpiresIn","isProductionEnvironment","max","Infinity","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","date","nullable","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;QAmEaA;eAAAA;;QAQAC;eAAAA;;QA7CAC;eAAAA;;QAmBAC;eAAAA;;QA9BAC;eAAAA;;QAOAC;eAAAA;;QAiCAC;eAAAA;;QAIAC;eAAAA;;QARAC;eAAAA;;QApDAC;eAAAA;;QAoEAC;eAAAA;;QAzDAC;eAAAA;;QA6BAC;eAAAA;;;0BA3C2B;qBACtB;AAEX,MAAMH,6BAA6BI,MAAC,CAACC,MAAM,CAAC;IACjDC,cAAcF,MAAC,CAACG,OAAO;IACvBC,eAAeJ,MAAC,CAACG,OAAO;IACxBE,8BAA8BL,MAAC,CAACG,OAAO;IACvCG,0BAA0BN,MAAC,CAACG,OAAO;IACnCI,8BAA8BP,MAAC,CAACG,OAAO;IACvCK,8BAA8BR,MAAC,CAACG,OAAO;IACvCM,2BAA2BT,MAAC,CAACG,OAAO;IACpCO,0BAA0BV,MAAC,CAACG,OAAO;AACrC;AAEO,MAAML,8BAA8BE,MAAC,CAACC,MAAM,CAAC;IAClDU,YAAYX,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IACjCC,kBAAkBf,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;AACzC;AAEO,MAAMvB,+BAA+BS,MAAC,CAACC,MAAM,CAAC;IACnDe,UAAUhB,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IAC/BG,UAAUjB,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IAC/BI,YAAYlB,MAAC,CAACG,OAAO;IACrBgB,+BAA+BnB,MAAC,CAACG,OAAO;AAC1C;AAEO,MAAMX,yCAAyCQ,MAAC,CAACC,MAAM,CAAC;IAC7DmB,WAAWpB,MAAC,CAACqB,MAAM,GAAGP,GAAG,CAAC;AAC5B;AAEO,MAAMzB,gCAAgCW,MAAC,CAACC,MAAM,CAAC;IACpDqB,cAActB,MAAC,CACZY,MAAM,GACNC,GAAG,GACHC,GAAG,CAACS,IAAAA,iCAAuB,MAAK,MAAM,GACtCC,GAAG,CAACD,IAAAA,iCAAuB,MAAK,OAAOE;IAC1CC,sBAAsB1B,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,CAAC;IAC5Ca,oBAAoB3B,MAAC,CAClBY,MAAM,GACNC,GAAG,GACHC,GAAG,CAACS,IAAAA,iCAAuB,MAAK,MAAM;AAC3C;AAEO,MAAMxB,qBAAqBC,MAAC,CAACC,MAAM,CAAC;IACzC2B,iBAAiB5B,MAAC,CAACG,OAAO;IAC1B0B,mBAAmB7B,MAAC,CAAC8B,IAAI,GAAGC,QAAQ;IACpCC,eAAehC,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;AACtC;AAEO,MAAMxB,gCAAgCU,MAAC,CAACC,MAAM,CAAC;IACpDgC,gCAAgCjC,MAAC,CAACG,OAAO;IACzC+B,0BAA0BlC,MAAC,CAACG,OAAO;IACnCgC,iCAAiCnC,MAAC,CAACY,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;AACxD;AAEO,MAAMnB,iCAAiCK,MAAC,CAACC,MAAM,CAAC;IACrDmC,SAASpC,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMV,yBAAyBO,MAAC,CAACC,MAAM,CAAC;IAC7CmC,SAASpC,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMT,yBAAyBM,MAAC,CAACC,MAAM,CAAC;IAC7CmC,SAASpC,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMhB,qBAAqBa,MAAC,CAACC,MAAM,CAAC;IACzCmC,SAASpC,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMN,yBAAyBG,MAAC,CAACC,MAAM,CAAC;IAC7CmC,SAASpC,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMf,mBAAmBY,MAAC,CAACC,MAAM,CAAC;IACvCmC,SAASpC,MAAC,CAACG,OAAO;AACpB"}
|