@fdm-monster/server 1.6.4 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/README.md +2 -1
- package/RELEASE_NOTES.MD +24 -4
- package/dist/consoles/download-github-releases.js +50 -0
- package/dist/consoles/download-github-releases.js.map +1 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +9 -6
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +117 -18
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +2 -3
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +6 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +38 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/validation/printer-controller.validation.js +2 -2
- package/dist/controllers/validation/printer-controller.validation.js.map +1 -1
- package/dist/entities/settings.entity.js +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/handlers/cache-manager.js +2 -9
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/middleware/printer.js +4 -1
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Settings.js +12 -2
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.host.js +16 -4
- package/dist/server.host.js.map +1 -1
- package/dist/services/core/batch-call.service.js +1 -1
- package/dist/services/core/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +2 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/print-completion.shared.js.map +1 -1
- package/dist/services/mongoose/settings.service.js +14 -5
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +1 -2
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +1 -1
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +1 -1
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/dto/octoprint-event.dto.js +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +5 -5
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +0 -1
- package/dist/services/octoprint/utils/file.utils.js.map +1 -1
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/settings.service.js +17 -8
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +3 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/socket.factory.js +6 -1
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +2 -2
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +14 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +1 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/state/printer-events.cache.js +12 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/settings.store.js +26 -6
- package/dist/state/settings.store.js.map +1 -1
- package/package.json +15 -13
- package/requests/octoprint-pluginmanager-plugins.http +7 -0
- package/tsconfig.json +2 -2
- package/dist/services/octoprint/dto/connection/connection-state.dto.js +0 -21
- package/dist/services/octoprint/dto/connection/connection-state.dto.js.map +0 -1
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/README.md
CHANGED
|
@@ -76,7 +76,7 @@ Please join the discord, but stay professional and proactive!
|
|
|
76
76
|
These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
|
|
77
77
|
|
|
78
78
|
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
|
79
|
-
[](#contributors-)
|
|
80
80
|
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
|
81
81
|
|
|
82
82
|
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
|
@@ -105,6 +105,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
|
|
|
105
105
|
<tr>
|
|
106
106
|
<td align="center" valign="top" width="14.28%"><a href="https://techinterview.guide"><img src="https://avatars.githubusercontent.com/u/168030?v=4?s=80" width="80px;" alt="w. ian douglas"/><br /><sub><b>w. ian douglas</b></sub></a><br /><a href="#ideas-iandouglas" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
107
107
|
<td align="center" valign="top" width="14.28%"><a href="http://insanityautomation.com/"><img src="https://avatars.githubusercontent.com/u/38436470?v=4?s=80" width="80px;" alt="InsanityAutomation"/><br /><sub><b>InsanityAutomation</b></sub></a><br /><a href="#ideas-InsanityAutomation" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3AInsanityAutomation" title="Bug reports">🐛</a></td>
|
|
108
|
+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/LyfeOnEdge"><img src="https://avatars.githubusercontent.com/u/26140376?v=4?s=80" width="80px;" alt="Andrew (LyfeOnEdge) (ArcticGentoo)"/><br /><sub><b>Andrew (LyfeOnEdge) (ArcticGentoo)</b></sub></a><br /><a href="#ideas-LyfeOnEdge" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
108
109
|
</tr>
|
|
109
110
|
</tbody>
|
|
110
111
|
</table>
|
package/RELEASE_NOTES.MD
CHANGED
|
@@ -1,18 +1,38 @@
|
|
|
1
1
|
# Develop
|
|
2
2
|
|
|
3
|
-
# FDM Monster
|
|
3
|
+
# FDM Monster 01/11/2024 1.6.4
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
## Chore:
|
|
6
|
+
|
|
7
|
+
- Workflows: upgrade github actions to node 20
|
|
8
|
+
- Introduce nock to test everything (except for octokit based tests)
|
|
9
|
+
|
|
10
|
+
## Features:
|
|
11
|
+
|
|
12
|
+
- Setting: add experimental moonraker support setting to model, validation and API endpoints
|
|
13
|
+
- Setting: expose experimental typeorm setting and adjust test
|
|
14
|
+
- Apply moonraker setting to middleware, and disable moonraker printers on disabling feature
|
|
15
|
+
- Enable moonraker printerType support
|
|
16
|
+
|
|
17
|
+
## Fixes:
|
|
18
|
+
|
|
19
|
+
- Add sourceMaps: "inline" to jest for hitting breakpoints with swc in Webstorm
|
|
20
|
+
- Printer file clean could contain extra data, skim those props off
|
|
21
|
+
- Batch reprint selection: wrong status is concluded when reprint preparation is called (OctoPrint is not available, instead of no job is selected)
|
|
22
|
+
|
|
23
|
+
# FDM Monster 12/26/2024 1.6.4
|
|
24
|
+
|
|
25
|
+
## Changes:
|
|
6
26
|
|
|
7
27
|
- Dropped printer file database table (kept the entity/schema), so FDMM "remote file" architecture can be redesigned. We're solely using in-memory cache from this point.
|
|
8
28
|
- Introduced first version of the standardized PrinterApi, the concept of multiplePrinterServices with only OctoPrint and printer type to indicate service types in the future
|
|
9
29
|
- Simplified the PrinterFile model, dropped unused properties for multi-print-service standardization in the future.
|
|
10
30
|
- Used attributes for PrinterFilesController
|
|
11
31
|
- Renamed OctoPrintApiService to OctoprintClient
|
|
12
|
-
- Switch to 1.6.x client UI version range
|
|
32
|
+
- Switch to 1.6.x client UI version range
|
|
13
33
|
- Update Octoprint websocket with refresh interval, defaulting to 10sec. This loop will keep refresh attempts internal to the Websocket adapter of each service type (Octoprint, Moonraker, Bambu, etc).
|
|
14
34
|
|
|
15
|
-
|
|
35
|
+
## Fixes:
|
|
16
36
|
|
|
17
37
|
- Print completion service would throw exception that correlationId was not provided (SQLite didnt like that). This error is prevented.
|
|
18
38
|
- Moonraker type printers will resort to OctoPrint implementation (edge case in development)
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
const _axios = /*#__PURE__*/ _interop_require_default(require("axios"));
|
|
6
|
+
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
7
|
+
const _path = /*#__PURE__*/ _interop_require_default(require("path"));
|
|
8
|
+
function _interop_require_default(obj) {
|
|
9
|
+
return obj && obj.__esModule ? obj : {
|
|
10
|
+
default: obj
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
const fetchReleases = async ()=>{
|
|
14
|
+
try {
|
|
15
|
+
const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client/releases");
|
|
16
|
+
const releases = response.data;
|
|
17
|
+
const releaseData = releases.map((release)=>({
|
|
18
|
+
tag_name: release.tag_name,
|
|
19
|
+
name: release.name,
|
|
20
|
+
published_at: release.published_at,
|
|
21
|
+
body: release.body
|
|
22
|
+
}));
|
|
23
|
+
const outputPath = _path.default.join(__dirname, "github-releases-client-slim-oct-2024.data.json");
|
|
24
|
+
_fs.default.writeFileSync(outputPath, JSON.stringify(releaseData, null, 2));
|
|
25
|
+
console.log(`Releases data written to ${outputPath}`);
|
|
26
|
+
} catch (error) {
|
|
27
|
+
console.error("Error fetching releases:", error);
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
const fetchLatest = async ()=>{
|
|
31
|
+
try {
|
|
32
|
+
const response = await _axios.default.get("https://api.github.com/repos/fdm-monster/fdm-monster-client/releases/latest");
|
|
33
|
+
const release = response.data;
|
|
34
|
+
const releaseData = {
|
|
35
|
+
tag_name: release.tag_name,
|
|
36
|
+
name: release.name,
|
|
37
|
+
published_at: release.published_at,
|
|
38
|
+
body: release.body
|
|
39
|
+
};
|
|
40
|
+
const outputPath = _path.default.join(__dirname, "github-releases-latest-client-slim-oct-2024.data.json");
|
|
41
|
+
_fs.default.writeFileSync(outputPath, JSON.stringify(releaseData, null, 2));
|
|
42
|
+
console.log(`Releases data written to ${outputPath}`);
|
|
43
|
+
} catch (error) {
|
|
44
|
+
console.error("Error fetching releases:", error);
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
fetchReleases();
|
|
48
|
+
fetchLatest();
|
|
49
|
+
|
|
50
|
+
//# sourceMappingURL=download-github-releases.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/consoles/download-github-releases.ts"],"names":["fetchReleases","response","axios","get","releases","data","releaseData","map","release","tag_name","name","published_at","body","outputPath","path","join","__dirname","fs","writeFileSync","JSON","stringify","console","log","error","fetchLatest"],"mappings":";;;;8DAAkB;2DACH;6DACE;;;;;;AASjB,MAAMA,gBAAgB;IACpB,IAAI;QACF,MAAMC,WAAW,MAAMC,cAAK,CAACC,GAAG,CAAY;QAC5C,MAAMC,WAAWH,SAASI,IAAI;QAG9B,MAAMC,cAAcF,SAASG,GAAG,CAAC,CAACC,UAAa,CAAA;gBAC7CC,UAAUD,QAAQC,QAAQ;gBAC1BC,MAAMF,QAAQE,IAAI;gBAClBC,cAAcH,QAAQG,YAAY;gBAClCC,MAAMJ,QAAQI,IAAI;YACpB,CAAA;QAGA,MAAMC,aAAaC,aAAI,CAACC,IAAI,CAACC,WAAW;QACxCC,WAAE,CAACC,aAAa,CAACL,YAAYM,KAAKC,SAAS,CAACd,aAAa,MAAM;QAC/De,QAAQC,GAAG,CAAC,CAAC,yBAAyB,EAAET,YAAY;IACtD,EAAE,OAAOU,OAAO;QACdF,QAAQE,KAAK,CAAC,4BAA4BA;IAC5C;AACF;AAEA,MAAMC,cAAc;IAClB,IAAI;QACF,MAAMvB,WAAW,MAAMC,cAAK,CAACC,GAAG,CAAU;QAC1C,MAAMK,UAAUP,SAASI,IAAI;QAG7B,MAAMC,cAAc;YAClBG,UAAUD,QAAQC,QAAQ;YAC1BC,MAAMF,QAAQE,IAAI;YAClBC,cAAcH,QAAQG,YAAY;YAClCC,MAAMJ,QAAQI,IAAI;QACpB;QAGA,MAAMC,aAAaC,aAAI,CAACC,IAAI,CAACC,WAAW;QACxCC,WAAE,CAACC,aAAa,CAACL,YAAYM,KAAKC,SAAS,CAACd,aAAa,MAAM;QAC/De,QAAQC,GAAG,CAAC,CAAC,yBAAyB,EAAET,YAAY;IACtD,EAAE,OAAOU,OAAO;QACdF,QAAQE,KAAK,CAAC,4BAA4BA;IAC5C;AACF;AAEAvB;AACAwB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/constants/event.constants.ts"],"names":["fdmMonsterPrinterStoppedEvent","fdmPrinterEventToPrinterId","firmwareFlashUploadEvent","octoPrintWebsocketCurrentEvent","octoPrintWebsocketEvent","prefix","printerEvents","socketIoConnectedEvent","uploadProgressEvent","printersDeleted","printerUpdated","printerCreated","batchPrinterCreated","printerId","token","event","split"],"mappings":";;;;;;;;;;;IAiBaA,6BAA6B;eAA7BA;;IACAC,0BAA0B;eAA1BA;;IAJAC,wBAAwB;eAAxBA;;IAFAC,8BAA8B;eAA9BA;;IADAC,uBAAuB;eAAvBA;;IAKAC,MAAM;eAANA;;IAZAC,aAAa;eAAbA;;IAFAC,sBAAsB;eAAtBA;;IAWAC,mBAAmB;eAAnBA;;;AAXN,MAAMD,yBAAyB;AAE/B,MAAMD,gBAAgB;IAC3BG,iBAAiB;IACjBC,gBAAgB;IAChBC,gBAAgB;IAChBC,qBAAqB;AACvB;AAEO,MAAMR,0BAA0B,CAACS,YAAsB,CAAC,UAAU,EAAEA,WAAW;AAC/E,MAAMV,iCAAiC,CAACU,YAAsB,CAAC,UAAU,EAAEA,UAAU,QAAQ,CAAC;AAC9F,MAAML,sBAAsB,CAACM,QAAkB,CAAC,gBAAgB,EAAEA,OAAO;AACzE,MAAMZ,2BAA2B,CAACW,YAAsB,CAAC,gBAAgB,EAAEA,WAAW;AAEtF,MAAMR,SAAS;AACf,MAAML,gCAAgC,CAACa,YAAsB,GAAGR,OAAO,CAAC,EAAEQ,UAAU,gBAAgB,CAAC;AACrG,MAAMZ,6BAA6B,CAACc,QAAkBA,MAAMC,KAAK,CAAC,IAAI,CAAC,EAAE"}
|
|
@@ -12,9 +12,6 @@ _export(exports, {
|
|
|
12
12
|
credentialSettingsKey: function() {
|
|
13
13
|
return credentialSettingsKey;
|
|
14
14
|
},
|
|
15
|
-
fileCleanSettingKey: function() {
|
|
16
|
-
return fileCleanSettingKey;
|
|
17
|
-
},
|
|
18
15
|
frontendSettingKey: function() {
|
|
19
16
|
return frontendSettingKey;
|
|
20
17
|
},
|
|
@@ -42,6 +39,9 @@ _export(exports, {
|
|
|
42
39
|
getDefaultWizardSettings: function() {
|
|
43
40
|
return getDefaultWizardSettings;
|
|
44
41
|
},
|
|
42
|
+
printerFileCleanSettingKey: function() {
|
|
43
|
+
return printerFileCleanSettingKey;
|
|
44
|
+
},
|
|
45
45
|
serverSettingsKey: function() {
|
|
46
46
|
return serverSettingsKey;
|
|
47
47
|
},
|
|
@@ -78,7 +78,10 @@ const getDefaultServerSettings = ()=>({
|
|
|
78
78
|
loginRequired: true,
|
|
79
79
|
registration: false,
|
|
80
80
|
whitelistEnabled: false,
|
|
81
|
-
whitelistedIpAddresses: getDefaultWhitelistIpAddresses()
|
|
81
|
+
whitelistedIpAddresses: getDefaultWhitelistIpAddresses(),
|
|
82
|
+
experimentalMoonrakerSupport: false,
|
|
83
|
+
experimentalTypeormSupport: false,
|
|
84
|
+
experimentalClientSupport: false
|
|
82
85
|
});
|
|
83
86
|
const credentialSettingsKey = "credentials";
|
|
84
87
|
const getDefaultCredentialSettings = ()=>({
|
|
@@ -97,7 +100,7 @@ const timeoutSettingKey = "timeout";
|
|
|
97
100
|
const getDefaultTimeout = ()=>({
|
|
98
101
|
apiTimeout: 10000
|
|
99
102
|
});
|
|
100
|
-
const
|
|
103
|
+
const printerFileCleanSettingKey = "printerFileClean";
|
|
101
104
|
const getDefaultFileCleanSettings = ()=>({
|
|
102
105
|
autoRemoveOldFilesBeforeUpload: false,
|
|
103
106
|
autoRemoveOldFilesAtBoot: false,
|
|
@@ -107,7 +110,7 @@ const getDefaultSettings = ()=>({
|
|
|
107
110
|
[serverSettingsKey]: getDefaultServerSettings(),
|
|
108
111
|
[wizardSettingKey]: getDefaultWizardSettings(),
|
|
109
112
|
[credentialSettingsKey]: getDefaultCredentialSettings(),
|
|
110
|
-
[
|
|
113
|
+
[printerFileCleanSettingKey]: getDefaultFileCleanSettings(),
|
|
111
114
|
[frontendSettingKey]: getDefaultFrontendSettings(),
|
|
112
115
|
[timeoutSettingKey]: getDefaultTimeout()
|
|
113
116
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","
|
|
1
|
+
{"version":3,"sources":["../../src/constants/server-settings.constants.ts"],"names":["credentialSettingsKey","frontendSettingKey","getDefaultCredentialSettings","getDefaultFileCleanSettings","getDefaultFrontendSettings","getDefaultServerSettings","getDefaultSettings","getDefaultTimeout","getDefaultWhitelistIpAddresses","getDefaultWizardSettings","printerFileCleanSettingKey","serverSettingsKey","timeoutSettingKey","wizardSettingKey","wizardCompleted","wizardCompletedAt","wizardVersion","debugSettings","debugSocketIoEvents","debugSocketReconnect","debugSocketRetries","debugSocketSetup","debugSocketMessages","debugSocketIoBandwidth","sentryDiagnosticsEnabled","loginRequired","registration","whitelistEnabled","whitelistedIpAddresses","experimentalMoonrakerSupport","experimentalTypeormSupport","experimentalClientSupport","jwtSecret","uuidv4","jwtExpiresIn","AppConstants","DEFAULT_JWT_EXPIRES_IN","refreshTokenAttempts","DEFAULT_REFRESH_TOKEN_ATTEMPTS","refreshTokenExpiry","DEFAULT_REFRESH_TOKEN_EXPIRY","gridCols","gridRows","largeTiles","apiTimeout","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays"],"mappings":";;;;;;;;;;;IAwCaA,qBAAqB;eAArBA;;IAYAC,kBAAkB;eAAlBA;;IAXAC,4BAA4B;eAA5BA;;IAwBAC,2BAA2B;eAA3BA;;IAZAC,0BAA0B;eAA1BA;;IAhCAC,wBAAwB;eAAxBA;;IAkDAC,kBAAkB;eAAlBA;;IAXAC,iBAAiB;eAAjBA;;IAjDAC,8BAA8B;eAA9BA;;IAGAC,wBAAwB;eAAxBA;;IAkDAC,0BAA0B;eAA1BA;;IA5CAC,iBAAiB;eAAjBA;;IAuCAC,iBAAiB;eAAjBA;;IA9CAC,gBAAgB;eAAhBA;;;iCAbgB;sBACA;AAUtB,MAAML,iCAAiC,IAAM;QAAC;QAAQ;KAAY;AAElE,MAAMK,mBAAmB;AACzB,MAAMJ,2BAA2B,IAA0B,CAAA;QAChEK,iBAAiB;QACjBC,mBAAmB;QACnBC,eAAe;IACjB,CAAA;AAEO,MAAML,oBAAoB;AAC1B,MAAMN,2BAA2B,IAA0B,CAAA;QAChEY,eAAe;YACbC,qBAAqB;YACrBC,sBAAsB;YACtBC,oBAAoB;YACpBC,kBAAkB;YAClBC,qBAAqB;YACrBC,wBAAwB;QAC1B;QACAC,0BAA0B;QAC1BC,eAAe;QACfC,cAAc;QACdC,kBAAkB;QAClBC,wBAAwBpB;QACxBqB,8BAA8B;QAC9BC,4BAA4B;QAC5BC,2BAA2B;IAC7B,CAAA;AAEO,MAAM/B,wBAAwB;AAC9B,MAAME,+BAA+B,IAA8B,CAAA;QAExE8B,WAAWC,IAAAA,QAAM;QAEjBC,cAAcC,6BAAY,CAACC,sBAAsB;QAEjDC,sBAAsBF,6BAAY,CAACG,8BAA8B;QAEjEC,oBAAoBJ,6BAAY,CAACK,4BAA4B;IAC/D,CAAA;AAEO,MAAMvC,qBAAqB;AAC3B,MAAMG,6BAA6B,IAA4B,CAAA;QACpEqC,UAAU;QACVC,UAAU;QACVC,YAAY;IACd,CAAA;AAEO,MAAM/B,oBAAoB;AAC1B,MAAML,oBAAoB,IAA2B,CAAA;QAC1DqC,YAAY;IACd,CAAA;AAEO,MAAMlC,6BAA6B;AACnC,MAAMP,8BAA8B,IAA6B,CAAA;QACtE0C,gCAAgC;QAChCC,0BAA0B;QAC1BC,iCAAiC;IACnC,CAAA;AAEO,MAAMzC,qBAAqB,IAAO,CAAA;QACvC,CAACK,kBAAkB,EAAEN;QACrB,CAACQ,iBAAiB,EAAEJ;QACpB,CAACT,sBAAsB,EAAEE;QACzB,CAACQ,2BAA2B,EAAEP;QAC9B,CAACF,mBAAmB,EAAEG;QACtB,CAACQ,kBAAkB,EAAEL;IACvB,CAAA"}
|
|
@@ -2,18 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
get: all[name]
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
PluginFirmwareUpdateController: function() {
|
|
5
|
+
Object.defineProperty(exports, "PluginFirmwareUpdateController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
13
8
|
return PluginFirmwareUpdateController;
|
|
14
|
-
},
|
|
15
|
-
default: function() {
|
|
16
|
-
return _default;
|
|
17
9
|
}
|
|
18
10
|
});
|
|
19
11
|
const _awilixexpress = require("awilix-express");
|
|
@@ -22,6 +14,16 @@ const _authenticate = require("../middleware/authenticate");
|
|
|
22
14
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
23
15
|
const _printer = require("../middleware/printer");
|
|
24
16
|
const _validators = require("../handlers/validators");
|
|
17
|
+
const _express = require("express");
|
|
18
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
19
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
22
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
|
+
}
|
|
24
|
+
function _ts_metadata(k, v) {
|
|
25
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
26
|
+
}
|
|
25
27
|
const cacheKey = "firmware-state";
|
|
26
28
|
class PluginFirmwareUpdateController {
|
|
27
29
|
cacheManager;
|
|
@@ -125,13 +127,110 @@ class PluginFirmwareUpdateController {
|
|
|
125
127
|
return result;
|
|
126
128
|
}
|
|
127
129
|
}
|
|
128
|
-
|
|
129
|
-
(0,
|
|
130
|
-
(0,
|
|
131
|
-
|
|
132
|
-
|
|
130
|
+
_ts_decorate([
|
|
131
|
+
(0, _awilixexpress.GET)(),
|
|
132
|
+
(0, _awilixexpress.route)("/"),
|
|
133
|
+
_ts_metadata("design:type", Function),
|
|
134
|
+
_ts_metadata("design:paramtypes", [
|
|
135
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
136
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
137
|
+
]),
|
|
138
|
+
_ts_metadata("design:returntype", Promise)
|
|
139
|
+
], PluginFirmwareUpdateController.prototype, "listUpdateState", null);
|
|
140
|
+
_ts_decorate([
|
|
141
|
+
(0, _awilixexpress.POST)(),
|
|
142
|
+
(0, _awilixexpress.route)("/releases/sync"),
|
|
143
|
+
_ts_metadata("design:type", Function),
|
|
144
|
+
_ts_metadata("design:paramtypes", [
|
|
145
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
146
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
147
|
+
]),
|
|
148
|
+
_ts_metadata("design:returntype", Promise)
|
|
149
|
+
], PluginFirmwareUpdateController.prototype, "syncFirmwareReleasesCache", null);
|
|
150
|
+
_ts_decorate([
|
|
151
|
+
(0, _awilixexpress.POST)(),
|
|
152
|
+
(0, _awilixexpress.route)("/download-firmware"),
|
|
153
|
+
_ts_metadata("design:type", Function),
|
|
154
|
+
_ts_metadata("design:paramtypes", [
|
|
155
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
156
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
157
|
+
]),
|
|
158
|
+
_ts_metadata("design:returntype", Promise)
|
|
159
|
+
], PluginFirmwareUpdateController.prototype, "downloadFirmware", null);
|
|
160
|
+
_ts_decorate([
|
|
161
|
+
(0, _awilixexpress.POST)(),
|
|
162
|
+
(0, _awilixexpress.route)("/scan"),
|
|
163
|
+
_ts_metadata("design:type", Function),
|
|
164
|
+
_ts_metadata("design:paramtypes", [
|
|
165
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
166
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
167
|
+
]),
|
|
168
|
+
_ts_metadata("design:returntype", Promise)
|
|
169
|
+
], PluginFirmwareUpdateController.prototype, "scanPrinterFirmwareVersions", null);
|
|
170
|
+
_ts_decorate([
|
|
171
|
+
(0, _awilixexpress.GET)(),
|
|
172
|
+
(0, _awilixexpress.route)("/:id/is-plugin-installed"),
|
|
173
|
+
_ts_metadata("design:type", Function),
|
|
174
|
+
_ts_metadata("design:paramtypes", [
|
|
175
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
176
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
177
|
+
]),
|
|
178
|
+
_ts_metadata("design:returntype", Promise)
|
|
179
|
+
], PluginFirmwareUpdateController.prototype, "isPluginInstalled", null);
|
|
180
|
+
_ts_decorate([
|
|
181
|
+
(0, _awilixexpress.POST)(),
|
|
182
|
+
(0, _awilixexpress.route)("/:id/install-firmware-update-plugin"),
|
|
183
|
+
_ts_metadata("design:type", Function),
|
|
184
|
+
_ts_metadata("design:paramtypes", [
|
|
185
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
186
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
187
|
+
]),
|
|
188
|
+
_ts_metadata("design:returntype", Promise)
|
|
189
|
+
], PluginFirmwareUpdateController.prototype, "installFirmwareUpdatePlugin", null);
|
|
190
|
+
_ts_decorate([
|
|
191
|
+
(0, _awilixexpress.GET)(),
|
|
192
|
+
(0, _awilixexpress.route)("/:id/status"),
|
|
193
|
+
_ts_metadata("design:type", Function),
|
|
194
|
+
_ts_metadata("design:paramtypes", [
|
|
195
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
196
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
197
|
+
]),
|
|
198
|
+
_ts_metadata("design:returntype", Promise)
|
|
199
|
+
], PluginFirmwareUpdateController.prototype, "getFirmwareUpdaterStatus", null);
|
|
200
|
+
_ts_decorate([
|
|
201
|
+
(0, _awilixexpress.POST)(),
|
|
202
|
+
(0, _awilixexpress.route)("/:id/configure-plugin-settings"),
|
|
203
|
+
_ts_metadata("design:type", Function),
|
|
204
|
+
_ts_metadata("design:paramtypes", [
|
|
205
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
206
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
207
|
+
]),
|
|
208
|
+
_ts_metadata("design:returntype", Promise)
|
|
209
|
+
], PluginFirmwareUpdateController.prototype, "configurePluginSettings", null);
|
|
210
|
+
_ts_decorate([
|
|
211
|
+
(0, _awilixexpress.POST)(),
|
|
212
|
+
(0, _awilixexpress.route)("/:id/flash-firmware"),
|
|
213
|
+
_ts_metadata("design:type", Function),
|
|
214
|
+
_ts_metadata("design:paramtypes", [
|
|
215
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
216
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
217
|
+
]),
|
|
218
|
+
_ts_metadata("design:returntype", Promise)
|
|
219
|
+
], PluginFirmwareUpdateController.prototype, "flashFirmware", null);
|
|
220
|
+
PluginFirmwareUpdateController = _ts_decorate([
|
|
221
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/plugin/firmware-update"),
|
|
222
|
+
(0, _awilixexpress.before)([
|
|
223
|
+
(0, _authenticate.authenticate)(),
|
|
224
|
+
(0, _authenticate.authorizeRoles)([
|
|
225
|
+
_authorizationconstants.ROLES.OPERATOR,
|
|
226
|
+
_authorizationconstants.ROLES.ADMIN
|
|
227
|
+
]),
|
|
228
|
+
(0, _printer.printerResolveMiddleware)()
|
|
133
229
|
]),
|
|
134
|
-
(
|
|
135
|
-
|
|
230
|
+
_ts_metadata("design:type", Function),
|
|
231
|
+
_ts_metadata("design:paramtypes", [
|
|
232
|
+
Object
|
|
233
|
+
])
|
|
234
|
+
], PluginFirmwareUpdateController);
|
|
136
235
|
|
|
137
236
|
//# sourceMappingURL=plugin-firmware-update.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","error","firmwareStates","failures","set","ttl","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/plugin-firmware-update.controller.ts"],"names":["PluginFirmwareUpdateController","cacheKey","cacheManager","printerCache","pluginFirmwareUpdateService","logger","constructor","loggerFactory","name","listUpdateState","req","res","result","performScanOnPrinters","send","syncFirmwareReleasesCache","releases","queryGithubPrusaFirmwareReleasesCache","downloadFirmware","scanPrinterFirmwareVersions","isPluginInstalled","printerLogin","getScopedPrinter","isInstalled","installFirmwareUpdatePlugin","installPlugin","installing","getFirmwareUpdaterStatus","status","getPluginFirmwareStatus","configurePluginSettings","response","configureFirmwareUpdaterSettings","flashFirmware","currentPrinterId","flashPrusaFirmware","printers","listCachedPrinters","printerFirmwareStates","failureStates","printer","loginDto","getLoginDtoAsync","id","version","getPrinterFirmwareVersion","push","firmware","printerName","pluginInstalled","e","error","firmwareStates","failures","set","ttl","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
|
|
@@ -77,8 +77,7 @@ class PrinterController {
|
|
|
77
77
|
res.send(importResult);
|
|
78
78
|
}
|
|
79
79
|
async getPluginList(req, res) {
|
|
80
|
-
|
|
81
|
-
let pluginList = this.pluginRepositoryCache.getCache();
|
|
80
|
+
const pluginList = this.pluginRepositoryCache.getCache();
|
|
82
81
|
res.send(pluginList);
|
|
83
82
|
}
|
|
84
83
|
async getPrinter(req, res) {
|
|
@@ -247,7 +246,7 @@ class PrinterController {
|
|
|
247
246
|
}
|
|
248
247
|
async getPrinterPluginList(req, res) {
|
|
249
248
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
250
|
-
|
|
249
|
+
const pluginList = await this.octoprintClient.getPluginManagerPlugins(printerLogin);
|
|
251
250
|
res.send(pluginList);
|
|
252
251
|
}
|
|
253
252
|
async getOctoPrintBackupOverview(req, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","console","warn","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":";;;;+BAyCaA;;;eAAAA;;;+BAzC2C;0BACf;8BACI;4BACuB;6CAU7D;iCACsB;yBACY;sCACA;wCACnB;yBAWY;uBAGP;2CACe;mCACF;;;;;;;;;;AAQjC,MAAMA;IACXC,kBAAqC;IACrCC,mBAAuC;IACvCC,uBAA+C;IAC/CC,eAAgC;IAChCC,aAA2B;IAC3BC,mBAAuC;IACvCC,mBAAuC;IACvCC,WAAwB;IACxBC,gBAAiC;IACjCC,gBAAiC;IACjCC,sBAA6C;IAC7CC,WAAuB;IACvBC,cAA6B;IAC7BC,OAAsB;IAEtBC,YAAY,EACVd,iBAAiB,EACjBC,kBAAkB,EAClBC,sBAAsB,EACtBC,cAAc,EACdC,YAAY,EACZC,kBAAkB,EAClBC,kBAAkB,EAClBS,aAAa,EACbR,UAAU,EACVE,eAAe,EACfD,eAAe,EACfE,qBAAqB,EACrBC,UAAU,EACVC,aAAa,EAgBd,CAAE;QACD,IAAI,CAACC,MAAM,GAAGE,cAAchB,kBAAkBiB,IAAI;QAClD,IAAI,CAAChB,iBAAiB,GAAGA;QACzB,IAAI,CAACI,YAAY,GAAGA;QACpB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACF,cAAc,GAAGA;QACtB,IAAI,CAACF,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,sBAAsB,GAAGA;QAC9B,IAAI,CAACI,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACC,qBAAqB,GAAGA;QAC7B,IAAI,CAACC,UAAU,GAAGA;QAClB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAEMK,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtCA,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACiB,kBAAkB,CAAC;IACtD;IAEA,MAEMC,OAAOJ,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMI,aAAaL,IAAIM,IAAI;QAC3B,IAAIN,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAACJ;QACpC;QAGA,MAAMK,iBAAiB,MAAM,IAAI,CAACzB,cAAc,CAACmB,MAAM,CAACC;QACxDJ,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACD,eAAeE,EAAE;IACjF;IAEA,MAEMC,YAAYb,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAMa,eAAe,MAAM,IAAI,CAAC7B,cAAc,CAAC8B,WAAW,CAACf,IAAIM,IAAI;QACnEL,IAAIC,IAAI,CAACY;IACX;IAKA,MAEME,cAAchB,GAAY,EAAEC,GAAa,EAAE;QAC/CgB,QAAQC,IAAI,CAAC;QACb,IAAIC,aAAa,IAAI,CAAC3B,qBAAqB,CAAC4B,QAAQ;QACpDnB,IAAIC,IAAI,CAACiB;IACX;IAEA,MAEME,WAAWrB,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACW;IAChE;IAEA,MAEME,qBAAqBxB,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9CC,IAAIC,IAAI,CAAC,MAAM,IAAI,CAACf,kBAAkB,CAACsC,sBAAsB,CAACH;IAChE;IAEA,MAEMI,OAAO1B,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMO,YAAYR,IAAIO,KAAK,CAACC,SAAS,KAAK;QAG1C,MAAM,EAAEc,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAM2B,iBAAiB3B,IAAIM,IAAI;QAC/B,IAAI,CAACE,WAAW;YACd,MAAM,IAAI,CAACC,sBAAsB,CAACkB;QACpC;QAEA,MAAM,IAAI,CAAC1C,cAAc,CAACyC,MAAM,CAACJ,kBAAkBK;QACnD1B,IAAIC,IAAI,CAAC,MAAM,IAAI,CAAChB,YAAY,CAACyB,4BAA4B,CAACW;IAChE;IAEA,MAEMM,OAAO5B,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAM6B,SAAS,MAAM,IAAI,CAAC5C,cAAc,CAAC2C,MAAM,CAACN;QAChD,MAAM,IAAI,CAAC7B,UAAU,CAACqC,yBAAyB,CAACR;QAChDrB,IAAIC,IAAI,CAAC2B;IACX;IAEA,MAEME,cAAc/B,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAMgC,OAAO,MAAMC,IAAAA,8BAAkB,EAACjC,KAAKkC,qDAAwB;QACnE,MAAM,IAAI,CAACjD,cAAc,CAAC8C,aAAa,CAACT,kBAAkBU,KAAKG,OAAO;QACtElC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMkC,4BAA4BpC,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAMgC,OAAO,MAAMC,IAAAA,8BAAkB,EAACjC,KAAKqC,6DAAgC;QAC3E,MAAM,IAAI,CAACpD,cAAc,CAACqD,oBAAoB,CAAChB,kBAAkBU,KAAKO,cAAc;QACpFtC,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMsC,yBAAyBxC,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAMyC,YAAY,MAAMR,IAAAA,8BAAkB,EAACjC,KAAK0C,gEAAmC;QAEnF,IAAI1C,IAAIO,KAAK,CAACC,SAAS,KAAK,QAAQ;YAClC,MAAM,IAAI,CAACC,sBAAsB,CAACgC;QACpC;QAEA,MAAME,YAAY,MAAM,IAAI,CAAC1D,cAAc,CAACuD,wBAAwB,CAAClB,kBAAkBmB;QACvFxC,IAAIC,IAAI,CAAC;YACP0C,YAAYD,UAAUC,UAAU;YAChCC,QAAQF,UAAUE,MAAM;YACxBC,aAAaH,UAAUG,WAAW;QACpC;IACF;IAEA,MAEMC,qBAAqB/C,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,IAAI,CAACjB,kBAAkB,CAACiE,kBAAkB,CAAC1B;QAC3C,MAAM,IAAI,CAACnC,kBAAkB,CAAC8D,yBAAyB,CAAC3B;QACxDrB,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMgD,eAAelD,GAAY,EAAEC,GAAa,EAAE;QAChD,IAAID,IAAIM,IAAI,CAACsC,UAAU,EAAEO,QAAQ;YAC/BnD,IAAIM,IAAI,CAACsC,UAAU,GAAGQ,IAAAA,kCAAwB,EAACpD,IAAIM,IAAI,CAACsC,UAAU;QACpE;QACA,MAAMvC,aAAa,MAAM4B,IAAAA,8BAAkB,EAACjC,KAAKqD,gDAAmB;QACpEhD,WAAWiD,gBAAgB,GAAGC,IAAAA,8CAAwB;QACtD,IAAI,CAAC5D,MAAM,CAAC6D,GAAG,CAAC,CAAC,uCAAuC,EAAEnD,WAAWiD,gBAAgB,EAAE;QAGvF,IAAI;YACF,MAAM,IAAI,CAACtE,sBAAsB,CAACyE,gBAAgB,CAACpD;QACrD,EAAE,OAAOqD,GAAG;YACVzD,IAAIC,IAAI,CAAC;gBAAEoD,kBAAkBjD,WAAWiD,gBAAgB;gBAAEK,SAAS;gBAAMC,OAAOF,EAAEG,QAAQ;YAAG;YAC7F;QACF;QACA5D,IAAIC,IAAI,CAAC;YAAEoD,kBAAkBjD,WAAWiD,gBAAgB;QAAC;IAC3D;IAEA,MAEMQ,uBAAuB9D,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1CC,IAAIC,IAAI,CAAC6D;IACX;IAEA,MAEMC,yBAAyBhE,GAAY,EAAEC,GAAa,EAAE;QAC1D,MAAM,IAAI,CAACZ,UAAU,CAAC4E,OAAO;QAC7BhE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMgE,4BAA4BlE,GAAY,EAAEC,GAAa,EAAE;QAC7D,MAAM,IAAI,CAACZ,UAAU,CAAC8E,UAAU;QAChClE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMkE,cAAcpE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAAC+E,aAAa,CAACpE,IAAIM,IAAI;QAC5CL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMmE,SAASrE,GAAY,EAAEC,GAAa,EAAE;QAC1C,MAAM,IAAI,CAACZ,UAAU,CAACgF,QAAQ,CAACrE,IAAIM,IAAI;QACvCL,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMoE,WAAWtE,GAAY,EAAEC,GAAa,EAAE;QAC5C,MAAM,IAAI,CAACZ,UAAU,CAACiF,UAAU;QAChCrE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMqE,YAAYvE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACkF,WAAW;QACjCtE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMsE,YAAYxE,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,IAAI,CAACZ,UAAU,CAACmF,WAAW;QACjCvE,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAGMuE,cAAczE,GAAY,EAAEC,GAAa,EAAE;QAC/C,MAAM,IAAI,CAACZ,UAAU,CAACoF,aAAa;QACnCxE,IAAIC,IAAI;IACV;IAEA,MAAcO,uBAAuBiE,aAAuB,EAAE;QAC5D,MAAMC,IAAAA,yBAAa,EAACD,eAAehC,gEAAmC;QACtE,IAAI;YACF,IAAI,IAAI,CAACrD,UAAU,EAAE;gBACnB,MAAM,IAAI,CAACA,UAAU,CAACuF,UAAU;YAClC,OAAO;gBACL,MAAMvF,aAAa,IAAI,CAACP,iBAAiB,CAACyC,gBAAgB,CAACmD;gBAC3D,MAAMrF,WAAWuF,UAAU;YAC7B;QACF,EAAE,OAAOlB,GAAG;YACV,IAAI,CAAC/D,MAAM,CAAC6D,GAAG,CAAC;YAEhB,IAAIE,aAAamB,iBAAU,EAAE;gBAC3B,IAAI,CAAClF,MAAM,CAACmF,KAAK,CAACpB,EAAEqB,OAAO,GAAG,MAAMrB,EAAEsB,MAAM,GAAG,MAAMtB,EAAEuB,QAAQ,EAAED;gBACjE,OAAQtB,EAAEuB,QAAQ,EAAED;oBAClB,KAAK;wBAEH;oBACF,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,yBAAyBxB,EAAEuB,QAAQ,EAAED;wBAC3E;oBACA,KAAK;oBACL,KAAK;oBACL,KAAK;wBAAK;4BACR,MAAM,IAAIE,oDAAyB,CAAC,yBAAyBxB,EAAEuB,QAAQ,EAAED;wBAC3E;oBACA;wBAAS;4BACP,IAAI,CAACtB,EAAEuB,QAAQ,EAAED,QAAQ;gCAKvB,MAAM,IAAIE,oDAAyB,CAAC,CAAC,+CAA+C,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC;4BACjG,OAAO;gCACL,MAAM,IAAID,oDAAyB,CAAC,CAAC,4CAA4C,EAAExB,EAAEyB,IAAI,CAAC,CAAC,CAAC,EAAEzB,EAAEuB,QAAQ,EAAED;4BAC5G;wBACF;gBACF;YACF;YAEA,MAAM,IAAII,0CAAuB,CAAC,CAAC,0CAA0C,CAAC,EAAE,AAAC1B,EAAY2B,KAAK;QACpG;IACF;IAEA,MAEMC,YAAYtF,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAMgC,OAAO,MAAMC,IAAAA,8BAAkB,EAACjC,KAAKuF,0CAAa;QAExD,MAAM,IAAI,CAACtG,cAAc,CAACuG,cAAc,CAAClE,kBAAkBU,KAAKyD,QAAQ;QACxExF,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEMwF,YAAY1F,GAAY,EAAEC,GAAa,EAAE;QAC7C,MAAM,EAAEqB,gBAAgB,EAAE,GAAGC,IAAAA,4BAAgB,EAACvB;QAC9C,MAAMgC,OAAO,MAAMC,IAAAA,8BAAkB,EAACjC,KAAK2F,0CAAa;QACxD,MAAM,IAAI,CAAC1G,cAAc,CAAC2G,cAAc,CAACtE,kBAAkBU,KAAK6D,QAAQ;QACxE5F,IAAIC,IAAI,CAAC,CAAC;IACZ;IAEA,MAEM4F,qBAAqB9F,GAAY,EAAEC,GAAa,EAAE;QAEtD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,IAAImB,aAAa,MAAM,IAAI,CAAC7B,eAAe,CAACyG,uBAAuB,CAAChC;QACpE9D,IAAIC,IAAI,CAACiB;IACX;IAEA,MAEM6E,2BAA2BhG,GAAY,EAAEC,GAAa,EAAE;QAC5D,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAMiG,iBAAiB,MAAM,IAAI,CAAC3G,eAAe,CAAC4G,iBAAiB,CAACnC;QACpE9D,IAAIC,IAAI,CAAC+F;IACX;IAEA,MAEME,qBAAqBnG,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAMiG,iBAAiB,MAAM,IAAI,CAAC3G,eAAe,CAAC8G,UAAU,CAACrC;QAC7D9D,IAAIC,IAAI,CAAC+F;IACX;IAEA,MAEMI,sBAAsBrG,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAM,EAAEsG,OAAO,EAAE,GAAG,MAAMrE,IAAAA,8BAAkB,EAACjC,KAAKuG,uDAA0B;QAC5E,MAAMtB,WAAW,MAAM,IAAI,CAAC3F,eAAe,CAACkH,YAAY,CAACzC,cAAcuC;QACvErG,IAAIC,IAAI,CAAC+E;IACX;IAEA,MAEMwB,wBAAwBzG,GAAY,EAAEC,GAAa,EAAE;QACzD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAM,EAAE0G,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAACjC,KAAK2G,oDAAuB;QAC1E,MAAMC,aAAa,MAAM,IAAI,CAACtH,eAAe,CAACuH,uBAAuB,CAAC9C,cAAc2C;QACpFE,WAAWE,IAAI,CAAC7G;IAClB;IAEA,MAEM8G,uBAAuB/G,GAAY,EAAEC,GAAa,EAAE;QACxD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAMgH,QAAQ,MAAM,IAAI,CAACtH,aAAa,CAACuH,mBAAmB,CAACjH,KAAKC,KAAK,MAAM;QAC3E,MAAMgF,WAAW,MAAM,IAAI,CAAC3F,eAAe,CAAC4H,8BAA8B,CAACnD,cAAciD,KAAK,CAAC,EAAE,CAACG,MAAM;QACxGlH,IAAIC,IAAI,CAAC+E,SAASjD,IAAI;IACxB;IAEA,MAEMoF,sBAAsBpH,GAAY,EAAEC,GAAa,EAAE;QACvD,MAAM,EAAE8D,YAAY,EAAE,GAAGxC,IAAAA,4BAAgB,EAACvB;QAC1C,MAAM,EAAE0G,QAAQ,EAAE,GAAG,MAAMzE,IAAAA,8BAAkB,EAACjC,KAAK2G,oDAAuB;QAC1E,MAAM1B,WAAW,MAAM,IAAI,CAAC3F,eAAe,CAAC+H,YAAY,CAACtD,cAAc2C;QACvEzG,IAAIC,IAAI,CAAC+E;IACX;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA5YOqC,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY;QAAIC,IAAAA,4BAAc,EAAC;YAACC,6BAAK,CAACC,QAAQ;YAAED,6BAAK,CAACE,KAAK;SAAC;QAAGC,IAAAA,iCAAwB"}
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
|
|
@@ -53,6 +53,8 @@ class ServerPublicController {
|
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
getFeatures(req, res) {
|
|
56
|
+
const serverSettings = this.settingsStore.getServerSettings();
|
|
57
|
+
const moonrakerEnabled = serverSettings.experimentalMoonrakerSupport;
|
|
56
58
|
res.send({
|
|
57
59
|
batchReprintCalls: {
|
|
58
60
|
available: true,
|
|
@@ -112,7 +114,10 @@ class ServerPublicController {
|
|
|
112
114
|
available: true,
|
|
113
115
|
version: 1,
|
|
114
116
|
subFeatures: {
|
|
115
|
-
types: [
|
|
117
|
+
types: moonrakerEnabled ? [
|
|
118
|
+
"octoprint",
|
|
119
|
+
"klipper"
|
|
120
|
+
] : [
|
|
116
121
|
"octoprint"
|
|
117
122
|
]
|
|
118
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":";;;;;;;;;;;IAcaA,sBAAsB;eAAtBA;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
|
|
@@ -24,16 +24,21 @@ const _validators = require("../handlers/validators");
|
|
|
24
24
|
const _settingsservicevalidation = require("../services/validators/settings-service.validation");
|
|
25
25
|
const _ip = require("ip");
|
|
26
26
|
const _demomiddleware = require("../middleware/demo.middleware");
|
|
27
|
+
const _printerapiinterface = require("../services/printer-api.interface");
|
|
27
28
|
class SettingsController {
|
|
28
29
|
settingsStore;
|
|
29
30
|
logger;
|
|
31
|
+
printerCache;
|
|
32
|
+
printerService;
|
|
30
33
|
configService;
|
|
31
34
|
serverVersion;
|
|
32
|
-
constructor({ settingsStore, serverVersion, loggerFactory, configService }){
|
|
35
|
+
constructor({ settingsStore, printerCache, printerService, serverVersion, loggerFactory, configService }){
|
|
33
36
|
this.settingsStore = settingsStore;
|
|
34
37
|
this.logger = loggerFactory(SettingsController.name);
|
|
35
38
|
this.serverVersion = serverVersion;
|
|
36
39
|
this.configService = configService;
|
|
40
|
+
this.printerCache = printerCache;
|
|
41
|
+
this.printerService = printerService;
|
|
37
42
|
}
|
|
38
43
|
getSettings(req, res) {
|
|
39
44
|
let connection;
|
|
@@ -62,6 +67,23 @@ class SettingsController {
|
|
|
62
67
|
const result = this.settingsStore.setSentryDiagnosticsEnabled(enabled);
|
|
63
68
|
res.send(result);
|
|
64
69
|
}
|
|
70
|
+
async updateMoonrakerSupport(req, res) {
|
|
71
|
+
const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.moonrakerSupportRules);
|
|
72
|
+
const result = await this.settingsStore.setExperimentalMoonrakerSupport(enabled);
|
|
73
|
+
if (!enabled) {
|
|
74
|
+
const printers = await this.printerCache.listCachedPrinters(false);
|
|
75
|
+
const klipperPrinters = printers.filter((p)=>p.printerType === _printerapiinterface.MoonrakerType);
|
|
76
|
+
for (const printer of klipperPrinters){
|
|
77
|
+
await this.printerService.updateEnabled(printer.id, false);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
res.send(result);
|
|
81
|
+
}
|
|
82
|
+
async updateClientSupport(req, res) {
|
|
83
|
+
const { enabled } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.clientNextRules);
|
|
84
|
+
const result = await this.settingsStore.setExperimentalClientSupport(enabled);
|
|
85
|
+
res.send(result);
|
|
86
|
+
}
|
|
65
87
|
async updateWhitelistSettings(req, res) {
|
|
66
88
|
const { whitelistEnabled, whitelistedIpAddresses } = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.whitelistSettingUpdateRules);
|
|
67
89
|
if (!whitelistedIpAddresses.includes("127.0.0.1")) {
|
|
@@ -120,7 +142,21 @@ const _default = (0, _awilixexpress.createController)(SettingsController).prefix
|
|
|
120
142
|
]),
|
|
121
143
|
_demomiddleware.demoUserNotAllowed
|
|
122
144
|
]
|
|
123
|
-
}).patch("/sentry-diagnostics", "updateSentryDiagnosticsEnabled", _demomiddleware.demoUserNotAllowedInterceptor).put("/
|
|
145
|
+
}).patch("/sentry-diagnostics", "updateSentryDiagnosticsEnabled", _demomiddleware.demoUserNotAllowedInterceptor).put("/experimental-moonraker-support", "updateMoonrakerSupport", {
|
|
146
|
+
before: [
|
|
147
|
+
(0, _authenticate.authorizeRoles)([
|
|
148
|
+
_authorizationconstants.ROLES.ADMIN
|
|
149
|
+
]),
|
|
150
|
+
_demomiddleware.demoUserNotAllowed
|
|
151
|
+
]
|
|
152
|
+
}).put("/experimental-client-support", "updateClientSupport", {
|
|
153
|
+
before: [
|
|
154
|
+
(0, _authenticate.authorizeRoles)([
|
|
155
|
+
_authorizationconstants.ROLES.ADMIN
|
|
156
|
+
]),
|
|
157
|
+
_demomiddleware.demoUserNotAllowed
|
|
158
|
+
]
|
|
159
|
+
}).put("/server", "updateServerSettings", {
|
|
124
160
|
before: [
|
|
125
161
|
(0, _authenticate.authorizeRoles)([
|
|
126
162
|
_authorizationconstants.ROLES.ADMIN
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","isWhitelistFeatureEnabled","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","settingsStore","logger","printerCache","printerService","configService","serverVersion","constructor","loggerFactory","name","getSettings","req","res","connection","serverIp","address","clientIp","socket","remoteAddress","ip","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledRules","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportRules","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updateClientSupport","clientNextRules","setExperimentalClientSupport","updateWhitelistSettings","whitelistEnabled","whitelistedIpAddresses","whitelistSettingUpdateRules","includes","push","setWhitelist","updateFrontendSettings","validatedInput","frontendSettingsUpdateRules","updateServerSettings","isWhitelistFeatureEnabled","get","AppConstants","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","serverSettingsUpdateRules","updateLoginRequiredSettings","loginRequired","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","setRegistrationEnabled","updateCredentialSettings","credentialSettingPatchRules","updateFileCleanSettings","fileCleanSettingsUpdateRules","patchFileCleanSettings","updateTimeoutSettings","timeoutSettingsUpdateRules","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","patch","demoUserNotAllowedInterceptor","put"],"mappings":"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"}
|