@fdm-monster/server 1.5.1 → 1.5.4
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/README.md +1 -1
- package/dist/constants/authorization.constants.js +1 -2
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/http-status-codes.constants.js +62 -255
- package/dist/constants/http-status-codes.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +0 -4
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/constants/service.constants.js +3 -10
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +66 -69
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -7
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/auth.controller.js +0 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +7 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/camera-stream.controller.js +6 -4
- package/dist/controllers/camera-stream.controller.js.map +1 -1
- package/dist/controllers/custom-gcode.controller.js +11 -11
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +9 -12
- package/dist/controllers/floor.controller.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +1 -3
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/print-completion.controller.js +1 -4
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +22 -39
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +8 -6
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +7 -37
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +0 -1
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +0 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/user.controller.js +10 -17
- package/dist/controllers/user.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +10 -9
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/controllers/validation/generic.validation.js +16 -7
- package/dist/controllers/validation/generic.validation.js.map +1 -1
- package/dist/controllers/validation/setting.validation.js +0 -1
- package/dist/controllers/validation/setting.validation.js.map +1 -1
- package/dist/handlers/cache-manager.js +1 -1
- package/dist/handlers/cache-manager.js.map +1 -1
- package/dist/handlers/event-emitter.js +0 -7
- package/dist/handlers/event-emitter.js.map +1 -1
- package/dist/handlers/logger.js +1 -1
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/validators.js +1 -1
- package/dist/handlers/validators.js.map +1 -1
- package/dist/middleware/authenticate.js +23 -23
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/exception.filter.js +0 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/global.middleware.js +6 -6
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/models/Auth/User.js +0 -2
- package/dist/models/Auth/User.js.map +1 -1
- package/dist/models/FloorPrinter.js.map +1 -1
- package/dist/models/PrintCompletion.js.map +1 -1
- package/dist/models/Printer.js +2 -11
- package/dist/models/Printer.js.map +1 -1
- package/dist/models/Settings.js +0 -1
- package/dist/models/Settings.js.map +1 -1
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js +0 -4
- package/dist/mongo-migrations/20210713120034-printers-settingsapperance-apikey.js.map +1 -1
- package/dist/mongo-migrations/20210907173950-printers-enabled.js +0 -4
- package/dist/mongo-migrations/20210907173950-printers-enabled.js.map +1 -1
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js +0 -4
- package/dist/mongo-migrations/20211029110742-user-password-passwordhash.js.map +1 -1
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js +35 -0
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -0
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +41 -0
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -0
- package/dist/server.constants.js +1 -19
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +6 -7
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +6 -18
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +6 -8
- package/dist/server.host.js.map +1 -1
- package/dist/services/authentication/auth.service.js +2 -20
- package/dist/services/authentication/auth.service.js.map +1 -1
- package/dist/services/authentication/jwt.service.js +1 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/permission.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js +8 -1
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/role.service.js +1 -1
- package/dist/services/authentication/role.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +1 -5
- package/dist/services/authentication/user.service.js.map +1 -1
- package/dist/services/batch-call.service.js +4 -8
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/camera-stream.service.js +1 -2
- package/dist/services/camera-stream.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +1 -4
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +1 -2
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +3 -6
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/server-release.service.js +4 -13
- package/dist/services/core/server-release.service.js.map +1 -1
- package/dist/services/core/server-update.service.js +0 -2
- package/dist/services/core/server-update.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +9 -22
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +28 -22
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/custom-gcode.service.js +2 -2
- package/dist/services/custom-gcode.service.js.map +1 -1
- package/dist/services/floor.service.js +4 -45
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/floor.dto.js +38 -0
- package/dist/services/interfaces/floor.dto.js.map +1 -1
- package/dist/services/interfaces/print-completion-context.dto.js +6 -0
- package/dist/services/interfaces/print-completion-context.dto.js.map +1 -0
- package/dist/services/interfaces/print-completion.dto.js +40 -0
- package/dist/services/interfaces/print-completion.dto.js.map +1 -0
- package/dist/services/interfaces/print-completion.service.js +6 -0
- package/dist/services/interfaces/print-completion.service.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js +16 -3
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/refresh-token.dto.js +0 -2
- package/dist/services/interfaces/refresh-token.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js +0 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/interfaces/user-role.dto.js +18 -0
- package/dist/services/interfaces/user-role.dto.js.map +1 -0
- package/dist/services/octoprint/constants/octoprint-service.constants.js +0 -3
- package/dist/services/octoprint/constants/octoprint-service.constants.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +2 -4
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +10 -27
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +10 -43
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +0 -1
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +0 -3
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/print-completion.service.js +14 -45
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/services/print-completion.shared.js +59 -0
- package/dist/services/print-completion.shared.js.map +1 -0
- package/dist/services/printer-files.service.js +1 -5
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/printer.service.js +20 -15
- package/dist/services/printer.service.js.map +1 -1
- package/dist/services/settings.service.js +2 -8
- package/dist/services/settings.service.js.map +1 -1
- package/dist/services/validators/floor-service.validation.js +13 -11
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +1 -2
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/user-service.validation.js +10 -10
- package/dist/services/validators/user-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +13 -14
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +0 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/file.cache.js +25 -33
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/floor.store.js +0 -1
- package/dist/state/floor.store.js.map +1 -1
- package/dist/state/printer-events.cache.js +1 -3
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/{files.store.js → printer-files.store.js} +12 -26
- package/dist/state/printer-files.store.js.map +1 -0
- package/dist/state/printer-socket.store.js +7 -32
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +4 -9
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +0 -2
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/socket-io.gateway.js +0 -2
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -7
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/task.presets.js +0 -11
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +6 -10
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +10 -11
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +13 -21
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +1 -5
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +5 -15
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +0 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +0 -2
- package/dist/tasks.js.map +1 -1
- package/dist/types/express/index.d.js +0 -1
- package/dist/types/express/index.d.js.map +1 -1
- package/dist/utils/env.utils.js +2 -5
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/is-docker.js +1 -1
- package/dist/utils/is-docker.js.map +1 -1
- package/dist/utils/normalize-url.js +0 -35
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/semver.utils.js +0 -1
- package/dist/utils/semver.utils.js.map +1 -1
- package/dist/utils/url.utils.js +1 -0
- package/dist/utils/url.utils.js.map +1 -1
- package/dist/utils/websocket.adapter.js +8 -54
- package/dist/utils/websocket.adapter.js.map +1 -1
- package/package.json +37 -37
- package/dist/state/files.store.js.map +0 -1
- package/dist/utils/mapper.utils.js +0 -33
- package/dist/utils/mapper.utils.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/refresh-token.dto.ts"],"names":["RefreshTokenDto","id","userId","expiresAt","refreshAttemptsUsed"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAa;IACbC,OAAiB;IACjBC,UAAmB;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/refresh-token.dto.ts"],"names":["RefreshTokenDto","id","userId","expiresAt","refreshAttemptsUsed"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAa;IACbC,OAAiB;IACjBC,UAAmB;IAGnBC,oBAA6B;AAC/B"}
|
|
@@ -25,7 +25,6 @@ class SettingsDto {
|
|
|
25
25
|
[_serversettingsconstants.serverSettingsKey];
|
|
26
26
|
[_serversettingsconstants.wizardSettingKey];
|
|
27
27
|
[_serversettingsconstants.frontendSettingKey];
|
|
28
|
-
// [credentialSettingsKey]: CredentialSettingsDto;
|
|
29
28
|
[_serversettingsconstants.fileCleanSettingKey];
|
|
30
29
|
[_serversettingsconstants.timeoutSettingKey];
|
|
31
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/settings.dto.ts"],"names":["IpWhitelistSettingsDto","SettingsDto","whitelistedIpAddresses","whitelistEnabled","serverSettingsKey","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey"],"mappings":";;;;;;;;;;;IAmBaA,sBAAsB;eAAtBA;;IA2CAC,WAAW;eAAXA;;;yCAvDN;AAYA,MAAMD;IACXE,uBAAiC;IACjCC,iBAA0B;AAC5B;AAwCO,MAAMF;IACX,CAACG,0CAAiB,CAAC,CAAoB;IACvC,CAACC,yCAAgB,CAAC,CAAoB;IACtC,CAACC,2CAAkB,CAAC,CAAsB;IAE1C,CAACC,4CAAmB,CAAC,CAAuB;IAC5C,CAACC,0CAAiB,CAAC,CAAqB;AAC1C"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "UserRoleDto", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return UserRoleDto;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class UserRoleDto {
|
|
12
|
+
id;
|
|
13
|
+
userId;
|
|
14
|
+
roleId;
|
|
15
|
+
createdAt;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
//# sourceMappingURL=user-role.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/user-role.dto.ts"],"names":["UserRoleDto","id","userId","roleId","createdAt"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,GAAW;IACXC,OAAe;IACfC,OAAe;IACfC,UAAgB;AAClB"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
// https://github.com/OctoPrint/OctoPrint/blob/161e21fe0f6344ec3b9b9b541e9b2c472087ba77/src/octoprint/util/comm.py#L913
|
|
2
1
|
"use strict";
|
|
3
2
|
Object.defineProperty(exports, "__esModule", {
|
|
4
3
|
value: true
|
|
@@ -93,8 +92,6 @@ const apiKeyHeaderKey = "x-api-key";
|
|
|
93
92
|
const jsonContentType = "application/json";
|
|
94
93
|
const multiPartContentType = "multipart/form-data";
|
|
95
94
|
function isLoginResponseGlobal(octoPrintResponse) {
|
|
96
|
-
// Explicit nullability check serves to let an unconnected printer fall through as well as incorrect apiKey
|
|
97
|
-
// Note: 'apikey' property is conform OctoPrint response (and not FDM Monster printer model's 'apiKey')
|
|
98
95
|
return !!octoPrintResponse && octoPrintResponse.name === "_api";
|
|
99
96
|
}
|
|
100
97
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["OP_STATE","apiKeyHeaderKey","contentTypeHeaderKey","isLoginResponseGlobal","jsonContentType","multiPartContentType","pluginManagerCommands","pluginRepositoryUrl","Offline","OpeningSerial","DetectingSerial","Connecting","Operational","StartingPrintFromSD","StartSendingPrintToSD","Starting","TransferringFileToSD","PrintingFromSD","SendingFileToSD","Printing","Cancelling","Pausing","Paused","Resuming","Finishing","Error","OfflineAfterError","UnknownState","install","name","param","uninstall","enable","disable","cleanup","cleanup_all","undefined","refresh_repository","octoPrintResponse"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/constants/octoprint-service.constants.ts"],"names":["OP_STATE","apiKeyHeaderKey","contentTypeHeaderKey","isLoginResponseGlobal","jsonContentType","multiPartContentType","pluginManagerCommands","pluginRepositoryUrl","Offline","OpeningSerial","DetectingSerial","Connecting","Operational","StartingPrintFromSD","StartSendingPrintToSD","Starting","TransferringFileToSD","PrintingFromSD","SendingFileToSD","Printing","Cancelling","Pausing","Paused","Resuming","Finishing","Error","OfflineAfterError","UnknownState","install","name","param","uninstall","enable","disable","cleanup","cleanup_all","undefined","refresh_repository","octoPrintResponse"],"mappings":";;;;;;;;;;;IACaA,QAAQ;eAARA;;IAyDAC,eAAe;eAAfA;;IADAC,oBAAoB;eAApBA;;IAQGC,qBAAqB;eAArBA;;IANHC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IApCAC,qBAAqB;eAArBA;;IA+BAC,mBAAmB;eAAnBA;;;AAtDN,MAAMP,WAAW;IACtBQ,SAAS;IACTC,eAAe;IACfC,iBAAiB;IACjBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,uBAAuB;IACvBC,UAAU;IACVC,sBAAsB;IACtBC,gBAAgB;IAChBC,iBAAiB;IACjBC,UAAU;IACVC,YAAY;IACZC,SAAS;IACTC,QAAQ;IACRC,UAAU;IACVC,WAAW;IACXC,OAAO;IACPC,mBAAmB;IACnBC,cAAc;AAChB;AAEO,MAAMrB,wBAAwB;IACnCsB,SAAS;QACPC,MAAM;QACNC,OAAO;IACT;IACAC,WAAW;QACTF,MAAM;QACNC,OAAO;IACT;IACAE,QAAQ;QACNH,MAAM;QACNC,OAAO;IACT;IACAG,SAAS;QACPJ,MAAM;QACNC,OAAO;IACT;IACAI,SAAS;QACPL,MAAM;QACNC,OAAO;IACT;IACAK,aAAa;QACXN,MAAM;QACNC,OAAOM;IACT;IACAC,oBAAoB;QAClBR,MAAM;QACNC,OAAOM;IACT;AACF;AAEO,MAAM7B,sBAAsB;AAE5B,MAAML,uBAAuB;AAC7B,MAAMD,kBAAkB;AACxB,MAAMG,kBAAkB;AACxB,MAAMC,uBAAuB;AAK7B,SAASF,sBAAsBmC,iBAAiB;IAGrD,OAAO,CAAC,CAACA,qBAAqBA,kBAAkBT,IAAI,KAAK;AAC3D"}
|
|
@@ -106,10 +106,10 @@ class OctoPrintRoutes {
|
|
|
106
106
|
destination
|
|
107
107
|
};
|
|
108
108
|
}
|
|
109
|
-
printerNameSetting(
|
|
109
|
+
printerNameSetting(name) {
|
|
110
110
|
return {
|
|
111
111
|
appearance: {
|
|
112
|
-
name:
|
|
112
|
+
name: name
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
115
|
}
|
|
@@ -175,10 +175,8 @@ class OctoPrintRoutes {
|
|
|
175
175
|
}
|
|
176
176
|
};
|
|
177
177
|
}
|
|
178
|
-
// Unused because we dont have any PUT/PATCH/POST with relevant data so far
|
|
179
178
|
_prepareJsonRequest(login, path, data, timeoutOverride) {
|
|
180
179
|
const { url, options } = this._prepareRequest(login, path, timeoutOverride);
|
|
181
|
-
// We must allow file uploads elsewhere, so be explicit about the content type and data in this JSON request
|
|
182
180
|
let serializedData = data ? JSON.stringify(data) : undefined;
|
|
183
181
|
options.headers[_octoprintserviceconstants.contentTypeHeaderKey] = _octoprintserviceconstants.jsonContentType;
|
|
184
182
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinterOperations","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","_settingsStore","_timeouts","constructor","settingsStore","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinterOperations","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","_settingsStore","_timeouts","constructor","settingsStore","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","_ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","_prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","_prepareAnonymousRequest","contentTypeHeaderKey","_prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"mappings":"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"}
|
|
@@ -8,10 +8,10 @@ Object.defineProperty(exports, "OctoPrintApiService", {
|
|
|
8
8
|
return OctoPrintApiService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _fs =
|
|
12
|
-
const _path =
|
|
13
|
-
const _formdata =
|
|
14
|
-
const _got =
|
|
11
|
+
const _fs = _interop_require_default(require("fs"));
|
|
12
|
+
const _path = _interop_require_default(require("path"));
|
|
13
|
+
const _formdata = _interop_require_default(require("form-data"));
|
|
14
|
+
const _got = _interop_require_default(require("got"));
|
|
15
15
|
const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
|
|
16
16
|
const _apiutils = require("./utils/api.utils");
|
|
17
17
|
const _eventconstants = require("../../constants/event.constants");
|
|
@@ -51,9 +51,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
51
51
|
const response = await this.axiosClient.post(url, data, options);
|
|
52
52
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
53
53
|
}
|
|
54
|
-
|
|
55
|
-
* Ability to start, cancel, restart, or pause a job
|
|
56
|
-
*/ async sendJobCommand(login, commandData, responseOptions) {
|
|
54
|
+
async sendJobCommand(login, commandData, responseOptions) {
|
|
57
55
|
const { url, options, data } = this._prepareJsonRequest(login, this.apiJob, commandData);
|
|
58
56
|
const response = await this.axiosClient.post(url, data, options);
|
|
59
57
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
@@ -95,11 +93,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
95
93
|
}
|
|
96
94
|
return opAdminUserName;
|
|
97
95
|
}
|
|
98
|
-
|
|
99
|
-
* @param {LoginDto} login
|
|
100
|
-
* @param responseOptions
|
|
101
|
-
* @returns {Promise<{data, status}|*>}
|
|
102
|
-
*/ async getUsers(login, responseOptions) {
|
|
96
|
+
async getUsers(login, responseOptions) {
|
|
103
97
|
const { url, options } = this._prepareRequest(login, this.apiUsers);
|
|
104
98
|
const response = await this.axiosClient.get(url, options);
|
|
105
99
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
@@ -110,7 +104,8 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
110
104
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
111
105
|
}
|
|
112
106
|
async getFile(login, path, responseOptions) {
|
|
113
|
-
const
|
|
107
|
+
const pathUrl = this.apiFile(path);
|
|
108
|
+
const { url, options } = this._prepareRequest(login, pathUrl);
|
|
114
109
|
const response = await this.axiosClient.get(url, options);
|
|
115
110
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
116
111
|
}
|
|
@@ -171,7 +166,6 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
171
166
|
this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(token)}`, token, p);
|
|
172
167
|
}
|
|
173
168
|
});
|
|
174
|
-
// Cleanup
|
|
175
169
|
if (isPhysicalFile) {
|
|
176
170
|
_fs.default.unlinkSync(fileStreamOrBuffer.path);
|
|
177
171
|
}
|
|
@@ -195,13 +189,6 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
195
189
|
});
|
|
196
190
|
}
|
|
197
191
|
}
|
|
198
|
-
// TODO implement when UI is ready, preferably using websocket stream and timing
|
|
199
|
-
// async getSoftwareUpdateCheck(login: LoginDto, responseOptions) {
|
|
200
|
-
// const { url, options } = this._prepareRequest(printer, this.pluginSoftwareUpdateCheck);
|
|
201
|
-
//
|
|
202
|
-
// const response = await this.axiosClient.get(url, options);
|
|
203
|
-
// return processResponse(response, responseOptions);
|
|
204
|
-
// }
|
|
205
192
|
async deleteFileOrFolder(login, path, responseOptions) {
|
|
206
193
|
const { url, options } = this._prepareRequest(login, this.apiFile(path));
|
|
207
194
|
const response = await this.axiosClient.delete(url, options);
|
|
@@ -217,9 +204,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
217
204
|
const response = await this.axiosClient.get(url, options);
|
|
218
205
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
219
206
|
}
|
|
220
|
-
|
|
221
|
-
* Based on https://github.com/OctoPrint/OctoPrint/blob/f430257d7072a83692fc2392c683ed8c97ae47b6/src/octoprint/plugins/softwareupdate/__init__.py#L1265
|
|
222
|
-
*/ async postSoftwareUpdate(login, targets, responseOptions) {
|
|
207
|
+
async postSoftwareUpdate(login, targets, responseOptions) {
|
|
223
208
|
const { url, options } = this._prepareJsonRequest(login, this.pluginSoftwareUpdateUpdate, {
|
|
224
209
|
targets
|
|
225
210
|
});
|
|
@@ -290,9 +275,7 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
290
275
|
const response = await this.axiosClient.get(url, options);
|
|
291
276
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
292
277
|
}
|
|
293
|
-
|
|
294
|
-
* Does not require printer login, much faster, requires internet connectivity
|
|
295
|
-
*/ async fetchOctoPrintPlugins(responseOptions) {
|
|
278
|
+
async fetchOctoPrintPlugins(responseOptions) {
|
|
296
279
|
const { url, options } = this._prepareAnonymousRequest(_octoprintserviceconstants.pluginRepositoryUrl);
|
|
297
280
|
const response = await this.axiosClient.get(url, options);
|
|
298
281
|
return (0, _apiutils.processResponse)(response, responseOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","login","responseOptions","url","options","_prepareRequest","apiLogin","response","post","processResponse","sendConnectionCommand","commandData","data","_prepareJsonRequest","apiConnection","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","command","sendJobCommand","apiJob","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","get","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getAdminUserOrDefault","getUsers","opAdminUserName","users","Array","isArray","adminUser","find","user","admin","apiUsers","getFiles","recursive","apiGetFiles","getFile","path","apiFile","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","print","selectCommand","uploadFileAsMultiPart","fileStreamOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","fs","createReadStream","filename","originalname","got","body","on","p","emit","uploadProgressEvent","unlinkSync","processGotResponse","e","failed","JSON","parse","ExternalServiceError","error","message","statusCode","success","stack","deleteFileOrFolder","delete","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","_prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","exclude","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","login","responseOptions","url","options","_prepareRequest","apiLogin","response","post","processResponse","sendConnectionCommand","commandData","data","_prepareJsonRequest","apiConnection","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","command","sendJobCommand","apiJob","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","get","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getAdminUserOrDefault","getUsers","opAdminUserName","users","Array","isArray","adminUser","find","user","admin","apiUsers","getFiles","recursive","apiGetFiles","getFile","path","pathUrl","apiFile","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","print","selectCommand","uploadFileAsMultiPart","fileStreamOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","fs","createReadStream","filename","originalname","got","body","on","p","emit","uploadProgressEvent","unlinkSync","processGotResponse","e","failed","JSON","parse","ExternalServiceError","error","message","statusCode","success","stack","deleteFileOrFolder","delete","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","_prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","exclude","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
|
|
@@ -40,7 +40,6 @@ const Message = {
|
|
|
40
40
|
plugin: "plugin",
|
|
41
41
|
timelapse: "timelapse",
|
|
42
42
|
slicingProgress: "slicingProgress",
|
|
43
|
-
// Custom events
|
|
44
43
|
WS_OPENED: "WS_OPENED",
|
|
45
44
|
WS_CLOSED: "WS_CLOSED",
|
|
46
45
|
WS_ERROR: "WS_ERROR",
|
|
@@ -109,9 +108,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
109
108
|
isClosedOrAborted() {
|
|
110
109
|
return this.socketState === SOCKET_STATE.closed || this.socketState === SOCKET_STATE.aborted;
|
|
111
110
|
}
|
|
112
|
-
|
|
113
|
-
* @param {CredentialsDto} socketLogin
|
|
114
|
-
*/ registerCredentials(socketLogin) {
|
|
111
|
+
registerCredentials(socketLogin) {
|
|
115
112
|
const { printerId, loginDto, protocol } = socketLogin;
|
|
116
113
|
this.printerId = printerId;
|
|
117
114
|
this.loginDto = loginDto;
|
|
@@ -139,19 +136,15 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
139
136
|
await this.sendAuth();
|
|
140
137
|
this.resetReauthRequired();
|
|
141
138
|
}
|
|
142
|
-
|
|
143
|
-
* Retrieve session token by authenticating with OctoPrint API
|
|
144
|
-
*/ async setupSocketSession() {
|
|
139
|
+
async setupSocketSession() {
|
|
145
140
|
this.resetSocketState();
|
|
146
141
|
this.sessionDto = await this.octoPrintApiService.login(this.loginDto).then((r)=>{
|
|
147
|
-
// Check response for red flags
|
|
148
142
|
if (r.name === "_api") {
|
|
149
143
|
this.setApiState(API_STATE.globalKey);
|
|
150
144
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
151
145
|
throw new _runtimeexceptions.ExternalServiceError("Global API Key detected, aborting socket connection");
|
|
152
146
|
} else if (r.needs?.group[0] === "guests") {
|
|
153
147
|
this.logger.warn("Detected group guests in OctoPrint login response, marking as unauthorized");
|
|
154
|
-
// This doesn't occur often (instead a 400 with CSRF failed is returned)
|
|
155
148
|
this.setApiState(API_STATE.authFail);
|
|
156
149
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
157
150
|
throw new _runtimeexceptions.ExternalServiceError("Guest group detected, authentication failed, aborting socket connection");
|
|
@@ -161,7 +154,6 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
161
154
|
return r;
|
|
162
155
|
}).catch((e)=>{
|
|
163
156
|
this.setSocketState(SOCKET_STATE.aborted);
|
|
164
|
-
// TODO improve error type detection
|
|
165
157
|
if (e instanceof _runtimeexceptions.ExternalServiceError) {
|
|
166
158
|
this.logger.warn(`Printer authorization error (id: ${this.printerId}), apiState: ${this.apiState}`);
|
|
167
159
|
throw e;
|
|
@@ -196,42 +188,29 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
196
188
|
throw e;
|
|
197
189
|
});
|
|
198
190
|
}
|
|
199
|
-
|
|
200
|
-
* @private
|
|
201
|
-
* @returns {Promise<void>}
|
|
202
|
-
*/ async afterOpened(event) {
|
|
191
|
+
async afterOpened(event) {
|
|
203
192
|
this.setSocketState(SOCKET_STATE.opened);
|
|
204
193
|
await this.sendAuth();
|
|
205
194
|
await this.sendThrottle(_serverconstants.AppConstants.defaultSocketThrottleRate);
|
|
206
195
|
}
|
|
207
|
-
|
|
208
|
-
* @private
|
|
209
|
-
* @returns {Promise<void>}
|
|
210
|
-
*/ async onMessage(message) {
|
|
196
|
+
async onMessage(message) {
|
|
211
197
|
this.lastMessageReceivedTimestamp = Date.now();
|
|
212
198
|
if (this.socketState !== SOCKET_STATE.authenticated) {
|
|
213
199
|
this.setSocketState(SOCKET_STATE.authenticated);
|
|
214
200
|
}
|
|
215
201
|
const data = JSON.parse(message);
|
|
216
|
-
|
|
217
|
-
* @type {Message}
|
|
218
|
-
*/ const eventName = Object.keys(data)[0];
|
|
202
|
+
const eventName = Object.keys(data)[0];
|
|
219
203
|
const payload = data[eventName];
|
|
220
204
|
if (eventName === Message.reauthRequired) {
|
|
221
205
|
this.setReauthRequired();
|
|
222
206
|
}
|
|
223
|
-
// Emit the message to the event bus
|
|
224
207
|
await this.emitEvent(eventName, payload);
|
|
225
208
|
}
|
|
226
|
-
|
|
227
|
-
* @private
|
|
228
|
-
* @returns {Promise<void>}
|
|
229
|
-
*/ async sendAuth() {
|
|
209
|
+
async sendAuth() {
|
|
230
210
|
this.setSocketState(SOCKET_STATE.authenticating);
|
|
231
211
|
await this.sendMessage(JSON.stringify({
|
|
232
212
|
auth: `${this.username}:${this.sessionDto.session}`
|
|
233
213
|
}));
|
|
234
|
-
// TODO what if bad auth? => pure silence right?
|
|
235
214
|
}
|
|
236
215
|
async afterClosed(event) {
|
|
237
216
|
this.setSocketState(SOCKET_STATE.closed);
|
|
@@ -254,10 +233,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
254
233
|
this.setSocketState(SOCKET_STATE.unopened);
|
|
255
234
|
this.setApiState(API_STATE.unset);
|
|
256
235
|
}
|
|
257
|
-
|
|
258
|
-
* @private
|
|
259
|
-
* @param {API_STATE} state
|
|
260
|
-
*/ setApiState(state) {
|
|
236
|
+
setApiState(state) {
|
|
261
237
|
this.apiState = state;
|
|
262
238
|
this.apiStateUpdated = true;
|
|
263
239
|
this.apiStateUpdateTimestamp = Date.now();
|
|
@@ -266,10 +242,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
266
242
|
}
|
|
267
243
|
this.emitEventSync(Message.API_STATE_UPDATED, state);
|
|
268
244
|
}
|
|
269
|
-
|
|
270
|
-
* @private
|
|
271
|
-
* @param {SOCKET_STATE} state
|
|
272
|
-
*/ setSocketState(state) {
|
|
245
|
+
setSocketState(state) {
|
|
273
246
|
this.socketState = state;
|
|
274
247
|
this.stateUpdated = true;
|
|
275
248
|
this.stateUpdateTimestamp = Date.now();
|
|
@@ -278,14 +251,8 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
278
251
|
}
|
|
279
252
|
this.emitEventSync(Message.WS_STATE_UPDATED, state);
|
|
280
253
|
}
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
* @param {Message} event
|
|
284
|
-
* @param {?Object} payload
|
|
285
|
-
*/ async emitEvent(event, payload) {
|
|
286
|
-
/**
|
|
287
|
-
* @type {OctoPrintEventDto}
|
|
288
|
-
*/ const data = {
|
|
254
|
+
async emitEvent(event, payload) {
|
|
255
|
+
const data = {
|
|
289
256
|
event,
|
|
290
257
|
payload,
|
|
291
258
|
printerId: this.printerId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","afterOpened","onMessage","message","Date","now","data","parse","eventName","Object","keys","payload","setReauthRequired","emitEvent","auth","session","afterClosed","onError","state","log","emitEventSync","emitAsync","emit"],"mappings":";;;;;;;;;;;IAkEaA,SAAS;eAATA;;IA7BAC,OAAO;eAAPA;;IAuCAC,sBAAsB;eAAtBA;;IArBAC,YAAY;eAAZA;;IAmBAC,cAAc;eAAdA;;;kCA1EoB;0CACF;iCACF;mCACQ;0BACT;8BACC;AAgCtB,MAAMH,UAAU;IACrBI,WAAW;IACXC,gBAAgB;IAChBC,SAAS;IACTC,SAAS;IACTC,OAAO;IACPC,QAAQ;IACRC,WAAW;IACXC,iBAAiB;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","Message","OctoPrintSockIoAdapter","SOCKET_STATE","octoPrintEvent","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","printerId","loginDto","socketURL","sessionDto","username","octoPrintApiService","eventEmitter","logger","configService","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","_","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","afterOpened","onMessage","message","Date","now","data","parse","eventName","Object","keys","payload","setReauthRequired","emitEvent","auth","session","afterClosed","onError","state","log","emitEventSync","emitAsync","emit"],"mappings":"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"}
|
|
@@ -11,7 +11,6 @@ Object.defineProperty(exports, "PluginBaseService", {
|
|
|
11
11
|
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
12
12
|
const _octoprintserviceconstants = require("./constants/octoprint-service.constants");
|
|
13
13
|
class PluginBaseService {
|
|
14
|
-
// https://github.com/OctoPrint/OctoPrint/blob/76e87ba81329e6ce761c9307d3e80c291000871e/src/octoprint/plugins/pluginmanager/__init__.py#L609
|
|
15
14
|
octoPrintApiService;
|
|
16
15
|
pluginRepositoryCache;
|
|
17
16
|
_pluginName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoPrintApiService","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postSystemRestartCommand"],"mappings":";;;;+BAQaA;;;eAAAA;;;mCARgD;2CACvB;AAO/B,MAAMA;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/plugin-base.service.ts"],"names":["PluginBaseService","octoPrintApiService","pluginRepositoryCache","_pluginName","_pluginUrl","logger","constructor","loggerFactory","pluginName","pluginUrl","pluginReference","getPlugin","archive","ValidationException","isPluginUpToDate","printerLogin","response","queryInstalledPlugin","result","github","latest_release","name","version","getPluginManagerPlugin","InternalServerException","plugin","isPluginInstalled","foundPlugin","findPluginFromListQuery","getPluginManagerPlugins","plugins","length","findPluginInList","pluginList","find","p","key","toLowerCase","updatePlugin","login","postSoftwareUpdate","installPlugin","restartAfter","command","pluginManagerCommands","install","postApiPluginManagerCommand","conditionalRestartCommand","uninstallPlugin","uninstall","enablePlugin","enable","disablePlugin","disable","cleanupPlugin","cleanup","cleanupAllPlugins","cleanup_all","postSystemRestartCommand"],"mappings":"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"}
|
|
@@ -58,7 +58,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
|
58
58
|
throw new _runtimeexceptions.ValidationException("No firmware releases were scanned. Download was not successful");
|
|
59
59
|
}
|
|
60
60
|
const latestFirmware = this.prusaFirmwareReleases[0];
|
|
61
|
-
// Download the latest firmware asset
|
|
62
61
|
const firmwareAsset = latestFirmware.assets.find((asset)=>asset.name.includes("MK3S_MK3S+"));
|
|
63
62
|
const downloadUrl = firmwareAsset.browser_download_url;
|
|
64
63
|
const downloadName = firmwareAsset.name;
|
|
@@ -74,7 +73,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
|
74
73
|
async getPrinterFirmwareVersion(printerLogin) {
|
|
75
74
|
const response = await this.octoPrintApiService.getSystemInfo(printerLogin);
|
|
76
75
|
const systemInfo = response.systeminfo;
|
|
77
|
-
// @todo If this fails, the printer most likely is not connected...
|
|
78
76
|
if (!Object.keys(systemInfo).includes(connectivityProp) || !Object.keys(systemInfo).includes(firmwareProp)) {
|
|
79
77
|
throw new _runtimeexceptions.ValidationException("Could not retrieve printer firmware version as the OctoPrint response was not recognized. Is it connected?");
|
|
80
78
|
}
|
|
@@ -96,7 +94,6 @@ class PluginFirmwareUpdateService extends _pluginbaseservice.PluginBaseService {
|
|
|
96
94
|
}
|
|
97
95
|
async flashPrusaFirmware(currentPrinterId, printerLogin) {
|
|
98
96
|
const latestHexFilePath = this.multerService.getNewestFile(firmwareDownloadPath);
|
|
99
|
-
// todo setup BG task to track progress
|
|
100
97
|
return await this.octoPrintApiService.postPluginFirmwareUpdateFlash(currentPrinterId, printerLogin, latestHexFilePath);
|
|
101
98
|
}
|
|
102
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","octoPrintApiService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":";;;;+BAyBaA;;;eAAAA;;;mCAzBqB;mCACE;iDACW;AAS/C,MAAMC,SAAS;IACbC,YAAY;IACZC,WAAW;AACb;AAEA,MAAMC,eAAe;IACnBC,oBAAoB;IACpBC,mBAAmB;AACrB;AAEA,MAAMC,mBAAmB;AACzB,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAEtB,MAAMT,oCAAoCU,oCAAiB;IAChEC,oBAAyC;IACzCC,cAA6B;IACrBC,cAA6B;IAE7BC,sBAAsB;IACtBC,eAAe;IAEvBC,YAAY,EACVL,mBAAmB,EACnBM,qBAAqB,EACrBL,aAAa,EACbC,aAAa,EACbK,aAAa,EAOd,CAAE;QACD,KAAK,CAAC;YAAEP;YAAqBM;YAAuBC;QAAc,GAAGjB;QACrE,IAAI,CAACU,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAMM,wCAAwC;QAC5C,IAAI;YACF,MAAMC,WAAW,MAAM,IAAI,CAACR,aAAa,CAACS,WAAW,CAACjB,aAAaC,kBAAkB,EAAED,aAAaE,iBAAiB;YACrH,IAAI,CAACQ,qBAAqB,GAAGM,SAASE,IAAI;QAC5C,EAAE,OAAOC,GAAG;YACV,OAAO,IAAI,CAACC,MAAM,CAACC,KAAK,CAAC;QAC3B;QAEA,IAAI,CAAC,IAAI,CAACX,qBAAqB,EAAEY,QAAQ,OAAO,EAAE;QAElD,IAAI,CAACX,cAAc,GAAG,IAAI,CAACD,qBAAqB,CAAC,EAAE;QACnD,IAAI,CAACU,MAAM,CAACG,GAAG,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAACb,qBAAqB,EAAEY,UAAU,IAAI,kBAAkB,CAAC,EAAE;YACzGE,KAAK,IAAI,CAACb,cAAc,CAACa,GAAG;YAC5BC,UAAU,IAAI,CAACd,cAAc,CAACc,QAAQ;QACxC;QAEA,OAAO,IAAI,CAACf,qBAAqB;IACnC;IAEA,MAAMgB,mBAAmB;QACvB,IAAI,CAAC,IAAI,CAAChB,qBAAqB,EAAEY,UAAU,CAAC,IAAI,CAACX,cAAc,EAAE;YAC/D,MAAM,IAAIgB,sCAAmB,CAAC;QAChC;QAEA,MAAMhB,iBAAiB,IAAI,CAACD,qBAAqB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/plugin-firmware-update.service.ts"],"names":["PluginFirmwareUpdateService","config","pluginName","pluginUrl","defaultRepos","prusaFirmwareOwner","prusaFirmwareRepo","connectivityProp","firmwareProp","firmwareDownloadPath","PluginBaseService","octoPrintApiService","githubService","multerService","prusaFirmwareReleases","latestFirmware","constructor","pluginRepositoryCache","loggerFactory","queryGithubPrusaFirmwareReleasesCache","response","getReleases","data","e","logger","error","length","log","url","tag_name","downloadFirmware","ValidationException","firmwareAsset","assets","find","asset","name","includes","downloadUrl","browser_download_url","downloadName","fileExists","downloadFile","getPrinterFirmwareVersion","printerLogin","getSystemInfo","systemInfo","systeminfo","Object","keys","connected","firmware","getPluginFirmwareStatus","getPluginFirmwareUpdateStatus","configureFirmwareUpdaterSettings","updateFirmwareUpdaterSettings","defaultFirmwareUpdaterSettings","flashPrusaFirmware","currentPrinterId","latestHexFilePath","getNewestFile","postPluginFirmwareUpdateFlash"],"mappings":"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"}
|