@fdm-monster/server 1.5.3 → 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 +0 -1
- 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 -3
- package/dist/constants/service.constants.js.map +1 -1
- package/dist/container.js +4 -10
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -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/custom-gcode.controller.js +1 -3
- package/dist/controllers/custom-gcode.controller.js.map +1 -1
- package/dist/controllers/floor.controller.js +0 -5
- 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 -3
- package/dist/controllers/print-completion.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +19 -38
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +7 -25
- 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 +1 -10
- package/dist/controllers/user.controller.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 +0 -2
- 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 +0 -4
- 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/Printer.js +0 -3
- 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 +0 -5
- package/dist/mongo-migrations/20231111081809-printer-flatten-name.js.map +1 -1
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js +0 -5
- package/dist/mongo-migrations/20231111082521-printer-remove-settingsappearance.js.map +1 -1
- 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 +4 -16
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -7
- 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 +0 -1
- package/dist/services/authentication/jwt.service.js.map +1 -1
- package/dist/services/authentication/refresh-token.service.js +0 -3
- package/dist/services/authentication/refresh-token.service.js.map +1 -1
- package/dist/services/authentication/user.service.js +0 -4
- 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 +0 -1
- 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 +0 -7
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +2 -43
- package/dist/services/floor.service.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/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 +0 -2
- 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.shared.js +0 -1
- package/dist/services/print-completion.shared.js.map +1 -1
- 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 +2 -13
- 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 +3 -3
- package/dist/services/validators/floor-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +0 -3
- 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 +1 -8
- 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} +11 -25
- 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 +0 -1
- 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 +0 -4
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +12 -20
- 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/websocket.adapter.js +8 -54
- package/dist/utils/websocket.adapter.js.map +1 -1
- package/package.json +23 -23
- package/dist/state/files.store.js.map +0 -1
|
@@ -25,7 +25,6 @@ class SettingsStore {
|
|
|
25
25
|
const settings = this.settings;
|
|
26
26
|
if (!settings) throw new _runtimeexceptions.InternalServerException("Could not check server settings (server settings not loaded");
|
|
27
27
|
return Object.freeze({
|
|
28
|
-
// Credential settings are not shared with the client
|
|
29
28
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
30
29
|
loginRequired: settings[_serversettingsconstants.serverSettingsKey].loginRequired,
|
|
31
30
|
registration: settings[_serversettingsconstants.serverSettingsKey].registration,
|
|
@@ -54,7 +53,6 @@ class SettingsStore {
|
|
|
54
53
|
});
|
|
55
54
|
}
|
|
56
55
|
async loadSettings() {
|
|
57
|
-
// Setup Settings as connection is established
|
|
58
56
|
this.settings = await this.settingsService.getOrCreate();
|
|
59
57
|
await this.processSentryEnabled();
|
|
60
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":";;;;+BAwBaA;;;eAAAA;;;mCAxB2B;yCAQjC;sBACuB;0BACI;iCACL;AAatB,MAAMA;IACHC,gBAAkC;IAClCC,OAAsB;IACtBC,WAA6B,KAAK;IAE1CC,YAAY,EAAEH,eAAe,EAAEI,aAAa,EAAwE,CAAE;QACpH,IAAI,CAACJ,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGG,cAAcL,cAAcM,IAAI;IAChD;IAEAC,cAAc;QACZ,MAAMJ,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIK,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","settingsService","logger","settings","constructor","loggerFactory","name","getSettings","InternalServerException","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","wizardSettingKey","frontendSettingKey","fileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","debugSettings","whitelistEnabled","whitelistedIpAddresses","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","updateCredentialSettings","jwtSecret","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","getServerSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","patchWizardSettings","wizardCompletedAt","Date","setRegistrationEnabled","patchServerSettings","getLoginRequired","setLoginRequired","setWhitelist","updateServerSettings","serverSettings","updateTimeoutSettings","timeoutSettings","patchFileCleanSettings","fileClean","credentialSettings","patchCredentialSettings","setSentryDiagnosticsEnabled","updateFrontendSettings","frontendSettings","sentryEnabled","log","isTestEnvironment","getCurrentHub","getClient","getOptions","enabled"],"mappings":";;;;+BAwBaA;;;eAAAA;;;mCAxB2B;yCAQjC;sBACuB;0BACI;iCACL;AAatB,MAAMA;IACHC,gBAAkC;IAClCC,OAAsB;IACtBC,WAA6B,KAAK;IAE1CC,YAAY,EAAEH,eAAe,EAAEI,aAAa,EAAwE,CAAE;QACpH,IAAI,CAACJ,eAAe,GAAGA;QACvB,IAAI,CAACC,MAAM,GAAGG,cAAcL,cAAcM,IAAI;IAChD;IAEAC,cAAc;QACZ,MAAMJ,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIK,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YAEnB,CAACC,0CAAiB,CAAC,EAAE;gBACnBC,eAAeT,QAAQ,CAACQ,0CAAiB,CAAC,CAACC,aAAa;gBACxDC,cAAcV,QAAQ,CAACQ,0CAAiB,CAAC,CAACE,YAAY;gBACtDC,0BAA0BX,QAAQ,CAACQ,0CAAiB,CAAC,CAACG,wBAAwB;YAChF;YACA,CAACC,yCAAgB,CAAC,EAAEZ,QAAQ,CAACY,yCAAgB,CAAC;YAC9C,CAACC,2CAAkB,CAAC,EAAEb,QAAQ,CAACa,2CAAkB,CAAC;YAClD,CAACC,4CAAmB,CAAC,EAAEd,QAAQ,CAACc,4CAAmB,CAAC;YACpD,CAACC,0CAAiB,CAAC,EAAEf,QAAQ,CAACe,0CAAiB,CAAC;QAClD;IACF;IAEAC,uBAAuB;QACrB,MAAMhB,WAAW,IAAI,CAACA,QAAQ;QAC9B,IAAI,CAACA,UAAU,MAAM,IAAIK,0CAAuB,CAAC;QACjD,OAAOC,OAAOC,MAAM,CAAC;YACnB,CAACU,8CAAqB,CAAC,EAAE;gBACvBC,cAAclB,QAAQ,CAACiB,8CAAqB,CAAC,CAACC,YAAY;gBAC1DC,sBAAsBnB,QAAQ,CAACiB,8CAAqB,CAAC,CAACE,oBAAoB;gBAC1EC,oBAAoBpB,QAAQ,CAACiB,8CAAqB,CAAC,CAACG,kBAAkB;YACxE;YACA,CAACZ,0CAAiB,CAAC,EAAE;gBACnBa,eAAerB,QAAQ,CAACQ,0CAAiB,CAAC,CAACa,aAAa;gBACxDC,kBAAkBtB,QAAQ,CAACQ,0CAAiB,CAAC,CAACc,gBAAgB;gBAC9DC,wBAAwBvB,QAAQ,CAACQ,0CAAiB,CAAC,CAACe,sBAAsB;YAC5E;QACF;IACF;IAEA,MAAMC,eAAe;QAEnB,IAAI,CAACxB,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC2B,WAAW;QACtD,MAAM,IAAI,CAACC,oBAAoB;IACjC;IAEA,MAAMC,wBAAwB;QAC5B,OAAO,IAAI,CAAC3B,QAAQ,CAACiB,8CAAqB,CAAC;IAC7C;IAEA,MAAMW,iCAAiC;QACrC,OAAO,IAAI,CAAC5B,QAAQ,CAACQ,0CAAiB,CAAC,CAACG,wBAAwB;IAClE;IAEA,MAAMkB,kCAAkCC,iBAAyB,EAAEC,oBAA4B,EAAE;QAC/F,IAAID,mBAAmB;YACrB,MAAM,IAAI,CAACE,wBAAwB,CAAC;gBAClCC,WAAWH;YACb;QACF;QACA,IAAIC,sBAAsB;YACxB,MAAM,IAAI,CAACC,wBAAwB,CAAC;gBAClCd,cAAcgB,SAASH;YACzB;QACF;IACF;IAEAI,iBAAiB;QACf,OAAO;YACLC,iBAAiB,IAAI,CAACpC,QAAQ,CAACY,yCAAgB,CAAC,CAACwB,eAAe;YAChEC,eAAe,IAAI,CAACrC,QAAQ,CAACY,yCAAgB,CAAC,CAACyB,aAAa;YAC5DC,qBAAqBC,6BAAY,CAACC,oBAAoB;QACxD;IACF;IAEAC,oBAAoB;QAClB,OACE,IAAI,CAACzC,QAAQ,CAACY,yCAAgB,CAAC,CAACwB,eAAe,IAC/C,IAAI,CAACpC,QAAQ,CAACY,yCAAgB,CAAC,CAACyB,aAAa,KAAKE,6BAAY,CAACC,oBAAoB;IAEvF;IAEAE,oBAAoB;QAClB,OAAO,IAAI,CAAC1C,QAAQ,CAACY,yCAAgB,CAAC;IACxC;IAEA+B,wBAAwB;QACtB,IAAI,CAAC,IAAI,CAAC3C,QAAQ,EAAE,MAAM,IAAIK,0CAAuB,CAAC;QACtD,OAAO,IAAI,CAACL,QAAQ,CAACQ,0CAAiB,CAAC,CAACE,YAAY;IACtD;IAEAkC,oBAAoB;QAClB,OAAO,IAAI,CAACxC,WAAW,EAAE,CAACI,0CAAiB,CAAC;IAC9C;IAEAqC,sBAAsB;QACpB,OAAO,IAAI,CAACzC,WAAW,EAAE,CAACS,2CAAkB,CAAC;IAC/C;IAEAiC,uBAAuB;QACrB,OAAO,IAAI,CAAC1C,WAAW,EAAE,CAACU,4CAAmB,CAAC;IAChD;IAEAiC,8BAA8B;QAC5B,OAAO,IAAI,CAAC3C,WAAW,EAAE,CAACU,4CAAmB,CAAC,EAAEkC;IAClD;IAEA,MAAMC,mBAAmBC,OAAe,EAAE;QACxC,IAAI,CAAClD,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACqD,mBAAmB,CAAC;YAC7Df,iBAAiB;YACjBgB,mBAAmB,IAAIC;YACvBhB,eAAea;QACjB;QACA,OAAO,IAAI,CAAC9C,WAAW;IACzB;IAEA,MAAMkD,uBAAuB5C,eAAe,IAAI,EAAE;QAChD,IAAI,CAACV,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyD,mBAAmB,CAAC;YAC7D7C;QACF;QACA,OAAO,IAAI,CAACN,WAAW;IACzB;IAEA,MAAMoD,mBAAmB;QACvB,OAAO,IAAI,CAACZ,iBAAiB,GAAGnC,aAAa;IAC/C;IAEA,MAAMgD,iBAAiBhD,gBAAgB,IAAI,EAAE;QAC3C,IAAI,CAACT,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyD,mBAAmB,CAAC;YAC7D9C;QACF;QACA,OAAO,IAAI,CAACL,WAAW;IACzB;IAEA,MAAMsD,aAAapC,mBAAmB,IAAI,EAAEC,sBAAgC,EAAE;QAC5E,IAAI,CAACvB,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyD,mBAAmB,CAAC;YAC7DjC;YACAC;QACF;QACA,OAAO,IAAI,CAACnB,WAAW;IACzB;IAEA,MAAMuD,qBAAqBC,cAA0C,EAAE;QACrE,IAAI,CAAC5D,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyD,mBAAmB,CAACK;QAC/D,OAAO,IAAI,CAACxD,WAAW;IACzB;IAEA,MAAMyD,sBAAsBC,eAAmC,EAAE;QAC/D,IAAI,CAAC9D,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAAC+D,qBAAqB,CAACC;QACjE,OAAO,IAAI,CAAC1D,WAAW;IACzB;IAEA,MAAM2D,uBAAuBC,SAAwC,EAAE;QACrE,IAAI,CAAChE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACiE,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAAC5D,WAAW;IACzB;IAEA,MAAM4B,yBAAyBiC,kBAAkD,EAAE;QACjF,IAAI,CAACjE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACoE,uBAAuB,CAACD;QACnE,OAAO,IAAI,CAAC7D,WAAW;IACzB;IAEA,MAAM+D,4BAA4BxD,wBAAiC,EAAE;QACnE,IAAI,CAACX,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACyD,mBAAmB,CAAC;YAC7D5C;QACF;QACA,MAAM,IAAI,CAACe,oBAAoB;QAC/B,OAAO,IAAI,CAACtB,WAAW;IACzB;IAEA,MAAMgE,uBAAuBC,gBAAqC,EAAE;QAClE,IAAI,CAACrE,QAAQ,GAAG,MAAM,IAAI,CAACF,eAAe,CAACsE,sBAAsB,CAACC;QAClE,OAAO,IAAI,CAACjE,WAAW;IACzB;IAEA,MAAcsB,uBAAuB;QACnC,MAAM4C,gBAAgB,MAAM,IAAI,CAAC1C,8BAA8B;QAC/D,IAAI0C,eAAe;YACjB,IAAI,CAACvE,MAAM,CAACwE,GAAG,CAAC;QAClB,OAAO;YACL,IAAI,CAACxE,MAAM,CAACwE,GAAG,CAAC;QAClB;QAEA,IAAIC,IAAAA,2BAAiB,KAAI;QACzBC,IAAAA,mBAAa,IAAGC,SAAS,GAAIC,UAAU,GAAGC,OAAO,GAAGN;IACtD;AACF"}
|
|
@@ -24,10 +24,8 @@ const authorize = (settingsStore, options, verify)=>{
|
|
|
24
24
|
const strategy = new _passportjwt.Strategy(options, verify);
|
|
25
25
|
return async function authorizeCallback(socket, next) {
|
|
26
26
|
if (!await settingsStore.getLoginRequired()) {
|
|
27
|
-
// No login required, so we can skip the authentication
|
|
28
27
|
return next();
|
|
29
28
|
}
|
|
30
|
-
// --- Begin strategy augmentation ala passport
|
|
31
29
|
strategy.success = function success(user) {
|
|
32
30
|
socket.handshake.user = user;
|
|
33
31
|
next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;
|
|
1
|
+
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","authorize","settingsStore","options","verify","strategy","JwtStrategy","authorizeCallback","socket","next","getLoginRequired","success","user","handshake","fail","info","Error","error","authenticate","logger","eventEmitter2","io","authService","configService","userService","constructor","loggerFactory","name","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","auth","token","verifyUserCallback","use","on","onConnect","bind","log","id","emit","socketIoConnectedEvent","send","event","data","debug","getServerSettings","debugSettings","debugSocketIoEvents","LegacyUpdate","LegacyPrinterTest","CompletionEvent","HostState","ApiAccessibility"],"mappings":";;;;;;;;;;;IA0GaA,WAAW;eAAXA;;IAhEAC,eAAe;eAAfA;;;0BA1CkB;gCACQ;0BAOmB;6BAEiB;AAK3E,MAAMC,YAAY,CAChBC,eACAC,SACAC;IAEA,MAAMC,WAAW,IAAIC,qBAAW,CAACH,SAASC;IAE1C,OAAO,eAAeG,kBACpBC,MAAyE,EACzEC,IAAmC;QAEnC,IAAI,CAAE,MAAMP,cAAcQ,gBAAgB,IAAK;YAE7C,OAAOD;QACT;QAEAJ,SAASM,OAAO,GAAG,SAASA,QAAQC,IAAI;YACtCJ,OAAOK,SAAS,CAACD,IAAI,GAAGA;YACxBH;QACF;QACAJ,SAASS,IAAI,GAAG,CAACC,OAASN,KAAK,IAAIO,MAAMD;QACzCV,SAASY,KAAK,GAAG,CAACA,QAAUR,KAAKQ;QAEjCZ,SAASa,YAAY,CAACV,QAAQ,CAAC;IACjC;AACF;AAEO,MAAMR;IACXmB,OAAsB;IACtBC,cAA6B;IAC7BC,GAAW;IAEXC,YAAyB;IACzBpB,cAA6B;IAC7BqB,cAA8B;IAC9BC,YAA0B;IAE1BC,YAAY,EACVC,aAAa,EACbN,aAAa,EACblB,aAAa,EACboB,WAAW,EACXC,aAAa,EACbC,WAAW,EAQZ,CAAE;QACD,IAAI,CAACL,MAAM,GAAGO,cAAc1B,gBAAgB2B,IAAI;QAChD,IAAI,CAACP,aAAa,GAAGA;QACrB,IAAI,CAAClB,aAAa,GAAGA;QACrB,IAAI,CAACoB,WAAW,GAAGA;QACnB,IAAI,CAACE,WAAW,GAAGA;QACnB,IAAI,CAACD,aAAa,GAAGA;IACvB;IAEAK,aAAaC,UAAuB,EAAE;QACpC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAAC,IAAI,CAAChC,aAAa,EAAE,IAAI,CAACqB,aAAa,EAAE,CAACY,QAAkBA,MAAMtB,SAAS,CAACuB,IAAI,CAACC,KAAK;QACxH,MAAMjC,SAASkC,IAAAA,4BAAkB,EAAC,IAAI,CAACd,WAAW;QAClD,IAAI,CAACH,EAAE,CAACkB,GAAG,CAACtC,UAAU,IAAI,CAACC,aAAa,EAAE+B,MAAM7B;QAChD,IAAI,CAACiB,EAAE,CAACmB,EAAE,CAAC,cAAc,CAAChC,SAAW,IAAI,CAACiC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAElC;IACjE;IAEAiC,UAAUjC,MAAc,EAAE;QACxB,IAAI,CAACW,MAAM,CAACwB,GAAG,CAAC,6BAA6BnC,OAAOoC,EAAE;QAEtD,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEtC,OAAOoC,EAAE;QAEzDpC,OAAOgC,EAAE,CAAC,cAAc;YACtB,IAAI,CAACrB,MAAM,CAACwB,GAAG,CAAC,gCAAgCnC,OAAOoC,EAAE;QAC3D;IACF;IAEAG,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAC5B,EAAE,EAAE;YACZ,IAAI,CAACF,MAAM,CAAC+B,KAAK,CAAC;YAClB;QACF;QAEA,IAAI,IAAI,CAAChD,aAAa,CAACiD,iBAAiB,GAAGC,aAAa,EAAEC,qBAAqB;YAC7E,IAAI,CAAClC,MAAM,CAACwB,GAAG,CAAC,CAAC,cAAc,EAAEK,MAAM,CAAC;QAC1C;QACA,IAAI,CAAC3B,EAAE,CAACwB,IAAI,CAACG,OAAOC;IACtB;AACF;AAEO,MAAMlD,cAAc;IACzBuD,cAAc;IACdC,mBAAmB;IACnBC,iBAAiB;IACjBC,WAAW;IACXC,kBAAkB;AACpB"}
|
|
@@ -23,21 +23,15 @@ class TestPrinterSocketStore {
|
|
|
23
23
|
this.socketIoGateway = socketIoGateway;
|
|
24
24
|
this.eventEmitter2 = eventEmitter2;
|
|
25
25
|
}
|
|
26
|
-
|
|
27
|
-
* Sets up/recreates a printer to be tested quickly by running the standard checks
|
|
28
|
-
* @param printer
|
|
29
|
-
* @returns {Promise<*>}
|
|
30
|
-
*/ async setupTestPrinter(printer) {
|
|
26
|
+
async setupTestPrinter(printer) {
|
|
31
27
|
if (this.testSocket) {
|
|
32
28
|
this.testSocket.close();
|
|
33
29
|
this.testSocket = null;
|
|
34
30
|
}
|
|
35
31
|
const validatedData = await (0, _validators.validateInput)(printer, _createtestprintervalidation.createTestPrinterRules);
|
|
36
32
|
validatedData.enabled = true;
|
|
37
|
-
// Create a new socket if it doesn't exist
|
|
38
33
|
const { correlationToken } = printer;
|
|
39
34
|
this.testSocket = this.socketFactory.createInstance();
|
|
40
|
-
// Reset the socket credentials before (re-)connecting
|
|
41
35
|
this.testSocket.registerCredentials({
|
|
42
36
|
printerId: correlationToken,
|
|
43
37
|
loginDto: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;
|
|
1
|
+
{"version":3,"sources":["../../src/state/test-printer-socket.store.ts"],"names":["TestPrinterSocketStore","testSocket","socketIoGateway","socketFactory","eventEmitter2","constructor","setupTestPrinter","printer","close","validatedData","validateInput","createTestPrinterRules","enabled","correlationToken","createInstance","registerCredentials","printerId","loginDto","apiKey","printerURL","protocol","testEvents","octoPrintEvent","Message","WS_STATE_UPDATED","API_STATE_UPDATED","WS_CLOSED","WS_OPENED","WS_ERROR","listener","event","payload","send","forEach","te","on","setupSocketSession","promise","Promise","resolve","reject","open","startTime","setInterval","socketState","SOCKET_STATE","authenticated","race","setTimeout","AppConstants","defaultWebsocketHandshakeTimeout","off"],"mappings":";;;;+BASaA;;;eAAAA;;;0BAT2B;4BACV;6CACS;wCACuC;iCACjD;AAKtB,MAAMA;IACXC,WAAmC;IACnCC,gBAAiC;IACjCC,cAA6B;IAC7BC,cAA6B;IAC7BC,YAAY,EACVF,aAAa,EACbD,eAAe,EACfE,aAAa,EAKd,CAAE;QACD,IAAI,CAACD,aAAa,GAAGA;QACrB,IAAI,CAACD,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;IACvB;IAOA,MAAME,iBAAiBC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAACN,UAAU,EAAE;YACnB,IAAI,CAACA,UAAU,CAACO,KAAK;YACrB,IAAI,CAACP,UAAU,GAAG;QACpB;QAEA,MAAMQ,gBAAgB,MAAMC,IAAAA,yBAAa,EAACH,SAASI,mDAAsB;QACzEF,cAAcG,OAAO,GAAG;QAGxB,MAAM,EAAEC,gBAAgB,EAAE,GAAGN;QAC7B,IAAI,CAACN,UAAU,GAAG,IAAI,CAACE,aAAa,CAACW,cAAc;QAGnD,IAAI,CAACb,UAAU,CAACc,mBAAmB,CAAC;YAClCC,WAAWH;YACXI,UAAU;gBACRC,QAAQX,QAAQW,MAAM;gBACtBC,YAAYZ,QAAQY,UAAU;YAChC;YACAC,UAAU;QACZ;QAEA,MAAMC,aAAa;YACjBC,IAAAA,sCAAc,EAACC,+BAAO,CAACC,gBAAgB;YACvCF,IAAAA,sCAAc,EAACC,+BAAO,CAACE,iBAAiB;YACxCH,IAAAA,sCAAc,EAACC,+BAAO,CAACG,SAAS;YAChCJ,IAAAA,sCAAc,EAACC,+BAAO,CAACI,SAAS;YAChCL,IAAAA,sCAAc,EAACC,+BAAO,CAACK,QAAQ;SAChC;QACD,MAAMC,WAAW,CAAC,EAAEC,KAAK,EAAEC,OAAO,EAAEf,SAAS,EAAE;YAC7C,IAAIA,cAAcH,kBAAkB;gBAClC;YACF;YACA,IAAI,CAACX,eAAe,CAAC8B,IAAI,CAAC,sBAAsB;gBAC9CF;gBACAC;gBACAlB;YACF;QACF;QACAQ,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+B,EAAE,CAACD,IAAIL;QAC5B;QACA,MAAM,IAAI,CAAC5B,UAAU,CAACmC,kBAAkB;QAExC,MAAMC,UAAU,IAAIC,QAAQ,OAAOC,SAASC;YAC1C,IAAI,CAACvC,UAAU,CAACwC,IAAI;YACpB,WAAW,MAAMC,aAAaC,IAAAA,qBAAW,EAAC,KAAM;gBAC9C,IAAI,CAAC,IAAI,CAAC1C,UAAU,EAAE;oBACpB;gBACF;gBACA,IAAI,IAAI,CAACA,UAAU,CAAC2C,WAAW,KAAKC,oCAAY,CAACC,aAAa,EAAE;oBAC9DP;oBACA;gBACF;YACF;QACF;QAEA,MAAMD,QAAQS,IAAI,CAAC;YAACV;YAASW,IAAAA,oBAAU,EAACC,6BAAY,CAACC,gCAAgC;SAAE;QACvF,IAAI,CAACjD,UAAU,CAACO,KAAK;QACrB,OAAO,IAAI,CAACP,UAAU;QACtBoB,WAAWY,OAAO,CAAC,CAACC;YAClB,IAAI,CAAC9B,aAAa,CAAC+C,GAAG,CAACjB,IAAIL;QAC7B;IACF;AACF"}
|
package/dist/task.presets.js
CHANGED
|
@@ -1,14 +1,3 @@
|
|
|
1
|
-
// Test or example task
|
|
2
|
-
// TaskManager.registerPeriodicJob(
|
|
3
|
-
// "unique_test_task1",
|
|
4
|
-
// async () => {
|
|
5
|
-
// await new Promise((resolve) => {
|
|
6
|
-
// setTimeout(() => resolve(), 9000);
|
|
7
|
-
// });
|
|
8
|
-
// },
|
|
9
|
-
// {
|
|
10
|
-
// PERIODIC_TASK_PRESET_2500MS
|
|
11
|
-
// );
|
|
12
1
|
"use strict";
|
|
13
2
|
Object.defineProperty(exports, "__esModule", {
|
|
14
3
|
value: true
|
package/dist/task.presets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../src/task.presets.ts"],"names":["TASK_PRESETS","PERIODIC","periodic","logFirstCompletion","runImmediately","PERIODIC_DISABLED","disabled","PERIODIC_2500MS","milliseconds","RUNONCE","runOnce","RUNDELAYED","runDelayed","seconds"],"mappings":";;;;+BAYaA;;;eAAAA;;;AAAN,MAAMA;IACX,OAAOC,WAAW;QAChBC,UAAU;QACVC,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOC,oBAAoB;QACzB,GAAG,IAAI,CAACJ,QAAQ;QAChBG,gBAAgB;QAChBE,UAAU;IACZ,EAAE;IAEF,OAAOC,kBAAkB;QACvB,GAAG,IAAI,CAACN,QAAQ;QAChBO,cAAc;IAChB,EAAE;IAEF,OAAOC,UAAU;QACfC,SAAS;QACTP,oBAAoB;QACpBC,gBAAgB;IAClB,EAAE;IAEF,OAAOO,aAAa;QAClBC,YAAY;QACZT,oBAAoB;QACpBC,gBAAgB;QAChBS,SAAS;IACX,EAAE;AACJ"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "BootTask", {
|
|
|
8
8
|
return BootTask;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _mongoose =
|
|
11
|
+
const _mongoose = _interop_require_wildcard(require("mongoose"));
|
|
12
12
|
const _serverenv = require("../server.env");
|
|
13
13
|
const _containertokens = require("../container.tokens");
|
|
14
14
|
const _serverconstants = require("../server.constants");
|
|
@@ -61,7 +61,7 @@ class BootTask {
|
|
|
61
61
|
settingsService;
|
|
62
62
|
multerService;
|
|
63
63
|
printerSocketStore;
|
|
64
|
-
|
|
64
|
+
printerFilesStore;
|
|
65
65
|
permissionService;
|
|
66
66
|
roleService;
|
|
67
67
|
userService;
|
|
@@ -70,14 +70,14 @@ class BootTask {
|
|
|
70
70
|
pluginFirmwareUpdateService;
|
|
71
71
|
clientBundleService;
|
|
72
72
|
configService;
|
|
73
|
-
constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore,
|
|
73
|
+
constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, pluginFirmwareUpdateService, clientBundleService, configService }){
|
|
74
74
|
this.logger = loggerFactory(BootTask.name);
|
|
75
75
|
this.serverTasks = serverTasks;
|
|
76
76
|
this.settingsService = settingsService;
|
|
77
77
|
this.settingsStore = settingsStore;
|
|
78
78
|
this.multerService = multerService;
|
|
79
79
|
this.printerSocketStore = printerSocketStore;
|
|
80
|
-
this.
|
|
80
|
+
this.printerFilesStore = printerFilesStore;
|
|
81
81
|
this.permissionService = permissionService;
|
|
82
82
|
this.roleService = roleService;
|
|
83
83
|
this.userService = userService;
|
|
@@ -89,7 +89,6 @@ class BootTask {
|
|
|
89
89
|
this.configService = configService;
|
|
90
90
|
}
|
|
91
91
|
async runOnce() {
|
|
92
|
-
// To cope with retries after failures we register this task - disabled
|
|
93
92
|
this.taskManagerService.registerJobOrTask(this.serverTasks.SERVER_BOOT_TASK);
|
|
94
93
|
this.logger.log("Running boot task once.");
|
|
95
94
|
await this.run();
|
|
@@ -100,9 +99,7 @@ class BootTask {
|
|
|
100
99
|
await this.migrateDatabase();
|
|
101
100
|
} catch (e) {
|
|
102
101
|
if (e instanceof _mongoose.default.Error) {
|
|
103
|
-
// Tests should just continue
|
|
104
102
|
if (!e.message.includes("Can't call `openUri()` on an active connection with different connection strings.")) {
|
|
105
|
-
// We are not in a test
|
|
106
103
|
if (e.message.includes("ECONNREFUSED")) {
|
|
107
104
|
this.logger.error("Database connection timed-out. Retrying in 5000.");
|
|
108
105
|
} else {
|
|
@@ -143,9 +140,9 @@ class BootTask {
|
|
|
143
140
|
this.logger.log("Clearing upload folder");
|
|
144
141
|
this.multerService.clearUploadsFolder();
|
|
145
142
|
this.logger.log("Loading printer sockets");
|
|
146
|
-
await this.printerSocketStore.loadPrinterSockets();
|
|
143
|
+
await this.printerSocketStore.loadPrinterSockets();
|
|
147
144
|
this.logger.log("Loading files store");
|
|
148
|
-
await this.
|
|
145
|
+
await this.printerFilesStore.loadFilesStore();
|
|
149
146
|
this.logger.log("Loading floor store");
|
|
150
147
|
await this.floorStore.loadStore();
|
|
151
148
|
if (process.env.SAFEMODE_ENABLED === "true") {
|
|
@@ -155,7 +152,6 @@ class BootTask {
|
|
|
155
152
|
this.taskManagerService.registerJobOrTask(task);
|
|
156
153
|
});
|
|
157
154
|
}
|
|
158
|
-
// Success so we disable this task
|
|
159
155
|
this.taskManagerService.disableJob(_containertokens.DITokens.bootTask, false);
|
|
160
156
|
}
|
|
161
157
|
async createOrUpdateDemoAccount() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","connect","fetchMongoDBConnectionString","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
|
|
@@ -32,7 +32,6 @@ class PrintCompletionSocketIoTask {
|
|
|
32
32
|
return this.contextCache;
|
|
33
33
|
}
|
|
34
34
|
async handleMessage(fdmEvent, octoPrintEvent, data) {
|
|
35
|
-
// If not parsed well, skip log
|
|
36
35
|
const printerId = fdmEvent.replace("octoprint.", "");
|
|
37
36
|
if (!printerId) {
|
|
38
37
|
this.logger.log(`Skipping print completion log for FDM event ${fdmEvent}`);
|
|
@@ -63,7 +62,6 @@ class PrintCompletionSocketIoTask {
|
|
|
63
62
|
return;
|
|
64
63
|
}
|
|
65
64
|
if (data.type === _octoprintwebsocketconstants.EVENT_TYPES.PrintStarted) {
|
|
66
|
-
// Clear the context now with association id
|
|
67
65
|
const token = (0, _correlationtokenutil.generateCorrelationToken)();
|
|
68
66
|
this.contextCache[printerId] = {
|
|
69
67
|
correlationId: token
|
|
@@ -75,12 +73,10 @@ class PrintCompletionSocketIoTask {
|
|
|
75
73
|
completion.context = this.contextCache[printerId] || {};
|
|
76
74
|
await this.printCompletionService.create(completion);
|
|
77
75
|
this.eventEmitter2.emit((0, _eventconstants.fdmMonsterPrinterStoppedEvent)(printerId));
|
|
78
|
-
// Clear the context now
|
|
79
76
|
this.contextCache[printerId] = {};
|
|
80
77
|
}
|
|
81
78
|
}
|
|
82
79
|
async run() {
|
|
83
|
-
// Run once to bind event handler and reload the cache
|
|
84
80
|
this.contextCache = await this.printCompletionService.loadPrintContexts();
|
|
85
81
|
}
|
|
86
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","send","IO_MESSAGES","CompletionEvent","JSON","stringify","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","context","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":";;;;+BAWaA;;;eAAAA;;;gCAX0D;6CAC3C;sCACa;iCACI;AAQtC,MAAMA;IACXC,cAA6B;IAC7BC,gBAAiC;IACjCC,OAAsB;IACtBC,uBAA+C;IAE/CC,eAAuD,CAAC,EAAE;IAE1DC,YAAY,EACVL,aAAa,EACbC,eAAe,EACfE,sBAAsB,EACtBG,aAAa,EAMd,CAAE;QACD,IAAI,CAACN,aAAa,GAAGA;QACrB,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACE,sBAAsB,GAAGA;QAC9B,IAAI,CAACD,MAAM,GAAGI,cAAcP,4BAA4BQ,IAAI;QAE5D,IAAIC,OAAO,IAAI;QACf,IAAI,CAACR,aAAa,CAACS,EAAE,CAACC,IAAAA,uCAAuB,EAAC,MAAM,eAAgBC,cAAc,EAAEC,IAAI;YACtF,MAAMJ,KAAKK,aAAa,CAAC,IAAI,CAACC,KAAK,EAAEH,gBAAgBC;QACvD;IACF;IAEA,IAAIG,WAAW;QACb,OAAO,IAAI,CAACX,YAAY;IAC1B;IAEA,MAAMS,cAAcG,QAAgB,EAAEL,cAAsB,EAAEC,IAAS,EAAE;
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/print-completion.socketio.task.ts"],"names":["PrintCompletionSocketIoTask","eventEmitter2","socketIoGateway","logger","printCompletionService","contextCache","constructor","loggerFactory","name","that","on","octoPrintWebsocketEvent","octoPrintEvent","data","handleMessage","event","contexts","fdmEvent","printerId","replace","log","send","IO_MESSAGES","CompletionEvent","JSON","stringify","completion","status","type","fileName","payload","createdAt","Date","now","completionLog","error","context","EVENT_TYPES","EStop","PrintCancelling","PrintCancelled","Home","TransferStarted","TransferDone","Disconnecting","Disconnected","MetadataAnalysisStarted","MetadataAnalysisFinished","Error","corrId","correlationId","updateContext","PrintStarted","token","generateCorrelationToken","create","PrintFailed","PrintDone","emit","fdmMonsterPrinterStoppedEvent","run","loadPrintContexts"],"mappings":"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"}
|
|
@@ -10,26 +10,25 @@ Object.defineProperty(exports, "PrinterFileCleanTask", {
|
|
|
10
10
|
});
|
|
11
11
|
class PrinterFileCleanTask {
|
|
12
12
|
logger;
|
|
13
|
-
|
|
13
|
+
printerFilesStore;
|
|
14
14
|
printerCache;
|
|
15
15
|
settingsStore;
|
|
16
16
|
taskManagerService;
|
|
17
17
|
octoPrintApiService;
|
|
18
|
-
constructor({ printerCache,
|
|
18
|
+
constructor({ printerCache, printerFilesStore, octoPrintApiService, taskManagerService, settingsStore, loggerFactory }){
|
|
19
19
|
this.printerCache = printerCache;
|
|
20
|
-
this.
|
|
20
|
+
this.printerFilesStore = printerFilesStore;
|
|
21
21
|
this.taskManagerService = taskManagerService;
|
|
22
22
|
this.octoPrintApiService = octoPrintApiService;
|
|
23
23
|
this.settingsStore = settingsStore;
|
|
24
24
|
this.logger = loggerFactory(PrinterFileCleanTask.name);
|
|
25
25
|
}
|
|
26
|
-
get
|
|
27
|
-
return this
|
|
26
|
+
get ageDaysMaxSetting() {
|
|
27
|
+
return this.getSettings().autoRemoveOldFilesCriteriumDays;
|
|
28
28
|
}
|
|
29
29
|
async run() {
|
|
30
|
-
// TODO filter disconnected printers
|
|
31
30
|
const printers = await this.printerCache.listCachedPrinters(false);
|
|
32
|
-
const fileCleanSettings = this
|
|
31
|
+
const fileCleanSettings = this.getSettings();
|
|
33
32
|
const autoCleanAtBootEnabled = fileCleanSettings.autoRemoveOldFilesAtBoot;
|
|
34
33
|
try {
|
|
35
34
|
if (autoCleanAtBootEnabled) {
|
|
@@ -37,11 +36,9 @@ class PrinterFileCleanTask {
|
|
|
37
36
|
} else {
|
|
38
37
|
this.logger.log(`Reporting about old files of ${printers.length} printers.`);
|
|
39
38
|
}
|
|
40
|
-
// Filter printer states - cant clean unconnected OctoPrint instances
|
|
41
39
|
for (let printer of printers){
|
|
42
40
|
const outdatedFiles = this.getPrinterOutdatedFiles(printer);
|
|
43
41
|
if (!outdatedFiles?.length) continue;
|
|
44
|
-
// Report
|
|
45
42
|
this.logger.log(`Found ${outdatedFiles?.length} old files of ${printer.name}`);
|
|
46
43
|
if (autoCleanAtBootEnabled) {
|
|
47
44
|
await this.cleanPrinterFiles(printer.id);
|
|
@@ -52,19 +49,14 @@ class PrinterFileCleanTask {
|
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
51
|
async cleanPrinterFiles(printerId) {
|
|
55
|
-
|
|
56
|
-
await this.
|
|
57
|
-
// Update printer files
|
|
58
|
-
await this.filesStore.eagerLoadPrinterFiles(printerId, false);
|
|
52
|
+
await this.printerFilesStore.deleteOutdatedFiles(printerId, this.ageDaysMaxSetting);
|
|
53
|
+
await this.printerFilesStore.eagerLoadPrinterFiles(printerId, false);
|
|
59
54
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
*/ getPrinterOutdatedFiles(printer) {
|
|
64
|
-
const ageDaysMax = this.#ageDaysMaxSetting;
|
|
65
|
-
return this.filesStore.getOutdatedFiles(printer.id, ageDaysMax);
|
|
55
|
+
getPrinterOutdatedFiles(printer) {
|
|
56
|
+
const ageDaysMax = this.ageDaysMaxSetting;
|
|
57
|
+
return this.printerFilesStore.getOutdatedFiles(printer.id, ageDaysMax);
|
|
66
58
|
}
|
|
67
|
-
|
|
59
|
+
getSettings() {
|
|
68
60
|
return this.settingsStore.getFileCleanSettings();
|
|
69
61
|
}
|
|
70
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/printer-file-clean.task.ts"],"names":["PrinterFileCleanTask","logger","printerFilesStore","printerCache","settingsStore","taskManagerService","octoPrintApiService","constructor","loggerFactory","name","ageDaysMaxSetting","getSettings","autoRemoveOldFilesCriteriumDays","run","printers","listCachedPrinters","fileCleanSettings","autoCleanAtBootEnabled","autoRemoveOldFilesAtBoot","log","length","printer","outdatedFiles","getPrinterOutdatedFiles","cleanPrinterFiles","id","printerId","deleteOutdatedFiles","eagerLoadPrinterFiles","ageDaysMax","getOutdatedFiles","getFileCleanSettings"],"mappings":";;;;+BAcaA;;;eAAAA;;;AAAN,MAAMA;IACXC,OAAsB;IACtBC,kBAAqC;IACrCC,aAA2B;IAC3BC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IAEzCC,YAAY,EACVJ,YAAY,EACZD,iBAAiB,EACjBI,mBAAmB,EACnBD,kBAAkB,EAClBD,aAAa,EACbI,aAAa,EAQd,CAAE;QACD,IAAI,CAACL,YAAY,GAAGA;QACpB,IAAI,CAACD,iBAAiB,GAAGA;QACzB,IAAI,CAACG,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACH,MAAM,GAAGO,cAAcR,qBAAqBS,IAAI;IACvD;IAEA,IAAYC,oBAAoB;QAC9B,OAAO,IAAI,CAACC,WAAW,GAAGC,+BAA+B;IAC3D;IAEA,MAAMC,MAAM;QAEV,MAAMC,WAAW,MAAM,IAAI,CAACX,YAAY,CAACY,kBAAkB,CAAC;QAC5D,MAAMC,oBAAoB,IAAI,CAACL,WAAW;QAC1C,MAAMM,yBAAyBD,kBAAkBE,wBAAwB;QAEzE,IAAI;YACF,IAAID,wBAAwB;gBAC1B,IAAI,CAAChB,MAAM,CAACkB,GAAG,CAAC,CAAC,kBAAkB,EAAEL,SAASM,MAAM,CAAC,6DAA6D,CAAC;YACrH,OAAO;gBACL,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,6BAA6B,EAAEL,SAASM,MAAM,CAAC,UAAU,CAAC;YAC7E;YAGA,KAAK,IAAIC,WAAWP,SAAU;gBAC5B,MAAMQ,gBAAgB,IAAI,CAACC,uBAAuB,CAACF;gBACnD,IAAI,CAACC,eAAeF,QAAQ;gBAG5B,IAAI,CAACnB,MAAM,CAACkB,GAAG,CAAC,CAAC,MAAM,EAAEG,eAAeF,OAAO,cAAc,EAAEC,QAAQZ,IAAI,CAAC,CAAC;gBAE7E,IAAIQ,wBAAwB;oBAC1B,MAAM,IAAI,CAACO,iBAAiB,CAACH,QAAQI,EAAE;gBACzC;YACF;QACF,SAAU;YACR,IAAI,CAACxB,MAAM,CAACkB,GAAG,CAAC,CAAC,mCAAmC,CAAC;QACvD;IACF;IAEA,MAAMK,kBAAkBE,SAAiB,EAAE;QAEzC,MAAM,IAAI,CAACxB,iBAAiB,CAACyB,mBAAmB,CAACD,WAAW,IAAI,CAAChB,iBAAiB;QAGlF,MAAM,IAAI,CAACR,iBAAiB,CAAC0B,qBAAqB,CAACF,WAAW;IAChE;IAMAH,wBAAwBF,OAA2B,EAAE;QACnD,MAAMQ,aAAa,IAAI,CAACnB,iBAAiB;QACzC,OAAO,IAAI,CAACR,iBAAiB,CAAC4B,gBAAgB,CAACT,QAAQI,EAAE,EAAEI;IAC7D;IAEQlB,cAAc;QACpB,OAAO,IAAI,CAACP,aAAa,CAAC2B,oBAAoB;IAChD;AACF"}
|
|
@@ -23,9 +23,7 @@ class PrinterWebsocketRestoreTask {
|
|
|
23
23
|
}
|
|
24
24
|
async run() {
|
|
25
25
|
const startTime = Date.now();
|
|
26
|
-
|
|
27
|
-
* @type {OctoPrintSockIoAdapter[]}
|
|
28
|
-
*/ const existingSockets = this.printerSocketStore.listPrinterSockets();
|
|
26
|
+
const existingSockets = this.printerSocketStore.listPrinterSockets();
|
|
29
27
|
const resetAdapterIds = [];
|
|
30
28
|
const silentSocketIds = [];
|
|
31
29
|
for (const socket of existingSockets){
|
|
@@ -40,10 +38,8 @@ class PrinterWebsocketRestoreTask {
|
|
|
40
38
|
this.logger.error(`WebSocket authentication command failed for '${socket.printerId}' with error '${(0, _errorutils.errorSummary)(e)}'`, e.stack);
|
|
41
39
|
continue;
|
|
42
40
|
}
|
|
43
|
-
// Often due to USB disconnect, not interesting to reconnect unless we perform an API call for verification
|
|
44
41
|
if (socket.apiState !== _octoprintsockioadapter.API_STATE.unset && !socket.lastMessageReceivedTimestamp || Date.now() - socket.lastMessageReceivedTimestamp > 10 * 1000) {
|
|
45
42
|
silentSocketIds.push(socket.printerId);
|
|
46
|
-
// Produce logs for silent sockets
|
|
47
43
|
try {
|
|
48
44
|
const result = await this.octoPrintApiService.getConnection(socket.loginDto);
|
|
49
45
|
if (result?.current?.state !== "Closed") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","push","printerId","e","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","warn","duration","getServerSettings","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,mBAAmB,EACnBF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/printer-websocket-restore.task.ts"],"names":["PrinterWebsocketRestoreTask","settingsStore","printerSocketStore","octoPrintApiService","logger","constructor","loggerFactory","name","run","startTime","Date","now","existingSockets","listPrinterSockets","resetAdapterIds","silentSocketIds","socket","isClosedOrAborted","close","resetSocketState","push","printerId","e","error","errorSummary","stack","apiState","API_STATE","unset","lastMessageReceivedTimestamp","result","getConnection","loginDto","current","state","warn","duration","getServerSettings","debugSettings","debugSocketRetries","log","length"],"mappings":";;;;+BAQaA;;;eAAAA;;;4BARgB;wCACH;AAOnB,MAAMA;IACXC,cAA6B;IAC7BC,mBAAuC;IACvCC,oBAAyC;IACzCC,OAAsB;IAEtBC,YAAY,EACVH,kBAAkB,EAClBC,mBAAmB,EACnBF,aAAa,EACbK,aAAa,EAMd,CAAE;QACD,IAAI,CAACJ,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACF,aAAa,GAAGA;QACrB,IAAI,CAACG,MAAM,GAAGE,cAAcN,4BAA4BO,IAAI;IAC9D;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAK1B,MAAMC,kBAAkB,IAAI,CAACV,kBAAkB,CAACW,kBAAkB;QAClE,MAAMC,kBAAkB,EAAE;QAC1B,MAAMC,kBAAkB,EAAE;QAC1B,KAAK,MAAMC,UAAUJ,gBAAiB;YACpC,IAAI;gBACF,IAAII,OAAOC,iBAAiB,IAAI;oBAC9BD,OAAOE,KAAK;oBACZF,OAAOG,gBAAgB;oBACvBL,gBAAgBM,IAAI,CAACJ,OAAOK,SAAS;oBACrC;gBACF;YACF,EAAE,OAAOC,GAAG;gBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,6CAA6C,EAAEP,OAAOK,SAAS,CAAC,cAAc,EAAEG,IAAAA,wBAAY,EAACF,GAAG,CAAC,CAAC,EACnGA,EAAEG,KAAK;gBAET;YACF;YAGA,IACE,AAACT,OAAOU,QAAQ,KAAKC,iCAAS,CAACC,KAAK,IAAI,CAACZ,OAAOa,4BAA4B,IAC5EnB,KAAKC,GAAG,KAAKK,OAAOa,4BAA4B,GAAG,KAAK,MACxD;gBACAd,gBAAgBK,IAAI,CAACJ,OAAOK,SAAS;gBAErC,IAAI;oBACF,MAAMS,SAAS,MAAM,IAAI,CAAC3B,mBAAmB,CAAC4B,aAAa,CAACf,OAAOgB,QAAQ;oBAC3E,IAAIF,QAAQG,SAASC,UAAU,UAAU;wBACvC,IAAI,CAAC9B,MAAM,CAAC+B,IAAI,CACd,CAAC,4FAA4F,EAAEL,QAAQG,SAASC,MAAM,aAAa,EAAElB,OAAOK,SAAS,CAAC,CAAC,CAAC;oBAE5J;gBACF,EAAE,OAAOC,GAAG;oBACV,IAAI,CAAClB,MAAM,CAACmB,KAAK,CACf,CAAC,uFAAuF,EAAEP,OAAOK,SAAS,CAAC,CAAC,CAAC;gBAEjH;YACF;QACF;QAEA,MAAMe,WAAW1B,KAAKC,GAAG,KAAKF;QAC9B,IAAI,IAAI,CAACR,aAAa,CAACoC,iBAAiB,IAAIC,eAAeC,oBAAoB;YAC7E,IAAI,CAACnC,MAAM,CAACoC,GAAG,CACb,CAAC,MAAM,EAAE1B,gBAAgB2B,MAAM,CAAC,qCAAqC,EAAE1B,gBAAgB0B,MAAM,CAAC,0BAA0B,EAAEL,SAAS,GAAG,CAAC;QAE3I;IACF;AACF"}
|
|
@@ -9,21 +9,11 @@ Object.defineProperty(exports, "PrinterWebsocketTask", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
class PrinterWebsocketTask {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
*/ settingsStore;
|
|
18
|
-
/**
|
|
19
|
-
* @type {OctoPrintApiService}
|
|
20
|
-
*/ octoPrintApiService;
|
|
21
|
-
/**
|
|
22
|
-
* @type {TaskManagerService}
|
|
23
|
-
*/ taskManagerService;
|
|
24
|
-
/**
|
|
25
|
-
* @type {LoggerService}
|
|
26
|
-
*/ logger;
|
|
12
|
+
printerSocketStore;
|
|
13
|
+
settingsStore;
|
|
14
|
+
octoPrintApiService;
|
|
15
|
+
taskManagerService;
|
|
16
|
+
logger;
|
|
27
17
|
constructor({ printerSocketStore, octoPrintApiService, settingsStore, taskManagerService, loggerFactory }){
|
|
28
18
|
this.printerSocketStore = printerSocketStore;
|
|
29
19
|
this.settingsStore = settingsStore;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/printer-websocket.task.ts"],"names":["PrinterWebsocketTask","printerSocketStore","settingsStore","octoPrintApiService","taskManagerService","logger","constructor","loggerFactory","name","run","startTime","Date","now","result","reconnectPrinterSockets","getServerSettings","debugSettings","debugSocketReconnect","log"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IAIXC,mBAAmB;IAInBC,cAAc;IAIdC,oBAAoB;IAIpBC,mBAAmB;IAKnBC,OAAO;IAEPC,YAAY,EAAEL,kBAAkB,EAAEE,mBAAmB,EAAED,aAAa,EAAEE,kBAAkB,EAAEG,aAAa,EAAE,CAAE;QACzG,IAAI,CAACN,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,mBAAmB,GAAGA;QAC3B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,MAAM,GAAGE,cAAcP,qBAAqBQ,IAAI;IACvD;IAEA,MAAMC,MAAM;QACV,MAAMC,YAAYC,KAAKC,GAAG;QAC1B,MAAMC,SAAS,MAAM,IAAI,CAACZ,kBAAkB,CAACa,uBAAuB;QACpE,IAAI,IAAI,CAACZ,aAAa,CAACa,iBAAiB,GAAGC,aAAa,EAAEC,sBAAsB;YAC9E,IAAI,CAACZ,MAAM,CAACa,GAAG,CAAC,CAAC,kBAAkB,EAAEP,KAAKC,GAAG,KAAKF,UAAU,GAAG,CAAC,EAAEG;QACpE;IACF;AACF"}
|
|
@@ -55,7 +55,6 @@ class SocketIoTask {
|
|
|
55
55
|
printerEvents,
|
|
56
56
|
trackedUploads
|
|
57
57
|
};
|
|
58
|
-
// Precise debugging
|
|
59
58
|
if (this.settingsStore.getServerSettings().debugSettings?.debugSocketIoBandwidth) {
|
|
60
59
|
const kbDataString = Object.entries(socketIoData).map(([id, state])=>{
|
|
61
60
|
return `${id} ${(0, _metricutils.formatKB)(state)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getServerSettings","debugSettings","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":";;;;+BAaaA;;;eAAAA;;;iCAbgC;gCACN;6BACN;AAW1B,MAAMA;IACXC,gBAAiC;IACjCC,mBAAuC;IACvCC,mBAAuC;IACvCC,WAAuB;IACvBC,uBAA+C;IAC/CC,cAA6B;IAC7BC,aAA2B;IAC3BC,OAAsB;IACtBC,cAA6B;IAErBC,uBAAuB,EAAE;IACzBC,wBAAwB,IAAI;IAC5BC,iBAA2B,EAAE,CAAC;IAC9BC,WAAW,EAAE;IAErBC,YAAY,EACVb,eAAe,EACfG,UAAU,EACVF,kBAAkB,EAClBC,kBAAkB,EAClBI,YAAY,EACZQ,aAAa,EACbV,sBAAsB,EACtBI,aAAa,EACbH,aAAa,EAWd,CAAE;QACD,IAAI,CAACL,eAAe,GAAGA;QACvB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACE,sBAAsB,GAAGA;QAC9B,IAAI,CAACD,UAAU,GAAGA;QAClB,IAAI,CAACI,MAAM,GAAGO,cAAcf,aAAagB,IAAI;QAC7C,IAAI,CAACV,aAAa,GAAGA;QACrB,IAAI,CAACC,YAAY,GAAGA;QACpB,IAAI,CAACE,aAAa,GAAGA;QAErB,IAAI,CAACH,aAAa,CAACW,EAAE,CAACC,sCAAsB,EAAE;YAC5C,MAAM,IAAI,CAACC,UAAU;QACvB;IACF;IAEA,MAAMC,MAAM;QACV,MAAM,IAAI,CAACD,UAAU;IACvB;IAEA,MAAMA,aAAa;QACjB,MAAME,SAAS,MAAM,IAAI,CAACjB,UAAU,CAACkB,SAAS;QAC9C,MAAMC,WAAW,MAAM,IAAI,CAAChB,YAAY,CAACiB,kBAAkB,CAAC;QAC5D,MAAMC,eAAe,IAAI,CAACvB,kBAAkB,CAACwB,mBAAmB;QAChE,MAAMC,gBAAgB,MAAM,IAAI,CAACxB,kBAAkB,CAACyB,eAAe;QACnE,MAAMC,iBAAiB,IAAI,CAACxB,sBAAsB,CAACyB,UAAU,CAAC;QAE9D,MAAMC,eAAe;YACnBR;YACAF;YACAI;YACAE;YACAE;QACF;
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getServerSettings","debugSettings","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":"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"}
|
package/dist/tasks.js
CHANGED
|
@@ -38,9 +38,7 @@ class ServerTasks {
|
|
|
38
38
|
registerTask(_containertokens.DITokens.socketIoTask, _taskpresets.TASK_PRESETS.PERIODIC, 500),
|
|
39
39
|
registerTask(_containertokens.DITokens.printCompletionSocketIoTask, _taskpresets.TASK_PRESETS.RUNONCE),
|
|
40
40
|
registerTask(_containertokens.DITokens.printerFileCleanTask, _taskpresets.TASK_PRESETS.RUNONCE, 60 * 1000, true),
|
|
41
|
-
// Every 2 seconds
|
|
42
41
|
registerTask(_containertokens.DITokens.printerWebsocketTask, _taskpresets.TASK_PRESETS.PERIODIC, 2000, true),
|
|
43
|
-
// Every 15 seconds
|
|
44
42
|
registerTask(_containertokens.DITokens.printerWebsocketRestoreTask, _taskpresets.TASK_PRESETS.PERIODIC, 15 * 1000, false)
|
|
45
43
|
];
|
|
46
44
|
}
|
package/dist/tasks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX4B;iCACnB;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAM,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACjF,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,iBAAiB;IAC/C,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAOS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtG,OAAOC,aAAa;QAClBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;
|
|
1
|
+
{"version":3,"sources":["../src/tasks.ts"],"names":["ServerTasks","registerTask","task","preset","milliseconds","runImmediately","timingPreset","id","name","SERVER_BOOT_TASK","DITokens","bootTask","TaskPresets","PERIODIC_DISABLED","BOOT_TASKS","softwareUpdateTask","RUNDELAYED","clientDistDownloadTask","RUNONCE","socketIoTask","PERIODIC","printCompletionSocketIoTask","printerFileCleanTask","printerWebsocketTask","printerWebsocketRestoreTask"],"mappings":";;;;;;;;;;;IAsBaA,WAAW;eAAXA;;IAXGC,YAAY;eAAZA;;;6BAX4B;iCACnB;AAUlB,SAASA,aAAaC,IAAI,EAAEC,MAAM,EAAEC,eAAe,CAAC,EAAEC,iBAAiB,KAAK;IACjF,IAAIC,eAAe;QAAE,GAAGH,MAAM;IAAC;IAC/BG,aAAaF,YAAY,GAAGD,OAAOC,YAAY,IAAIA;IACnDE,aAAaD,cAAc,GAAGA,iBAAiB;IAC/C,OAAO;QACLE,IAAIL,KAAKM,IAAI,IAAIN;QACjBA;QACAC,QAAQG;IACV;AACF;AAEO,MAAMN;IACX,OAAOS,mBAAmBR,aAAaS,yBAAQ,CAACC,QAAQ,EAAEC,yBAAW,CAACC,iBAAiB,EAAE,MAAM,OAAO;IACtG,OAAOC,aAAa;QAClBb,aAAaS,yBAAQ,CAACK,kBAAkB,EAAEH,yBAAW,CAACI,UAAU,EAAE;QAClEf,aAAaS,yBAAQ,CAACO,sBAAsB,EAAEL,yBAAW,CAACM,OAAO;QACjEjB,aAAaS,yBAAQ,CAACS,YAAY,EAAEP,yBAAW,CAACQ,QAAQ,EAAE;QAC1DnB,aAAaS,yBAAQ,CAACW,2BAA2B,EAAET,yBAAW,CAACM,OAAO;QACtEjB,aAAaS,yBAAQ,CAACY,oBAAoB,EAAEV,yBAAW,CAACM,OAAO,EAAE,KAAK,MAAM;QAE5EjB,aAAaS,yBAAQ,CAACa,oBAAoB,EAAEX,yBAAW,CAACQ,QAAQ,EAAE,MAAM;QAExEnB,aAAaS,yBAAQ,CAACc,2BAA2B,EAAEZ,yBAAW,CAACQ,QAAQ,EAAE,KAAK,MAAM;KACrF,CAAC;AACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/types/express/index.d.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/types/express/index.d.ts"],"names":[],"mappings":""}
|
package/dist/utils/env.utils.js
CHANGED
|
@@ -34,7 +34,7 @@ _export(exports, {
|
|
|
34
34
|
return verifyPackageJsonRequirements;
|
|
35
35
|
}
|
|
36
36
|
});
|
|
37
|
-
const _fs =
|
|
37
|
+
const _fs = _interop_require_default(require("fs"));
|
|
38
38
|
const _logger = require("../handlers/logger");
|
|
39
39
|
const _serverconstants = require("../server.constants");
|
|
40
40
|
const _path = require("path");
|
|
@@ -67,10 +67,7 @@ function isNodemon() {
|
|
|
67
67
|
function isNode() {
|
|
68
68
|
return "NODE" in process.env;
|
|
69
69
|
}
|
|
70
|
-
|
|
71
|
-
* Turn an object into an envfile string
|
|
72
|
-
* Copied from https://github.com/bevry/envfile
|
|
73
|
-
*/ function stringifyDotEnv(obj) {
|
|
70
|
+
function stringifyDotEnv(obj) {
|
|
74
71
|
let result = "";
|
|
75
72
|
for (const [key, value] of Object.entries(obj)){
|
|
76
73
|
if (key) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;
|
|
1
|
+
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;6CApDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAMA,SAASS,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACf,KAAKgB,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAId,KAAK;YACP,MAAMmB,OAAO,CAAC,EAAEnB,IAAI,CAAC,EAAEoB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASlB,8BAA8BwB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB3B,OAAO4B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAvB,OAAO6B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB9B,OAAO4B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOzB,6BAAY,CAAC0B,iBAAiB,EAAE;QAChEnC,OAAO4B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAlC,OAAO6B,KAAK,CAAC;IACb,OAAO;AACT"}
|
package/dist/utils/is-docker.js
CHANGED
|
@@ -8,7 +8,7 @@ Object.defineProperty(exports, "isDocker", {
|
|
|
8
8
|
return isDocker;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _fs =
|
|
11
|
+
const _fs = _interop_require_default(require("fs"));
|
|
12
12
|
function _interop_require_default(obj) {
|
|
13
13
|
return obj && obj.__esModule ? obj : {
|
|
14
14
|
default: obj
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/is-docker.ts"],"names":["isDocker","isDockerCached","undefined","hasDockerEnv","fs","statSync","hasDockerCGroup","readFileSync","includes"],"mappings":";;;;+BAqBgBA;;;eAAAA;;;
|
|
1
|
+
{"version":3,"sources":["../../src/utils/is-docker.ts"],"names":["isDocker","isDockerCached","undefined","hasDockerEnv","fs","statSync","hasDockerCGroup","readFileSync","includes"],"mappings":";;;;+BAqBgBA;;;eAAAA;;;6CArBD;;;;;;AAEf,IAAIC,iBAAsCC;AAE1C,SAASC;IACP,IAAI;QACFC,WAAE,CAACC,QAAQ,CAAC;QACZ,OAAO;IACT,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,SAASC;IACP,IAAI;QACF,OAAOF,WAAE,CAACG,YAAY,CAAC,qBAAqB,QAAQC,QAAQ,CAAC;IAC/D,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEO,SAASR;IACd,IAAIC,mBAAmBC,WAAW;QAChCD,iBAAiBE,kBAAkBG;IACrC;IAEA,OAAOL;AACT"}
|